diff --git a/.github/workflows/code_quality.yml b/.github/workflows/code_quality.yml
index 65f350e1b53..e5351acaf78 100644
--- a/.github/workflows/code_quality.yml
+++ b/.github/workflows/code_quality.yml
@@ -18,7 +18,7 @@ jobs:
           fetch-depth: 1
           #php-version: '7.1'
       - name: 'Qodana Scan'
-        uses: JetBrains/qodana-action@v2022.3.0
+        uses: JetBrains/qodana-action@v2022.3.2
         #with:
         #  php-version: '7.1'
         env:
diff --git a/dev/dolibarr_changes.txt b/dev/dolibarr_changes.txt
index 461db52f959..e12c237e28e 100644
--- a/dev/dolibarr_changes.txt
+++ b/dev/dolibarr_changes.txt
@@ -209,6 +209,11 @@ with
 with
 	foreach ($value[1] as $k => $v) {
 
+* Fix by replacing 
+	if ($res[0] == PDF_TYPE_OBJECT)
+with
+	if ($res && $res[0] == PDF_TYPE_OBJECT)
+
 
 
 JSGANTT:
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index ecd5668beb5..23bb513a85b 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -493,7 +493,7 @@ if (empty($reshook)) {
 			if ($conf->global->ACCOUNTING_REEXPORT == 1) {
 				setEventMessages($langs->trans("ExportOfPiecesAlreadyExportedIsEnable"), null, 'mesgs');
 			} else {
-				setEventMessages($langs->trans("ExportOfPiecesAlreadyExportedIsDisable"), null, 'mesgs');
+				setEventMessages($langs->trans("ExportOfPiecesAlreadyExportedIsDisable"), null, 'warnings');
 			}
 		} else {
 			setEventMessages($langs->trans("Error"), null, 'errors');
@@ -1002,11 +1002,14 @@ $newcardbutton = empty($hookmanager->resPrint) ? '' : $hookmanager->resPrint;
 if (empty($reshook)) {
 	// Button re-export
 	if (!empty($conf->global->ACCOUNTING_REEXPORT)) {
-		$newcardbutton .= '<a class="valignmiddle" href="'.$_SERVER['PHP_SELF'].'?action=setreexport&token='.newToken().'&value=0'.($param ? '&'.$param : '').'">'.img_picto($langs->trans("Activated"), 'switch_on').'</a> ';
+		$newcardbutton .= '<a class="valignmiddle" href="'.$_SERVER['PHP_SELF'].'?action=setreexport&token='.newToken().'&value=0'.($param ? '&'.$param : '').'">'.img_picto($langs->trans("ClickToHideAlreadyExportedLines"), 'switch_off', 'class="small size15x valignmiddle"');
+		$newcardbutton .= '<span class="valignmiddle marginrightonly paddingleft">'.$langs->trans("ClickToHideAlreadyExportedLines").'</span>';
+		$newcardbutton .= '</a>';
 	} else {
-		$newcardbutton .= '<a class="valignmiddle" href="'.$_SERVER['PHP_SELF'].'?action=setreexport&token='.newToken().'&value=1'.($param ? '&'.$param : '').'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a> ';
+		$newcardbutton .= '<a class="valignmiddle" href="'.$_SERVER['PHP_SELF'].'?action=setreexport&token='.newToken().'&value=1'.($param ? '&'.$param : '').'">'.img_picto($langs->trans("DocsAlreadyExportedAreExcluded"), 'switch_on', 'class="warning size15x valignmiddle"').'';
+		$newcardbutton .= '<span class="valignmiddle marginrightonly paddingleft">'.$langs->trans("DocsAlreadyExportedAreExcluded").'</span>';
+		$newcardbutton .= '</a>';
 	}
-	$newcardbutton .= '<span class="valignmiddle marginrightonly">'.$langs->trans("IncludeDocsAlreadyExported").'</span>';
 
 	if ($user->hasRight('accounting', 'mouvements', 'export')) {
 		$newcardbutton .= dolGetButtonTitle($buttonLabel, $langs->trans("ExportFilteredList").' ('.$listofformat[$formatexportset].')', 'fa fa-file-export paddingleft', $_SERVER["PHP_SELF"].'?action=export_file&token='.newToken().($param ? '&'.$param : ''), $user->hasRight('accounting', 'mouvements', 'export'));
@@ -1040,7 +1043,7 @@ if ($massaction == 'preunletteringauto') {
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
 if ($massactionbutton && $contextpage != 'poslist') {
 	$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
 }
@@ -1066,7 +1069,7 @@ print $moreforfilter;
 print '</div>';
 
 print '<div class="div-table-responsive">';
-print '<table class="tagtable liste centpercent">';
+print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">';
 
 // Filters lines
 print '<tr class="liste_titre_filter">';
@@ -1222,8 +1225,7 @@ print "</tr>\n";
 
 print '<tr class="liste_titre">';
 if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
-}
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch actioncolumn ');}
 if (!empty($arrayfields['t.piece_num']['checked'])) {
 	print_liste_field_titre($arrayfields['t.piece_num']['label'], $_SERVER['PHP_SELF'], "t.piece_num", "", $param, "", $sortfield, $sortorder);
 }
diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index 4c6e2d09838..d34f89d95d3 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-2022  Alexandre Spangaro  <aspangaro@open-dsi.fr>
+ * Copyright (C) 2016-2023  Alexandre Spangaro  <aspangaro@open-dsi.fr>
  * Copyright (C) 2022  		Lionel Vessiller    <lvessiller@open-dsi.fr>
  * Copyright (C) 2013-2017  Olivier Geffroy     <jeff@jeffinfo.com>
  * Copyright (C) 2017       Elarifr. Ari Elbaz  <github@accedinfo.com>
@@ -203,7 +203,7 @@ class AccountancyExport
 					'ACCOUNTING_EXPORT_FORMAT' => empty($conf->global->ACCOUNTING_EXPORT_FORMAT) ? 'txt' : $conf->global->ACCOUNTING_EXPORT_FORMAT,
 					'ACCOUNTING_EXPORT_SEPARATORCSV' => empty($conf->global->ACCOUNTING_EXPORT_SEPARATORCSV) ? ',' : $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV,
 					'ACCOUNTING_EXPORT_ENDLINE' => empty($conf->global->ACCOUNTING_EXPORT_ENDLINE) ? 1 : $conf->global->ACCOUNTING_EXPORT_ENDLINE,
-					'ACCOUNTING_EXPORT_DATE' => empty($conf->global->ACCOUNTING_EXPORT_DATE) ? '%d%m%Y' : $conf->global->ACCOUNTING_EXPORT_DATE,
+					'ACCOUNTING_EXPORT_DATE' => getDolGlobalString('ACCOUNTING_EXPORT_DATE', '%Y-%m-%d'),
 				),
 				self::$EXPORT_TYPE_CEGID => array(
 					'label' => $langs->trans('Modelcsv_CEGID'),
@@ -682,7 +682,7 @@ class AccountancyExport
 	/**
 	 * Export format : Quadratus (Format ASCII)
 	 * Format since 2015 compatible QuadraCOMPTA
-	 * Last review for this format : 2021/09/13 Alexandre Spangaro (aspangaro@open-dsi.fr)
+	 * Last review for this format : 2023/01/28 Alexandre Spangaro (aspangaro@open-dsi.fr)
 	 *
 	 * Help : https://docplayer.fr/20769649-Fichier-d-entree-ascii-dans-quadracompta.html
 	 * In QuadraCompta | Use menu : "Outils" > "Suivi des dossiers" > "Import ASCII(Compta)"
@@ -703,6 +703,14 @@ class AccountancyExport
 		// $date_ecriture = dol_print_date(dol_now(), $conf->global->ACCOUNTING_EXPORT_DATE); // format must be ddmmyy
 		// $date_ecriture = dol_print_date(time(), $conf->global->ACCOUNTING_EXPORT_DATE); // format must be ddmmyy
 		foreach ($TData as $data) {
+			// Clean some data
+			$data->doc_ref = dol_string_unaccent($data->doc_ref);
+			$data->label_operation = dol_string_unaccent($data->label_operation);
+			$data->numero_compte = dol_string_unaccent($data->numero_compte);
+			$data->label_compte = dol_string_unaccent($data->label_compte);
+			$data->subledger_account = dol_string_unaccent($data->subledger_account);
+			$data->subledger_label = dol_string_unaccent($data->subledger_label);
+
 			$code_compta = $data->numero_compte;
 			if (!empty($data->subledger_account)) {
 				$code_compta = $data->subledger_account;
@@ -734,9 +742,9 @@ class AccountancyExport
 				if ($data->doc_type == 'customer_invoice') {
 					$Tab['type_compte'] = 'C';
 				} elseif ($data->doc_type == 'supplier_invoice') {
-					$Tab['coll_compte'] = 'F';
+					$Tab['type_compte'] = 'F';
 				} else {
-					$Tab['coll_compte'] = 'G';
+					$Tab['type_compte'] = 'G';
 				}
 
 				$Tab['filler3'] = str_repeat(' ', 235);
@@ -761,7 +769,7 @@ class AccountancyExport
 			//$Tab['date_ecriture'] = $date_ecriture;
 			$Tab['date_ecriture'] = dol_print_date($data->doc_date, '%d%m%y');
 			$Tab['filler'] = ' ';
-			$Tab['libelle_ecriture'] = str_pad(self::trunc(dol_string_unaccent($data->doc_ref).' '.dol_string_unaccent($data->label_operation), 20), 20);
+			$Tab['libelle_ecriture'] = str_pad(self::trunc($data->doc_ref.' '.$data->label_operation, 20), 20);
 
 			// Credit invoice - invert sens
 			/*
@@ -811,8 +819,8 @@ class AccountancyExport
 			// TODO: we should filter more than only accent to avoid wrong line size
 			// TODO: remove invoice number doc_ref in libelle,
 			// TODO: we should offer an option for customer to build the libelle using invoice number / name / date in accounting software
-			//$Tab['libelle_ecriture2'] = str_pad(self::trunc(dol_string_unaccent($data->doc_ref) . ' ' . dol_string_unaccent($data->label_operation), 30), 30);
-			$Tab['libelle_ecriture2'] = str_pad(self::trunc(dol_string_unaccent($data->label_operation), 30), 30);
+			//$Tab['libelle_ecriture2'] = str_pad(self::trunc($data->doc_ref . ' ' . $data->label_operation, 30), 30);
+			$Tab['libelle_ecriture2'] = str_pad(self::trunc($data->label_operation, 30), 30);
 			$Tab['codetva'] = str_repeat(' ', 2);
 
 			// We need to keep the 10 lastest number of invoice doc_ref not the beginning part that is the unusefull almost same part
diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php
index 94ee1ac6029..8e5f7690dd1 100644
--- a/htdocs/accountancy/class/accountingaccount.class.php
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@@ -723,7 +723,7 @@ class AccountingAccount extends CommonObject
 	}
 
 	/**
-	 * Return Suggest accounting accounts to bind
+	 * Return a suggested account (from chart of accounts) to bind
 	 *
 	 * @param 	Societe 							$buyer 				Object buyer
 	 * @param 	Societe 							$seller 			Object seller
@@ -733,6 +733,8 @@ class AccountingAccount extends CommonObject
 	 * @param 	array 								$accountingAccount 	Array of Accounting account
 	 * @param 	string 								$type 				Customer / Supplier
 	 * @return	array|int      											Accounting accounts suggested or < 0 if technical error.
+	 * 																	'suggestedaccountingaccountbydefaultfor'=>Will be used for the label to show on tooltip for account by default on any product
+	 * 																	'suggestedaccountingaccountfor'=>Is the account suggested for this product
 	 */
 	public function getAccountingCodeToBind(Societe $buyer, Societe $seller, Product $product, $facture, $factureDet, $accountingAccount = array(), $type = '')
 	{
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index 021c1ec7821..35be32d6b34 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -43,10 +43,11 @@ $langs->loadLangs(array("bills", "companies", "compta", "accountancy", "other",
 
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
-$show_files = GETPOST('show_files', 'int');
 $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'accountancycustomerlist'; // To manage different context of search
 $optioncss = GETPOST('optioncss', 'alpha');
+
 $default_account = GETPOST('default_account', 'int');
 
 // Select Box
@@ -73,8 +74,6 @@ $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_en
 $search_country = GETPOST('search_country', 'alpha');
 $search_tvaintra = GETPOST('search_tvaintra', 'alpha');
 
-$btn_ventil = GETPOST('ventil', 'alpha');
-
 // 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);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
@@ -520,8 +519,8 @@ if ($result) {
 	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);
-	print_liste_field_titre("AccountAccountingSuggest", '', '', '', '', '', '', '', 'nowraponall ');
-	print_liste_field_titre("IntoAccount", '', '', '', '', '', '', '', 'center ');
+	print_liste_field_titre("DataUsedToSuggestAccount", '', '', '', '', '', '', '', 'nowraponall ');
+	print_liste_field_titre("AccountAccountingSuggest", '', '', '', '', '', '', '', 'center ');
 	$checkpicto = '';
 	if ($massactionbutton) {
 		$checkpicto = $form->showCheckAddButtons('checkforselect', 1);
@@ -640,7 +639,7 @@ if ($result) {
 		print '<td class="center">'.dol_print_date($facture_static->date, 'day').'</td>';
 
 		// Ref Product
-		print '<td class="tdoverflowmax150">';
+		print '<td class="tdoverflowmax100">';
 		if ($product_static->id > 0) {
 			print $product_static->getNomUrl(1);
 		}
@@ -649,7 +648,7 @@ if ($result) {
 		}
 		print '</td>';
 
-		// Description
+		// Description of line
 		print '<td class="tdoverflowonsmartphone small">';
 		$text = dolGetFirstLineOfText(dol_string_nohtmltag($facture_static_det->desc, 1));
 		$trunclength = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION) ? 32 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION;
@@ -683,15 +682,22 @@ if ($result) {
 
 		// Found accounts
 		print '<td class="small">';
+		// First show default account for any products
 		$s = '1. '.(($facture_static_det->product_type == 1) ? $langs->trans("DefaultForService") : $langs->trans("DefaultForProduct")).': ';
-		$shelp = '';
+		$shelp = ''; $ttype = 'help';
 		if ($suggestedaccountingaccountbydefaultfor == 'eec') {
 			$shelp .= $langs->trans("SaleEEC");
+		} elseif ($suggestedaccountingaccountbydefaultfor == 'eecwithvat') {
+			$shelp = $langs->trans("SaleEECWithVAT");
+		} elseif ($suggestedaccountingaccountbydefaultfor == 'eecwithoutvatnumber') {
+			$shelp = $langs->trans("SaleEECWithoutVATNumber");
+			$ttype = 'warning';
 		} elseif ($suggestedaccountingaccountbydefaultfor == 'export') {
 			$shelp .= $langs->trans("SaleExport");
 		}
 		$s .= ($code_sell_l > 0 ? length_accountg($code_sell_l) : '<span style="'.$code_sell_p_notset.'">'.$langs->trans("NotDefined").'</span>');
-		print $form->textwithpicto($s, $shelp, 1, 'help', '', 0, 2, '', 1);
+		print $form->textwithpicto($s, $shelp, 1, $ttype, '', 0, 2, '', 1);
+		// Now show account for product
 		if ($product_static->id > 0) {
 			print '<br>';
 			$s = '2. '.(($facture_static_det->product_type == 1) ? $langs->trans("ThisService") : $langs->trans("ThisProduct")).': ';
diff --git a/htdocs/accountancy/expensereport/index.php b/htdocs/accountancy/expensereport/index.php
index 0929c9c9e24..339ffe68b96 100644
--- a/htdocs/accountancy/expensereport/index.php
+++ b/htdocs/accountancy/expensereport/index.php
@@ -58,6 +58,8 @@ $year_current = $year_start;
 // Validate History
 $action = GETPOST('action', 'aZ09');
 
+$chartaccountcode = dol_getIdFromCode($db, $conf->global->CHARTOFACCOUNTS, 'accounting_system', 'rowid', 'pcg_version');
+
 // Security check
 if (!isModEnabled('accounting')) {
 	accessforbidden();
@@ -65,7 +67,7 @@ if (!isModEnabled('accounting')) {
 if ($user->socid > 0) {
 	accessforbidden();
 }
-if (empty($user->rights->accounting->mouvements->lire)) {
+if (!$user->hasRight('accounting', 'mouvements', 'lire')) {
 	accessforbidden();
 }
 
@@ -74,7 +76,7 @@ if (empty($user->rights->accounting->mouvements->lire)) {
  * Actions
  */
 
-if (($action == 'clean' || $action == 'validatehistory') && $user->rights->accounting->bind->write) {
+if (($action == 'clean' || $action == 'validatehistory') && $user->hasRight('accounting', 'bind', 'write')) {
 	// Clean database
 	$db->begin();
 	$sql1 = "UPDATE ".MAIN_DB_PREFIX."expensereport_det as erd";
@@ -110,8 +112,7 @@ if ($action == 'validatehistory') {
 	$sql1 = "SELECT erd.rowid, accnt.rowid as suggestedid";
 	$sql1 .= " FROM ".MAIN_DB_PREFIX."expensereport_det as erd";
 	$sql1 .= " LEFT JOIN ".MAIN_DB_PREFIX."c_type_fees as t ON erd.fk_c_type_fees = t.id";
-	$sql1 .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as accnt ON t.accountancy_code = accnt.account_number AND accnt.active = 1 AND accnt.entity =".((int) $conf->entity);
-	$sql1 .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_system as syst ON accnt.fk_pcg_version = syst.pcg_version AND syst.rowid = ".((int) $conf->global->CHARTOFACCOUNTS).' AND syst.active = 1,';
+	$sql1 .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as accnt ON t.accountancy_code = accnt.account_number AND accnt.active = 1 AND accnt.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND accnt.entity =".((int) $conf->entity);
 	$sql1 .= " ".MAIN_DB_PREFIX."expensereport as er";
 	$sql1 .= " WHERE erd.fk_expensereport = er.rowid AND er.entity = ".((int) $conf->entity);
 	$sql1 .= " AND er.fk_statut IN (".ExpenseReport::STATUS_APPROVED.", ".ExpenseReport::STATUS_CLOSED.") AND erd.fk_code_ventilation <= 0";
@@ -182,6 +183,7 @@ llxHeader('', $langs->trans("ExpenseReportsVentilation"));
 $textprevyear = '<a href="'.$_SERVER["PHP_SELF"].'?year='.($year_current - 1).'">'.img_previous().'</a>';
 $textnextyear = '&nbsp;<a href="'.$_SERVER["PHP_SELF"].'?year='.($year_current + 1).'">'.img_next().'</a>';
 
+
 print load_fiche_titre($langs->trans("ExpenseReportsVentilation")."&nbsp;".$textprevyear."&nbsp;".$langs->trans("Year")."&nbsp;".$year_start."&nbsp;".$textnextyear, '', 'title_accountancy');
 
 print '<span class="opacitymedium">'.$langs->trans("DescVentilExpenseReport").'</span><br>';
@@ -253,7 +255,7 @@ $sql .= " AND aa.account_number IS NULL";
 $sql .= " GROUP BY erd.fk_code_ventilation,aa.account_number,aa.label";
 $sql .= ' ORDER BY aa.account_number';
 
-dol_syslog('/accountancy/expensereport/index.php:: sql='.$sql);
+dol_syslog('/accountancy/expensereport/index.php', LOG_DEBUG);
 $resql = $db->query($sql);
 if ($resql) {
 	$num = $db->num_rows($resql);
diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php
index 25b86a8d527..1cf9149024a 100644
--- a/htdocs/accountancy/expensereport/list.php
+++ b/htdocs/accountancy/expensereport/list.php
@@ -40,10 +40,9 @@ $langs->loadLangs(array("bills", "companies", "compta", "accountancy", "other",
 
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
-$show_files = GETPOST('show_files', 'int');
 $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
-$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'expensereportlist'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'accountancyexpensereportlist'; // To manage different context of search
 $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 
 
@@ -419,8 +418,8 @@ if ($result) {
 	print_liste_field_titre("Description", $_SERVER["PHP_SELF"], "erd.comments", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "erd.total_ht", "", $param, '', $sortfield, $sortorder, 'right maxwidth50 ');
 	print_liste_field_titre("VATRate", $_SERVER["PHP_SELF"], "erd.tva_tx", "", $param, '', $sortfield, $sortorder, 'right ');
-	print_liste_field_titre("AccountAccountingSuggest", '', '', '', '', '', '', '', 'nowraponall ');
-	print_liste_field_titre("IntoAccount", '', '', '', '', '', '', '', '');
+	print_liste_field_titre("DataUsedToSuggestAccount", '', '', '', '', '', '', '', 'nowraponall ');
+	print_liste_field_titre("AccountAccountingSuggest", '', '', '', '', '', '', '', '');
 	$checkpicto = '';
 	if ($massactionbutton) {
 		$checkpicto = $form->showCheckAddButtons('checkforselect', 1);
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index 3b8e93cb54b..aae34a51e03 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -44,10 +44,11 @@ $langs->loadLangs(array("bills", "companies", "compta", "accountancy", "other",
 
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
-$show_files = GETPOST('show_files', 'int');
 $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'accountancysupplierlist'; // To manage different context of search
 $optioncss = GETPOST('optioncss', 'alpha');
+
 $default_account = GETPOST('default_account', 'int');
 
 // Select Box
@@ -75,8 +76,6 @@ $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_en
 $search_country = GETPOST('search_country', 'alpha');
 $search_tvaintra = GETPOST('search_tvaintra', 'alpha');
 
-$btn_ventil = GETPOST('ventil', 'alpha');
-
 // 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);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
@@ -112,7 +111,7 @@ if (!isModEnabled('accounting')) {
 if ($user->socid > 0) {
 	accessforbidden();
 }
-if (empty($user->rights->accounting->mouvements->lire)) {
+if (!$user->hasRight('accounting', 'mouvements', 'lire')) {
 	accessforbidden();
 }
 
@@ -532,8 +531,8 @@ if ($result) {
 	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);
-	print_liste_field_titre("AccountAccountingSuggest", '', '', '', '', '', '', '', 'nowraponall ');
-	print_liste_field_titre("IntoAccount", '', '', '', '', '', '', '', 'center ');
+	print_liste_field_titre("DataUsedToSuggestAccount", '', '', '', '', '', '', '', 'nowraponall ');
+	print_liste_field_titre("AccountAccountingSuggest", '', '', '', '', '', '', '', 'center ');
 	$checkpicto = '';
 	if ($massactionbutton) {
 		$checkpicto = $form->showCheckAddButtons('checkforselect', 1);
@@ -712,14 +711,19 @@ if ($result) {
 		// Found accounts
 		print '<td class="small">';
 		$s = '1. '.(($facturefourn_static_det->product_type == 1) ? $langs->trans("DefaultForService") : $langs->trans("DefaultForProduct")).': ';
-		$shelp = '';
+		$shelp = ''; $ttype = 'help';
 		if ($suggestedaccountingaccountbydefaultfor == 'eec') {
 			$shelp .= $langs->trans("SaleEEC");
+		} elseif ($suggestedaccountingaccountbydefaultfor == 'eecwithvat') {
+			$shelp = $langs->trans("SaleEECWithVAT");
+		} elseif ($suggestedaccountingaccountbydefaultfor == 'eecwithoutvatnumber') {
+			$shelp = $langs->trans("SaleEECWithoutVATNumber");
+			$ttype = 'warning';
 		} elseif ($suggestedaccountingaccountbydefaultfor == 'export') {
 			$shelp .= $langs->trans("SaleExport");
 		}
 		$s .= ($code_buy_l > 0 ? length_accountg($code_buy_l) : '<span style="'.$code_buy_p_notset.'">'.$langs->trans("NotDefined").'</span>');
-		print $form->textwithpicto($s, $shelp, 1, 'help', '', 0, 2, '', 1);
+		print $form->textwithpicto($s, $shelp, 1, $ttype, '', 0, 2, '', 1);
 		if ($product_static->id > 0) {
 			print '<br>';
 			$s = '2. '.(($facturefourn_static_det->product_type == 1) ? $langs->trans("ThisService") : $langs->trans("ThisProduct")).': ';
diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index f72682ce22a..f57bb2e312d 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -313,10 +313,6 @@ if (empty($reshook)) {
 					$object->socialnetworks[$key] = trim(GETPOST($key, 'alphanohtml'));
 				}
 			}
-			//$object->skype = trim(GETPOST("skype", 'alpha'));
-			//$object->twitter = trim(GETPOST("twitter", 'alpha'));
-			//$object->facebook = trim(GETPOST("facebook", 'alpha'));
-			//$object->linkedin = trim(GETPOST("linkedin", 'alpha'));
 			$object->birth = $birthdate;
 			$object->default_lang = GETPOST('default_lang', 'alpha');
 			$object->typeid = GETPOST("typeid", 'int');
@@ -488,11 +484,6 @@ if (empty($reshook)) {
 			}
 		}
 
-		// $object->skype       = $skype;
-		// $object->twitter     = $twitter;
-		// $object->facebook    = $facebook;
-		// $object->linkedin    = $linkedin;
-
 		$object->email       = $email;
 		$object->url       	 = $url;
 		$object->login       = $login;
diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index f5a5a8933d0..4a3db45ba03 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -639,7 +639,7 @@ class AdherentType extends CommonObject
 			$sql .= ' AND ('.$excludefilter.')';
 		}
 
-		dol_syslog(get_class($this)."::listUsersForGroup", LOG_DEBUG);
+		dol_syslog(get_class($this)."::listMembersForMemberType", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			while ($obj = $this->db->fetch_object($resql)) {
diff --git a/htdocs/adherents/class/adherentstats.class.php b/htdocs/adherents/class/adherentstats.class.php
index 72db71d07bd..ed2fa05cf51 100644
--- a/htdocs/adherents/class/adherentstats.class.php
+++ b/htdocs/adherents/class/adherentstats.class.php
@@ -171,4 +171,82 @@ class AdherentStats extends Stats
 
 		return $this->_getAllByYear($sql);
 	}
+
+
+
+	/**
+	 *	Return count of member by status group by adh type, total and average
+	 *
+	 * 	@param		int	$numberYears    Years to scan
+	 * 	@return		array 	Array with total of draft, pending, uptodate, expired, resiliated for each member tag
+	 */
+	public function countMembersByTagAndStatus($numberYears = 2)
+	{
+		global $user;
+
+		$now = dol_now();
+		$endYear = date('Y');
+		$startYear = $endYear - $numberYears;
+
+		$sql = "SELECT c.rowid as fk_categorie, c.label as label";
+		$sql .= ", COUNT(".$this->db->ifsql("d.statut = ".Adherent::STATUS_DRAFT, "'members_draft'", 'NULL').") as members_draft";
+		$sql .= ", COUNT(".$this->db->ifsql("d.statut = ".Adherent::STATUS_VALIDATED."  AND (d.datefin IS NULL AND t.subscription = '1')", "'members_pending'", 'NULL').") as members_pending";
+		$sql .= ", COUNT(".$this->db->ifsql("d.statut = ".Adherent::STATUS_VALIDATED."  AND (d.datefin >= '".$this->db->idate($now)."' OR t.subscription = 0)", "'members_uptodate'", 'NULL').") as members_uptodate";
+		$sql .= ", COUNT(".$this->db->ifsql("d.statut = ".Adherent::STATUS_VALIDATED."  AND (d.datefin < '".$this->db->idate($now)."' AND t.subscription = 1)", "'members_expired'", 'NULL').") as members_expired";
+		$sql .= ", COUNT(".$this->db->ifsql("d.statut = ".Adherent::STATUS_EXCLUDED, "'members_excluded'", 'NULL').") as members_excluded";
+		$sql .= ", COUNT(".$this->db->ifsql("d.statut = ".Adherent::STATUS_RESILIATED, "'members_resiliated'", 'NULL').") as members_resiliated";
+		$sql .= " FROM ".MAIN_DB_PREFIX."categorie as c";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_member as ct ON c.rowid = ct.fk_categorie";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."adherent as d ON d.rowid = ct.fk_member";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."adherent_type as t ON t.rowid = d.fk_adherent_type";
+		$sql .= " WHERE c.entity IN (".getEntity('member_type').")";
+		$sql .= " AND d.entity IN (" . getEntity('adherent') . ")";
+		$sql .= " AND t.entity IN (" . getEntity('adherent') . ")";
+		$sql .= " AND d.datefin > '".$this->db->idate(dol_get_first_day($startYear))."'";
+		$sql .= " AND c.fk_parent = 0";
+		$sql .= " GROUP BY c.rowid";
+
+		dol_syslog("box_members_by_type::select nb of members per type", LOG_DEBUG);
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$i = 0;
+			$MembersCountArray = [];
+			$totalstatus = array(
+				'label' => 'Total',
+				'members_draft' => 0,
+				'members_pending' => 0,
+				'members_uptodate' => 0,
+				'members_expired' => 0,
+				'members_excluded' => 0,
+				'members_resiliated' => 0
+			);
+			while ($i < $num) {
+				$objp = $this->db->fetch_object($result);
+				$MembersCountArray[$objp->fk_categorie] = array(
+					'label' => $objp->label,
+					'members_draft' => (int) $objp->members_draft,
+					'members_pending' => (int) $objp->members_pending,
+					'members_uptodate' => (int) $objp->members_uptodate,
+					'members_expired' => (int) $objp->members_expired,
+					'members_excluded' => (int) $objp->members_excluded,
+					'members_resiliated' => (int) $objp->members_resiliated
+				);
+				$totalrow = 0;
+				foreach ($MembersCountArray[$objp->fk_categorie] as $key=>$nb) {
+					if ($key!='label') {
+						$totalrow += $nb;
+						$totalstatus[$key] += $nb;
+					}
+				}
+				$MembersCountArray[$objp->fk_categorie]['total_adhtype'] = $totalrow;
+				$i++;
+			}
+			$this->db->free($result);
+			$MembersCountArray['total'] = $totalstatus;
+			$MembersCountArray['total']['all'] = array_sum($totalstatus);
+		}
+		return $MembersCountArray;
+	}
 }
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index d06d91cbea6..2e04aba9167 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -30,9 +30,9 @@
 
 // Load Dolibarr environment
 require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
 
@@ -41,47 +41,51 @@ $langs->loadLangs(array("members", "companies"));
 
 
 // Get parameters
-$action = GETPOST('action', 'aZ09');
+$action 	= GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 $show_files = GETPOST('show_files', 'int');
-$confirm = GETPOST('confirm', 'alpha');
-$toselect = GETPOST('toselect', 'array');
+$confirm 	= GETPOST('confirm', 'alpha');
+$cancel     = GETPOST('cancel', 'alpha');
+$toselect 	= GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'memberslist'; // To manage different context of search
-$mode        = GETPOST('mode', 'alpha');
-
+$backtopage = GETPOST('backtopage', 'alpha');
+$optioncss 	= GETPOST('optioncss', 'aZ');
+$mode 		= GETPOST('mode', 'alpha');
 
 // Search fields
-$search = GETPOST("search", 'alpha');
-$search_ref = GETPOST("search_ref", 'alpha');
-$search_lastname = GETPOST("search_lastname", 'alpha');
-$search_firstname = GETPOST("search_firstname", 'alpha');
-$search_gender = GETPOST("search_gender", 'alpha');
-$search_civility = GETPOST("search_civility", 'alpha');
-$search_company = GETPOST('search_company', 'alphanohtml');
-$search_login = GETPOST("search_login", 'alpha');
-$search_address = GETPOST("search_address", 'alpha');
-$search_zip = GETPOST("search_zip", 'alpha');
-$search_town = GETPOST("search_town", 'alpha');
-$search_state = GETPOST("search_state", 'alpha');
-$search_country = GETPOST("search_country", 'alpha');
-$search_phone = GETPOST("search_phone", 'alpha');
+$search 			= GETPOST("search", 'alpha');
+$search_ref 		= GETPOST("search_ref", 'alpha');
+$search_lastname 	= GETPOST("search_lastname", 'alpha');
+$search_firstname 	= GETPOST("search_firstname", 'alpha');
+$search_gender 		= GETPOST("search_gender", 'alpha');
+$search_civility 	= GETPOST("search_civility", 'alpha');
+$search_company 	= GETPOST('search_company', 'alphanohtml');
+$search_login 		= GETPOST("search_login", 'alpha');
+$search_address 	= GETPOST("search_address", 'alpha');
+$search_zip 		= GETPOST("search_zip", 'alpha');
+$search_town 		= GETPOST("search_town", 'alpha');
+$search_state 		= GETPOST("search_state", 'alpha');  // county / departement / federal state
+$search_country 	= GETPOST("search_country", 'alpha');
+$search_phone 		= GETPOST("search_phone", 'alpha');
 $search_phone_perso = GETPOST("search_phone_perso", 'alpha');
 $search_phone_mobile = GETPOST("search_phone_mobile", 'alpha');
-$search_type = GETPOST("search_type", 'alpha');
-$search_email = GETPOST("search_email", 'alpha');
-$search_categ = GETPOST("search_categ", 'int');
-$search_filter = GETPOST("search_filter", 'alpha');
-$search_status = GETPOST("search_status", 'intcomma');
-$search_morphy = GETPOST("search_morphy", 'alpha');
+$search_type 		= GETPOST("search_type", 'alpha');
+$search_email 		= GETPOST("search_email", 'alpha');
+$search_categ 		= GETPOST("search_categ", 'int');
+$search_morphy 		= GETPOST("search_morphy", 'alpha');
 $search_import_key  = trim(GETPOST("search_import_key", 'alpha'));
-$catid        = GETPOST("catid", 'int');
-$optioncss = GETPOST('optioncss', 'alpha');
-$socid = GETPOST('socid', 'int');
+
+$catid 		= GETPOST("catid", 'int');
+$socid 		= GETPOST('socid', 'int');
+
+$search_filter 		= GETPOST("search_filter", 'alpha');
+$search_status 		= GETPOST("search_status", 'intcomma');  // statut
 
 $filter = GETPOST("filter", 'alpha');
 if ($filter) {
 	$search_filter = $filter; // For backward compatibility
 }
+
 $statut = GETPOST("statut", 'alpha');
 if ($statut != '') {
 	$search_status = $statut; // For backward compatibility
@@ -93,6 +97,7 @@ if ($search_status < -2) {
 	$search_status = '';
 }
 
+// Pagination parameters
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index 79c42f6e2db..b366ea928ef 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -117,7 +117,7 @@ if ($action == 'updateMask') {
 } elseif ($action == 'del') {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0) {
-		if ($conf->global->COMMANDE_ADDON_PDF == "$value") {
+		if (getDolGlobalString('COMMANDE_ADDON_PDF') == $value) {
 			dolibarr_del_const($db, 'COMMANDE_ADDON_PDF', $conf->entity);
 		}
 	}
@@ -461,7 +461,7 @@ foreach ($dirmodels as $reldir) {
 
 								// Default
 								print '<td class="center">';
-								if ($conf->global->COMMANDE_ADDON_PDF == $name) {
+								if (getDolGlobalString('COMMANDE_ADDON_PDF') == $name) {
 									print img_picto($langs->trans("Default"), 'on');
 								} else {
 									print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setdoc&token='.newToken().'&value='.urlencode($name).'&scan_dir='.urlencode($module->scandir).'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index d6760ef45e8..7b2708e1906 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -195,7 +195,7 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 	dolibarr_set_const($db, "MAIN_INFO_PROFID6", GETPOST("MAIN_INFO_PROFID6", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 
 	dolibarr_set_const($db, "MAIN_INFO_TVAINTRA", GETPOST("tva", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_OBJECT", GETPOST("object", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_OBJECT", GETPOST("socialobject", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 
 	dolibarr_set_const($db, "SOCIETE_FISCAL_MONTH_START", GETPOST("SOCIETE_FISCAL_MONTH_START", 'int'), 'chaine', 0, '', $conf->entity);
 
@@ -676,8 +676,8 @@ print '<input name="tva" id="intra_vat" class="minwidth200" value="'.dol_escape_
 print '</td></tr>';
 
 // Object of the company
-print '<tr class="oddeven"><td><label for="object">'.$langs->trans("CompanyObject").'</label></td><td>';
-print '<textarea class="flat quatrevingtpercent" name="object" id="object" rows="'.ROWS_5.'">'.(!empty($conf->global->MAIN_INFO_SOCIETE_OBJECT) ? $conf->global->MAIN_INFO_SOCIETE_OBJECT : '').'</textarea></td></tr>';
+print '<tr class="oddeven"><td><label for="socialobject">'.$langs->trans("CompanyObject").'</label></td><td>';
+print '<textarea class="flat quatrevingtpercent" name="socialobject" id="socialobject" rows="'.ROWS_5.'">'.(!empty($conf->global->MAIN_INFO_SOCIETE_OBJECT) ? $conf->global->MAIN_INFO_SOCIETE_OBJECT : '').'</textarea></td></tr>';
 print '</td></tr>';
 
 print '</table>';
diff --git a/htdocs/admin/company_socialnetworks.php b/htdocs/admin/company_socialnetworks.php
index e9171431187..fb496c1dce1 100644
--- a/htdocs/admin/company_socialnetworks.php
+++ b/htdocs/admin/company_socialnetworks.php
@@ -84,6 +84,8 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))) {
  * View
  */
 
+$form = new Form($db);
+
 $wikihelp = 'EN:First_setup|FR:Premiers_paramétrages|ES:Primeras_configuraciones';
 llxHeader('', $langs->trans("Setup"), $wikihelp);
 
diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php
index b3d6e045470..034997b1716 100644
--- a/htdocs/admin/emailcollector_card.php
+++ b/htdocs/admin/emailcollector_card.php
@@ -387,7 +387,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$morehtmlref = '<div class="refidno">';
 	$morehtmlref .= '</div>';
 
-	$morehtml = $langs->trans("NbOfEmailsInInbox").' : ';
+	$morehtml = '';
 
 	$sourcedir = $object->source_directory;
 	$targetdir = ($object->target_directory ? $object->target_directory : ''); // Can be '[Gmail]/Trash' or 'mytag'
@@ -404,6 +404,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$connectstringserver = $object->getConnectStringIMAP($usessl);
 
 		if ($action == 'scan') {
+			$nbemail = '';
 			if (!empty($conf->global->MAIN_IMAP_USE_PHPIMAP)) {
 				if ($object->acces_type == 1) {
 					// Mode OAUth2 with PHP-IMAP
@@ -493,7 +494,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 				$f = $client->getFolders(false, $object->source_directory);
 				$nbemail = $f[0]->examine()["exists"];
-				$morehtml .= $nbemail;
 			} else {
 				try {
 					if ($sourcedir) {
@@ -525,15 +525,15 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 				}
 
 				if (!$connection) {
-					$morehtml .= 'Failed to open IMAP connection '.$connectstringsource;
+					$nbemail .= 'Failed to open IMAP connection '.$connectstringsource;
 					if (function_exists('imap_last_error')) {
-						$morehtml .= '<br>'.imap_last_error();
+						$nbemail .= '<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);
+					$nbemail .= imap_num_msg($connection);
 				}
 
 				if ($connection) {
@@ -541,12 +541,15 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 					imap_close($connection);
 				}
 			}
-		} else {
-			$morehtml .= '<a class="flat" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=scan&token='.newToken().'">'.img_picto('', 'refresh', 'class="paddingrightonly"').$langs->trans("Refresh").'</a>';
 		}
 
-		$morehtml .= $form->textwithpicto('', 'connect string '.$connectstringserver);
+		$morehtml .= $form->textwithpicto($langs->trans("NbOfEmailsInInbox"), 'connect string '.$connectstringserver).': ';
+
+		$morehtml .= ($nbemail != '' ? $nbemail : '?');
+
+		$morehtml .= ' &nbsp; <a class="flat paddingleft marginleftonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=scan&token='.newToken().'">'.img_picto('', 'refresh', 'class="paddingrightonly"').$langs->trans("Refresh").'</a>';
 	} else {
+		$morehtml .= $langs->trans("NbOfEmailsInInbox").': ';
 		$morehtml .= 'IMAP functions not available on your PHP. ';
 	}
 
diff --git a/htdocs/admin/emailcollector_list.php b/htdocs/admin/emailcollector_list.php
index 3be38cca113..fb09143412f 100644
--- a/htdocs/admin/emailcollector_list.php
+++ b/htdocs/admin/emailcollector_list.php
@@ -601,13 +601,17 @@ while ($i < $imaxinloop) {
 			//if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
 
 			if (!empty($arrayfields['t.'.$key]['checked'])) {
-				print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '');
+				print '<td'.($cssforfield ? ' class="'.$cssforfield.(preg_match('/tdoverflow/', $cssforfield) ? ' classfortooltip' : '').'"' : '');
 				if (preg_match('/tdoverflow/', $cssforfield)) {
 					print ' title="'.dol_escape_htmltag($object->$key).'"';
 				}
 				print '>';
 				if ($key == 'status') {
 					print $object->getLibStatut(5);
+				} elseif ($key == 'lastresult') {
+					print '<div class="twolinesmax">';
+					print $object->showOutputField($val, $key, $object->$key, '');
+					print '</div>';
 				} elseif ($key == 'rowid') {
 					print $object->showOutputField($val, $key, $object->id, '');
 				} else {
diff --git a/htdocs/admin/mails_senderprofile_list.php b/htdocs/admin/mails_senderprofile_list.php
index 95f57d5dfc5..a73b899dd00 100644
--- a/htdocs/admin/mails_senderprofile_list.php
+++ b/htdocs/admin/mails_senderprofile_list.php
@@ -416,7 +416,7 @@ if ($action != 'create') {
 	print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input type="text" name="label" class="width300" value="'.GETPOST('label', 'alphanohtml').'" autofocus></td></tr>';
 	print '<tr><td class="fieldrequired">'.$langs->trans("Email").'</td><td>';
 	print img_picto('', 'email', 'class="pictofixedwidth"');
-	print '<input type="text" name="email" value="'.GETPOST('email', 'alphanohtml').'"></td></tr>';
+	print '<input type="text" name="email" class="width300" 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%');
diff --git a/htdocs/api/class/api_access.class.php b/htdocs/api/class/api_access.class.php
index e5cc664fa0e..541682101c6 100644
--- a/htdocs/api/class/api_access.class.php
+++ b/htdocs/api/class/api_access.class.php
@@ -144,6 +144,7 @@ class DolibarrApiAccess implements iAuthenticate
 				throw new RestException(503, 'Error when searching login user from api key');
 			}
 
+
 			$genericmessageerroruser = 'Error user not valid (not found or bad status or bad validity dates) (conf->entity='.$conf->entity.')';
 
 			$fuser = new User($this->db);
@@ -151,21 +152,27 @@ class DolibarrApiAccess implements iAuthenticate
 			if ($result <= 0) {
 				throw new RestException(503, $genericmessageerroruser);
 			}
-			if ($fuser->statut == 0) {
-				throw new RestException(503, 'Error when fetching user. This user has been locked or disabled');
-			}
 
-			$now = dol_now();
-
-			// Check date start validity
-			if ($fuser->datestartvalidity && $this->db->jdate($fuser->datestartvalidity) > $now) {
-				throw new RestException(503, $genericmessageerroruser);
-			}
-			// Check date end validity
-			if ($fuser->dateendvalidity && $this->db->jdate($fuser->dateendvalidity) < dol_get_first_hour($now)) {
+			// Check if user status is enabled
+			if ($fuser->statut != $fuser::STATUS_ENABLED) {
+				// Status is disabled
+				dol_syslog("The user has been disabled");
 				throw new RestException(503, $genericmessageerroruser);
 			}
 
+			// Check if session was unvalidated by a password change
+			if (($fuser->flagdelsessionsbefore && !empty($_SESSION["dol_logindate"]) && $fuser->flagdelsessionsbefore > $_SESSION["dol_logindate"])) {
+				// Session is no more valid
+				dol_syslog("The user has a date for session invalidation = ".$fuser->flagdelsessionsbefore." and a session date = ".$_SESSION["dol_logindate"].". We must invalidate its sessions.");
+				throw new RestException(503, $genericmessageerroruser);
+			}
+
+			// Check date validity
+			if ($fuser->isNotIntoValidityDateRange()) {
+				// User validity dates are no more valid
+				dol_syslog("The user login has a validity between [".$fuser->datestartvalidity." and ".$fuser->dateendvalidity."], curren date is ".dol_now());
+				throw new RestException(503, $genericmessageerroruser);
+			}
 
 			// User seems valid
 			$fuser->getrights();
diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php
index c79a3e63653..17649370ae0 100644
--- a/htdocs/api/class/api_setup.class.php
+++ b/htdocs/api/class/api_setup.class.php
@@ -1762,11 +1762,6 @@ class Setup extends DolibarrApi
 				throw new RestException(403, 'Error API open to admin users only or to the users with logins defined into constant API_LOGINS_ALLOWED_FOR_GET_COMPANY');
 		}
 
-		unset($mysoc->skype);
-		unset($mysoc->twitter);
-		unset($mysoc->facebook);
-		unset($mysoc->linkedin);
-
 		unset($mysoc->pays);
 		unset($mysoc->note);
 		unset($mysoc->nom);
diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index fbced8e6773..3901e18bac4 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2017-2020  Laurent Destailleur     <eldy@users.sourceforge.net>
+/* Copyright (C) 2017-2023  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
@@ -275,302 +275,303 @@ if (empty($reshook)) {
 			$object->calculateCosts();
 		}
 	}
+}
 
 
+/*
+ * View
+ */
 
-	/*
-	* View
-	*/
-
-	$form = new Form($db);
-	$formfile = new FormFile($db);
+$form = new Form($db);
+$formfile = new FormFile($db);
 
 
-	$title = $langs->trans('BOM');
-	$help_url ='EN:Module_BOM';
-	llxHeader('', $title, $help_url);
+$title = $langs->trans('BOM');
+$help_url ='EN:Module_BOM';
+llxHeader('', $title, $help_url);
 
-	// Part to create
-	if ($action == 'create') {
-		print load_fiche_titre($langs->trans("NewBOM"), '', 'bom');
+// Part to create
+if ($action == 'create') {
+	print load_fiche_titre($langs->trans("NewBOM"), '', 'bom');
 
-		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="backtopage" value="'.$backtopage.'">';
+	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="backtopage" value="'.$backtopage.'">';
 
-		print dol_get_fiche_head(array(), '');
+	print dol_get_fiche_head(array(), '');
 
-		print '<table class="border centpercent tableforfieldcreate">'."\n";
+	print '<table class="border centpercent tableforfieldcreate">'."\n";
 
-		// Common attributes
-		include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_add.tpl.php';
+	// Common attributes
+	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_add.tpl.php';
 
-		// Other attributes
-		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
+	// Other attributes
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
 
-		print '</table>'."\n";
+	print '</table>'."\n";
 
-		print dol_get_fiche_end();
+	print dol_get_fiche_end();
 
-		print $form->buttonsSaveCancel("Create");
+	print $form->buttonsSaveCancel("Create");
 
-		print '</form>';
+	print '</form>';
+}
+
+// Part to edit record
+if (($id || $ref) && $action == 'edit') {
+	print load_fiche_titre($langs->trans("BillOfMaterials"), '', 'cubes');
+
+	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="backtopage" value="'.$backtopage.'">';
+	print '<input type="hidden" name="id" value="'.$object->id.'">';
+
+	print dol_get_fiche_head();
+
+	//$object->fields['keyfield']['disabled'] = 1;
+
+	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 $form->buttonsSaveCancel("Create");
+
+	print '</form>';
+}
+
+// Part to show record
+if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {
+	$head = bomPrepareHead($object);
+	print dol_get_fiche_head($head, 'card', $langs->trans("BillOfMaterials"), -1, 'bom');
+
+	$formconfirm = '';
+
+	// Confirmation to delete
+	if ($action == 'delete') {
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteBillOfMaterials'), $langs->trans('ConfirmDeleteBillOfMaterials'), '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);
 	}
 
-	// Part to edit record
-	if (($id || $ref) && $action == 'edit') {
-		print load_fiche_titre($langs->trans("BillOfMaterials"), '', 'cubes');
-
-		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="backtopage" value="'.$backtopage.'">';
-		print '<input type="hidden" name="id" value="'.$object->id.'">';
-
-		print dol_get_fiche_head();
-
-		//$object->fields['keyfield']['disabled'] = 1;
-
-		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 $form->buttonsSaveCancel("Create");
-
-		print '</form>';
-	}
-
-	// Part to show record
-	if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {
-		$head = bomPrepareHead($object);
-		print dol_get_fiche_head($head, 'card', $langs->trans("BillOfMaterials"), -1, 'bom');
-
-		$formconfirm = '';
-
-		// Confirmation to delete
-		if ($action == 'delete') {
-			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeleteBillOfMaterials'), $langs->trans('ConfirmDeleteBillOfMaterials'), '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);
-		}
-
-		// Confirmation of validation
-		if ($action == 'validate') {
-			// We check that object has a temporary ref
-			$ref = substr($object->ref, 1, 4);
-			if ($ref == 'PROV') {
-				$object->fetch_product();
-				$numref = $object->getNextNumRef($object->product);
-			} else {
-				$numref = $object->ref;
-			}
-
-			$text = $langs->trans('ConfirmValidateBom', $numref);
-			/*if (isModEnabled('notification'))
-			{
-			require_once DOL_DOCUMENT_ROOT . '/core/class/notify.class.php';
-			$notify = new Notify($db);
-			$text .= '<br>';
-			$text .= $notify->confirmMessage('BOM_VALIDATE', $object->socid, $object);
-			}*/
-
-			$formquestion = array();
-			if (isModEnabled('bom')) {
-				$langs->load("mrp");
-				$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),
-				);
-			}
-
-			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('Validate'), $text, 'confirm_validate', $formquestion, 0, 1, 220);
-		}
-
-		// Confirmation of closing
-		if ($action == 'close') {
-			$text = $langs->trans('ConfirmCloseBom', $object->ref);
-			/*if (isModEnabled('notification'))
-			{
-			require_once DOL_DOCUMENT_ROOT . '/core/class/notify.class.php';
-			$notify = new Notify($db);
-			$text .= '<br>';
-			$text .= $notify->confirmMessage('BOM_CLOSE', $object->socid, $object);
-			}*/
-
-			$formquestion = array();
-			if (isModEnabled('bom')) {
-				$langs->load("mrp");
-				$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),
-				);
-			}
-
-			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('Close'), $text, 'confirm_close', $formquestion, 0, 1, 220);
-		}
-
-		// Confirmation of reopen
-		if ($action == 'reopen') {
-			$text = $langs->trans('ConfirmReopenBom', $object->ref);
-			/*if (isModEnabled('notification'))
-			 {
-			 require_once DOL_DOCUMENT_ROOT . '/core/class/notify.class.php';
-			 $notify = new Notify($db);
-			 $text .= '<br>';
-			 $text .= $notify->confirmMessage('BOM_CLOSE', $object->socid, $object);
-			 }*/
-
-			$formquestion = array();
-			if (isModEnabled('bom')) {
-				$langs->load("mrp");
-				require_once DOL_DOCUMENT_ROOT . '/product/class/html.formproduct.class.php';
-				$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),
-				);
-			}
-
-			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('ReOpen'), $text, 'confirm_reopen', $formquestion, 0, 1, 220);
-		}
-
-		// Clone confirmation
-		if ($action == 'clone') {
-			// Create an array for form
-			$formquestion = array();
-			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneBillOfMaterials', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
-		}
-
-		// Confirmation of action xxxx
-		if ($action == 'setdraft') {
-			$text = $langs->trans('ConfirmSetToDraft', $object->ref);
-
-			$formquestion = array();
-			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('SetToDraft'), $text, 'confirm_setdraft', $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
-		if (empty($reshook)) {
-			$formconfirm .= $hookmanager->resPrint;
-		} elseif ($reshook > 0) {
-			$formconfirm = $hookmanager->resPrint;
-		}
-
-		// Print form confirm
-		print $formconfirm;
-
-
-		// Object card
-		// ------------------------------------------------------------
-		$linkback = '<a href="' . DOL_URL_ROOT . '/bom/bom_list.php?restore_lastsearch_values=1' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
-
-		$morehtmlref = '<div class="refidno">';
-		/*
-		// Ref bis
-		$morehtmlref.=$form->editfieldkey("RefBis", 'ref_client', $object->ref_client, $object, $user->rights->bom->creer, 'string', '', 0, 1);
-		$morehtmlref.=$form->editfieldval("RefBis", 'ref_client', $object->ref_client, $object, $user->rights->bom->creer, 'string', '', null, null, '', 1);
-		// Thirdparty
-		$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $soc->getNomUrl(1);
-		// Project
-		if (isModEnabled('project'))
-		{
-		$langs->load("projects");
-		$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
-		if ($permissiontoadd)
-		{
-			if ($action != 'classify')
-				$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&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', 0, 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);
-			}
+	// Confirmation of validation
+	if ($action == 'validate') {
+		// We check that object has a temporary ref
+		$ref = substr($object->ref, 1, 4);
+		if ($ref == 'PROV') {
+			$object->fetch_product();
+			$numref = $object->getNextNumRef($object->product);
 		} else {
-			if (! empty($object->fk_project)) {
-				$proj = new Project($db);
-				$proj->fetch($object->fk_project);
-				$morehtmlref.=$proj->getNomUrl();
-			} else {
-				$morehtmlref.='';
+			$numref = $object->ref;
+		}
+
+		$text = $langs->trans('ConfirmValidateBom', $numref);
+		/*if (isModEnabled('notification'))
+		 {
+		 require_once DOL_DOCUMENT_ROOT . '/core/class/notify.class.php';
+		 $notify = new Notify($db);
+		 $text .= '<br>';
+		 $text .= $notify->confirmMessage('BOM_VALIDATE', $object->socid, $object);
+		 }*/
+
+		$formquestion = array();
+		if (isModEnabled('bom')) {
+			$langs->load("mrp");
+			$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),
+			);
 		}
+
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('Validate'), $text, 'confirm_validate', $formquestion, 0, 1, 220);
+	}
+
+	// Confirmation of closing
+	if ($action == 'close') {
+		$text = $langs->trans('ConfirmCloseBom', $object->ref);
+		/*if (isModEnabled('notification'))
+		 {
+		 require_once DOL_DOCUMENT_ROOT . '/core/class/notify.class.php';
+		 $notify = new Notify($db);
+		 $text .= '<br>';
+		 $text .= $notify->confirmMessage('BOM_CLOSE', $object->socid, $object);
+		 }*/
+
+		$formquestion = array();
+		if (isModEnabled('bom')) {
+			$langs->load("mrp");
+			$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),
+			);
 		}
-		*/
-		$morehtmlref .= '</div>';
+
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('Close'), $text, 'confirm_close', $formquestion, 0, 1, 220);
+	}
+
+	// Confirmation of reopen
+	if ($action == 'reopen') {
+		$text = $langs->trans('ConfirmReopenBom', $object->ref);
+		/*if (isModEnabled('notification'))
+		 {
+		 require_once DOL_DOCUMENT_ROOT . '/core/class/notify.class.php';
+		 $notify = new Notify($db);
+		 $text .= '<br>';
+		 $text .= $notify->confirmMessage('BOM_CLOSE', $object->socid, $object);
+		 }*/
+
+		$formquestion = array();
+		if (isModEnabled('bom')) {
+			$langs->load("mrp");
+			require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
+			$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),
+			);
+		}
+
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ReOpen'), $text, 'confirm_reopen', $formquestion, 0, 1, 220);
+	}
+
+	// Clone confirmation
+	if ($action == 'clone') {
+		// Create an array for form
+		$formquestion = array();
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneBillOfMaterials', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
+	}
+
+	// Confirmation of action xxxx
+	if ($action == 'setdraft') {
+		$text = $langs->trans('ConfirmSetToDraft', $object->ref);
+
+		$formquestion = array();
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('SetToDraft'), $text, 'confirm_setdraft', $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
+	if (empty($reshook)) {
+		$formconfirm .= $hookmanager->resPrint;
+	} elseif ($reshook > 0) {
+		$formconfirm = $hookmanager->resPrint;
+	}
+
+	// Print form confirm
+	print $formconfirm;
 
 
-		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+	// Object card
+	// ------------------------------------------------------------
+	$linkback = '<a href="'.DOL_URL_ROOT.'/bom/bom_list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+
+	$morehtmlref = '<div class="refidno">';
+	/*
+	 // Ref bis
+	 $morehtmlref.=$form->editfieldkey("RefBis", 'ref_client', $object->ref_client, $object, $user->rights->bom->creer, 'string', '', 0, 1);
+	 $morehtmlref.=$form->editfieldval("RefBis", 'ref_client', $object->ref_client, $object, $user->rights->bom->creer, 'string', '', null, null, '', 1);
+	 // Thirdparty
+	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $soc->getNomUrl(1);
+	 // Project
+	 if (isModEnabled('project'))
+	 {
+	 $langs->load("projects");
+	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+	 if ($permissiontoadd)
+	 {
+	 if ($action != 'classify')
+	 $morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&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', 0, 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.=$proj->getNomUrl();
+	 } else {
+	 $morehtmlref.='';
+	 }
+	 }
+	 }
+	 */
+	 $morehtmlref .= '</div>';
 
 
-		print '<div class="fichecenter">';
-		print '<div class="fichehalfleft">';
-		print '<div class="underbanner clearboth"></div>';
-		print '<table class="border centpercent tableforfield">' . "\n";
+	 dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
-		// Common attributes
-		$keyforbreak = 'duration';
-		include DOL_DOCUMENT_ROOT . '/core/tpl/commonfields_view.tpl.php';
+
+	 print '<div class="fichecenter">';
+	 print '<div class="fichehalfleft">';
+	 print '<div class="underbanner clearboth"></div>';
+	 print '<table class="border centpercent tableforfield">'."\n";
+
+	 // Common attributes
+	 $keyforbreak = 'duration';
+	 include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
+	 $object->calculateCosts();
+	 print '<tr><td>'.$form->textwithpicto($langs->trans("TotalCost"), $langs->trans("BOMTotalCost")).'</td><td><span class="amount">'.price($object->total_cost).'</span></td></tr>';
+	 print '<tr><td>'.$langs->trans("UnitCost").'</td><td>'.price($object->unit_cost).'</td></tr>';
+
+	 // Other attributes
+	 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
+
+	 print '</table>';
+	 print '</div>';
+	 print '</div>';
+
+	 print '<div class="clearboth"></div>';
+
+	 print dol_get_fiche_end();
+
+
+
+	 /*
+	  * Lines
+	  */
+
+	if (!empty($object->table_element_line)) {
+		// Products
+		$res = $object->fetchLinesbytypeproduct(0);
 		$object->calculateCosts();
-		print '<tr><td>' . $form->textwithpicto($langs->trans("TotalCost"), $langs->trans("BOMTotalCost")) . '</td><td><span class="amount">' . price($object->total_cost) . '</span></td></tr>';
-		print '<tr><td>' . $langs->trans("UnitCost") . '</td><td>' . price($object->unit_cost) . '</td></tr>';
 
-		// Other attributes
-		include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+		print ($res == 0 && $object->status >= $object::STATUS_VALIDATED) ? '' : load_fiche_titre($langs->trans('BOMProductsList'), '', 'product');
 
-		print '</table>';
-		print '</div>';
-		print '</div>';
-
-		print '<div class="clearboth"></div>';
-
-		print dol_get_fiche_end();
-
-
-		/*
-		 * Lines
-		 */
-
-		if (!empty($object->table_element_line)) {
-			//Products
-			$res = $object->fetchLinesbytypeproduct(0);
-			$object->calculateCosts();
-
-			print ($res == 0 && $object->status >= $object::STATUS_VALIDATED) ? '' : load_fiche_titre($langs->trans('BOMProductsList'), '', 'product');
-
-			print '	<form name="addproduct" id="addproduct" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (($action != 'editline') ? '' : '') . '" 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="">
@@ -578,81 +579,30 @@ if (empty($reshook)) {
     	<input type="hidden" name="id" value="' . $object->id . '">
     	';
 
-			if (!empty($conf->use_javascript_ajax) && $object->status == 0) {
-				include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
-			}
+		if (!empty($conf->use_javascript_ajax) && $object->status == 0) {
+			include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
+		}
 
-			print '<div class="div-table-responsive-no-min">';
-			if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline')) {
-				print '<table id="tablelines" class="noborder noshadow" width="100%">';
-			}
+		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 centpercent">';
+		}
 
-			if (!empty($object->lines)) {
-				$object->printObjectLines($action, $mysoc, null, GETPOST('lineid', 'int'), 1, '/bom/tpl');
-			}
+		if (!empty($object->lines)) {
+			$object->printObjectLines($action, $mysoc, null, GETPOST('lineid', 'int'), 1, '/bom/tpl');
+		}
 
-			// Form to add new line
-			if ($object->status == 0 && $permissiontoadd && $action != 'selectlines') {
-				if ($action != 'editline') {
-					// Add products/services form
+		// Form to add new line
+		if ($object->status == 0 && $permissiontoadd && $action != 'selectlines') {
+			if ($action != 'editline') {
+				// Add products/services form
 
 
-					$parameters = array();
-					$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-					if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-					if (empty($reshook))
-						$object->formAddObjectLine(1, $mysoc, null, '/bom/tpl');
-				}
-			}
-
-			if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline')) {
-				print '</table>';
-			}
-			print '</div>';
-
-			print "</form>\n";
-
-			mrpCollapseBomManagement();
-
-
-			//Services
-			$filtertype = 1;
-			$res = $object->fetchLinesbytypeproduct(1);
-			$object->calculateCosts();
-
-			print ($res == 0 && $object->status >= $object::STATUS_VALIDATED) ? '' : load_fiche_titre($langs->trans('BOMServicesList'), '', 'service');
-
-			print '	<form name="addservice" id="addservice" 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 . '">
-    	';
-
-			if (!empty($conf->use_javascript_ajax) && $object->status == 0) {
-				$tagidfortablednd = 'tablelinesservice';
-				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="tablelinesservice" class="noborder noshadow" width="100%">';
-			}
-
-			if (!empty($object->lines)) {
-				$object->printObjectLines($action, $mysoc, null, GETPOST('lineid', 'int'), 1, '/bom/tpl');
-			}
-
-			// Form to add new line
-			if ($object->status == 0 && $permissiontoadd && $action != 'selectlines') {
-				if ($action != 'editline') {
-					// Add services form
-					$parameters = array();
-					$reshook = $hookmanager->executeHooks('formAddObjectServiceLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-					if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-					if (empty($reshook))
-						$object->formAddObjectLine(1, $mysoc, null, '/bom/tpl');
-				}
+				$parameters = array();
+				$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+				if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+				if (empty($reshook))
+					$object->formAddObjectLine(1, $mysoc, null, '/bom/tpl');
 			}
 		}
 
@@ -663,149 +613,199 @@ if (empty($reshook)) {
 
 		print "</form>\n";
 
-		mrpCollapseBomManagement();
+		// Services
+		$filtertype = 1;
+		$res = $object->fetchLinesbytypeproduct(1);
+		$object->calculateCosts();
 
-		$res = $object->fetchLines();
+		print ($res == 0 && $object->status >= $object::STATUS_VALIDATED) ? '' : load_fiche_titre($langs->trans('BOMServicesList'), '', 'service');
 
-		// Buttons for actions
+		print '	<form name="addservice" id="addservice" 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 . '">
+    	';
 
-		if ($action != 'presend' && $action != 'editline') {
-			print '<div class="tabsAction">' . "\n";
-			$parameters = array();
-			$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-			if ($reshook < 0) {
-				setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		if (!empty($conf->use_javascript_ajax) && $object->status == 0) {
+			$tagidfortablednd = 'tablelinesservice';
+			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="tablelinesservice" class="noborder noshadow centpercent">';
+		}
+
+		if (!empty($object->lines)) {
+			$object->printObjectLines($action, $mysoc, null, GETPOST('lineid', 'int'), 1, '/bom/tpl');
+		}
+
+		// Form to add new line
+		if ($object->status == 0 && $permissiontoadd && $action != 'selectlines') {
+			if ($action != 'editline') {
+				// Add services form
+				$parameters = array();
+				$reshook = $hookmanager->executeHooks('formAddObjectServiceLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+				if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+				if (empty($reshook))
+					$object->formAddObjectLine(1, $mysoc, null, '/bom/tpl');
 			}
+		}
+	}
 
-			if (empty($reshook)) {
-				// Send
-				//if (empty($user->socid)) {
-				//	print '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=presend&mode=init#formmailbeforetitle">' . $langs->trans('SendMail') . '</a>'."\n";
+	if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline')) {
+		print '</table>';
+	}
+	 print '</div>';
+
+	 print "</form>\n";
+
+
+	 mrpCollapseBomManagement();
+
+
+	 $res = $object->fetchLines();
+
+	 // Buttons for actions
+
+	if ($action != 'presend' && $action != 'editline') {
+		print '<div class="tabsAction">'."\n";
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+		if ($reshook < 0) {
+			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		}
+
+		if (empty($reshook)) {
+			// Send
+			//if (empty($user->socid)) {
+			//	print '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=presend&mode=init#formmailbeforetitle">' . $langs->trans('SendMail') . '</a>'."\n";
 				//}
 
 				// Back to draft
-				if ($object->status == $object::STATUS_VALIDATED) {
-					if ($permissiontoadd) {
-						print '<a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=setdraft&token=' . newToken() . '">' . $langs->trans("SetToDraft") . '</a>' . "\n";
-					}
+			if ($object->status == $object::STATUS_VALIDATED) {
+				if ($permissiontoadd) {
+					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=setdraft&token='.newToken().'">'.$langs->trans("SetToDraft").'</a>'."\n";
 				}
+			}
 
 				// Modify
-				if ($object->status == $object::STATUS_DRAFT) {
-					if ($permissiontoadd) {
-						print '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=edit&token=' . newToken() . '">' . $langs->trans("Modify") . '</a>' . "\n";
-					} else {
-						print '<a class="butActionRefused classfortooltip" href="#" title="' . dol_escape_htmltag($langs->trans("NotEnoughPermissions")) . '">' . $langs->trans('Modify') . '</a>' . "\n";
-					}
+			if ($object->status == $object::STATUS_DRAFT) {
+				if ($permissiontoadd) {
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a>'."\n";
+				} else {
+					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Modify').'</a>'."\n";
 				}
+			}
 
 				// Validate
-				if ($object->status == $object::STATUS_DRAFT) {
-					if ($permissiontoadd) {
-						if (is_array($object->lines) && count($object->lines) > 0) {
-							print '<a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&amp;action=validate&amp;token=' . newToken() . '">' . $langs->trans("Validate") . '</a>' . "\n";
-						} else {
-							$langs->load("errors");
-							print '<a class="butActionRefused" href="" title="' . $langs->trans("ErrorAddAtLeastOneLineFirst") . '">' . $langs->trans("Validate") . '</a>' . "\n";
-						}
+			if ($object->status == $object::STATUS_DRAFT) {
+				if ($permissiontoadd) {
+					if (is_array($object->lines) && count($object->lines) > 0) {
+						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=validate&amp;token='.newToken().'">'.$langs->trans("Validate").'</a>'."\n";
+					} else {
+						$langs->load("errors");
+						print '<a class="butActionRefused" href="" title="'.$langs->trans("ErrorAddAtLeastOneLineFirst").'">'.$langs->trans("Validate").'</a>'."\n";
 					}
 				}
+			}
 
 				// Re-open
-				if ($permissiontoadd && $object->status == $object::STATUS_CANCELED) {
-					print '<a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=reopen&token=' . newToken() . '">' . $langs->trans("ReOpen") . '</a>' . "\n";
-				}
+			if ($permissiontoadd && $object->status == $object::STATUS_CANCELED) {
+				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans("ReOpen").'</a>'."\n";
+			}
 
 				// Create MO
-				if (isModEnabled('mrp')) {
-					if ($object->status == $object::STATUS_VALIDATED && !empty($user->rights->mrp->write)) {
-						print '<a class="butAction" href="' . DOL_URL_ROOT . '/mrp/mo_card.php?action=create&fk_bom=' . $object->id . '&token=' . newToken() . '&backtopageforcancel=' . urlencode($_SERVER["PHP_SELF"] . '?id=' . $object->id) . '">' . $langs->trans("CreateMO") . '</a>' . "\n";
-					}
+			if (isModEnabled('mrp')) {
+				if ($object->status == $object::STATUS_VALIDATED && !empty($user->rights->mrp->write)) {
+					print '<a class="butAction" href="'.DOL_URL_ROOT.'/mrp/mo_card.php?action=create&fk_bom='.$object->id.'&token='.newToken().'&backtopageforcancel='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id).'">'.$langs->trans("CreateMO").'</a>'."\n";
 				}
+			}
 
 				// Clone
-				if ($permissiontoadd) {
-					print dolGetButtonAction($langs->trans("ToClone"), '', 'default', $_SERVER['PHP_SELF'] . '?id=' . $object->id . (!empty($object->socid) ? '&socid=' . $object->socid : "") . '&action=clone&object=bom', 'clone', $permissiontoadd);
-				}
+			if ($permissiontoadd) {
+				print dolGetButtonAction($langs->trans("ToClone"), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.(!empty($object->socid) ? '&socid='.$object->socid : "").'&action=clone&object=bom', 'clone', $permissiontoadd);
+			}
 
 				// Close / Cancel
-				if ($permissiontoadd && $object->status == $object::STATUS_VALIDATED) {
-					print '<a class="butActionDelete" href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=close&token=' . newToken() . '">' . $langs->trans("Disable") . '</a>' . "\n";
-				}
+			if ($permissiontoadd && $object->status == $object::STATUS_VALIDATED) {
+				print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=close&token='.newToken().'">'.$langs->trans("Disable").'</a>'."\n";
+			}
 
 				/*
-				if ($user->rights->bom->write)
-				{
-					if ($object->status == 1)
-					 {
-						 print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=disable&token='.newToken().'">'.$langs->trans("Disable").'</a>'."\n";
-					 }
-					 else
-					 {
-						 print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=enable&token='.newToken().'">'.$langs->trans("Enable").'</a>'."\n";
-					 }
-				}
-				*/
+				  if ($user->rights->bom->write)
+				  {
+				  if ($object->status == 1)
+				  {
+				  print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=disable&token='.newToken().'">'.$langs->trans("Disable").'</a>'."\n";
+				  }
+				  else
+				  {
+				  print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=enable&token='.newToken().'">'.$langs->trans("Enable").'</a>'."\n";
+				  }
+				  }
+				  */
 
 				// Delete
-				print dolGetButtonAction($langs->trans("Delete"), '', 'delete', $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=delete&token=' . newToken(), 'delete', $permissiontodelete);
-			}
-			print '</div>' . "\n";
+				print dolGetButtonAction($langs->trans("Delete"), '', 'delete', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken(), 'delete', $permissiontodelete);
 		}
-
-
-		// Select mail models is same action as presend
-		if (GETPOST('modelselected')) {
-			$action = 'presend';
-		}
-
-		if ($action != 'presend') {
-			print '<div class="fichecenter"><div class="fichehalfleft">';
-			print '<a name="builddoc"></a>'; // ancre
-
-			// Documents
-			$objref = dol_sanitizeFileName($object->ref);
-			$relativepath = $objref . '/' . $objref . '.pdf';
-			$filedir = $conf->bom->dir_output . '/' . $objref;
-			$urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
-			$genallowed = $user->rights->bom->read; // If you can read, you can build the PDF to read content
-			$delallowed = $user->rights->bom->write; // If you can create/edit, you can remove a file on card
-			print $formfile->showdocuments('bom', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $langs->defaultlang);
-
-			// Show links to link elements
-			$linktoelem = $form->showLinkToObjectBlock($object, null, array('bom'));
-			$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
-
-
-			print '</div><div class="fichehalfright">';
-
-			$MAXEVENT = 10;
-
-			$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-bars imgforviewmode', DOL_URL_ROOT . '/bom/bom_agenda.php?id=' . $object->id);
-
-			// List of actions on element
-			include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
-			$formactions = new FormActions($db);
-			$somethingshown = $formactions->showactions($object, $object->element, 0, 1, '', $MAXEVENT, '', $morehtmlcenter);
-
-			print '</div></div>';
-		}
-
-		//Select mail models is same action as presend
-		if (GETPOST('modelselected')) {
-			$action = 'presend';
-		}
-
-		// Presend form
-		$modelmail = 'bom';
-		$defaulttopic = 'InformationMessage';
-		$diroutput = $conf->bom->dir_output;
-		$trackid = 'bom' . $object->id;
-
-		include DOL_DOCUMENT_ROOT . '/core/tpl/card_presend.tpl.php';
+		print '</div>'."\n";
 	}
+
+
+	 // Select mail models is same action as presend
+	if (GETPOST('modelselected')) {
+		$action = 'presend';
+	}
+
+	if ($action != 'presend') {
+		print '<div class="fichecenter"><div class="fichehalfleft">';
+		print '<a name="builddoc"></a>'; // ancre
+
+		// Documents
+		$objref = dol_sanitizeFileName($object->ref);
+		$relativepath = $objref.'/'.$objref.'.pdf';
+		$filedir = $conf->bom->dir_output.'/'.$objref;
+		$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
+		$genallowed = $user->rights->bom->read; // If you can read, you can build the PDF to read content
+		$delallowed = $user->rights->bom->write; // If you can create/edit, you can remove a file on card
+		print $formfile->showdocuments('bom', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $langs->defaultlang);
+
+		// Show links to link elements
+		$linktoelem = $form->showLinkToObjectBlock($object, null, array('bom'));
+		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+
+
+		print '</div><div class="fichehalfright">';
+
+		$MAXEVENT = 10;
+
+		$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-bars imgforviewmode', DOL_URL_ROOT.'/bom/bom_agenda.php?id='.$object->id);
+
+		// List of actions on element
+		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+		$formactions = new FormActions($db);
+		$somethingshown = $formactions->showactions($object, $object->element, 0, 1, '', $MAXEVENT, '', $morehtmlcenter);
+
+		print '</div></div>';
+	}
+
+	 //Select mail models is same action as presend
+	if (GETPOST('modelselected')) {
+		$action = 'presend';
+	}
+
+	 // Presend form
+	 $modelmail = 'bom';
+	 $defaulttopic = 'InformationMessage';
+	 $diroutput = $conf->bom->dir_output;
+	 $trackid = 'bom'.$object->id;
+
+	 include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
 }
 
+
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/bom/bom_list.php b/htdocs/bom/bom_list.php
index 601eb9b75b3..c5e5491dff8 100644
--- a/htdocs/bom/bom_list.php
+++ b/htdocs/bom/bom_list.php
@@ -517,7 +517,7 @@ if ($search_all) {
 		$fieldstosearchall[$key] = $langs->trans($val);
 		$setupstring .= $key."=".$val.";";
 	}
-	print '<!-- Search done like if PRODUCT_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
+	print '<!-- Search done like if BOM_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>'."\n";
 }
 
diff --git a/htdocs/bom/bom_net_needs.php b/htdocs/bom/bom_net_needs.php
index 1b8afa91e52..60736d085da 100644
--- a/htdocs/bom/bom_net_needs.php
+++ b/htdocs/bom/bom_net_needs.php
@@ -187,8 +187,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	print dol_get_fiche_end();
 
-	$viewlink = dolGetButtonTitle($langs->trans('GroupByProduct'), '', 'fa fa-bars imgforviewmode', $_SERVER['PHP_SELF'].'?id='.$object->id.'&token='.newToken(), '', 1, array('morecss' => 'reposition '.($action !== 'treeview' ? 'btnTitleSelected':'')));
-	$viewlink .= dolGetButtonTitle($langs->trans('TreeStructure'), '', 'fa fa-stream imgforviewmode', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=treeview&token='.newToken(), '', 1, array('morecss' => 'reposition marginleftonly '.($action == 'treeview' ? 'btnTitleSelected':'')));
+	$viewlink = dolGetButtonTitle($langs->trans('GroupByX', $langs->transnoentitiesnoconv("Products")), '', 'fa fa-bars imgforviewmode', $_SERVER['PHP_SELF'].'?id='.$object->id.'&token='.newToken(), '', 1, array('morecss' => 'reposition '.($action !== 'treeview' ? 'btnTitleSelected':'')));
+	$viewlink .= dolGetButtonTitle($langs->trans('TreeView'), '', 'fa fa-stream imgforviewmode', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=treeview&token='.newToken(), '', 1, array('morecss' => 'reposition marginleftonly '.($action == 'treeview' ? 'btnTitleSelected':'')));
 
 	print load_fiche_titre($langs->trans("BOMNetNeeds"), $viewlink, '');
 
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index d7982a44069..84bae509ebd 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -102,9 +102,9 @@ class BOM extends CommonObject
 		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'position'=>30, 'notnull'=>1, 'searchall'=>1, 'showoncombobox'=>'2', 'autofocusoncreate'=>1, 'css'=>'minwidth300 maxwidth400', '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'=>'minwidth175', 'csslist'=>'minwidth175 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', 'csslist'=>'tdoverflowmax100'),
+		'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'),
+		'qty' => array('type'=>'real', 'label'=>'Quantity', 'enabled'=>1, 'visible'=>1, 'default'=>1, 'position'=>55, 'notnull'=>1, 'isameasure'=>'1', 'css'=>'maxwidth50imp right'),
 		//'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', 'csslist'=>'tdoverflowmax100'),
diff --git a/htdocs/bom/tpl/objectline_create.tpl.php b/htdocs/bom/tpl/objectline_create.tpl.php
index 96a179b93f3..e87d526302b 100644
--- a/htdocs/bom/tpl/objectline_create.tpl.php
+++ b/htdocs/bom/tpl/objectline_create.tpl.php
@@ -107,7 +107,7 @@ print '<td class="bordertop nobottom linecoldescription minwidth500imp">';
 if (isModEnabled("product") || isModEnabled("service")) {
 	if ($filtertype == 1) {
 		print $langs->trans("Service");
-	} elseif (!empty($conf->global->BOM_SUB_BOM)) {
+	} else {
 		print $langs->trans("Product");
 	}
 	echo '<span class="prod_entry_mode_predef">';
diff --git a/htdocs/bom/tpl/objectline_view.tpl.php b/htdocs/bom/tpl/objectline_view.tpl.php
index f432eefc0c8..2dbc793fdf4 100644
--- a/htdocs/bom/tpl/objectline_view.tpl.php
+++ b/htdocs/bom/tpl/objectline_view.tpl.php
@@ -171,7 +171,7 @@ $tmpbom->calculateCosts();
 print '<td id="costline_'.$line->id.'" class="linecolcost nowrap right">';
 $coldisplay++;
 if (!empty($line->fk_bom_child)) {
-	echo '<span class="amount">'.price($tmpbom->total_cost).'</span>';
+	echo '<span class="amount">'.price($tmpbom->total_cost * $line->qty).'</span>';
 } else {
 	echo '<span class="amount">'.price($line->total_cost).'</span>';
 }
@@ -269,16 +269,20 @@ if ($resql) {
 		$label = $sub_bom_product->getLabelOfUnit('long');
 		if ($sub_bom_line->qty_frozen > 0) {
 			print '<td class="linecolqty nowrap right" id="sub_bom_qty_'.$sub_bom_line->id.'">'.price($sub_bom_line->qty, 0, '', 0, 0).'</td>';
-			print '<td class="linecoluseunit nowrap left">';
-			if ($label !== '') print $langs->trans($label);
-			print '</td>';
+			if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+				print '<td class="linecoluseunit nowrap left">';
+				if ($label !== '') print $langs->trans($label);
+				print '</td>';
+			}
 			print '<td class="linecolqtyfrozen nowrap right" id="sub_bom_qty_frozen_'.$sub_bom_line->id.'">'.$langs->trans('Yes').'</td>';
 		} else {
 			print '<td class="linecolqty nowrap right" id="sub_bom_qty_'.$sub_bom_line->id.'">'.price($sub_bom_line->qty * $line->qty, 0, '', 0, 0).'</td>';
-			print '<td class="linecoluseunit nowrap left">';
-			if ($label !== '') print $langs->trans($label);
-			print '</td>';
-			print '</td>';
+			if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+				print '<td class="linecoluseunit nowrap left">';
+				if ($label !== '') print $langs->trans($label);
+				print '</td>';
+			}
+
 			print '<td class="linecolqtyfrozen nowrap right" id="sub_bom_qty_frozen_'.$sub_bom_line->id.'">&nbsp;</td>';
 		}
 
diff --git a/htdocs/bookcal/availabilities_list.php b/htdocs/bookcal/availabilities_list.php
index 26d66ce0ca4..414faf2dc5a 100644
--- a/htdocs/bookcal/availabilities_list.php
+++ b/htdocs/bookcal/availabilities_list.php
@@ -470,7 +470,7 @@ if ($search_all) {
 		$fieldstosearchall[$key] = $langs->trans($val);
 		$setupstring .= $key."=".$val.";";
 	}
-	print '<!-- Search done like if PRODUCT_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
+	print '<!-- Search done like if BOOKCAL_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>'."\n";
 }
 
diff --git a/htdocs/bookcal/booking_list.php b/htdocs/bookcal/booking_list.php
index 2e4fbfccd16..3c78ffea120 100644
--- a/htdocs/bookcal/booking_list.php
+++ b/htdocs/bookcal/booking_list.php
@@ -470,7 +470,7 @@ if ($search_all) {
 		$fieldstosearchall[$key] = $langs->trans($val);
 		$setupstring .= $key."=".$val.";";
 	}
-	print '<!-- Search done like if PRODUCT_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
+	print '<!-- Search done like if BOOKCAL_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>'."\n";
 }
 
diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php
index 2adef615a70..3eae08bb60a 100644
--- a/htdocs/bookmarks/list.php
+++ b/htdocs/bookmarks/list.php
@@ -29,15 +29,18 @@ require_once DOL_DOCUMENT_ROOT.'/bookmarks/class/bookmark.class.php';
 $langs->loadLangs(array('bookmarks', 'admin'));
 
 // Get Parameters
-$action = GETPOST('action', 'aZ09');
+$id = GETPOST("id", 'int');
+
+$action 	= GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 $show_files = GETPOST('show_files', 'int');
-$confirm = GETPOST('confirm', 'alpha');
-$toselect = GETPOST('toselect', 'array');
+$confirm 	= GETPOST('confirm', 'alpha');
+$cancel     = GETPOST('cancel', 'alpha');
+$toselect 	= GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'bookmarklist'; // To manage different context of search
-$id = GETPOST("id", 'int');
-$optioncss = GETPOST('optioncss', 'alpha');
-$mode = GETPOST('mode', 'aZ09');
+$backtopage = GETPOST('backtopage', 'alpha');
+$optioncss 	= GETPOST('optioncss', 'alpha');
+$mode 		= GETPOST('mode', 'aZ09');
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index 8807ccd4764..a0176ca18b0 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -33,18 +33,22 @@ require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 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/agenda.lib.php';
-include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
+include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+
 // Load translation files required by the page
 $langs->loadLangs(array("users", "companies", "agenda", "commercial", "other", "orders", "bills"));
 
-$action = GETPOST('action', 'aZ09');
+// Get Parameters
+$action 	= GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
+$confirm 	= GETPOST('confirm', 'alpha');
+$cancel     = GETPOST('cancel', 'alpha');
+$toselect 	= GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'actioncommlist'; // To manage different context of search
-$optioncss = GETPOST('optioncss', 'alpha');
-$toselect = GETPOST('toselect', 'array');
-$confirm = GETPOST('confirm', 'alpha');
+$optioncss 	= GETPOST('optioncss', 'alpha');
+
 
 $disabledefaultvalues = GETPOST('disabledefaultvalues', 'int');
 
@@ -70,6 +74,7 @@ if (GETPOST('search_actioncode', 'array')) {
 	$actioncode = GETPOST("search_actioncode", "alpha", 3) ?GETPOST("search_actioncode", "alpha", 3) : (GETPOST("search_actioncode") == '0' ? '0' : ((empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) || $disabledefaultvalues) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE));
 }
 
+// Search Fields
 $search_id = GETPOST('search_id', 'alpha');
 $search_title = GETPOST('search_title', 'alpha');
 $search_note = GETPOST('search_note', 'alpha');
@@ -106,6 +111,7 @@ if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS)) {
 	$filtert = $user->id;
 }
 
+// Pagination parameters
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index 1ae651dae6d..340efbf30a8 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -948,26 +948,6 @@ while ($currentdaytoshow < $lastdaytoshow) {
 		$usernames[] = $tmpuser;
 	}
 
-	/*
-	if ($filtert > 0)
-	{
-		$tmpuser = new User($db);
-		$tmpuser->fetch($filtert);
-		$usernames[] = $tmpuser;
-	}
-	else if ($usergroup)
-	{
-		$tmpgroup = new UserGroup($db);
-		$tmpgroup->fetch($usergroup);
-		$usernames = $tmpgroup->listUsersForGroup();
-	}
-	else
-	{
-		$tmpgroup = new UserGroup($db);
-		//$tmpgroup->fetch($usergroup); No fetch, we want all users for all groups
-		$usernames = $tmpgroup->listUsersForGroup();
-	}*/
-
 	// Load array of colors by type
 	$colorsbytype = array();
 	$labelbytype = array();
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index e6162b45b52..46343919cb6 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -1419,7 +1419,7 @@ if ($object->id > 0) {
 		$sql .= ', f.total_tva';
 		$sql .= ', f.total_ttc';
 		$sql .= ', f.entity';
-		$sql .= ', f.datef as df, f.datec as dc, f.paye as paye, f.fk_statut as status';
+		$sql .= ', f.datef as df, f.date_lim_reglement as dl, f.datec as dc, f.paye as paye, f.fk_statut as status';
 		$sql .= ', s.nom, s.rowid as socid';
 		$sql .= ', SUM(pf.amount) as am';
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
@@ -1427,7 +1427,7 @@ if ($object->id > 0) {
 		$sql .= " WHERE f.fk_soc = s.rowid AND s.rowid = ".((int) $object->id);
 		$sql .= " AND f.entity IN (".getEntity('invoice').")";
 		$sql .= ' GROUP BY f.rowid, f.ref, f.type, f.total_ht, f.total_tva, f.total_ttc,';
-		$sql .= ' f.entity, f.datef, f.datec, f.paye, f.fk_statut,';
+		$sql .= ' f.entity, f.datef, f.date_lim_reglement, f.datec, f.paye, f.fk_statut,';
 		$sql .= ' s.nom, s.rowid';
 		$sql .= " ORDER BY f.datef DESC, f.datec DESC";
 
@@ -1441,7 +1441,7 @@ if ($object->id > 0) {
 				print '<table class="noborder centpercent lastrecordtable">';
 
 				print '<tr class="liste_titre">';
-				print '<td colspan="5"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastCustomersBills", ($num <= $MAXLIST ? "" : $MAXLIST)).'</td><td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$object->id.'">'.$langs->trans("AllBills").'<span class="badge marginleftonlyshort">'.$num.'</span></a></td>';
+				print '<td colspan="5"><table class="centpercent nobordernopadding"><tr><td>'.$langs->trans("LastCustomersBills", ($num <= $MAXLIST ? "" : $MAXLIST)).'</td><td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$object->id.'">'.$langs->trans("AllBills").'<span class="badge marginleftonlyshort">'.$num.'</span></a></td>';
 				print '<td width="20px" class="right"><a href="'.DOL_URL_ROOT.'/compta/facture/stats/index.php?socid='.$object->id.'">'.img_picto($langs->trans("Statistics"), 'stats').'</a></td>';
 				print '</tr></table></td>';
 				print '</tr>';
@@ -1458,6 +1458,8 @@ if ($object->id > 0) {
 				$facturestatic->total_tva = $objp->total_tva;
 				$facturestatic->total_ttc = $objp->total_ttc;
 				$facturestatic->statut = $objp->status;
+				$facturestatic->date = $db->jdate($objp->df);
+				$facturestatic->date_lim_reglement = $db->jdate($objp->dl);
 
 				print '<tr class="oddeven">';
 				print '<td class="nowraponall">';
@@ -1493,9 +1495,14 @@ if ($object->id > 0) {
 				//print $formfile->getDocumentsLink($facturestatic->element, $filename, $filedir);
 				print '</td>';
 				if ($objp->df > 0) {
-					print '<td class="right" width="80px">'.dol_print_date($db->jdate($objp->df), 'day').'</td>';
+					print '<td width="80px" title="'.dol_escape_htmltag($langs->trans('DateInvoice')).'">'.dol_print_date($db->jdate($objp->df), 'day').'</td>';
 				} else {
-					print '<td class="right"><b>!!!</b></td>';
+					print '<td><b>!!!</b></td>';
+				}
+				if ($objp->dl > 0) {
+					print '<td width="80px" title="'.dol_escape_htmltag($langs->trans('DateMaxPayment')).'">'.dol_print_date($db->jdate($objp->dl), 'day').'</td>';
+				} else {
+					print '<td><b>!!!</b></td>';
 				}
 				print '<td class="right" style="min-width: 60px">';
 				print price($objp->total_ht);
diff --git a/htdocs/comm/mailing/list.php b/htdocs/comm/mailing/list.php
index 6916a2dfe5d..501de4c11cf 100644
--- a/htdocs/comm/mailing/list.php
+++ b/htdocs/comm/mailing/list.php
@@ -27,20 +27,24 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/mailing/class/mailing.class.php';
 
 // Load translation files required by the page
-$langs->load("mails");
+$langs->load('mails');
 
-$sortfield = GETPOST('sortfield', 'aZ09comma');
-$sortorder = GETPOST('sortorder', 'aZ09comma');
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$optioncss = GETPOST('optioncss', 'alpha');
+// Get Parameters
 $massaction = GETPOST('massaction', 'alpha');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$optioncss 	= GETPOST('optioncss', 'alpha');
+
+// Pagination
+$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')) {
 	$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;
+
 if (!$sortorder) {
 	$sortorder = "DESC";
 }
@@ -48,10 +52,12 @@ if (!$sortfield) {
 	$sortfield = "m.date_creat";
 }
 
+// Search Fields
 $search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 $search_ref = GETPOST("search_ref", "alpha") ? GETPOST("search_ref", "alpha") : GETPOST("sref", "alpha");
 $filteremail = GETPOST('filteremail', 'alpha');
 
+// Initialize objects
 $object = new Mailing($db);
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -128,7 +134,9 @@ if (empty($reshook)) {
  * View
  */
 
-llxHeader('', $langs->trans("Mailing"), 'EN:Module_EMailing|FR:Module_Mailing|ES:M&oacute;dulo_Mailing');
+// Page Header
+$help_url = 'EN:Module_EMailing|FR:Module_Mailing|ES:M&oacute;dulo_Mailing';
+llxHeader('', $langs->trans("Mailing"), $help_url);
 
 $form = new Form($db);
 
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index cc5872abb25..cc507041ac6 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -62,21 +62,23 @@ if (isModEnabled("expedition")) {
 	$langs->loadLangs(array('sendings'));
 }
 
+// Get Parameters
 $socid = GETPOST('socid', 'int');
 
-$action = GETPOST('action', 'aZ09');
+$action 	= GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 $show_files = GETPOST('show_files', 'int');
-$confirm = GETPOST('confirm', 'alpha');
-$toselect = GETPOST('toselect', 'array');
+$confirm 	= GETPOST('confirm', 'alpha');
+$cancel     = GETPOST('cancel', 'alpha');
+$toselect 	= GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'proposallist';
-$mode = GETPOST('mode', 'alpha');
+$mode 		= GETPOST('mode', 'alpha');
 
-$search_user = GETPOST('search_user', 'int');
-$search_sale = GETPOST('search_sale', 'int');
-$search_ref = GETPOST('sf_ref') ?GETPOST('sf_ref', 'alpha') : GETPOST('search_ref', 'alpha');
+// Search Fields
+$search_user 	= GETPOST('search_user', 'int');
+$search_sale 	= GETPOST('search_sale', 'int');
+$search_ref 	= GETPOST('sf_ref') ?GETPOST('sf_ref', 'alpha') : GETPOST('search_ref', 'alpha');
 $search_refcustomer = GETPOST('search_refcustomer', 'alpha');
-
 $search_refproject = GETPOST('search_refproject', 'alpha');
 $search_project = GETPOST('search_project', 'alpha');
 
@@ -140,15 +142,15 @@ $search_date_signature_endyear = GETPOST('search_date_signature_endyear', 'int')
 $search_date_signature_start = dol_mktime(0, 0, 0, $search_date_signature_startmonth, $search_date_signature_startday, $search_date_signature_startyear);
 $search_date_signature_end = dol_mktime(23, 59, 59, $search_date_signature_endmonth, $search_date_signature_endday, $search_date_signature_endyear);
 
-
 $search_status = GETPOST('search_status', 'alpha');
+
 $optioncss = GETPOST('optioncss', 'alpha');
 $object_statut = GETPOST('search_statut', 'alpha');
 
 $sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 $mesg = (GETPOST("msg") ? GETPOST("msg") : GETPOST("mesg"));
 
-
+// Pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
@@ -263,6 +265,7 @@ foreach ($object->fields as $key => $val) {
 		$fieldstosearchall['t.'.$key] = $val['label'];
 	}
 }*/
+
 // Definition of array of fields for columns
 /*$arrayfields = array();
 foreach ($object->fields as $key => $val) {
@@ -278,9 +281,11 @@ foreach ($object->fields as $key => $val) {
 		);
 	}
 }*/
+
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 
+// Permissions
 $permissiontoread = $user->rights->propal->lire;
 $permissiontoadd = $user->rights->propal->creer;
 $permissiontodelete = $user->rights->propal->supprimer;
diff --git a/htdocs/commande/list_det.php b/htdocs/commande/list_det.php
index 2ef2d429900..d5b0336b95a 100644
--- a/htdocs/commande/list_det.php
+++ b/htdocs/commande/list_det.php
@@ -137,10 +137,10 @@ $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortfield) {
-	$sortfield = 'c.ref';
+	$sortfield = 'pr.ref';
 }
 if (!$sortorder) {
-	$sortorder = 'DESC';
+	$sortorder = 'ASC';
 }
 
 $show_shippable_command = GETPOST('show_shippable_command', 'aZ09');
diff --git a/htdocs/compta/ajaxpayment.php b/htdocs/compta/ajaxpayment.php
index b566f77bcde..a0c45ff0ed0 100644
--- a/htdocs/compta/ajaxpayment.php
+++ b/htdocs/compta/ajaxpayment.php
@@ -72,6 +72,10 @@ if (is_array($remains)) {
 			unset($remains[$key]);
 		}
 	}
+} elseif ($remains) {
+	$remains = array(price2num($remains));
+} else {
+	$remains = array();
 }
 
 // Treatment
diff --git a/htdocs/compta/cashcontrol/cashcontrol_list.php b/htdocs/compta/cashcontrol/cashcontrol_list.php
index a1e5dae0c91..05612f54166 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_list.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_list.php
@@ -423,7 +423,7 @@ if ($search_all) {
 		$fieldstosearchall[$key] = $langs->trans($val);
 		$setupstring .= $key."=".$val.";";
 	}
-	print '<!-- Search done like if PRODUCT_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
+	print '<!-- Search done like if BOOKCAL_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>'."\n";
 }
 
diff --git a/htdocs/compta/localtax/card.php b/htdocs/compta/localtax/card.php
index 8b6119db13a..ad80b6d1b6d 100644
--- a/htdocs/compta/localtax/card.php
+++ b/htdocs/compta/localtax/card.php
@@ -144,9 +144,12 @@ $form = new Form($db);
 
 $title = $langs->trans("LT".$object->ltt)." - ".$langs->trans("Card");
 $help_url = '';
-llxHeader('', $title, $helpurl);
+llxHeader('', $title, $help_url);
 
 if ($action == 'create') {
+	$datev = dol_mktime(12, 0, 0, GETPOST("datevmonth"), GETPOST("datevday"), GETPOST("datevyear"));
+	$datep = dol_mktime(12, 0, 0, GETPOST("datepmonth"), GETPOST("datepday"), GETPOST("datepyear"));
+
 	print load_fiche_titre($langs->transcountry($lttype == 2 ? "newLT2Payment" : "newLT1Payment", $mysoc->country_code));
 
 	print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" name="formlocaltax" method="post">'."\n";
diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php
index 073365fa876..7c68a443feb 100644
--- a/htdocs/compta/paiement/card.php
+++ b/htdocs/compta/paiement/card.php
@@ -46,6 +46,11 @@ $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 
+$socid = GETPOST('socid', 'int');
+if ($socid < 0) {
+	$socid = 0;
+}
+
 $object = new Paiement($db);
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('paymentcard', 'globalcard'));
diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index 658f2c150f1..6db18f6aa55 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -513,6 +513,7 @@ foreach ($arrayfields as $column) {
 
 $i = 0;
 $totalarray = array();
+$totalarray['nbfield'] = 0;
 while ($i < min($num, $limit)) {
 	$objp = $db->fetch_object($resql);
 
@@ -620,7 +621,11 @@ while ($i < min($num, $limit)) {
 			$totalarray['nbfield']++;
 		}
 		$totalarray['pos'][$checkedCount] = 'amount';
-		$totalarray['val']['amount'] += $objp->amount;
+		if (empty($totalarray['val']['amount'])) {
+			$totalarray['val']['amount'] = $objp->amount;
+		} else {
+			$totalarray['val']['amount'] += $objp->amount;
+		}
 	}
 
 	// Status
diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php
index c9f90b8b240..33a4409bac9 100644
--- a/htdocs/compta/prelevement/card.php
+++ b/htdocs/compta/prelevement/card.php
@@ -272,7 +272,7 @@ if ($id > 0 || $ref) {
 	print $formconfirm;
 
 
-	if (empty($object->date_trans) && $user->rights->prelevement->bons->send && $action == 'settransmitted') {
+	if (empty($object->date_trans) && (($user->rights->prelevement->bons->send && $object->type != 'bank-transfer') || ($user->rights->paymentbybanktransfer->send && $object->type == 'bank-transfer')) && $action == 'settransmitted') {
 		print '<form method="post" name="userfile" action="card.php?id='.$object->id.'" enctype="multipart/form-data">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="infotrans">';
@@ -291,7 +291,7 @@ if ($id > 0 || $ref) {
 		print '<br>';
 	}
 
-	if (!empty($object->date_trans) && empty($object->date_credit) && $user->rights->prelevement->bons->credit && $action == 'setcredited') {
+	if (!empty($object->date_trans) && empty($object->date_credit) && (($user->rights->prelevement->bons->credit && $object->type != 'bank-transfer') || ($user->rights->paymentbybanktransfer->debit && $object->type == 'bank-transfer')) && $action == 'setcredited') {
 		$btnLabel = ($object->type == 'bank-transfer') ? $langs->trans("ClassDebited") : $langs->trans("ClassCredited");
 		print '<form name="infocredit" method="post" action="card.php?id='.$object->id.'">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 4fde1b75552..cd94f4ebbac 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -213,11 +213,6 @@ if (empty($reshook)) {
 		$object->town = (string) GETPOST("town", 'alpha');
 		$object->country_id = (int) GETPOST("country_id", 'int');
 		$object->state_id = (int) GETPOST("state_id", 'int');
-		//$object->jabberid		= GETPOST("jabberid", 'alpha');
-		//$object->skype		= GETPOST("skype", 'alpha');
-		//$object->twitter		= GETPOST("twitter", 'alpha');
-		//$object->facebook		= GETPOST("facebook", 'alpha');
-		//$object->linkedin		= GETPOST("linkedin", 'alpha');
 		$object->socialnetworks = array();
 		if (isModEnabled('socialnetworks')) {
 			foreach ($socialnetworks as $key => $value) {
@@ -419,11 +414,6 @@ if (empty($reshook)) {
 
 			$object->email = (string) GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL);
 			$object->no_email = GETPOST("no_email", "int");
-			//$object->jabberid		= GETPOST("jabberid", 'alpha');
-			//$object->skype		= GETPOST("skype", 'alpha');
-			//$object->twitter		= GETPOST("twitter", 'alpha');
-			//$object->facebook		= GETPOST("facebook", 'alpha');
-			//$object->linkedin		= GETPOST("linkedin", 'alpha');
 			$object->socialnetworks = array();
 			if (isModEnabled('socialnetworks')) {
 				foreach ($socialnetworks as $key => $value) {
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index c9d62c410b3..52ea2b69c8d 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -702,22 +702,6 @@ class Contact extends CommonObject
 					$tmpobj->socialnetworks = $this->socialnetworks;
 					$usermustbemodified++;
 				}
-				// if ($tmpobj->skype != $this->skype) {
-				// 	$tmpobj->skype = $this->skype;
-				// 	$usermustbemodified++;
-				// }
-				// if ($tmpobj->twitter != $this->twitter) {
-				// 	$tmpobj->twitter = $this->twitter;
-				// 	$usermustbemodified++;
-				// }
-				// if ($tmpobj->facebook != $this->facebook) {
-				// 	$tmpobj->facebook = $this->facebook;
-				// 	$usermustbemodified++;
-				// }
-				// if ($tmpobj->linkedin != $this->linkedin) {
-				//     $tmpobj->linkedin = $this->linkedin;
-				//     $usermustbemodified++;
-				// }
 				if ($usermustbemodified) {
 					$result = $tmpobj->update($user, 0, 1, 1, 1);
 					if ($result < 0) {
@@ -850,9 +834,6 @@ class Contact extends CommonObject
 		if ($this->fax && !empty($conf->global->LDAP_CONTACT_FIELD_FAX)) {
 			$info[$conf->global->LDAP_CONTACT_FIELD_FAX] = $this->fax;
 		}
-		if ($this->skype && !empty($conf->global->LDAP_CONTACT_FIELD_SKYPE)) {
-			$info[$conf->global->LDAP_CONTACT_FIELD_SKYPE] = $this->skype;
-		}
 		if ($this->note_private && !empty($conf->global->LDAP_CONTACT_FIELD_DESCRIPTION)) {
 			$info[$conf->global->LDAP_CONTACT_FIELD_DESCRIPTION] = dol_string_nohtmltag($this->note_private, 2);
 		}
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index b29f001bda2..54779bb692d 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -143,7 +143,16 @@ if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php';  // Must be include, not include_once
 
 	if ($action == 'confirm_active' && $confirm == 'yes' && $user->rights->contrat->activer) {
-		$result = $object->active_line($user, GETPOST('ligne', 'int'), GETPOST('date'), GETPOST('dateend'), GETPOST('comment'));
+		$date_start = '';
+		$date_end = '';
+		if (GETPOST('startmonth') && GETPOST('startday') && GETPOST('startyear')) {
+			$date_start = dol_mktime(GETPOST('starthour'), GETPOST('startmin'), 0, GETPOST('startmonth'), GETPOST('startday'), GETPOST('startyear'));
+		}
+		if (GETPOST('endmonth') && GETPOST('endday') && GETPOST('endyear')) {
+			$date_end = dol_mktime(GETPOST('endhour'), GETPOST('endmin'), 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
+		}
+
+		$result = $object->active_line($user, GETPOST('ligne', 'int'), $date_start, $date_end, GETPOST('comment'));
 
 		if ($result > 0) {
 			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
@@ -152,12 +161,16 @@ if (empty($reshook)) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	} elseif ($action == 'confirm_closeline' && $confirm == 'yes' && $user->rights->contrat->activer) {
-		if (!GETPOST('dateend')) {
+		$date_end = '';
+		if (GETPOST('endmonth') && GETPOST('endday') && GETPOST('endyear')) {
+			$date_end = dol_mktime(GETPOST('endhour'), GETPOST('endmin'), 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
+		}
+		if (!$date_end) {
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DateEnd")), null, 'errors');
 		}
 		if (!$error) {
-			$result = $object->close_line($user, GETPOST('ligne', 'int'), GETPOST('dateend'), urldecode(GETPOST('comment')));
+			$result = $object->close_line($user, GETPOST('ligne', 'int'), $date_end, urldecode(GETPOST('comment')));
 			if ($result > 0) {
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
@@ -1838,34 +1851,6 @@ if ($action == 'create') {
 				print '<table class="notopnoleftnoright" width="100%"><tr class="oddeven" height="6"><td></td></tr></table>';
 			}
 
-			/*
-			 * Confirmation de la validation activation
-			 */
-			if ($action == 'active' && !$cancel && $user->rights->contrat->activer && $object->lines[$cursorline - 1]->id == GETPOST('ligne', 'int')) {
-				$dateactstart = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
-				$dateactend   = dol_mktime(12, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
-				$comment      = GETPOST('comment', 'alpha');
-				print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id."&ligne=".GETPOST('ligne', 'int')."&date=".$dateactstart."&dateend=".$dateactend."&comment=".urlencode($comment), $langs->trans("ActivateService"), $langs->trans("ConfirmActivateService", dol_print_date($dateactstart, "%A %d %B %Y")), "confirm_active", '', 0, 1);
-				print '<table class="notopnoleftnoright" width="100%"><tr class="oddeven" height="6"><td></td></tr></table>';
-			}
-
-			/*
-			 * Confirmation de la validation fermeture
-			 */
-			if ($action == 'closeline' && !$cancel && $user->rights->contrat->activer && $object->lines[$cursorline - 1]->id == GETPOST('ligne', 'int')) {
-				$dateactstart = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
-				$dateactend   = dol_mktime(12, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
-				$comment      = GETPOST('comment', 'alpha');
-
-				if (empty($dateactend)) {
-					setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DateEndReal")), null, 'errors');
-				} else {
-					print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id."&ligne=".GETPOST('ligne', 'int')."&date=".$dateactstart."&dateend=".$dateactend."&comment=".urlencode($comment), $langs->trans("CloseService"), $langs->trans("ConfirmCloseService", dol_print_date($dateactend, "%A %d %B %Y")), "confirm_closeline", '', 0, 1);
-				}
-				print '<table class="notopnoleftnoright" width="100%"><tr class="oddeven" height="6"><td></td></tr></table>';
-			}
-
-
 			// Area with status and activation info of line
 			if ($object->statut > 0) {
 				print '<table class="notopnoleftnoright tableforservicepart2'.($cursorline < $nbofservices ? ' boxtablenobottom' : '').'" width="100%">';
@@ -1931,8 +1916,12 @@ if ($action == 'create') {
 
 			// Form to activate line
 			if ($user->rights->contrat->activer && $action == 'activateline' && $object->lines[$cursorline - 1]->id == GETPOST('ligne', 'int')) {
-				print '<form name="active" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;ligne='.GETPOST('ligne', 'int').'&amp;action=active" method="post">';
+				print '<form name="active" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 				print '<input type="hidden" name="token" value="'.newToken().'">';
+				print '<input type="hidden" name="action" value="confirm_active">';
+				print '<input type="hidden" name="id" value="'.$object->id.'">';
+				print '<input type="hidden" name="ligne" value="'.GETPOST('ligne', 'int').'">';
+				print '<input type="hidden" name="confirm" value="yes">';
 
 				print '<table class="noborder tableforservicepart2'.($cursorline < $nbofservices ? ' boxtablenobottom' : '').'" width="100%">';
 
@@ -1957,7 +1946,7 @@ if ($action == 'create') {
 
 				print '<tr class="oddeven">';
 				print '<td class="nohover">'.$langs->trans("DateServiceActivate").'</td><td class="nohover">';
-				print $form->selectDate($dateactstart, '', $usehm, $usehm, '', "active", 1, 0);
+				print $form->selectDate($dateactstart, 'start', $usehm, $usehm, '', "active", 1, 0);
 				print '</td>';
 				print '<td class="nohover">'.$langs->trans("DateEndPlanned").'</td><td class="nohover">';
 				print $form->selectDate($dateactend, "end", $usehm, $usehm, '', "active", 1, 0);
@@ -1985,10 +1974,10 @@ if ($action == 'create') {
 				 * Disable a contract line
 				 */
 				print '<!-- Form to disabled a line -->'."\n";
-				print '<form name="closeline" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;ligne='.$object->lines[$cursorline - 1]->id.'" method="post">';
-
+				print '<form name="confirm_closeline" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;ligne='.$object->lines[$cursorline - 1]->id.'" method="post">';
 				print '<input type="hidden" name="token" value="'.newToken().'">';
-				print '<input type="hidden" name="action" value="closeline">';
+				print '<input type="hidden" name="confirm" value="yes">';
+				print '<input type="hidden" name="action" value="confirm_closeline">';
 
 				print '<table class="noborder tableforservicepart2'.($cursorline < $nbofservices ? ' boxtablenobottom' : '').'" width="100%">';
 
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 4d08fdb96cd..ad2cbcea84b 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -225,9 +225,10 @@ class Contrat extends CommonObject
 	 */
 	public $fields = array(
 		'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
-		'ref' =>array('type'=>'varchar(50)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>-1, 'showoncombobox'=>1, 'position'=>15),
+		'ref' =>array('type'=>'varchar(50)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>-1, 'showoncombobox'=>1, 'position'=>15, 'searchall'=>1),
 		'ref_ext' =>array('type'=>'varchar(255)', 'label'=>'Ref ext', 'enabled'=>1, 'visible'=>0, 'position'=>20),
-		'ref_supplier' =>array('type'=>'varchar(50)', 'label'=>'Ref supplier', 'enabled'=>1, 'visible'=>-1, 'position'=>25),
+		'ref_customer' =>array('type'=>'varchar(50)', 'label'=>'RefCustomer', 'enabled'=>1, 'visible'=>-1, 'position'=>25, 'searchall'=>1),
+		'ref_supplier' =>array('type'=>'varchar(50)', 'label'=>'RefSupplier', 'enabled'=>1, 'visible'=>-1, 'position'=>26, 'searchall'=>1),
 		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>30, 'index'=>1),
 		'tms' =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>35),
 		'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'position'=>40),
@@ -237,12 +238,11 @@ class Contrat extends CommonObject
 		'fk_commercial_signature' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'SaleRepresentative Signature', 'enabled'=>1, 'visible'=>-1, 'position'=>80),
 		'fk_commercial_suivi' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'SaleRepresentative follower', 'enabled'=>1, 'visible'=>-1, 'position'=>85),
 		'fk_user_author' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>90),
-		'note_public' =>array('type'=>'text', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>105),
-		'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'=>105, 'searchall'=>1),
+		'note_private' =>array('type'=>'text', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>110, 'searchall'=>1),
 		'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>1, 'visible'=>0, 'position'=>115),
 		'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>120),
 		'extraparams' =>array('type'=>'varchar(255)', 'label'=>'Extraparams', 'enabled'=>1, 'visible'=>-1, 'position'=>125),
-		'ref_customer' =>array('type'=>'varchar(50)', 'label'=>'Ref customer', 'enabled'=>1, 'visible'=>-1, 'position'=>130),
 		'fk_user_modif' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>135),
 		'last_main_doc' =>array('type'=>'varchar(255)', 'label'=>'Last main doc', 'enabled'=>1, 'visible'=>-1, 'position'=>140),
 		'statut' =>array('type'=>'smallint(6)', 'label'=>'Statut', 'enabled'=>1, 'visible'=>-1, 'position'=>500, 'notnull'=>1, 'arrayofkeyval'=>array(0=>'Draft', 1=>'Validated', 2=>'Closed'))
@@ -320,15 +320,15 @@ class Contrat extends CommonObject
 	 *
 	 *  @param	User		$user       Objet User who activate contract
 	 *  @param  int			$line_id    Id of line to activate
-	 *  @param  int			$date       Opening date
+	 *  @param  int			$date_start Opening date
 	 *  @param  int|string	$date_end   Expected end date
 	 * 	@param	string		$comment	A comment typed by user
 	 *  @return int         			<0 if KO, >0 if OK
 	 */
-	public function active_line($user, $line_id, $date, $date_end = '', $comment = '')
+	public function active_line($user, $line_id, $date_start, $date_end = '', $comment = '')
 	{
 		// phpcs:enable
-		$result = $this->lines[$this->lines_id_index_mapper[$line_id]]->active_line($user, $date, $date_end, $comment);
+		$result = $this->lines[$this->lines_id_index_mapper[$line_id]]->active_line($user, $date_start, $date_end, $comment);
 		if ($result < 0) {
 			$this->error = $this->lines[$this->lines_id_index_mapper[$line_id]]->error;
 			$this->errors = $this->lines[$this->lines_id_index_mapper[$line_id]]->errors;
@@ -2249,15 +2249,15 @@ class Contrat extends CommonObject
 				$warning_delay = $conf->contrat->services->inactifs->warning_delay;
 				$label = $langs->trans("BoardNotActivatedServices");
 				$labelShort = $langs->trans("BoardNotActivatedServicesShort");
-				$url = DOL_URL_ROOT.'/contrat/services_list.php?mainmenu=commercial&leftmenu=contracts&mode=0&sortfield=cd.date_fin_validite&sortorder=asc';
+				$url = DOL_URL_ROOT.'/contrat/services_list.php?mainmenu=commercial&leftmenu=contracts&search_status=0&sortfield=cd.date_fin_validite&sortorder=asc';
 			} elseif ($mode == 'expired') {
 				$warning_delay = $conf->contrat->services->expires->warning_delay;
-				$url = DOL_URL_ROOT.'/contrat/services_list.php?mainmenu=commercial&leftmenu=contracts&mode=4&filter=expired&sortfield=cd.date_fin_validite&sortorder=asc';
+				$url = DOL_URL_ROOT.'/contrat/services_list.php?mainmenu=commercial&leftmenu=contracts&search_status=4&filter=expired&sortfield=cd.date_fin_validite&sortorder=asc';
 				$label = $langs->trans("BoardExpiredServices");
 				$labelShort = $langs->trans("BoardExpiredServicesShort");
 			} else {
 				$warning_delay = $conf->contrat->services->expires->warning_delay;
-				$url = DOL_URL_ROOT.'/contrat/services_list.php?mainmenu=commercial&leftmenu=contracts&mode=4&sortfield=cd.date_fin_validite&sortorder=asc';
+				$url = DOL_URL_ROOT.'/contrat/services_list.php?mainmenu=commercial&leftmenu=contracts&search_status=4&sortfield=cd.date_fin_validite&sortorder=asc';
 				//$url.= '&op2day='.$arraydatetouse['mday'].'&op2month='.$arraydatetouse['mon'].'&op2year='.$arraydatetouse['year'];
 				//if ($warning_delay >= 0) $url.='&amp;filter=expired';
 				$label = $langs->trans("BoardRunningServices");
@@ -3587,7 +3587,7 @@ class ContratLigne extends CommonObjectLine
 	 *  Activate a contract line
 	 *
 	 * @param   User 		$user 		Objet User who activate contract
-	 * @param  	int 		$date 		Date activation
+	 * @param  	int 		$date 		Date real activation
 	 * @param  	int|string 	$date_end 	Date planned end. Use '-1' to keep it unchanged.
 	 * @param   string 		$comment 	A comment typed by user
 	 * @return 	int                    	<0 if KO, >0 if OK
@@ -3602,13 +3602,13 @@ class ContratLigne extends CommonObjectLine
 		$this->db->begin();
 
 		$this->statut = ContratLigne::STATUS_OPEN;
-		$this->date_start = $date;
+		$this->date_start_real = $date;
 		$this->date_end = $date_end;
 		$this->fk_user_ouverture = $user->id;
 		$this->date_end_real = null;
 		$this->commentaire = $comment;
 
-		$sql = "UPDATE ".MAIN_DB_PREFIX."contratdet SET statut = ".$this->statut.",";
+		$sql = "UPDATE ".MAIN_DB_PREFIX."contratdet SET statut = ".((int) $this->statut).",";
 		$sql .= " date_ouverture = ".(dol_strlen($this->date_start_real) != 0 ? "'".$this->db->idate($this->date_start_real)."'" : "null").",";
 		if ($date_end >= 0) {
 			$sql .= " date_fin_validite = ".(dol_strlen($this->date_end) != 0 ? "'".$this->db->idate($this->date_end)."'" : "null").",";
@@ -3647,7 +3647,7 @@ class ContratLigne extends CommonObjectLine
 	 *  Close a contract line
 	 *
 	 * @param    User 	$user 			Objet User who close contract
-	 * @param  	 int 	$date_end_real 		Date end
+	 * @param  	 int 	$date_end_real 	Date end
 	 * @param    string $comment 		A comment typed by user
 	 * @param    int	$notrigger		1=Does not execute triggers, 0=Execute triggers
 	 * @return int                    	<0 if KO, >0 if OK
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index c14775449c6..c40453ec7af 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -194,7 +194,7 @@ foreach ($listofstatus as $status) {
 	if (empty($conf->use_javascript_ajax)) {
 		print '<tr class="oddeven">';
 		print '<td>'.$staticcontratligne->LibStatut($status, 0, ($bool ? 1 : 0)).'</td>';
-		print '<td class="right"><a href="services_list.php?mode='.$status.($bool ? '&filter=expired' : '').'">'.($nb[$status.$bool] ? $nb[$status.$bool] : 0).' '.$staticcontratligne->LibStatut($status, 3, ($bool ? 1 : 0)).'</a></td>';
+		print '<td class="right"><a href="services_list.php?search_status='.((int) $status).($bool ? '&filter=expired' : '').'">'.($nb[$status.$bool] ? $nb[$status.$bool] : 0).' '.$staticcontratligne->LibStatut($status, 3, ($bool ? 1 : 0)).'</a></td>';
 		print "</tr>\n";
 	}
 	if ($status == 4 && !$bool) {
@@ -224,7 +224,7 @@ foreach ($listofstatus as $status) {
 	if (empty($conf->use_javascript_ajax)) {
 		print '<tr class="oddeven">';
 		print '<td>'.$staticcontratligne->LibStatut($status, 0, ($bool ? 1 : 0)).'</td>';
-		print '<td class="right"><a href="services_list.php?mode='.$status.($bool ? '&filter=expired' : '').'">'.($nb[$status.$bool] ? $nb[$status.$bool] : 0).' '.$staticcontratligne->LibStatut($status, 3, ($bool ? 1 : 0)).'</a></td>';
+		print '<td class="right"><a href="services_list.php?search_status='.((int) $status).($bool ? '&filter=expired' : '').'">'.($nb[$status.$bool] ? $nb[$status.$bool] : 0).' '.$staticcontratligne->LibStatut($status, 3, ($bool ? 1 : 0)).'</a></td>';
 		if ($status == 4 && !$bool) {
 			$bool = true;
 		} else {
@@ -622,7 +622,7 @@ if ($resql) {
 	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder centpercent">';
 
-	print '<tr class="liste_titre"><th colspan="4">'.$langs->trans("ListOfExpiredServices").' <a href="'.DOL_URL_ROOT.'/contrat/services_list.php?mode=4&amp;filter=expired"><span class="badge">'.$num.'</span></a></th>';
+	print '<tr class="liste_titre"><th colspan="4">'.$langs->trans("ListOfExpiredServices").' <a href="'.DOL_URL_ROOT.'/contrat/services_list.php?search_status=4&amp;filter=expired"><span class="badge">'.$num.'</span></a></th>';
 	print "</tr>\n";
 
 	while ($i < $num) {
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 7ea26bf6f1b..38c37c1389e 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -63,7 +63,7 @@ $search_type_thirdparty = GETPOST("search_type_thirdparty", 'int');
 $search_contract = GETPOST('search_contract', 'alpha');
 $search_ref_customer = GETPOST('search_ref_customer', 'alpha');
 $search_ref_supplier = GETPOST('search_ref_supplier', 'alpha');
-$sall = (GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml');
+$search_all = (GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml');
 $search_status = GETPOST('search_status', 'alpha');
 $socid = GETPOST('socid', 'int');
 $search_user = GETPOST('search_user', 'int');
@@ -133,16 +133,23 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 // List of fields to search into when doing a "search in all"
-$fieldstosearchall = array(
-	'c.ref'=>'Ref',
-	'c.ref_customer'=>'RefCustomer',
-	'c.ref_supplier'=>'RefSupplier',
-	's.nom'=>"ThirdParty",
-	'c.note_public'=>'NotePublic',
-);
+$fieldstosearchall = array();
+foreach ($object->fields as $key => $val) {
+	if (!empty($val['searchall'])) {
+		$fieldstosearchall['c.'.$key] = $val['label'];
+	}
+}
+$fieldstosearchall["s.nom"] = "ThirdParty";
 if (empty($user->socid)) {
 	$fieldstosearchall["c.note_private"] = "NotePrivate";
 }
+$parameters = array('fieldstosearchall'=>$fieldstosearchall);
+$reshook = $hookmanager->executeHooks('completeFieldsToSearchAll', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook > 0) {
+	$fieldstosearchall = $hookmanager->resArray['fieldstosearchall'];
+} elseif ($reshook == 0) {
+	$fieldstosearchall = array_merge($fieldstosearchall, $hookmanager->resArray['fieldstosearchall']);
+}
 
 $arrayfields = array(
 	'c.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1, 'position'=>10),
@@ -167,9 +174,12 @@ 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->contrat->lire;
+$permissiontodelete = $user->rights->contrat->supprimer;
+
 
 /*
- * Action
+ * Actions
  */
 
 if (GETPOST('cancel', 'alpha')) {
@@ -213,7 +223,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$search_date_endyear = '';
 	$search_date_start = '';
 	$search_date_end = '';
-	$sall = "";
+	$search_all = "";
 	$search_status = "";
 	$toselect = array();
 	$search_type_thirdparty = '';
@@ -224,8 +234,6 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 if (empty($reshook)) {
 	$objectclass = 'Contrat';
 	$objectlabel = 'Contracts';
-	$permissiontoread = $user->rights->contrat->lire;
-	$permissiontodelete = $user->rights->contrat->supprimer;
 	$uploaddir = $conf->contrat->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
@@ -265,6 +273,9 @@ if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
+
+$sqlfields = $sql; // $sql fields to remove for count total
+
 $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)";
@@ -325,8 +336,8 @@ if ($search_country && $search_country != '-1') {
 if ($search_sale > 0) {
 	$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_all) {
+	$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 }
 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 = ".((int) $search_user);
@@ -456,13 +467,18 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 			}
 		}
 	} else {
-		$sqlforcount = preg_replace('/^SELECT[a-zA-Z0-9\._\s\(\),=<>\:\-\']+\sFROM/Ui', 'SELECT COUNT(*) as nbtotalofrecords FROM', $sql);
-		$sqlforcount = preg_replace('/LEFT JOIN '.MAIN_DB_PREFIX.'contratdet as cd ON c.rowid = cd.fk_contrat/', '', $sqlforcount);
+		/* The fast and low memory method to get and count full list converts the sql into a sql count */
+		$sqlforcount = preg_replace('/^'.preg_quote($sqlfields, '/').'/', 'SELECT COUNT(*) as nbtotalofrecords', $sql);
+		$sqlforcount = preg_replace('/LEFT JOIN '.MAIN_DB_PREFIX.'contratdet as cd ON c.rowid = cd.fk_contrat /', '', $sqlforcount);
 		$sqlforcount = preg_replace('/GROUP BY.*$/', '', $sqlforcount);
 
 		$resql = $db->query($sqlforcount);
-		$objforcount = $db->fetch_object($resql);
-		$nbtotalofrecords = $objforcount->nbtotalofrecords;
+		if ($resql) {
+			$objforcount = $db->fetch_object($resql);
+			$nbtotalofrecords = $objforcount->nbtotalofrecords;
+		} else {
+			dol_print_error($db);
+		}
 	}
 
 	if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
@@ -485,7 +501,7 @@ if (!$resql) {
 $num = $db->num_rows($resql);
 
 // Direct jump if only one record found
-if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall && !$page) {
+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.'/contrat/card.php?id='.$id);
@@ -520,8 +536,8 @@ if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 if ($limit > 0 && $limit != $conf->liste_limit) {
 	$param .= '&limit='.urlencode($limit);
 }
-if ($sall != '') {
-	$param .= '&sall='.urlencode($sall);
+if ($search_all != '') {
+	$param .= '&search_all='.urlencode($search_all);
 }
 if ($search_contract != '') {
 	$param .= '&search_contract='.urlencode($search_contract);
@@ -598,10 +614,10 @@ $arrayofmassactions = array(
 	'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
 	'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
 );
-if ($user->rights->contrat->supprimer) {
+if (!empty($permissiontodelete)) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
-if (in_array($massaction, array('presend', 'predelete'))) {
+if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
@@ -615,7 +631,7 @@ $newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars i
 $newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
 $newcardbutton .= dolGetButtonTitle($langs->trans('NewContractSubscription'), '', 'fa fa-plus-circle', $url, '', $user->rights->contrat->creer);
 
-print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
+print '<form method="POST" id="searchFormList" action="'.$_SERVER['PHP_SELF'].'">';
 if ($optioncss != '') {
 	print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 }
@@ -624,7 +640,9 @@ 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.'">';
+print '<input type="hidden" name="page_y" value="">';
 print '<input type="hidden" name="mode" value="'.$mode.'">';
 
 print_barre_liste($langs->trans("Contracts"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'contract', 0, $newcardbutton, '', $limit, 0, 0, 1);
@@ -635,11 +653,14 @@ $objecttmp = new Contrat($db);
 $trackid = 'con'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
-if ($sall) {
+if ($search_all) {
+	$setupstring = '';
 	foreach ($fieldstosearchall as $key => $val) {
 		$fieldstosearchall[$key] = $langs->trans($val);
+		$setupstring .= $key."=".$val.";";
 	}
-	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
+	print '<!-- Search done like if CONTRACT_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
+	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>'."\n";
 }
 
 $moreforfilter = '';
diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php
index fb50283991b..47818081448 100644
--- a/htdocs/contrat/services_list.php
+++ b/htdocs/contrat/services_list.php
@@ -36,6 +36,7 @@ require_once DOL_DOCUMENT_ROOT."/societe/class/societe.class.php";
 $langs->loadLangs(array('products', 'contracts', 'companies'));
 
 $optioncss = GETPOST('optioncss', 'aZ09');
+$mode = GETPOST("mode");
 
 $massaction = GETPOST('massaction', 'alpha');
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
@@ -55,11 +56,10 @@ if (!$sortorder) {
 	$sortorder = "ASC";
 }
 
-$mode = GETPOST("mode");
-$filter = GETPOST("filter");
+$filter = GETPOST("filter", 'alpha');
 $search_name = GETPOST("search_name", 'alpha');
 $search_subprice = GETPOST("search_subprice", 'alpha');
-$search_qty = GETPOST("search_name", 'alpha');
+$search_qty = GETPOST("search_qty", 'alpha');
 $search_total_ht = GETPOST("search_total_ht", 'alpha');
 $search_total_tva = GETPOST("search_total_tva", 'alpha');
 $search_total_ttc = GETPOST("search_total_ttc", 'alpha');
@@ -110,7 +110,6 @@ $result = restrictedArea($user, 'contrat', $contratid);
 
 if ($search_status != '') {
 	$tmp = explode('&', $search_status);
-	$mode = $tmp[0];
 	if (empty($tmp[1])) {
 		$filter = '';
 	} else {
@@ -121,14 +120,6 @@ if ($search_status != '') {
 			$filter = 'expired';
 		}
 	}
-} else {
-	$search_status = $mode;
-	if ($filter == 'expired') {
-		$search_status .= '&filter=expired';
-	}
-	if ($filter == 'notexpired') {
-		$search_status .= '&filter=notexpired';
-	}
 }
 
 $staticcontrat = new Contrat($db);
@@ -144,10 +135,10 @@ $arrayfields = array(
 	'cd.qty'=>array('label'=>"Qty", 'checked'=>1, 'position'=>108),
 	'cd.total_ht'=>array('label'=>"TotalHT", 'checked'=>-1, 'position'=>109, 'isameasure'=>1),
 	'cd.total_tva'=>array('label'=>"TotalVAT", 'checked'=>-1, 'position'=>110),
-	'cd.date_ouverture_prevue'=>array('label'=>"DateStartPlannedShort", 'checked'=>(($mode == "" || $mode == -1) || $mode == "0"), 'position'=>150),
-	'cd.date_ouverture'=>array('label'=>"DateStartRealShort", 'checked'=>(($mode == "" || $mode == -1) || $mode > 0), 'position'=>160),
-	'cd.date_fin_validite'=>array('label'=>"DateEndPlannedShort", 'checked'=>(($mode == "" || $mode == -1) || $mode < 5), 'position'=>170),
-	'cd.date_cloture'=>array('label'=>"DateEndRealShort", 'checked'=>(($mode == "" || $mode == -1) || $mode >= 5), 'position'=>180),
+	'cd.date_ouverture_prevue'=>array('label'=>"DateStartPlannedShort", 'checked'=>1, 'position'=>150),
+	'cd.date_ouverture'=>array('label'=>"DateStartRealShort", 'checked'=>1, 'position'=>160),
+	'cd.date_fin_validite'=>array('label'=>"DateEndPlannedShort", 'checked'=>1, 'position'=>170),
+	'cd.date_cloture'=>array('label'=>"DateEndRealShort", 'checked'=>1, 'position'=>180),
 	//'cd.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
 	'cd.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500),
 	'status'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000)
@@ -209,7 +200,6 @@ if (empty($reshook)) {
 		$opclotureday = "";
 		$opclotureyear = "";
 		$filter_opcloture = "";
-		$mode = '';
 		$filter = '';
 		$toselect = array();
 		$search_array_options = array();
@@ -275,13 +265,13 @@ $sql .= " AND c.fk_soc = s.rowid";
 if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 }
-if ($mode == "0") {
+if ($search_status == "0") {
 	$sql .= " AND cd.statut = 0";
 }
-if ($mode == "4") {
+if ($search_status == "4") {
 	$sql .= " AND cd.statut = 4";
 }
-if ($mode == "5") {
+if ($search_status == "5") {
 	$sql .= " AND cd.statut = 5";
 }
 if ($filter == "expired") {
@@ -294,7 +284,7 @@ if ($search_subprice) {
 	$sql .= natural_search("cd.subprice", $search_subprice, 1);
 }
 if ($search_qty) {
-	$sql .= natural_search("cd.total_qty", $search_qty, 1);
+	$sql .= natural_search("cd.qty", $search_qty, 1);
 }
 if ($search_total_ht) {
 	$sql .= natural_search("cd.total_ht", $search_total_ht, 1);
@@ -417,6 +407,9 @@ if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 if ($limit > 0 && $limit != $conf->liste_limit) {
 	$param .= '&limit='.$limit;
 }
+if ($mode) {
+	$param .= '&amp;mode='.urlencode($mode);
+}
 if ($search_contract) {
 	$param .= '&amp;search_contract='.urlencode($search_contract);
 }
@@ -441,8 +434,8 @@ if ($search_total_ttc) {
 if ($search_service) {
 	$param .= '&amp;search_service='.urlencode($search_service);
 }
-if ($mode) {
-	$param .= '&amp;mode='.urlencode($mode);
+if ($search_status) {
+	$param .= '&amp;search_status='.urlencode($search_status);
 }
 if ($filter) {
 	$param .= '&amp;filter='.urlencode($filter);
@@ -500,16 +493,16 @@ print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 $title = $langs->trans("ListOfServices");
-if ($mode == "0") {
+if ($search_status == "0") {
 	$title = $langs->trans("ListOfInactiveServices"); // Must use == "0"
 }
-if ($mode == "4" && $filter != "expired") {
+if ($search_status == "4" && $filter != "expired") {
 	$title = $langs->trans("ListOfRunningServices");
 }
-if ($mode == "4" && $filter == "expired") {
+if ($search_status == "4" && $filter == "expired") {
 	$title = $langs->trans("ListOfExpiredServices");
 }
-if ($mode == "5") {
+if ($search_status == "5") {
 	$title = $langs->trans("ListOfClosedServices");
 }
 
@@ -563,7 +556,7 @@ if (!empty($arrayfields['c.ref']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<input type="hidden" name="filter" value="'.$filter.'">';
 	print '<input type="hidden" name="mode" value="'.$mode.'">';
-	print '<input type="text" class="flat" size="3" name="search_contract" value="'.dol_escape_htmltag($search_contract).'">';
+	print '<input type="text" class="flat maxwidth75" name="search_contract" value="'.dol_escape_htmltag($search_contract).'">';
 	print '</td>';
 }
 // Service label
@@ -822,6 +815,9 @@ while ($i < min($num, $limit)) {
 		if (!$i) {
 			$totalarray['pos'][$totalarray['nbfield']] = 'cd.qty';
 		}
+		if (!$i) {
+			$totalarray['val']['cd.qty'] = $obj->qty;
+		}
 		$totalarray['val']['cd.qty'] += $obj->qty;
 	}
 	if (!empty($arrayfields['cd.total_ht']['checked'])) {
@@ -961,6 +957,17 @@ while ($i < min($num, $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.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
+}
+
 $db->free($resql);
 
 $parameters = array('sql' => $sql);
diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index ab041e63385..55d7ec6fdcf 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -753,7 +753,7 @@ if (!$error && $massaction == "builddoc" && $permissiontoread && !GETPOST('butto
 		$arrayofinclusion[] = '^'.preg_quote(dol_sanitizeFileName($tmppdf), '/').'\.pdf$';
 	}
 	foreach ($listofobjectref as $tmppdf) {
-		$arrayofinclusion[] = '^'.preg_quote(dol_sanitizeFileName($tmppdf), '/').'_[a-zA-Z0-9-_]+\.pdf$'; // To include PDF generated from ODX files
+		$arrayofinclusion[] = '^'.preg_quote(dol_sanitizeFileName($tmppdf), '/').'_[a-zA-Z0-9\-\_\']+\.pdf$'; // To include PDF generated from ODX files
 	}
 	$listoffiles = dol_dir_list($uploaddir, 'all', 1, implode('|', $arrayofinclusion), '\.meta$|\.png', 'date', SORT_DESC, 0, true);
 
diff --git a/htdocs/core/boxes/box_members_by_tags.php b/htdocs/core/boxes/box_members_by_tags.php
new file mode 100644
index 00000000000..196cec30738
--- /dev/null
+++ b/htdocs/core/boxes/box_members_by_tags.php
@@ -0,0 +1,278 @@
+<?php
+/* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2015-2020 Frederic France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2021-2022 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/>.
+ */
+
+/**
+ *	\file       htdocs/core/boxes/box_members_by_tags.php
+ *	\ingroup    adherent
+ *	\brief      Module to show box of members
+ */
+
+include_once DOL_DOCUMENT_ROOT . '/core/boxes/modules_boxes.php';
+
+
+/**
+ * Class to manage the box to show last modofied members
+ */
+class box_members_by_tags extends ModeleBoxes
+{
+	public $boxcode = "box_members_by_tags";
+	public $boximg = "object_user";
+	public $boxlabel = "BoxTitleMembersByTags";
+	public $depends = array("adherent", "categorie");
+
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
+
+	public $param;
+	public $enabled = 1;
+
+	public $info_box_head = array();
+	public $info_box_contents = array();
+
+
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB	$db      	Database handler
+	 *  @param	string	$param		More parameters
+	 */
+	public function __construct($db, $param = '')
+	{
+		global $conf, $user;
+
+		$this->db = $db;
+
+		// disable module for such cases
+		$listofmodulesforexternal = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);
+		if (!in_array('adherent', $listofmodulesforexternal) && !empty($user->socid)) {
+			$this->enabled = 0; // disabled for external users
+		}
+
+		$this->hidden = !(isModEnabled('adherent') && $user->rights->adherent->lire);
+	}
+
+	/**
+	 *  Load data into info_box_contents array to show array later.
+	 *
+	 *  @param	int		$max        Maximum number of records to load
+	 *  @return	void
+	 */
+	public function loadBox($max = 5)
+	{
+		global $user, $langs, $conf;
+		$langs->load("boxes");
+
+		$this->max = $max;
+
+		include_once DOL_DOCUMENT_ROOT . '/adherents/class/adherent.class.php';
+		$staticmember = new Adherent($this->db);
+
+		$year = date('Y');
+		$numberyears = empty(getDolGlobalInt("MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH")) ? 2 : getDolGlobalInt("MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH");
+
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleMembersByTags").' ('.$year-$numberyears.' - '.$year.')');
+
+		if ($user->rights->adherent->lire) {
+			require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherentstats.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+			$stats = new AdherentStats($this->db, $user->socid, $user->id);
+
+			// Show array
+			$sumMembers= $stats->countMembersByTagAndStatus($numberyears);
+			if ($sumMembers) {
+				$line = 0;
+				$this->info_box_contents[$line][] = array(
+					'td' => 'class=""',
+					'text' => '',
+				);
+				// Members Status To Valid
+				$labelstatus = $staticmember->LibStatut($staticmember::STATUS_DRAFT, 0, 0, 1);
+				$this->info_box_contents[$line][] = array(
+					'td' => 'class="right tdoverflowmax100" width="10%" title="'.dol_escape_htmltag($labelstatus).'"',
+					'text' => $labelstatus
+				);
+				// Waiting for subscription
+				$labelstatus = $staticmember->LibStatut($staticmember::STATUS_VALIDATED, 1, 0, 1);
+				$this->info_box_contents[$line][] = array(
+					'td' => 'class="right tdoverflowmax100" width="10%" title="'.dol_escape_htmltag($labelstatus).'"',
+					'text' => $labelstatus,
+				);
+				// Up to date
+				$labelstatus = $staticmember->LibStatut($staticmember::STATUS_VALIDATED, 1, dol_now() + 86400, 1);
+				$this->info_box_contents[$line][] = array(
+					'td' => 'class="right tdoverflowmax100" width="10%" title="'.dol_escape_htmltag($labelstatus).'"',
+					'text' => $labelstatus,
+				);
+				// Expired
+				$labelstatus = $staticmember->LibStatut($staticmember::STATUS_VALIDATED, 1, dol_now() - 86400, 1);
+				$this->info_box_contents[$line][] = array(
+					'td' => 'class="right tdoverflowmax100" width="10%" title="'.dol_escape_htmltag($labelstatus).'"',
+					'text' => $labelstatus
+				);
+				// Excluded
+				$labelstatus = $staticmember->LibStatut($staticmember::STATUS_EXCLUDED, 0, 0, 1);
+				$this->info_box_contents[$line][] = array(
+					'td' => 'class="right tdoverflowmax100" width="10%" title="'.dol_escape_htmltag($labelstatus).'"',
+					'text' => $labelstatus
+				);
+				// Resiliated
+				$labelstatus = $staticmember->LibStatut($staticmember::STATUS_RESILIATED, 0, 0, 1);
+				$this->info_box_contents[$line][] = array(
+					'td' => 'class="right tdoverflowmax100" width="10%" title="'.dol_escape_htmltag($labelstatus).'"',
+					'text' => $labelstatus
+				);
+				// Total row
+				$labelstatus = $staticmember->LibStatut($staticmember::STATUS_RESILIATED, 0, 0, 1);
+				$this->info_box_contents[$line][] = array(
+					'td' => 'class="right tdoverflowmax100" width="10%" title="'.dol_escape_htmltag($langs->trans("Total")).'"',
+					'text' => $langs->trans("Total")
+				);
+				$line++;
+				foreach ($sumMembers as $key => $data) {
+					$adhtype = new AdherentType($this->db);
+					$adhtype->id = $key;
+
+					if ($key=='total') {
+						break;
+					}
+					$adhtype->label = $data['label'];
+					$AdherentType[$key] = $adhtype;
+
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
+						'text' => $adhtype->getNomUrl(1, dol_size(32)),
+						'asis' => 1,
+					);
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => (isset($data['members_draft']) && $data['members_draft'] > 0 ? $data['members_draft'] : '') . ' ' . $staticmember->LibStatut(Adherent::STATUS_DRAFT, 1, 0, 3),
+						'asis' => 1,
+					);
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => (isset($data['members_pending']) && $data['members_pending'] > 0 ? $data['members_pending'] : '') . ' ' . $staticmember->LibStatut(Adherent::STATUS_VALIDATED, 1, $now, 3),
+						'asis' => 1,
+					);
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => (isset($data['members_uptodate']) && $data['members_uptodate'] > 0 ? $data['members_uptodate'] : '') . ' ' . $staticmember->LibStatut(Adherent::STATUS_VALIDATED, 0, 0, 3),
+						'asis' => 1,
+					);
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => (isset($data['members_expired']) && $data['members_expired'] > 0 ? $data['members_expired'] : '') . ' ' . $staticmember->LibStatut(Adherent::STATUS_VALIDATED, 1, 1, 3),
+						'asis' => 1,
+					);
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => (isset($data['members_excluded']) && $data['members_excluded'] > 0 ? $data['members_excluded'] : '') . ' ' . $staticmember->LibStatut(Adherent::STATUS_EXCLUDED, 1, $now, 3),
+						'asis' => 1,
+					);
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => (isset($data['members_resiliated']) && $data['members_resiliated'] > 0 ? $data['members_resiliated'] : '') . ' ' . $staticmember->LibStatut(Adherent::STATUS_RESILIATED, 1, 0, 3),
+						'asis' => 1,
+					);
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => (isset($data['total_adhtype']) && $data['total_adhtype'] > 0 ? $data['total_adhtype'] : ''),
+						'asis' => 1,
+					);
+					$line++;
+				}
+
+				if (count($sumMembers) == 0) {
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'class="center" colspan="6"',
+						'text' => $langs->trans("NoRecordedMembersByType")
+					);
+				} else {
+					$this->info_box_contents[$line][] = array(
+						'tr' => 'class="liste_total"',
+						'td' => 'class="liste_total"',
+						'text' => $langs->trans("Total")
+					);
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="liste_total right"',
+						'text' => $sumMembers['total']['members_draft'].' '.$staticmember->LibStatut(Adherent::STATUS_DRAFT, 1, 0, 3),
+						'asis' => 1
+					);
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="liste_total right"',
+						'text' => $sumMembers['total']['members_pending'].' '.$staticmember->LibStatut(Adherent::STATUS_VALIDATED, 1, $now, 3),
+						'asis' => 1
+					);
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="liste_total right"',
+						'text' => $sumMembers['total']['members_uptodate'].' '.$staticmember->LibStatut(Adherent::STATUS_VALIDATED, 0, 0, 3),
+						'asis' => 1
+					);
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="liste_total right"',
+						'text' => $sumMembers['total']['members_expired'].' '.$staticmember->LibStatut(Adherent::STATUS_VALIDATED, 1, 1, 3),
+						'asis' => 1
+					);
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="liste_total right"',
+						'text' => $sumMembers['total']['members_excluded'].' '.$staticmember->LibStatut(Adherent::STATUS_EXCLUDED, 1, 0, 3),
+						'asis' => 1
+					);
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="liste_total right"',
+						'text' => $sumMembers['total']['members_resiliated'].' '.$staticmember->LibStatut(Adherent::STATUS_RESILIATED, 1, 0, 3),
+						'asis' => 1
+					);
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="liste_total right"',
+						'text' => $sumMembers['total']['all'],
+						'asis' => 1
+					);
+				}
+			} else {
+				$this->info_box_contents[0][0] = array(
+					'td' => '',
+					'maxlength' => 500,
+					'text' => ($this->db->error() . ' sql=' . $sql)
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
+		}
+	}
+
+	/**
+	 *	Method to show box
+	 *
+	 *	@param	array	$head       Array with properties of box title
+	 *	@param  array	$contents   Array with properties of box lines
+	 *  @param	int		$nooutput	No print, only return string
+	 *	@return	string
+	 */
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
+}
diff --git a/htdocs/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php
index 1a29c8e1389..96928adfdff 100644
--- a/htdocs/core/boxes/modules_boxes.php
+++ b/htdocs/core/boxes/modules_boxes.php
@@ -464,6 +464,7 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
 				closedir($handle);
 			}
 		}
+		//echo "<pre>";print_r($modules);echo "</pre>";
 
 		asort($orders);
 
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 7c136f446d9..da529e33d0e 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -443,7 +443,7 @@ abstract class CommonDocGenerator
 			}
 		}
 
-		$date = ($object->element == 'contrat' ? $object->date_contrat : $object->date);
+		$date = (isset($object->element) && $object->element == 'contrat' && isset($object->date_contrat)) ? $object->date_contrat : (isset($object->date) ? $object->date : null);
 
 		$resarray = array(
 			$array_key.'_id'=>$object->id,
@@ -452,7 +452,7 @@ abstract class CommonDocGenerator
 			$array_key.'_ref_ext' => (property_exists($object, 'ref_ext') ? $object->ref_ext : ''),
 			$array_key.'_ref_customer'=>(!empty($object->ref_client) ? $object->ref_client : (empty($object->ref_customer) ? '' : $object->ref_customer)),
 			$array_key.'_ref_supplier'=>(!empty($object->ref_fournisseur) ? $object->ref_fournisseur : (empty($object->ref_supplier) ? '' : $object->ref_supplier)),
-			$array_key.'_source_invoice_ref'=>$invoice_source->ref,
+			$array_key.'_source_invoice_ref'=>((empty($invoice_source) || empty($invoice_source->ref)) ? '' : $invoice_source->ref),
 			// Dates
 			$array_key.'_hour'=>dol_print_date($date, 'hour'),
 			$array_key.'_date'=>dol_print_date($date, 'day'),
@@ -1104,7 +1104,7 @@ abstract class CommonDocGenerator
 	public function getColumnContentXStart($colKey)
 	{
 		$colDef = $this->cols[$colKey];
-		return  $colDef['xStartPos'] + $colDef['content']['padding'][3];
+		return  (isset($colDef['xStartPos']) ? $colDef['xStartPos'] : 0) + $colDef['content']['padding'][3];
 	}
 
 	/**
@@ -1279,7 +1279,7 @@ abstract class CommonDocGenerator
 		$extrafieldOptionsKey = $extrafieldsKeyPrefix.$extrafieldKey;
 
 
-		// Load extrafiels if not allready does
+		// Load extra fields if they haven't been loaded already.
 		if (empty($this->extrafieldsCache)) {
 			$this->extrafieldsCache = new ExtraFields($this->db);
 		}
@@ -1605,7 +1605,7 @@ abstract class CommonDocGenerator
 			return 0;
 		}
 
-		// Load extrafiels if not allready does
+		// Load extra fields if they haven't been loaded already.
 		if (empty($this->extrafieldsCache)) {
 			$this->extrafieldsCache = new ExtraFields($this->db);
 		}
@@ -1615,7 +1615,7 @@ abstract class CommonDocGenerator
 		$extrafields = $this->extrafieldsCache;
 
 
-		if (!empty($extrafields->attributes[$object->table_element]) && is_array($extrafields->attributes[$object->table_element]['label'])) {
+		if (!empty($extrafields->attributes[$object->table_element]) && is_array($extrafields->attributes[$object->table_element]) && array_key_exists('label', $extrafields->attributes[$object->table_element]) && is_array($extrafields->attributes[$object->table_element]['label'])) {
 			foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $label) {
 				// Dont display separator yet even is set to be displayed (not compatible yet)
 				if ($extrafields->attributes[$object->table_element]['type'][$key] == 'separate') {
diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index 17c9c7deae3..dd0ec988062 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -332,6 +332,7 @@ abstract class CommonInvoice extends CommonObject
 		$field = 'fk_facture';
 		$field2 = 'fk_paiement';
 		$field3 = ', p.ref_ext';
+		$field4 = ', p.fk_bank'; // Bank line id
 		$sharedentity = 'facture';
 		if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') {
 			$table = 'paiementfourn_facturefourn';
@@ -342,7 +343,7 @@ abstract class CommonInvoice extends CommonObject
 			$sharedentity = 'facture_fourn';
 		}
 
-		$sql = "SELECT p.ref, pf.amount, pf.multicurrency_amount, p.fk_paiement, p.datep, p.num_paiement as num, t.code".$field3;
+		$sql = "SELECT p.ref, pf.amount, pf.multicurrency_amount, p.fk_paiement, p.datep, p.num_paiement as num, t.code".$field3 . $field4;
 		$sql .= " FROM ".$this->db->prefix().$table." as pf, ".$this->db->prefix().$table2." as p, ".$this->db->prefix()."c_paiement as t";
 		$sql .= " WHERE pf.".$field." = ".((int) $this->id);
 		$sql .= " AND pf.".$field2." = p.rowid";
@@ -363,6 +364,9 @@ abstract class CommonInvoice extends CommonObject
 				if (!empty($field3)) {
 					$tmp['ref_ext'] = $obj->ref_ext;
 				}
+				if (!empty($field4)) {
+					$tmp['fk_bank_line'] = $obj->fk_bank;
+				}
 				$retarray[] = $tmp;
 				$i++;
 			}
@@ -1079,10 +1083,12 @@ abstract class CommonInvoice extends CommonObject
 									if ($companypaymentmode->type == 'ban') {
 										$sepaMode = true;
 										// Check into societe_rib if a payment mode for Stripe and ban payment exists
+										// To make a Stripe SEPA payment request, we must have the payment mode source already saved into societe_rib and retreived with ->sepaStripe
+										// The payment mode source is created when we create the bank account on Stripe with paymentmodes.php?action=create
 										$stripecard = $stripe->sepaStripe($customer, $companypaymentmode, $stripeacc, $servicestatus, 0);
 									}
 
-									if ($stripecard) {  // Can be src_... (for sepa). Note that card_... (old card mode) or pm_... (new card mode) should not happen here.
+									if ($stripecard) {  // Can be src_... (for sepa) or pm_... (new card mode). Note that card_... (old card mode) should not happen here.
 										$FULLTAG = 'INV=' . $this->id . '-CUS=' . $thirdparty->id;
 										$description = 'Stripe payment from makeStripeSepaRequest: ' . $FULLTAG . ' ref=' . $this->ref;
 
@@ -1097,7 +1103,7 @@ abstract class CommonInvoice extends CommonObject
 										$paymentintent = $stripe->getPaymentIntent($amounttopay, $currency, $FULLTAG, $description, $this, $customer->id, $stripeacc, $servicestatus, 0, 'automatic', true, $stripecard->id, 1);
 
 										$charge = new stdClass();
-										//erics add processing sepa is like success ?
+
 										if ($paymentintent->status === 'succeeded' || $paymentintent->status === 'processing') {
 											$charge->status = 'ok';
 											$charge->id = $paymentintent->id;
@@ -1173,9 +1179,9 @@ abstract class CommonInvoice extends CommonObject
 											$postactionmessages[] = $errmsg . ' (' . $stripearrayofkeys['publishable_key'] . ')';
 											$this->errors[] = $errmsg;
 										} else {
-											dol_syslog('Successfuly charge direct debit ' . $stripecard->id);
+											dol_syslog('Successfuly request direct debit ' . $stripecard->id);
 
-											$postactionmessages[] = 'Success to charge direct debit (' . $charge->id . ' with ' . $stripearrayofkeys['publishable_key'] . ')';
+											$postactionmessages[] = 'Success to request direct debit (' . $charge->id . ' with ' . $stripearrayofkeys['publishable_key'] . ')';
 
 											// Save a stripe payment was done in realy life so later we will be able to force a commit on recorded payments
 											// even if in batch mode (method doTakePaymentStripe), we will always make all action in one transaction with a forced commit.
@@ -1185,7 +1191,7 @@ abstract class CommonInvoice extends CommonObject
 											$description = 'Stripe payment request OK (' . $charge->id . ') from makeStripeSepaRequest: ' . $FULLTAG;
 
 
-											// TODO Save request to status pending. Done should be set with a webhook.
+											// @TODO LMR Save request to status pending instead of done. Done should be set with a webhook.
 
 
 											$db = $this->db;
@@ -1227,6 +1233,7 @@ abstract class CommonInvoice extends CommonObject
 											$ispostactionok = 1;
 
 											// Creation of payment line
+											// TODO LMR This must be move into the stripe server listening hooks public/stripe/ipn.php
 											include_once DOL_DOCUMENT_ROOT . '/compta/paiement/class/paiement.class.php';
 											$paiement = new Paiement($this->db);
 											$paiement->datepaye = $now;
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 88fefed035f..25f16cbbdb4 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -961,27 +961,6 @@ abstract class CommonObject
 					}
 					$outdone++;
 				}
-			} else {	// Old code to remove
-				if (!empty($this->skype)) {
-					$outsocialnetwork .= dol_print_socialnetworks($this->skype, $this->id, $object->id, 'skype');
-				}
-				$outdone++;
-				if (!empty($this->jabberid)) {
-					$outsocialnetwork .= dol_print_socialnetworks($this->jabberid, $this->id, $object->id, 'jabber');
-				}
-				$outdone++;
-				if (!empty($this->twitter)) {
-					$outsocialnetwork .= dol_print_socialnetworks($this->twitter, $this->id, $object->id, 'twitter');
-				}
-				$outdone++;
-				if (!empty($this->facebook)) {
-					$outsocialnetwork .= dol_print_socialnetworks($this->facebook, $this->id, $object->id, 'facebook');
-				}
-				$outdone++;
-				if (!empty($this->linkedin)) {
-					$outsocialnetwork .= dol_print_socialnetworks($this->linkedin, $this->id, $object->id, 'linkedin');
-				}
-				$outdone++;
 			}
 
 			if ($outsocialnetwork) {
@@ -1291,11 +1270,11 @@ abstract class CommonObject
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *    Delete all links between an object $this and all its contacts
+	 *    Delete all links between an object $this and all its contacts in llx_element_contact
 	 *
 	 *	  @param	string	$source		'' or 'internal' or 'external'
 	 *	  @param	string	$code		Type of contact (code or id)
-	 *    @return   int					>0 if OK, <0 if KO
+	 *    @return   int					<0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function delete_linked_contact($source = '', $code = '')
 	{
@@ -1311,11 +1290,15 @@ abstract class CommonObject
 			$listId = implode(",", $temp);
 		}
 
+		// If $listId is empty, we have not criteria on fk_c_type_contact so we will delete record on element_id for
+		// any type or record instead of only the ones of the current object. So we do nothing in such a case.
+		if (empty($listId)) {
+			return 0;
+		}
+
 		$sql = "DELETE FROM ".$this->db->prefix()."element_contact";
 		$sql .= " WHERE element_id = ".((int) $this->id);
-		if (!empty($listId)) {
-			$sql .= " AND fk_c_type_contact IN (".$this->db->sanitize($listId).")";
-		}
+		$sql .= " AND fk_c_type_contact IN (".$this->db->sanitize($listId).")";
 
 		dol_syslog(get_class($this)."::delete_linked_contact", LOG_DEBUG);
 		if ($this->db->query($sql)) {
@@ -8652,7 +8635,10 @@ abstract class CommonObject
 						// Find name of thumb file
 						$photo_vignette = basename(getImageFileNameForSize($dir.$file, '_small'));
 						if (!dol_is_file($dirthumb.$photo_vignette)) {
-							$photo_vignette = '';
+							// The thumb does not exists, so we will use the original file
+							$dirthumb = $dir;
+							$pdirthumb = $pdir;
+							$photo_vignette = basename($file);
 						}
 
 						// Get filesize of original file
diff --git a/htdocs/core/class/commonsocialnetworks.class.php b/htdocs/core/class/commonsocialnetworks.class.php
index eeb6583ca65..4ec32194f3d 100644
--- a/htdocs/core/class/commonsocialnetworks.class.php
+++ b/htdocs/core/class/commonsocialnetworks.class.php
@@ -27,6 +27,12 @@
  */
 trait CommonSocialNetworks
 {
+	/**
+	 * @var array array of socialnetworks
+	 */
+	public $socialnetworks;
+
+
 	/**
 	 * Show social network part if the module is enabled with hiding functionality
 	 *
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 74d8b089223..bec9c85d5dc 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -785,6 +785,11 @@ class Conf
 				$this->global->USE_STRICT_CSV_RULES = 2;
 			}
 
+			// By default, option is on. Once set by user, this code is useless
+			if (!isset($this->global->ACCOUNTING_REEXPORT)) {
+				$this->global->ACCOUNTING_REEXPORT = 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;
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index bbc30468e7a..c6cf71fbe44 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5109,7 +5109,7 @@ class Form
 						$more .= '</div></div>'."\n";
 					} elseif ($input['type'] == 'checkbox') {
 						$more .= '<div class="tagtr">';
-						$more .= '<div class="tagtd'.(empty($input['tdclass']) ? '' : (' '.$input['tdclass'])).'">'.$input['label'].' </div><div class="tagtd">';
+						$more .= '<div class="tagtd'.(empty($input['tdclass']) ? '' : (' '.$input['tdclass'])).'"><label for="'.dol_escape_htmltag($input['name']).'">'.$input['label'].'</label></div><div class="tagtd">';
 						$more .= '<input type="checkbox" class="flat'.($morecss ? ' '.$morecss : '').'" id="'.dol_escape_htmltag($input['name']).'" name="'.dol_escape_htmltag($input['name']).'"'.$moreattr;
 						if (!is_bool($input['value']) && $input['value'] != 'false' && $input['value'] != '0' && $input['value'] != '') {
 							$more .= ' checked';
@@ -6287,7 +6287,7 @@ class Form
 		if (!empty($conf->global->SERVICE_ARE_ECOMMERCE_200238EC)) {    // If option to have vat for end customer for services is on
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 			if (!isInEEC($societe_vendeuse) && (!is_object($societe_acheteuse) || (isInEEC($societe_acheteuse) && !$societe_acheteuse->isACompany()))) {
-				// We also add the buyer
+				// We also add the buyer country code
 				if (is_numeric($type)) {
 					if ($type == 1) { // We know product is a service
 						$code_country .= ",'".$societe_acheteuse->country_code."'";
@@ -7801,7 +7801,7 @@ class Form
 	}
 
 	/**
-	 * Function to forge a SQL criteria
+	 * Function to forge a SQL criteria from a Dolibarr filter syntax string.
 	 *
 	 * @param  array    $matches       Array of found string by regex search. Example: "t.ref:like:'SO-%'" or "t.date_creation:<:'20160101'" or "t.nature:is:NULL"
 	 * @return string                  Forged criteria. Example: "t.field like 'abc%'"
@@ -7816,17 +7816,30 @@ class Form
 		}
 		$tmp = explode(':', $matches[1]);
 		if (count($tmp) < 3) {
-			return '';
+			return '1=2';	// An always false request
 		}
 
 		$tmpescaped = $tmp[2];
 		$regbis = array();
+
 		if (preg_match('/^\'(.*)\'$/', $tmpescaped, $regbis)) {
 			$tmpescaped = "'".$db->escape($regbis[1])."'";
 		} else {
 			$tmpescaped = $db->escape($tmpescaped);
 		}
-		return $db->escape($tmp[0]).' '.strtoupper($db->escape($tmp[1]))." ".$tmpescaped;
+
+		if ($tmp[1] == '!=') {
+			$tmp[1] = '<>';
+		}
+
+		if (preg_match('/[\(\)]/', $tmp[0])) {
+			return '1=2';	// An always false request
+		}
+		if (! in_array($tmp[1], array('<', '>', '<>', 'is', 'isnot', '=', 'like'))) {
+			return '1=2';	// An always false request
+		}
+
+		return $db->escape($tmp[0]).' '.strtoupper($db->escape($tmp[1])).' '.$tmpescaped;
 	}
 
 	/**
diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index e9d38796589..dc82e3bf4cf 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -39,6 +39,9 @@ class FormProjets
 	 */
 	public $error = '';
 
+	public $errors = array();
+
+
 	public $nboftasks;
 
 
@@ -622,6 +625,8 @@ class FormProjets
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
+			$sellist = '';
+
 			if ($num > 0) {
 				$sellist = '<select class="flat elementselect css'.$table_element.($morecss ? ' '.$morecss : '').'" name="elementselect">';
 				$sellist .= '<option value="-1"'.($placeholder ? ' class="optiongrey"' : '').'>'.$placeholder.'</option>';
diff --git a/htdocs/core/class/html.formsetup.class.php b/htdocs/core/class/html.formsetup.class.php
index 60499845de0..40dec1870a4 100644
--- a/htdocs/core/class/html.formsetup.class.php
+++ b/htdocs/core/class/html.formsetup.class.php
@@ -21,7 +21,6 @@
  */
 class FormSetup
 {
-
 	/**
 	 * @var DoliDB Database handler.
 	 */
@@ -1082,16 +1081,18 @@ class FormSetupItem
 				}
 			}
 		} elseif (preg_match('/emailtemplate:/', $this->type)) {
-			include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
-			$formmail = new FormMail($this->db);
+			if ($this->fieldValue > 0) {
+				include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
+				$formmail = new FormMail($this->db);
 
-			$tmp = explode(':', $this->type);
+				$tmp = explode(':', $this->type);
 
-			$template = $formmail->getEMailTemplate($this->db, $tmp[1], $user, $this->langs, $this->fieldValue);
-			if (is_numeric($template) && $template < 0) {
-				$this->setErrors($formmail->errors);
+				$template = $formmail->getEMailTemplate($this->db, $tmp[1], $user, $this->langs, $this->fieldValue);
+				if (is_numeric($template) && $template < 0) {
+					$this->setErrors($formmail->errors);
+				}
+				$out.= $this->langs->trans($template->label);
 			}
-			$out.= $this->langs->trans($template->label);
 		} elseif (preg_match('/category:/', $this->type)) {
 			require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 			$c = new Categorie($this->db);
@@ -1117,6 +1118,7 @@ class FormSetupItem
 			}
 		} elseif ($this->type == 'product') {
 			require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+
 			$product = new Product($this->db);
 			$resprod = $product->fetch($this->fieldValue);
 			if ($resprod > 0) {
diff --git a/htdocs/core/class/ldap.class.php b/htdocs/core/class/ldap.class.php
index 9ad06ba137c..8b3c9177d3e 100644
--- a/htdocs/core/class/ldap.class.php
+++ b/htdocs/core/class/ldap.class.php
@@ -1291,7 +1291,6 @@ class Ldap
 			$this->firstname  = $this->convToOutputCharset($result[0][$this->attr_firstname][0], $this->ldapcharset);
 			$this->login      = $this->convToOutputCharset($result[0][$this->attr_login][0], $this->ldapcharset);
 			$this->phone      = $this->convToOutputCharset($result[0][$this->attr_phone][0], $this->ldapcharset);
-			$this->skype      = $this->convToOutputCharset($result[0][$this->attr_skype][0], $this->ldapcharset);
 			$this->fax        = $this->convToOutputCharset($result[0][$this->attr_fax][0], $this->ldapcharset);
 			$this->mail       = $this->convToOutputCharset($result[0][$this->attr_mail][0], $this->ldapcharset);
 			$this->mobile     = $this->convToOutputCharset($result[0][$this->attr_mobile][0], $this->ldapcharset);
diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php
index d34aca48ed9..593fa770536 100644
--- a/htdocs/core/db/mysqli.class.php
+++ b/htdocs/core/db/mysqli.class.php
@@ -705,7 +705,7 @@ class DoliDBMysqli extends DoliDB
 		}
 		$tmpdatabase = preg_replace('/[^a-z0-9\.\-\_]/i', '', $database);
 
-		$sql = "SHOW TABLES FROM ".$tmpdatabase." ".$like.";";
+		$sql = "SHOW TABLES FROM `".$tmpdatabase."` ".$like.";";
 		//print $sql;
 		$result = $this->query($sql);
 		if ($result) {
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 1076d32602f..4be0fd2006f 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1433,13 +1433,17 @@ function dol_string_nounprintableascii($str, $removetabcrlf = 1)
 /**
  *  Returns text escaped for inclusion into javascript code
  *
- *  @param      string		$stringtoescape		String to escape
- *  @param		int		$mode				0=Escape also ' and " into ', 1=Escape ' but not " for usage into 'string', 2=Escape " but not ' for usage into "string", 3=Escape ' and " with \
- *  @param		int		$noescapebackslashn	0=Escape also \n. 1=Do not escape \n.
- *  @return     string     		 				Escaped string. Both ' and " are escaped into ' if they are escaped.
+ *  @param      string	$stringtoescape			String to escape
+ *  @param		int		$mode					0=Escape also ' and " into ', 1=Escape ' but not " for usage into 'string', 2=Escape " but not ' for usage into "string", 3=Escape ' and " with \
+ *  @param		int		$noescapebackslashn		0=Escape also \n. 1=Do not escape \n.
+ *  @return     string   		 				Escaped string. Both ' and " are escaped into ' if they are escaped.
  */
 function dol_escape_js($stringtoescape, $mode = 0, $noescapebackslashn = 0)
 {
+	if (is_null($stringtoescape)) {
+		return '';
+	}
+
 	// escape quotes and backslashes, newlines, etc.
 	$substitjs = array("&#039;"=>"\\'", "\r"=>'\\r');
 	//$substitjs['</']='<\/';	// We removed this. Should be useless.
@@ -4085,7 +4089,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'delete', 'dolly', 'dollyrevert', 'donation', 'download', 'dynamicprice',
 				'edit', 'ellipsis-h', 'email', 'entity', 'envelope', 'eraser', 'establishment', 'expensereport', 'external-link-alt', 'external-link-square-alt', 'eye',
 				'filter', 'file-code', 'file-export', 'file-import', 'file-upload', 'autofill', 'folder', 'folder-open', 'folder-plus',
-				'generate', 'globe', 'globe-americas', 'graph', 'grip', 'grip_title', 'group',
+				'gears', 'generate', 'globe', 'globe-americas', 'graph', 'grip', 'grip_title', 'group',
 				'help', 'holiday',
 				'id-card', 'images', 'incoterm', 'info', 'intervention', 'inventory', 'intracommreport', 'knowledgemanagement',
 				'label', 'language', 'line', 'link', 'list', 'list-alt', 'listlight', 'loan', 'lock', 'lot', 'long-arrow-alt-right',
@@ -5743,9 +5747,9 @@ function price($amount, $form = 0, $outlangs = '', $trunc = 1, $rounding = -1, $
 
 	// If force rounding
 	if ((string) $forcerounding != '-1') {
-		if ($forcerounding == 'MU') {
+		if ($forcerounding === 'MU') {
 			$nbdecimal = $conf->global->MAIN_MAX_DECIMALS_UNIT;
-		} elseif ($forcerounding == 'MT') {
+		} elseif ($forcerounding === 'MT') {
 			$nbdecimal = $conf->global->MAIN_MAX_DECIMALS_TOT;
 		} elseif ($forcerounding >= 0) {
 			$nbdecimal = $forcerounding;
@@ -6490,7 +6494,7 @@ function get_default_tva(Societe $thirdparty_seller, Societe $thirdparty_buyer,
 	if (!empty($conf->global->SERVICE_ARE_ECOMMERCE_200238EC)) {
 		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)) {
+			if ($isacompany && getDolGlobalString('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;
@@ -6539,7 +6543,7 @@ function get_default_tva(Societe $thirdparty_seller, Societe $thirdparty_buyer,
 	// If (seller and buyer in European Community) and (buyer = company) then VAT by default=0. End of rule
 	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)) {
+		if ($isacompany && getDolGlobalString('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;
@@ -9943,7 +9947,7 @@ function showDirectDownloadLink($object)
  * @param   string  $file           Original filename (full or relative path)
  * @param   string  $extName        Extension to differenciate thumb file name ('', '_small', '_mini')
  * @param   string  $extImgTarget   Force image extension for thumbs. Use '' to keep same extension than original image (default).
- * @return  string                  New file name (full or relative path, including the thumbs/)
+ * @return  string                  New file name (full or relative path, including the thumbs/). May be the original path if no thumb can exists.
  */
 function getImageFileNameForSize($file, $extName, $extImgTarget = '')
 {
@@ -11929,8 +11933,8 @@ function show_actions_messaging($conf, $langs, $db, $filterobj, $objcon = '', $n
 
 						'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
diff --git a/htdocs/core/lib/payments.lib.php b/htdocs/core/lib/payments.lib.php
index d5ddb158d6d..29947dda57c 100644
--- a/htdocs/core/lib/payments.lib.php
+++ b/htdocs/core/lib/payments.lib.php
@@ -170,7 +170,16 @@ function getValidOnlinePaymentMethods($paymentmethod = '')
 		'validpaymentmethod' => &$validpaymentmethod
 	];
 	$tmpobject = new stdClass();
-	$hookmanager->executeHooks('doValidatePayment', $parameters, $tmpobject, $action);
+	$reshook = $hookmanager->executeHooks('getValidPayment', $parameters, $tmpobject, $action);
+	if ($reshook < 0) {
+		setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+	} elseif (!empty($hookmanager->resArray['validpaymentmethod'])) {
+		if ($reshook == 0) {
+			$validpaymentmethod = array_merge($validpaymentmethod, $hookmanager->resArray['validpaymentmethod']);
+		} else {
+			$validpaymentmethod = $hookmanager->resArray['validpaymentmethod'];
+		}
+	}
 
 	return $validpaymentmethod;
 }
diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index 7d88253cef2..c372f617237 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -344,7 +344,9 @@ function restrictedArea(User $user, $features, $object = 0, $tableandshare = '',
 	} else {
 		$objectid = $object;		// $objectid can be X or 'X,Y,Z'
 	}
-	$objectid = preg_replace('/[^0-9\.\,]/', '', $objectid);	// For the case value is coming from a non sanitized user input
+	if ($objectid) {
+		$objectid = preg_replace('/[^0-9\.\,]/', '', $objectid);	// For the case value is coming from a non sanitized user input
+	}
 
 	//dol_syslog("functions.lib:restrictedArea $feature, $objectid, $dbtablename, $feature2, $dbt_socfield, $dbt_select, $isdraft");
 	//print "user_id=".$user->id.", features=".$features.", feature2=".$feature2.", objectid=".$objectid;
diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php
index f450d390dff..93da106aebd 100644
--- a/htdocs/core/lib/security2.lib.php
+++ b/htdocs/core/lib/security2.lib.php
@@ -96,7 +96,8 @@ function checkLoginPassEntity($usertotest, $passwordtotest, $entitytotest, $auth
 					// Call function to check user/password
 					$function = 'check_user_password_'.$mode;
 					$login = call_user_func($function, $usertotest, $passwordtotest, $entitytotest, $context);
-					if ($login && $login != '--bad-login-validity--') {	// Login is successfull
+					if ($login && $login != '--bad-login-validity--') {
+						// Login is successfull with this method
 						$test = false; // To stop once at first login success
 						$conf->authmode = $mode; // This properties is defined only when logged to say what mode was successfully used
 						/*$dol_tz = GETPOST('tz');
diff --git a/htdocs/core/login/functions_dolibarr.php b/htdocs/core/login/functions_dolibarr.php
index 5f4b722ea1c..9b65bf4d877 100644
--- a/htdocs/core/login/functions_dolibarr.php
+++ b/htdocs/core/login/functions_dolibarr.php
@@ -74,24 +74,6 @@ function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotes
 		if ($resql) {
 			$obj = $db->fetch_object($resql);
 			if ($obj) {
-				$now = dol_now();
-				// Check date start validity
-				if ($obj->datestartvalidity && $db->jdate($obj->datestartvalidity) > $now) {
-					// Load translation files required by the page
-					$langs->loadLangs(array('main', 'errors'));
-					$_SESSION["dol_loginmesg"] = $langs->transnoentitiesnoconv("ErrorLoginDateValidity");
-					dol_syslog("functions_dolibarr::check_user_password_dolibarr bad datestart validity", LOG_WARNING);
-					return '--bad-login-validity--';
-				}
-				// Check date end validity
-				if ($obj->dateendvalidity && $db->jdate($obj->dateendvalidity) < dol_get_first_hour($now)) {
-					// Load translation files required by the page
-					$langs->loadLangs(array('main', 'errors'));
-					$_SESSION["dol_loginmesg"] = $langs->transnoentitiesnoconv("ErrorLoginDateValidity");
-					dol_syslog("functions_dolibarr::check_user_password_dolibarr bad date end validity", LOG_WARNING);
-					return '--bad-login-validity--';
-				}
-
 				$passclear = $obj->pass;
 				$passcrypted = $obj->pass_crypted;
 				$passtyped = $passwordtotest;
@@ -121,7 +103,7 @@ function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotes
 					if ((!$passcrypted || $passtyped)
 						&& ($passclear && ($passtyped == $passclear))) {
 						$passok = true;
-						dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ok - found pass in database");
+						dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ok - found old pass in database", LOG_WARNING);
 					}
 				}
 
diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index cef586ad1da..5c819488971 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -205,10 +205,10 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->contrat->enabled', __HANDLER__, 'left', 1401__+MAX_llx_menu__, 'commercial', '', 1400__+MAX_llx_menu__, '/contrat/card.php?mainmenu=commercial&amp;action=create&amp;leftmenu=contracts', 'NewContract', 1, 'contracts', '$user->rights->contrat->creer', '', 2, 0, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->contrat->enabled', __HANDLER__, 'left', 1402__+MAX_llx_menu__, 'commercial', '', 1400__+MAX_llx_menu__, '/contrat/list.php?mainmenu=commercial&amp;leftmenu=contracts', 'List', 1, 'contracts', '$user->rights->contrat->lire', '', 2, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->contrat->enabled', __HANDLER__, 'left', 1403__+MAX_llx_menu__, 'commercial', '', 1400__+MAX_llx_menu__, '/contrat/services_list.php?mainmenu=commercial&amp;leftmenu=contracts', 'MenuServices', 1, 'contracts', '$user->rights->contrat->lire', '', 2, 2, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->contrat->enabled && $leftmenu=="contracts"', __HANDLER__, 'left', 1404__+MAX_llx_menu__, 'commercial', '', 1403__+MAX_llx_menu__, '/contrat/services_list.php?mainmenu=commercial&amp;leftmenu=contracts&amp;mode=0', 'MenuInactiveServices', 2, 'contracts', '$user->rights->contrat->lire', '', 2, 0, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->contrat->enabled && $leftmenu=="contracts"', __HANDLER__, 'left', 1405__+MAX_llx_menu__, 'commercial', '', 1403__+MAX_llx_menu__, '/contrat/services_list.php?mainmenu=commercial&amp;leftmenu=contracts&amp;mode=4', 'MenuRunningServices', 2, 'contracts', '$user->rights->contrat->lire', '', 2, 1, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->contrat->enabled && $leftmenu=="contracts"', __HANDLER__, 'left', 1406__+MAX_llx_menu__, 'commercial', '', 1403__+MAX_llx_menu__, '/contrat/services_list.php?mainmenu=commercial&amp;leftmenu=contracts&amp;mode=4&amp;filter=expired', 'MenuExpiredServices', 2, 'contracts', '$user->rights->contrat->lire', '', 2, 2, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->contrat->enabled && $leftmenu=="contracts"', __HANDLER__, 'left', 1407__+MAX_llx_menu__, 'commercial', '', 1403__+MAX_llx_menu__, '/contrat/services_list.php?mainmenu=commercial&amp;leftmenu=contracts&amp;mode=5', 'MenuClosedServices', 2, 'contracts', '$user->rights->contrat->lire', '', 2, 3, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->contrat->enabled && $leftmenu=="contracts"', __HANDLER__, 'left', 1404__+MAX_llx_menu__, 'commercial', '', 1403__+MAX_llx_menu__, '/contrat/services_list.php?mainmenu=commercial&amp;leftmenu=contracts&amp;search_status=0', 'MenuInactiveServices', 2, 'contracts', '$user->rights->contrat->lire', '', 2, 0, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->contrat->enabled && $leftmenu=="contracts"', __HANDLER__, 'left', 1405__+MAX_llx_menu__, 'commercial', '', 1403__+MAX_llx_menu__, '/contrat/services_list.php?mainmenu=commercial&amp;leftmenu=contracts&amp;search_status=4', 'MenuRunningServices', 2, 'contracts', '$user->rights->contrat->lire', '', 2, 1, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->contrat->enabled && $leftmenu=="contracts"', __HANDLER__, 'left', 1406__+MAX_llx_menu__, 'commercial', '', 1403__+MAX_llx_menu__, '/contrat/services_list.php?mainmenu=commercial&amp;leftmenu=contracts&amp;search_status=4&amp;filter=expired', 'MenuExpiredServices', 2, 'contracts', '$user->rights->contrat->lire', '', 2, 2, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->contrat->enabled && $leftmenu=="contracts"', __HANDLER__, 'left', 1407__+MAX_llx_menu__, 'commercial', '', 1403__+MAX_llx_menu__, '/contrat/services_list.php?mainmenu=commercial&amp;leftmenu=contracts&amp;search_status=5', 'MenuClosedServices', 2, 'contracts', '$user->rights->contrat->lire', '', 2, 3, __ENTITY__);
 
 -- Commercial - Interventions
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->ficheinter->enabled', __HANDLER__, 'left', 1500__+MAX_llx_menu__, 'commercial', 'ficheinter', 5__+MAX_llx_menu__, '/fichinter/list.php?mainmenu=commercial&amp;leftmenu=ficheinter', 'Interventions', 0, 'interventions', '$user->rights->ficheinter->lire', '', 2, 8, __ENTITY__);
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index dbc2be872eb..a4ca1d290a1 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1385,10 +1385,10 @@ function get_left_menu_commercial($mainmenu, &$newmenu, $usemenuhider = 1, $left
 			$newmenu->add("/contrat/list.php?leftmenu=contracts", $langs->trans("List"), 1, $user->hasRight('contrat',  'lire'));
 			$newmenu->add("/contrat/services_list.php?leftmenu=contracts", $langs->trans("MenuServices"), 1, $user->hasRight('contrat',  'lire'));
 			if ($usemenuhider || empty($leftmenu) || $leftmenu == "contracts") {
-				$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=0", $langs->trans("MenuInactiveServices"), 2, $user->hasRight('contrat',  'lire'));
-				$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=4", $langs->trans("MenuRunningServices"), 2, $user->hasRight('contrat',  'lire'));
-				$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=4&amp;filter=expired", $langs->trans("MenuExpiredServices"), 2, $user->hasRight('contrat',  'lire'));
-				$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=5", $langs->trans("MenuClosedServices"), 2, $user->hasRight('contrat',  'lire'));
+				$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;search_status=0", $langs->trans("MenuInactiveServices"), 2, $user->hasRight('contrat',  'lire'));
+				$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;search_status=4", $langs->trans("MenuRunningServices"), 2, $user->hasRight('contrat',  'lire'));
+				$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;search_status=4&amp;filter=expired", $langs->trans("MenuExpiredServices"), 2, $user->hasRight('contrat',  'lire'));
+				$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;search_status=5", $langs->trans("MenuClosedServices"), 2, $user->hasRight('contrat',  'lire'));
 			}
 		}
 
@@ -1729,7 +1729,10 @@ function get_left_menu_accountancy($mainmenu, &$newmenu, $usemenuhider = 1, $lef
 
 							if ($nature) {
 								$langs->load('accountancy');
-								$journallabel = $langs->transnoentities($objp->label); // Label of bank account in llx_accounting_journal
+								$journallabel = '';
+								if ($objp->label) {
+									$journallabel = '<span class="opacitymedium">('.$langs->transnoentities($objp->label).')</span>'; // Label of bank account in llx_accounting_journal
+								}
 
 								$key = $langs->trans("AccountingJournalType".strtoupper($objp->nature));
 								$transferlabel = ($objp->nature && $key != "AccountingJournalType".strtoupper($langs->trans($objp->nature)) ? $key.($journallabel != $key ? ' '.$journallabel : ''): $journallabel);
diff --git a/htdocs/core/modules/dons/html_cerfafr.modules.php b/htdocs/core/modules/dons/html_cerfafr.modules.php
index d859ae0ca56..155d16842ec 100644
--- a/htdocs/core/modules/dons/html_cerfafr.modules.php
+++ b/htdocs/core/modules/dons/html_cerfafr.modules.php
@@ -162,7 +162,7 @@ class html_cerfafr extends ModeleDon
 				$form = str_replace('__MAIN_INFO_SOCIETE_ADDRESS__', $mysoc->address, $form);
 				$form = str_replace('__MAIN_INFO_SOCIETE_ZIP__', $mysoc->zip, $form);
 				$form = str_replace('__MAIN_INFO_SOCIETE_TOWN__', $mysoc->town, $form);
-				$form = str_replace('__MAIN_INFO_SOCIETE_OBJECT__', $mysoc->object, $form);
+				$form = str_replace('__MAIN_INFO_SOCIETE_OBJECT__', $mysoc->socialobject, $form);
 				$form = str_replace('__DONATOR_FIRSTNAME__', $don->firstname, $form);
 				$form = str_replace('__DONATOR_LASTNAME__', $don->lastname, $form);
 				$form = str_replace('__DONATOR_SOCIETE__', $don->societe, $form);
diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php
index e5cff7e9301..8aa1b0ec9ef 100644
--- a/htdocs/core/modules/modAccounting.class.php
+++ b/htdocs/core/modules/modAccounting.class.php
@@ -139,7 +139,7 @@ class modAccounting extends DolibarrModules
 		$this->const[11] = array(
 				"ACCOUNTING_EXPORT_DATE",
 				"chaine",
-				"%d%m%Y",
+				"%Y-%m-%d",
 				"", 0, 'current', 0
 		);
 		$this->const[12] = array(
@@ -338,7 +338,7 @@ class modAccounting extends DolibarrModules
 			'b.sens'=>'C'	// This field is still used by accounting export. We can remove it once it has been replace into accountancyexport.class.php by a detection using ->debit and ->credit
 		);
 
-		// General ledger - Fichier FEC
+		// General ledger - File FEC
 		$r++;
 		$this->import_code[$r] = $this->rights_class.'_'.$r;
 		$this->import_label[$r] = 'ImportAccountingEntriesFECFormat';
diff --git a/htdocs/core/modules/modAdherent.class.php b/htdocs/core/modules/modAdherent.class.php
index 2422cead7bb..0df5284eaed 100644
--- a/htdocs/core/modules/modAdherent.class.php
+++ b/htdocs/core/modules/modAdherent.class.php
@@ -198,6 +198,7 @@ class modAdherent extends DolibarrModules
 			4 => array('file'=>'box_members_last_subscriptions.php', 'enabledbydefaulton'=>'membersindex'),
 			5 => array('file'=>'box_members_subscriptions_by_year.php', 'enabledbydefaulton'=>'membersindex'),
 			6 => array('file'=>'box_members_by_type.php', 'enabledbydefaulton'=>'membersindex'),
+			7 => array('file'=>'box_members_by_tags.php', 'enabledbydefaulton'=>'membersindex'),
 		);
 
 		// Permissions
diff --git a/htdocs/core/modules/modHRM.class.php b/htdocs/core/modules/modHRM.class.php
index 78c0bde14f6..f4295f53193 100644
--- a/htdocs/core/modules/modHRM.class.php
+++ b/htdocs/core/modules/modHRM.class.php
@@ -250,9 +250,17 @@ class modHRM extends DolibarrModules
 		$this->rights[$r][5] = 'read'; // In php code, permission will be checked by test if ($user->rights->hrm->compare_advance->read)
 		$r++;
 
+		// Evaluation
+		$this->rights[$r][0] = 4029; // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Read all evaluations'; // Permission label
+		$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'evaluation';
+		$this->rights[$r][5] = 'readall'; // In php code, permission will be checked by test if ($user->rights->hrm->evaluation->read)
+		$r++;
+
 		// Read employee
 		$this->rights[$r][0] = 4031; // Permission id (must not be already used)
-		$this->rights[$r][1] = 'Read personal information'; // Permission label
+		$this->rights[$r][1] = 'Read personal/HR information'; // Permission label
 		$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
 		$this->rights[$r][4] = 'read_personal_information';
 		$this->rights[$r][5] = 'read'; // In php code, permission will be checked by test if ($user->rights->hrm->read_personal_information->read)
@@ -260,19 +268,11 @@ class modHRM extends DolibarrModules
 
 		// Write employee
 		$this->rights[$r][0] = 4032; // Permission id (must not be already used)
-		$this->rights[$r][1] = 'Write personal information'; // Permission label
+		$this->rights[$r][1] = 'Write personal/HR information'; // Permission label
 		$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
 		$this->rights[$r][4] = 'write_personal_information';
 		$this->rights[$r][5] = 'write'; // In php code, permission will be checked by test if ($user->rights->hrm->write_personal_information->write)
 		$r++;
-
-		// Evaluation
-		$this->rights[$r][0] = 4033; // Permission id (must not be already used)
-		$this->rights[$r][1] = 'Read all evaluations'; // Permission label
-		$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'evaluation';
-		$this->rights[$r][5] = 'readall'; // In php code, permission will be checked by test if ($user->rights->hrm->evaluation->read)
-		$r++;
 	}
 
 	/**
diff --git a/htdocs/core/modules/modTicket.class.php b/htdocs/core/modules/modTicket.class.php
index 37e6552af2f..67c27178987 100644
--- a/htdocs/core/modules/modTicket.class.php
+++ b/htdocs/core/modules/modTicket.class.php
@@ -157,7 +157,7 @@ class modTicket extends DolibarrModules
 			'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 && !empty($conf->global->TICKET_ENABLE_RESOLUTION)),
+			'tabcond' => array($conf->ticket->enabled, $conf->ticket->enabled, $conf->ticket->enabled, $conf->ticket->enabled && getDolGlobalString('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")),
@@ -208,6 +208,13 @@ class modTicket extends DolibarrModules
 		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
 		$this->rights[$r][4] = 'manage';
 
+		$r++;
+		$this->rights[$r][0] = 56006; // id de la permission
+		$this->rights[$r][1] = "Export ticket"; // 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] = 'export';
+
 		/* Seems not used and in conflict with societe->client->voir (see all thirdparties)
 		$r++;
 		$this->rights[$r][0] = 56005; // id de la permission
@@ -318,6 +325,27 @@ class modTicket extends DolibarrModules
 			'target' => '',
 			'user' => 0);
 		$r++;
+
+		// Exports
+		//--------
+		$r = 1;
+
+		// Export list of tickets and attributes
+		$langs->load("ticket");
+		$this->export_code[$r]=$this->rights_class.'_'.$r;
+		$this->export_label[$r]='ExportDataset_ticket_1';	// Translation key (used only if key ExportDataset_xxx_z not found)
+		$this->export_permission[$r] = array(array("ticket", "export"));
+		$this->export_icon[$r]='ticket';
+		$keyforclass = 'Ticket';$keyforclassfile='/ticket/class/ticket.class.php';$keyforelement='ticket';
+		include DOL_DOCUMENT_ROOT.'/core/commonfieldsinexport.inc.php';
+		$keyforselect='ticket'; $keyforaliasextra='extra'; $keyforelement='ticket';
+		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+		$this->export_sql_start[$r]='SELECT DISTINCT ';
+		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'ticket as t';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'ticket_extrafields as extra on (t.rowid = extra.fk_object)';
+		$this->export_sql_end[$r] .=' WHERE 1 = 1';
+		$this->export_sql_end[$r] .=' AND t.entity IN ('.getEntity('ticket').')';
+		$r++;
 	}
 
 	/**
diff --git a/htdocs/core/modules/product/doc/pdf_standard.modules.php b/htdocs/core/modules/product/doc/pdf_standard.modules.php
index 8baef2ffa75..c8190a362f5 100644
--- a/htdocs/core/modules/product/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/product/doc/pdf_standard.modules.php
@@ -1,5 +1,6 @@
 <?php
-/* Copyright (C) 2017 	Laurent Destailleur <eldy@products.sourceforge.net>
+/* Copyright (C) 2017 	Laurent Destailleur		<eldy@products.sourceforge.net>
+ * Copyright (C) 2023 	Anthony Berton			<anthony.berton@bb2a.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
@@ -209,10 +210,10 @@ class pdf_standard extends ModelePDFProduct
 				$pdf->SetDrawColor(128, 128, 128);
 
 				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
-				$pdf->SetSubject($outputlangs->transnoentities("Order"));
+				$pdf->SetSubject($outputlangs->transnoentities("Product"));
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
-				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Order")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
+				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Product"));
 				if (getDolGlobalString('MAIN_DISABLE_PDF_COMPRESSION')) {
 					$pdf->SetCompression(false);
 				}
@@ -242,6 +243,53 @@ class pdf_standard extends ModelePDFProduct
 				$pdf->writeHTMLCell(190, 3, $this->marge_gauche, $tab_top, dol_htmlentitiesbr($object->label), 0, 1);
 				$nexY = $pdf->GetY();
 
+				// Show photo
+				if (getDolGlobalInt('PRODUCT_USE_OLD_PATH_FOR_PHOTO')) {
+					$pdir[0] = get_exdir($object->id, 2, 0, 0, $object, 'product').$object->id."/photos/";
+					$pdir[1] = get_exdir(0, 0, 0, 0, $object, 'product').dol_sanitizeFileName($object->ref).'/';
+				} else {
+					$pdir[0] = get_exdir(0, 0, 0, 0, $object, 'product'); // default
+					$pdir[1] = get_exdir($object->id, 2, 0, 0, $object, 'product').$object->id."/photos/"; // alternative
+				}
+
+				$arephoto = false;
+				foreach ($pdir as $midir) {
+					if (!$arephoto) {
+						if ($conf->entity != $object->entity) {
+							$dir = $conf->product->multidir_output[$object->entity].'/'.$midir; //Check repertories of current entities
+						} else {
+							$dir = $conf->product->dir_output.'/'.$midir; //Check repertory of the current product
+						}
+						foreach ($object->liste_photos($dir, 1) as $key => $obj) {
+							if (!getDolGlobalInt('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;
+							$arephoto = true;
+						}
+					}
+				}
+				// Define size of image if we need it
+				$imglinesize = array();
+				if (!empty($realpath) && $arephoto) {
+					$imgsize = pdf_getSizeForImage($realpath);
+					$imgsizewidth = $imgsize['width'] + 20;
+					$imgsizeheight = $imgsize['height'] + 20;
+
+					$midelpage = ($this->page_largeur - $this->marge_gauche - $this->marge_droite) / 2;
+					$posxphoto = $midelpage + ($midelpage / 2) - ($imgsizewidth / 2);
+					$posyphoto = $tab_top - 1;
+					$pdf->Image($realpath, $posxphoto, $posyphoto, $imgsizewidth, $imgsizeheight, '', '', '', 2, 300); // Use 300 dpi
+					$nexyafterphoto = $tab_top + $imgsizeheight;
+				}
+
+				// Description
 				$pdf->SetFont('', '', $default_font_size);
 				$pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, dol_htmlentitiesbr($object->description), 0, 1);
 				$nexY = $pdf->GetY();
@@ -276,30 +324,22 @@ class pdf_standard extends ModelePDFProduct
 					$nexY = $pdf->GetY();
 				}
 
+				$tab_top = 88;
+				if (!empty($nexyafterphoto) && $nexyafterphoto > $tab_top) {
+					$tab_top = $nexyafterphoto;
+				}
+
 				// Show notes
 				// TODO There is no public note on product yet
 				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
-				if (!empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE)) {
-					// Get first sale rep
-					if (is_object($object->thirdparty)) {
-						$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 ($notetoshow) {
 					$substitutionarray = pdf_getSubstitutionArray($outputlangs, null, $object);
 					complete_substitutions_array($substitutionarray, $outputlangs, $object);
 					$notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
 					$notetoshow = convertBackOfficeMediasLinksToPublicLinks($notetoshow);
 
-					$tab_top = 88;
-
 					$pdf->SetFont('', '', $default_font_size - 1);
-					$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
+					$pdf->writeHTMLCell(190, 3, $this->marge_gauche - 1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
 					$nexY = $pdf->GetY();
 					$height_note = $nexY - $tab_top;
 
@@ -673,6 +713,9 @@ class pdf_standard extends ModelePDFProduct
 	{
 		global $conf, $langs, $hookmanager;
 
+		$ltrdirection = 'L';
+		if ($outputlangs->trans("DIRECTION") == 'rtl') $ltrdirection = 'R';
+
 		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "propal", "companies", "bills", "orders"));
 
@@ -687,35 +730,48 @@ class pdf_standard extends ModelePDFProduct
 		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 
 		// Show Draft Watermark
-		if ($object->statut == 0 && getDolGlobalString('COMMANDE_DRAFT_WATERMARK')) {
+		if ($object->statut == 0 && getDolGlobalString('PRODUCT_DRAFT_WATERMARK')) {
 			pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', getDolGlobalString('COMMANDE_DRAFT_WATERMARK'));
 		}
 
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->SetFont('', 'B', $default_font_size + 3);
 
+		$w = 100;
+
 		$posy = $this->marge_haute;
 		$posx = $this->page_largeur - $this->marge_droite - 100;
 
 		$pdf->SetXY($this->marge_gauche, $posy);
 
 		// Logo
-		$logo = $conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
-		if ($this->emetteur->logo) {
-			if (is_readable($logo)) {
-				$height = pdf_getHeightForLogo($logo);
-				$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
+		if (!getDolGlobalInt('PDF_DISABLE_MYCOMPANY_LOGO')) {
+			if ($this->emetteur->logo) {
+				$logodir = $conf->mycompany->dir_output;
+				if (!empty($conf->mycompany->multidir_output[$object->entity])) {
+					$logodir = $conf->mycompany->multidir_output[$object->entity];
+				}
+				if (!getDolGlobalInt('MAIN_PDF_USE_LARGE_LOGO')) {
+					$logo = $logodir.'/logos/thumbs/'.$this->emetteur->logo_small;
+				} else {
+					$logo = $logodir.'/logos/'.$this->emetteur->logo;
+				}
+				if (is_readable($logo)) {
+					$height = pdf_getHeightForLogo($logo);
+					$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
+				} else {
+					$pdf->SetTextColor(200, 0, 0);
+					$pdf->SetFont('', 'B', $default_font_size - 2);
+					$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
+					$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
+				}
 			} else {
-				$pdf->SetTextColor(200, 0, 0);
-				$pdf->SetFont('', 'B', $default_font_size - 2);
-				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
-				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
+				$text = $this->emetteur->name;
+				$pdf->MultiCell($w, 4, $outputlangs->convToOutputCharset($text), 0, $ltrdirection);
 			}
-		} else {
-			$text = $this->emetteur->name;
-			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 		}
 
+
 		$pdf->SetFont('', 'B', $default_font_size + 3);
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
diff --git a/htdocs/core/modules/project/task/mod_task_universal.php b/htdocs/core/modules/project/task/mod_task_universal.php
index 55c1a3ff89d..22ac9e3d681 100644
--- a/htdocs/core/modules/project/task/mod_task_universal.php
+++ b/htdocs/core/modules/project/task/mod_task_universal.php
@@ -128,8 +128,7 @@ class mod_task_universal extends ModeleNumRefTask
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-		// On defini critere recherche compteur
-		$mask = $conf->global->PROJECT_TASK_UNIVERSAL_MASK;
+		$mask = !empty($conf->global->PROJECT_TASK_UNIVERSAL_MASK) ? $conf->global->PROJECT_TASK_UNIVERSAL_MASK : '';
 
 		if (!$mask) {
 			$this->error = 'NotConfigured';
diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index 7f97e751ded..4900acc9ec2 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -133,9 +133,15 @@ $(document).ready(function () {
 </script>
 <?php } ?>
 
-<div class="login_center center"<?php print empty($conf->global->MAIN_LOGIN_BACKGROUND) ? ' style="background-size: cover; background-position: center center; background-attachment: fixed; background-repeat: no-repeat; background-image: linear-gradient(rgb('.$colorbackhmenu1.',0.3), rgb(240,240,240));"' : '' ?>>
+<div class="login_center center"<?php
+$backstyle = 'background: linear-gradient('.($conf->browser->layout == 'phone' ? '0deg' : '4deg').', rgb(240,240,240) 52%, rgb('.$colorbackhmenu1.') 52.1%);';
+// old style:  $backstyle = 'background-image: linear-gradient(rgb('.$colorbackhmenu1.',0.3), rgb(240,240,240));';
+$backstyle = getDolGlobalString('MAIN_LOGIN_BACKGROUND_STYLE', $backstyle);
+print empty($conf->global->MAIN_LOGIN_BACKGROUND) ? ' style="background-size: cover; background-position: center center; background-attachment: fixed; background-repeat: no-repeat; '.$backstyle.'"' : '';
+?>>
 <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 newToken(); ?>" />
diff --git a/htdocs/datapolicy/class/actions_datapolicy.class.php b/htdocs/datapolicy/class/actions_datapolicy.class.php
index ac360674c85..768ddd216d7 100644
--- a/htdocs/datapolicy/class/actions_datapolicy.class.php
+++ b/htdocs/datapolicy/class/actions_datapolicy.class.php
@@ -82,11 +82,11 @@ class ActionsDatapolicy
 	/**
 	 * Overloading the doActions function : replacing the parent's function with the one below
 	 *
-	 * @param   array           $parameters     Hook metadatas (context, etc...)
-	 * @param   CommonObject    $object         The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
-	 * @param   string          $action         Current action (if set). Generally create or edit or null
-	 * @param   HookManager     $hookmanager    Hook manager propagated to allow calling another hook
-	 * @return  int                             < 0 on error, 0 on success, 1 to replace standard code
+	 * @param   array   		        $parameters     Hook metadatas (context, etc...)
+	 * @param   Societe|CommonObject    $object         The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
+	 * @param   string         			$action         Current action (if set). Generally create or edit or null
+	 * @param   HookManager     		$hookmanager    Hook manager propagated to allow calling another hook
+	 * @return  int                     		        < 0 on error, 0 on success, 1 to replace standard code
 	 */
 	public function doActions($parameters, &$object, &$action, $hookmanager)
 	{
@@ -103,7 +103,6 @@ class ActionsDatapolicy
 			// on verifie si l'objet est utilisé
 			if ($object->isObjectUsed(GETPOST('socid'))) {
 				$object->name = $langs->trans('ANONYME');
-				$object->name_bis = '';
 				$object->name_alias = '';
 				$object->address = '';
 				$object->town = '';
@@ -115,7 +114,7 @@ class ActionsDatapolicy
 				$object->state = '';
 				$object->country = '';
 				$object->state_id = '';
-				$object->skype = '';
+				$object->socialnetworks = '';
 				$object->country_id = '';
 				$object->note_private = $object->note_private.'<br>'.$langs->trans('ANONYMISER_AT', dol_print_date(time()));
 
@@ -128,76 +127,6 @@ class ActionsDatapolicy
 					header('Location:'.$_SERVER["PHP_SELF"]."?socid=".$object->id);
 				}
 			}
-		} elseif ($parameters['currentcontext'] == 'thirdpartycard' && $action == 'datapolicy_portabilite') {
-			header('Content-Type: application/csv');
-			header('Content-Disposition: attachment; filename=datapolicy_portabilite.csv');
-			header('Pragma: no-cache');
-			$object->fetch(GETPOST('socid'));
-			echo 'Name;Firstname;Civility;Thirdparty;Function;Address;ZipCode;City;Department;Country;Email;Pro Phone;Perso Phone;Mobile Phone;Instant Mail;Birthday;'.PHP_EOL;
-			echo $object->name.';';
-			echo ';';
-			echo ';';
-			echo ';';
-			echo ';';
-			echo $object->address.';';
-			echo $object->zip.';';
-			echo $object->town.';';
-			echo $object->state.';';
-			echo $object->country.';';
-			echo $object->email.';';
-			echo $object->phone.';';
-			echo ';';
-			echo ';';
-			echo $object->skype.';';
-			echo ';';
-			exit;
-		} elseif ($parameters['currentcontext'] == 'membercard' && $action == 'datapolicy_portabilite') {
-			header('Content-Type: application/csv');
-			header('Content-Disposition: attachment; filename=datapolicy_portabilite.csv');
-			header('Pragma: no-cache');
-			$soc = $object->fetch_thirdparty();
-
-			echo 'Name;Firstname;Civility;Thirdparty;Function;Address;ZipCode;City;Department;Country;Email;Pro Phone;Perso Phone;Mobile Phone;Instant Mail;Birthday;'.PHP_EOL;
-			echo $object->lastname.';';
-			echo $object->firstname.';';
-			echo $object->getCivilityLabel().';';
-			echo ($soc != -1 ? $object->thirdparty->name : '').';';
-			echo ';';
-			echo $object->address.';';
-			echo $object->zip.';';
-			echo $object->town.';';
-			echo $object->state.';';
-			echo $object->country.';';
-			echo $object->email.';';
-			echo $object->phone.';';
-			echo $object->phone_perso.';';
-			echo $object->phone_mobile.';';
-			echo $object->skype.';';
-			echo dol_print_date($object->birth).';';
-			exit;
-		} elseif ($parameters['currentcontext'] == 'contactcard' && $action == 'datapolicy_portabilite') {
-			$object->fetch(GETPOST('id'));
-			header('Content-Type: application/csv');
-			header('Content-Disposition: attachment; filename=datapolicy_portabilite.csv');
-			header('Pragma: no-cache');
-			$soc = $object->fetch_thirdparty();
-			echo 'Name;Firstname;Civility;Thirdparty;Function;Address;ZipCode;City;Department;Country;Email;Pro Phone;Perso Phone;Mobile Phone;Instant Mail;Birthday;'.PHP_EOL;
-			echo $object->lastname.';';
-			echo $object->firstname.';';
-			echo $object->getCivilityLabel().';';
-			echo ($soc != -1 ? $object->thirdparty->name : '').';';
-			echo $object->poste.';';
-			echo $object->address.';';
-			echo $object->zip.';';
-			echo $object->town.';';
-			echo $object->state.';';
-			echo $object->country.';';
-			echo $object->email.';';
-			echo $object->phone_pro.';';
-			echo $object->phone_perso.';';
-			echo $object->phone_mobile.';';
-			echo dol_print_date($object->birth).';';
-			exit;
 		} elseif ($parameters['currentcontext'] == 'contactcard' && $action == 'send_datapolicy') {
 			$object->fetch(GETPOST('id'));
 
@@ -358,13 +287,7 @@ class ActionsDatapolicy
                       } );
                       </script>';
 			echo $dialog;
-			if ($parameters['currentcontext'] == 'thirdpartycard' && in_array($object->forme_juridique_code, array(11, 12, 13, 15, 17, 18, 19, 35, 60, 200, 311, 312, 316, 401, 600, 700, 1005)) || $object->typent_id == 8) {
-				echo '<div class="inline-block divButAction"><a target="_blank" rel="noopener noreferrer" id="rpgpdbtn" class="butAction" href="'.$_SERVER["PHP_SELF"]."?socid=".$object->id.'&action=datapolicy_portabilite" title="'.$langs->trans('DATAPOLICY_PORTABILITE_TITLE').'">'.$langs->trans("DATAPOLICY_PORTABILITE").'</a></div>';
-			} elseif ($parameters['currentcontext'] == 'membercard') {
-				echo '<div class="inline-block divButAction"><a target="_blank" rel="noopener noreferrer" id="rpgpdbtn" class="butAction" href="'.$_SERVER["PHP_SELF"]."?rowid=".$object->id.'&action=datapolicy_portabilite" title="'.$langs->trans('DATAPOLICY_PORTABILITE_TITLE').'">'.$langs->trans("DATAPOLICY_PORTABILITE").'</a></div>';
-			} elseif ($parameters['currentcontext'] == 'contactcard') {
-				echo '<div class="inline-block divButAction"><a target="_blank" rel="noopener noreferrer" id="rpgpdbtn" class="butAction" href="'.$_SERVER["PHP_SELF"]."?id=".$object->id.'&action=datapolicy_portabilite" title="'.$langs->trans('DATAPOLICY_PORTABILITE_TITLE').'">'.$langs->trans("DATAPOLICY_PORTABILITE").'</a></div>';
-			}
+			// TODO Replace test of hardcoded values
 			if (!empty($object->mail) && empty($object->array_options['options_datapolicy_send']) && $parameters['currentcontext'] == 'thirdpartycard' && in_array($object->forme_juridique_code, array(11, 12, 13, 15, 17, 18, 19, 35, 60, 200, 311, 312, 316, 401, 600, 700, 1005)) || $object->typent_id == 8) {
 				echo '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"]."?socid=".$object->id.'&action=send_datapolicy" title="'.$langs->trans('DATAPOLICY_SEND').'">'.$langs->trans("DATAPOLICY_SEND").'</a></div>';
 			} elseif (!empty($object->mail) && empty($object->array_options['options_datapolicy_send']) && $parameters['currentcontext'] == 'membercard') {
diff --git a/htdocs/dav/fileserver.php b/htdocs/dav/fileserver.php
index 7abe3f2bacf..af23fde5fff 100644
--- a/htdocs/dav/fileserver.php
+++ b/htdocs/dav/fileserver.php
@@ -92,8 +92,7 @@ $tmpDir = $conf->dav->multidir_output[$entity]; // We need root dir, not a dir t
 
 // Authentication callback function
 $authBackend = new \Sabre\DAV\Auth\Backend\BasicCallBack(function ($username, $password) {
-	global $user;
-	global $conf;
+	global $user, $conf;
 	global $dolibarr_main_authentication, $dolibarr_auto_user;
 
 	if (empty($user->login)) {
@@ -101,7 +100,7 @@ $authBackend = new \Sabre\DAV\Auth\Backend\BasicCallBack(function ($username, $p
 		return false;
 	}
 	if ($user->socid > 0) {
-		dol_syslog("Failed to authenticate to DAV, use is an external user", LOG_WARNING);
+		dol_syslog("Failed to authenticate to DAV, user is an external user", LOG_WARNING);
 		return false;
 	}
 	if ($user->login != $username) {
@@ -132,6 +131,27 @@ $authBackend = new \Sabre\DAV\Auth\Backend\BasicCallBack(function ($username, $p
 		return false;
 	}
 
+	// Check if user status is enabled
+	if ($user->statut != $user::STATUS_ENABLED) {
+		// Status is disabled
+		dol_syslog("The user has been disabled.");
+		return false;
+	}
+
+	// Check if session was unvalidated by a password change
+	if (($user->flagdelsessionsbefore && !empty($_SESSION["dol_logindate"]) && $user->flagdelsessionsbefore > $_SESSION["dol_logindate"])) {
+		// Session is no more valid
+		dol_syslog("The user has a date for session invalidation = ".$user->flagdelsessionsbefore." and a session date = ".$_SESSION["dol_logindate"].". We must invalidate its sessions.");
+		return false;
+	}
+
+	// Check date validity
+	if ($user->isNotIntoValidityDateRange()) {
+		// User validity dates are no more valid
+		dol_syslog("The user login has a validity between [".$user->datestartvalidity." and ".$user->dateendvalidity."], curren date is ".dol_now());
+		return false;
+	}
+
 	return true;
 });
 
diff --git a/htdocs/debugbar/class/DataCollector/DolLogsCollector.php b/htdocs/debugbar/class/DataCollector/DolLogsCollector.php
index 44885296bae..3d3b3b25a0e 100644
--- a/htdocs/debugbar/class/DataCollector/DolLogsCollector.php
+++ b/htdocs/debugbar/class/DataCollector/DolLogsCollector.php
@@ -41,6 +41,11 @@ class DolLogsCollector extends MessagesCollector
 	 */
 	protected $maxnboflines;
 
+	/**
+	 * @var int number of lines
+	 */
+	protected $nboflines;
+
 	/**
 	 * Constructor
 	 *
@@ -54,7 +59,7 @@ class DolLogsCollector extends MessagesCollector
 		parent::__construct($name);
 
 		$this->nboflines = 0;
-		$this->maxnboflines = empty($conf->global->DEBUGBAR_LOGS_LINES_NUMBER) ? 250 : $conf->global->DEBUGBAR_LOGS_LINES_NUMBER; // High number slows seriously output
+		$this->maxnboflines = getDolGlobalInt('DEBUGBAR_LOGS_LINES_NUMBER', 250); // High number slows seriously output
 
 		$this->path = $path ?: $this->getLogsFile();
 	}
diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index acd3b34961c..716e3728b57 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -772,7 +772,7 @@ class Don extends CommonObject
 	 */
 	public function setPaid($id, $modepayment = 0)
 	{
-		$sql = "UPDATE ".MAIN_DB_PREFIX."don SET fk_statut = 2";
+		$sql = "UPDATE ".MAIN_DB_PREFIX."don SET fk_statut = 2, paid = 1";
 		if ($modepayment) {
 			$sql .= ", fk_payment = ".((int) $modepayment);
 		}
@@ -782,6 +782,7 @@ class Don extends CommonObject
 		if ($resql) {
 			if ($this->db->affected_rows($resql)) {
 				$this->statut = 2;
+				$this->paid = 1;
 				return 1;
 			} else {
 				return 0;
diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index b2b3cb70f39..69d1ea61a30 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -128,7 +128,7 @@ class EmailCollector extends CommonObject
 	public $fields = array(
 		'rowid'         => array('type'=>'integer', 'label'=>'TechnicalID', 'visible'=>2, 'enabled'=>1, 'position'=>1, 'notnull'=>1, 'index'=>1),
 		'entity'        => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'default'=>1, 'notnull'=>1, 'index'=>1, 'position'=>20),
-		'ref'           => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'help'=>'Example: MyCollector1', 'csslist'=>'tdoverflowmax150'),
+		'ref'           => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'help'=>'Example: MyCollector1', 'csslist'=>'tdoverflowmax200'),
 		'label'         => array('type'=>'varchar(255)', 'label'=>'Label', 'visible'=>1, 'enabled'=>1, 'position'=>30, 'notnull'=>-1, 'searchall'=>1, 'help'=>'Example: My Email collector', 'csslist'=>'tdoverflowmax150'),
 		'description'   => array('type'=>'text', 'label'=>'Description', 'visible'=>-1, 'enabled'=>1, 'position'=>60, 'notnull'=>-1, 'csslist'=>'small'),
 		'host'          => array('type'=>'varchar(255)', 'label'=>'EMailHost', 'visible'=>1, 'enabled'=>1, 'position'=>90, 'notnull'=>1, 'searchall'=>1, 'comment'=>"IMAP server", 'help'=>'Example: imap.gmail.com', 'csslist'=>'tdoverflowmax125'),
@@ -145,7 +145,7 @@ class EmailCollector extends CommonObject
 		'maxemailpercollect' => array('type'=>'integer', 'label'=>'MaxEmailCollectPerCollect', 'visible'=>-1, 'enabled'=>1, 'position'=>111, 'default'=>100),
 		'datelastresult' => array('type'=>'datetime', 'label'=>'DateLastCollectResult', 'visible'=>1, 'enabled'=>'$action != "create" && $action != "edit"', 'position'=>121, 'notnull'=>-1, 'csslist'=>'nowraponall'),
 		'codelastresult' => array('type'=>'varchar(16)', 'label'=>'CodeLastResult', 'visible'=>1, 'enabled'=>'$action != "create" && $action != "edit"', 'position'=>122, 'notnull'=>-1,),
-		'lastresult' => array('type'=>'varchar(255)', 'label'=>'LastResult', 'visible'=>1, 'enabled'=>'$action != "create" && $action != "edit"', 'position'=>123, 'notnull'=>-1, 'csslist'=>'small'),
+		'lastresult' => array('type'=>'varchar(255)', 'label'=>'LastResult', 'visible'=>1, 'enabled'=>'$action != "create" && $action != "edit"', 'position'=>123, 'notnull'=>-1, 'csslist'=>'small tdoverflowmax200'),
 		'datelastok' => array('type'=>'datetime', 'label'=>'DateLastcollectResultOk', 'visible'=>1, 'enabled'=>'$action != "create"', 'position'=>125, 'notnull'=>-1, 'csslist'=>'nowraponall'),
 		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'visible'=>0, 'enabled'=>1, 'position'=>61, 'notnull'=>-1,),
 		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'visible'=>0, 'enabled'=>1, 'position'=>62, 'notnull'=>-1,),
@@ -2932,7 +2932,11 @@ class EmailCollector extends CommonObject
 							// TODO Move mail using PHP-IMAP
 						}
 					} else {
-						dol_syslog("EmailCollector::doCollectOneCollector message ".$imapemail." to ".$connectstringtarget." was set to read", LOG_DEBUG);
+						if (empty($conf->global->MAIN_IMAP_USE_PHPIMAP)) {
+							dol_syslog("EmailCollector::doCollectOneCollector message ".((string) $imapemail)." to ".$connectstringtarget." was set to read", LOG_DEBUG);
+						} else {
+							dol_syslog("EmailCollector::doCollectOneCollector message '".($imapemail->getHeader()->get('subject'))."' using this->host=".$this->host.", this->access_type=".$this->acces_type." was set to read", LOG_DEBUG);
+						}
 					}
 				} else {
 					$errorforemail++;
diff --git a/htdocs/emailcollector/class/emailcollectoraction.class.php b/htdocs/emailcollector/class/emailcollectoraction.class.php
index e43a86da515..5616abbbd35 100644
--- a/htdocs/emailcollector/class/emailcollectoraction.class.php
+++ b/htdocs/emailcollector/class/emailcollectoraction.class.php
@@ -24,8 +24,6 @@
 
 // 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 EmailCollectorAction
@@ -113,37 +111,6 @@ class EmailCollectorAction extends CommonObject
 	public $status;
 	// END MODULEBUILDER PROPERTIES
 
-
-
-	// If this object has a subtable with lines
-
-	// /**
-	//  * @var string    Name of subtable line
-	//  */
-	//public $table_element_line = 'emailcollectoractiondet';
-
-	// /**
-	//  * @var string    Field with ID of parent key if this field has a parent
-	//  */
-	//public $fk_element = 'fk_emailcollectoraction';
-
-	// /**
-	//  * @var string    Name of subtable class that manage subtable lines
-	//  */
-	//public $class_element_line = 'EmailcollectorActionline';
-
-	// /**
-	//	* @var array	List of child tables. To test if we can delete object.
-	//  */
-	//protected $childtables=array();
-
-	// /**
-	//  * @var EmailcollectorActionLine[]     Array of subtable lines
-	//  */
-	//public $lines = array();
-
-
-
 	/**
 	 * Constructor
 	 *
@@ -225,16 +192,14 @@ class EmailCollectorAction extends CommonObject
 
 		// Clear fields
 		$object->ref = "copy_of_".$object->ref;
-		$object->title = $langs->trans("CopyOf")." ".$object->title;
-		// ...
+		// $object->title = $langs->trans("CopyOf")." ".$object->title;
+
 		// 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->element]['unique'][$shortkey])) {
-					//var_dump($key);
-					//var_dump($clonedObj->array_options[$key]); exit;
 					unset($object->array_options[$key]);
 				}
 			}
@@ -271,26 +236,10 @@ class EmailCollectorAction extends CommonObject
 	public function fetch($id, $ref = null)
 	{
 		$result = $this->fetchCommon($id, $ref);
-		// if ($result > 0 && !empty($this->table_element_line)) {
-		// 	$this->fetchLinesCommon();
-		// }
+
 		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();
-
-		// Load lines with object EmailcollectorActionLine
-
-		return count($this->lines)?1:0;
-	}*/
-
 	/**
 	 * Update object into database
 	 *
@@ -336,7 +285,6 @@ class EmailCollectorAction extends CommonObject
 		}
 
 		$result = '';
-		$companylink = '';
 
 		$label = '<u>'.$langs->trans("EmailcollectorAction").'</u>';
 		$label .= '<br>';
@@ -487,7 +435,7 @@ class EmailCollectorAction extends CommonObject
 
 				$this->user_creation_id = $obj->fk_user_creat;
 				$this->user_modification_id = $obj->fk_user_modif;
-				$this->date_creation     = $this->db->jdate($obj->datec);
+				$this->date_creation = $this->db->jdate($obj->datec);
 				$this->date_modification = empty($obj->datem) ? '' : $this->db->jdate($obj->datem);
 			}
 
diff --git a/htdocs/emailcollector/class/emailcollectorfilter.class.php b/htdocs/emailcollector/class/emailcollectorfilter.class.php
index cff80aa4153..327159f61a4 100644
--- a/htdocs/emailcollector/class/emailcollectorfilter.class.php
+++ b/htdocs/emailcollector/class/emailcollectorfilter.class.php
@@ -206,16 +206,14 @@ class EmailCollectorFilter extends CommonObject
 
 		// Clear fields
 		$object->ref = "copy_of_".$object->ref;
-		$object->title = $langs->trans("CopyOf")." ".$object->title;
-		// ...
+		// $object->title = $langs->trans("CopyOf")." ".$object->title;
+
 		// 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->element]['unique'][$shortkey])) {
-					//var_dump($key);
-					//var_dump($clonedObj->array_options[$key]); exit;
 					unset($object->array_options[$key]);
 				}
 			}
@@ -252,26 +250,10 @@ class EmailCollectorFilter extends CommonObject
 	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();
-
-		// Load lines with object EmailcollectorFilterLine
-
-		return count($this->lines)?1:0;
-	}*/
-
 	/**
 	 * Update object into database
 	 *
@@ -317,7 +299,6 @@ class EmailCollectorFilter extends CommonObject
 		}
 
 		$result = '';
-		$companylink = '';
 
 		$label = '<u>'.$langs->trans("EmailcollectorFilter").'</u>';
 		$label .= '<br>';
@@ -468,7 +449,7 @@ class EmailCollectorFilter extends CommonObject
 
 				$this->user_creation_id = $obj->fk_user_creat;
 				$this->user_modification_id = $obj->fk_user_modif;
-				$this->date_creation     = $this->db->jdate($obj->datec);
+				$this->date_creation = $this->db->jdate($obj->datec);
 				$this->date_modification = empty($obj->datem) ? '' : $this->db->jdate($obj->datem);
 			}
 
diff --git a/htdocs/eventorganization/class/conferenceorbooth.class.php b/htdocs/eventorganization/class/conferenceorbooth.class.php
index 4afe54b2b5d..b15dcf3e545 100644
--- a/htdocs/eventorganization/class/conferenceorbooth.class.php
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -106,10 +106,10 @@ class ConferenceOrBooth extends ActionComm
 		'id' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
 		'ref' => array('type'=>'integer', 'label'=>'Ref', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>2, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'csslist'=>'left', 'comment'=>"Id"),
 		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'csslist'=>'tdoverflowmax125', 'help'=>"OrganizationEvenLabelName", 'showoncombobox'=>'1', 'autofocusoncreate'=>1),
-		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ThirdParty', 'enabled'=>'$conf->societe->enabled', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'help'=>"OrganizationEventLinkToThirdParty", 'picto'=>'company', 'csslist'=>'tdoverflowmax150 maxwidth500', 'css'=>'maxwidth500'),
-		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1:t.usage_organize_event=1', 'label'=>'Project', 'enabled'=>"isModEnabled('project')", 'position'=>52, 'notnull'=>-1, 'visible'=>-1, 'index'=>1, 'picto'=>'project', 'css'=>'tdoverflowmax150 maxwidth500', 'csslist'=>'width100'),
+		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1:t.usage_organize_event=1', 'label'=>'Project', 'enabled'=>"isModEnabled('project')", 'position'=>52, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'picto'=>'project', 'css'=>'tdoverflowmax150 maxwidth500', 'csslist'=>'width100'),
+		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ThirdParty', 'enabled'=>'$conf->societe->enabled', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'help'=>"OrganizationEventLinkToThirdParty", 'picto'=>'company', 'csslist'=>'tdoverflowmax125', 'css'=>'maxwidth500'),
 		'note' => array('type'=>'text', 'label'=>'Description', 'enabled'=>'1', 'position'=>60, 'notnull'=>0, 'visible'=>3),
-		'fk_action' => array('type'=>'sellist:c_actioncomm:libelle:id::module LIKE (\'%@eventorganization\')', 'label'=>'Format', 'enabled'=>'1', 'position'=>60, 'notnull'=>1, 'visible'=>1, 'css'=>'width100'),
+		'fk_action' => array('type'=>'sellist:c_actioncomm:libelle:id::module LIKE (\'%@eventorganization\')', 'label'=>'Format', 'enabled'=>'1', 'position'=>60, 'notnull'=>1, 'visible'=>1, 'css'=>'width100', 'csslist'=>'tdoverflowmax100'),
 		'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, 'csslist'=>'nowraponall'),
diff --git a/htdocs/eventorganization/conferenceorbooth_list.php b/htdocs/eventorganization/conferenceorbooth_list.php
index 21172d774d9..39aa7216e84 100644
--- a/htdocs/eventorganization/conferenceorbooth_list.php
+++ b/htdocs/eventorganization/conferenceorbooth_list.php
@@ -44,20 +44,20 @@ global $dolibarr_main_url_root;
 $langs->loadLangs(array("eventorganization", "other", "projects", "companies"));
 
 // Get Parameters
-$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 'create'/'add', '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
-$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'conferenceorboothlist'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : str_replace('_', '', basename(dirname(__FILE__)).basename(__FILE__, '.php')); // 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')
 $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hierarchy', 'calendar', ...)
 
 $id = GETPOST('id', 'int');
 $projectid = GETPOST('projectid', 'int');
-$projectref = GETPOST('ref');
+$projectref = GETPOST('ref', 'alpha');
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
@@ -76,7 +76,7 @@ $pagenext = $page + 1;
 $object = new ConferenceOrBooth($db);
 $extrafields = new ExtraFields($db);
 $diroutputmassaction = $conf->eventorganization->dir_output.'/temp/massgeneration/'.$user->id;
-$hookmanager->initHooks(array('conferenceorboothlist')); // Note that conf->hooks_modules contains array
+$hookmanager->initHooks(array($contextpage)); // Note that conf->hooks_modules contains array
 
 // Fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
@@ -140,8 +140,8 @@ $permissiontoadd = $user->rights->eventorganization->write;
 $permissiontodelete = $user->rights->eventorganization->delete;
 
 // Security check
-if (empty($conf->eventorganization->enabled)) {
-	accessforbidden('Module not enabled');
+if (!isModEnabled('eventorganization')) {
+	accessforbidden('Module eventorganization not enabled');
 }
 $socid = 0;
 if ($user->socid > 0) { // Protection if external user
@@ -234,7 +234,7 @@ if (empty($reshook)) {
 $form = new Form($db);
 $now = dol_now();
 
-//$help_url="EN:Module_ConferenceOrBooth|FR:Module_ConferenceOrBooth_FR|ES:Módulo_ConferenceOrBooth";
+//$help_url = "EN:Module_ConferenceOrBooth|FR:Module_ConferenceOrBooth_FR|ES:Módulo_ConferenceOrBooth";
 $help_url = '';
 $title = $langs->trans('ListOfConferencesOrBooths');
 $morejs = array();
@@ -721,7 +721,7 @@ if ($search_all) {
 		$fieldstosearchall[$key] = $langs->trans($val);
 		$setupstring .= $key."=".$val.";";
 	}
-	print '<!-- Search done like if PRODUCT_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
+	print '<!-- Search done like if EVENTORGANIZATION_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>'."\n";
 }
 
@@ -772,13 +772,13 @@ 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')) && $key != 'rowid' && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'rowid' && $key != 'ref' && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
-		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').($key == 'status' ? ' parentonrightofpage' : '').'">';
+		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'.($key == 'status' ? ' search_status width100 onrightofpage' : ''), 1);
+			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], (isset($search[$key]) ? $search[$key] : ''), $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100'.($key == 'status' ? ' search_status onrightofpage' : ''), 1);
 		} elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:') === 0)) {
 			print $object->showInputField($val, $key, (isset($search[$key]) ? $search[$key] : ''), '', '', 'search_', $cssforfield.' maxwidth250', 1);
 		} elseif (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
@@ -831,7 +831,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')) && $key != 'rowid' && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'rowid' && $key != 'ref' && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
 	$cssforfield = preg_replace('/small\s*/', '', $cssforfield);	// the 'small' css must not be used for the title label
@@ -881,94 +881,110 @@ while ($i < $imaxinloop) {
 	// Store properties in $object
 	$object->setVarsFromFetchObj($obj);
 
-	// Show here line of result
-	$j = 0;
-	print '<tr data-rowid="'.$object->id.'" class="oddeven">';
-	// Action column
-	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_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($object->id, $arrayofselected)) {
-				$selected = 1;
-			}
-			print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
+	if ($mode == 'kanban') {
+		if ($i == 0) {
+			print '<tr><td colspan="'.$savnbfield.'">';
+			print '<div class="box-flex-container">';
 		}
-		print '</td>';
-	}
-	foreach ($object->fields as $key => $val) {
-		$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';
+		// Output Kanban
+		print $object->getKanbanView('');
+		if ($i == ($imaxinloop - 1)) {
+			print '</div>';
+			print '</td></tr>';
 		}
-
-		if (in_array($val['type'], array('timestamp'))) {
-			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-		} elseif ($key == 'ref') {
-			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-		}
-
-		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 (preg_match('/tdoverflow/', $cssforfield)) {
-				print ' title="'.dol_escape_htmltag($object->$key).'"';
-			}
-			print '>';
-			if ($key == 'status') {
-				print $object->getLibStatut(5);
-			} elseif ($key == 'ref') {
-				print $object->getNomUrl(1, 0, '', (($projectid > 0)?'withproject':''));
-			} else {
-				print $object->showOutputField($val, $key, $object->$key, '');
+	} else {
+		// Show here line of result
+		$j = 0;
+		print '<tr data-rowid="'.$object->id.'" class="oddeven">';
+		// Action column
+		if (getDolGlobalString('MAIN_CHECKBOX_LEFT_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($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 (!empty($val['isameasure']) && $val['isameasure'] == 1) {
-				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;
-			}
 		}
-	}
-	// 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;
-	// Action column
-	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_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($object->id, $arrayofselected)) {
-				$selected = 1;
+		foreach ($object->fields as $key => $val) {
+			$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';
 			}
-			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>'."\n";
+			if (in_array($val['type'], array('timestamp'))) {
+				$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+			} elseif ($key == 'ref') {
+				$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+			}
+
+			if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'ref', '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.(preg_match('/tdoverflow/', $cssforfield) ? ' classfortooltip' : '').'"' : '');
+				if (preg_match('/tdoverflow/', $cssforfield)) {
+					print ' title="'.dol_escape_htmltag($object->$key).'"';
+				}
+				print '>';
+				if ($key == 'status') {
+					print $object->getLibStatut(5);
+				} elseif ($key == 'ref') {
+					print $object->getNomUrl(1, 0, '', (($projectid > 0)?'withproject':''));
+				} else {
+					print $object->showOutputField($val, $key, $object->$key, '');
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!empty($val['isameasure']) && $val['isameasure'] == 1) {
+					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;
+				}
+			}
+		}
+		// 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;
+		// Action column
+		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_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($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']++;
+			}
+		}
+
+		print '</tr>'."\n";
+	}
 
 	$i++;
 }
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 75c5b02de10..7f3fb7d8b32 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -1210,11 +1210,17 @@ if (empty($reshook)) {
 
 				unset($date);
 			} else {
+				$error++;
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
 
-		$action = '';
+		if (!$error) {
+			header("Location: ".$_SERVER["PHP_SELF"]."?id=".GETPOST('id', 'int'));
+			exit;
+		} else {
+			$action = '';
+		}
 	}
 
 	if ($action == 'confirm_delete_line' && GETPOST("confirm", 'alpha') == "yes" && $user->rights->expensereport->creer) {
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index c8fc2814ad6..dfb6327bd3f 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -3071,7 +3071,8 @@ if ($action == 'create') {
 		}
 		if (isset($objectidnext) && $objectidnext > 0) {
 			$facthatreplace = new FactureFournisseur($db);
-			$facthatreplace->fetch($facidnext);
+
+			$facthatreplace->fetch($objectidnext);
 			print ' <span class="opacitymediumbycolor paddingleft">'.str_replace('{s1}', $facthatreplace->getNomUrl(1), $langs->transnoentities("ReplacedByInvoice", '{s1}')).'</span>';
 		}
 		if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE || $object->type == FactureFournisseur::TYPE_DEPOSIT) {
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index 6166ffb3b4e..42c64613933 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -607,7 +607,7 @@ if ($resql) {
 		}
 
 		print '<td class="liste_titre maxwidthonsmartphone left">';
-		print $form->select_dolusers($search_employee, "search_employee", 1, "", $disabled, $include, '', 0, 0, 0, $morefilter, 0, '', 'maxwidth150');
+		print $form->select_dolusers($search_employee, "search_employee", 1, "", $disabled, $include, '', 0, 0, 0, $morefilter, 0, '', 'maxwidth125');
 		print '</td>';
 	}
 
@@ -617,12 +617,12 @@ if ($resql) {
 			print '<td class="liste_titre maxwidthonsmartphone left">';
 			$validator = new UserGroup($db);
 			$excludefilter = $user->admin ? '' : 'u.rowid <> '.$user->id;
-			$valideurobjects = $validator->listUsersForGroup($excludefilter);
+			$valideurobjects = $validator->listUsersForGroup($excludefilter, 1);
 			$valideurarray = array();
 			foreach ($valideurobjects as $val) {
 				$valideurarray[$val->id] = $val->id;
 			}
-			print $form->select_dolusers($search_valideur, "search_valideur", 1, "", 0, $valideurarray, '', 0, 0, 0, $morefilter, 0, '', 'maxwidth150');
+			print $form->select_dolusers($search_valideur, "search_valideur", 1, "", 0, $valideurarray, '', 0, 0, 0, $morefilter, 0, '', 'maxwidth125');
 			print '</td>';
 		} else {
 			print '<td class="liste_titre">&nbsp;</td>';
@@ -642,7 +642,7 @@ if ($resql) {
 				//$labeltoshow .= ($val['delay'] > 0 ? ' ('.$langs->trans("NoticePeriod").': '.$val['delay'].' '.$langs->trans("days").')':'');
 				$arraytypeleaves[$val['rowid']] = $labeltoshow;
 			}
-			print $form->selectarray('search_type', $arraytypeleaves, $search_type, 1, 0, 0, '', 0, 0, 0, '', '', 1);
+			print $form->selectarray('search_type', $arraytypeleaves, $search_type, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth100', 1);
 		}
 		print '</td>';
 	}
diff --git a/htdocs/holiday/month_report.php b/htdocs/holiday/month_report.php
index fe2d33ff78a..9b611c18852 100644
--- a/htdocs/holiday/month_report.php
+++ b/htdocs/holiday/month_report.php
@@ -118,16 +118,16 @@ if (empty($reshook)) {
 }
 
 $arrayfields = array(
-	'cp.ref'=>array('label' => 'Ref', 'checked'=>1),
-	'cp.fk_user'=>array('label' => 'Employee', 'checked'=>1),
-	'cp.fk_type'=>array('label' => 'Type', 'checked'=>1),
-	'cp.date_debut'=>array('label' => 'DateDebCP', 'checked'=>1),
-	'cp.date_fin'=>array('label' => 'DateFinCP', 'checked'=>1),
-	'used_days'=>array('label' => 'NbUseDaysCPShort', 'checked'=>1),
-	'date_start_month'=>array('label' => 'DateStartInMonth', 'checked'=>1),
-	'date_end_month'=>array('label' => 'DateEndInMonth', 'checked'=>1),
-	'used_days_month'=>array('label' => 'NbUseDaysCPShortInMonth', 'checked'=>1),
-	'cp.description'=>array('label' => 'DescCP', 'checked'=>1),
+	'cp.ref'=>array('label' => 'Ref', 'checked'=>1, 'position'=>5),
+	'cp.fk_type'=>array('label' => 'Type', 'checked'=>1, 'position'=>10),
+	'cp.fk_user'=>array('label' => 'Employee', 'checked'=>1, 'position'=>20),
+	'cp.date_debut'=>array('label' => 'DateDebCP', 'checked'=>1, 'position'=>30),
+	'cp.date_fin'=>array('label' => 'DateFinCP', 'checked'=>1, 'position'=>32),
+	'used_days'=>array('label' => 'NbUseDaysCPShort', 'checked'=>1, 'position'=>34),
+	'date_start_month'=>array('label' => 'DateStartInMonth', 'checked'=>1, 'position'=>50),
+	'date_end_month'=>array('label' => 'DateEndInMonth', 'checked'=>1, 'position'=>52),
+	'used_days_month'=>array('label' => 'NbUseDaysCPShortInMonth', 'checked'=>1, 'position'=>54),
+	'cp.description'=>array('label' => 'DescCP', 'checked'=>-1, 'position'=>800),
 );
 
 
@@ -149,7 +149,7 @@ $search_month = GETPOST("remonth", 'int') ?GETPOST("remonth", 'int') : date("m",
 $search_year = GETPOST("reyear", 'int') ?GETPOST("reyear", 'int') : date("Y", time());
 $year_month = sprintf("%04d", $search_year).'-'.sprintf("%02d", $search_month);
 
-$sql = "SELECT cp.rowid, cp.ref, cp.fk_user, cp.date_debut, cp.date_fin, cp.fk_type, cp.description, cp.halfday";
+$sql = "SELECT cp.rowid, cp.ref, cp.fk_user, cp.date_debut, cp.date_fin, cp.fk_type, cp.description, cp.halfday, cp.statut as status";
 $sql .= " FROM ".MAIN_DB_PREFIX."holiday cp";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user u ON cp.fk_user = u.rowid";
 $sql .= " WHERE cp.rowid > 0";
@@ -250,13 +250,6 @@ if (!empty($arrayfields['cp.ref']['checked'])) {
 	print '</th>';
 }
 
-// Filter: Employee
-if (!empty($arrayfields['cp.fk_user']['checked'])) {
-	print '<th class="liste_titre">';
-	print $form->select_dolusers($search_employee, "search_employee", 1, null, 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth100');
-	print '</th>';
-}
-
 // Filter: Type
 if (!empty($arrayfields['cp.fk_type']['checked'])) {
 	$typeleaves = $holidaystatic->getTypes(1, -1);
@@ -267,7 +260,14 @@ if (!empty($arrayfields['cp.fk_type']['checked'])) {
 	}
 
 	print '<th class="liste_titre">';
-	print $form->selectarray('search_type', $arraytypeleaves, $search_type, 1, 0, 0, '', 0, 0, 0, '', '', 1);
+	print $form->selectarray('search_type', $arraytypeleaves, $search_type, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth100', 1);
+	print '</th>';
+}
+
+// Filter: Employee
+if (!empty($arrayfields['cp.fk_user']['checked'])) {
+	print '<th class="liste_titre">';
+	print $form->select_dolusers($search_employee, "search_employee", 1, null, 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth100');
 	print '</th>';
 }
 
@@ -313,12 +313,12 @@ if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 if (!empty($arrayfields['cp.ref']['checked'])) {
 	print_liste_field_titre($arrayfields['cp.ref']['label'], $_SERVER["PHP_SELF"], 'cp.ref', '', '', '', $sortfield, $sortorder);
 }
-if (!empty($arrayfields['cp.fk_user']['checked'])) {
-	print_liste_field_titre($arrayfields['cp.fk_user']['label'], $_SERVER["PHP_SELF"], 'cp.fk_user', '', '', '', $sortfield, $sortorder);
-}
 if (!empty($arrayfields['cp.fk_type']['checked'])) {
 	print_liste_field_titre($arrayfields['cp.fk_type']['label'], $_SERVER["PHP_SELF"], 'cp.fk_type', '', '', '', $sortfield, $sortorder);
 }
+if (!empty($arrayfields['cp.fk_user']['checked'])) {
+	print_liste_field_titre($arrayfields['cp.fk_user']['label'], $_SERVER["PHP_SELF"], 'cp.fk_user', '', '', '', $sortfield, $sortorder);
+}
 if (!empty($arrayfields['ct.label']['checked'])) {
 	print_liste_field_titre($arrayfields['ct.label']['label'], $_SERVER["PHP_SELF"], 'ct.label', '', '', '', $sortfield, $sortorder);
 }
@@ -398,6 +398,15 @@ if ($num == 0) {
 		// Leave request
 		$holidaystatic->id = $obj->rowid;
 		$holidaystatic->ref = $obj->ref;
+		$holidaystatic->statut = $obj->status;
+		$holidaystatic->status = $obj->status;
+		$holidaystatic->fk_user = $obj->fk_user;
+		$holidaystatic->fk_type = $obj->fk_type;
+		$holidaystatic->description = $obj->description;
+		$holidaystatic->halfday = $obj->halfday;
+		$holidaystatic->date_debut = $db->jdate($obj->date_debut);
+		$holidaystatic->date_fin = $db->jdate($obj->date_fin);
+
 
 		print '<tr class="oddeven">';
 		// Action column
@@ -408,12 +417,12 @@ if ($num == 0) {
 		if (!empty($arrayfields['cp.ref']['checked'])) {
 			print '<td class="nowraponall">'.$holidaystatic->getNomUrl(1, 1).'</td>';
 		}
-		if (!empty($arrayfields['cp.fk_user']['checked'])) {
-			print '<td>'.$user->getFullName($langs).'</td>';
-		}
 		if (!empty($arrayfields['cp.fk_type']['checked'])) {
 			print '<td>'.$arraytypeleaves[$obj->fk_type].'</td>';
 		}
+		if (!empty($arrayfields['cp.fk_user']['checked'])) {
+			print '<td class="tdoverflowmax150">'.$user->getFullName($langs).'</td>';
+		}
 
 		if (!empty($arrayfields['cp.date_debut']['checked'])) {
 			print '<td class="center">'.dol_print_date($db->jdate($obj->date_debut), 'day');
@@ -447,7 +456,11 @@ 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 small">'.dolGetFirstLineOfText(dol_string_nohtmltag($obj->description, 1)).'</td>';
+			print '<td class="maxwidth300 small">';
+			print '<div class="twolinesmax">';
+			print dolGetFirstLineOfText(dol_string_nohtmltag($obj->description, 1));
+			print '</div>';
+			print '</td>';
 		}
 		// Action column
 		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php
index 9bd55252a43..4235b7261eb 100644
--- a/htdocs/holiday/view_log.php
+++ b/htdocs/holiday/view_log.php
@@ -333,9 +333,8 @@ if (!empty($arrayfields['cpl.date_action']['checked'])) {
 if (!empty($arrayfields['cpl.fk_user_action']['checked'])) {
 	$validator = new UserGroup($db);
 	$excludefilter = $user->admin ? '' : 'u.rowid <> '.$user->id;
-	$valideurobjects = $validator->listUsersForGroup($excludefilter);
+	$valideurobjects = $validator->listUsersForGroup($excludefilter, 1);
 	$valideurarray = array();
-
 	foreach ($valideurobjects as $val) {
 		$valideurarray[$val->id] = $val->id;
 	}
diff --git a/htdocs/hrm/class/job.class.php b/htdocs/hrm/class/job.class.php
index 1afa8c75647..b0a1d263b65 100644
--- a/htdocs/hrm/class/job.class.php
+++ b/htdocs/hrm/class/job.class.php
@@ -1065,20 +1065,21 @@ class Job extends CommonObject
 	public function getKanbanView($option = '', $arraydata = null)
 	{
 		global $selected, $langs;
+
 		$return = '<div class="box-flex-item box-flex-grow-zero">';
 		$return .= '<div class="info-box info-box-sm">';
 		$return .= '<span class="info-box-icon bg-infobox-action">';
 		$return .= img_picto('', $this->picto);
 		$return .= '</span>';
 		$return .= '<div class="info-box-content">';
-		$return .= '<span class="info-box-ref">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).'</span>';
-		$return .= '<input style="float:right;" id="cb'.$this->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$this->id.'"'.($selected ? ' checked="checked"' : '').'>';
-		if (property_exists($this, 'deplacement')) {
+		$return .= '<span class="info-box-ref">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(0) : $this->ref).'</span>';
+		$return .= '<input id="cb'.$this->id.'" class="flat checkforselect fright" type="checkbox" name="toselect[]" value="'.$this->id.'"'.($selected ? ' checked="checked"' : '').'>';
+		/*if (property_exists($this, 'deplacement')) {
 			$return .= '<br><span class="opacitymedium">'.$langs->trans("Type").'</span>';
 			$return .= ' : <span class="info-box-label ">'.$this->fields['deplacement']['arrayofkeyval'][$this->deplacement].'</span>';
-		}
+		}*/
 		if (property_exists($this, 'description') && !(empty($this->description))) {
-			$return .= '<br><span class="info-box-label opacitymedium">'.$langs->trans("Description").'</span> : ';
+			//$return .= '<br><span class="info-box-label opacitymedium">'.$langs->trans("Description").'</span> : ';
 			$return .= '<br><span class="info-box-label ">'.(strlen($this->description) > 30 ? dol_substr($this->description, 0, 25).'...' : $this->description).'</span>';
 		}
 		$return .= '</div>';
diff --git a/htdocs/hrm/class/position.class.php b/htdocs/hrm/class/position.class.php
index caf2ff00b03..fe394ea5e8a 100644
--- a/htdocs/hrm/class/position.class.php
+++ b/htdocs/hrm/class/position.class.php
@@ -1118,6 +1118,41 @@ class Position extends CommonObject
 
 		return $error;
 	}
+
+	/**
+	 *	Return clicable link of object (with eventually picto)
+	 *
+	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @return		string		HTML Code for Kanban thumb.
+	 */
+	public function getKanbanView($option = '')
+	{
+		global $selected, $langs;
+		$return = '<div class="box-flex-item box-flex-grow-zero">';
+		$return .= '<div class="info-box info-box-sm">';
+		$return .= '<span class="info-box-icon bg-infobox-action">';
+		$return .= img_picto('', $this->picto);
+		$return .= '</span>';
+		$return .= '<div class="info-box-content">';
+		$return .= '<span class="info-box-ref">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).'</span>';
+		$return .= '<input class="fright" id="cb'.$this->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$this->id.'"'.($selected ? ' checked="checked"' : '').'>';
+		if (property_exists($this, 'fk_user') && !(empty($this->fk_user))) {
+			$return .= '<br><span class="info-box-label opacitymedium">'.$langs->trans("Employee").'</span> : ';
+			$return .= '<span class="info-box-label ">'.$this->fk_user.'</span>';
+		}
+		if (property_exists($this, 'fk_job') && !(empty($this->fk_job))) {
+			$return .= '<br><span class="info-box-label opacitymedium">'.$langs->trans("Job").'</span> : ';
+			$return .= '<span class="info-box-label ">'.$this->fk_job.'</span>';
+		}
+		if (property_exists($this, 'date_start') && property_exists($this, 'date_end')) {
+			$return .= '<br><div class ="margintoponly"><span class="info-box-label ">'.dol_print_date($this->db->jdate($this->date_start), 'day').'</span>';
+			$return .= ' - <span class="info-box-label ">'.dol_print_date($this->db->jdate($this->date_end), 'day').'</span></div>';
+		}
+		$return .= '</div>';
+		$return .= '</div>';
+		$return .= '</div>';
+		return $return;
+	}
 }
 
 
diff --git a/htdocs/hrm/job_list.php b/htdocs/hrm/job_list.php
index 6e97c0d0483..18414cc9f11 100644
--- a/htdocs/hrm/job_list.php
+++ b/htdocs/hrm/job_list.php
@@ -116,11 +116,11 @@ $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, 1, '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, 1, '1')),
+			'enabled'=>(abs($visible) != 3 && dol_eval($val['enabled'], 1)),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
@@ -137,18 +137,15 @@ $permissiontoread = $user->rights->hrm->all->read;
 $permissiontoadd  = $user->rights->hrm->all->write;
 $permissiontodelete = $user->rights->hrm->all->delete;
 
-// Security check
-if (empty($conf->hrm->enabled)) {
-	accessforbidden('Module not enabled');
-}
-
 // Security check (enable the most restrictive one)
 if ($user->socid > 0) accessforbidden();
 //if ($user->socid > 0) accessforbidden();
 //$socid = 0; if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->hrm->enabled)) accessforbidden();
+if (!isModEnabled('hrm')) {
+	accessforbidden('Module hrm not enabled');
+}
 if (!$permissiontoread) accessforbidden();
 
 
@@ -257,17 +254,17 @@ foreach ($search as $key => $val) {
 			$mode_search = 2;
 		}
 		if ($search[$key] != '') {
-			$sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
+			$sql .= natural_search("t.".$db->escape($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]) . "'";
+					$sql .= " AND t.".$db->escape($columnName)." >= '".$db->idate($search[$key])."'";
 				}
 				if (preg_match('/_dtend$/', $key)) {
-					$sql .= " AND t." . $columnName . " <= '" . $db->idate($search[$key]) . "'";
+					$sql .= " AND t.".$db->escape($columnName)." <= '".$db->idate($search[$key])."'";
 				}
 			}
 		}
@@ -287,7 +284,7 @@ $sql .= $hookmanager->resPrint;
 /* If a group by is required
 $sql .= " GROUP BY ";
 foreach($object->fields as $key => $val) {
-	$sql .= "t.".$key.", ";
+	$sql .= "t.".$db->escape($key).", ";
 }
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
@@ -302,8 +299,6 @@ $sql .= $hookmanager->resPrint;
 $sql = preg_replace('/,\s*$/', '', $sql);
 */
 
-$sql .= $db->order($sortfield, $sortorder);
-
 // Count total nb of records
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
@@ -313,24 +308,24 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 		$page = 0;
 		$offset = 0;
 	}
+	$db->free($resql);
 }
-// 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 || empty($limit))) {
-	$num = $nbtotalofrecords;
-} else {
-	if ($limit) {
-		$sql .= $db->plimit($limit + 1, $offset);
-	}
 
-	$resql = $db->query($sql);
-	if (!$resql) {
-		dol_print_error($db);
-		exit;
-	}
-
-	$num = $db->num_rows($resql);
+// Complete request and execute it with limit
+$sql .= $db->order($sortfield, $sortorder);
+if ($limit) {
+	$sql .= $db->plimit($limit + 1, $offset);
 }
 
+$resql = $db->query($sql);
+if (!$resql) {
+	dol_print_error($db);
+	exit;
+}
+
+$num = $db->num_rows($resql);
+
+
 // Direct jump if only one record found
 if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all && !$page) {
 	$obj = $db->fetch_object($resql);
@@ -373,11 +368,17 @@ if ($limit > 0 && $limit != $conf->liste_limit) {
 	$param .= '&limit='.urlencode($limit);
 }
 foreach ($search as $key => $val) {
-	if (is_array($search[$key]) && count($search[$key])) {
+	if (is_array($search[$key])) {
 		foreach ($search[$key] as $skey) {
-			$param .= '&search_'.$key.'[]='.urlencode($skey);
+			if ($skey != '') {
+				$param .= '&search_'.$key.'[]='.urlencode($skey);
+			}
 		}
-	} else {
+	} elseif (preg_match('/(_dtstart|_dtend)$/', $key) && !empty($val)) {
+		$param .= '&search_'.$key.'month='.((int) GETPOST('search_'.$key.'month', 'int'));
+		$param .= '&search_'.$key.'day='.((int) GETPOST('search_'.$key.'day', 'int'));
+		$param .= '&search_'.$key.'year='.((int) GETPOST('search_'.$key.'year', 'int'));
+	} elseif ($search[$key] != '') {
 		$param .= '&search_'.$key.'='.urlencode($search[$key]);
 	}
 }
@@ -398,7 +399,7 @@ $arrayofmassactions = array(
 	//'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
 	//'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
 );
-if ($permissiontodelete) {
+if (!empty($permissiontodelete)) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
 if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
@@ -435,9 +436,12 @@ $trackid = 'xxxx'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 if ($search_all) {
+	$setupstring = '';
 	foreach ($fieldstosearchall as $key => $val) {
 		$fieldstosearchall[$key] = $langs->trans($val);
+		$setupstring .= $key."=".$val.";";
 	}
+	print '<!-- Search done like if JOBPOSITION_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
 }
 
@@ -461,7 +465,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // 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
@@ -471,7 +475,15 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
 // Fields title search
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
+// Action column
+if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons('left');
+	print $searchpicto;
+	print '</td>';
+}
 foreach ($object->fields as $key => $val) {
+	$searchkey = empty($search[$key]) ? '' : $search[$key];
 	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'status') {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
@@ -479,7 +491,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' && empty($val['arrayofkeyval'])) {
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'rowid' && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
@@ -487,9 +499,7 @@ foreach ($object->fields as $key => $val) {
 		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)) {
-			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] : '').'">';
+			print $object->showInputField($val, $key, (isset($search[$key]) ? $search[$key] : ''), '', '', 'search_', $cssforfield.' maxwidth125', 1);
 		} 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'));
@@ -497,6 +507,12 @@ foreach ($object->fields as $key => $val) {
 			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>';
+		} elseif ($key == 'lang') {
+			require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
+			$formadmin = new FormAdmin($db);
+			print $formadmin->select_language($search[$key], 'search_lang', 0, null, 1, 0, 0, 'minwidth150 maxwidth200', 2);
+		} else {
+			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag(isset($search[$key]) ? $search[$key] : '').'">';
 		}
 		print '</td>';
 	}
@@ -509,16 +525,23 @@ $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>';
+if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons();
+	print $searchpicto;
+	print '</td>';
+}
 print '</tr>'."\n";
 
+$totalarray = array();
+$totalarray['nbfield'] = 0;
 
 // Fields title label
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
+if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+}
 foreach ($object->fields as $key => $val) {
 	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'status') {
@@ -527,21 +550,26 @@ 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' && empty($val['arrayofkeyval'])) {
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'rowid' && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
+	$cssforfield = preg_replace('/small\s*/', '', $cssforfield);	// the 'small' css must not be used for the title label
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
 		print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n";
+		$totalarray['nbfield']++;
 	}
 }
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder, 'totalarray'=>&$totalarray);
 $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";
+if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+}
+$totalarray['nbfield']++;
 print '</tr>'."\n";
 
 
@@ -559,9 +587,11 @@ if (isset($extrafields->attributes[$object->table_element]['computed']) && is_ar
 // Loop on record
 // --------------------------------------------------------------------
 $i = 0;
+$savnbfield = $totalarray['nbfield'];
 $totalarray = array();
 $totalarray['nbfield'] = 0;
-while ($i < ($limit ? min($num, $limit) : $num)) {
+$imaxinloop = ($limit ? min($num, $limit) : $num);
+while ($i < $imaxinloop) {
 	$obj = $db->fetch_object($resql);
 	if (empty($obj)) {
 		break; // Should not happen
@@ -571,29 +601,35 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 	$object->setVarsFromFetchObj($obj);
 
 	if ($mode == 'kanban') {
-		if ($i == 0) {
-			print '<tr><td colspan="12">';
-			print '<div class="box-flex-container">';
-		}
-		// Output Kanban
-
 		$object->deplacement = $obj->deplacement;
 		$object->description = $obj->description;
 
-		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;
-			}
-			print $object->getKanbanView('');
+		if ($i == 0) {
+			print '<tr><td colspan="'.$savnbfield.'">';
+			print '<div class="box-flex-container">';
 		}
-		if ($i == (min($num, $limit) - 1)) {
+		// Output Kanban
+		print $object->getKanbanView('');
+		if ($i == ($imaxinloop - 1)) {
 			print '</div>';
 			print '</td></tr>';
 		}
 	} else {
 		// Show here line of result
-		print '<tr class="oddeven">';
+		$j = 0;
+		print '<tr data-rowid="'.$object->id.'" class="oddeven">';
+		// Action column
+		if (!empty($conf->global->MAIN_CHECKBOX_LEFT_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($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>';
+		}
 		foreach ($object->fields as $key => $val) {
 			$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 			if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
@@ -614,7 +650,11 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			//if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
 
 			if (!empty($arrayfields['t.'.$key]['checked'])) {
-				print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
+				print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '');
+				if (preg_match('/tdoverflow/', $cssforfield)) {
+					print ' title="'.dol_escape_htmltag($object->$key).'"';
+				}
+				print '>';
 				if ($key == 'status') {
 					print $object->getLibStatut(5);
 				} elseif ($key == 'rowid') {
@@ -649,21 +689,24 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // 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
-			$selected = 0;
-			if (in_array($object->id, $arrayofselected)) {
-				$selected = 1;
+		if (empty($conf->global->MAIN_CHECKBOX_LEFT_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($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 '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
+			print '</td>';
 		}
-		print '</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
 
 		print '</tr>'."\n";
 	}
+
 	$i++;
 }
 
@@ -678,14 +721,14 @@ if ($num == 0) {
 			$colspan++;
 		}
 	}
-	print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
+	print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
 }
 
 
 $db->free($resql);
 
 $parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
-$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
 print '</table>'."\n";
diff --git a/htdocs/hrm/position_list.php b/htdocs/hrm/position_list.php
index 40cb706b5df..4518d28bf65 100644
--- a/htdocs/hrm/position_list.php
+++ b/htdocs/hrm/position_list.php
@@ -73,6 +73,7 @@ $pagenext = $page + 1;
 // Initialize technical objects
 $object = new Position($db);
 $extrafields = new ExtraFields($db);
+$userstatic = new User($db);
 $diroutputmassaction = $conf->hrm->dir_output.'/temp/massgeneration/'.$user->id;
 $hookmanager->initHooks(array('positionlist')); // Note that conf->hooks_modules contains array
 
@@ -218,6 +219,10 @@ $morecss = array();
 // --------------------------------------------------------------------
 $sql = 'SELECT ';
 $sql .= $object->getFieldList('t');
+$sql .= ',';
+$sql .= $userstatic->getFieldList('u');
+$sql .= ',u.email, u.statut';
+$sql .= ',j.rowid, j.label as job_label';
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
@@ -229,7 +234,7 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object); // Note that $action and $object may have been modified by hook
 $sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
 $sql = preg_replace('/,\s*$/', '', $sql);
-$sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
+$sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t LEFT JOIN ".MAIN_DB_PREFIX.$userstatic->table_element." as u on t.fk_user = u.rowid, ".MAIN_DB_PREFIX."hrm_job as j";
 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)";
 }
@@ -242,6 +247,7 @@ if ($object->ismultientitymanaged == 1) {
 } else {
 	$sql .= " WHERE 1 = 1";
 }
+$sql .= " AND t.fk_job = j.rowid";
 foreach ($search as $key => $val) {
 	if (array_key_exists($key, $object->fields)) {
 		if ($key == 'status' && $search[$key] == -1) {
@@ -426,7 +432,10 @@ print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 print '<input type="hidden" name="mode" value="'.$mode.'">';
 
-$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/hrm/position.php', 1).'?action=create', '', $permissiontoadd);
+$newcardbutton = '';
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/hrm/position.php', 1).'?action=create', '', $permissiontoadd);
 
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'object_'.$object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
 
@@ -602,13 +611,33 @@ while ($i < $imaxinloop) {
 	// Store properties in $object
 	$object->setVarsFromFetchObj($obj);
 
+
 	if ($mode == 'kanban') {
 		if ($i == 0) {
-			print '<tr><td colspan="'.$savnbfield.'">';
+			print '<tr><td colspan="12">';
 			print '<div class="box-flex-container">';
 		}
-		// Output Kanban
-		print $object->getKanbanView('');
+		// get info needed
+		$object->date_start = $obj->date_start;
+		$object->date_end = $obj->date_end;
+		$object->fk_job = $obj->job_label;
+
+		$userstatic->id = $obj->fk_user;
+		$userstatic->ref = $obj->fk_user;
+		$userstatic->firstname = $obj->firstname;
+		$userstatic->lastname = $obj->lastname;
+		$userstatic->email = $obj->email;
+		$userstatic->statut = $obj->statut;
+
+		$object->fk_user = $userstatic->getNomUrl(1);
+		// output kanban
+		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;
+			}
+			print $object->getKanbanView('');
+		}
 		if ($i == ($imaxinloop - 1)) {
 			print '</div>';
 			print '</td></tr>';
diff --git a/htdocs/includes/tcpdi/tcpdi_parser.php b/htdocs/includes/tcpdi/tcpdi_parser.php
index 13e9839f2b4..6d3cf789b6a 100644
--- a/htdocs/includes/tcpdi/tcpdi_parser.php
+++ b/htdocs/includes/tcpdi/tcpdi_parser.php
@@ -1373,7 +1373,7 @@ class tcpdi_parser {
     			return false;
     		} else {
                 $res = $this->_getPageRotation($obj[1][1]['/Parent']);
-                if ($res[0] == PDF_TYPE_OBJECT)
+                if ($res && $res[0] == PDF_TYPE_OBJECT)
                     return $res[1];
                 return $res;
     		}
diff --git a/htdocs/includes/webklex/php-imap/vendor/autoload.php b/htdocs/includes/webklex/php-imap/vendor/autoload.php
index f4e36963c6a..298bedf9b9c 100644
--- a/htdocs/includes/webklex/php-imap/vendor/autoload.php
+++ b/htdocs/includes/webklex/php-imap/vendor/autoload.php
@@ -13,10 +13,23 @@ require_once __DIR__ . '/composer/autoload_real.php';
 return ComposerAutoloaderInit4da13270269c89a28e472e1f7324e6d1::getLoader();
 */
 
+
+// Add class/method of PHP8 for compatibility with older versions of PHP
+require_once(__DIR__.'/symfony/polyfill-php80/bootstrap.php');
+
+
 spl_autoload_register(function ($class_name) {
 	// Enable this to detect what we need for require_once
 	//var_dump($class_name);
 
+
+	$preg_match = preg_match('/^Symfony\\\Polyfill\\\Php80\\\/', $class_name);
+	if (1 === $preg_match) {
+		$class_name = preg_replace('/\\\/', '/', $class_name);
+		$class_name = preg_replace('/^Symfony\\/Polyfill\\/Php80\\//', '', $class_name);
+		require_once __DIR__ . '/symfony/polyfill-php80/' . $class_name . '.php';
+	}
+
 	$preg_match = preg_match('/^Webklex\\\PHPIMAP\\\/', $class_name);
 	if (1 === $preg_match) {
 		$class_name = preg_replace('/\\\/', '/', $class_name);
diff --git a/htdocs/install/mysql/data/llx_10_c_regions.sql b/htdocs/install/mysql/data/llx_10_c_regions.sql
index 52a1a3bbbb6..f86fbe069b8 100644
--- a/htdocs/install/mysql/data/llx_10_c_regions.sql
+++ b/htdocs/install/mysql/data/llx_10_c_regions.sql
@@ -78,6 +78,7 @@
 -- Portugal
 -- Romania -> for Departmements
 -- San Salvador
+-- Slovakia
 -- Slovenia
 -- Spain
 -- Switzerland/Suisse -> for Departmements/Cantons
@@ -450,6 +451,13 @@ INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 8
 INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 86, 8603, NULL, NULL, 'Occidental');
 
 
+-- Slovakia Regions (rowid country=201)
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 201, '20101', 'SK01', NULL, 'Bratislava Region');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 201, '20102', 'SK02', NULL, 'Western Slovakia');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 201, '20103', 'SK03', NULL, 'Central Slovakia');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 201, '20104', 'SK04', NULL, 'Eastern Slovakia');
+
+
 -- Slovenia Regions (rowid country=202)
 INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 202, '20203', 'SI03', NULL, 'East Slovenia');
 INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 202, '20204', 'SI04', NULL, 'West Slovenia');
diff --git a/htdocs/install/step5.php b/htdocs/install/step5.php
index 31b086636f2..c516cc70aef 100644
--- a/htdocs/install/step5.php
+++ b/htdocs/install/step5.php
@@ -368,13 +368,16 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i', $action)) {
 if ($action == "set") {
 	if ($success) {
 		if (empty($conf->global->MAIN_VERSION_LAST_UPGRADE) || ($conf->global->MAIN_VERSION_LAST_UPGRADE == DOL_VERSION)) {
-			// Install is finished
+			// Install is finished (database is on same version than files)
 			print '<br>'.$langs->trans("SystemIsInstalled")."<br>";
 
+			// Create install.lock file
+			// No need for the moment to create it automatically, creation by web assistant means permissions are given
+			// to the web user, it is better to show a warning to say to create it manually with correct user/permission (not erasable by a web process)
 			$createlock = 0;
-
 			if (!empty($force_install_lockinstall) || !empty($conf->global->MAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADE)) {
-				// Install is finished, we create the lock file
+				// Install is finished, we create the "install.lock" file, so install won't be possible anymore.
+				// TODO Upgrade will be still be possible if a file "upgrade.unlock" is present
 				$lockfile = DOL_DATA_ROOT.'/install.lock';
 				$fp = @fopen($lockfile, "w");
 				if ($fp) {
@@ -413,13 +416,14 @@ if ($action == "set") {
 } elseif (empty($action) || preg_match('/upgrade/i', $action)) {
 	// If upgrade
 	if (empty($conf->global->MAIN_VERSION_LAST_UPGRADE) || ($conf->global->MAIN_VERSION_LAST_UPGRADE == DOL_VERSION)) {
-		// Upgrade is finished
+		// Upgrade is finished (database is on same version than files)
 		print '<img class="valignmiddle inline-block paddingright" src="../theme/common/octicons/build/svg/checklist.svg" width="20" alt="Configuration"> <span class="valignmiddle">'.$langs->trans("SystemIsUpgraded")."</span><br>";
 
+		// Create install.lock file if it does not exists.
+		// Note: it should always exists. A better solution to allow upgrade will be to add an upgrade.unlock file
 		$createlock = 0;
-
 		if (!empty($force_install_lockinstall) || !empty($conf->global->MAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADE)) {
-			// Upgrade is finished, we create the lock file
+			// Upgrade is finished, we modify the lock file
 			$lockfile = DOL_DATA_ROOT.'/install.lock';
 			$fp = @fopen($lockfile, "w");
 			if ($fp) {
@@ -436,6 +440,10 @@ if ($action == "set") {
 			print '<br><div class="warning">'.$langs->trans("WarningRemoveInstallDir")."</div>";
 		}
 
+		// Delete the upgrade.unlock file it it exists
+		$unlockupgradefile = DOL_DATA_ROOT.'/upgrade.unlock';
+		dol_delete_file($unlockupgradefile, 0, 0, 0, null, false, 0);
+
 		print "<br>";
 
 		$morehtml = '<br><div class="center"><a href="../index.php?mainmenu=home'.(isset($login) ? '&username='.urlencode($login) : '').'">';
diff --git a/htdocs/knowledgemanagement/knowledgerecord_list.php b/htdocs/knowledgemanagement/knowledgerecord_list.php
index 7f3e3cec2c1..7cd5a24c764 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_list.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_list.php
@@ -469,7 +469,7 @@ if ($search_all) {
 		$fieldstosearchall[$key] = $langs->trans($val);
 		$setupstring .= $key."=".$val.";";
 	}
-	print '<!-- Search done like if PRODUCT_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
+	print '<!-- Search done like if KNOWLEDGEMANAGEMENT_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>'."\n";
 }
 
diff --git a/htdocs/langs/ar_IQ/companies.lang b/htdocs/langs/ar_IQ/companies.lang
new file mode 100644
index 00000000000..68a71bb368e
--- /dev/null
+++ b/htdocs/langs/ar_IQ/companies.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - companies
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> with this vendor
+HasNoRelativeDiscountFromSupplier=No default relative discount with this vendor
diff --git a/htdocs/langs/ar_SA/accountancy.lang b/htdocs/langs/ar_SA/accountancy.lang
index e7db1d05f66..d4fb4d12a14 100644
--- a/htdocs/langs/ar_SA/accountancy.lang
+++ b/htdocs/langs/ar_SA/accountancy.lang
@@ -14,8 +14,8 @@ ACCOUNTING_EXPORT_ENDLINE=حدد نوع إرجاع السطر
 ACCOUNTING_EXPORT_PREFIX_SPEC=تحديد بادئة لاسم الملف
 ThisService=هذه الخدمة
 ThisProduct=هذا المنتج
-DefaultForService=افتراضي للخدمة
-DefaultForProduct=افتراضي للمنتج
+DefaultForService=Default for services
+DefaultForProduct=Default for products
 ProductForThisThirdparty=منتج لهذا الطرف الثالث
 ServiceForThisThirdparty=خدمة لهذا الطرف الثالث
 CantSuggest=لا أستطيع أن أقترح
@@ -101,7 +101,8 @@ ShowAccountingAccount=عرض حساب المحاسبة
 ShowAccountingJournal=عرض دفتر يومية
 ShowAccountingAccountInLedger=عرض حساب المحاسبة في دفتر الأستاذ
 ShowAccountingAccountInJournals=عرض حساب المحاسبة في دفاتر اليومية
-AccountAccountingSuggest=حساب المحاسبة المقترح
+DataUsedToSuggestAccount=Data used to suggest account
+AccountAccountingSuggest=Account suggested
 MenuDefaultAccounts=الحسابات الافتراضية
 MenuBankAccounts=الحسابات المصرفية
 MenuVatAccounts=حسابات ضريبة القيمة المضافة
@@ -126,6 +127,7 @@ WriteBookKeeping=تسجيل المعاملات في المحاسبة
 Bookkeeping=دفتر حسابات
 BookkeepingSubAccount=حساب استاذ فرعي
 AccountBalance=رصيد الحساب
+AccountBalanceSubAccount=Sub-accounts balance
 ObjectsRef=مرجع الكائن المصدر
 CAHTF=Total purchase vendor before tax
 TotalExpenseReport=تقرير المصاريف الإجمالية
@@ -189,6 +191,7 @@ ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Account (from the Chart Of Account) to be us
 UseAuxiliaryAccountOnCustomerDeposit=تخزين حساب العميل كحساب فردي في دفتر الأستاذ الفرعي لخطوط الدفعات المقدمة (إذا تم تعطيله ، فسيظل الحساب الفردي لبنود الدَفعة المقدمة فارغًا)
 ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Account (from the Chart Of Account) to be used as the default
 UseAuxiliaryAccountOnSupplierDeposit=Store supplier account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
+ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY=Accounting account by default to register customer retained warranty
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased within same country (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased from EEC to another EEC country (used if not defined in the product sheet)
@@ -218,6 +221,7 @@ JournalLabel=اسم دفتر اليومية
 NumPiece=رقم القطعة
 TransactionNumShort=رقم. العملية
 AccountingCategory=Custom group of accounts
+AccountingCategories=Custom groups of accounts
 GroupByAccountAccounting=تجميع حسب حساب دفتر الأستاذ العام
 GroupBySubAccountAccounting=تجميع حسب حساب دفتر الأستاذ الفرعي
 AccountingAccountGroupsDesc=يمكنك هنا تحديد بعض مجموعات الحساب. سيتم استخدامها لتقارير المحاسبة الشخصية.
@@ -265,6 +269,7 @@ ShowSubtotalByGroup=عرض المجموع الفرعي حسب المستوى
 
 Pcgtype=مجموعة الحساب
 PcgtypeDesc=تُستخدم مجموعة الحسابات كمعايير "تصفية" و "تجميع" محددة مسبقًا لبعض التقارير المحاسبية. على سبيل المثال ، يتم استخدام "الدخل" أو "المصاريف" كمجموعات لحسابات المنتجات لإنشاء تقرير المصاريف / الدخل.
+AccountingCategoriesDesc=Custom group of accounts can be used to group accounting accounts into one name to ease filter use or building of custom reports.
 
 Reconcilable=قابل للتسوية
 
@@ -294,6 +299,7 @@ DescValidateMovements=سيتم حظر أي تعديل أو حذف للكتابة
 
 ValidateHistory=ربط تلقائي
 AutomaticBindingDone=تم إجراء عمليات ربط تلقائية (%s) - الربط التلقائي غير ممكن لبعض السجلات (%s)
+DoManualBindingForFailedRecord=You have to do a manual link for the %s row(s) not linked automatically.
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot remove or disable this account of chart of account because it is used
 MvtNotCorrectlyBalanced=الحركة غير متوازنة بشكل صحيح. الخصم = %s والائتمان = %s
@@ -337,11 +343,13 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=تعطيل الربط والتحويل في
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=تعطيل الربط والتحويل في المحاسبة على المشتريات (لن يتم أخذ فواتير البائعين في الاعتبار في المحاسبة)
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=تعطيل الربط والتحويل في المحاسبة على تقارير المصروفات (لن يتم أخذ تقارير المصروفات في الاعتبار في المحاسبة)
 ACCOUNTING_ENABLE_LETTERING=Enable the lettering function in the accounting
+ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
 
 ## Export
 NotExportLettering=Do not export the lettering when generating the file
 NotifiedExportDate=ضع علامة على الخطوط المصدرة كـ <span class="warning"> (لتعديل سطر ، ستحتاج إلى حذف المعاملة بالكامل وإعادة تحويلها إلى المحاسبة) </span>
 NotifiedValidationDate=تحقق من صحة الإدخالات التي تم تصديرها وقفلها <span class="warning"> (نفس التأثير من ميزة "%s" ، ولن يكون تعديل الأسطر وحذفها بالتأكيد ممكنًا) </span>
+NotifiedExportFull=Export documents ?
 DateValidationAndLock=التحقق من صحة التاريخ والقفل
 ConfirmExportFile=تأكيد إنشاء ملف محاسبي تصدير؟
 ExportDraftJournal=تصدير مسودة دفتر اليومية
@@ -398,7 +406,7 @@ SaleLocal=بيع محلي
 SaleExport=بيع تصدير
 SaleEEC=بيع في الاتحاد الاوروبي
 SaleEECWithVAT=البيع في EEC مع ضريبة القيمة المضافة ليست فارغة ، لذلك نفترض أن هذا ليس بيعًا داخل الاتحاد والحساب المقترح هو حساب المنتج القياسي.
-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.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the thirdparty, or change the product account suggested for binding if needed.
 ForbiddenTransactionAlreadyExported=ممنوع: تم التحقق من صحة المعاملة و / أو تصديرها.
 ForbiddenTransactionAlreadyValidated=ممنوع: تم التحقق من صحة المعاملة.
 ## Dictionary
@@ -442,6 +450,7 @@ AccountancyErrorMismatchLetterCode=عدم تطابق في التوفيق بين
 AccountancyErrorMismatchBalanceAmount=الرصيد (%s) لا يساوي 0
 AccountancyErrorLetteringBookkeeping=حدثت أخطاء بخصوص المعاملات: %s
 ErrorAccountNumberAlreadyExists=رقم المحاسبة %s موجود بالفعل
+ErrorArchiveAddFile=Can't put "%s" file in archive
 
 ## Import
 ImportAccountingEntries=مداخيل حسابية
@@ -468,5 +477,7 @@ FECFormatMulticurrencyCode=كود متعدد العملات (ايديفيز)
 DateExport=تاريخ التصدير
 WarningReportNotReliable=تحذير ، هذا التقرير لا يستند إلى دفتر الأستاذ ، لذلك لا يحتوي على معاملة تم تعديلها يدويًا في دفتر الأستاذ. إذا كان تسجيل دفتر اليومية الخاص بك محدثًا ، فسيكون عرض مسك الدفاتر أكثر دقة.
 ExpenseReportJournal=تقرير دفتر المصاريف
+DocsAlreadyExportedAreExcluded=Docs already exported are excluded
+ClickToHideAlreadyExportedLines=Click to hide already exported lines
 
 NAccounts=%s حساباً
diff --git a/htdocs/langs/ar_SA/main.lang b/htdocs/langs/ar_SA/main.lang
index 2d93cc6fedf..8e6c8c6381a 100644
--- a/htdocs/langs/ar_SA/main.lang
+++ b/htdocs/langs/ar_SA/main.lang
@@ -226,6 +226,7 @@ NoUserGroupDefined=لم يتم تحديد مجموعة مستخدمين
 Password=كلمة المرور
 PasswordRetype=Repeat your password
 NoteSomeFeaturesAreDisabled=لاحظ أنه تم تعطيل الكثير من الميزات | الوحدات في هذا العرض التوضيحي.
+YourUserFile=Your user file
 Name=اسم
 NameSlashCompany=الاسم | الشركة
 Person=شخص
@@ -897,6 +898,9 @@ MassFilesArea=مساحة للملفات التي تم إنشاؤها بواسط
 ShowTempMassFilesArea=عرض مساحة الملفات التي تم إنشاؤها بواسطة الإجراءات الجماعية
 ConfirmMassDeletion=تأكيد الحذف الضخم
 ConfirmMassDeletionQuestion=هل أنت متأكد من أنك تريد حذف %s السجل (السجلات) المحددة؟
+ConfirmMassClone=Bulk clone confirmation
+ConfirmMassCloneQuestion=Select project to clone to
+ConfirmMassCloneToOneProject=Clone to project %s
 RelatedObjects=كائنات ذات صلة
 ClassifyBilled=تصنيف الفواتير
 ClassifyUnbilled=تصنيف غير مفوتر
@@ -912,8 +916,8 @@ ExportFilteredList=تصدير قائمة التى تم تصفيتها
 ExportList=قائمة التصدير
 ExportOptions=خيارات التصدير
 IncludeDocsAlreadyExported=تضمين المستندات التي تم تصديرها
-ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
-ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+ExportOfPiecesAlreadyExportedIsEnable=Documents already exported are visible and will be exported
+ExportOfPiecesAlreadyExportedIsDisable=Documents already exported are hidden and won't be exported
 AllExportedMovementsWereRecordedAsExported=تم تسجيل جميع حركات التصدير على أنها مصدرة
 NotAllExportedMovementsCouldBeRecordedAsExported=لا يمكن تسجيل جميع حركات التصدير على أنها مصدرة
 Miscellaneous=متفرقات
@@ -1128,6 +1132,7 @@ DeleteFileText=هل تريد حقا حذف هذا الملف؟
 ShowOtherLanguages=عرض اللغات الأخرى
 SwitchInEditModeToAddTranslation=قم بالتبديل في وضع التحرير لإضافة ترجمات لهذه اللغة
 NotUsedForThisCustomer=غير مستخدم لهذا العميل
+NotUsedForThisVendor=Not used for this vendor
 AmountMustBePositive=المبلغ  يجب أن يكون موجبًا
 ByStatus=حسب الحالة
 InformationMessage=معلومات
@@ -1148,14 +1153,14 @@ EventReminder=تذكير بالحدث
 UpdateForAllLines=تحديث لجميع البنود
 OnHold=في الانتظار
 Civility=Civility
-AffectTag=Assign Tag
-AffectUser=Assign User
-SetSupervisor=Set Supervisor
+AffectTag=Assign a Tag
+AffectUser=Assign a User
+SetSupervisor=Set the supervisor
 CreateExternalUser=إنشاء مستخدم خارجي
 ConfirmAffectTag=Bulk Tag Assignement
 ConfirmAffectUser=Bulk User Assignement
-ProjectRole=Role assigned on each project
-TasksRole=Role assigned on each task of each project
+ProjectRole=Role assigned on each project/opportunity
+TasksRole=Role assigned on each task (if used)
 ConfirmSetSupervisor=Bulk Supervisor Set
 ConfirmUpdatePrice=Choose a increase/decrease price rate
 ConfirmAffectTagQuestion=Are you sure you want to assign tags to the %s selected record(s)?
@@ -1210,3 +1215,10 @@ CreatedByPublicPortal=تم إنشاؤه من بوابة عامة
 UserAgent=User Agent
 InternalUser=مستخدم داخلي
 ExternalUser=مستخدم خارجي
+NoSpecificContactAddress=No specific contact or address
+NoSpecificContactAddressBis=This tab is dedicated to force specific contacts or addresses for the current object. Use it only if you want to define one or several specific contacts or addresses for the object when the information on the thirdparty is not enough or not accurate.
+HideOnVCard=Hide %s
+AddToContacts=Add address to my contacts
+LastAccess=Last access
+UploadAnImageToSeeAPhotoHere=Upload an image from the tab %s to see a photo here
+LastPasswordChangeDate=Last password change date
diff --git a/htdocs/langs/ar_SA/stripe.lang b/htdocs/langs/ar_SA/stripe.lang
index 94865279dd8..442c1a2788a 100644
--- a/htdocs/langs/ar_SA/stripe.lang
+++ b/htdocs/langs/ar_SA/stripe.lang
@@ -41,7 +41,8 @@ STRIPE_LIVE_WEBHOOK_KEY=المفتاح المباشر للخطاف التلقا
 ONLINE_PAYMENT_WAREHOUSE=المخزون الذي سيتم استخدامه لتقليل المخزون عند إتمام الدفع عبر الإنترنت <br> (TODO عندما يتم تنفيذ خيار تقليل المخزون على إجراء على الفاتورة ويقوم الدفع عبر الإنترنت بإنشاء الفاتورة بنفسه؟)
 StripeLiveEnabled=تم تمكين Stripe Live (بخلاف ذلك وضع الاختبار / وضع الحماية)
 StripeImportPayment=استيراد مدفوعات الشريط
-ExampleOfTestCreditCard=مثال على بطاقة الائتمان للاختبار: %s => صالحة ، %s => خطأ CVC ، %s => منتهية الصلاحية ، %s => فشل الشحن
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+ExampleOfTestBankAcountForSEPA=Example of bank account BAN for direct debit test: %s
 StripeGateways=بوابات شريطية
 OAUTH_STRIPE_TEST_ID=معرف عميل Stripe Connect (ca _...)
 OAUTH_STRIPE_LIVE_ID=معرف عميل Stripe Connect (ca _...)
@@ -70,5 +71,8 @@ ToOfferALinkForLiveWebhook=رابط لإعداد Stripe WebHook لاستدعاء
 PaymentWillBeRecordedForNextPeriod=سيتم تسجيل الدفع للفترة القادمة.
 ClickHereToTryAgain= <a href="%s"> انقر هنا للمحاولة مرة أخرى ... </a>
 CreationOfPaymentModeMustBeDoneFromStripeInterface=نظرًا لقواعد مصادقة العميل القوية ، يجب أن يتم إنشاء بطاقة من Stripe backoffice. يمكنك النقر هنا للتبديل إلى سجل عميل Stripe: %s
-TERMINAL_LOCATION=موقع (العنوان) للمحطات
+STRIPE_CARD_PRESENT=Card Present for Stripe Terminals
+TERMINAL_LOCATION=Location (address) for Stripe Terminals
 RequestDirectDebitWithStripe=Request Direct Debit with Stripe
+STRIPE_SEPA_DIRECT_DEBIT=Enable the Direct Debit payments through Stripe
+
diff --git a/htdocs/langs/ar_SA/ticket.lang b/htdocs/langs/ar_SA/ticket.lang
index ba141c195ad..c9f94d6f391 100644
--- a/htdocs/langs/ar_SA/ticket.lang
+++ b/htdocs/langs/ar_SA/ticket.lang
@@ -26,6 +26,7 @@ Permission56002=تعديل التذاكر
 Permission56003=حذف التذاكر
 Permission56004=إدارة التذاكر
 Permission56005=عرض جميع تذاكر الأطراف الثالثة (غير فعالة للمستخدمين الخارجيين ، دائماً محدودين بالطرف الثالث المعتمدين عليه)
+Permission56006=Export tickets
 
 Tickets=التذاكر
 TicketDictType=انواع - التذاكر
@@ -61,6 +62,8 @@ TypeContact_ticket_external_CONTRIBUTOR=مساهم خارجي
 OriginEmail=البريد الإلكتروني للمبلغ
 Notify_TICKET_SENTBYMAIL=إرسال إشعار التذكرة بالبريد الإلكتروني
 
+ExportDataset_ticket_1=التذاكر
+
 # Status
 Read=قراءة
 Assigned=مسند
diff --git a/htdocs/langs/ar_SA/users.lang b/htdocs/langs/ar_SA/users.lang
index df3d662f0b2..742d573c6f3 100644
--- a/htdocs/langs/ar_SA/users.lang
+++ b/htdocs/langs/ar_SA/users.lang
@@ -66,7 +66,8 @@ LinkedToDolibarrUser=ارتباط بالمستخدم
 LinkedToDolibarrThirdParty=رابط لطرف ثالث
 CreateDolibarrLogin=انشاء مستخدم
 CreateDolibarrThirdParty=إيجاد طرف ثالث
-LoginAccountDisableInDolibarr=في حساب المعاقين Dolibarr.
+LoginAccountDisableInDolibarr=Account disabled in Dolibarr
+PASSWORDInDolibarr=Password modified in Dolibarr
 UsePersonalValue=استخدام الشخصي قيمة
 ExportDataset_user_1=المستخدمون وخصائصهم
 DomainUser=النطاق المستخدم ق ٪
@@ -129,3 +130,6 @@ IPLastLogin=آخر تسجيل دخول إلى IP
 IPPreviousLogin=تسجيل الدخول السابق إلى IP
 ShowAllPerms=Show all permission rows
 HideAllPerms=Hide all permission rows
+UserPublicPageDesc=You can enable a virtual card for this user. An url with the user profile and a barcode will be available to allow anybody with a smartphone to scan it and add your contact to its address book.
+EnablePublicVirtualCard=Enable the public virtual user card
+PublicVirtualCardUrl=Public virtual user card
diff --git a/htdocs/langs/bg_BG/accountancy.lang b/htdocs/langs/bg_BG/accountancy.lang
index 93acfa70491..7baa0711571 100644
--- a/htdocs/langs/bg_BG/accountancy.lang
+++ b/htdocs/langs/bg_BG/accountancy.lang
@@ -14,8 +14,8 @@ ACCOUNTING_EXPORT_ENDLINE=Изберете типа пренасяне на но
 ACCOUNTING_EXPORT_PREFIX_SPEC=Посочете префикса в името на файла
 ThisService=Тази услуга
 ThisProduct=Този продукт
-DefaultForService=По подразбиране за услуга
-DefaultForProduct=По подразбиране за продукт
+DefaultForService=Default for services
+DefaultForProduct=Default for products
 ProductForThisThirdparty=Product for this thirdparty
 ServiceForThisThirdparty=Service for this thirdparty
 CantSuggest=Не може да се предложи
@@ -101,7 +101,8 @@ ShowAccountingAccount=Показване на счетоводна сметка
 ShowAccountingJournal=Показване на счетоводен журнал
 ShowAccountingAccountInLedger=Show accounting account in ledger
 ShowAccountingAccountInJournals=Show accounting account in journals
-AccountAccountingSuggest=Предложена счетоводна сметка
+DataUsedToSuggestAccount=Data used to suggest account
+AccountAccountingSuggest=Account suggested
 MenuDefaultAccounts=Сметки по подразбиране
 MenuBankAccounts=Банкови сметки
 MenuVatAccounts=Сметки за ДДС
@@ -126,6 +127,7 @@ WriteBookKeeping=Record transactions in accounting
 Bookkeeping=Главна счетоводна книга
 BookkeepingSubAccount=Subledger
 AccountBalance=Салдо по сметка
+AccountBalanceSubAccount=Sub-accounts balance
 ObjectsRef=Обект №
 CAHTF=Обща покупка от доставчик преди ДДС
 TotalExpenseReport=Общ разходен отчет
@@ -189,6 +191,7 @@ ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Account (from the Chart Of Account) to be us
 UseAuxiliaryAccountOnCustomerDeposit=Store customer account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
 ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Account (from the Chart Of Account) to be used as the default
 UseAuxiliaryAccountOnSupplierDeposit=Store supplier account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
+ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY=Accounting account by default to register customer retained warranty
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased within same country (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased from EEC to another EEC country (used if not defined in the product sheet)
@@ -218,6 +221,7 @@ JournalLabel=Име на журнал
 NumPiece=Пореден номер
 TransactionNumShort=Транзакция №
 AccountingCategory=Custom group of accounts
+AccountingCategories=Custom groups of accounts
 GroupByAccountAccounting=Group by general ledger account
 GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=Тук може да определите някои групи счетоводни сметки. Те ще бъдат използвани за персонализирани счетоводни отчети.
@@ -265,6 +269,7 @@ ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Група от сметки
 PcgtypeDesc=Групата от сметки се използва като предварително зададен критерий за филтриране и групиране за някои счетоводни отчети. Например 'Приход' или 'Разход' се използват като групи за счетоводни сметки на продукти за съставяне на отчет за разходи / приходи.
+AccountingCategoriesDesc=Custom group of accounts can be used to group accounting accounts into one name to ease filter use or building of custom reports.
 
 Reconcilable=Съвместим
 
@@ -294,6 +299,7 @@ DescValidateMovements=Всякакви промени или изтриване
 
 ValidateHistory=Автоматично свързване
 AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
+DoManualBindingForFailedRecord=You have to do a manual link for the %s row(s) not linked automatically.
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot remove or disable this account of chart of account because it is used
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s & Credit = %s
@@ -337,11 +343,13 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on
 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_ENABLE_LETTERING=Enable the lettering function in the accounting
+ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
 
 ## Export
 NotExportLettering=Do not export the lettering when generating the file
 NotifiedExportDate=Flag exported lines as Exported <span class="warning">(to modify a line, you will need to delete the whole transaction and re-transfert it into accounting)</span>
 NotifiedValidationDate=Validate and Lock the exported entries <span class="warning">(same effect than the "%s" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+NotifiedExportFull=Export documents ?
 DateValidationAndLock=Date validation and lock
 ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Експортиране на журнал в чернова
@@ -398,7 +406,7 @@ SaleLocal=Локална продажба
 SaleExport=Експортна продажба
 SaleEEC=Вътреобщностна продажба
 SaleEECWithVAT=Продажба в ЕИО с ДДС различен от нула, за която се предполага, че НЕ е вътреобщностна продажба, поради тази причина се препоръчва стандартната сметка за продукти.
-SaleEECWithoutVATNumber=Продажба в ЕИО без ДДС, но идентификационният номер по ДДС на контрагента не е определен. Ще се използва стандартната сметка за продажба на продукти. Може да въведете идентификационен номер по ДДС на контрагента или сметка на продукта, ако е необходимо.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the thirdparty, or change the product account suggested for binding if needed.
 ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
 ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
 ## Dictionary
@@ -442,6 +450,7 @@ AccountancyErrorMismatchLetterCode=Mismatch in reconcile code
 AccountancyErrorMismatchBalanceAmount=The balance (%s) is not equal to 0
 AccountancyErrorLetteringBookkeeping=Errors have occurred concerning the transactions: %s
 ErrorAccountNumberAlreadyExists=The accounting number %s already exists
+ErrorArchiveAddFile=Can't put "%s" file in archive
 
 ## Import
 ImportAccountingEntries=Счетоводни записи
@@ -468,5 +477,7 @@ FECFormatMulticurrencyCode=Multicurrency code (Idevise)
 DateExport=Дата на експортиране
 WarningReportNotReliable=Внимание, тази справка не се основава на главната счетоводна книга, така че не съдържа транзакция, ръчно променена в книгата. Ако осчетоводяването ви е актуално, то прегледът на счетоводството е по-точен.
 ExpenseReportJournal=Журнал за разходни отчети
+DocsAlreadyExportedAreExcluded=Docs already exported are excluded
+ClickToHideAlreadyExportedLines=Click to hide already exported lines
 
 NAccounts=%s accounts
diff --git a/htdocs/langs/bg_BG/main.lang b/htdocs/langs/bg_BG/main.lang
index a9c4989034a..46f43ddf58b 100644
--- a/htdocs/langs/bg_BG/main.lang
+++ b/htdocs/langs/bg_BG/main.lang
@@ -226,6 +226,7 @@ NoUserGroupDefined=Няма дефинирана потребителска гр
 Password=Парола
 PasswordRetype=Repeat your password
 NoteSomeFeaturesAreDisabled=Имайте предвид, че много функции / модули са деактивирани в тази демонстрация.
+YourUserFile=Your user file
 Name=Име
 NameSlashCompany=Име / Фирма
 Person=Лице
@@ -897,6 +898,9 @@ MassFilesArea=Секция с файлове, създадени от масов
 ShowTempMassFilesArea=Показване на секцията с файлове, създадени от масови действия
 ConfirmMassDeletion=Потвърждение за масово изтриване
 ConfirmMassDeletionQuestion=Сигурни ли сте, че искате да изтриете избраните %s записа?
+ConfirmMassClone=Bulk clone confirmation
+ConfirmMassCloneQuestion=Select project to clone to
+ConfirmMassCloneToOneProject=Clone to project %s
 RelatedObjects=Свързани обекти
 ClassifyBilled=Класифициране като фактурирано
 ClassifyUnbilled=Класифициране като нетаксувано
@@ -912,8 +916,8 @@ ExportFilteredList=Експортиране на филтрирания спис
 ExportList=Списък за експортиране
 ExportOptions=Настройки за експортиране
 IncludeDocsAlreadyExported=Включените документи са вече експортирани
-ExportOfPiecesAlreadyExportedIsEnable=Експортът на вече експортирани части е разрешен
-ExportOfPiecesAlreadyExportedIsDisable=Експортът на вече експортирани части е забранен
+ExportOfPiecesAlreadyExportedIsEnable=Documents already exported are visible and will be exported
+ExportOfPiecesAlreadyExportedIsDisable=Documents already exported are hidden and won't be exported
 AllExportedMovementsWereRecordedAsExported=Всички експортирани движения бяха записани като експортирани
 NotAllExportedMovementsCouldBeRecordedAsExported=Не всички експортирани движения могат да бъдат записани като експортирани
 Miscellaneous=Разни
@@ -1128,6 +1132,7 @@ DeleteFileText=Сигурни ли сте, че искате да изтриет
 ShowOtherLanguages=Показване на други езици
 SwitchInEditModeToAddTranslation=Превключете в режим на редактиране, за да добавите преводи за този език.
 NotUsedForThisCustomer=Не се използва за този клиент
+NotUsedForThisVendor=Not used for this vendor
 AmountMustBePositive=Amount must be positive
 ByStatus=By status
 InformationMessage=Информация
@@ -1148,14 +1153,14 @@ EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
 OnHold=На изчакване
 Civility=Civility
-AffectTag=Assign Tag
-AffectUser=Assign User
-SetSupervisor=Set Supervisor
+AffectTag=Assign a Tag
+AffectUser=Assign a User
+SetSupervisor=Set the supervisor
 CreateExternalUser=Create external user
 ConfirmAffectTag=Bulk Tag Assignement
 ConfirmAffectUser=Bulk User Assignement
-ProjectRole=Role assigned on each project
-TasksRole=Role assigned on each task of each project
+ProjectRole=Role assigned on each project/opportunity
+TasksRole=Role assigned on each task (if used)
 ConfirmSetSupervisor=Bulk Supervisor Set
 ConfirmUpdatePrice=Choose a increase/decrease price rate
 ConfirmAffectTagQuestion=Are you sure you want to assign tags to the %s selected record(s)?
@@ -1210,3 +1215,10 @@ CreatedByPublicPortal=Created from Public portal
 UserAgent=User Agent
 InternalUser=Вътрешен потребител
 ExternalUser=Външен потребител
+NoSpecificContactAddress=No specific contact or address
+NoSpecificContactAddressBis=This tab is dedicated to force specific contacts or addresses for the current object. Use it only if you want to define one or several specific contacts or addresses for the object when the information on the thirdparty is not enough or not accurate.
+HideOnVCard=Hide %s
+AddToContacts=Add address to my contacts
+LastAccess=Last access
+UploadAnImageToSeeAPhotoHere=Upload an image from the tab %s to see a photo here
+LastPasswordChangeDate=Last password change date
diff --git a/htdocs/langs/bg_BG/stripe.lang b/htdocs/langs/bg_BG/stripe.lang
index c3902716951..00f338b7ed7 100644
--- a/htdocs/langs/bg_BG/stripe.lang
+++ b/htdocs/langs/bg_BG/stripe.lang
@@ -41,7 +41,8 @@ STRIPE_LIVE_WEBHOOK_KEY=Работен Webhook ключ
 ONLINE_PAYMENT_WAREHOUSE=Склад, който да се използва за намаляване на наличности, когато се извършва онлайн плащане<br>(Да се направи, когато възможността за намаляване на наличности се извършва при действие върху фактура и онлайн плащането генерира фактурата?)
 StripeLiveEnabled=Активиран е работен режим на Stripe (в противен случай тестов режим / пясъчник)
 StripeImportPayment=Импортиране на Stripe плащания
-ExampleOfTestCreditCard=Пример с кредитна карта за тест: %s => валидна, %s => грешка в CVC, %s => изтекла, %s => неуспешно таксуване
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+ExampleOfTestBankAcountForSEPA=Example of bank account BAN for direct debit test: %s
 StripeGateways=Stripe шлюзове
 OAUTH_STRIPE_TEST_ID=Тестов Stripe Connect Client ID (ca_...)
 OAUTH_STRIPE_LIVE_ID=Реален Stripe Connect Client ID (ca_...)
@@ -61,6 +62,7 @@ DeleteACard=Изтриване на карта
 ConfirmDeleteCard=Сигурни ли сте, че искате да изтриете тази кредитна или дебитна карта?
 CreateCustomerOnStripe=Създаване на клиент в Stripe
 CreateCardOnStripe=Създаване на карта в Stripe
+CreateBANOnStripe=Create bank on Stripe
 ShowInStripe=Показване в Stripe
 StripeUserAccountForActions=Потребителски акаунт, който да се използва за известяване по имейл при някои Stripe събития (Stripe изплащания)
 StripePayoutList=Списък със Stripe изплащания
@@ -69,3 +71,8 @@ ToOfferALinkForLiveWebhook=Връзка към настройка на Stripe We
 PaymentWillBeRecordedForNextPeriod=Плащането ще бъде регистрирано за следващия период.
 ClickHereToTryAgain=<a href="%s">Кликнете тук, за да опитате отново ...</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
+STRIPE_CARD_PRESENT=Card Present for Stripe Terminals
+TERMINAL_LOCATION=Location (address) for Stripe Terminals
+RequestDirectDebitWithStripe=Request Direct Debit with Stripe
+STRIPE_SEPA_DIRECT_DEBIT=Enable the Direct Debit payments through Stripe
+
diff --git a/htdocs/langs/bg_BG/ticket.lang b/htdocs/langs/bg_BG/ticket.lang
index 13bdf4bbdd0..be19f01c898 100644
--- a/htdocs/langs/bg_BG/ticket.lang
+++ b/htdocs/langs/bg_BG/ticket.lang
@@ -26,6 +26,7 @@ Permission56002=Промяна на тикети
 Permission56003=Изтриване на тикети
 Permission56004=Управление на тикети
 Permission56005=Преглед на тикети от всички контрагенти (не е приложимо за външни потребители, винаги ще бъдат ограничени до контрагента от който зависят)
+Permission56006=Export tickets
 
 Tickets=Тикети
 TicketDictType=Тикет - Видове
@@ -61,6 +62,8 @@ TypeContact_ticket_external_CONTRIBUTOR=Сътрудник от страна н
 OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Изпращане на тикет съобщението по имейл
 
+ExportDataset_ticket_1=Тикети
+
 # Status
 Read=Прочетен
 Assigned=Възложен
diff --git a/htdocs/langs/bg_BG/users.lang b/htdocs/langs/bg_BG/users.lang
index de922457273..df1a93675a5 100644
--- a/htdocs/langs/bg_BG/users.lang
+++ b/htdocs/langs/bg_BG/users.lang
@@ -66,7 +66,8 @@ LinkedToDolibarrUser=Link to user
 LinkedToDolibarrThirdParty=Link to third party
 CreateDolibarrLogin=Създаване на потребител
 CreateDolibarrThirdParty=Създаване на контрагент
-LoginAccountDisableInDolibarr=Профилът е деактивиран в системата.
+LoginAccountDisableInDolibarr=Account disabled in Dolibarr
+PASSWORDInDolibarr=Password modified in Dolibarr
 UsePersonalValue=Използване на лична стойност
 ExportDataset_user_1=Потребители и техните реквизити
 DomainUser=Домейн потребител %s
@@ -129,3 +130,6 @@ IPLastLogin=IP last login
 IPPreviousLogin=IP previous login
 ShowAllPerms=Show all permission rows
 HideAllPerms=Hide all permission rows
+UserPublicPageDesc=You can enable a virtual card for this user. An url with the user profile and a barcode will be available to allow anybody with a smartphone to scan it and add your contact to its address book.
+EnablePublicVirtualCard=Enable the public virtual user card
+PublicVirtualCardUrl=Public virtual user card
diff --git a/htdocs/langs/bs_BA/accountancy.lang b/htdocs/langs/bs_BA/accountancy.lang
index d1b45e43d0b..a15b6a0d8b7 100644
--- a/htdocs/langs/bs_BA/accountancy.lang
+++ b/htdocs/langs/bs_BA/accountancy.lang
@@ -14,8 +14,8 @@ ACCOUNTING_EXPORT_ENDLINE=Select the carriage return type
 ACCOUNTING_EXPORT_PREFIX_SPEC=Odredi prefiks za naziv datoteke
 ThisService=This service
 ThisProduct=Ovaj proizvod
-DefaultForService=Default for service
-DefaultForProduct=Pretpostavljeno za proizvod
+DefaultForService=Default for services
+DefaultForProduct=Default for products
 ProductForThisThirdparty=Product for this thirdparty
 ServiceForThisThirdparty=Service for this thirdparty
 CantSuggest=Can't suggest
@@ -101,7 +101,8 @@ ShowAccountingAccount=Show accounting account
 ShowAccountingJournal=Show accounting journal
 ShowAccountingAccountInLedger=Show accounting account in ledger
 ShowAccountingAccountInJournals=Show accounting account in journals
-AccountAccountingSuggest=Predloženi računovodstveni račun
+DataUsedToSuggestAccount=Data used to suggest account
+AccountAccountingSuggest=Account suggested
 MenuDefaultAccounts=Default accounts
 MenuBankAccounts=Žiro računi
 MenuVatAccounts=Vat accounts
@@ -126,6 +127,7 @@ WriteBookKeeping=Record transactions in accounting
 Bookkeeping=Ledger
 BookkeepingSubAccount=Subledger
 AccountBalance=Account balance
+AccountBalanceSubAccount=Sub-accounts balance
 ObjectsRef=Source object ref
 CAHTF=Total purchase vendor before tax
 TotalExpenseReport=Total expense report
@@ -189,6 +191,7 @@ ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Account (from the Chart Of Account) to be us
 UseAuxiliaryAccountOnCustomerDeposit=Store customer account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
 ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Account (from the Chart Of Account) to be used as the default
 UseAuxiliaryAccountOnSupplierDeposit=Store supplier account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
+ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY=Accounting account by default to register customer retained warranty
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased within same country (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased from EEC to another EEC country (used if not defined in the product sheet)
@@ -218,6 +221,7 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Custom group of accounts
+AccountingCategories=Custom groups of accounts
 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.
@@ -265,6 +269,7 @@ ShowSubtotalByGroup=Show subtotal by level
 
 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.
+AccountingCategoriesDesc=Custom group of accounts can be used to group accounting accounts into one name to ease filter use or building of custom reports.
 
 Reconcilable=Reconcilable
 
@@ -294,6 +299,7 @@ DescValidateMovements=Any modification or deletion of writing, lettering and del
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
+DoManualBindingForFailedRecord=You have to do a manual link for the %s row(s) not linked automatically.
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot remove or disable this account of chart of account because it is used
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s & Credit = %s
@@ -337,11 +343,13 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on
 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_ENABLE_LETTERING=Enable the lettering function in the accounting
+ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
 
 ## Export
 NotExportLettering=Do not export the lettering when generating the file
 NotifiedExportDate=Flag exported lines as Exported <span class="warning">(to modify a line, you will need to delete the whole transaction and re-transfert it into accounting)</span>
 NotifiedValidationDate=Validate and Lock the exported entries <span class="warning">(same effect than the "%s" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+NotifiedExportFull=Export documents ?
 DateValidationAndLock=Date validation and lock
 ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Export draft journal
@@ -398,7 +406,7 @@ 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.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the thirdparty, or change the product account suggested for binding if needed.
 ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
 ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
 ## Dictionary
@@ -442,6 +450,7 @@ AccountancyErrorMismatchLetterCode=Mismatch in reconcile code
 AccountancyErrorMismatchBalanceAmount=The balance (%s) is not equal to 0
 AccountancyErrorLetteringBookkeeping=Errors have occurred concerning the transactions: %s
 ErrorAccountNumberAlreadyExists=The accounting number %s already exists
+ErrorArchiveAddFile=Can't put "%s" file in archive
 
 ## Import
 ImportAccountingEntries=Accounting entries
@@ -468,5 +477,7 @@ 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.
 ExpenseReportJournal=Expense Report Journal
+DocsAlreadyExportedAreExcluded=Docs already exported are excluded
+ClickToHideAlreadyExportedLines=Click to hide already exported lines
 
 NAccounts=%s accounts
diff --git a/htdocs/langs/bs_BA/users.lang b/htdocs/langs/bs_BA/users.lang
index c0d6210a338..5266d7c1bd3 100644
--- a/htdocs/langs/bs_BA/users.lang
+++ b/htdocs/langs/bs_BA/users.lang
@@ -66,7 +66,8 @@ LinkedToDolibarrUser=Link to user
 LinkedToDolibarrThirdParty=Link to third party
 CreateDolibarrLogin=Kreiraj korisnika
 CreateDolibarrThirdParty=Napravi subjekat
-LoginAccountDisableInDolibarr=Račun isključen u Dolibarru.
+LoginAccountDisableInDolibarr=Account disabled in Dolibarr
+PASSWORDInDolibarr=Password modified in Dolibarr
 UsePersonalValue=Koristite lične vrijednosti
 ExportDataset_user_1=Users and their properties
 DomainUser=Korisnik domene %s
@@ -129,3 +130,6 @@ IPLastLogin=IP last login
 IPPreviousLogin=IP previous login
 ShowAllPerms=Show all permission rows
 HideAllPerms=Hide all permission rows
+UserPublicPageDesc=You can enable a virtual card for this user. An url with the user profile and a barcode will be available to allow anybody with a smartphone to scan it and add your contact to its address book.
+EnablePublicVirtualCard=Enable the public virtual user card
+PublicVirtualCardUrl=Public virtual user card
diff --git a/htdocs/langs/ca_ES/accountancy.lang b/htdocs/langs/ca_ES/accountancy.lang
index 35a6fd4b114..4a42cad58e8 100644
--- a/htdocs/langs/ca_ES/accountancy.lang
+++ b/htdocs/langs/ca_ES/accountancy.lang
@@ -14,8 +14,8 @@ ACCOUNTING_EXPORT_ENDLINE=Seleccioneu el tipus de retorn
 ACCOUNTING_EXPORT_PREFIX_SPEC=Especifica el prefix del nom del fitxer
 ThisService=Aquest servei
 ThisProduct=Aquest producte
-DefaultForService=Defecte per al servei
-DefaultForProduct=Defecte per al producte
+DefaultForService=Default for services
+DefaultForProduct=Default for products
 ProductForThisThirdparty=Producte per a aquest tercer
 ServiceForThisThirdparty=Servei per a aquest tercer
 CantSuggest=No es pot suggerir
@@ -101,7 +101,8 @@ ShowAccountingAccount=Mostrar diari de comptes
 ShowAccountingJournal=Mostrar diari comptable
 ShowAccountingAccountInLedger=Mostra el compte comptable al Llibre major
 ShowAccountingAccountInJournals=Mostra el compte comptable als diaris
-AccountAccountingSuggest=Compte comptable suggerit
+DataUsedToSuggestAccount=Data used to suggest account
+AccountAccountingSuggest=Account suggested
 MenuDefaultAccounts=Comptes per defecte
 MenuBankAccounts=Comptes bancaris
 MenuVatAccounts=Comptes d'IVA
@@ -126,6 +127,7 @@ WriteBookKeeping=Registrar transaccions en comptabilitat
 Bookkeeping=Llibre major
 BookkeepingSubAccount=Subcompte
 AccountBalance=Compte saldo
+AccountBalanceSubAccount=Sub-accounts balance
 ObjectsRef=Referència de l'objecte origen
 CAHTF=Total de compra a Proveïdor abans d'impostos
 TotalExpenseReport=Informe de despeses totals
@@ -165,8 +167,8 @@ ACCOUNTANCY_COMBO_FOR_AUX=Activa la llista combinada per a un compte subsidiari
 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 la transferència comptable, quin és el període seleccionat per defecte
 
-ACCOUNTING_SELL_JOURNAL=Sales journal (sales and returns)
-ACCOUNTING_PURCHASE_JOURNAL=Purchase journal (purchase and returns)
+ACCOUNTING_SELL_JOURNAL=Diari de vendes (vendes i devolucions)
+ACCOUNTING_PURCHASE_JOURNAL=Diari de compres (compres i devolucions)
 ACCOUNTING_BANK_JOURNAL=Cash journal (receipts and disbursements)
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Diari de l'informe de despeses
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Diari general
@@ -189,6 +191,7 @@ ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Account (from the Chart Of Account) to be us
 UseAuxiliaryAccountOnCustomerDeposit=Emmagatzema el compte del client com a compte individual al llibre major subsidiari per a les línies de pagament inicial (si està desactivat, el compte individual per a les línies de pagament inicial romandrà buit)
 ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Account (from the Chart Of Account) to be used as the default
 UseAuxiliaryAccountOnSupplierDeposit=Emmagatzema el compte del proveïdor com a compte individual al llibre major subsidiari per a les línies de pagament inicial (si està desactivat, el compte individual de les línies de pagament inicial romandrà buit)
+ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY=Accounting account by default to register customer retained warranty
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased within same country (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased from EEC to another EEC country (used if not defined in the product sheet)
@@ -217,7 +220,8 @@ Codejournal=Diari
 JournalLabel=Nom del diari
 NumPiece=Número de peça
 TransactionNumShort=Número de transacció
-AccountingCategory=Custom group of accounts
+AccountingCategory=Grup de comptes personalitzat
+AccountingCategories=Custom groups of accounts
 GroupByAccountAccounting=Agrupa per compte major
 GroupBySubAccountAccounting=Agrupa per subcompte comptable
 AccountingAccountGroupsDesc=Podeu definir aquí alguns grups de comptes comptables. S'utilitzaran per a informes comptables personalitzats.
@@ -265,6 +269,7 @@ ShowSubtotalByGroup=Mostra el subtotal per nivell
 
 Pcgtype=Grup de comptes
 PcgtypeDesc=S'utilitzen grups de comptes com a criteris predefinits de «filtre» i «agrupació» per a alguns informes de comptabilitat. Per exemple, «INGRESSOS» o «DESPESES» s'utilitzen com a grups per a comptes comptables de productes per a crear l'informe de despeses/ingressos.
+AccountingCategoriesDesc=Custom group of accounts can be used to group accounting accounts into one name to ease filter use or building of custom reports.
 
 Reconcilable=Reconciliable
 
@@ -294,6 +299,7 @@ DescValidateMovements=Queda prohibida qualsevol modificació o supressió de reg
 
 ValidateHistory=Comptabilitza automàticament
 AutomaticBindingDone=Enllaços automàtics fets (%s): l'enllaç automàtic no és possible per a alguns registres (%s)
+DoManualBindingForFailedRecord=You have to do a manual link for the %s row(s) not linked automatically.
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot remove or disable this account of chart of account because it is used
 MvtNotCorrectlyBalanced=Moviment no equilibrat correctament. Dèbit = %s i crèdit = %s
@@ -337,11 +343,13 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=Desactiva la vinculació i transferència de
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Desactiva la vinculació i transferència a la comptabilitat de les compres (les factures de proveïdors no es tindran en compte a la comptabilitat)
 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)
 ACCOUNTING_ENABLE_LETTERING=Enable the lettering function in the accounting
+ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
 
 ## Export
 NotExportLettering=Do not export the lettering when generating the file
 NotifiedExportDate=Marca les línies exportades com a Exportades <span class="warning"> (per a modificar una línia, hauràs de suprimir tota la transacció i tornar-la a transferir a la comptabilitat) </span>
-NotifiedValidationDate=Validar i bloquejar les entrades exportades <span class="warning"> (mateix efecte que la característica "%s", la modificació i la supressió de les línies DEFINITIVAMENT no seran possibles) </span>
+NotifiedValidationDate=Validar i bloquejar les entrades exportades <span class="warning">(mateix efecte que la característica "%s", la modificació i la supressió de les línies DEFINITIVAMENT no seran possibles)</span>
+NotifiedExportFull=Export documents ?
 DateValidationAndLock=Validació de data i bloqueig
 ConfirmExportFile=Confirmació de la generació del fitxer d'exportació comptable?
 ExportDraftJournal=Exporta els esborranys del llibre
@@ -398,7 +406,7 @@ SaleLocal=Venda local
 SaleExport=Venda d’exportació
 SaleEEC=Venda en CEE
 SaleEECWithVAT=Venda a la CEE amb un IVA que no és nul, per la qual cosa suposem que NO es tracta d’una venda intracomunitària i el compte suggerit és el compte estàndard del producte.
-SaleEECWithoutVATNumber=Venda a la CEE sense IVA, però l’identificador d’IVA del tercer no està definit. S'ha emprat el compte del producte per a vendes estàndard. Podeu corregir l’identificador d’IVA del tercer o el compte del producte si cal.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the thirdparty, or change the product account suggested for binding if needed.
 ForbiddenTransactionAlreadyExported=Prohibit: la transacció ha estat validada i/o exportada.
 ForbiddenTransactionAlreadyValidated=Prohibit: la transacció s'ha validat.
 ## Dictionary
@@ -429,19 +437,20 @@ ConfirmMassDeleteBookkeepingWritingQuestion=Això suprimirà la transacció de l
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=No s'han fet alguns passos obligatoris de configuració, si us plau, completeu-los
 ErrorNoAccountingCategoryForThisCountry=No hi ha cap grup de comptes comptables disponible per al país %s (Vegeu Inici - Configuració - Diccionaris)
-ErrorInvoiceContainsLinesNotYetBounded=Intenta actualitzar algunes línies de la factura <strong> %s </strong>, però algunes altres encara no estan vinculades al compte de comptabilitat. Es rebutja el registre comptable de totes les línies d'aquesta factura.
+ErrorInvoiceContainsLinesNotYetBounded=Intenteu registrar algunes línies de la factura <strong>%s</strong>, però algunes altres línies encara no estan vinculades al compte comptable. Es denega el registre al diari de totes les línies d'aquesta factura.
 ErrorInvoiceContainsLinesNotYetBoundedShort=Algunes línies a la factura no estan vinculades al compte de comptabilitat.
 ExportNotSupported=El format d'exportació configurat no està suportat en aquesta pàgina
 BookeppingLineAlreayExists=Les línies ja existeixen en la comptabilitat
 NoJournalDefined=Cap diari definit
 Binded=Línies comptabilitzades
 ToBind=Línies a comptabilitzar
-UseMenuToSetBindindManualy=Línies encara no enllaçades, utilitzeu el menú <a href="%s"> %s </a> per a fer l'enllaç manualment
+UseMenuToSetBindindManualy=Línies encara no enllaçades, utilitzeu el menú <a href="%s">%s</a> per a fer l'enllaç manualment
 SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Ho sentim, aquest mòdul no és compatible amb la funció experimental de les factures de situació
 AccountancyErrorMismatchLetterCode=No coincideix en el codi de conciliació
 AccountancyErrorMismatchBalanceAmount=El saldo (%s) no és igual a 0
 AccountancyErrorLetteringBookkeeping=S'han produït errors relacionats amb les transaccions: %s
 ErrorAccountNumberAlreadyExists=El número de comptabilitat %s ja existeix
+ErrorArchiveAddFile=Can't put "%s" file in archive
 
 ## Import
 ImportAccountingEntries=Entrades de comptabilitat
@@ -468,5 +477,7 @@ 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
+DocsAlreadyExportedAreExcluded=Docs already exported are excluded
+ClickToHideAlreadyExportedLines=Click to hide already exported lines
 
 NAccounts=comptes %s
diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang
index 48dc1627b3a..78fd6572a90 100644
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -645,6 +645,8 @@ Module2300Name=Tasques programades
 Module2300Desc=Gestió de tasques programades (àlies cron o taula de crons)
 Module2400Name=Esdeveniments/Agenda
 Module2400Desc=Seguiment d'esdeveniments. Registre d'esdeveniments automàtics per a fer el seguiment o registrar esdeveniments manuals o reunions. Aquest és el mòdul principal per a una bona gestió de la relació amb clients o proveïdors.
+Module2430Name=Booking Calendar System
+Module2430Desc=Provide an online calendar to allow anyone to book rendez-vous, according to predefined ranges or availabilities.
 Module2500Name=SGD / GCE
 Module2500Desc=Sistema de gestió de documents / Gestió de continguts electrònics. Organització automàtica dels vostres documents generats o emmagatzemats. Compartiu-los quan ho necessiteu.
 Module2600Name=Serveis API / Web (servidor SOAP)
@@ -660,6 +662,8 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=Capacitats de conversió GeoIP Maxmind
 Module3200Name=Arxius inalterables
 Module3200Desc=Activa el registre d'alguns esdeveniments de negoci en un registre inalterable. Els esdeveniments s'arxiven en temps real. El registre és una taula d'esdeveniments encadenats que només es poden llegir i exportar. Aquest mòdul pot ser obligatori per a alguns països.
+Module3300Name=Module Builder
+Module3200Desc=Activa el registre d'alguns esdeveniments de negoci en un registre inalterable. Els esdeveniments s'arxiven en temps real. El registre és una taula d'esdeveniments encadenats que només es poden llegir i exportar. Aquest mòdul pot ser obligatori per a alguns països.
 Module3400Name=Xarxes socials
 Module3400Desc=Activa els camps de les xarxes socials a tercers i adreces (skype, twitter, facebook...).
 Module4000Name=RH
@@ -1270,6 +1274,7 @@ TriggerActiveAsModuleActive=Els activadors d'aquest fitxer estan actius, ja que
 GeneratedPasswordDesc=Trieu el mètode que s'utilitzarà per a les contrasenyes generades automàticament.
 DictionaryDesc=Afegeix totes les dades de referència. Pots afegir els teus valors per defecte.
 ConstDesc=Aquesta pàgina permet editar (anul·lar) paràmetres no disponibles en altres pàgines. Aquests són paràmetres reservats només per a desenvolupadors o solucions avançades de problemes.
+MiscellaneousOptions=Miscellaneous options
 MiscellaneousDesc=Aquí es defineixen la resta de paràmetres relacionats amb la seguretat.
 LimitsSetup=Configuració de límits i precisions
 LimitsDesc=Podeu definir aquí els límits i precisions utilitzats per Dolibarr
@@ -1496,7 +1501,7 @@ 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=Visitor can choose from any available payment modes
+VisitorCanChooseItsPaymentMode=El visitant pot triar entre qualsevol forma de pagament disponible
 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
 ##### LDAP setup #####
@@ -1826,6 +1831,9 @@ AGENDA_USE_EVENT_TYPE=Utilitzeu tipus d'esdeveniments (gestionats en el menú Co
 AGENDA_USE_EVENT_TYPE_DEFAULT=Estableix automàticament aquest valor predeterminat per al tipus d'esdeveniment en el formulari de creació de l'esdeveniment
 AGENDA_DEFAULT_FILTER_TYPE=Estableix automàticament aquest tipus d'esdeveniment al filtre de cerca de la vista d'agenda
 AGENDA_DEFAULT_FILTER_STATUS=Estableix automàticament aquest estat per a esdeveniments al filtre de cerca de la visualització d'agenda
+AGENDA_EVENT_PAST_COLOR=Past event color
+AGENDA_EVENT_CURRENT_COLOR=Current event color
+AGENDA_EVENT_FUTURE_COLOR=Future event color
 AGENDA_DEFAULT_VIEW=Quina vista voleu obrir de manera predeterminada en seleccionar el menú Agenda
 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
@@ -2129,6 +2137,7 @@ CodeLastResult=Últim codi retornat
 NbOfEmailsInInbox=Nombre de correus electrònics en el directori font
 LoadThirdPartyFromName=Carregueu la cerca de tercers al %s (només carrega)
 LoadThirdPartyFromNameOrCreate=Carregueu la cerca de tercers a %s (crear si no es troba)
+LoadContactFromEmailOrCreate=Load contact searching on %s (create if not found)
 AttachJoinedDocumentsToObject=Deseu els fitxers adjunts als documents d'objectes si es troba una referència d'un objecte al tema del correu electrònic.
 WithDolTrackingID=Missatge d'una conversa iniciada per un primer correu electrònic enviat des de Dolibarr
 WithoutDolTrackingID=Missatge d'una conversa iniciada per un primer correu electrònic NO enviat des de Dolibarr
@@ -2355,3 +2364,5 @@ AllowExternalDownload=Allow external download (without login, using a shared lin
 DeadlineDayVATSubmission=Deadline day for vat submission on the next month
 MaxNumberOfAttachementOnForms=Max number of joinded files in a form
 IfDefinedUseAValueBeetween=If defined, use a value between %s and %s
+Reload=Reload
+ConfirmReload=Confirm module reload
diff --git a/htdocs/langs/ca_ES/bills.lang b/htdocs/langs/ca_ES/bills.lang
index 04cfb614f83..44769c6d765 100644
--- a/htdocs/langs/ca_ES/bills.lang
+++ b/htdocs/langs/ca_ES/bills.lang
@@ -17,7 +17,7 @@ DisabledBecauseNotLastSituationInvoice=Disabled because invoice is not erasable.
 DisabledBecauseNotErasable=S'ha desactivat perquè no es pot esborrar
 InvoiceStandard=Factura estàndard
 InvoiceStandardAsk=Factura estàndard
-InvoiceStandardDesc=Aquest tipus de factura és la factura tradicional. També es coneix com <b>factura de dèbit</ b> (del verb deure).
+InvoiceStandardDesc=Aquest tipus de factura és la factura comuna.
 InvoiceStandardShort=Estàndard
 InvoiceDeposit=Factura de bestreta
 InvoiceDepositAsk=Factura de bestreta
@@ -31,7 +31,7 @@ InvoiceReplacementAsk=Factura rectificativa de la factura
 InvoiceReplacementDesc=<b>La factura de substitució</b> s’utilitza per a substituir completament una factura sense que s’hagi rebut cap pagament. <br><br> Nota: Només es poden substituir les factures sense pagament. Si la factura que reemplaça encara no està tancada, es tancarà automàticament a 'abandonada'
 InvoiceAvoir=Abonament
 InvoiceAvoirAsk=Abonament per factura rectificativa
-InvoiceAvoirDesc=L'<b>abonament</b> és una factura negativa destinada a compensar un import de factura que difereix de l'import realment pagat (per haver pagat de més o per devolució de productes, per exemple).
+InvoiceAvoirDesc=La <b>nota de crèdit</b> és una factura negativa que s'utilitza per a corregir el fet que una factura mostra un import diferent de l'import realment pagat (p. ex., el client va pagar massa per error o no pagarà l'import complet perquè alguns productes van ser retornats) .
 invoiceAvoirWithLines=Crear abonament amb les línies de la factura d'origen
 invoiceAvoirWithPaymentRestAmount=Crear abonament de la factura pendent de pagament
 invoiceAvoirLineWithPaymentRestAmount=Abonament per a la quantitat restant no pagada
@@ -244,7 +244,7 @@ RemainderToPayMulticurrency=La moneda original pendent de pagament
 RemainderToTake=Import restant per a cobrar
 RemainderToTakeMulticurrency=Import restant, moneda original
 RemainderToPayBack=Import restant a reemborsar
-RemainderToPayBackMulticurrency=Import restant per reembossar, moneda original
+RemainderToPayBackMulticurrency=Import restant a reemborsar, moneda original
 NegativeIfExcessRefunded=negatiu si es reemborsa l'excés
 Rest=Pendent
 AmountExpected=Import reclamat
@@ -263,7 +263,7 @@ NoOtherDraftBills=Cap altra factura esborrany
 NoDraftInvoices=Sense factures esborrany
 RefBill=Ref. factura
 ToBill=A facturar
-RemainderToBill=Queda per facturar
+RemainderToBill=Queda per a facturar
 SendBillByMail=Envia factura per e-mail
 SendReminderBillByMail=Envia recordatori per e-mail
 RelatedCommercialProposals=Pressupostos relacionats
diff --git a/htdocs/langs/ca_ES/blockedlog.lang b/htdocs/langs/ca_ES/blockedlog.lang
index f878fc12d5a..2c1a310ef20 100644
--- a/htdocs/langs/ca_ES/blockedlog.lang
+++ b/htdocs/langs/ca_ES/blockedlog.lang
@@ -8,34 +8,12 @@ BrowseBlockedLog=Registres inalterables
 ShowAllFingerPrintsMightBeTooLong=Mostra tots els registres arxivats (pot ser llarg)
 ShowAllFingerPrintsErrorsMightBeTooLong=Mostra tots els registres d'arxiu no vàlids (pot ser llarg)
 DownloadBlockChain=Baixa les empremtes dactilars
-KoCheckFingerprintValidity=L’entrada de registre arxivada no és vàlida. Significa que algú (un pirata informàtic?) ha modificat algunes dades d’aquest registre després que es va gravar, o que ha estat esborrat el registre arxivat anterior (comproveu que la línia amb numeració anterior existeix) o ha sigut modificat el el checksum del registre anterior.
+KoCheckFingerprintValidity=L'entrada de registre arxivada no és vàlida. Significa que algú (un pirata informàtic?) ha modificat algunes dades d'aquest registre després d'haver-lo enregistrat, o ha esborrat el registre arxivat anterior (comproveu que existeixi la línia amb la numeració anterior) o ha modificat la suma de verificació del registre anterior.
 OkCheckFingerprintValidity=El registre del registre arxivat és vàlid. Les dades d'aquesta línia no s'han modificat i l'entrada segueix l'anterior.
 OkCheckFingerprintValidityButChainIsKo=El registre arxivat sembla ser vàlid en comparació amb l'anterior, però la cadena s'ha corromput prèviament.
 AddedByAuthority=Emmagatzemat a l'autoritat remota
 NotAddedByAuthorityYet=Encara no emmagatzemat a l'autoritat remota
 ShowDetails=Mostra els detalls emmagatzemats
-logPAYMENT_VARIOUS_CREATE=S'ha creat el pagament (no assignat a una factura)
-logPAYMENT_VARIOUS_MODIFY=S'ha modificat el pagament (no assignat a una factura)
-logPAYMENT_VARIOUS_DELETE=Supressió lògica de pagament (no assignada a una factura)
-logPAYMENT_ADD_TO_BANK=Pagament afegit al banc
-logPAYMENT_CUSTOMER_CREATE=S'ha creat el pagament del client
-logPAYMENT_CUSTOMER_DELETE=Lògica de liquidació del pagament del client
-logDONATION_PAYMENT_CREATE=Pagament de donació creat
-logDONATION_PAYMENT_DELETE=Llicència de pagament de la donació
-logBILL_PAYED=S'ha pagat la factura del client
-logBILL_UNPAYED=Establiment de la factura del client no remunerat
-logBILL_VALIDATE=Validació factura
-logBILL_SENTBYMAIL=La factura del client s'envia per correu
-logBILL_DELETE=S'ha suprimit la factura del client lògicament
-logMODULE_RESET=S'ha desactivat el mòdul bloquejat
-logMODULE_SET=S'ha habilitat el mòdul bloquejat
-logDON_VALIDATE=Donació validada
-logDON_MODIFY=Donació modificada
-logDON_DELETE=Donació de l'eliminació lògica
-logMEMBER_SUBSCRIPTION_CREATE=S'ha creat una subscripció de membre
-logMEMBER_SUBSCRIPTION_MODIFY=S'ha modificat la subscripció de membre
-logMEMBER_SUBSCRIPTION_DELETE=Supressió lògica de subscripció de membre
-logCASHCONTROL_VALIDATE=Registre de tancament de caixa
 BlockedLogBillDownload=Descarrega la factura del client
 BlockedLogBillPreview=Previsualització de la factura del client
 BlockedlogInfoDialog=Detalls del registre
@@ -48,10 +26,36 @@ DataOfArchivedEvent=Dades completes d'esdeveniments arxivats
 ImpossibleToReloadObject=Objecte original (tipus %s, identificador %s) no enllaçat (vegeu la columna "Dades completes" per a obtenir dades desades inalterables)
 BlockedLogAreRequiredByYourCountryLegislation=El mòdul de registres inalterables pot ser requerit per la legislació del vostre país. La desactivació d'aquest mòdul pot fer que qualsevol transacció futura sigui invàlida pel que fa a la llei i l'ús del programari legal, ja que no es pot validar mitjançant una auditoria fiscal.
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=El mòdul de registres inalterables s'ha activat a causa de la legislació del vostre país. La desactivació d'aquest mòdul pot fer que qualsevol transacció futura sigui invàlida pel que fa a la llei i l'ús del programari legal, ja que no es pot validar mitjançant una auditoria fiscal.
-BlockedLogDisableNotAllowedForCountry=Llista de països on l'ús d'aquest mòdul és obligatori (només per impedir que es desactivi el mòdul per error, si el vostre país està en aquesta llista, la desactivació del mòdul no és possible sense editar aquesta llista. Noteu també que habilitar / desactivar aquest mòdul seguiu una pista en el registre inalterable).
+BlockedLogDisableNotAllowedForCountry=Llista de països on l'ús d'aquest mòdul és obligatori (només per a evitar que es desactivi el mòdul per error, si el vostre país és en aquesta llista, no és possible desactivar el mòdul sense editar aquesta llista primer. Tingueu en compte també que activar/desactivar aquest mòdul mantindrà un registre al registre inalterable).
 OnlyNonValid=No vàlid
 TooManyRecordToScanRestrictFilters=Hi ha massa registres per a escanejar/analitzar. Limita la llista amb filtres més restrictius.
 RestrictYearToExport=Restringeix el mes / any per a exportar
 BlockedLogEnabled=S'ha habilitat el sistema per a fer el seguiment d'esdeveniments en registres inalterables
 BlockedLogDisabled=El sistema per a fer el seguiment d'esdeveniments en registres inalterables s'ha desactivat després de fer algunes gravacions. Hem desat una empremta digital especial per a fer un seguiment de la cadena com a trencada
 BlockedLogDisabledBis=S'ha desactivat el sistema per a fer el seguiment d'esdeveniments en registres inalterables. Això és possible perquè encara no s'ha fet cap registre.
+
+## logTypes
+logBILL_DELETE=S'ha suprimit la factura del client lògicament
+logBILL_PAYED=S'ha pagat la factura del client
+logBILL_SENTBYMAIL=La factura del client s'envia per correu
+logBILL_UNPAYED=Establiment de la factura del client no remunerat
+logBILL_VALIDATE=Validació factura
+logCASHCONTROL_VALIDATE=Registre de tancament de caixa
+logDOC_DOWNLOAD=Descàrrega d'un document validat per a imprimir o enviar
+logDOC_PREVIEW=Vista prèvia d'un document validat per a imprimir o descarregar
+logDONATION_PAYMENT_CREATE=Pagament de donació creat
+logDONATION_PAYMENT_DELETE=Llicència de pagament de la donació
+logDON_DELETE=Donació de l'eliminació lògica
+logDON_MODIFY=Donació modificada
+logDON_VALIDATE=Donació validada
+logMEMBER_SUBSCRIPTION_CREATE=S'ha creat una subscripció de membre
+logMEMBER_SUBSCRIPTION_DELETE=Supressió lògica de subscripció de membre
+logMEMBER_SUBSCRIPTION_MODIFY=S'ha modificat la subscripció de membre
+logMODULE_RESET=S'ha desactivat el mòdul bloquejat
+logMODULE_SET=S'ha habilitat el mòdul bloquejat
+logPAYMENT_ADD_TO_BANK=Pagament afegit al banc
+logPAYMENT_CUSTOMER_CREATE=S'ha creat el pagament del client
+logPAYMENT_CUSTOMER_DELETE=Lògica de liquidació del pagament del client
+logPAYMENT_VARIOUS_CREATE=S'ha creat el pagament (no assignat a una factura)
+logPAYMENT_VARIOUS_DELETE=Supressió lògica de pagament (no assignada a una factura)
+logPAYMENT_VARIOUS_MODIFY=S'ha modificat el pagament (no assignat a una factura)
diff --git a/htdocs/langs/ca_ES/companies.lang b/htdocs/langs/ca_ES/companies.lang
index 44780aca714..ba49594bb39 100644
--- a/htdocs/langs/ca_ES/companies.lang
+++ b/htdocs/langs/ca_ES/companies.lang
@@ -312,8 +312,8 @@ CustomerRelativeDiscountShort=Descompte relatiu
 CustomerAbsoluteDiscountShort=Descompte fixe
 CompanyHasRelativeDiscount=Aquest client té un descompte per defecte de <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Aquest client no té descomptes relatius per defecte
-HasRelativeDiscountFromSupplier=Teniu un descompte predeterminat de <b> %s%% </b> d'aquest proveïdor
-HasNoRelativeDiscountFromSupplier=No default relative discount from this vendor
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> with this vendor
+HasNoRelativeDiscountFromSupplier=No default relative discount with this vendor
 CompanyHasAbsoluteDiscount=Aquest client té descomptes disponibles (notes de crèdit o bestretes) per <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=Aquest client té un descompte disponible (comercial, de pagament) per a <b>%s</b>%s
 CompanyHasCreditNote=Aquest client encara té abonaments per <b>%s</b> %s
@@ -499,4 +499,7 @@ OutOfEurope=Fora d’Europa (CEE)
 CurrentOutstandingBillLate=Factura pendent actual en retard
 BecarefullChangeThirdpartyBeforeAddProductToInvoice=Ves amb compte, en funció de la configuració del preu del producte, has de canviar de tercer abans d’afegir el producte al TPV.
 EmailAlreadyExistsPleaseRewriteYourCompanyName=El correu electrònic ja existeix, si us plau, reescriu el nom de la teva empresa
-TwoRecordsOfCompanyName=Hi ha més d'un registre per a aquesta empresa, poseu-vos en contacte amb nosaltres per a completar la vostra sol·licitud d'associació"
+TwoRecordsOfCompanyName=more than one record exists for this company, please contact us to complete your partnership request
+CompanySection=Secció d'empresa
+ShowSocialNetworks=Mostra les xarxes socials
+HideSocialNetworks=Amaga les xarxes socials
diff --git a/htdocs/langs/ca_ES/cron.lang b/htdocs/langs/ca_ES/cron.lang
index a8b7e209e63..b2c8d96b8fc 100644
--- a/htdocs/langs/ca_ES/cron.lang
+++ b/htdocs/langs/ca_ES/cron.lang
@@ -84,14 +84,14 @@ 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
 MakeSendLocalDatabaseDumpShort=Envia una còpia de seguretat de la base de dades local
 MakeSendLocalDatabaseDump=Envieu una còpia de seguretat de la base de dades local per correu electrònic. Els paràmetres són: to, from, subject, message, filename (nom del fitxer enviat), filtre ('sql' només per a la còpia de seguretat de la base de dades)
-BackupIsTooLargeSend=Sorry, last backup file is too large to be send by email
+BackupIsTooLargeSend=Ho sentim, l'últim fitxer de còpia de seguretat és massa gran per a enviar-lo per correu electrònic
 CleanUnfinishedCronjobShort=Neteja les tasques programades inacabades
 CleanUnfinishedCronjob=Neteja les tasques programades bloquejades en el processament quan el procés ja no s'executa
 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
-EmailIfError=Email for warning on error
-ErrorInBatch=Error when running the job %s
+EmailIfError=Correu electrònic per a advertir d'error
+ErrorInBatch=Error en executar la tasca %s
 
 # Cron Boxes
 LastExecutedScheduledJob=Darrera tasca programada executada
diff --git a/htdocs/langs/ca_ES/errors.lang b/htdocs/langs/ca_ES/errors.lang
index 92d701f368e..0818df26ea1 100644
--- a/htdocs/langs/ca_ES/errors.lang
+++ b/htdocs/langs/ca_ES/errors.lang
@@ -303,6 +303,7 @@ ErrorValueForTooLow=Value for <b>%s</b> is too low
 ErrorValueCantBeNull=Value for <b>%s</b> can't be null
 ErrorDateOfMovementLowerThanDateOfFileTransmission=The date of the bank transaction can't be lower than the date of the file transmission
 ErrorTooMuchFileInForm=Too much files in form, the maximum number is %s file(s)
+ErrorSessionInvalidatedAfterPasswordChange=The session was been invalidated following a change of password, status or dates of validity. Please relogin.
 
 # 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.
@@ -325,6 +326,7 @@ WarningPaymentDateLowerThanInvoiceDate=La data de pagament (%s) és anterior a l
 WarningTooManyDataPleaseUseMoreFilters=Massa dades (més de %s línies). Utilitza més filtres o indica la constant %s amb un límit superior.
 WarningSomeLinesWithNullHourlyRate=Algunes vegades es van registrar per alguns usuaris quan no s'havia definit el seu preu per hora. Es va utilitzar un valor de 0 %s per hora, però això pot resultar una valoració incorrecta del temps dedicat.
 WarningYourLoginWasModifiedPleaseLogin=El vostre nom d'usuari s'ha modificat. Per motius de seguretat, haureu d'iniciar sessió amb el vostre nou nom d'usuari abans de la propera acció.
+WarningYourPasswordWasModifiedPleaseLogin=S'ha modificat la teva contrasenya. Per motius de seguretat, haureu d'iniciar sessió ara amb la vostra nova contrasenya.
 WarningAnEntryAlreadyExistForTransKey=Ja existeix una entrada per la clau de traducció d'aquest idioma
 WarningNumberOfRecipientIsRestrictedInMassAction=Advertència: el nombre de destinataris diferents està limitat a <b> %s </b> quan s'utilitzen les accions massives a les llistes.
 WarningDateOfLineMustBeInExpenseReportRange=Advertència, la data de la línia no està dins del rang de l'informe de despeses
diff --git a/htdocs/langs/ca_ES/eventorganization.lang b/htdocs/langs/ca_ES/eventorganization.lang
index e17596d878c..f2acfbb129e 100644
--- a/htdocs/langs/ca_ES/eventorganization.lang
+++ b/htdocs/langs/ca_ES/eventorganization.lang
@@ -172,3 +172,5 @@ ErrorSeveralCompaniesWithEmailContactUs=S'han trobat diverses empreses amb aques
 ErrorSeveralCompaniesWithNameContactUs=S'han trobat diverses empreses amb aquest nom, de manera que no podem validar automàticament el vostre registre. Si us plau, poseu-vos en contacte amb nosaltres a %s per a obtenir una validació manual
 NoPublicActionsAllowedForThisEvent=No hi ha cap acció pública oberta al públic per a aquest esdeveniment
 MaxNbOfAttendees=Nombre màxim d'assistents
+DateStartEvent=Data d'inici de l'esdeveniment
+DateEndEvent=Data de finalització de l'esdeveniment
diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang
index ef9b8f4c8d5..77b9b4cd021 100644
--- a/htdocs/langs/ca_ES/main.lang
+++ b/htdocs/langs/ca_ES/main.lang
@@ -226,6 +226,7 @@ NoUserGroupDefined=Grup d'usuari no definit
 Password=Contrasenya
 PasswordRetype=Repetiu la vostra contrasenya
 NoteSomeFeaturesAreDisabled=Tingues en compte que molts mòduls i funcionalitats estan deshabilitats en aquesta demostració.
+YourUserFile=Your user file
 Name=Nom
 NameSlashCompany=Nom / Empresa
 Person=Persona
@@ -897,6 +898,9 @@ MassFilesArea=Àrea de fitxers generats per accions massives
 ShowTempMassFilesArea=Mostra l'àrea de fitxers generats per accions massives
 ConfirmMassDeletion=Confirmació d'esborrament massiu
 ConfirmMassDeletionQuestion=Esteu segur que voleu suprimir els (s) registre (s) %s?
+ConfirmMassClone=Bulk clone confirmation
+ConfirmMassCloneQuestion=Select project to clone to
+ConfirmMassCloneToOneProject=Clone to project %s
 RelatedObjects=Objectes relacionats
 ClassifyBilled=Classifica facturat
 ClassifyUnbilled=Classifica no facturat
@@ -912,8 +916,8 @@ ExportFilteredList=Llistat filtrat d'exportació
 ExportList=Llistat d'exportació
 ExportOptions=Opcions d'exportació
 IncludeDocsAlreadyExported=Inclou documents ja exportats
-ExportOfPiecesAlreadyExportedIsEnable=L’exportació de peces ja exportades està habilitada
-ExportOfPiecesAlreadyExportedIsDisable=L’exportació de peces ja exportades està inhabilitada
+ExportOfPiecesAlreadyExportedIsEnable=Documents already exported are visible and will be exported
+ExportOfPiecesAlreadyExportedIsDisable=Documents already exported are hidden and won't be exported
 AllExportedMovementsWereRecordedAsExported=Tots els moviments exportats s'han registrat com a exportats
 NotAllExportedMovementsCouldBeRecordedAsExported=No s'ha pogut registrar tots els moviments exportats com a exportats
 Miscellaneous=Diversos
@@ -1128,6 +1132,7 @@ DeleteFileText=Realment vols suprimir aquest fitxer?
 ShowOtherLanguages=Mostrar altres idiomes
 SwitchInEditModeToAddTranslation=Canviar a mode d'edició per a afegir traduccions per a aquest idioma
 NotUsedForThisCustomer=No s'utilitza per a aquest client
+NotUsedForThisVendor=Not used for this vendor
 AmountMustBePositive=L'import ha de ser positiu
 ByStatus=Per estat
 InformationMessage=Informació
@@ -1148,14 +1153,14 @@ EventReminder=Recordatori d'esdeveniments
 UpdateForAllLines=Actualització per a totes les línies
 OnHold=Fora de servei
 Civility=Civilitat
-AffectTag=Assign Tag
-AffectUser=Assign User
-SetSupervisor=Set Supervisor
+AffectTag=Assign a Tag
+AffectUser=Assign a User
+SetSupervisor=Set the supervisor
 CreateExternalUser=Crea un usuari extern
 ConfirmAffectTag=Bulk Tag Assignement
 ConfirmAffectUser=Bulk User Assignement
-ProjectRole=Role assigned on each project
-TasksRole=Role assigned on each task of each project
+ProjectRole=Role assigned on each project/opportunity
+TasksRole=Role assigned on each task (if used)
 ConfirmSetSupervisor=Bulk Supervisor Set
 ConfirmUpdatePrice=Choose a increase/decrease price rate
 ConfirmAffectTagQuestion=Are you sure you want to assign tags to the %s selected record(s)?
@@ -1210,3 +1215,10 @@ CreatedByPublicPortal=Creat a partir del portal públic
 UserAgent=Agent d'usuari
 InternalUser=Usuari intern
 ExternalUser=Usuari extern
+NoSpecificContactAddress=No specific contact or address
+NoSpecificContactAddressBis=This tab is dedicated to force specific contacts or addresses for the current object. Use it only if you want to define one or several specific contacts or addresses for the object when the information on the thirdparty is not enough or not accurate.
+HideOnVCard=Hide %s
+AddToContacts=Add address to my contacts
+LastAccess=Últim accés
+UploadAnImageToSeeAPhotoHere=Carregueu una imatge de la pestanya %s per a veure una foto aquí
+LastPasswordChangeDate=Last password change date
diff --git a/htdocs/langs/ca_ES/members.lang b/htdocs/langs/ca_ES/members.lang
index 7c5232f0eee..db410480361 100644
--- a/htdocs/langs/ca_ES/members.lang
+++ b/htdocs/langs/ca_ES/members.lang
@@ -207,7 +207,7 @@ NbOfSubscriptions=Nombre de contribucions
 AmountOfSubscriptions=Import recaptat de les contribucions
 TurnoverOrBudget=Volum de vendes (empresa) o Pressupost (associació o col.lectiu)
 DefaultAmount=Import per defecte de la contribució
-CanEditAmount=Subscription amount is free
+CanEditAmount=L'import de la subscripció és gratuït
 CanEditAmountDetail=El visitant pot triar/editar la quantitat de la seva contribució independentment del tipus de soci
 AmountIsLowerToMinimumNotice=sobre un total d'%s
 MEMBER_NEWFORM_PAYONLINE=After the online registration, switch automatically on the online payment page
diff --git a/htdocs/langs/ca_ES/orders.lang b/htdocs/langs/ca_ES/orders.lang
index 472cd6f2c80..530bfe3f540 100644
--- a/htdocs/langs/ca_ES/orders.lang
+++ b/htdocs/langs/ca_ES/orders.lang
@@ -96,6 +96,10 @@ OrdersStatisticsSuppliers=Estadístiques de comandes de compra
 NumberOfOrdersByMonth=Nombre de comandes per mes
 AmountOfOrdersByMonthHT=Quantitat de comandes per mes (sense IVA)
 ListOfOrders=Llistat de comandes
+ListOrderLigne=Lines of orders
+productobuy=Products to buy only
+productonly=Només productes
+disablelinefree=No lines free
 CloseOrder=Tancar comanda
 ConfirmCloseOrder=Vols classificar aquesta comanda com entregada? Un cop s'entrega la comanda, es podrà classificar com a facturada.
 ConfirmDeleteOrder=Vols eliminar aquesta comanda?
@@ -131,6 +135,7 @@ SupplierOrderClassifiedBilled=Comanda de compra %s com a facturada
 OtherOrders=Altres comandes
 SupplierOrderValidatedAndApproved=La comanda del proveïdor està validada i aprovada: %s
 SupplierOrderValidated=La comanda del proveïdor està validada: %s
+OrderShowDetail=Show order detail
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Ordre de venda de seguiment representatiu
 TypeContact_commande_internal_SHIPPING=Responsable del seguiment de l'enviament
@@ -199,3 +204,5 @@ StatusSupplierOrderApproved=Aprovat
 StatusSupplierOrderRefused=Rebutjat
 StatusSupplierOrderReceivedPartially=Rebuda parcialment
 StatusSupplierOrderReceivedAll=Tots els productes rebuts
+NeedAtLeastOneInvoice = Hi ha d'haver almenys una factura
+LineAlreadyDispatched = La línia de comanda ja s'ha rebut.
diff --git a/htdocs/langs/ca_ES/projects.lang b/htdocs/langs/ca_ES/projects.lang
index e0bd97da30b..7e49d3d4d4e 100644
--- a/htdocs/langs/ca_ES/projects.lang
+++ b/htdocs/langs/ca_ES/projects.lang
@@ -125,7 +125,7 @@ ValidateProject=Validar projecte
 ConfirmValidateProject=Vols validar aquest projecte?
 CloseAProject=Tancar projecte
 ConfirmCloseAProject=Vols tancar aquest projecte?
-AlsoCloseAProject=Also close project
+AlsoCloseAProject=Tanca el projecte també
 AlsoCloseAProjectTooltip=Manteniu-lo obert si encara heu de seguir les tasques de producció
 ReOpenAProject=Reobrir projecte
 ConfirmReOpenAProject=Vols reobrir aquest projecte?
@@ -259,6 +259,7 @@ RecordsClosed=%s projecte(s) tancat(s)
 SendProjectRef=Informació del projecte %s
 ModuleSalaryToDefineHourlyRateMustBeEnabled=El mòdul "Salaris" ha d'estar habilitat per a definir la tarifa horària dels empleats per tal de valorar el temps dedicat
 NewTaskRefSuggested=Tasca ref en ús, es requereix una nova tasca ref
+NumberOfTasksCloned=%s task(s) cloned
 TimeSpentInvoiced=Temps de facturació facturat
 TimeSpentForIntervention=Temps dedicat
 TimeSpentForInvoice=Temps dedicat
@@ -287,7 +288,7 @@ 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=Note: existing projects with all tasks already set to a progress of 100 %% won't be affected: you will have to close them manually. This option only affects open projects.
-SelectLinesOfTimeSpentToInvoice=Seleccioneu les línies de temps que no es facturen i, a continuació, feu una acció massiva "Genera factura" per facturar-les
+SelectLinesOfTimeSpentToInvoice=Seleccioneu les línies de temps invertides que no estiguin facturades i, a continuació, feu l'acció massiva "Genera factura" per a facturar-les.
 ProjectTasksWithoutTimeSpent=Projecte tasques sense temps dedicat
 FormForNewLeadDesc=Gràcies per omplir el següent formulari per contactar amb nosaltres. També podeu enviar-nos un correu electrònic directament a <b> %s </b>.
 ProjectsHavingThisContact=Projectes amb aquest contacte
diff --git a/htdocs/langs/ca_ES/stocks.lang b/htdocs/langs/ca_ES/stocks.lang
index abdf7041022..0db83a567c2 100644
--- a/htdocs/langs/ca_ES/stocks.lang
+++ b/htdocs/langs/ca_ES/stocks.lang
@@ -49,7 +49,7 @@ StockCorrection=Regularització d'estoc
 CorrectStock=Regularització d'estoc
 StockTransfer=Transferència d’estoc
 TransferStock=Transferència d'estoc
-MassStockTransferShort=Bulk stock change
+MassStockTransferShort=Canvi d'estoc massiu
 StockMovement=Moviment d'estoc
 StockMovements=Moviments d'estoc
 NumberOfUnit=Nombre d'unitats
@@ -107,7 +107,7 @@ LieuWareHouse=Localització magatzem
 WarehousesAndProducts=Magatzems i productes
 WarehousesAndProductsBatchDetail=Magatzems i productes (amb detall per lot/sèrie)
 AverageUnitPricePMPShort=Preu mitjà ponderat
-AverageUnitPricePMPDesc=El preu unitari mitjà d’entrada que vam haver de gastar per aconseguir una unitat de producte al nostre estoc.
+AverageUnitPricePMPDesc=El preu unitari mitjà d'entrada que hem hagut de gastar per a incorporar 1 unitat de producte al nostre estoc.
 SellPriceMin=Preu de venda unitari
 EstimatedStockValueSellShort=Valor per vendre
 EstimatedStockValueSell=Valor per vendre
diff --git a/htdocs/langs/ca_ES/stripe.lang b/htdocs/langs/ca_ES/stripe.lang
index ff4fd2e511b..190e2d222cb 100644
--- a/htdocs/langs/ca_ES/stripe.lang
+++ b/htdocs/langs/ca_ES/stripe.lang
@@ -28,7 +28,7 @@ AccountParameter=Paràmetres del compte
 UsageParameter=Paràmetres d'ús
 InformationToFindParameters=Ajuda per a trobar la vostra informació del compte %s
 STRIPE_CGI_URL_V2=URL CGI del mòdul Stripe per al pagament
-CSSUrlForPaymentForm=Url del full d'estil CSS per al formulari de pagament
+CSSUrlForPaymentForm=URL del full d'estil CSS per al formulari de pagament
 NewStripePaymentReceived=S'ha rebut un pagament nou de Stripe
 NewStripePaymentFailed=S'ha intentat el pagament nou de Stripe, però ha fallat
 FailedToChargeCard=No s'ha pogut fer el càrrec a la targeta
@@ -41,7 +41,8 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook clau en directe
 ONLINE_PAYMENT_WAREHOUSE=Estoc a utilitzar per a disminuir l'estoc quan es fa el pagament en línia <br>(Pendent de fer quan l'opció per a reduir l'estoc es fa en una acció a la factura i el pagament en línia es genera la seva factura?)
 StripeLiveEnabled=Stripe live activat (en cas contrari, mode de prova/sandbox)
 StripeImportPayment=Importar pagaments per Stripe
-ExampleOfTestCreditCard=Exemple de targeta de crèdit per a la prova: %s => vàlid, %s => error CVC, %s => caducat, %s => falla la càrrega
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+ExampleOfTestBankAcountForSEPA=Exemple de compte bancari BAN per a la prova de domiciliació bancària: %s
 StripeGateways=Passarel·les Stripe
 OAUTH_STRIPE_TEST_ID=Identificador de client de Stripe Connect (ca _...)
 OAUTH_STRIPE_LIVE_ID=Identificador de client de Stripe Connect (ca _...)
@@ -61,6 +62,7 @@ DeleteACard=Suprimeix la targeta
 ConfirmDeleteCard=Estàs segur que vols eliminar aquesta targeta de crèdit o de dèbit?
 CreateCustomerOnStripe=Crea un client a Stripe
 CreateCardOnStripe=Crea una targeta a Stripe
+CreateBANOnStripe=Create bank on Stripe
 ShowInStripe=Mostra a Stripe
 StripeUserAccountForActions=Compte d'usuari que s'utilitzarà per a la notificació per correu electrònic d'alguns esdeveniments de Stripe (pagaments de Stripe)
 StripePayoutList=Llista de pagaments de Stripe
@@ -69,4 +71,8 @@ ToOfferALinkForLiveWebhook=Enllaç a la configuració de Stripe WebHook per truc
 PaymentWillBeRecordedForNextPeriod=El pagament es registrarà per al període següent.
 ClickHereToTryAgain=<a href="%s"> Feu clic aquí per a tornar-ho a provar... </a>
 CreationOfPaymentModeMustBeDoneFromStripeInterface=A causa de les fortes regles d'autenticació de clients, la creació d'una fitxa s'ha de fer des del panell de Stripe. Podeu fer clic aquí per a activar el registre de clients de Stripe: %s
-TERMINAL_LOCATION=Ubicació (adreça) per a terminals
+STRIPE_CARD_PRESENT=Card Present for Stripe Terminals
+TERMINAL_LOCATION=Location (address) for Stripe Terminals
+RequestDirectDebitWithStripe=Request Direct Debit with Stripe
+STRIPE_SEPA_DIRECT_DEBIT=Activeu els pagaments per domiciliació bancària mitjançant Stripe
+
diff --git a/htdocs/langs/ca_ES/ticket.lang b/htdocs/langs/ca_ES/ticket.lang
index 6d113e189d6..849bef2cda1 100644
--- a/htdocs/langs/ca_ES/ticket.lang
+++ b/htdocs/langs/ca_ES/ticket.lang
@@ -26,6 +26,7 @@ Permission56002=Modifica tiquets
 Permission56003=Esborrar tiquets
 Permission56004=Gestiona els tiquets
 Permission56005=Veure els tiquets de tots els tercers (no efectiu per als usuaris externs, sempre estarà limitat al tercer del qual depenen)
+Permission56006=Export tickets
 
 Tickets=Tiquets
 TicketDictType=Tiquet - Tipus
@@ -61,6 +62,8 @@ TypeContact_ticket_external_CONTRIBUTOR=Col·laborador extern
 OriginEmail=Correu electrònic del reporter
 Notify_TICKET_SENTBYMAIL=Envia el missatge del tiquet per correu electrònic
 
+ExportDataset_ticket_1=Tiquets
+
 # Status
 Read=Llegit
 Assigned=Assignat
diff --git a/htdocs/langs/ca_ES/users.lang b/htdocs/langs/ca_ES/users.lang
index 0fbf167ffb5..ab4e884a2d7 100644
--- a/htdocs/langs/ca_ES/users.lang
+++ b/htdocs/langs/ca_ES/users.lang
@@ -47,7 +47,7 @@ RemoveFromGroup=Eliminar del grup
 PasswordChangedAndSentTo=Contrasenya canviada i enviada a <b>%s</b>.
 PasswordChangeRequest=Sol·licitud de canvi de contrasenya per <b> %s </b>
 PasswordChangeRequestSent=Petició de canvi de contrasenya per a <b>%s</b> enviada a <b>%s</b>.
-IfLoginExistPasswordRequestSent=Si aquest inici de sessió és un compte vàlid, s'ha enviat un correu electrònic per a restablir la contrasenya.
+IfLoginExistPasswordRequestSent=If this login is a valid account (with a valid email), an email to reset password has been sent.
 IfEmailExistPasswordRequestSent=Si aquest correu electrònic és un compte vàlid, s'ha enviat un correu electrònic per a restablir la contrasenya.
 ConfirmPasswordReset=Confirma la restauració de la contrasenya
 MenuUsersAndGroups=Usuaris i grups
@@ -66,9 +66,9 @@ LinkedToDolibarrUser=Enllaç a l'usuari
 LinkedToDolibarrThirdParty=Enllaç a tercers
 CreateDolibarrLogin=Crear un compte d'usuari
 CreateDolibarrThirdParty=Crea un tercer
-LoginAccountDisableInDolibarr=El compte està desactivat en Dolibarr
+LoginAccountDisableInDolibarr=Compte desactivat a Dolibarr
+PASSWORDInDolibarr=Contrasenya modificada a Dolibarr
 UsePersonalValue=Utilitzar valors personalitzats
-InternalUser=Usuari intern
 ExportDataset_user_1=Usuaris i les seves propietats
 DomainUser=Usuari de domini
 Reactivate=Reactivar
@@ -128,3 +128,8 @@ DateLastLogin=Data darrera sessió
 DatePreviousLogin=Data d'inici de sessió anterior
 IPLastLogin=IP darrer inici de sessió
 IPPreviousLogin=IP d'inici de sessió anterior
+ShowAllPerms=Show all permission rows
+HideAllPerms=Hide all permission rows
+UserPublicPageDesc=You can enable a virtual card for this user. An url with the user profile and a barcode will be available to allow anybody with a smartphone to scan it and add your contact to its address book.
+EnablePublicVirtualCard=Enable the public virtual user card
+PublicVirtualCardUrl=Public virtual user card
diff --git a/htdocs/langs/ca_ES/withdrawals.lang b/htdocs/langs/ca_ES/withdrawals.lang
index d6b183c7c69..00d8bd28f98 100644
--- a/htdocs/langs/ca_ES/withdrawals.lang
+++ b/htdocs/langs/ca_ES/withdrawals.lang
@@ -101,11 +101,11 @@ CreditDate=Abonada el
 WithdrawalFileNotCapable=No es pot generar el fitxer de rebut de domiciliació del vostre país %s (El vostre país no és compatible)
 ShowWithdraw=Mostra l'ordre de domiciliació
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Tot i això, si la factura té com a mínim una ordre de pagament per domiciliació bancària encara no processada, no s’establirà com a pagament per a permetre la gestió prèvia de la retirada.
-DoStandingOrdersBeforePayments=Aquesta pestanya permet sol·licitar una ordre de pagament per domiciliació bancària. Un cop fet, podeu entrar al menú "Banc->Pagament per domiciliació bancària" per generar i gestionar un fitxer de comanda de domiciliació bancària.
+DoStandingOrdersBeforePayments=Aquesta pestanya permet sol·licitar una ordre de pagament per domiciliació bancària. Un cop fet, podeu entrar al menú "Banc->Pagament per domiciliació bancària" per a generar i gestionar un fitxer de domiciliació bancària.
 DoStandingOrdersBeforePayments2=També podeu enviar una sol·licitud directament a un processador de pagaments SEPA com Stripe, ...
-DoStandingOrdersBeforePayments3=Quan es tanqui l'ordre de domiciliació bancària, el pagament de les factures es registrarà automàticament i les factures es tanquen si la resta per pagar és nul·la.
-DoCreditTransferBeforePayments=Aquesta pestanya us permet sol·licitar una ordre de transferència de crèdit. Un cop fet, aneu al menú "Banc->Pagament per transferència de crèdit" per generar i gestionar un fitxer d'ordre de transferència de crèdit.
-DoCreditTransferBeforePayments3=Quan es tanqui l'ordre de transferència de crèdit, el pagament de les factures es registrarà automàticament i les factures es tanquen si la resta per pagar és nul·la.
+DoStandingOrdersBeforePayments3=Quan es tanqui l'ordre de domiciliació bancària, el pagament de les factures es registrarà automàticament i les factures es tanquen si la resta per a pagar és nul·la.
+DoCreditTransferBeforePayments=Aquesta pestanya us permet sol·licitar una ordre de transferència de crèdit. Un cop fet, aneu al menú "Banc->Pagament per transferència de crèdit" per a generar i gestionar un fitxer d'ordre de transferència de crèdit.
+DoCreditTransferBeforePayments3=Quan es tanqui l'ordre de transferència de crèdit, el pagament de les factures es registrarà automàticament i les factures es tanquen si la resta per a pagar és nul·la.
 WithdrawalFile=Fitxer de comanda de dèbit
 CreditTransferFile=Fitxer de transferència de crèdit
 SetToStatusSent=Estableix l'estat "Fitxer enviat"
@@ -122,7 +122,7 @@ WithdrawRequestErrorNilAmount=No és possible crear una domiciliació sense impo
 SepaMandate=Mandat de domiciliació bancària SEPA 
 SepaMandateShort=Mandat SEPA
 PleaseReturnMandate=Si us plau, envieu aquest formulari de mandat per correu electrònic a %s o per correu postal a
-SEPALegalText=En signar aquest formulari de mandat, autoritzeu (A) a %s i al seu proveïdor de serveis de pagament a enviar instruccions al vostre banc per carregar el vostre compte i (B) al vostre banc a domiciliar el vostre compte d'acord amb les instruccions d'%s. Com a part dels vostres drets, teniu dret a un reemborsament del vostre banc segons els termes i condicions del vostre acord amb el vostre banc. Els vostres drets respecte al mandat anterior s'expliquen en un comunicat que podeu obtenir al vostre banc.
+SEPALegalText=En signar aquest formulari de mandat, autoritzeu (A) a %s i al seu proveïdor de serveis de pagament a enviar instruccions al vostre banc per a carregar el vostre compte i (B) al vostre banc a domiciliar el vostre compte d'acord amb les instruccions d'%s. Com a part dels vostres drets, teniu dret a un reemborsament del vostre banc segons els termes i condicions del vostre acord amb el vostre banc. Els vostres drets respecte al mandat anterior s'expliquen en un comunicat que podeu obtenir al vostre banc.
 CreditorIdentifier=Identificador del creditor
 CreditorName=Nom del creditor
 SEPAFillForm=(B) Si us plau completa tots els camps marcats amb *
diff --git a/htdocs/langs/ca_ES/zapier.lang b/htdocs/langs/ca_ES/zapier.lang
index 65d851a78bd..3ddf2a27546 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=No cal una configuració de Dolibarr per a utilitzar Zapier. Tanmateix, heu de generar i publicar un paquet a zapier per a poder utilitzar Zapier amb Dolibarr. Vegeu la documentació sobre <a href="https://wiki.dolibarr.org/index.php/Module_Zapier"> aquesta pàgina wiki </a>.
+ZapierSetupPage=No cal una configuració de Dolibarr per a utilitzar Zapier. Tanmateix, heu de generar i publicar un paquet a zapier per a poder utilitzar Zapier amb Dolibarr. Vegeu la documentació sobre <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 10e039ebde0..15d52b75959 100644
--- a/htdocs/langs/cs_CZ/accountancy.lang
+++ b/htdocs/langs/cs_CZ/accountancy.lang
@@ -14,8 +14,8 @@ ACCOUNTING_EXPORT_ENDLINE=Zvolte typ návratu vozíku
 ACCOUNTING_EXPORT_PREFIX_SPEC=Určete předponu pro název souboru
 ThisService=Tato služba
 ThisProduct=Tento výrobek
-DefaultForService=Výchozí nastavení pro službu
-DefaultForProduct=Výchozí produkt
+DefaultForService=Default for services
+DefaultForProduct=Default for products
 ProductForThisThirdparty=Produkty pro tento subjekt
 ServiceForThisThirdparty=Služby pro tento subjekt
 CantSuggest=Nelze navrhnout
@@ -101,7 +101,8 @@ ShowAccountingAccount=Zobrazit účetní účet
 ShowAccountingJournal=Zobrazit účetní deník
 ShowAccountingAccountInLedger=Show accounting account in ledger
 ShowAccountingAccountInJournals=Show accounting account in journals
-AccountAccountingSuggest=Účetní účet navrhl
+DataUsedToSuggestAccount=Data used to suggest account
+AccountAccountingSuggest=Account suggested
 MenuDefaultAccounts=výchozí účty
 MenuBankAccounts=Bankovní účty
 MenuVatAccounts=Účty DPH
@@ -126,6 +127,7 @@ WriteBookKeeping=Record transactions in accounting
 Bookkeeping=účetní kniha
 BookkeepingSubAccount=Subledger
 AccountBalance=Zůstatek na účtu
+AccountBalanceSubAccount=Sub-accounts balance
 ObjectsRef=Zdrojový objekt ref
 CAHTF=Celkový prodejce před zdaněním
 TotalExpenseReport=Celková výkaz výdajů
@@ -189,6 +191,7 @@ ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Account (from the Chart Of Account) to be us
 UseAuxiliaryAccountOnCustomerDeposit=Store customer account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
 ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Account (from the Chart Of Account) to be used as the default
 UseAuxiliaryAccountOnSupplierDeposit=Store supplier account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
+ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY=Accounting account by default to register customer retained warranty
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased within same country (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased from EEC to another EEC country (used if not defined in the product sheet)
@@ -218,6 +221,7 @@ JournalLabel=Označení časopisu
 NumPiece=počet kusů
 TransactionNumShort=Num. transakce
 AccountingCategory=Custom group of accounts
+AccountingCategories=Custom groups of accounts
 GroupByAccountAccounting=Group by general ledger account
 GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=Zde můžete definovat některé skupiny účetních účtů. Budou se používat pro personalizované účetní výkazy.
@@ -265,6 +269,7 @@ ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Skupina účtů
 PcgtypeDesc=Skupina účtů se používá jako předdefinovaná kritéria pro filtrování a seskupování pro některé účetní výkazy. Například „PŘÍJMY“ nebo „VÝDAJE“ se používají jako skupiny pro účetní účty produktů k sestavení výkazu nákladů / výnosů.
+AccountingCategoriesDesc=Custom group of accounts can be used to group accounting accounts into one name to ease filter use or building of custom reports.
 
 Reconcilable=Smíření
 
@@ -294,6 +299,7 @@ DescValidateMovements=Jakékoli úpravy nebo vymazání písem, nápisů a vymaz
 
 ValidateHistory=Ověřit automaticky
 AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
+DoManualBindingForFailedRecord=You have to do a manual link for the %s row(s) not linked automatically.
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot remove or disable this account of chart of account because it is used
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s & Credit = %s
@@ -337,11 +343,13 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on
 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_ENABLE_LETTERING=Enable the lettering function in the accounting
+ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
 
 ## Export
 NotExportLettering=Do not export the lettering when generating the file
 NotifiedExportDate=Flag exported lines as Exported <span class="warning">(to modify a line, you will need to delete the whole transaction and re-transfert it into accounting)</span>
 NotifiedValidationDate=Validate and Lock the exported entries <span class="warning">(same effect than the "%s" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+NotifiedExportFull=Export documents ?
 DateValidationAndLock=Date validation and lock
 ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Exportovat deník návrhu
@@ -398,7 +406,7 @@ SaleLocal=Místní prodej
 SaleExport=Exportní prodej
 SaleEEC=Prodej v EHS
 SaleEECWithVAT=Prodej v EHS s nulovou DPH, takže předpokládáme, že se nejedná o intrakomunitní prodej a navrhovaný účet je standardní produktový účet.
-SaleEECWithoutVATNumber=Prodej v EHS bez DPH, ale DIČ třetí strany není definováno. Pro standardní prodej jsme upadli na produktový účet. V případě potřeby můžete opravit DIČ třetí strany nebo produktový účet.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the thirdparty, or change the product account suggested for binding if needed.
 ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
 ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
 ## Dictionary
@@ -442,6 +450,7 @@ AccountancyErrorMismatchLetterCode=Mismatch in reconcile code
 AccountancyErrorMismatchBalanceAmount=The balance (%s) is not equal to 0
 AccountancyErrorLetteringBookkeeping=Errors have occurred concerning the transactions: %s
 ErrorAccountNumberAlreadyExists=The accounting number %s already exists
+ErrorArchiveAddFile=Can't put "%s" file in archive
 
 ## Import
 ImportAccountingEntries=Účetní zápisy
@@ -468,5 +477,7 @@ FECFormatMulticurrencyCode=Multicurrency code (Idevise)
 DateExport=Datum exportu
 WarningReportNotReliable=Upozornění: Tento přehled není založen na záznamníku, takže neobsahuje transakci upravenou ručně v Knihovně. Je-li vaše deník aktuální, zobrazení účetnictví je přesnější.
 ExpenseReportJournal=Účet výkazů výdajů
+DocsAlreadyExportedAreExcluded=Docs already exported are excluded
+ClickToHideAlreadyExportedLines=Click to hide already exported lines
 
 NAccounts=%s accounts
diff --git a/htdocs/langs/cs_CZ/main.lang b/htdocs/langs/cs_CZ/main.lang
index 77d27372595..8ddc04c49f2 100644
--- a/htdocs/langs/cs_CZ/main.lang
+++ b/htdocs/langs/cs_CZ/main.lang
@@ -226,6 +226,7 @@ NoUserGroupDefined=Žádná uživatelská skupina není definována
 Password=Heslo
 PasswordRetype=Repeat your password
 NoteSomeFeaturesAreDisabled=Všimněte si, že v této demonstraci je mnoho funkcí / modulů zakázáno.
+YourUserFile=Your user file
 Name=Název
 NameSlashCompany=Název / společnost
 Person=Osoba
@@ -897,6 +898,9 @@ MassFilesArea=Plocha pro soubory postavený masových akcí
 ShowTempMassFilesArea=Show area souborů postavený masových akcí
 ConfirmMassDeletion=Hromadné smazání potvrzení
 ConfirmMassDeletionQuestion=Opravdu chcete odstranit vybraný záznam(y) %s?
+ConfirmMassClone=Bulk clone confirmation
+ConfirmMassCloneQuestion=Select project to clone to
+ConfirmMassCloneToOneProject=Clone to project %s
 RelatedObjects=Související objekty
 ClassifyBilled=Označit jako účtováno
 ClassifyUnbilled=Zařadit nevyfakturované
@@ -912,8 +916,8 @@ ExportFilteredList=Export filtrovaný seznam
 ExportList=seznam export
 ExportOptions=Možnosti exportu
 IncludeDocsAlreadyExported=Zahrnout již exportované dokumenty
-ExportOfPiecesAlreadyExportedIsEnable=Export již exportovaných kusů je povolen
-ExportOfPiecesAlreadyExportedIsDisable=Export již exportovaných kusů je zakázán
+ExportOfPiecesAlreadyExportedIsEnable=Documents already exported are visible and will be exported
+ExportOfPiecesAlreadyExportedIsDisable=Documents already exported are hidden and won't be exported
 AllExportedMovementsWereRecordedAsExported=Všechny exportované pohyby byly zaznamenány jako exportované
 NotAllExportedMovementsCouldBeRecordedAsExported=Ne všechny exportované pohyby nelze zaznamenat jako exportované
 Miscellaneous=Smíšený
@@ -1128,6 +1132,7 @@ DeleteFileText=Opravdu chcete tento soubor odstranit?
 ShowOtherLanguages=Zobrazit další jazyky
 SwitchInEditModeToAddTranslation=Přepnutím v režimu úprav přidáte překlady do tohoto jazyka
 NotUsedForThisCustomer=Nepoužívá se pro tohoto zákazníka
+NotUsedForThisVendor=Not used for this vendor
 AmountMustBePositive=Amount must be positive
 ByStatus=By status
 InformationMessage=Informace
@@ -1148,14 +1153,14 @@ EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
 OnHold=Pozdržen
 Civility=Civility
-AffectTag=Assign Tag
-AffectUser=Assign User
-SetSupervisor=Set Supervisor
+AffectTag=Assign a Tag
+AffectUser=Assign a User
+SetSupervisor=Set the supervisor
 CreateExternalUser=Create external user
 ConfirmAffectTag=Bulk Tag Assignement
 ConfirmAffectUser=Bulk User Assignement
-ProjectRole=Role assigned on each project
-TasksRole=Role assigned on each task of each project
+ProjectRole=Role assigned on each project/opportunity
+TasksRole=Role assigned on each task (if used)
 ConfirmSetSupervisor=Bulk Supervisor Set
 ConfirmUpdatePrice=Choose a increase/decrease price rate
 ConfirmAffectTagQuestion=Are you sure you want to assign tags to the %s selected record(s)?
@@ -1210,3 +1215,10 @@ CreatedByPublicPortal=Created from Public portal
 UserAgent=User Agent
 InternalUser=Interní uživatel
 ExternalUser=Externí uživatel
+NoSpecificContactAddress=No specific contact or address
+NoSpecificContactAddressBis=This tab is dedicated to force specific contacts or addresses for the current object. Use it only if you want to define one or several specific contacts or addresses for the object when the information on the thirdparty is not enough or not accurate.
+HideOnVCard=Hide %s
+AddToContacts=Add address to my contacts
+LastAccess=Last access
+UploadAnImageToSeeAPhotoHere=Upload an image from the tab %s to see a photo here
+LastPasswordChangeDate=Last password change date
diff --git a/htdocs/langs/cs_CZ/stripe.lang b/htdocs/langs/cs_CZ/stripe.lang
index dfc420fc999..7c2cb64cd34 100644
--- a/htdocs/langs/cs_CZ/stripe.lang
+++ b/htdocs/langs/cs_CZ/stripe.lang
@@ -41,7 +41,8 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook live klíč
 ONLINE_PAYMENT_WAREHOUSE=Sklad, který se má použít k poklesu akcií, když je hotovo on-line platba <br> (TODO Pokud se volba k poklesu zásob uskuteční na akci na faktuře a on-line platba vygeneruje fakturu?)
 StripeLiveEnabled=Stripe live povoleno (jinak testovací režim / režim sandbox)
 StripeImportPayment=Platby importu Stripe
-ExampleOfTestCreditCard=Příklad kreditní karty pro test: %s (platný), %s (chyba CVC), %s (uplynula), %s (poplatek selže)
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+ExampleOfTestBankAcountForSEPA=Example of bank account BAN for direct debit test: %s
 StripeGateways=Brána Stripe
 OAUTH_STRIPE_TEST_ID=Připojení klienta Stripe Connect (ca _...)
 OAUTH_STRIPE_LIVE_ID=Připojení klienta Stripe Connect (ca _...)
@@ -61,6 +62,7 @@ DeleteACard=Smazat kartu
 ConfirmDeleteCard=Opravdu chcete tuto kreditní nebo debetní kartu smazat?
 CreateCustomerOnStripe=Vytvořte zákazníka na Stripe
 CreateCardOnStripe=Vytvořte kartu na Stripe
+CreateBANOnStripe=Create bank on Stripe
 ShowInStripe=Zobrazit ve Stripe
 StripeUserAccountForActions=Uživatelský účet, který se má používat pro e-mailové upozornění na některé události Stripe (Stripe výplaty)
 StripePayoutList=Seznam páskových výplat
@@ -69,3 +71,8 @@ ToOfferALinkForLiveWebhook=Odkaz na nastavení Stripe WebHook pro volání IPN (
 PaymentWillBeRecordedForNextPeriod=Platba bude zaznamenána pro další období.
 ClickHereToTryAgain= <a href="%s"> Klikněte zde a zkuste to znovu ... </a>
 CreationOfPaymentModeMustBeDoneFromStripeInterface=Vzhledem k přísným pravidlům pro ověřování zákazníků musí být karta vytvořena z backoffice Stripe. Klepnutím sem zapnete záznam zákazníka Stripe: %s
+STRIPE_CARD_PRESENT=Card Present for Stripe Terminals
+TERMINAL_LOCATION=Location (address) for Stripe Terminals
+RequestDirectDebitWithStripe=Request Direct Debit with Stripe
+STRIPE_SEPA_DIRECT_DEBIT=Enable the Direct Debit payments through Stripe
+
diff --git a/htdocs/langs/cs_CZ/ticket.lang b/htdocs/langs/cs_CZ/ticket.lang
index b121180eab7..93a2528ce94 100644
--- a/htdocs/langs/cs_CZ/ticket.lang
+++ b/htdocs/langs/cs_CZ/ticket.lang
@@ -26,6 +26,7 @@ Permission56002=Změnit vstupenky
 Permission56003=Smazat vstupenky
 Permission56004=Správa vstupenek
 Permission56005=Viz vstupenky všech subjektů (neplatí pro externí uživatele, vždy se omezují na subjekt, na který se vztahují)
+Permission56006=Export tickets
 
 Tickets=Vstupenky
 TicketDictType=Vstupenka - Typy
@@ -61,6 +62,8 @@ TypeContact_ticket_external_CONTRIBUTOR=Externí přispěvatel
 OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Odeslat e-mailem zprávu o lince
 
+ExportDataset_ticket_1=Vstupenky
+
 # Status
 Read=Číst
 Assigned=Přidělené
diff --git a/htdocs/langs/cs_CZ/users.lang b/htdocs/langs/cs_CZ/users.lang
index bfc589bed06..2ac189e660f 100644
--- a/htdocs/langs/cs_CZ/users.lang
+++ b/htdocs/langs/cs_CZ/users.lang
@@ -66,7 +66,8 @@ LinkedToDolibarrUser=Link to user
 LinkedToDolibarrThirdParty=Link to third party
 CreateDolibarrLogin=Vytvoření uživatele
 CreateDolibarrThirdParty=Vytvořit třetí stranu
-LoginAccountDisableInDolibarr=Účet byl zakázán v Dolibarr.
+LoginAccountDisableInDolibarr=Account disabled in Dolibarr
+PASSWORDInDolibarr=Password modified in Dolibarr
 UsePersonalValue=Používejte osobní hodnotu
 ExportDataset_user_1=Uživatelé a jejich vlastnosti
 DomainUser=Doménový uživatel %s
@@ -129,3 +130,6 @@ IPLastLogin=IP last login
 IPPreviousLogin=IP previous login
 ShowAllPerms=Show all permission rows
 HideAllPerms=Hide all permission rows
+UserPublicPageDesc=You can enable a virtual card for this user. An url with the user profile and a barcode will be available to allow anybody with a smartphone to scan it and add your contact to its address book.
+EnablePublicVirtualCard=Enable the public virtual user card
+PublicVirtualCardUrl=Public virtual user card
diff --git a/htdocs/langs/cy_GB/accountancy.lang b/htdocs/langs/cy_GB/accountancy.lang
index bdaa125540b..f7813cfe19c 100644
--- a/htdocs/langs/cy_GB/accountancy.lang
+++ b/htdocs/langs/cy_GB/accountancy.lang
@@ -14,8 +14,8 @@ ACCOUNTING_EXPORT_ENDLINE=Dewiswch y math dychwelyd cerbyd
 ACCOUNTING_EXPORT_PREFIX_SPEC=Nodwch y rhagddodiad ar gyfer enw'r ffeil
 ThisService=Y gwasanaeth hwn
 ThisProduct=Mae'r cynnyrch hwn
-DefaultForService=Diofyn ar gyfer gwasanaeth
-DefaultForProduct=Diofyn ar gyfer cynnyrch
+DefaultForService=Default for services
+DefaultForProduct=Default for products
 ProductForThisThirdparty=Cynnyrch ar gyfer y trydydd parti hwn
 ServiceForThisThirdparty=Gwasanaeth ar gyfer y trydydd parti hwn
 CantSuggest=Methu awgrymu
@@ -101,7 +101,8 @@ ShowAccountingAccount=Dangos cyfrif cyfrifeg
 ShowAccountingJournal=Dangos dyddlyfr cyfrifo
 ShowAccountingAccountInLedger=Dangos cyfrif cyfrifeg yn y cyfriflyfr
 ShowAccountingAccountInJournals=Dangos cyfrif cyfrifeg mewn cyfnodolion
-AccountAccountingSuggest=Awgrymu cyfrif cyfrifo
+DataUsedToSuggestAccount=Data used to suggest account
+AccountAccountingSuggest=Account suggested
 MenuDefaultAccounts=Cyfrifon rhagosodedig
 MenuBankAccounts=Cyfrifon banc
 MenuVatAccounts=Cyfrifon TAW
@@ -126,6 +127,7 @@ WriteBookKeeping=Cofnodi trafodion mewn cyfrifeg
 Bookkeeping=Cyfriflyfr
 BookkeepingSubAccount=Subledger
 AccountBalance=Balans cyfrif
+AccountBalanceSubAccount=Sub-accounts balance
 ObjectsRef=Ffynhonnell gwrthrych cyf
 CAHTF=Cyfanswm y gwerthwr pryniant cyn treth
 TotalExpenseReport=Adroddiad cyfanswm gwariant
@@ -189,6 +191,7 @@ ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Account (from the Chart Of Account) to be us
 UseAuxiliaryAccountOnCustomerDeposit=Store customer account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
 ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Account (from the Chart Of Account) to be used as the default
 UseAuxiliaryAccountOnSupplierDeposit=Store supplier account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
+ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY=Accounting account by default to register customer retained warranty
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased within same country (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased from EEC to another EEC country (used if not defined in the product sheet)
@@ -218,6 +221,7 @@ JournalLabel=Label cyfnodolyn
 NumPiece=Rhif y darn
 TransactionNumShort=Rhif. trafodiad
 AccountingCategory=Custom group of accounts
+AccountingCategories=Custom groups of accounts
 GroupByAccountAccounting=Grwpio yn ôl cyfrif cyfriflyfr cyffredinol
 GroupBySubAccountAccounting=Grwpio yn ôl cyfrif subledger
 AccountingAccountGroupsDesc=Gallwch ddiffinio yma rai grwpiau o gyfrifon cyfrifeg. Cânt eu defnyddio ar gyfer adroddiadau cyfrifyddu personol.
@@ -265,6 +269,7 @@ ShowSubtotalByGroup=Dangos is-gyfanswm yn ôl lefel
 
 Pcgtype=Grŵp o gyfrifon
 PcgtypeDesc=Defnyddir grŵp cyfrifon fel meini prawf 'hidlo' a 'grwpio' rhagnodedig ar gyfer rhai adroddiadau cyfrifyddu. Er enghraifft, defnyddir 'INCOME' neu 'GREUL' fel grwpiau ar gyfer cyfrifon cyfrifon cynhyrchion i adeiladu'r adroddiad treuliau/incwm.
+AccountingCategoriesDesc=Custom group of accounts can be used to group accounting accounts into one name to ease filter use or building of custom reports.
 
 Reconcilable=Cymodi
 
@@ -294,6 +299,7 @@ DescValidateMovements=Gwaherddir unrhyw newid neu ddileu ysgrifen, llythrennau a
 
 ValidateHistory=Rhwymo'n Awtomatig
 AutomaticBindingDone=Cwblhawyd rhwymiadau awtomatig (%s) - Nid yw rhwymo awtomatig yn bosibl ar gyfer rhywfaint o gofnod (%s)
+DoManualBindingForFailedRecord=You have to do a manual link for the %s row(s) not linked automatically.
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot remove or disable this account of chart of account because it is used
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s & Credit = %s
@@ -337,11 +343,13 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=Analluogi rhwymo a throsglwyddo cyfrifyddiae
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Analluogi rhwymo a throsglwyddo cyfrifyddiaeth ar bryniannau (ni fydd anfonebau gwerthwr yn cael eu hystyried wrth gyfrifo)
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Analluogi rhwymo a throsglwyddo cyfrifon ar adroddiadau treuliau (ni fydd adroddiadau gwariant yn cael eu hystyried wrth gyfrifo)
 ACCOUNTING_ENABLE_LETTERING=Enable the lettering function in the accounting
+ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
 
 ## Export
 NotExportLettering=Do not export the lettering when generating the file
 NotifiedExportDate=Baner llinellau wedi'u hallforio fel Allforiwyd <span class="warning"> (i addasu llinell, bydd angen i chi ddileu'r trafodiad cyfan a'i ail-drosglwyddo i gyfrifeg) </span>
 NotifiedValidationDate=Validate and Lock the exported entries <span class="warning">(same effect than the "%s" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+NotifiedExportFull=Export documents ?
 DateValidationAndLock=Dyddiad dilysu a chlo
 ConfirmExportFile=Cadarnhad o gynhyrchu'r ffeil allforio cyfrifo ?
 ExportDraftJournal=Allforio cyfnodolyn drafft
@@ -398,7 +406,7 @@ SaleLocal=Gwerthiant lleol
 SaleExport=Gwerthu allforio
 SaleEEC=Gwerthu yn EEC
 SaleEECWithVAT=Gwerthiant mewn EEC gyda TAW nid nwl, felly mae'n debyg NID yw hwn yn werthiant mewngymunedol a'r cyfrif a awgrymir yw'r cyfrif cynnyrch safonol.
-SaleEECWithoutVATNumber=Gwerthu mewn EEC heb TAW ond nid yw ID TAW trydydd parti wedi'i ddiffinio. Rydym wrth gefn ar y cyfrif cynnyrch ar gyfer gwerthiannau safonol. Gallwch drwsio ID TAW trydydd parti neu gyfrif y cynnyrch os oes angen.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the thirdparty, or change the product account suggested for binding if needed.
 ForbiddenTransactionAlreadyExported=Wedi'i wahardd: Mae'r trafodiad wedi'i ddilysu a/neu ei allforio.
 ForbiddenTransactionAlreadyValidated=Wedi'i wahardd: Mae'r trafodiad wedi'i ddilysu.
 ## Dictionary
@@ -442,6 +450,7 @@ AccountancyErrorMismatchLetterCode=Mismatch in reconcile code
 AccountancyErrorMismatchBalanceAmount=The balance (%s) is not equal to 0
 AccountancyErrorLetteringBookkeeping=Errors have occurred concerning the transactions: %s
 ErrorAccountNumberAlreadyExists=The accounting number %s already exists
+ErrorArchiveAddFile=Can't put "%s" file in archive
 
 ## Import
 ImportAccountingEntries=Cofnodion cyfrifeg
@@ -468,5 +477,7 @@ FECFormatMulticurrencyCode=Cod aml-arian (Dyfeisio)
 DateExport=Dyddiad allforio
 WarningReportNotReliable=Rhybudd, nid yw'r adroddiad hwn yn seiliedig ar y Cyfriflyfr, felly nid yw'n cynnwys trafodiad a addaswyd â llaw yn y Cyfriflyfr. Os yw eich cyfnodolyn yn gyfredol, mae'r olwg cadw cyfrifon yn fwy cywir.
 ExpenseReportJournal=Cyfnodolyn Adroddiad Treuliau
+DocsAlreadyExportedAreExcluded=Docs already exported are excluded
+ClickToHideAlreadyExportedLines=Click to hide already exported lines
 
 NAccounts=%s cyfrifon
diff --git a/htdocs/langs/cy_GB/main.lang b/htdocs/langs/cy_GB/main.lang
index 2939668089a..3e611f62ff9 100644
--- a/htdocs/langs/cy_GB/main.lang
+++ b/htdocs/langs/cy_GB/main.lang
@@ -226,6 +226,7 @@ NoUserGroupDefined=Dim grŵp defnyddwyr wedi'i ddiffinio
 Password=Cyfrinair
 PasswordRetype=Repeat your password
 NoteSomeFeaturesAreDisabled=Sylwch fod llawer o nodweddion/modiwlau wedi'u hanalluogi yn yr arddangosiad hwn.
+YourUserFile=Your user file
 Name=Enw
 NameSlashCompany=Enw / Cwmni
 Person=Person
@@ -897,6 +898,9 @@ MassFilesArea=Ardal ar gyfer ffeiliau a adeiladwyd gan gamau gweithredu torfol
 ShowTempMassFilesArea=Dangos arwynebedd y ffeiliau a adeiladwyd gan weithredoedd torfol
 ConfirmMassDeletion=Cadarnhad Swmp Dileu
 ConfirmMassDeletionQuestion=A ydych yn siŵr eich bod am ddileu'r cofnod(au) %s a ddewiswyd?
+ConfirmMassClone=Bulk clone confirmation
+ConfirmMassCloneQuestion=Select project to clone to
+ConfirmMassCloneToOneProject=Clone to project %s
 RelatedObjects=Gwrthrychau Cysylltiedig
 ClassifyBilled=Dosbarthu wedi'i bilio
 ClassifyUnbilled=Dosbarthu heb ei filio
@@ -912,8 +916,8 @@ ExportFilteredList=Allforio rhestr wedi'i hidlo
 ExportList=Rhestr allforio
 ExportOptions=Opsiynau Allforio
 IncludeDocsAlreadyExported=Cynnwys dogfennau sydd eisoes wedi'u hallforio
-ExportOfPiecesAlreadyExportedIsEnable=Allforio darnau a allforiwyd eisoes yn galluogi
-ExportOfPiecesAlreadyExportedIsDisable=Mae allforio darnau sydd eisoes wedi'u hallforio yn analluog
+ExportOfPiecesAlreadyExportedIsEnable=Documents already exported are visible and will be exported
+ExportOfPiecesAlreadyExportedIsDisable=Documents already exported are hidden and won't be exported
 AllExportedMovementsWereRecordedAsExported=Cofnodwyd bod yr holl symudiadau a allforiwyd wedi'u hallforio
 NotAllExportedMovementsCouldBeRecordedAsExported=Ni ellid cofnodi pob symudiad a allforiwyd fel un wedi'i allforio
 Miscellaneous=Amrywiol
@@ -1128,6 +1132,7 @@ DeleteFileText=Ydych chi wir eisiau dileu'r ffeil hon?
 ShowOtherLanguages=Dangos ieithoedd eraill
 SwitchInEditModeToAddTranslation=Newidiwch y modd golygu i ychwanegu cyfieithiadau ar gyfer yr iaith hon
 NotUsedForThisCustomer=Heb ei ddefnyddio ar gyfer y cwsmer hwn
+NotUsedForThisVendor=Not used for this vendor
 AmountMustBePositive=Rhaid i'r swm fod yn bositif
 ByStatus=Yn ôl statws
 InformationMessage=Gwybodaeth
@@ -1148,14 +1153,14 @@ EventReminder=Nodyn Atgoffa am Ddigwyddiad
 UpdateForAllLines=Diweddariad ar gyfer pob llinell
 OnHold=Ar stop
 Civility=Gwareiddiad
-AffectTag=Assign Tag
-AffectUser=Assign User
-SetSupervisor=Set Supervisor
+AffectTag=Assign a Tag
+AffectUser=Assign a User
+SetSupervisor=Set the supervisor
 CreateExternalUser=Creu defnyddiwr allanol
 ConfirmAffectTag=Bulk Tag Assignement
 ConfirmAffectUser=Bulk User Assignement
-ProjectRole=Role assigned on each project
-TasksRole=Role assigned on each task of each project
+ProjectRole=Role assigned on each project/opportunity
+TasksRole=Role assigned on each task (if used)
 ConfirmSetSupervisor=Bulk Supervisor Set
 ConfirmUpdatePrice=Choose a increase/decrease price rate
 ConfirmAffectTagQuestion=Are you sure you want to assign tags to the %s selected record(s)?
@@ -1210,3 +1215,10 @@ CreatedByPublicPortal=Created from Public portal
 UserAgent=User Agent
 InternalUser=Internal user
 ExternalUser=External user
+NoSpecificContactAddress=No specific contact or address
+NoSpecificContactAddressBis=This tab is dedicated to force specific contacts or addresses for the current object. Use it only if you want to define one or several specific contacts or addresses for the object when the information on the thirdparty is not enough or not accurate.
+HideOnVCard=Hide %s
+AddToContacts=Add address to my contacts
+LastAccess=Last access
+UploadAnImageToSeeAPhotoHere=Upload an image from the tab %s to see a photo here
+LastPasswordChangeDate=Last password change date
diff --git a/htdocs/langs/cy_GB/stripe.lang b/htdocs/langs/cy_GB/stripe.lang
index 04b1fadf885..c50c262f6b1 100644
--- a/htdocs/langs/cy_GB/stripe.lang
+++ b/htdocs/langs/cy_GB/stripe.lang
@@ -41,7 +41,8 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook allwedd byw
 ONLINE_PAYMENT_WAREHOUSE=Stoc i'w ddefnyddio ar gyfer gostyngiad stoc pan wneir taliad ar-lein <br> (TODO Pan fydd opsiwn i leihau stoc yn cael ei wneud ar weithred ar anfoneb a'r taliad ar-lein yn cynhyrchu'r anfoneb ei hun ?)
 StripeLiveEnabled=Stripe live wedi'i alluogi (modd prawf / blwch tywod fel arall)
 StripeImportPayment=Mewnforio taliadau Stripe
-ExampleOfTestCreditCard=Enghraifft o gerdyn credyd ar gyfer prawf: %s => dilys, %s => gwall CVC, %s => wedi dod i ben, %s => tâl yn methu
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+ExampleOfTestBankAcountForSEPA=Example of bank account BAN for direct debit test: %s
 StripeGateways=Pyrth streipen
 OAUTH_STRIPE_TEST_ID=ID Cleient Stripe Connect (ca_...)
 OAUTH_STRIPE_LIVE_ID=ID Cleient Stripe Connect (ca_...)
@@ -61,6 +62,7 @@ DeleteACard=Dileu Cerdyn
 ConfirmDeleteCard=Ydych chi'n siŵr eich bod am ddileu'r cerdyn Credyd neu Ddebyd hwn?
 CreateCustomerOnStripe=Creu cwsmer ar Stripe
 CreateCardOnStripe=Creu cerdyn ar Stripe
+CreateBANOnStripe=Create bank on Stripe
 ShowInStripe=Dangos yn Stripe
 StripeUserAccountForActions=Cyfrif defnyddiwr i'w ddefnyddio ar gyfer hysbysiad e-bost o rai digwyddiadau Stripe (taliadau Stripe)
 StripePayoutList=Rhestr o daliadau Stripe
@@ -69,3 +71,8 @@ ToOfferALinkForLiveWebhook=Dolen i'r gosodiad Stripe WebHook i ffonio'r IPN (mod
 PaymentWillBeRecordedForNextPeriod=Bydd taliad yn cael ei gofnodi ar gyfer y cyfnod nesaf.
 ClickHereToTryAgain= <a href="%s"> Cliciwch yma i geisio eto... </a>
 CreationOfPaymentModeMustBeDoneFromStripeInterface=Oherwydd rheolau Dilysu Cwsmeriaid Cryf, rhaid creu cerdyn o swyddfa gefn Stripe. Gallwch glicio yma i droi cofnod cwsmer Stripe ymlaen: %s
+STRIPE_CARD_PRESENT=Card Present for Stripe Terminals
+TERMINAL_LOCATION=Location (address) for Stripe Terminals
+RequestDirectDebitWithStripe=Request Direct Debit with Stripe
+STRIPE_SEPA_DIRECT_DEBIT=Enable the Direct Debit payments through Stripe
+
diff --git a/htdocs/langs/cy_GB/users.lang b/htdocs/langs/cy_GB/users.lang
index a27365d59af..6f2871b0d36 100644
--- a/htdocs/langs/cy_GB/users.lang
+++ b/htdocs/langs/cy_GB/users.lang
@@ -66,7 +66,8 @@ LinkedToDolibarrUser=Dolen i'r defnyddiwr
 LinkedToDolibarrThirdParty=Dolen i drydydd parti
 CreateDolibarrLogin=Creu defnyddiwr
 CreateDolibarrThirdParty=Creu trydydd parti
-LoginAccountDisableInDolibarr=Cyfrif wedi'i analluogi yn Dolibarr.
+LoginAccountDisableInDolibarr=Account disabled in Dolibarr
+PASSWORDInDolibarr=Password modified in Dolibarr
 UsePersonalValue=Defnyddiwch werth personol
 ExportDataset_user_1=Defnyddwyr a'u priodweddau
 DomainUser=Defnyddiwr parth %s
@@ -129,3 +130,6 @@ IPLastLogin=IP last login
 IPPreviousLogin=IP previous login
 ShowAllPerms=Show all permission rows
 HideAllPerms=Hide all permission rows
+UserPublicPageDesc=You can enable a virtual card for this user. An url with the user profile and a barcode will be available to allow anybody with a smartphone to scan it and add your contact to its address book.
+EnablePublicVirtualCard=Enable the public virtual user card
+PublicVirtualCardUrl=Public virtual user card
diff --git a/htdocs/langs/da_DK/accountancy.lang b/htdocs/langs/da_DK/accountancy.lang
index f5cd33c205d..bfce7602092 100644
--- a/htdocs/langs/da_DK/accountancy.lang
+++ b/htdocs/langs/da_DK/accountancy.lang
@@ -14,8 +14,8 @@ ACCOUNTING_EXPORT_ENDLINE=Vælg linjeskift type
 ACCOUNTING_EXPORT_PREFIX_SPEC=Angiv præfiks for filnavnet
 ThisService=Denne ydelse
 ThisProduct=Dette produkt
-DefaultForService=Forvalg ydelse
-DefaultForProduct=Forvalg produkt
+DefaultForService=Standard for tjenester
+DefaultForProduct=Standard for produkter
 ProductForThisThirdparty=Produkt til denne tredjepart
 ServiceForThisThirdparty=Service for denne tredjepart
 CantSuggest=Kan ikke foreslå
@@ -101,7 +101,8 @@ ShowAccountingAccount=Vis regnskabs konto
 ShowAccountingJournal=Vis kontokladde
 ShowAccountingAccountInLedger=Vis regnskabskonto i hovedbog
 ShowAccountingAccountInJournals=Vis regnskabskonto i tidsskrifter
-AccountAccountingSuggest=Forelslået regnskabskonto
+DataUsedToSuggestAccount=Data brugt til at foreslå konto
+AccountAccountingSuggest=Konto foreslået
 MenuDefaultAccounts=Standardkonti
 MenuBankAccounts=Bankkonti
 MenuVatAccounts=Momskonti
@@ -126,6 +127,7 @@ WriteBookKeeping=Registrer transaktioner i regnskabet
 Bookkeeping=Hovedbog
 BookkeepingSubAccount=Underkonti
 AccountBalance=Kontobalance
+AccountBalanceSubAccount=Underkonti balance
 ObjectsRef=Objektreference
 CAHTF=Samlet købeleverandør før skat
 TotalExpenseReport=Rapport for samlede udgifter
@@ -189,6 +191,7 @@ ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Konto (fra kontoplanen) skal bruges som stan
 UseAuxiliaryAccountOnCustomerDeposit=Gem kundekonto som individuel konto i hovedbog for linjer med forudbetalinger (hvis den er deaktiveret, forbliver individuel konto for forudbetalingslinjer tomme)
 ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Konto (fra kontoplanen), der skal bruges som standard
 UseAuxiliaryAccountOnSupplierDeposit=Gem leverandørkonto som individuel konto i hovedbog for linjer med forudbetalinger (hvis den er deaktiveret, vil individuel konto for forudbetalingslinjer forblive tom)
+ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY=Regnskabskonto som standard for at registrere kundebeholdt garanti
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Konto (fra kontoplanen), der skal bruges som standardkonto for de produkter, der er købt i samme land (bruges, hvis det ikke er defineret i produktarket)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Konto (fra kontoplanen), der skal bruges som standardkonto for produkter købt fra EF til et andet EF-land (bruges, hvis det ikke er defineret i produktarket)
@@ -218,6 +221,7 @@ JournalLabel=Journalmærke
 NumPiece=Partsnummer
 TransactionNumShort=Transaktionsnr.
 AccountingCategory=Brugerdefineret gruppe af konti
+AccountingCategories=Brugerdefinerede grupper af konti
 GroupByAccountAccounting=Gruppér efter hovedkontokonto
 GroupBySubAccountAccounting=Gruppér efter underkonti
 AccountingAccountGroupsDesc=Du kan definere her nogle grupper af regnskabskonto. De vil blive brugt til personlige regnskabsrapporter.
@@ -265,6 +269,7 @@ ShowSubtotalByGroup=Vis subtotal efter niveau
 
 Pcgtype=Kontoens gruppe
 PcgtypeDesc=Kontogruppe bruges som foruddefinerede 'filter' og 'gruppering' kriterier for nogle regnskabsrapporter. For eksempel bruges 'INKOMST' eller 'UDGIFT' som grupper til regnskabsmæssige regnskaber for produkter til at oprette omkostnings- / indkomstrapporten.
+AccountingCategoriesDesc=Brugerdefineret gruppe af konti kan bruges til at gruppere regnskabskonti i ét navn for at lette filterbrug eller opbygning af tilpassede rapporter.
 
 Reconcilable=Afstemning
 
@@ -294,6 +299,7 @@ DescValidateMovements=Enhver ændring eller sletning af skrivning, bogstaver og
 
 ValidateHistory=Automatisk Bogføring
 AutomaticBindingDone=Automatiske bindinger udført (%s) - Automatisk binding er ikke mulig for nogle poster (%s)
+DoManualBindingForFailedRecord=Du skal lave et manuelt link for %s række(r), der ikke linkes automatisk.
 
 ErrorAccountancyCodeIsAlreadyUse=Fejl, du kan ikke fjerne eller deaktivere denne kontoplan, fordi den er brugt
 MvtNotCorrectlyBalanced=Bevægelse ikke korrekt afbalanceret. Debet = %s & Kredit = %s
@@ -337,11 +343,13 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=Deaktiver binding og overførsel i regnskab
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Deaktiver binding og overførsel i regnskab ved køb (leverandørfakturaer tages ikke med i regnskabet)
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Deaktiver binding og overførsel i regnskab på udgiftsrapporter (udgiftsrapporter tages ikke med i regnskabet)
 ACCOUNTING_ENABLE_LETTERING=Aktiver bogstavfunktionen i regnskabet
+ACCOUNTING_ENABLE_AUTOLETTERING=Aktiver den automatiske bogstaver ved overførsel til regnskab
 
 ## Export
 NotExportLettering=Eksporter ikke bogstaverne, når du genererer filen
 NotifiedExportDate=Flag eksporterede linjer som eksporteret <span class="warning"> (for at ændre en linje skal du slette hele transaktionen og overføre den til regnskab igen) </span>
 NotifiedValidationDate=Valider og lås de eksporterede indgange <span class="warning"> (samme effekt som "%s"-funktionen, ændring og sletning af linjerne vil DEFINITIVT ikke være mulig) </span>
+NotifiedExportFull=Eksportere dokumenter?
 DateValidationAndLock=Datovalidering og lås
 ConfirmExportFile=Bekræftelse af genereringen af den regnskabsmæssige eksportfil?
 ExportDraftJournal=Eksporter udkast til kladde
@@ -398,7 +406,7 @@ SaleLocal=Lokalt salg
 SaleExport=Eksport salg
 SaleEEC=Salg i EU
 SaleEECWithVAT=Salg i EU med en moms, der ikke er null, så vi antager, at dette IKKE er et intrakommunalt salg, og den foreslåede konto er standardproduktskontoen.
-SaleEECWithoutVATNumber=Du kan fastsætte moms nummer for tredjepart eller produktkonto om nødvendigt.
+SaleEECWithoutVATNumber=Salg i EEC uden moms, men tredjemands moms-id er ikke defineret. Vi falder tilbage på kontoen for standardsalg. Du kan rette tredjepartens moms-id eller ændre den produktkonto, der er foreslået til binding, hvis det er nødvendigt.
 ForbiddenTransactionAlreadyExported=Forbudt: Transaktionen er blevet valideret og/eller eksporteret.
 ForbiddenTransactionAlreadyValidated=Forbudt: Transaktionen er blevet valideret.
 ## Dictionary
@@ -442,6 +450,7 @@ AccountancyErrorMismatchLetterCode=Uoverensstemmelse i afstemningskode
 AccountancyErrorMismatchBalanceAmount=Saldoen (%s) er ikke lig med 0
 AccountancyErrorLetteringBookkeeping=Der er opstået fejl vedrørende transaktionerne: %s
 ErrorAccountNumberAlreadyExists=Kontonummeret %s findes allerede
+ErrorArchiveAddFile=Kan ikke lægge "%s" fil i arkivet
 
 ## Import
 ImportAccountingEntries=Regnskabsposter
@@ -468,5 +477,7 @@ FECFormatMulticurrencyCode=MultiValuta-kode (Idevise)
 DateExport=Eksport dato
 WarningReportNotReliable=Advarsel, denne rapport er ikke baseret på Ledger, så indeholder ikke transaktion ændret manuelt i Ledger. Hvis din journalisering er opdateret, er bogføringsvisningen mere præcis.
 ExpenseReportJournal=Udgifts Journal
+DocsAlreadyExportedAreExcluded=Dokumenter, der allerede er eksporteret, er ekskluderet
+ClickToHideAlreadyExportedLines=Klik for at skjule allerede eksporterede linjer
 
 NAccounts=%s konti
diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang
index 84ede269564..390a3d10170 100644
--- a/htdocs/langs/da_DK/admin.lang
+++ b/htdocs/langs/da_DK/admin.lang
@@ -645,6 +645,8 @@ Module2300Name=Planlagte job
 Module2300Desc=Planlagt job styring (alias cron eller chrono tabel)
 Module2400Name=Begivenheder/tidsplan
 Module2400Desc=Spor begivenheder. Log automatiske begivenheder til sporingsformål eller optag manuelle begivenheder eller møder. Dette er hovedmodulet for god kunde- eller leverandør-relationsstyring.
+Module2430Name=Bestillingskalendersystem
+Module2430Desc=Giv en onlinekalender, så alle kan booke et møde, i henhold til foruddefinerede intervaller eller tilgængeligheder.
 Module2500Name=DMS / ECM
 Module2500Desc=Dokumentstyringssystem / Elektronisk indholdsstyring. Automatisk organisering af dine genererede eller gemte dokumenter. Del dem, når du har behov for det.
 Module2600Name=API / webtjenester (SOAP-server)
@@ -660,6 +662,8 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind konverteringsmuligheder
 Module3200Name=Uforanderlige arkiver
 Module3200Desc=Aktiver en uforanderlig log over forretningsbegivenheder. Begivenheder arkiveres i realtid. Loggen er en skrivebeskyttet tabel over kædede hændelser, der kan eksporteres. Dette modul er obligatorisk i nogle lande.
+Module3300Name=Modulbygger
+Module3200Desc=Aktiver en uforanderlig log over forretningsbegivenheder. Begivenheder arkiveres i realtid. Loggen er en skrivebeskyttet tabel over kædede hændelser, der kan eksporteres. Dette modul er obligatorisk i nogle lande.
 Module3400Name=Sociale netværk
 Module3400Desc=Aktiver sociale netværksfelter til tredjeparter og adresser (Skype, Twitter, Facebook, ...).
 Module4000Name=Personaleadministration
@@ -1270,6 +1274,7 @@ TriggerActiveAsModuleActive=Udløsere i denne fil er aktive, da modulet <b>%s</b
 GeneratedPasswordDesc=Vælg den metode, der skal bruges til automatisk genererede adgangskoder.
 DictionaryDesc=Indsæt alle referencedata. Du kan tilføje dine værdier til standarden.
 ConstDesc=Denne side giver dig mulighed for at redigere (tilsidesætte) parametre, der ikke er tilgængelige på andre sider. Disse er for det meste reserverede parametre kun til udviklere/avanceret fejlfinding.
+MiscellaneousOptions=Forskellige muligheder
 MiscellaneousDesc=Alle andre sikkerhedsrelaterede parametre er defineret her.
 LimitsSetup=Begrænsninger/Nøjagtigheds opsætning
 LimitsDesc=Du kan definere grænser, nøjagtighed og optimeringer brugen af Dolibarr her
@@ -1826,6 +1831,9 @@ AGENDA_USE_EVENT_TYPE=Brug begivenhedstyper (administreret i menuen Opsætning -
 AGENDA_USE_EVENT_TYPE_DEFAULT=Indstil automatisk denne standardværdi for begivenhedstype i begivenhedsoprettelsesformularen
 AGENDA_DEFAULT_FILTER_TYPE=Indstil automatisk denne type begivenhed i søgefilteret i dagsordensvisningen
 AGENDA_DEFAULT_FILTER_STATUS=Indstil automatisk denne status for begivenheder i søgefilteret i dagsordensvisningen
+AGENDA_EVENT_PAST_COLOR=Farve på tidligere begivenheder
+AGENDA_EVENT_CURRENT_COLOR=Aktuel begivenhedsfarve
+AGENDA_EVENT_FUTURE_COLOR=Fremtidig begivenhed farve
 AGENDA_DEFAULT_VIEW=Hvilken visning vil du som standard åbne, når du vælger menu Tidsplan
 AGENDA_REMINDER_BROWSER=Aktiver hændelsespåmindelse <b>på brugerens browser</b> (Når påmindelsesdatoen er nået, vises en pop op af browseren. Hver bruger kan deaktivere sådanne meddelelser fra sin browsermeddelelsesopsætning).
 AGENDA_REMINDER_BROWSER_SOUND=Aktiver lydmeddelelse
@@ -2129,6 +2137,7 @@ CodeLastResult=Seneste resultatkode
 NbOfEmailsInInbox=Antal e-mails i kildekataloget
 LoadThirdPartyFromName=Indlæs tredjepartssøgning på %s (kun indlæsning)
 LoadThirdPartyFromNameOrCreate=Indlæs tredjepartssøgning på %s (opret, hvis den ikke findes)
+LoadContactFromEmailOrCreate=Indlæs kontaktsøgning på %s (opret, hvis den ikke findes)
 AttachJoinedDocumentsToObject=Gem vedhæftede filer i objektdokumenter, hvis der findes en ref af et objekt i e-mail emnet.
 WithDolTrackingID=Besked fra en samtale initieret af en første e-mail sendt fra Dolibarr
 WithoutDolTrackingID=Besked fra en samtale initieret af en første e-mail IKKE sendt fra Dolibarr
@@ -2355,3 +2364,5 @@ AllowExternalDownload=Tillad ekstern download (uden login, ved hjælp af et delt
 DeadlineDayVATSubmission=Deadline dag for momsindsendelse den næste måned
 MaxNumberOfAttachementOnForms=Maks. antal sammenføjede filer i en formular
 IfDefinedUseAValueBeetween=Hvis det er defineret, skal du bruge en værdi mellem %s og %s
+Reload=Genindlæs
+ConfirmReload=Bekræft modulgenindlæsning
diff --git a/htdocs/langs/da_DK/boxes.lang b/htdocs/langs/da_DK/boxes.lang
index d2ca38da8a4..8bdaee3825d 100644
--- a/htdocs/langs/da_DK/boxes.lang
+++ b/htdocs/langs/da_DK/boxes.lang
@@ -24,6 +24,7 @@ BoxFicheInter=Latest interventions
 BoxCurrentAccounts=Open accounts balance
 BoxTitleMemberNextBirthdays=Fødselsdage i denne måned (medlemmer)
 BoxTitleMembersByType=Medlemmer efter type og status
+BoxTitleMembersByTags=Medlemmer efter tags og status
 BoxTitleMembersSubscriptionsByYear=Medlemmer Abonnementer efter år
 BoxTitleLastRssInfos=Latest %s news from %s
 BoxTitleLastProducts=Produkter / tjenester: sidst %s ændret
diff --git a/htdocs/langs/da_DK/companies.lang b/htdocs/langs/da_DK/companies.lang
index eaa7b8ee001..cf3f69cbe95 100644
--- a/htdocs/langs/da_DK/companies.lang
+++ b/htdocs/langs/da_DK/companies.lang
@@ -312,8 +312,8 @@ CustomerRelativeDiscountShort=Relativ rabat
 CustomerAbsoluteDiscountShort=Absolut rabat
 CompanyHasRelativeDiscount=Denne kunde har en standardrabat på <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Denne kunde har som standard ingen rabat
-HasRelativeDiscountFromSupplier=Du har en standardrabat på <b>%s%%</b> fra denne leverandør
-HasNoRelativeDiscountFromSupplier=Ingen standard relativ rabat fra denne leverandør
+HasRelativeDiscountFromSupplier=Du har en standardrabat på <b> %s%% </b> hos denne leverandør
+HasNoRelativeDiscountFromSupplier=Ingen standard relativ rabat hos denne leverandør
 CompanyHasAbsoluteDiscount=Denne kunde har tilgodehavender (kreditnotaer eller forudbetalinger) for <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=Denne kunde har tilgængelige rabatter (kommercielle, forudbetalinger) for <b>%s</b> %s
 CompanyHasCreditNote=Denne kunde har stadig kreditnotaer for <b>%s</b> %s
@@ -499,4 +499,7 @@ OutOfEurope=Uden for Europa (EØF)
 CurrentOutstandingBillLate=Aktuel udestående regninger i restance
 BecarefullChangeThirdpartyBeforeAddProductToInvoice=Vær forsigtig, afhængigt af dine produkt prisindstillinger bør du ændre tredjepart, før du tilføjer produkt til POS.
 EmailAlreadyExistsPleaseRewriteYourCompanyName=e-mail eksisterer allerede, skriv venligst dit firmanavn
-TwoRecordsOfCompanyName=der findes mere end én registrering for denne virksomhed, kontakt os venligst for at fuldføre din partnerskabsanmodning"
+TwoRecordsOfCompanyName=der findes mere end én registrering for denne virksomhed, kontakt os venligst for at fuldføre din partnerskabsanmodning
+CompanySection=Virksomhedssektion
+ShowSocialNetworks=Vis sociale netværk
+HideSocialNetworks=Skjul sociale netværk
diff --git a/htdocs/langs/da_DK/errors.lang b/htdocs/langs/da_DK/errors.lang
index 10c3d0f830b..94d7ff0f677 100644
--- a/htdocs/langs/da_DK/errors.lang
+++ b/htdocs/langs/da_DK/errors.lang
@@ -303,6 +303,7 @@ ErrorValueForTooLow=Værdien for <b> %s </b> er for lav
 ErrorValueCantBeNull=Værdien for <b> %s </b> kan ikke være 0
 ErrorDateOfMovementLowerThanDateOfFileTransmission=Datoen for banktransaktionen må ikke være lavere end datoen for filoverførslen
 ErrorTooMuchFileInForm=For mange filer i form, det maksimale antal er %s fil(er)
+ErrorSessionInvalidatedAfterPasswordChange=Sessionen blev ugyldiggjort efter en ændring af adgangskode, status eller gyldighedsdatoer. Log venligst på igen.
 
 # 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.
@@ -325,6 +326,7 @@ WarningPaymentDateLowerThanInvoiceDate=Betalingsdato (%s) er tidligere end faktu
 WarningTooManyDataPleaseUseMoreFilters=For mange data (mere end %s linjer). Brug venligst flere filtre eller indstil konstanten %s til en højere grænse.
 WarningSomeLinesWithNullHourlyRate=Nogle tidspunkter blev registreret af nogle brugere, mens deres timepris ikke var defineret. Der blev brugt en værdi på 0 %s pr. time, men dette kan resultere i forkert værdiansættelse af brugt tid.
 WarningYourLoginWasModifiedPleaseLogin=Dit login blev ændret. Af sikkerhedsmæssige årsager skal du logge ind med dit nye login før næste handling.
+WarningYourPasswordWasModifiedPleaseLogin=Din adgangskode blev ændret. Af sikkerhedsmæssige årsager skal du logge ind nu med din nye adgangskode.
 WarningAnEntryAlreadyExistForTransKey=Der findes allerede en post for oversættelsesnøglen for dette sprog
 WarningNumberOfRecipientIsRestrictedInMassAction=Advarsel, antallet af forskellige modtagere er begrænset til <b> %s</b>, når du bruger massehandlingerne på lister
 WarningDateOfLineMustBeInExpenseReportRange=Advarsel, datoen for linjen ligger ikke inden for udgiftsrapporten
diff --git a/htdocs/langs/da_DK/eventorganization.lang b/htdocs/langs/da_DK/eventorganization.lang
index 49d5ec90885..d6a594121db 100644
--- a/htdocs/langs/da_DK/eventorganization.lang
+++ b/htdocs/langs/da_DK/eventorganization.lang
@@ -172,3 +172,5 @@ ErrorSeveralCompaniesWithEmailContactUs=Flere virksomheder med denne e -mail er
 ErrorSeveralCompaniesWithNameContactUs=Flere virksomheder med dette navn er fundet, så vi kan ikke automatisk validere din registrering. Kontakt os venligst på %s for en manuel validering
 NoPublicActionsAllowedForThisEvent=Ingen offentlige handlinger er åbne for offentligheden for denne begivenhed
 MaxNbOfAttendees=Max antal deltagere
+DateStartEvent=Begivenhedens startdato
+DateEndEvent=Begivenheds slutdato
diff --git a/htdocs/langs/da_DK/main.lang b/htdocs/langs/da_DK/main.lang
index 6037eaed8ec..98efad1705a 100644
--- a/htdocs/langs/da_DK/main.lang
+++ b/htdocs/langs/da_DK/main.lang
@@ -226,6 +226,7 @@ NoUserGroupDefined=Ingen brugergruppe defineret
 Password=Adgangskode
 PasswordRetype=Gentag din adgangskode
 NoteSomeFeaturesAreDisabled=Bemærk, at mange funktioner/moduler er deaktiveret i denne demonstration.
+YourUserFile=Din brugerfil
 Name=Navn
 NameSlashCompany=Navn/virksomhed
 Person=Person
@@ -897,6 +898,9 @@ MassFilesArea=Område for filer opbygget af massehandlinger
 ShowTempMassFilesArea=Vis område af filer bygget af massehandlinger
 ConfirmMassDeletion=Bekræftelse på massesletning
 ConfirmMassDeletionQuestion=Er du sikker på, at du vil slette den/de valgt/valgte %s post(er)?
+ConfirmMassClone=Bulk klon bekræftelse
+ConfirmMassCloneQuestion=Vælg det projekt, der skal klones til
+ConfirmMassCloneToOneProject=Klon for at projektere %s
 RelatedObjects=Relaterede objekter
 ClassifyBilled=Klassificere faktureret
 ClassifyUnbilled=Klassificer Ikke faktureret
@@ -912,8 +916,8 @@ ExportFilteredList=Eksporter filtreret liste
 ExportList=Eksportliste
 ExportOptions=Eksport indstillinger
 IncludeDocsAlreadyExported=Inkluder dokumenter, der allerede er eksporteret
-ExportOfPiecesAlreadyExportedIsEnable=Eksport af allerede eksporterede stykker er aktiveret
-ExportOfPiecesAlreadyExportedIsDisable=Eksport af allerede eksporterede stykker er deaktiveret
+ExportOfPiecesAlreadyExportedIsEnable=Dokumenter, der allerede er eksporteret, er synlige og vil blive eksporteret
+ExportOfPiecesAlreadyExportedIsDisable=Dokumenter, der allerede er eksporteret, er skjulte og vil ikke blive eksporteret
 AllExportedMovementsWereRecordedAsExported=Alle eksporterede bevægelser blev registreret som eksporteret
 NotAllExportedMovementsCouldBeRecordedAsExported=Ikke alle eksporterede bevægelser kunne registreres som eksporteret
 Miscellaneous=Diverse
@@ -1128,6 +1132,7 @@ DeleteFileText=Vil du virkelig slette denne fil?
 ShowOtherLanguages=Vis andre sprog
 SwitchInEditModeToAddTranslation=Skift i redigeringsfunktion for at tilføje oversættelser til dette sprog
 NotUsedForThisCustomer=Ikke brugt til denne kunde
+NotUsedForThisVendor=Ikke brugt til denne leverandør
 AmountMustBePositive=Beløbet skal være positivt
 ByStatus=Efter status
 InformationMessage=Information
@@ -1148,14 +1153,14 @@ EventReminder=Påmindelse om begivenhed
 UpdateForAllLines=Opdatering til alle linjer
 OnHold=Afventer
 Civility=Høflighed
-AffectTag=Tildel tag
-AffectUser=Tildel bruger
-SetSupervisor=Sæt Supervisor
+AffectTag=Tildel et tag
+AffectUser=Tildel en bruger
+SetSupervisor=Indstil vejlederen
 CreateExternalUser=Opret ekstern bruger
 ConfirmAffectTag=Bulk Tag Tildeling
 ConfirmAffectUser=Massebrugertildeling
-ProjectRole=Rolle tildelt på hvert projekt
-TasksRole=Rolle tildelt på hver opgave i hvert projekt
+ProjectRole=Rolle tildelt på hvert projekt/mulighed
+TasksRole=Rolle tildelt hver opgave (hvis brugt)
 ConfirmSetSupervisor=Bulk supervisor sæt
 ConfirmUpdatePrice=Vælg en stigning/reduktionspris
 ConfirmAffectTagQuestion=Er du sikker på, at du vil tildele tags til de(n) valgte post(er) %s?
@@ -1210,3 +1215,10 @@ CreatedByPublicPortal=Oprettet fra offentlig portal
 UserAgent=Brugeragent
 InternalUser=Intern bruger
 ExternalUser=Ekstern bruger
+NoSpecificContactAddress=Ingen specifik kontakt eller adresse
+NoSpecificContactAddressBis=Denne fane er dedikeret til at tvinge specifikke kontakter eller adresser til det aktuelle objekt. Brug det kun, hvis du ønsker at definere en eller flere specifikke kontakter eller adresser for objektet, når oplysningerne om tredjeparten ikke er tilstrækkelige eller ikke nøjagtige.
+HideOnVCard=Skjul %s
+AddToContacts=Tilføj adresse til mine kontakter
+LastAccess=Sidste adgang
+UploadAnImageToSeeAPhotoHere=Upload et billede fra fanen %s for at se et billede her
+LastPasswordChangeDate=Dato for sidste ændring af adgangskode
diff --git a/htdocs/langs/da_DK/mrp.lang b/htdocs/langs/da_DK/mrp.lang
index e47bec20cb1..22b926c5ef5 100644
--- a/htdocs/langs/da_DK/mrp.lang
+++ b/htdocs/langs/da_DK/mrp.lang
@@ -102,6 +102,7 @@ NbOperatorsRequired=Antal krævede operatører
 THMOperatorEstimated=Anslået operatør THM
 THMMachineEstimated=Anslået maskine THM
 WorkstationType=Arbejdsstationstype
+DefaultWorkstation=Standard arbejdsstation
 Human=Person
 Machine=Maskine
 HumanMachine=Person / maskine
diff --git a/htdocs/langs/da_DK/orders.lang b/htdocs/langs/da_DK/orders.lang
index f726c1b6bab..b75a3272702 100644
--- a/htdocs/langs/da_DK/orders.lang
+++ b/htdocs/langs/da_DK/orders.lang
@@ -96,6 +96,10 @@ OrdersStatisticsSuppliers=Indkøbsordrestatistik
 NumberOfOrdersByMonth=Antallet af ordrer efter måned
 AmountOfOrdersByMonthHT=Mængden af ordrer efter måned (ekskl. Moms)
 ListOfOrders=Liste af ordrer
+ListOrderLigne=Ordrerækker
+productobuy=Kun produkter til køb
+productonly=Kun produkter
+disablelinefree=Ingen linjer fri
 CloseOrder=Luk for
 ConfirmCloseOrder=Er du sikker på, at du vil indstille denne ordre til levering? Når en ordre er leveret, kan den indstilles til fakturering.
 ConfirmDeleteOrder=Er du sikker på, at du vil slette denne ordre?
@@ -131,6 +135,7 @@ SupplierOrderClassifiedBilled=Indkøbsordre %s er faktureret
 OtherOrders=Andre ordrer
 SupplierOrderValidatedAndApproved=Leverandørordre er valideret og godkendt: %s
 SupplierOrderValidated=Leverandørordre er valideret: %s
+OrderShowDetail=Vis ordredetaljer
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Repræsentative opfølgning salgsordre
 TypeContact_commande_internal_SHIPPING=Repræsentant opfølgning shipping
@@ -199,3 +204,5 @@ StatusSupplierOrderApproved=Godkendt
 StatusSupplierOrderRefused=Afvist
 StatusSupplierOrderReceivedPartially=Delvist modtaget
 StatusSupplierOrderReceivedAll=Alle varer modtaget
+NeedAtLeastOneInvoice = Der skal være mindst én faktura
+LineAlreadyDispatched = Ordrelinjen er allerede modtaget.
diff --git a/htdocs/langs/da_DK/projects.lang b/htdocs/langs/da_DK/projects.lang
index e040819d02c..8fd681ffc10 100644
--- a/htdocs/langs/da_DK/projects.lang
+++ b/htdocs/langs/da_DK/projects.lang
@@ -259,6 +259,7 @@ RecordsClosed=%s projekt (er) lukket
 SendProjectRef=Informationsprojekt %s
 ModuleSalaryToDefineHourlyRateMustBeEnabled=Modul 'lønninger' skal være aktiveret for at definere medarbejderens timepris for at få brugt tid valideret
 NewTaskRefSuggested=Task ref allerede brugt, en ny task ref kræves
+NumberOfTasksCloned=%s opgave(r) klonet
 TimeSpentInvoiced=Faktureret tid
 TimeSpentForIntervention=Tid brugt
 TimeSpentForInvoice=Tid brugt
diff --git a/htdocs/langs/da_DK/stripe.lang b/htdocs/langs/da_DK/stripe.lang
index 2caa038cc39..173725802f8 100644
--- a/htdocs/langs/da_DK/stripe.lang
+++ b/htdocs/langs/da_DK/stripe.lang
@@ -41,7 +41,8 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook-livenøgle
 ONLINE_PAYMENT_WAREHOUSE=Lager til brug for lagerreduktion, når online betaling er færdig <br> (TODO Når valgmuligheden for at reducere lagerbeholdningen sker på en handling på faktura, og online betaling genererer selve fakturaen?)
 StripeLiveEnabled=Stripe live aktiveret (ellers test / sandbox mode)
 StripeImportPayment=Import Stripe betalinger
-ExampleOfTestCreditCard=Eksempel på kreditkort til test:%s => gyldigt,%s => fejl CVC,%s => udløbet, %s=> gebyr mislykkes
+ExampleOfTestCreditCard=Eksempel på kreditkort til SEPA-test: %s => gyldig, %s => fejl CVC, %s => udløbet, %s => opladning mislykkes
+ExampleOfTestBankAcountForSEPA=Eksempel på bankkonto BAN til test af direkte debitering: %s
 StripeGateways=Stripe gateways
 OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca. _...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca. _...)
@@ -61,6 +62,7 @@ DeleteACard=Slet kort
 ConfirmDeleteCard=Er du sikker på, at du vil slette dette kredit- eller betalingskort?
 CreateCustomerOnStripe=Opret kunde på Stripe
 CreateCardOnStripe=Opret kort på Stripe
+CreateBANOnStripe=Opret bank på Stripe
 ShowInStripe=Vis i Stripe
 StripeUserAccountForActions=Brugerkonto, der skal bruges til e-mail-meddelelse om nogle Stripe begivenheder (Stripe udbetalinger)
 StripePayoutList=Liste over Stripe udbetalinger
@@ -69,4 +71,8 @@ ToOfferALinkForLiveWebhook=Link til opsætning Stripe WebHook for at ringe til I
 PaymentWillBeRecordedForNextPeriod=Betaling registreres for den næste periode.
 ClickHereToTryAgain=<a href="%s">Klik her for at prøve igen ...</a>
 CreationOfPaymentModeMustBeDoneFromStripeInterface=På grund af stærke kunde autentificerings regler skal oprettelse af et kort foretages fra Stripe backoffice. Du kan klikke her for at tænde for Stripe-kundepost:%s
-TERMINAL_LOCATION=Placering (adresse) for terminaler
+STRIPE_CARD_PRESENT=Kort til stede til Stripe-terminaler
+TERMINAL_LOCATION=Placering (adresse) for Stripe Terminals
+RequestDirectDebitWithStripe=Anmod om direkte debitering med Stripe
+STRIPE_SEPA_DIRECT_DEBIT=Aktiver direkte debitering via Stripe
+
diff --git a/htdocs/langs/da_DK/ticket.lang b/htdocs/langs/da_DK/ticket.lang
index bbeb209fc8a..14f5fcde62b 100644
--- a/htdocs/langs/da_DK/ticket.lang
+++ b/htdocs/langs/da_DK/ticket.lang
@@ -26,6 +26,7 @@ Permission56002=Ændre sager
 Permission56003=Slet sager
 Permission56004=Administrer sager
 Permission56005=Se sager fra alle tredjepart (ikke effektiv for eksterne brugere, vær altid begrænset til den tredjepart, de er afhængige af)
+Permission56006=Eksportér billetter
 
 Tickets=Sager
 TicketDictType=Sag - Typer
@@ -61,6 +62,8 @@ TypeContact_ticket_external_CONTRIBUTOR=Ekstern bidragyder
 OriginEmail=Sagsopretter e-mail
 Notify_TICKET_SENTBYMAIL=Send sagsbesked via e-mail
 
+ExportDataset_ticket_1=Sager
+
 # Status
 Read=Læs
 Assigned=Tildelt
diff --git a/htdocs/langs/da_DK/users.lang b/htdocs/langs/da_DK/users.lang
index 4f91274ef1a..48076bd127a 100644
--- a/htdocs/langs/da_DK/users.lang
+++ b/htdocs/langs/da_DK/users.lang
@@ -66,7 +66,8 @@ LinkedToDolibarrUser=Link til bruger
 LinkedToDolibarrThirdParty=Link til tredjepart
 CreateDolibarrLogin=Opret Dolibarr konto
 CreateDolibarrThirdParty=Opret en tredjepart
-LoginAccountDisableInDolibarr=Konto deaktiveret i Dolibarr.
+LoginAccountDisableInDolibarr=Konto deaktiveret i Dolibarr
+PASSWORDInDolibarr=Adgangskode ændret i Dolibarr
 UsePersonalValue=Brug personlige værdi
 ExportDataset_user_1=Brugere og deres egenskaber
 DomainUser=Domænebruger %s
@@ -129,3 +130,6 @@ IPLastLogin=IP sidste login
 IPPreviousLogin=IP tidligere login
 ShowAllPerms=Vis alle tilladelsesrækker
 HideAllPerms=Skjul alle tilladelsesrækker
+UserPublicPageDesc=Du kan aktivere et virtuelt kort for denne bruger. En url med brugerprofilen og en stregkode vil være tilgængelig, så alle med en smartphone kan scanne den og tilføje din kontakt til dens adressebog.
+EnablePublicVirtualCard=Aktiver det offentlige virtuelle brugerkort
+PublicVirtualCardUrl=Offentligt virtuelt brugerkort
diff --git a/htdocs/langs/da_DK/website.lang b/htdocs/langs/da_DK/website.lang
index 311b985d372..40a033d367d 100644
--- a/htdocs/langs/da_DK/website.lang
+++ b/htdocs/langs/da_DK/website.lang
@@ -155,3 +155,5 @@ WebpageMustBeDisabled=Websiden skal have status "%s"
 SetWebsiteOnlineBefore=Når hjemmesiden er offline, er alle sider offline. Skift status på webstedet først.
 Booking=Booking
 Reservation=Reservation
+PagesViewedPreviousMonth=Viste sider (forrige måned)
+PagesViewedTotal=Viste sider (i alt)
diff --git a/htdocs/langs/de_AT/stripe.lang b/htdocs/langs/de_AT/stripe.lang
new file mode 100644
index 00000000000..ae44362fd94
--- /dev/null
+++ b/htdocs/langs/de_AT/stripe.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - stripe
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+TERMINAL_LOCATION=Location (address) for Stripe Terminals
diff --git a/htdocs/langs/de_CH/accountancy.lang b/htdocs/langs/de_CH/accountancy.lang
index e5e638185a8..3ccdcb82ebe 100644
--- a/htdocs/langs/de_CH/accountancy.lang
+++ b/htdocs/langs/de_CH/accountancy.lang
@@ -10,8 +10,6 @@ Selectformat=Wähle das Dateiformat
 ACCOUNTING_EXPORT_FORMAT=Wähle das Dateiformat
 ACCOUNTING_EXPORT_ENDLINE=Wähle das Steuerzeichen für den Wagenrücklauf (Carriage Return CR)
 ACCOUNTING_EXPORT_PREFIX_SPEC=Wähle dein Präfix für den Dateinamen
-DefaultForService=Standard für Leistungen
-DefaultForProduct=Standard für Produkte
 ServiceForThisThirdparty=Dienstleistung für diesen Geschäftspartner
 CantSuggest=Ich habe keinen Vorschlag
 AccountancySetupDoneFromAccountancyMenu=Die meisten Einstellungen der Buchhaltung setzt du im Menu %s
@@ -75,7 +73,6 @@ 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
 MenuExpenseReportAccounts=Spesenabrechnungskonten
 MenuProductsAccounts=Produktkonten
@@ -136,6 +133,8 @@ LetteringCode=Beschriftung
 Lettering=Beschriftung
 JournalLabel=Journalbezeichnung
 TransactionNumShort=Transaktionsnummer
+AccountingCategory=Custom group of accounts
+AccountingCategories=Custom groups of accounts
 GroupByAccountAccounting=Nach Hauptbuchkonto gruppieren
 GroupBySubAccountAccounting=Nach Nebenbuchkonto gruppieren
 AccountingAccountGroupsDesc=Trage hier deine eigenen Buchhaltungs - Kontogruppen ein. Daraus kannst du spezielle Berichte erzeugen.
diff --git a/htdocs/langs/de_CH/companies.lang b/htdocs/langs/de_CH/companies.lang
index 1869e91605d..074c9fb606a 100644
--- a/htdocs/langs/de_CH/companies.lang
+++ b/htdocs/langs/de_CH/companies.lang
@@ -14,7 +14,6 @@ ThirdPartyContact=Geschäftspartner-Kontakt
 Companies=Unternehmen
 CountryIsInEEC=EU - Staat
 PriceFormatInCurrentLanguage=Währungsanzeige dieser Sprache
-ThirdPartyName=Name des Geschäftspartners
 ThirdPartyEmail=E-Mail des Geschäftspartners
 ThirdPartyProspectsStats=Interessenten Statistik
 ThirdPartyType=Typ des Geschäftspartners
diff --git a/htdocs/langs/de_CH/main.lang b/htdocs/langs/de_CH/main.lang
index df9de7000cd..8b888ed2bfa 100644
--- a/htdocs/langs/de_CH/main.lang
+++ b/htdocs/langs/de_CH/main.lang
@@ -83,6 +83,7 @@ Close=Schliessen
 CloseBox=Box vom Startbildschirm entfernen
 ConfirmSendCardByMail=Willst du diese Karte wirklich an <b>%s</b> mailen?
 Resiliate=Abschliessen
+Cancel=Abbrechen
 Validate=Bestätigen
 ValidateAndApprove=Freigeben und bestätigen
 NotValidated=Nicht validiert
@@ -309,8 +310,6 @@ BackOffice=Dolibarr
 ExportFilteredList=Exportiere gefilterte Positionen
 ExportList=Exportiere Positionen
 IncludeDocsAlreadyExported=Beziehe bereits exportierte Dokumente mit ein
-ExportOfPiecesAlreadyExportedIsEnable=Bereits exportierte Dateien erneut exportieren ist "Ein".
-ExportOfPiecesAlreadyExportedIsDisable=Bereits exportierte Dateien erneut exportieren ist "Aus".
 AllExportedMovementsWereRecordedAsExported=Alles erfolgreich exportiert:-)
 NotAllExportedMovementsCouldBeRecordedAsExported=Nicht alles konnte korrekt exportiert werden:-(
 Calendar=Kalender
@@ -385,4 +384,9 @@ CustomReports=Eigene Berichte
 StatisticsOn=Statistiken zu
 SelectYourGraphOptionsFirst=Wähle den Diagrammtyp
 Measures=Masseinheiten
+AffectTag=Assign a Tag
+AffectUser=Assign a User
+SetSupervisor=Set the supervisor
+ProjectRole=Role assigned on each project/opportunity
+TasksRole=Role assigned on each task (if used)
 Terminate=Abschliessen
diff --git a/htdocs/langs/de_CH/stripe.lang b/htdocs/langs/de_CH/stripe.lang
new file mode 100644
index 00000000000..ae44362fd94
--- /dev/null
+++ b/htdocs/langs/de_CH/stripe.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - stripe
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+TERMINAL_LOCATION=Location (address) for Stripe Terminals
diff --git a/htdocs/langs/de_CH/users.lang b/htdocs/langs/de_CH/users.lang
index c7c14ca597b..b5a0fd13dcb 100644
--- a/htdocs/langs/de_CH/users.lang
+++ b/htdocs/langs/de_CH/users.lang
@@ -32,6 +32,7 @@ ConfirmCreateThirdParty=Willst du wirklich für dieses Mitglied einen Partner er
 LoginToCreate=Zu erstellende Anmeldung
 NameToCreate=Name des neuen Geschäftspartners
 YourRole=Ihre Rolle
+HierarchicalResponsible=Vorgesetzter
 UseTypeFieldToChange=Nutzen sie das Feld "Typ" zum ändern
 WeeklyHours=Geleistete Stunden pro Woche
 DisabledInMonoUserMode=Im Wartungsmodus deaktiviert
diff --git a/htdocs/langs/de_DE/accountancy.lang b/htdocs/langs/de_DE/accountancy.lang
index b2565f04044..521161d3f8f 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 Beschriftung
+ACCOUNTING_EXPORT_LABEL=Exportiere Bezeichnung
 ACCOUNTING_EXPORT_AMOUNT=Exportiere Betrag
 ACCOUNTING_EXPORT_DEVISE=Exportiere Währung
 Selectformat=Wählen Sie das Format für die Datei
@@ -14,8 +14,8 @@ ACCOUNTING_EXPORT_ENDLINE=Art des Zeilenumbruchs wählen
 ACCOUNTING_EXPORT_PREFIX_SPEC=Präfix für den Dateinamen angeben
 ThisService=Diese Leistung
 ThisProduct=Dieses Produkt
-DefaultForService=Standard für Leistung
-DefaultForProduct=Standard für Produkt
+DefaultForService=Standard für Leistungen 
+DefaultForProduct=Standard für Produkte
 ProductForThisThirdparty=Produkt für diesen Geschäftspartner
 ServiceForThisThirdparty=Leistungen für diesen Geschäftspartner
 CantSuggest=Kann keines vorschlagen
@@ -101,6 +101,7 @@ ShowAccountingAccount=Buchungskonto anzeigen
 ShowAccountingJournal=Buchhaltungsjournal anzeigen
 ShowAccountingAccountInLedger=Buchungskonto im Hauptbuch anzeigen
 ShowAccountingAccountInJournals=Buchungskonto in Journalen anzeigen
+DataUsedToSuggestAccount=Daten, die verwendet werden, um ein Buchungskonto vorzuschlagen
 AccountAccountingSuggest=Vorgeschlagenes Buchungskonto
 MenuDefaultAccounts=Standardkonten
 MenuBankAccounts=Bankkonten
@@ -126,6 +127,7 @@ WriteBookKeeping=Transaktionen in der Buchhaltung erfassen
 Bookkeeping=Hauptbuch
 BookkeepingSubAccount=Nebenbuch
 AccountBalance=Summen und Salden
+AccountBalanceSubAccount=Saldo der Unterkonten
 ObjectsRef=Quellreferenz
 CAHTF=Gesamtbetrag Lieferant vor Steuern
 TotalExpenseReport=Gesamtausgaben Spesenabrechnung
@@ -189,6 +191,7 @@ ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Konto (aus dem Kontenplan), das als Standard
 UseAuxiliaryAccountOnCustomerDeposit=Debitorenkonto als Einzelkonto im Nebenbuch für Anzahlungspositionen hinterlegen (bei Deaktivierung bleibt Einzelkonto für Anzahlungspositionen leer)
 ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Konto (aus dem Kontenplan), das als Standard verwendet werden soll
 UseAuxiliaryAccountOnSupplierDeposit=Lieferantenkonto als Einzelkonto im Nebenbuch für Anzahlungsbuchungen speichern (falls deaktiviert, bleibt Einzelkonto für Anzahlungsbuchungen leer)
+ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY=Standard-Buchungskonto zur Erfassung der vom Kunden einbehaltenen Garantie
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Konto (aus dem Kontenplan), das als Standardkonto für die im selben Land gekauften Produkte verwendet werden soll (wird verwendet, wenn nicht im Produktblatt definiert)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Konto (aus dem Kontenplan), das als Standardkonto für in der EWG aus einem anderen EWG-Land gekauften Produkte verwendet werden soll (wird verwendet, wenn nicht im Produktblatt definiert)
@@ -217,7 +220,8 @@ Codejournal=Journal
 JournalLabel=Journal-Bezeichnung
 NumPiece=Teilenummer
 TransactionNumShort=Buchungsnr.
-AccountingCategory=Custom group of accounts
+AccountingCategory=Benutzerdefinierte Kontengruppe
+AccountingCategories=Benutzerdefinierte Kontengruppe
 GroupByAccountAccounting=Gruppieren nach Hauptbuchkonto
 GroupBySubAccountAccounting=Gruppieren nach Nebenbuchkonto
 AccountingAccountGroupsDesc=Hier können Kontengruppen definiert werden. Diese werden für personaliserte Buchhaltungsreports verwendet.
@@ -265,6 +269,7 @@ ShowSubtotalByGroup=Zwischensumme nach Ebene anzeigen
 
 Pcgtype=Kontenklasse
 PcgtypeDesc=Kontengruppen werden für einige Buchhaltungsberichte als vordefinierte Filter- und Gruppierungskriterien verwendet. Beispielsweise werden "Aufwand" oder "Ertrag" als Gruppen für die Buchungskonten von Produkten genutzt, um die Ausgaben-/Einnahmenrechnung zu erstellen.
+AccountingCategoriesDesc=Benutzerdefinierte Kontengruppen können verwendet werden, um mehrere Buchhaltungskonten unter einem Namen zu gruppieren, um die Verwendung von Filtern oder das Erstellen von benutzerdefinierten Berichten zu vereinfachen.
 
 Reconcilable=ausgleichsfähig
 
@@ -294,6 +299,7 @@ DescValidateMovements=Es sind danach keinerlei Änderungen oder Löschungen mehr
 
 ValidateHistory=Automatisch kontieren
 AutomaticBindingDone=Automatische Zuordnungen durchgeführt (%s) - Automatische Zuordnung für einige Datensätze nicht möglich (%s)
+DoManualBindingForFailedRecord=Sie müssen eine manuelle Verknüpfung für die %s-Zeile(n) vornehmen, die nicht automatisch verknüpft wurden.
 
 ErrorAccountancyCodeIsAlreadyUse=Fehler, Sie können dieses Buchungskonto nicht löschen, da es benutzt wird.
 MvtNotCorrectlyBalanced=Buchungssalden nicht ausgeglichen. Soll = %s & Haben = %s
@@ -337,11 +343,13 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=Deaktivieren Sie die Bindung und Übertragun
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Deaktivieren Sie die Bindung und Übertragung in der Buchhaltung bei Einkäufen (Lieferantenrechnungen werden in der Buchhaltung nicht berücksichtigt).
 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).
 ACCOUNTING_ENABLE_LETTERING=Aktivieren Sie die Abstimmungsfunktion in der Buchhaltung
+ACCOUNTING_ENABLE_AUTOLETTERING=Aktivieren Sie den automatischen Buchungsabgleich bei der Übergabe an die Buchhaltung
 
 ## Export
 NotExportLettering=Beim Generieren der Datei die Abstimmungsinformationen nicht exportieren
 NotifiedExportDate=Exportierte Zeilen als exportiert kennzeichnen <span class="warning">(um eine Zeile zu ändern, müssen Sie die gesamte Transaktion löschen und erneut in die Buchhaltung übertragen)</span>
 NotifiedValidationDate=Festschreiben der exportierten Einträge <span class="warning">(gleiche Wirkung wie die Funktion  "%s", Änderungen und Löschungen der Zeilen sind danach DEFINITIV NICHT möglich)</span>
+NotifiedExportFull=Dokumente exportieren?
 DateValidationAndLock=Festschreibungsdatum
 ConfirmExportFile=Exportdatei der Buchhaltung erstellen?
 ExportDraftJournal=Entwurfsjournal exportieren
@@ -398,7 +406,7 @@ SaleLocal=Verkauf Inland
 SaleExport=Verkauf Export (ausserhalb EWG)
 SaleEEC=Verkauf in EU/EWG
 SaleEECWithVAT=Verkauf in der EU mit Mehrwertsteuer (nicht null), und daher anzunehmen ist, dass es sich NICHT um einen innergemeinschaftlichen Verkauf handelt und das vorgeschlagene Konto daher das Standardproduktkonto ist.
-SaleEECWithoutVATNumber=Verkauf in der EU ohne USt., aber ohne dass die erforderliche USt.-ID des Geschäftspartners hinterlegt ist. Es wird stattdessen auf das Produktkonto für Standardverkäufe zurückgegriffen. Bei Bedarf kann die USt.-ID des Geschäftspartners festgelegt oder die Einstellung für das Produktkonto geändert werden.
+SaleEECWithoutVATNumber=Verkauf in der EWG ohne Mehrwertsteuer, ohne dass die Umsatzsteuer-ID des Geschäftspartners definiert ist. Es wird stattdessen auf das Buchungskonto für Standardverkäufe zurückgegriffen. Sie können die Umsatzsteuer-ID des Geschäftspartners korrigieren oder das zur Kontierung vorgeschlagene Buchungskonto bei Bedarf ändern.
 ForbiddenTransactionAlreadyExported=Unzulässig: Die Transaktion wurde bereits freigegeben und/oder exportiert.
 ForbiddenTransactionAlreadyValidated=Unzulässig: Die Transaktion wurde bereits freigegeben.
 ## Dictionary
@@ -442,6 +450,7 @@ AccountancyErrorMismatchLetterCode=Fehlende Übereinstimmung im Code für Abglei
 AccountancyErrorMismatchBalanceAmount=Der Saldo (%s) ist ungleich 0
 AccountancyErrorLetteringBookkeeping=Bei den Transaktionen sind Fehler aufgetreten: %s
 ErrorAccountNumberAlreadyExists=Das Buchungskonto %s existiert bereits
+ErrorArchiveAddFile=Die Datei „%s“ kann nicht im Archiv abgelegt werden
 
 ## Import
 ImportAccountingEntries=Buchaltungseinträge
@@ -468,5 +477,7 @@ FECFormatMulticurrencyCode=Mehrwährungs-Code (Idevise)
 DateExport=Exportdatum
 WarningReportNotReliable=Achtung, dieser Bericht basiert nicht auf dem Hauptbuch und enthält keine Transaktionen, die manuell im Hauptbuch geändert wurden. Wenn Ihre Journalisierung aktuell ist, ist die Buchhaltungsansicht genauer.
 ExpenseReportJournal=Spesenabrechnung Journal
+DocsAlreadyExportedAreExcluded=Bereits exportierte Dokumente sind ausgeschlossen
+ClickToHideAlreadyExportedLines=Klicken Sie hier, um bereits exportierte Positionen auszublenden
 
 NAccounts=%s Konten
diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang
index 01a14256c24..68fcfa043dc 100644
--- a/htdocs/langs/de_DE/admin.lang
+++ b/htdocs/langs/de_DE/admin.lang
@@ -203,7 +203,7 @@ ExtendedInsert=Erweiterte INSERTS
 NoLockBeforeInsert=Keine Sperrbefehle (Lock) für INSERT
 DelayedInsert=Verzögerte INSERTS
 EncodeBinariesInHexa=Hexadezimal-Codierung für Binärdaten
-IgnoreDuplicateRecords=Fehler zu doppelten Zeiten ignorieren (INSERT IGNORE)
+IgnoreDuplicateRecords=Fehler zu doppelten Datensätzen ignorieren (INSERT IGNORE)
 AutoDetectLang=Automatische Erkennung (Browser-Sprache)
 FeatureDisabledInDemo=Funktion in der Demoversion deaktiviert
 FeatureAvailableOnlyOnStable=Diese Funktion steht nur in offiziellen stabilen Versionen zur Verfügung
@@ -285,7 +285,7 @@ NewByMonth=Neu nach Monat
 Emails=E-Mail
 EMailsSetup=E-Mail-Einstellungen
 EMailsDesc=Auf dieser Seite können Sie Parameter oder Optionen für das Senden von E-Mails festlegen.
-EmailSenderProfiles=E-Mail-Signaturen
+EmailSenderProfiles=E-Mail-Absenderprofile
 EMailsSenderProfileDesc=Sie können diesen Bereich leer lassen. Wenn Sie hier E-Mail-Adressen angeben, werden diese beim Schreiben einer neuen E-Mail in die Liste der möglichen Absender aufgenommen.
 MAIN_MAIL_SMTP_PORT=SMTP(S)-Port (Standardwert Ihrer php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_SERVER=SMTP(S)-Server (Standardwert Ihrer php.ini: <b>%s</b>)
@@ -645,6 +645,8 @@ Module2300Name=Geplante Aufgaben
 Module2300Desc=Verwaltung geplanter Aufgaben (Cron oder chrono Tabelle)
 Module2400Name=Agenda (Ereignisse/Termine)
 Module2400Desc=Modul zur Terminplanung und Ereignissaufzeichnung:  Protokollieren Sie automatisch Ereignisse wie beispielsweise Änderungen an Produktdatensätzen zu Verfolgungszwecken oder tragen Sie Termine manuell ein.\nDies ist ein wichtiges Modul für ein gutes Kunden- und/oder Lieferantenbeziehungsmanagement.
+Module2430Name=Kalender-Buchungssystem
+Module2430Desc=Stellen Sie einen Online-Kalender bereit, damit jeder Besprechungen in vordefinierten Bereichen oder Verfügbarkeiten buchen kann.
 Module2500Name=DMS/ECM
 Module2500Desc=Speicherung und Verteilung von Dokumenten. Automatische organisation der generierten oder gespeicherten Dokumente. Teilen Sie sie bei Bedarf.
 Module2600Name=API/Webservice (SOAP Server)
@@ -660,6 +662,8 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind Konvertierung
 Module3200Name=Unveränderliche Archive
 Module3200Desc=Aktivieren Sie ein unveränderliches Protokoll von Geschäftsereignissen. Ereignisse werden in Echtzeit archiviert. Das Protokoll ist eine schreibgeschützte Tabelle mit verketteten Ereignissen, die exportiert werden können. Dieses Modul kann für einige Länder zwingend erforderlich sein.
+Module3300Name=Module-Builder
+Module3200Desc=Aktivieren Sie ein unveränderliches Protokoll von Geschäftsereignissen. Ereignisse werden in Echtzeit archiviert. Das Protokoll ist eine schreibgeschützte Tabelle mit verketteten Ereignissen, die exportiert werden können. Dieses Modul kann für einige Länder zwingend erforderlich sein.
 Module3400Name=Soziale Netzwerke
 Module3400Desc=Aktiviert Felder für soziale Netzwerke für Dritte und Adressen (Skype, Twitter, Facebook, ...).
 Module4000Name=Personal
@@ -1270,6 +1274,7 @@ TriggerActiveAsModuleActive=Trigger in dieser Datei sind durch das übergeordnet
 GeneratedPasswordDesc=Wählen Sie die Methode für automatisch erzeugte Passwörter.
 DictionaryDesc=Alle Standardwerte einfügen. Sie können eigene Werte zu den Standartwerten hinzufügen.
 ConstDesc=Auf dieser Seite können Sie Parameter bearbeiten (überschreiben), die auf anderen Seiten nicht verfügbar sind. Diese Funktion ist für Entwickler und/oder die fortgeschrittene Fehlerbehebung vorgesehen.
+MiscellaneousOptions=Verschiedene Optionen
 MiscellaneousDesc=Alle anderen sicherheitsrelevanten Parameter werden hier eingestellt.
 LimitsSetup=Einstellungen zu Dezimalstellen und Rundung
 LimitsDesc=Hier können Sie die von Dolibarr verwendeten Grenzwerte, Genauigkeiten und Optimierungen definieren
@@ -1797,17 +1802,17 @@ FailedToInitializeMenu=Menü konnte nicht erstellt werden
 ##### Tax #####
 TaxSetup=Steuer-, Sozialabgaben- und Dividendenmodul-Einstellungen
 OptionVatMode=USt. fällig
-OptionVATDefault=Ist-Versteuerung
-OptionVATDebitOption=Soll-Versteuerung
-OptionVatDefaultDesc=USt fällig: <br>- Bei Lieferung/Zahlung für Waren<br>- Bei Zahlung für Leistungen
-OptionVatDebitOptionDesc=USt fällig: <br>- Bei Lieferung/Zahlung für Waren <br>- Bei Rechnungslegung (Lastschrift) für Dienstleistungen
-OptionPaymentForProductAndServices=Cash-Basis für Produkte und Leistungen
-OptionPaymentForProductAndServicesDesc=USt is fällig: <br>- Bei Bezahlung von Waren<br>- Bei Bezahlung von Dienstleistungen
+OptionVATDefault=Unterschiedliche Versteuerung für Produkte und Leistungen (z.B. in Frankreich)
+OptionVATDebitOption=Soll-Versteuerung für Produkte und Leistungen
+OptionVatDefaultDesc=USt fällig: <br>- zum Rechnungsdatum bei Produkten<br>- zum Zahlungsdatum bei Leistungen
+OptionVatDebitOptionDesc=USt fällig: <br>- zum Rechnungsdatum bei Produkten <br>- zum Rechnungsdatum bei Leistungen
+OptionPaymentForProductAndServices=Ist-Versteuerung für Produkte und Leistungen
+OptionPaymentForProductAndServicesDesc=USt fällig: <br>- zum Zahlungsdatum bei Produkten<br>- zum Zahlungsdatum bei Leistungen
 SummaryOfVatExigibilityUsedByDefault=Standardmäßiger Zeitpunkt der USt.-Fälligkeit in Abhängigkeit zur derzeit gewählten Option:
 OnDelivery=Bei Lieferung
 OnPayment=Bei Zahlung
 OnInvoice=Bei Rechnungslegung
-SupposedToBePaymentDate=Zahlungsdatum in Verwendung falls Lieferdatum unbekannt
+SupposedToBePaymentDate=Zahlungsdatum wird verwendet
 SupposedToBeInvoiceDate=Rechnungsdatum verwendet
 Buy=Kaufen
 Sell=Verkaufen
@@ -1826,6 +1831,9 @@ AGENDA_USE_EVENT_TYPE=Verwenden der Ereignissarten \nEinstellen unter (Start ->
 AGENDA_USE_EVENT_TYPE_DEFAULT=Diesen Standardwert automatisch als Ereignistyp im  Ereignis Erstell-Formular verwenden.
 AGENDA_DEFAULT_FILTER_TYPE=Diesen Ereignisstatus automatisch in den Suchfilter für die Agenda-Ansicht übernehmen
 AGENDA_DEFAULT_FILTER_STATUS=Diesen Ereignisstatus automatisch in den Suchfilter für die Agenda-Ansicht übernehmen
+AGENDA_EVENT_PAST_COLOR=Farbe für Ereignisse in der Vergangenheit
+AGENDA_EVENT_CURRENT_COLOR=Farbe für aktuelle Ereignisse
+AGENDA_EVENT_FUTURE_COLOR=Farbe für Ereignisse in der Zukunft
 AGENDA_DEFAULT_VIEW=Welche Standardansicht soll geöffnet werden, wenn das Menü 'Agenda' geöffnet wird
 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
@@ -2129,6 +2137,7 @@ CodeLastResult=Letzter Resultatcode
 NbOfEmailsInInbox=Anzahl E-Mails im Quellverzeichnis
 LoadThirdPartyFromName=Drittanbieter-Suche auf %s laden (nur laden)
 LoadThirdPartyFromNameOrCreate=Drittanbieter-Suche auf %s laden (erstellen, wenn nicht gefunden)
+LoadContactFromEmailOrCreate=Kontakt aus %s entnehmen (erstellen, wenn nicht gefunden)
 AttachJoinedDocumentsToObject=Speichern Sie angehängte Dateien als Dokumente eines Objekts, wenn die Referenz des Objekts im Betreff der E-Mail gefunden wird.
 WithDolTrackingID=Nachricht einer Unterhaltung die durch eine erste von Dolibarr gesendete E-Mail initiiert wurde 
 WithoutDolTrackingID=Nachricht einer Unterhaltung die NICHT durch eine erste von Dolibarr gesendete E-Mail initiiert wurde 
@@ -2355,3 +2364,5 @@ AllowExternalDownload=Externen Download zulassen (ohne Anmeldung, über einen fr
 DeadlineDayVATSubmission=Stichtag für die MwSt.-Einreichung im nächsten Monat
 MaxNumberOfAttachementOnForms=Maximale Anzahl verbundener Dateien in einem Formular
 IfDefinedUseAValueBeetween=Wenn definiert, einen Wert zwischen %s und %s verwenden
+Reload=Neu laden
+ConfirmReload=Neuladen des Moduls bestätigen
diff --git a/htdocs/langs/de_DE/boxes.lang b/htdocs/langs/de_DE/boxes.lang
index b8ba765a3d1..10eeb91d1e4 100644
--- a/htdocs/langs/de_DE/boxes.lang
+++ b/htdocs/langs/de_DE/boxes.lang
@@ -24,6 +24,7 @@ BoxFicheInter=Neueste Serviceaufträge
 BoxCurrentAccounts=Saldo offene Konten
 BoxTitleMemberNextBirthdays=Geburtstage in diesem Monat (Mitglieder)
 BoxTitleMembersByType=Mitglieder nach Typ und Status
+BoxTitleMembersByTags=Mitglieder nach Kategorien und Status
 BoxTitleMembersSubscriptionsByYear=Mitgliederabonnements nach Jahr
 BoxTitleLastRssInfos=%s neueste Neuigkeiten von %s
 BoxTitleLastProducts=Zuletzt bearbeitete Produkte / Leistungen (maximal %s)
diff --git a/htdocs/langs/de_DE/categories.lang b/htdocs/langs/de_DE/categories.lang
index 1369f84b2a3..9e9f407c2b0 100644
--- a/htdocs/langs/de_DE/categories.lang
+++ b/htdocs/langs/de_DE/categories.lang
@@ -78,11 +78,11 @@ CatContactList=Liste der Schlagwörter / Kategorien für Kontakte
 CatProjectsList=Liste der Schlagwörter / Kategorien für Projekte
 CatUsersList=Liste der Schlagwörter / Kategorien für Benutzer
 CatSupLinks=Verknüpfungen zwischen Anbietern und Schlagwörter / Kategorien
-CatCusLinks=Verbindung zwischen Kunden-/Leads und Kategorien
+CatCusLinks=Verknüpfungen zwischen Kunden-/Leads und Kategorien
 CatContactsLinks=Verknüpfungen zwischen Kontakten/Adressen und Tags/Kategorien
-CatProdLinks=Verbindung zwischen Produkten/Leistungen und Kategorien
-CatMembersLinks=Verbindung zwischen Mitgliedern und Kategorien
-CatProjectsLinks=Verbindung zwischen Projekten und Kategorien bzw. Suchwörtern
+CatProdLinks=Verknüpfungen zwischen Produkten/Leistungen und Kategorien
+CatMembersLinks=Verknüpfungen zwischen Mitgliedern und Kategorien
+CatProjectsLinks=Verknüpfungen zwischen Projekten und Kategorien bzw. Suchwörtern
 CatUsersLinks=Verknüpfungen zwischen Benutzern und Schlagwörter / Kategorien
 DeleteFromCat=Aus Kategorie entfernen
 ExtraFieldsCategories=Ergänzende Attribute
diff --git a/htdocs/langs/de_DE/companies.lang b/htdocs/langs/de_DE/companies.lang
index 0797e3164ab..2c1086dbf3a 100644
--- a/htdocs/langs/de_DE/companies.lang
+++ b/htdocs/langs/de_DE/companies.lang
@@ -29,7 +29,7 @@ AliasNameShort=Alias-Name
 Companies=Firmen
 CountryIsInEEC=Land ist EU-Mitglied
 PriceFormatInCurrentLanguage=Preisanzeigeformat in der aktuellen Sprache und Währung
-ThirdPartyName=Name des Partners
+ThirdPartyName=Name des Geschäftspartners
 ThirdPartyEmail=Geschäftspartner E-Mail
 ThirdParty=Geschäftspartner
 ThirdParties=Geschäftspartner
@@ -130,7 +130,7 @@ ProfId1AT=Steuernummer (Finanzamt)
 ProfId2AT=Gerichtsstand
 ProfId3AT=Firmenbuchnummer
 ProfId4AT=DVR-Nummer
-ProfId5AT=EORI-Nummer
+ProfId5AT=EORI Nummer
 ProfId6AT=-
 ProfId1AU=Prof ID 1
 ProfId2AU=-
@@ -313,7 +313,7 @@ CustomerAbsoluteDiscountShort=Rabatt absolut
 CompanyHasRelativeDiscount=Dieser Kunde hat einen Rabatt <b>von %s%%</b>
 CompanyHasNoRelativeDiscount=Dieser Kunde hat standardmäßig keinen prozentualen Rabatt
 HasRelativeDiscountFromSupplier=Sie haben einen Standardrabatt von <b>%s%%</b> bei diesem Lieferanten
-HasNoRelativeDiscountFromSupplier=Kein prozentualer Rabatt bei diesem Lieferanten
+HasNoRelativeDiscountFromSupplier=Kein prozentualer Standardrabatt bei diesem Lieferanten
 CompanyHasAbsoluteDiscount=Dieser Kunde hat ein Guthaben verfügbar (Gutschriften oder Anzahlungen) für <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=Dieser Kunde hat ein Guthaben verfügbar (Gutschriften oder Anzahlungen) für<b>%s</b> %s
 CompanyHasCreditNote=Dieser Kunde hat noch Gutschriften <b>über %s %s</b>
@@ -358,8 +358,8 @@ ValidityControledByModule=Vom Modul kontrollierte Gültigkeit
 ThisIsModuleRules=Regeln für dieses Modul
 ProspectToContact=Zu kontaktierender Interessent
 CompanyDeleted=Unternehmen "%s" aus der Datenbank gelöscht.
-ListOfContacts=Liste der Kontakte
-ListOfContactsAddresses=Liste der Kontakte
+ListOfContacts=Liste der Kontakte/Adressen
+ListOfContactsAddresses=Liste der Kontakte/Adressen
 ListOfThirdParties=Liste der Geschäftspartner
 ShowCompany=Geschäftspartner
 ShowContact=Kontakt-Adresse
@@ -435,8 +435,8 @@ ExportDataset_company_1=Geschäftspartner (Firmen/Stiftungen/Natürliche Persone
 ExportDataset_company_2=Kontakte und ihre Eigenschaften
 ImportDataset_company_1=Geschäftspartner und ihre Eigenschaften
 ImportDataset_company_2=Kontakte/Adressen und Attribute
-ImportDataset_company_3=Bankkonten des Geschäftspartners
-ImportDataset_company_4=Dem Geschäftspartner zugeordneter Vertriebsmitarbeiter (Vertriebsmitarbeiter/Benutzer zu Unternehmen zuordnen)
+ImportDataset_company_3=Bankkonten der Geschäftspartner
+ImportDataset_company_4=Geschäftspartnern zugeordnete Vertriebsmitarbeiter (Vertriebsmitarbeiter/Benutzer zu Unternehmen zuordnen)
 PriceLevel=Preisstufe
 PriceLevelLabels=Preisniveau Etiketten
 DeliveryAddress=Lieferadresse
@@ -444,7 +444,7 @@ AddAddress=Adresse hinzufügen
 SupplierCategory=Lieferantenkategorie
 JuridicalStatus200=Unabhängig
 DeleteFile=Datei löschen
-ConfirmDeleteFile=Möchten Sie diese Datei wirklich löschen?
+ConfirmDeleteFile=Möchten Sie die Datei <b>%s</b> wirklich löschen?
 AllocateCommercial=Diesem Vertriebsmitarbeiter zugeordnet
 Organization=Organisation
 FiscalYearInformation=Geschäftsjahr
@@ -498,3 +498,8 @@ RestOfEurope=übriges Europa (EU / EWG)
 OutOfEurope=außerhalb Europas (EU / EWG)
 CurrentOutstandingBillLate=Offene Posten
 BecarefullChangeThirdpartyBeforeAddProductToInvoice=Seien Sie vorsichtig: Abhängig von Ihren Produktpreiseinstellungen sollten Sie den Geschäftspartner wechseln, bevor Sie das Produkt zum POS hinzufügen.
+EmailAlreadyExistsPleaseRewriteYourCompanyName=E-Mail existiert bereits, bitte geben Sie Ihren Firmennamen neu ein
+TwoRecordsOfCompanyName=Für dieses Unternehmen existiert mehr als ein Datensatz. Bitte kontaktieren Sie uns, um Ihre Partnerschaftsanfrage abzuschließen.
+CompanySection=Unternehmensbereich
+ShowSocialNetworks=Soziale Netzwerke anzeigen
+HideSocialNetworks=Soziale Netzwerke ausblenden
diff --git a/htdocs/langs/de_DE/errors.lang b/htdocs/langs/de_DE/errors.lang
index 0553f3ba730..0791a31a29a 100644
--- a/htdocs/langs/de_DE/errors.lang
+++ b/htdocs/langs/de_DE/errors.lang
@@ -303,6 +303,7 @@ ErrorValueForTooLow=Wert für <b>%s</b> ist zu niedrig
 ErrorValueCantBeNull=Der Wert für <b>%s</b> darf nicht null sein
 ErrorDateOfMovementLowerThanDateOfFileTransmission=Das Datum der Banküberweisung darf nicht vor dem Datum der Dateiübermittlung liegen
 ErrorTooMuchFileInForm=Zu viele Dateien im Formular, die maximale Anzahl beträgt %s Datei(en)
+ErrorSessionInvalidatedAfterPasswordChange=Die Sitzung wurde nach einer Änderung von Passwort, Status oder Gültigkeitsdaten ungültig. Bitte melden Sie sich erneut an.
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Ihr PHP Parameter upload_max_filesize (%s) ist größer als Parameter post_max_size (%s). Dies ist eine inkonsistente Einstellung.
@@ -325,6 +326,7 @@ WarningPaymentDateLowerThanInvoiceDate=Zahlungsdatum (%s) liegt vor dem Rechnung
 WarningTooManyDataPleaseUseMoreFilters=Zu viele Ergebnisse (mehr als %s Zeilen). Bitte benutzen Sie mehr Filter oder erhöhen sie die Konstante %s auf einen höheren Wert.
 WarningSomeLinesWithNullHourlyRate=Einige erfasste Zeiten wurden von Benutzern erfasst bei denen der Stundensatz undefiniert war. Ein Stundenansatz von 0 %s pro Stunde wurde verwendet, was eine fehlerhafte Zeitauswertungen zur Folge haben kann.
 WarningYourLoginWasModifiedPleaseLogin=Ihr Login wurde verändert. Aus Sicherheitsgründen müssen Sie sich vor der nächsten Aktion mit Ihrem neuen Login anmelden.
+WarningYourPasswordWasModifiedPleaseLogin=Ihr Passwort wurde geändert. Aus Sicherheitsgründen müssen Sie sich jetzt mit Ihrem neuen Passwort anmelden.
 WarningAnEntryAlreadyExistForTransKey=Eine Übersetzung für diesen Übersetzungsschlüssel existiert schon für diese Sprache
 WarningNumberOfRecipientIsRestrictedInMassAction=Achtung, die Anzahl der verschiedenen Empfänger ist auf <b> %s </b> beschränkt, wenn Massenaktionen für Listen verwendet werden
 WarningDateOfLineMustBeInExpenseReportRange=Das Datum dieser Positionszeile ist ausserhalb der Datumsspanne dieser Spesenabrechnung
diff --git a/htdocs/langs/de_DE/eventorganization.lang b/htdocs/langs/de_DE/eventorganization.lang
index 02fdde502eb..d3b21af3c45 100644
--- a/htdocs/langs/de_DE/eventorganization.lang
+++ b/htdocs/langs/de_DE/eventorganization.lang
@@ -172,3 +172,5 @@ ErrorSeveralCompaniesWithEmailContactUs=Es wurden mehrere Unternehmen mit dieser
 ErrorSeveralCompaniesWithNameContactUs=Es wurden mehrere Unternehmen mit diesem Namen gefunden, so dass wir Ihre Registrierung nicht automatisch freigeben können. Bitte kontaktieren Sie uns unter %s für eine manuelle Freigabe
 NoPublicActionsAllowedForThisEvent=Für diese Veranstaltung sind keine Aktionen für die Öffentlichkeit zugänglich
 MaxNbOfAttendees=Maximale Teilnehmerzahl
+DateStartEvent=Startdatum der Veranstaltung
+DateEndEvent=Enddatum der Veranstaltung
diff --git a/htdocs/langs/de_DE/hrm.lang b/htdocs/langs/de_DE/hrm.lang
index cb1f4691727..c456572ac18 100644
--- a/htdocs/langs/de_DE/hrm.lang
+++ b/htdocs/langs/de_DE/hrm.lang
@@ -86,7 +86,7 @@ SaveAddSkill = Kompetenz(en) hinzugefügt
 SaveLevelSkill = Kompetenzstufe gespeichert
 DeleteSkill = Kompetenz entfernt
 SkillsExtraFields=Ergänzende Attribute (Kompetenzen)
-JobsExtraFields=Ergänzende Attribute (Mitarbeiter)
+JobsExtraFields=Ergänzende Attribute (Stellenprofil)
 EvaluationsExtraFields=Ergänzende Attribute (Beurteilungen)
 NeedBusinessTravels=Geschäftsreisen erforderlich
 NoDescription=Keine Beschreibung
diff --git a/htdocs/langs/de_DE/mails.lang b/htdocs/langs/de_DE/mails.lang
index 2ecaed7fd36..95e4c06ba4b 100644
--- a/htdocs/langs/de_DE/mails.lang
+++ b/htdocs/langs/de_DE/mails.lang
@@ -7,13 +7,13 @@ MailCard=E-Mail-Kampagnenkarte
 MailRecipients=Empfänger
 MailRecipient=Empfänger
 MailTitle=Bezeichnung
-MailFrom=Absenderadresse
+MailFrom=Von
 MailErrorsTo=Fehlerrückmeldungen an
 MailReply=Antwort an
-MailTo=Empfänger
-MailToUsers=An Empfänger:
+MailTo=An
+MailToUsers=An Benutzer
 MailCC=Kopie an
-MailToCCUsers=Kopie an Empfänger
+MailToCCUsers=Kopie an Benutzer
 MailCCC=Blindkopie an
 MailTopic=E-Mail Betreff
 MailText=Inhalt
diff --git a/htdocs/langs/de_DE/main.lang b/htdocs/langs/de_DE/main.lang
index 9d1a2ae7e30..6b1db066cd9 100644
--- a/htdocs/langs/de_DE/main.lang
+++ b/htdocs/langs/de_DE/main.lang
@@ -174,7 +174,7 @@ ConfirmSendCardByMail=Möchten Sie wirklich die Inhalte dieser Karteikarte per E
 Delete=Löschen
 Remove=Entfernen
 Resiliate=Beenden
-Cancel=Abbrechen
+Cancel=Stornieren
 Modify=Ändern
 Edit=Bearbeiten
 Validate=Freigeben
@@ -226,6 +226,7 @@ NoUserGroupDefined=Keine Benutzergruppe definiert
 Password=Passwort
 PasswordRetype=Passwort wiederholen
 NoteSomeFeaturesAreDisabled=Bitte beachten Sie, dass viele Funktionen/Module in dieser Demo deaktiviert sind
+YourUserFile=Ihre Benutzerdatei
 Name=Name
 NameSlashCompany=Name / Firma
 Person=Person
@@ -897,6 +898,9 @@ MassFilesArea=Bereich für Dateien aus Massenaktionen
 ShowTempMassFilesArea=Bereich für Dateien aus Massenaktionen zeigen
 ConfirmMassDeletion=Bestätigung für Massenlöschen
 ConfirmMassDeletionQuestion=Möchten Sie den/die <b>%s</b> ausgewählten Datensatz/-sätze wirklich löschen?
+ConfirmMassClone=Bestätigung des Massen-Klonens
+ConfirmMassCloneQuestion=Wählen Sie das Projekt aus, in das geklont werden soll
+ConfirmMassCloneToOneProject=In Projekt %s klonen
 RelatedObjects=Verknüpfte Objekte
 ClassifyBilled=Als verrechnet markieren
 ClassifyUnbilled=als "nicht berechnet" markieren
@@ -912,8 +916,8 @@ ExportFilteredList=Exportiere gefilterte Auswahl
 ExportList=Liste exportieren
 ExportOptions=Exportoptionen
 IncludeDocsAlreadyExported=Bereits exportierte Dokumente einschließen
-ExportOfPiecesAlreadyExportedIsEnable=Der Export von bereits exportierten Daten ist möglich
-ExportOfPiecesAlreadyExportedIsDisable=Der Export von bereits exportierten Daten ist deaktiviert
+ExportOfPiecesAlreadyExportedIsEnable=Bereits exportierte Dokumente sind sichtbar und werden exportiert
+ExportOfPiecesAlreadyExportedIsDisable=Bereits exportierte Dokumente sind ausgeblendet und werden nicht exportiert
 AllExportedMovementsWereRecordedAsExported=Alle exportierten Buchungen wurden als exportiert erfasst
 NotAllExportedMovementsCouldBeRecordedAsExported=Nicht alle exportierten Bewegungen konnten als exportiert erfasst werden.
 Miscellaneous=Verschiedenes
@@ -1128,10 +1132,11 @@ DeleteFileText=Möchten Sie diese Datei wirklich löschen?
 ShowOtherLanguages=Andere Sprachen anzeigen
 SwitchInEditModeToAddTranslation=Wechseln Sie in den Bearbeitungsmodus, um Übersetzungen für diese Sprache hinzuzufügen
 NotUsedForThisCustomer=Wird für diesen Kunden nicht verwendet
+NotUsedForThisVendor=Für diesen Lieferanten nicht verwendet
 AmountMustBePositive=Der Betrag muss positiv sein
 ByStatus=Nach Status
 InformationMessage=Information
-Used=Gebraucht
+Used=Verwendet
 ASAP=So schnell wie möglich
 CREATEInDolibarr=Datensatz %s erstellt
 MODIFYInDolibarr=Datensatz %s geändert
@@ -1154,8 +1159,8 @@ SetSupervisor=Führungskraft festlegen
 CreateExternalUser=Externen Benutzer anlegen
 ConfirmAffectTag=Massenzuweisung von Schlagwörtern/Kategorien
 ConfirmAffectUser=Massenzuordnung von Benutzern
-ProjectRole=Zugewiesene Rolle für jedes Projekt
-TasksRole=Zugewiesene Rolle für jede Aufgabe jedes Projekts
+ProjectRole=Für jedes Projekt / jeden Lead zugewiesene Rolle
+TasksRole=Für jede Aufgabe zugewiesene Rolle (falls verwendet)
 ConfirmSetSupervisor=Führungskraft für mehrere festlegen
 ConfirmUpdatePrice=Wählen Sie den Wert der Preiserhöhung/-senkung
 ConfirmAffectTagQuestion=Möchten Sie den %s ausgewählten Datensätzen wirklich Schlagwörter/Kategorien zuweisen?
@@ -1210,3 +1215,10 @@ CreatedByPublicPortal=Erstellt aus dem öffentlichen Portal
 UserAgent=User-Agent
 InternalUser=Interne Benutzer
 ExternalUser=Externer Benutzer
+NoSpecificContactAddress=Kein Kontakt oder Adresse
+NoSpecificContactAddressBis=Diese Registerkarte dient dazu, bestimmte Kontakte oder Adressen für das aktuelle Objekt zu erzwingen. Verwenden Sie diese Funktion nur, wenn Sie einen oder mehrere spezifische Kontakte oder Adressen für das Objekt definieren möchten für den Fall, dass die Informationen über den Geschäftspartner nicht ausreichen oder nicht spezifisch genug sind.
+HideOnVCard=%s ausblenden
+AddToContacts=Adresse zu meinen Kontakten hinzufügen
+LastAccess=Letzter Zugriff
+UploadAnImageToSeeAPhotoHere=Laden Sie ein Bild auf der Registerkarte %s hoch, um hier ein Foto zu sehen
+LastPasswordChangeDate=Datum der letzten Passwortänderung
diff --git a/htdocs/langs/de_DE/mrp.lang b/htdocs/langs/de_DE/mrp.lang
index 339efbf1f3e..339079761f1 100644
--- a/htdocs/langs/de_DE/mrp.lang
+++ b/htdocs/langs/de_DE/mrp.lang
@@ -11,7 +11,7 @@ Bom=Stücklisten
 BillOfMaterials=Stückliste
 BillOfMaterialsLines=Stücklistenpositionen
 BOMsSetup=Stücklisten Modul einrichten
-ListOfBOMs=Bills of material - BOM
+ListOfBOMs=Stücklisten - BOM
 ListOfManufacturingOrders=Fertigungsaufträge
 NewBOM=Neue Stückliste
 ProductBOMHelp=Mit dieser Stückliste zu erstellendes (oder zu zerlegendes) Produkt. <br> Hinweis: Produkte mit der Eigenschaft 'Art des Produkts' = 'Rohstoff' sind in dieser Liste nicht sichtbar.
@@ -102,6 +102,7 @@ NbOperatorsRequired=Anzahl der erforderlichen Bediener
 THMOperatorEstimated=Geschätzter Bediener THM
 THMMachineEstimated=Geschätzter Maschinen THM
 WorkstationType=Arbeitsstationstyp
+DefaultWorkstation=Standard-Arbeitsstation
 Human=Mensch
 Machine=Maschine
 HumanMachine=Mensch & Maschine
@@ -116,5 +117,5 @@ ParentMo=Übergeordneter Fertigungsauftrag
 MOChild=Untergeordneter Fertigungsauftrag
 BomCantAddChildBom=Die Nomenklatur %s ist bereits im Baum vorhanden, der zur Nomenklatur %s führt
 BOMNetNeeds = BOM-Nettobedarf
-BOMProductsList=BOM's products
-BOMServicesList=BOM's services
+BOMProductsList=BOM-Produkte
+BOMServicesList=BOM-Leistungen
diff --git a/htdocs/langs/de_DE/orders.lang b/htdocs/langs/de_DE/orders.lang
index cace09c16e1..984e8eb981c 100644
--- a/htdocs/langs/de_DE/orders.lang
+++ b/htdocs/langs/de_DE/orders.lang
@@ -96,6 +96,10 @@ OrdersStatisticsSuppliers=Statistik Lieferantenbestellungen
 NumberOfOrdersByMonth=Anzahl der Bestellungen pro Monat
 AmountOfOrdersByMonthHT=Gesamtbetrag der Bestellungen pro Monat (exkl. Steuern)
 ListOfOrders=Liste Aufträge
+ListOrderLigne=Auftragspositionen
+productobuy=Produkte nur zum Kaufen
+productonly=Nur Produkte
+disablelinefree=Keine kostenfreien Positionen anzeigen
 CloseOrder=Bestellung schließen
 ConfirmCloseOrder=Möchten Sie diese Bestellung wirklich auf "geliefert" setzen? Sobald eine Bestellung geliefert ist, kann sie auf "berechnet" gesetzt werden.
 ConfirmDeleteOrder=Möchten Sie diese Bestellung wirklich löschen?
@@ -131,6 +135,7 @@ SupplierOrderClassifiedBilled=Bestellung %s als verrechnet markieren
 OtherOrders=zeige weitere Bestellungen dieses Partners
 SupplierOrderValidatedAndApproved=Die Lieferantenbestellung ist freigegeben und genehmigt: %s
 SupplierOrderValidated=Lieferantenbestellung ist freigegeben: %s
+OrderShowDetail=Auftragsdetail anzeigen
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Kundenauftrag-Nachbetreuung durch Vertreter
 TypeContact_commande_internal_SHIPPING=Versand-Nachbetreuung durch Vertreter
@@ -199,3 +204,5 @@ StatusSupplierOrderApproved=Genehmigt
 StatusSupplierOrderRefused=Abgelehnt
 StatusSupplierOrderReceivedPartially=Teilweise erhalten
 StatusSupplierOrderReceivedAll=Alle Produkte erhalten
+NeedAtLeastOneInvoice = Es muss mindestens eine Rechnung vorhanden sein
+LineAlreadyDispatched = Die Bestellposition ist bereits eingegangen.
diff --git a/htdocs/langs/de_DE/other.lang b/htdocs/langs/de_DE/other.lang
index 83512bde292..78e2310165c 100644
--- a/htdocs/langs/de_DE/other.lang
+++ b/htdocs/langs/de_DE/other.lang
@@ -131,7 +131,7 @@ ModifiedByLogin=Letzte Änderung durch Benutzerlogin
 ValidatedByLogin=Freigabe durch User
 CanceledByLogin=storniert durch Benutzername
 ClosedByLogin=geschlossen von User
-FileWasRemoved=Datei wurde entfernt
+FileWasRemoved=Datei %s wurde entfernt
 DirWasRemoved=Verzeichnis wurde entfernt
 FeatureNotYetAvailable=Diese Funktion steht in dieser Version noch nicht zur Verfügung
 FeatureNotAvailableOnDevicesWithoutMouse=Funktion auf Geräten ohne Maus nicht verfügbar
diff --git a/htdocs/langs/de_DE/projects.lang b/htdocs/langs/de_DE/projects.lang
index 30bc766e650..92589e6721a 100644
--- a/htdocs/langs/de_DE/projects.lang
+++ b/htdocs/langs/de_DE/projects.lang
@@ -259,6 +259,7 @@ RecordsClosed=%s Projekt(e) geschlossen
 SendProjectRef=Informationen zu Projekt %s
 ModuleSalaryToDefineHourlyRateMustBeEnabled=Das Modul 'Gehälter' muss aktiviert sein, um den Stundensatz des Mitarbeiters zu definieren und den Zeitaufwand zu bewerten
 NewTaskRefSuggested=Aufgabenreferenz bereits verwendet, eine neue Aufgabenreferenz ist erforderlich
+NumberOfTasksCloned=%s Aufgabe(n) geklont
 TimeSpentInvoiced=Zeitaufwand in Rechnung gestellt
 TimeSpentForIntervention=Zeitaufwand
 TimeSpentForInvoice=Zeitaufwand
diff --git a/htdocs/langs/de_DE/stripe.lang b/htdocs/langs/de_DE/stripe.lang
index 5db52f3c5c0..2cefe44f2be 100644
--- a/htdocs/langs/de_DE/stripe.lang
+++ b/htdocs/langs/de_DE/stripe.lang
@@ -41,7 +41,8 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook Produktivschlüssel
 ONLINE_PAYMENT_WAREHOUSE=Warenlager für die Bestandsminderung bei Onlinezahlung<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 aktiviert (Nicht im Test/Sandbox Modus)
 StripeImportPayment=Stripe Zahlungen importieren
-ExampleOfTestCreditCard=Beispiel für eine zu testende Kreditkarte: %s => gültig, %s => Fehler CVC, %s => abgelaufen, %s => Belastung fehlgeschlagen
+ExampleOfTestCreditCard=Beispiel Kreditkarte für SEPA-Test: %s => gültig, %s => Fehler CVC, %s => abgelaufen, %s => Belastung fehlgeschlagen
+ExampleOfTestBankAcountForSEPA=Beispiel Bankkonto IBAN für Lastschrifttest: %s
 StripeGateways=Stripe Gateways
 OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
@@ -61,6 +62,7 @@ DeleteACard=Karte löschen
 ConfirmDeleteCard=Wollen Sie diese Debit- oder Kreditkarte wirklich löschen?
 CreateCustomerOnStripe=Kunden auf Stripe erstellen
 CreateCardOnStripe=Karte auf Stripe erstellen
+CreateBANOnStripe=Bank auf Stripe erstellen
 ShowInStripe=In Stripe anzeigen
 StripeUserAccountForActions=Benutzerkonto zur E-Mail-Benachrichtigung über einige Stripe-Ereignisse (Stripe-Auszahlungen)
 StripePayoutList=Liste der Auszahlungen
@@ -69,4 +71,8 @@ ToOfferALinkForLiveWebhook=Link zum Einrichten von Stripe WebHook zum Aufruf von
 PaymentWillBeRecordedForNextPeriod=Die Zahlung wird für den folgenden Zeitraum erfasst.
 ClickHereToTryAgain=<a href="%s">Hier klicken und nochmal versuchen...</a>
 CreationOfPaymentModeMustBeDoneFromStripeInterface=Aufgrund strenger Kundenauthentifizierungs-Regeln muss die Erstellung einer Karte im Stripe-Backoffice erfolgen. Sie können hier klicken, um zum Stripe-Kundendatensatz zu wechseln: %s
-TERMINAL_LOCATION=Standort (Adresse) für Terminals
+STRIPE_CARD_PRESENT='Card present' für Stripe-Terminals
+TERMINAL_LOCATION=Standort (Adresse) für Stripe-Terminals
+RequestDirectDebitWithStripe=Lastschrift über Stripe anfordern
+STRIPE_SEPA_DIRECT_DEBIT=Aktivieren Sie die Lastschriftzahlungen über Stripe
+
diff --git a/htdocs/langs/de_DE/ticket.lang b/htdocs/langs/de_DE/ticket.lang
index 8240ebb0637..db22f635a81 100644
--- a/htdocs/langs/de_DE/ticket.lang
+++ b/htdocs/langs/de_DE/ticket.lang
@@ -26,6 +26,7 @@ Permission56002=Tickets ändern
 Permission56003=Tickets löschen
 Permission56004=Tickets bearbeiten
 Permission56005=Tickets aller Geschäftspartner anzeigen (nicht gültig für externe Benutzer, diese sehen immer nur die Tickets des eigenen Geschäftspartners)
+Permission56006=Tickets exportieren
 
 Tickets=Tickets
 TicketDictType=Ticket-Anfragearten
@@ -61,6 +62,8 @@ TypeContact_ticket_external_CONTRIBUTOR=Externer Mitarbeiter
 OriginEmail=Ersteller E-Mail
 Notify_TICKET_SENTBYMAIL=Ticket Nachricht per E-Mail versenden
 
+ExportDataset_ticket_1=Tickets
+
 # Status
 Read=Gelesen
 Assigned=Zugewiesen
diff --git a/htdocs/langs/de_DE/users.lang b/htdocs/langs/de_DE/users.lang
index 52a6415bbc2..3831051df46 100644
--- a/htdocs/langs/de_DE/users.lang
+++ b/htdocs/langs/de_DE/users.lang
@@ -66,7 +66,8 @@ LinkedToDolibarrUser=Verknüpfung mit Benutzer
 LinkedToDolibarrThirdParty=Verknüpfung mit Geschäftspartner
 CreateDolibarrLogin=Benutzerkonto erstellen
 CreateDolibarrThirdParty=Neuen Geschäftspartner erstellen
-LoginAccountDisableInDolibarr=Benutzerkonto im System deaktiviert.
+LoginAccountDisableInDolibarr=Benutzerkonto in Dolibarr deaktiviert
+PASSWORDInDolibarr=Passwort in Dolibarr geändert
 UsePersonalValue=Eigenen Wert verwenden
 ExportDataset_user_1=Benutzer und -eigenschaften
 DomainUser=Domain-Benutzer %s
@@ -129,3 +130,6 @@ IPLastLogin=IP der letzten Anmeldung
 IPPreviousLogin=IP der vorangegangenen Anmeldung
 ShowAllPerms=Alle Berechtigungen anzeigen
 HideAllPerms=Alle Berechtigungen ausblenden
+UserPublicPageDesc=Sie können für diesen Benutzer eine virtuelle Karte aktivieren. Eine URL mit dem Benutzerprofil und einem Barcode wird verfügbar sein, damit jeder mit einem Smartphone sie scannen und Ihren Kontakt zu seinem Adressbuch hinzufügen kann.
+EnablePublicVirtualCard=Aktivieren Sie die öffentliche virtuelle Benutzerkarte
+PublicVirtualCardUrl=Öffentliche virtuelle Benutzerkarte
diff --git a/htdocs/langs/de_DE/website.lang b/htdocs/langs/de_DE/website.lang
index 88e820fd684..73ad12ac6cb 100644
--- a/htdocs/langs/de_DE/website.lang
+++ b/htdocs/langs/de_DE/website.lang
@@ -155,3 +155,5 @@ WebpageMustBeDisabled=Die Webseite muss den Status „%s“ haben
 SetWebsiteOnlineBefore=Wenn die Website offline ist, sind alle Seiten offline. Ändern Sie zuerst den Status der Website.
 Booking=Buchung
 Reservation=Reservierung
+PagesViewedPreviousMonth=Angesehene Seiten (Vormonat)
+PagesViewedTotal=Angesehene Seiten (gesamt)
diff --git a/htdocs/langs/el_CY/stripe.lang b/htdocs/langs/el_CY/stripe.lang
new file mode 100644
index 00000000000..ae44362fd94
--- /dev/null
+++ b/htdocs/langs/el_CY/stripe.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - stripe
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+TERMINAL_LOCATION=Location (address) for Stripe Terminals
diff --git a/htdocs/langs/el_GR/accountancy.lang b/htdocs/langs/el_GR/accountancy.lang
index 2e1dcef796c..7aa219573b5 100644
--- a/htdocs/langs/el_GR/accountancy.lang
+++ b/htdocs/langs/el_GR/accountancy.lang
@@ -14,8 +14,8 @@ ACCOUNTING_EXPORT_ENDLINE=Επιλέξτε τον τύπο επιστροφής
 ACCOUNTING_EXPORT_PREFIX_SPEC=Καθορίστε το πρόθεμα για το όνομα του αρχείου
 ThisService=Αυτή η υπηρεσία
 ThisProduct=Αυτό το προϊόν
-DefaultForService=Προεπιλογή για υπηρεσία
-DefaultForProduct=Προεπιλογή για προϊόν
+DefaultForService=Προεπιλογή για υπηρεσίες
+DefaultForProduct=Προεπιλογή για προϊόντα
 ProductForThisThirdparty=Προϊόν προς τρίτο μέρος
 ServiceForThisThirdparty=Υπηρεσία προς τρίτο μέρος
 CantSuggest=Δεν προτείνεται
@@ -101,7 +101,8 @@ ShowAccountingAccount=Εμφάνιση λογαριασμού λογιστική
 ShowAccountingJournal=Εμφάνιση ημερολογίου λογιστικής
 ShowAccountingAccountInLedger=Εμφάνιση λογαριασμού λογιστικής στο καθολικό
 ShowAccountingAccountInJournals=Εμφάνιση λογαριασμού λογιστικής στα ημερολόγια
-AccountAccountingSuggest=Προτεινόμενος λογαριασμός λογιστικής 
+DataUsedToSuggestAccount=Δεδομένα που χρησιμοποιούνται για την πρόταση λογαριασμού
+AccountAccountingSuggest=Προτεινόμενος λογαριασμός
 MenuDefaultAccounts=Προεπιλεγμένοι λογαριασμοί
 MenuBankAccounts=Τραπεζικοί Λογαριασμοί
 MenuVatAccounts=Λογαριασμοί Φ.Π.Α.
@@ -126,6 +127,7 @@ WriteBookKeeping=Καταγραφή συναλλαγών στη λογιστικ
 Bookkeeping=Καθολικό
 BookkeepingSubAccount=Βοηθητικό καθολικό
 AccountBalance=Ισοζύγιο λογαριασμού
+AccountBalanceSubAccount=Υπόλοιπο υπολογαριασμών
 ObjectsRef=Αναφορά αντικειμένου προέλευσης
 CAHTF=Σύνολο αγορών προμηθευτών προ φόρων
 TotalExpenseReport=Σύνολο αναφοράς εξόδων
@@ -189,6 +191,7 @@ ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Λογαριασμός (από το λογι
 UseAuxiliaryAccountOnCustomerDeposit=Αποθηκεύστε τον λογαριασμό πελάτη ως ατομικό λογαριασμό στο θυγατρικό καθολικό για γραμμές προκαταβολών (εάν απενεργοποιηθεί, ο ατομικός λογαριασμός για τις γραμμές προκαταβολών θα παραμείνει κενός)
 ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Λογαριασμός (από το λογιστικό σχέδιο) που θα χρησιμοποιηθεί ως προεπιλογή
 UseAuxiliaryAccountOnSupplierDeposit=Αποθηκεύστε τον λογαριασμό προμηθευτή ως ατομικό λογαριασμό στο θυγατρικό καθολικό για γραμμές προκαταβολών (εάν απενεργοποιηθεί, ο ατομικός λογαριασμός για τις γραμμές προκαταβολών θα παραμείνει κενός)
+ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY=Λογαριασμός λογιστικής από προεπιλογή για την εγγραφή της εγγύησης που δόθηκε από τον πελάτη
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Λογαριασμός (από το λογιστικό σχέδιο) που θα χρησιμοποιηθεί ως ο προεπιλεγμένος λογαριασμός για τα προϊόντα που αγοράστηκαν στην ίδια χώρα (χρησιμοποιείται εάν δεν ορίζεται στο φύλλο προϊόντος)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Λογαριασμός (από το λογιστικό σχέδιο) που θα χρησιμοποιηθεί ως προεπιλεγμένος λογαριασμός για τα προϊόντα που αγοράστηκαν από την Ε.Ε. σε άλλη χώρα της Ε.Ε. (χρησιμοποιείται εάν δεν ορίζεται στο φύλλο προϊόντος)
@@ -217,7 +220,8 @@ Codejournal=Ημερολόγιο
 JournalLabel=Ετικέτα Ημερολογίου
 NumPiece=Αριθμός καταχώρησης
 TransactionNumShort=Αριθ. συναλλαγής
-AccountingCategory=Custom group of accounts
+AccountingCategory=Προσαρμοσμένη ομάδα λογαριασμών
+AccountingCategories=Προσαρμοσμένες ομάδες λογαριασμών
 GroupByAccountAccounting=Ομαδοποίηση ανά λογαριασμό γενικού καθολικού
 GroupBySubAccountAccounting=Ομαδοποίηση ανά λογαριασμό βοηθητικού καθολικού
 AccountingAccountGroupsDesc=Μπορείτε να ορίσετε εδώ ορισμένες ομάδες λογιστικού λογαριασμού. Θα χρησιμοποιηθούν για εξατομικευμένες λογιστικές εκθέσεις.
@@ -265,6 +269,7 @@ ShowSubtotalByGroup=Εμφάνιση υποσυνόλου ανά επίπεδο
 
 Pcgtype=Ομάδα του λογαριασμού
 PcgtypeDesc=Η ομάδα λογαριασμού χρησιμοποιείται ως προκαθορισμένο κριτήριο «φίλτρου» και «ομαδοποίησης» για ορισμένες λογιστικές αναφορές. Για παράδειγμα,  «ΕΣΟΔΑ» ή «ΕΞΟΔΑ» χρησιμοποιούνται ως ομάδες λογιστικών λογαριασμών προϊόντων για τη δημιουργία της αναφοράς εξόδων / εσόδων.
+AccountingCategoriesDesc=Η προσαρμοσμένη ομάδα λογαριασμών μπορεί να χρησιμοποιηθεί για την ομαδοποίηση λογιστικών λογαριασμών σε ένα όνομα για τη διευκόλυνση της χρήσης φίλτρου ή της δημιουργίας προσαρμοσμένων αναφορών.
 
 Reconcilable=Προς συμφωνία
 
@@ -277,7 +282,7 @@ DescVentilDoneCustomer=Δείτε εδώ τη λίστα με τις γραμμ
 DescVentilTodoCustomer=Δεσμεύστε τις γραμμές τιμολογίου που δεν έχουν ήδη δεσμευθεί με έναν λογαριασμό προϊόντος από το λογιστικό σχέδιο
 ChangeAccount=Αλλάξτε τον λογαριασμό προϊόντος/υπηρεσίας (από το λογιστικό σχέδιο) για τις επιλεγμένες γραμμές με τον ακόλουθο λογαριασμό:
 Vide=-
-DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product account from chart of account (only record not already transfered in accountancy are visible)
+DescVentilSupplier=Συμβουλευτείτε εδώ τη λίστα των γραμμών τιμολογίων προμηθευτή που είναι συνδεδεμένες ή δεν έχουν ακόμη δεσμευτεί σε λογαριασμό προϊόντος από το λογιστικό σχέδιο (μόνο το αρχείο που δεν έχει ήδη μεταφερθεί στη λογιστική είναι ορατό)
 DescVentilDoneSupplier=Συμβουλευτείτε εδώ τον κατάλογο των γραμμών των τιμολογίων προμηθευτών και του λογιστικού λογαριασμού τους
 DescVentilTodoExpenseReport=Δεσμεύστε τις γραμμές αναφοράς εξόδων που δεν έχουν ήδη δεσμευθεί με ένα Λογιστικός λογαριασμός αμοιβής
 DescVentilExpenseReport=Συμβουλευτείτε εδώ τον κατάλογο των γραμμών αναφοράς εξόδων που δεσμεύονται (ή όχι) σε ένα λογαριασμό λογιστικής αμοιβής
@@ -294,6 +299,7 @@ DescValidateMovements=Απαγορεύεται οποιαδήποτε τροπο
 
 ValidateHistory=Δεσμεύστε αυτόματα
 AutomaticBindingDone=Ολοκληρώθηκαν οι αυτόματες δεσμεύσεις (%s) - Δεν είναι δυνατή η αυτόματη δέσμευση για κάποιες εγγραφές (%s)
+DoManualBindingForFailedRecord=Πρέπει να κάνετε έναν χειροκίνητο σύνδεσμο για τις %s σειρές που δεν συνδέθηκαν αυτόματα.
 
 ErrorAccountancyCodeIsAlreadyUse=Σφάλμα, δεν μπορείτε να καταργήσετε ή να απενεργοποιήσετε αυτόν τον λογαριασμό του λογιστικού σχεδίου επειδή χρησιμοποιείται
 MvtNotCorrectlyBalanced=Η κίνηση δεν είναι σωστά ισοζυγισμένη. Χρέωση = %s & Πίστωση = %s
@@ -337,11 +343,13 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=Απενεργοποίηση δέσμευσ
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Απενεργοποίηση δέσμευσης και μεταφοράς των αγορών στη λογιστική (τα τιμολόγια προμηθευτών δεν θα λαμβάνονται υπόψη στη λογιστική)
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Απενεργοποίηση δέσμευσης και μεταφοράς των αναφορών εξόδων (στη λογιστική οι αναφορές εξόδων δεν θα ληφθούν υπόψη στη λογιστική)
 ACCOUNTING_ENABLE_LETTERING=Ενεργοποίηση της λειτουργίας συμφωνίας στη λογιστική
+ACCOUNTING_ENABLE_AUTOLETTERING=Ενεργοποιήστε την αυτόματη συμφωνία κατά τη μεταφορά στη λογιστική
 
 ## Export
 NotExportLettering=Μην εξάγετε τη συμφωνία κατά τη δημιουργία του αρχείου
 NotifiedExportDate=Επισημάνετε τις εξαγόμενες γραμμές ως Εξαγόμενες <span class="warning"> (για να τροποποιήσετε μια γραμμή, θα χρειαστεί να διαγράψετε ολόκληρη τη συναλλαγή και να τη μεταφέρετε ξανά στη λογιστική) </span>
 NotifiedValidationDate=Επικύρωση και Κλείδωμα των εξαγόμενων καταχωρήσεων <span class="warning"> (το ίδιο αποτέλεσμα με τη δυνατότητα "%s", η τροποποίηση και η διαγραφή των γραμμών ΣΙΓΟΥΡΑ δεν θα είναι δυνατή) </span>
+NotifiedExportFull=Εξαγωγή εγγράφων ;
 DateValidationAndLock=Ημερομηνία επικύρωσης και κλειδώματος
 ConfirmExportFile=Επιβεβαίωση δημιουργίας του λογιστικού αρχείου εξαγωγής ;
 ExportDraftJournal=Εξαγωγή προσχεδίου ημερολογίου
@@ -398,7 +406,7 @@ SaleLocal=Τοπική πώληση
 SaleExport=Εξαγωγική πώληση
 SaleEEC=Πώληση στην Ε.Ε.
 SaleEECWithVAT=Πώληση στην Ε.Ε. με μη μηδενικό ΦΠΑ, άρα υποθέτουμε ότι ΔΕΝ πρόκειται για ενδοκοινοτική πώληση και ο προτεινόμενος λογαριασμός είναι ο τυπικός λογαριασμός προϊόντος.
-SaleEECWithoutVATNumber=Πώληση στην Ε.Ε. χωρίς ΦΠΑ αλλά δεν έχει οριστεί το ΑΦΜ του τρίτου μέρους. Επιστρέφουμε στον λογαριασμό προϊόντος για τυπικές πωλήσεις. Μπορείτε να διορθώσετε το ΑΦΜ τρίτου μέρους ή τον λογαριασμό προϊόντος εάν χρειάζεται.
+SaleEECWithoutVATNumber=Πώληση στην Ε.Ε. χωρίς ΦΠΑ αλλά χωρίς ΑΦΜ τρίτου. Επιστρέφουμε στον λογαριασμό για τυπικές πωλήσεις. Μπορείτε να διορθώσετε το ΑΦΜ του τρίτου μέρους ή να αλλάξετε τον λογαριασμό προϊόντος που προτείνεται για δέσμευση, εάν χρειάζεται.
 ForbiddenTransactionAlreadyExported=Απαγορευμένο: Η συναλλαγή έχει επικυρωθεί ή/και έχει εξαχθεί.
 ForbiddenTransactionAlreadyValidated=Απαγορευμένο: Η συναλλαγή έχει επικυρωθεί.
 ## Dictionary
@@ -442,6 +450,7 @@ AccountancyErrorMismatchLetterCode=Αναντιστοιχία στον κώδι
 AccountancyErrorMismatchBalanceAmount=Το ισοζύγιο (%s) δεν είναι ίσο με 0
 AccountancyErrorLetteringBookkeeping=Παρουσιάστηκαν σφάλματα σχετικά με τις συναλλαγές: %s
 ErrorAccountNumberAlreadyExists=Ο λογιστικός αριθμός %s υπάρχει ήδη
+ErrorArchiveAddFile=Δεν είναι δυνατή η αρχειοθέτηση του αρχείου "%s" 
 
 ## Import
 ImportAccountingEntries=Λογιστικές εγγραφές
@@ -468,5 +477,7 @@ FECFormatMulticurrencyCode=Κωδικός πολλαπλών νομισμάτω
 DateExport=Ημερομηνία εξαγωγής
 WarningReportNotReliable=Προειδοποίηση, αυτή η αναφορά δεν βασίζεται στο Καθολικό, επομένως δεν περιέχει συναλλαγή που τροποποιήθηκε χειροκίνητα στο Καθολικό. Εάν τα ημερολόγια σας είναι ενημερωμένα, η προβολή της λογιστικής είναι πιο ακριβής.
 ExpenseReportJournal=Ημερολόγιο Αναφοράς Εξόδων
+DocsAlreadyExportedAreExcluded=Εξαιρούνται τα έγγραφα που έχουν ήδη εξαχθεί
+ClickToHideAlreadyExportedLines=Κάντε κλικ για απόκρυψη γραμμών που έχουν ήδη εξαχθεί
 
 NAccounts= %s  λογαριασμοί
diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang
index f48ca6d0304..8e30b738283 100644
--- a/htdocs/langs/el_GR/admin.lang
+++ b/htdocs/langs/el_GR/admin.lang
@@ -547,7 +547,7 @@ Module2Desc=Εμπορική διαχείριση
 Module10Name=Λογιστική (απλουστευμένη)
 Module10Desc=Απλές λογιστικές αναφορές (ημερολόγια, κύκλος εργασιών) με βάση το περιεχόμενο της βάσης δεδομένων. Δεν χρησιμοποιεί κανένα πίνακα καθολικών.
 Module20Name=Προσφορές
-Module20Desc=Διαχείριση εμπορικών προσφορών
+Module20Desc=Διαχείριση προσφορών
 Module22Name=Μαζική αποστολή e-mail
 Module22Desc=Διαχείριση μαζικής αποστολής email
 Module23Name=Ενέργεια
@@ -611,7 +611,7 @@ Module320Desc=Προσθέστε μια ροή RSS στις σελίδες Dolib
 Module330Name=Σελιδοδείκτες και συντομεύσεις
 Module330Desc=Δημιουργήστε συντομεύσεις, πάντα προσιτές, στις εσωτερικές ή εξωτερικές σελίδες στις οποίες έχετε συχνά πρόσβαση
 Module400Name=Έργα ή προοπτικές
-Module400Desc=Διαχείριση έργων, προοπτικών/ευκαιριών ή/και εργασιών. Μπορείτε επίσης να αντιστοιχίσετε οποιοδήποτε στοιχείο (τιμολόγιο, παραγγελία, πρόταση, παρέμβαση, ...) σε ένα έργο και να λάβετε μια εγκάρσια προβολή από την προβολή έργου.
+Module400Desc=Διαχείριση έργων, προοπτικών/ευκαιριών ή/και εργασιών. Μπορείτε επίσης να αντιστοιχίσετε οποιοδήποτε στοιχείο (τιμολόγιο, παραγγελία, προσφορά, παρέμβαση, ...) σε ένα έργο και να λάβετε μια εγκάρσια προβολή από την προβολή έργου.
 Module410Name=Ημερολόγιο ιστού
 Module410Desc=Ενσωμάτωση ημερολογίου ιστού
 Module500Name=Φόροι & Ειδικά Έξοδα
@@ -645,6 +645,8 @@ Module2300Name=Προγραμματισμένες εργασίες
 Module2300Desc=Διαχείριση προγραμματισμένων εργασιών (alias cron ή chrono table)
 Module2400Name=Συμβάντα / Ατζέντα
 Module2400Desc=Παρακολούθηση συμβάντων. Καταγράψτε αυτόματα συμβάντα για σκοπούς παρακολούθησης ή καταγράψτε μη αυτόματα συμβάντα ή συσκέψεις. Αυτή είναι η κύρια ενότητα για την καλή διαχείριση σχέσεων πελατών ή προμηθευτών.
+Module2430Name=Σύστημα Ημερολογίου Κρατήσεων
+Module2430Desc=Ενα διαδικτυακό ημερολόγιο για να επιτρέψετε σε οποιονδήποτε να κάνει κράτηση για ραντεβού, σε προκαθορισμένα χρονικά περιθώρια ή διαθεσιμότητες.
 Module2500Name=DMS / ECM
 Module2500Desc=Σύστημα Διαχείρισης Εγγράφων / Ηλεκτρονική Διαχείριση Περιεχομένου. Αυτόματη οργάνωση των παραγόμενων ή αποθηκευμένων εγγράφων σας. Μοιραστείτε τα όταν χρειάζεστε.
 Module2600Name=API / Web services (SOAP server)
@@ -660,6 +662,8 @@ Module2900Name=GeoIP Maxmind
 Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3200Name=Αναλλοίωτα αρχεία
 Module3200Desc=Ενεργοποιήστε ένα αναλλοίωτο αρχείο καταγραφής επιχειρηματικών εκδηλώσεων. Τα συμβάντα αρχειοθετούνται σε πραγματικό χρόνο. Το αρχείο καταγραφής είναι ένας πίνακας μόνο για ανάγνωση των αλυσιδωτών συμβάντων που μπορούν να εξαχθούν. Αυτή η ενότητα μπορεί να είναι υποχρεωτική για ορισμένες χώρες.
+Module3300Name=Module Builder
+Module3200Desc=Ενεργοποιήστε ένα αναλλοίωτο αρχείο καταγραφής επιχειρηματικών εκδηλώσεων. Τα συμβάντα αρχειοθετούνται σε πραγματικό χρόνο. Το αρχείο καταγραφής είναι ένας πίνακας μόνο για ανάγνωση των αλυσιδωτών συμβάντων που μπορούν να εξαχθούν. Αυτή η ενότητα μπορεί να είναι υποχρεωτική για ορισμένες χώρες.
 Module3400Name=Κοινωνικά Δίκτυα
 Module3400Desc=Ενεργοποιήστε τα πεδία Κοινωνικών Δικτύων σε τρίτα μέρη και διευθύνσεις (skype, twitter, facebook, ...).
 Module4000Name=HRM
@@ -708,13 +712,13 @@ Permission14=Επικύρωση τιμολογίων πελατών
 Permission15=Αποστολή τιμολογίων πελατών μέσω ηλεκτρονικού ταχυδρομείου
 Permission16=Δημιουργία πληρωμών για τιμολόγια πελατών
 Permission19=Διαγραφή τιμολογίων πελατών
-Permission21=Ανάγνωση εμπορικών προτάσεων
-Permission22=Δημιουργία / τροποποίηση εμπορικών προτάσεων
-Permission24=Επικύρωση εμπορικών προτάσεων
-Permission25=Αποστολή εμπορικών προτάσεων
-Permission26=Κλείσιμο εμπορικών προτάσεων
-Permission27=Διαγραφή εμπορικών προτάσεων
-Permission28=Εξαγωγή εμπορικών προτάσεων
+Permission21=Ανάγνωση προσφορών
+Permission22=Δημιουργία / τροποποίηση προσφορών
+Permission24=Επικύρωση προσφορών
+Permission25=Αποστολή προσφορών
+Permission26=Κλείσιμο προσφορών
+Permission27=Διαγραφή προσφορών
+Permission28=Εξαγωγή προσφορών
 Permission31=Ανάγνωση προϊόντων
 Permission32=Δημιουργία / τροποποίηση προϊόντων
 Permission33=Ανάγνωση τιμών προϊόντων
@@ -833,7 +837,7 @@ PermissionAdvanced253=Δημιουργία / τροποποίηση εσωτερ
 Permission254=Δημιουργία / τροποποίηση μόνο εξωτερικών χρηστών
 Permission255=Τροποποίηση κωδικού πρόσβασης άλλων χρηστών
 Permission256=Διαγραφή ή απενεργοποίηση άλλων χρήστων
-Permission262=Επέκταση της πρόσβασης σε όλα τα τρίτα μέρη ΚΑΙ τα αντικείμενά τους (όχι μόνο τρίτα μέρη για τα οποία ο χρήστης είναι αντιπρόσωπος πωλήσεων).<br> Δεν είναι αποτελεσματικό για εξωτερικούς χρήστες (περιορίζονται πάντα στους εαυτούς τους για προτάσεις, παραγγελίες, τιμολόγια, συμβάσεις κ.λπ.). <br> Δεν ισχύει για έργα (μόνο σε κανόνες για τις άδειες έργων, την προβολή και τα θέματα ανάθεσης).
+Permission262=Επέκταση της πρόσβασης σε όλα τα τρίτα μέρη ΚΑΙ τα αντικείμενά τους (όχι μόνο τρίτα μέρη για τα οποία ο χρήστης είναι αντιπρόσωπος πωλήσεων).<br> Δεν είναι αποτελεσματικό για εξωτερικούς χρήστες (περιορίζονται πάντα στους εαυτούς τους για προσφορές, παραγγελίες, τιμολόγια, συμβάσεις κ.λπ.). <br> Δεν ισχύει για έργα (μόνο σε κανόνες για τις άδειες έργων, την προβολή και τα θέματα ανάθεσης).
 Permission263=Επέκταση της πρόσβασης σε όλα τα τρίτα μέρη ΧΩΡΙΣ τα αντικείμενά τους (όχι μόνο τρίτα μέρη για τα οποία ο χρήστης είναι αντιπρόσωπος πωλήσεων). <br> Δεν είναι αποτελεσματικό για εξωτερικούς χρήστες (περιορίζονται πάντα στους εαυτούς τους για προτάσεις, παραγγελίες, τιμολόγια, συμβάσεις κ.λπ.). <br> Δεν ισχύει για έργα (μόνο σε κανόνες για τις άδειες έργων, την προβολή και τα θέματα ανάθεσης).
 Permission271=Ανάγνωση CA
 Permission272=Ανάγνωση τιμολογίων
@@ -1270,6 +1274,7 @@ TriggerActiveAsModuleActive=Τα triggers σε αυτό το αρχείο είν
 GeneratedPasswordDesc=Επιλέξτε τη μέθοδο που θα χρησιμοποιηθεί για κωδικούς πρόσβασης που δημιουργούνται αυτόματα.
 DictionaryDesc=Εισάγετε όλα τα δεδομένα αναφοράς. Μπορείτε να προσθέσετε τις τιμές σας στην προεπιλογή.
 ConstDesc=Αυτή η σελίδα επιτρέπει την επεξεργασία (αντικατάσταση) παραμέτρων που δεν είναι διαθέσιμες σε άλλες σελίδες. Αυτές είναι κυρίως δεσμευμένες παράμετροι για προγραμματιστές/ προχωρημένη αντιμετώπιση προβλημάτων μόνο. 
+MiscellaneousOptions=Διάφορες επιλογές
 MiscellaneousDesc=Όλες οι άλλες παράμετροι που σχετίζονται με την ασφάλεια ορίζονται εδώ.
 LimitsSetup=Ρύθμιση Ορίων/Ακριβείας
 LimitsDesc=Μπορείτε να ορίσετε όρια, ακρίβεια και βελτιστοποιήσεις που χρησιμοποιούνται από το Dolibarr εδώ
@@ -1445,9 +1450,9 @@ SuppliersPayment=Πληρωμές προμηθευτών
 SupplierPaymentSetup=Ρύθμιση πληρωμών προμηθευτή
 InvoiceCheckPosteriorDate=Ελέγξτε την ημερομηνία του παραστατικού πριν από την επικύρωση
 InvoiceCheckPosteriorDateHelp=Η επικύρωση ενός τιμολογίου θα απαγορεύεται εάν η ημερομηνία του είναι προγενέστερη από την ημερομηνία του τελευταίου τιμολογίου του ίδιου τύπου.
-InvoiceOptionCategoryOfOperations=Display the mention "category of operations" on the invoice.
-InvoiceOptionCategoryOfOperationsHelp=Depending on the situation, the mention will appear in the form:<br>- Category of operations: Delivery of goods<br>- Category of operations: Provision of services<br>- Category of operations: Mixed - Delivery of goods & provision of services
-InvoiceOptionCategoryOfOperationsYes1=Yes, below the address block
+InvoiceOptionCategoryOfOperations=Εμφάνιση της αναφοράς «κατηγορία πράξεων» στο τιμολόγιο.
+InvoiceOptionCategoryOfOperationsHelp=Ανάλογα με την κατάσταση, η αναφορά θα εμφανίζεται με τη μορφή: <br> - Κατηγορία πράξεων: Παράδοση αγαθών <br> - Κατηγορία πράξεων: Παροχή υπηρεσιών <br> - Κατηγορία πράξεων: Μικτή Παράδοση αγαθών & Παροχή υπηρεσιών
+InvoiceOptionCategoryOfOperationsYes1=Ναι, κάτω από το μπλοκ διευθύνσεων
 InvoiceOptionCategoryOfOperationsYes2=Ναι, στην κάτω αριστερή γωνία
 ##### Proposals #####
 PropalSetup=Ρύθμιση ενότητας εμπορικών προσφορών
@@ -1758,7 +1763,7 @@ ActivateFCKeditor=Ενεργοποιήστε το προηγμένο πρόγρ
 FCKeditorForNotePublic=WYSIWYG δημιουργία/έκδοση του πεδίου «δημόσιες σημειώσεις» στοιχείων
 FCKeditorForNotePrivate=WYSIWYG δημιουργία/έκδοση του πεδίου "ιδιωτικές σημειώσεις" στοιχείων
 FCKeditorForCompany=WYSIWYG δημιουργία/έκδοση της περιγραφής πεδίου στοιχείων (εκτός προϊόντων/υπηρεσιών)
-FCKeditorForProductDetails=WYSIWIG δημιουργία/διόρθωση περιγραφής προϊόντων ή γραμμών για αντικείμενα (γραμμές προσφορών, παραγγελίες, τιμολόγια κ.λπ...).
+FCKeditorForProductDetails=WYSIWYG δημιουργία/διόρθωση περιγραφής προϊόντων ή γραμμών για αντικείμενα (γραμμές προσφορών, παραγγελίες, τιμολόγια κ.λπ...).
 FCKeditorForProductDetails2=Προειδοποίηση: Η χρήση αυτής της επιλογής για αυτήν την περίπτωση δεν συνιστάται, καθώς μπορεί να δημιουργήσει προβλήματα με ειδικούς χαρακτήρες και τη μορφοποίηση σελίδας κατά τη δημιουργία αρχείων PDF.
 FCKeditorForMailing= Δημιουργία / έκδοση WYSIWYG για μαζικά eMailings (Εργαλεία-> eMailing)
 FCKeditorForUserSignature=WYSIWYG δημιουργία/έκδοση υπογραφής χρήστη
@@ -1826,6 +1831,9 @@ AGENDA_USE_EVENT_TYPE=Χρήση τύπων συμβάντων (διαχείρι
 AGENDA_USE_EVENT_TYPE_DEFAULT=Αυτόματη ρύθμιση αυτής της προεπιλεγμένης τιμής για τον τύπο συμβάντος στη φόρμα δημιουργίας συμβάντος
 AGENDA_DEFAULT_FILTER_TYPE=Αυτόματη ρύθμιση αυτού του τύπου συμβάντος στο φίλτρο αναζήτησης της προβολής ατζέντας
 AGENDA_DEFAULT_FILTER_STATUS=Αυτόματη ρύθμιση αυτής της κατάστασης για συμβάντα στο φίλτρο αναζήτησης της προβολής ατζέντας
+AGENDA_EVENT_PAST_COLOR=Χρώμα παρελθόντος συμβάντος
+AGENDA_EVENT_CURRENT_COLOR=Χρώμα τρέχοντος συμβάντος
+AGENDA_EVENT_FUTURE_COLOR=Χρώμα μελλοντικής εκδήλωσης
 AGENDA_DEFAULT_VIEW=Ποια προβολή θέλετε να ανοίγετε από προεπιλογή όταν επιλέγετε το μενού Ατζέντα
 AGENDA_REMINDER_BROWSER=Ενεργοποίηση υπενθύμισης συμβάντος <b> στο πρόγραμμα περιήγησης του χρήστη </b> (Όταν φτάσει η ημερομηνία υπενθύμισης, εμφανίζεται ένα αναδυόμενο παράθυρο από το πρόγραμμα περιήγησης. Κάθε χρήστης μπορεί να απενεργοποιήσει τέτοιες ειδοποιήσεις από τη ρύθμιση ειδοποιήσεων του προγράμματος περιήγησης του).
 AGENDA_REMINDER_BROWSER_SOUND=Ενεργοποίηση ειδοποίησης ήχου
@@ -2129,6 +2137,7 @@ CodeLastResult=Κωδικός Τελευταίου αποτελέσματος
 NbOfEmailsInInbox=Αριθμός email στον κατάλογο προέλευσης
 LoadThirdPartyFromName=Φόρτωση αναζήτησης τρίτου μέρους στο %s (μόνο φόρτωση)
 LoadThirdPartyFromNameOrCreate=Φόρτωση αναζήτησης τρίτου μέρους στο %s (δημιουργία αν δεν βρεθεί)
+LoadContactFromEmailOrCreate=Φόρτωση αναζήτησης επαφής στο %s (δημιουργία αν δεν βρεθεί)
 AttachJoinedDocumentsToObject=Αποθηκεύστε τα συνημμένα αρχεία σε έγγραφα αντικειμένων εάν βρεθεί μια αναφορά ενός αντικειμένου στο θέμα του email.
 WithDolTrackingID=Μήνυμα από μια συνομιλία που ξεκίνησε από ένα πρώτο email που στάλθηκε από το Dolibarr
 WithoutDolTrackingID=Μήνυμα από μια συνομιλία που ξεκίνησε από ένα πρώτο email που ΔΕΝ εστάλη από το Dolibarr
@@ -2355,3 +2364,5 @@ AllowExternalDownload=Να επιτρέπεται εξωτερική λήψη (
 DeadlineDayVATSubmission=Προθεσμία υποβολής ΦΠΑ για τον επόμενο μήνα
 MaxNumberOfAttachementOnForms=Μέγιστος αριθμός επισυναπτόμενων αρχείων σε μια φόρμα
 IfDefinedUseAValueBeetween=Εάν ορίζεται, χρησιμοποιήστε μια τιμή μεταξύ %s και %s
+Reload=Επαναφόρτωση
+ConfirmReload=Επιβεβαίωση επαναφόρτωσης της μονάδας
diff --git a/htdocs/langs/el_GR/bills.lang b/htdocs/langs/el_GR/bills.lang
index 8fed9327ac5..3f07afff034 100644
--- a/htdocs/langs/el_GR/bills.lang
+++ b/htdocs/langs/el_GR/bills.lang
@@ -627,7 +627,7 @@ SendEmailsRemindersOnInvoiceDueDate=Αποστολή υπενθύμισης μέ
 MakePaymentAndClassifyPayed=Καταγραφή πληρωμής
 BulkPaymentNotPossibleForInvoice=Δεν είναι δυνατή η μαζική πληρωμή για το τιμολόγιο %s (λάθος τύπος ή κατάσταση)
 MentionVATDebitOptionIsOn=Δυνατότητα πληρωμής φόρου βάσει χρεώσεων
-MentionCategoryOfOperations=Category of operations
+MentionCategoryOfOperations=Κατηγορία πράξεων
 MentionCategoryOfOperations0=Διανομή αγαθών
 MentionCategoryOfOperations1=Παροχή υπηρεσιών
-MentionCategoryOfOperations2=Mixed - Delivery of goods & provision of services
+MentionCategoryOfOperations2=Μικτή - Παράδοση αγαθών & παροχή υπηρεσιών
diff --git a/htdocs/langs/el_GR/boxes.lang b/htdocs/langs/el_GR/boxes.lang
index c3728d5600e..03f769b4c26 100644
--- a/htdocs/langs/el_GR/boxes.lang
+++ b/htdocs/langs/el_GR/boxes.lang
@@ -9,7 +9,7 @@ BoxLastSupplierBills=Τελευταία τιμολόγια προμηθευτή
 BoxLastCustomerBills=Τελευταία τιμολόγια πελατών
 BoxOldestUnpaidCustomerBills=Παλαιότερα μη πληρωμένα τιμολόγια πελατών
 BoxOldestUnpaidSupplierBills=Παλαιότερα μη πληρωμένα τιμολόγια προμηθευτών
-BoxLastProposals=Τελευταίες εμπορικές προτάσεις
+BoxLastProposals=Τελευταίες προσφορές
 BoxLastProspects=Τελευταίες τροποποιημένες προοπτικές
 BoxLastCustomers=Τελευταίοι τροποποιημένοι πελάτες
 BoxLastSuppliers=Τελευταίοι τροποποιημένοι προμηθευτές
@@ -24,6 +24,7 @@ BoxFicheInter=Τελευταίες παρεμβάσεις
 BoxCurrentAccounts=Ισοζύγιο ανοιχτών λογαριασμών
 BoxTitleMemberNextBirthdays=Γενέθλια αυτού του μήνα (μέλη)
 BoxTitleMembersByType=Μέλη ανά τύπο και κατάσταση
+BoxTitleMembersByTags=Μέλη ανά ετικέτα και κατάσταση
 BoxTitleMembersSubscriptionsByYear=Συνδρομές μελών ανά έτος
 BoxTitleLastRssInfos=Τα τελευταία %s νέα από %s
 BoxTitleLastProducts=Προϊόντα / Υπηρεσίες: τελευταία %s τροποποιημένα
diff --git a/htdocs/langs/el_GR/commercial.lang b/htdocs/langs/el_GR/commercial.lang
index 746c112fe41..8d91921c35b 100644
--- a/htdocs/langs/el_GR/commercial.lang
+++ b/htdocs/langs/el_GR/commercial.lang
@@ -50,7 +50,7 @@ ActionAffectedTo=Η ενέργεια αφορά τον/την
 ActionDoneBy=Η ενέργεια έγινε από τον/την
 ActionAC_TEL=Τηλεφώνημα
 ActionAC_FAX=Αποστολή fax
-ActionAC_PROP=Αποστολή προσφορας με email
+ActionAC_PROP=Αποστολή προσφοράς με email
 ActionAC_EMAIL=Αποστολή email
 ActionAC_EMAIL_IN=Λήψη email
 ActionAC_RDV=Συναντήσεις
@@ -74,8 +74,16 @@ StatusProsp=Κατάσταση προοπτικής
 DraftPropals=Προσχέδιο προσφορών
 NoLimit=Κανένα όριο
 ToOfferALinkForOnlineSignature=Σύνδεσμος για ηλεκτρονική υπογραφή
-WelcomeOnOnlineSignaturePage=Καλώς ήρθατε στη σελίδα αποδοχής εμπορικών προτάσεων από  %s
-ThisScreenAllowsYouToSignDocFrom=Αυτή η οθόνη σάς επιτρέπει να αποδεχτείτε και να υπογράψετε ή να αρνηθείτε μια προσφορά
-ThisIsInformationOnDocumentToSign=Αυτές είναι οι πληροφορίες σχετικά με το έγγραφο προς αποδοχή ή απορρίψη
+WelcomeOnOnlineSignaturePageProposal=Καλώς ήρθατε στη σελίδα αποδοχής εμπορικών προσφορών από  %s
+WelcomeOnOnlineSignaturePageContract=Καλώς ορίσατε στη σελίδα υπογραφής PDF της σύμβασης %s
+WelcomeOnOnlineSignaturePageFichinter=Καλώς ορίσατε στη σελίδα υπογραφής PDF της παρέμβασης %s
+ThisScreenAllowsYouToSignDocFromProposal=Αυτή η οθόνη σάς επιτρέπει να αποδεχτείτε και να υπογράψετε ή να αρνηθείτε μια προσφορά
+ThisScreenAllowsYouToSignDocFromContract=Αυτή η οθόνη σάς επιτρέπει την online υπογραφή σύμβασης σε μορφή PDF.
+ThisScreenAllowsYouToSignDocFromFichinter=Αυτή η οθόνη σάς επιτρέπει να υπογράψετε διαδικτυακή παρέμβαση σε μορφή PDF.
+ThisIsInformationOnDocumentToSignProposal=Αυτές είναι οι πληροφορίες σχετικά με το έγγραφο προς αποδοχή ή απόρριψη
+ThisIsInformationOnDocumentToSignContract=Αυτές είναι πληροφορίες για την σύμβαση προς υπογραφή
+ThisIsInformationOnDocumentToSignFichinter=Αυτές είναι πληροφορίες σχετικά με την παρέμβαση προς υπογραφή
 SignatureProposalRef=Υπογραφή προσφοράς / εμπορικής πρότασης %s
+SignatureContractRef=Υπογραφή σύμβασης %s
+SignatureFichinterRef=Υπογραφή παρέμβασης %s
 FeatureOnlineSignDisabled=Η δυνατότητα για ηλεκτρονική υπογραφή απενεργοποιήθηκε ή δημιουργήθηκε έγγραφο πριν από την ενεργοποίηση της δυνατότητας
diff --git a/htdocs/langs/el_GR/companies.lang b/htdocs/langs/el_GR/companies.lang
index 661a9fe9688..3ec8674c6ba 100644
--- a/htdocs/langs/el_GR/companies.lang
+++ b/htdocs/langs/el_GR/companies.lang
@@ -53,7 +53,7 @@ RegisteredOffice=Έδρα της εταιρείας
 Lastname=Επίθετο
 Firstname=Όνομα
 RefEmployee=Κωδικός εργαζομένου
-NationalRegistrationNumber=National registration number
+NationalRegistrationNumber=Εθνικός αριθμός μητρώου
 PostOrFunction=Θέση εργασίας
 UserTitle=Τίτλος
 NatureOfThirdParty=Φύση του τρίτου μέρους
@@ -103,8 +103,8 @@ LocalTax2IsUsedES= IRPF is used
 LocalTax2IsNotUsedES= IRPF is not used
 WrongCustomerCode=Άκυρος κωδικός πελάτη
 WrongSupplierCode=Άκυρος κωδικός προμηθευτή
-CustomerCodeModel=Μοντέλο κωδικού πελάτη
-SupplierCodeModel=Μοντέλο κωδικού προμηθευτή
+CustomerCodeModel=Υπόδειγμα κωδικού πελάτη
+SupplierCodeModel=Υπόδειγμα κωδικού προμηθευτή
 Gencod=Barcode
 GencodBuyPrice=Barcode αναφοράς τιμής
 ##### Professional ID #####
@@ -312,12 +312,12 @@ CustomerRelativeDiscountShort=Σχετική έκπτωση
 CustomerAbsoluteDiscountShort=Απόλυτη έκπτωση
 CompanyHasRelativeDiscount=Αυτός ο πελάτης έχει προεπιλεγμένη έκπτωση <b> %s%% </b>
 CompanyHasNoRelativeDiscount=Αυτός ο πελάτης δεν έχει σχετική έκπτωση από προεπιλογή
-HasRelativeDiscountFromSupplier=Έχετε προεπιλεγμένη έκπτωση <b>%s%%</b> από αυτόν τον προμηθευτή
-HasNoRelativeDiscountFromSupplier=Δεν έχετε προεπιλεγμένη σχετική έκπτωση από αυτόν τον προμηθευτή
+HasRelativeDiscountFromSupplier=Έχετε μια προεπιλεγμένη έκπτωση <b> %s%% </b> από αυτόν τον προμηθευτή
+HasNoRelativeDiscountFromSupplier=Δεν υπάρχει προεπιλεγμένη σχετική έκπτωση από αυτόν τον προμηθευτή
 CompanyHasAbsoluteDiscount=Αυτός ο πελάτης έχει διαθέσιμες εκπτώσεις (πιστωτικές σημειώσεις ή προκαταβολές) για <b> %s </b> %s
 CompanyHasDownPaymentOrCommercialDiscount=Αυτός ο πελάτης έχει διαθέσιμες εκπτώσεις (εμπορικές, προκαταβολές) για <b>%s</b> %s
 CompanyHasCreditNote=Αυτός ο πελάτης έχει ακόμα πιστωτικές σημειώσεις για <b> %s </b> %s
-HasNoAbsoluteDiscountFromSupplier=Δεν έχετε διαθέσιμη πίστωση έκπτωσης από αυτόν τον προμηθευτή
+HasNoAbsoluteDiscountFromSupplier=Δεν διατίθεται έκπτωση/πίστωση από αυτόν τον προμηθευτή
 HasAbsoluteDiscountFromSupplier=Έχετε διαθέσιμες εκπτώσεις (πιστωτικές σημειώσεις ή προκαταβολές) για <b>%s</b> %s από αυτόν τον προμηθευτή
 HasDownPaymentOrCommercialDiscountFromSupplier=Έχετε διαθέσιμες εκπτώσεις (εμπορικές, προκαταβολές) για <b>%s</b> %s από αυτόν τον προμηθευτή
 HasCreditNoteFromSupplier=Έχετε πιστωτικές σημειώσεις για <b>%s</b> %s από αυτόν τον προμηθευτή
@@ -444,7 +444,7 @@ AddAddress=Προσθήκη διεύθυνσης
 SupplierCategory=Κατηγορία προμηθευτή
 JuridicalStatus200=Ανεξάρτητος
 DeleteFile=Διαγραφή Αρχείου
-ConfirmDeleteFile=Είστε σίγουροι ότι θέλετε να διαγράψετε το αρχείο;
+ConfirmDeleteFile=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτό το αρχείο <b> %s </b>;
 AllocateCommercial=Ανατέθηκε σε αντιπρόσωπο πωλήσεων
 Organization=Οργανισμός
 FiscalYearInformation=Οικονομικό έτος
@@ -498,3 +498,8 @@ RestOfEurope=Υπόλοιπη Ευρώπη (ΕΕ)
 OutOfEurope=Εκτός Ευρώπης (ΕΕ)
 CurrentOutstandingBillLate=Καθυστερημένος ανεξόφλητος λογαριασμός
 BecarefullChangeThirdpartyBeforeAddProductToInvoice=Προσοχή, ανάλογα με τις ρυθμίσεις τιμής του προϊόντος σας, θα πρέπει να αλλάξετε το Τρίτο Μέρος πριν προσθέσετε το προϊόν στο POS.
+EmailAlreadyExistsPleaseRewriteYourCompanyName=Το email υπάρχει ήδη, ξαναγράψτε το όνομα της εταιρείας σας
+TwoRecordsOfCompanyName=υπάρχουν περισσότερες από μια εγγραφή για αυτήν την εταιρεία, επικοινωνήστε μαζί μας για να ολοκληρώσετε το αίτημα συνεργασίας σας
+CompanySection=Τμήμα εταιρείας
+ShowSocialNetworks=Εμφάνιση κοινωνικών δικτύων
+HideSocialNetworks=Απόκρυψη κοινωνικών δικτύων
diff --git a/htdocs/langs/el_GR/errors.lang b/htdocs/langs/el_GR/errors.lang
index 6b3bd6c7ef3..89f518ceea0 100644
--- a/htdocs/langs/el_GR/errors.lang
+++ b/htdocs/langs/el_GR/errors.lang
@@ -303,6 +303,7 @@ ErrorValueForTooLow=Η τιμή για <b> %s </b> είναι πολύ χαμη
 ErrorValueCantBeNull=Η τιμή για <b> %s </b> δεν μπορεί να είναι μηδενική
 ErrorDateOfMovementLowerThanDateOfFileTransmission=Η ημερομηνία της τραπεζικής συναλλαγής δεν μπορεί να είναι παλαιότερη από την ημερομηνία αποστολής του αρχείου
 ErrorTooMuchFileInForm=Πάρα πολλά αρχεία στην φόρμα, ο μέγιστος αριθμός είναι %s αρχεία 
+ErrorSessionInvalidatedAfterPasswordChange=Η συνεδρία ακυρώθηκε μετά από αλλαγή κωδικού πρόσβασης, κατάστασης ή ημερομηνιών εγκυρότητας. Παρακαλώ συνδεθείτε ξανά.
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Η παράμετρος PHP upload_max_filesize (%s) είναι υψηλότερη από την παράμετρο PHP post_max_size (%s). Αυτή δεν είναι μια συνεπής ρύθμιση.
@@ -325,6 +326,7 @@ WarningPaymentDateLowerThanInvoiceDate=Η ημερομηνία πληρωμής
 WarningTooManyDataPleaseUseMoreFilters=Πάρα πολλά δεδομένα (περισσότερες από %sγραμμές). Χρησιμοποιήστε περισσότερα φίλτρα ή ορίστε τη σταθερά %s σε υψηλότερο όριο.
 WarningSomeLinesWithNullHourlyRate=Κάποιοι χρόνοι καταγράφηκαν από ορισμένους χρήστες ενώ η ωριαία τιμή τους δεν είχε καθοριστεί. Χρησιμοποιήθηκε μια τιμή 0 %s ανά ώρα, αλλά αυτό μπορεί να οδηγήσει σε λανθασμένη εκτίμηση του χρόνου που δαπανήθηκε.
 WarningYourLoginWasModifiedPleaseLogin=Η σύνδεσή σας τροποποιήθηκε. Για λόγους ασφαλείας θα πρέπει να συνδεθείτε με τη νέα σας σύνδεση πριν από την επόμενη ενέργεια.
+WarningYourPasswordWasModifiedPleaseLogin=Ο κωδικός πρόσβασης σας τροποποιήθηκε. Για λόγους ασφαλείας θα πρέπει να συνδεθείτε τώρα με τον νέο σας κωδικό πρόσβασης.
 WarningAnEntryAlreadyExistForTransKey=Υπάρχει ήδη μια καταχώριση για το κλειδί μετάφρασης για αυτήν τη γλώσσα
 WarningNumberOfRecipientIsRestrictedInMassAction=Προειδοποίηση, ο αριθμός διαφορετικών παραληπτών περιορίζεται σε <b>%s</b> όταν χρησιμοποιείτε τις μαζικές ενέργειες σε λίστες
 WarningDateOfLineMustBeInExpenseReportRange=Προειδοποίηση, η ημερομηνία γραμμής δεν είναι στο εύρος της αναφοράς εξόδων
diff --git a/htdocs/langs/el_GR/eventorganization.lang b/htdocs/langs/el_GR/eventorganization.lang
index 323f4f14049..1788d3d80bf 100644
--- a/htdocs/langs/el_GR/eventorganization.lang
+++ b/htdocs/langs/el_GR/eventorganization.lang
@@ -172,3 +172,5 @@ ErrorSeveralCompaniesWithEmailContactUs=Έχουν βρεθεί πολλές ε
 ErrorSeveralCompaniesWithNameContactUs=Έχουν βρεθεί πολλές εταιρείες με αυτό το όνομα, επομένως δεν μπορούμε να επικυρώσουμε αυτόματα την εγγραφή σας. Παρακαλώ επικοινωνήστε μαζί μας στο %s
 NoPublicActionsAllowedForThisEvent=Καμία δημόσια δράση δεν είναι ανοιχτή στο κοινό για αυτήν την εκδήλωση
 MaxNbOfAttendees=Μέγιστος αριθμός συμμετεχόντων
+DateStartEvent=Ημερομηνία έναρξης εκδήλωσης
+DateEndEvent=Ημερομηνία λήξης εκδήλωσης
diff --git a/htdocs/langs/el_GR/holiday.lang b/htdocs/langs/el_GR/holiday.lang
index 63b8a5d3c3b..5369f65d7b8 100644
--- a/htdocs/langs/el_GR/holiday.lang
+++ b/htdocs/langs/el_GR/holiday.lang
@@ -1,9 +1,11 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Αδεια
+Holidays=Άδειες
+Holiday=Άδεια
 CPTitreMenu=Αδεια
 MenuReportMonth=Μηνιαία αναφορά
 MenuAddCP=Νέα αίτηση άδειας
+MenuCollectiveAddCP=Νέα αίτηση συλλογικής άδειας
 NotActiveModCP=Πρέπει να ενεργοποιήσετε την ενότητα Άδειες για να δείτε αυτήν τη σελίδα.
 AddCP=Κάντε αίτηση άδειας
 DateDebCP=Ημερ. έναρξης
@@ -19,10 +21,10 @@ Leave=Αίτημα άδειας
 LeaveId=Αναγνωριστικό άδειας
 ReviewedByCP=Θα εγκριθεί από
 UserID=Αναγνωριστικό χρήστη
-UserForApprovalID=Χρήστη για αναγνωριστικό έγκρισης
-UserForApprovalFirstname=Όνομα του χρήστη της έγκρισης
-UserForApprovalLastname=Επώνυμο του χρήστη της έγκρισης
-UserForApprovalLogin=Σύνδεση χρήστη έγκρισης
+UserForApprovalID=Αναγνωριστικό Χρήστη έγκρισης
+UserForApprovalFirstname=Όνομα χρήστη έγκρισης
+UserForApprovalLastname=Επώνυμο του χρήστη έγκρισης
+UserForApprovalLogin=Όνομα σύνδεσης χρήστη έγκρισης
 DescCP=Περιγραφή
 SendRequestCP=Δημιουργία αιτήματος άδειας
 DelayToRequestCP=Τα αιτήματα αδείας πρέπει να υποβάλλονται τουλάχιστον <b> %s ημέρα(ες) </b> πριν από αυτές.
@@ -56,6 +58,7 @@ ConfirmDeleteCP=Επιβεβαίωση διαγραφής αυτής της αί
 ErrorCantDeleteCP=Σφάλμα δεν έχετε το δικαίωμα να διαγράψετε αυτό το αίτημα άδειας.
 CantCreateCP=Δεν έχετε το δικαίωμα να κάνετε αιτήματα άδειας.
 InvalidValidatorCP=Πρέπει να επιλέξεις τον προϊστάμενο για την αίτηση άδειας σου.
+InvalidValidator=Ο χρήστης που επιλέχθηκε δεν είναι υπεύθυνος έγκρισης.
 NoDateDebut=Πρέπει να επιλέξετε μια ημερομηνία έναρξης.
 NoDateFin=Πρέπει να επιλέξετε μια ημερομηνία λήξης.
 ErrorDureeCP=Η αίτηση άδειας δεν περιέχει εργάσιμες ημέρες
@@ -73,12 +76,14 @@ DetailRefusCP=Λόγος για την απόρριψη
 DateRefusCP=Ημερομηνία απόρριψης
 DateCancelCP=Ημερομηνία ακύρωσης
 DefineEventUserCP=Αναθέστε μια έκτακτη άδεια για έναν χρήστη
-addEventToUserCP=Αφήστε την ανάθεση
+addEventToUserCP=Έγκριση άδειας
 NotTheAssignedApprover=Δεν είστε ο εκχωρημένος υπεύθυνος έγκρισης
 MotifCP=Λόγος
 UserCP=Χρήστης
 ErrorAddEventToUserCP=Παρουσιάστηκε σφάλμα κατά την προσθήκη τις έκτακτης άδειας.
 AddEventToUserOkCP=Η προσθήκη της έκτακτης άδειας έχει ολοκληρωθεί.
+ErrorFieldRequiredUserOrGroup=Πρέπει να συμπληρωθεί το πεδίο "ομάδα" ή το πεδίο "χρήστης".
+fusionGroupsUsers=Το πεδίο ομάδων και το πεδίο χρήστη θα συγχωνευθούν
 MenuLogCP=Εμφάνιση καταγραφής αλλαγών
 LogCP=Αρχείο καταγραφής όλων των ενημερώσεων που έγιναν στο "Υπόλοιπο άδειας"
 ActionByCP=Ενημερώθηκε από
@@ -86,6 +91,13 @@ UserUpdateCP=Ενημερώθηκε για
 PrevSoldeCP=Προηγούμενο Υπόλοιπο
 NewSoldeCP=Νέο υπόλοιπο
 alreadyCPexist=Υπάρχει ήδη αίτηση άδειας για αυτήν τη περίοδο.
+UseralreadyCPexist=Ένα αίτημα άδειας έχει ήδη γίνει σε αυτήν την περίοδο για το %s.
+groups=Ομάδες
+users=Χρήστες
+AutoSendMail=Αυτόματη αποστολή αλληλογραφίας
+NewHolidayForGroup=Νέο αίτημα συλλογικής άδειας
+SendRequestCollectiveCP=Αποστολή αιτήματος συλλογικής άδειας
+AutoValidationOnCreate=Αυτόματη επικύρωση
 FirstDayOfHoliday=Πρώτη μέρα άδειας
 LastDayOfHoliday=Τελευταία μέρα άδειας
 BoxTitleLastLeaveRequests=Τελευταία %sτροποποιημένα αιτήματα άδειας 
@@ -117,11 +129,11 @@ HolidaysToValidateBody=Παρακάτω είναι ένα αίτημα άδει
 HolidaysToValidateDelay=Αυτή η αίτηση άδειας θα πραγματοποιηθεί εντός περιόδου μικρότερης των %s ημερών.
 HolidaysToValidateAlertSolde=Ο χρήστης που έκανε αυτήν την αίτηση άδειας δεν έχει αρκετές διαθέσιμες ημέρες.
 HolidaysValidated=Επικυρωμένα αιτήματα άδειας
-HolidaysValidatedBody=Η αίτηση αδείας %s στο %s έχει επικυρωθεί.
+HolidaysValidatedBody=Το αίτημά σας για άδεια από %s έως %s έχει επικυρωθεί.
 HolidaysRefused=Το αίτημα απορρίφθηκε
 HolidaysRefusedBody=Το αίτημα άδειας για %s στο %s απορρίφθηκε για τον ακόλουθο λόγο:
 HolidaysCanceled=Ακυρωμένο αίτημα αδείας
-HolidaysCanceledBody=Η αίτηση αδείας σας για %s στο %s έχει ακυρωθεί.
+HolidaysCanceledBody=Το αίτημά σας για άδεια από %s έως %s ακυρώθηκε.
 FollowedByACounter=1: Αυτό το είδος άδειας πρέπει να ακολουθείται από μετρητή. Ο μετρητής αυξάνεται χειροκίνητα ή αυτόματα και όταν επικυρωθεί ένα αίτημα άδειας, ο μετρητής μειώνεται. <br> 0: Δεν ακολουθείται από μετρητή.
 NoLeaveWithCounterDefined=Δεν έχουν οριστεί τύποι άδειας που πρέπει να ακολουθούνται από μετρητή
 GoIntoDictionaryHolidayTypes=Πηγαίνετε στο <strong>Αρχικη - Ρυθμίσεις - Λεξικά - Τύπος άδειας</strong> για τη ρύθμιση των διαφορετικών τύπων αδειών.
@@ -131,9 +143,16 @@ TemplatePDFHolidays=Πρότυπο PDF για αιτήματα άδειας
 FreeLegalTextOnHolidays=Ελεύθερο κείμενο σε pdf
 WatermarkOnDraftHolidayCards=Υδατογραφήματα σε προσχέδια αιτημάτων αδείας
 HolidaysToApprove=Διακοπές προς έγκριση
-NobodyHasPermissionToValidateHolidays=Κανείς δεν έχει άδεια να επικυρώσει διακοπές
-HolidayBalanceMonthlyUpdate=Μηνιαία ενημέρωση του υπολοιπου των εορτών
+NobodyHasPermissionToValidateHolidays=Κανείς δεν έχει άδεια να επικυρώσει αιτήματα άδειας
+HolidayBalanceMonthlyUpdate=Μηνιαία ενημέρωση υπολοίπου άδειας
 XIsAUsualNonWorkingDay=Η %s είναι συνήθως ΜΗ εργάσιμη ημέρα
 BlockHolidayIfNegative=Αποκλεισμός εάν το υπόλοιπο είναι αρνητικό
 LeaveRequestCreationBlockedBecauseBalanceIsNegative=Η δημιουργία αυτού του αιτήματος άδειας έχει αποκλειστεί επειδή το υπόλοιπό σας είναι αρνητικό
 ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=Το αίτημα αδείας%s πρέπει να είναι προσχέδιο, ακυρωμένο ή απορριφθέν για να διαγράφει
+IncreaseHolidays=Αύξηση του υπολοίπου άδειας
+HolidayRecordsIncreased= Τα υπόλοιπα %s αδειών αυξήθηκαν
+HolidayRecordIncreased=Το υπόλοιπο της άδειας αυξήθηκε
+ConfirmMassIncreaseHoliday=Μαζική αύξηση των ημερών αδείας
+NumberDayAddMass=Αριθμός ημέρας για προσθήκη στην επιλογή
+ConfirmMassIncreaseHolidayQuestion=Είστε σίγουροι ότι θέλετε να αυξήσετε τις διακοπές των %s επιλεγμένων εγγραφών ;
+HolidayQtyNotModified=Το υπόλοιπο των ημερών που απομένουν για το %s δεν έχει αλλάξει
diff --git a/htdocs/langs/el_GR/hrm.lang b/htdocs/langs/el_GR/hrm.lang
index e6eb6107843..0721140f6e8 100644
--- a/htdocs/langs/el_GR/hrm.lang
+++ b/htdocs/langs/el_GR/hrm.lang
@@ -2,7 +2,7 @@
 
 
 # Admin
-HRM_EMAIL_EXTERNAL_SERVICE=E-mail για αποτροπή εξωτερικών υπηρεσιών στο HRM
+HRM_EMAIL_EXTERNAL_SERVICE=Email για την αποτροπή εξωτερικής υπηρεσίας HRM
 Establishments=Επιχειρήσεις
 Establishment=Επιχείρηση
 NewEstablishment=Νέα επιχείρηση
@@ -26,8 +26,8 @@ HRM_DEFAULT_SKILL_DESCRIPTION=Προεπιλεγμένη περιγραφή τω
 deplacement=Ωράριο
 DateEval=Ημερομηνία αξιολόγησης
 JobCard=Καρτέλα θέσεων εργασίας
-JobPosition=Θέση εργασίας
-JobsPosition=Θέσεις εργασίας
+JobPosition=Περιγραφή εργασίας
+JobsPosition=Περιγραφές εργασιών
 NewSkill=Νέα Δεξιότητα
 SkillType=Τύπος δεξιότητας
 Skilldets=Λίστα βαθμών για αυτήν την δεξιότητα
@@ -86,7 +86,7 @@ SaveAddSkill = Προσθήκη δεξιότητας(ων)
 SaveLevelSkill = Το επίπεδο δεξιοτήτων αποθηκεύτηκε
 DeleteSkill = Η δεξιότητα αφαιρέθηκε
 SkillsExtraFields=Συμπληρωματικά χαρακτηριστικά (Δεξιότητες)
-JobsExtraFields=Συμπληρωματικά χαρακτηριστικά (Υπάλληλοι)
+JobsExtraFields=Συμπληρωματικά χαρακτηριστικά (Προφίλ θέσης εργασίας)
 EvaluationsExtraFields=Συμπληρωματικά χαρακτηριστικά (Αξιολογήσεις)
 NeedBusinessTravels=Ανάγκη επαγγελματικών ταξιδιών
 NoDescription=Χωρίς περιγραφή
diff --git a/htdocs/langs/el_GR/main.lang b/htdocs/langs/el_GR/main.lang
index a254cdd4741..18f1f56ae44 100644
--- a/htdocs/langs/el_GR/main.lang
+++ b/htdocs/langs/el_GR/main.lang
@@ -7,7 +7,7 @@ DIRECTION=ltr
 # To read Chinese pdf with Linux: sudo apt-get install poppler-data
 # cid0jp is for Japanish
 # cid0kr is for Korean
-# DejaVuSans is for some Eastern languages, greek, some Asian languages and some Arabic languages
+# DejaVuSans is for some Eastern languages, some Asian languages and some Arabic languages
 # freemono is for ru_RU or uk_UA, uz_UZ
 # freeserif is for Tamil
 FONTFORPDF=DejaVuSans
@@ -226,6 +226,7 @@ NoUserGroupDefined=Κανένας χρήστης δεν ορίζεται στη
 Password=Κωδικός πρόσβασης
 PasswordRetype=Επαναλάβετε τον κωδικό πρόσβασης σας
 NoteSomeFeaturesAreDisabled=Σημειώστε ότι πολλές δυνατότητες/ενότητες είναι απενεργοποιημένες σε αυτήν την επίδειξη.
+YourUserFile=Το αρχείο χρήστη σας
 Name=Όνομα
 NameSlashCompany=Όνομα / Εταιρεία
 Person=Άτομο
@@ -467,7 +468,7 @@ Ref=Αναφ.
 ExternalRef=εξωτερική Αναφ. 
 RefSupplier=Αναφ. Προμηθευτή
 RefPayment=Αναφ. πληρωμής
-CommercialProposalsShort=Εμπορικές προσφορές
+CommercialProposalsShort=Προσφορές
 Comment=Σχόλιο
 Comments=Σχόλια
 ActionsToDo=Ενέργειες που πρέπει να γίνουν
@@ -897,6 +898,9 @@ MassFilesArea=Τομέας αρχείων που δημιουργήθηκαν α
 ShowTempMassFilesArea=Εμφάνιση τομέα αρχείων που έχουν δημιουργηθεί με μαζικές ενέργειες
 ConfirmMassDeletion=Επιβεβαίωση μαζικής διαγραφής
 ConfirmMassDeletionQuestion=Είστε σίγουροι ότι θέλετε να διαγράψετε τις επιλεγμένες εγγραφές %s;
+ConfirmMassClone=Επιβεβαίωση μαζικής κλωνοποίησης
+ConfirmMassCloneQuestion=Επιλέξτε έργο για κλωνοποίηση
+ConfirmMassCloneToOneProject=Κλωνοποίηση στο έργο %s
 RelatedObjects=Σχετικά Αντικείμενα
 ClassifyBilled=Ταξινόμηση ως τιμολογημένο
 ClassifyUnbilled=Ταξινόμηση ως  μη τιμολογημένο
@@ -912,8 +916,8 @@ ExportFilteredList=Εξαγωγή φιλτραρισμένης λίστας
 ExportList=Εξαγωγή λίστας
 ExportOptions=Επιλογές Εξαγωγής
 IncludeDocsAlreadyExported=Συμπεριλάβετε έγγραφα που έχουν ήδη εξαχθεί
-ExportOfPiecesAlreadyExportedIsEnable=Η εξαγωγή τεμαχίων που έχουν ήδη εξαχθεί είναι δυνατή
-ExportOfPiecesAlreadyExportedIsDisable=Η εξαγωγή τεμαχίων που έχουν ήδη εξαχθεί είναι απενεργοποιημένη
+ExportOfPiecesAlreadyExportedIsEnable=Τα έγγραφα που έχουν ήδη εξαχθεί είναι ορατά και θα εξαχθούν ξανά
+ExportOfPiecesAlreadyExportedIsDisable=Τα έγγραφα που έχουν ήδη εξαχθεί είναι κρυφά και δεν θα εξαχθούν ξανά
 AllExportedMovementsWereRecordedAsExported=Όλες οι εξαγόμενες κινήσεις καταγράφηκαν ως εξαγόμενες
 NotAllExportedMovementsCouldBeRecordedAsExported=Δεν ήταν δυνατή η καταγραφή όλων των εξαγόμενων κινήσεων
 Miscellaneous=Διάφορα
@@ -1128,6 +1132,7 @@ DeleteFileText=Θέλετε πραγματικά να διαγράψετε αυ
 ShowOtherLanguages=Εμφάνιση άλλων γλωσσών
 SwitchInEditModeToAddTranslation=Μεταβείτε στη λειτουργία επεξεργασίας για να προσθέσετε μεταφράσεις για αυτήν τη γλώσσα
 NotUsedForThisCustomer=Δεν χρησιμοποιείται για αυτόν τον πελάτη
+NotUsedForThisVendor=Δεν χρησιμοποιείται για αυτόν τον προμηθευτή
 AmountMustBePositive=Το ποσό πρέπει να είναι θετικό
 ByStatus=Κατά κατάσταση
 InformationMessage=Πληροφορία
@@ -1148,18 +1153,18 @@ EventReminder=Υπενθύμιση συμβάντος
 UpdateForAllLines=Ενημέρωση για όλες τις γραμμές
 OnHold=Σε Αναμονή
 Civility=Ευγένεια
-AffectTag=Assign Tag
-AffectUser=Assign User
-SetSupervisor=Ορισμός επόπτη
+AffectTag=Αντιστοιχίστε μια ετικέτα
+AffectUser=Εκχώρηση σε χρήστη
+SetSupervisor=Ορίστε τον επόπτη
 CreateExternalUser=Δημιουργία εξωτερικού χρήστη
-ConfirmAffectTag=Bulk Tag Assignement
-ConfirmAffectUser=Bulk User Assignement
-ProjectRole=Ρόλος που ανατίθεται σε κάθε έργο
-TasksRole=Ρόλος που ανατίθεται σε κάθε εργασία κάθε έργου
+ConfirmAffectTag=Μαζική αντιστοίχιση ετικετών
+ConfirmAffectUser=Μαζική εκχώρηση σε χρήστες
+ProjectRole=Ρόλος έχει εκχωρηθεί σε κάθε έργο/ευκαιρία
+TasksRole=Ρόλος που έχει εκχωρηθεί σε κάθε εργασία (εάν χρησιμοποιείται)
 ConfirmSetSupervisor=Μαζικός ορισμός Επόπτη
 ConfirmUpdatePrice=Επιλέξτε ένα ποσοστό αύξησης/μείωσης τιμής
-ConfirmAffectTagQuestion=Are you sure you want to assign tags to the %s selected record(s)?
-ConfirmAffectUserQuestion=Are you sure you want to assign users to the %s selected record(s)?
+ConfirmAffectTagQuestion=Είστε σίγουροι ότι θέλετε να αντιστοιχίσετε ετικέτες στις επιλεγμένες εγγραφές %s;
+ConfirmAffectUserQuestion=Είστε σίγουροι ότι θέλετε να εκχωρήσετε χρήστες στις επιλεγμένες εγγραφές %s;
 ConfirmSetSupervisorQuestion=Είστε σίγουροι ότι θέλετε να ορίσετε τον επόπτη στις %s επιλεγμένες εγγραφές;
 ConfirmUpdatePriceQuestion=Είστε σίγουροι ότι θέλετε να ενημερώσετε την τιμή των %s επιλεγμένων  εγγραφών ;
 CategTypeNotFound=Δεν βρέθηκε τύπος ετικέτας για τον τύπο των εγγραφών
@@ -1210,3 +1215,10 @@ CreatedByPublicPortal=Δημιουργήθηκε από Δημόσια πύλη
 UserAgent=User Agent
 InternalUser=Εσωτερικός χρήστης
 ExternalUser=Εξωτερικός χρήστης
+NoSpecificContactAddress=Δεν υπάρχει συγκεκριμένη επαφή ή διεύθυνση
+NoSpecificContactAddressBis=Αυτή η καρτέλα είναι αφιερωμένη στην επιβολή συγκεκριμένων επαφών ή διευθύνσεων για το τρέχον αντικείμενο. Χρησιμοποιήστε το μόνο εάν θέλετε να ορίσετε μία ή περισσότερες συγκεκριμένες επαφές ή διευθύνσεις για το αντικείμενο όταν οι πληροφορίες του τρίτου μέρους δεν είναι αρκετές ή δεν είναι ακριβείς.
+HideOnVCard=Απόκρυψη %s
+AddToContacts=Προσθήκη διεύθυνσης στις επαφές μου
+LastAccess=Τελευταία πρόσβαση
+UploadAnImageToSeeAPhotoHere=Ανεβάστε μια εικόνα από την καρτέλα %s για να δείτε μια φωτογραφία εδώ
+LastPasswordChangeDate=Ημερομηνία τελευταίας αλλαγής κωδικού πρόσβασης
diff --git a/htdocs/langs/el_GR/mrp.lang b/htdocs/langs/el_GR/mrp.lang
index 181ede5bfec..0359b01be9c 100644
--- a/htdocs/langs/el_GR/mrp.lang
+++ b/htdocs/langs/el_GR/mrp.lang
@@ -102,6 +102,7 @@ NbOperatorsRequired=Αριθμός απαιτούμενων χειριστών
 THMOperatorEstimated=Εκτιμώμενος χειριστής THM
 THMMachineEstimated=Εκτιμώμενο μηχάνημα THM
 WorkstationType=Τύπος σταθμού εργασίας
+DefaultWorkstation=Προεπιλεγμένος σταθμός εργασίας
 Human=Άνθρωπος
 Machine=Μηχανή
 HumanMachine=Άνθρωπος / Μηχανή
diff --git a/htdocs/langs/el_GR/orders.lang b/htdocs/langs/el_GR/orders.lang
index ee15f50fb2f..6039f128126 100644
--- a/htdocs/langs/el_GR/orders.lang
+++ b/htdocs/langs/el_GR/orders.lang
@@ -96,6 +96,10 @@ OrdersStatisticsSuppliers=Στατιστικά παραγγελίας αγορά
 NumberOfOrdersByMonth=Αριθμός παραγγελιών ανά μήνα
 AmountOfOrdersByMonthHT=Ποσό παραγγελιών ανά μήνα (εκτός φόρου)
 ListOfOrders=Λίστα παραγγελιών
+ListOrderLigne=Γραμμές παραγγελιών
+productobuy=Προϊόντα για αγορά μόνο
+productonly=Μόνο προϊόντα
+disablelinefree=Χωρίς ελεύθερες γραμμές 
 CloseOrder=Κλείσιμο Παραγγελίας
 ConfirmCloseOrder=Είστε σίγουροι ότι θέλετε να ορίσετε αυτήν την παραγγελία ως παραδομένη; Μόλις παραδοθεί μια παραγγελία, μπορεί να οριστεί ως τιμολογημένη.
 ConfirmDeleteOrder=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτή την παραγγελία;
@@ -106,7 +110,7 @@ ConfirmMakeOrder=Είστε σίγουροι ότι θέλετε να επιβε
 GenerateBill=Δημιουργία τιμολογίου
 ClassifyShipped=Ταξινόμηση ως παραδομένη
 PassedInShippedStatus=Ταξινόμηση ως παραδομένη
-YouCantShipThis=Δεν μπορώ να το ταξινομήσω αυτό. Ελέγξτε τα δικαιώματα χρήστη
+YouCantShipThis=Δεν ειναι δυνατή η ταξινόμηση. Ελέγξτε τα δικαιώματα χρήστη
 DraftOrders=Προσχέδια παραγγελιών
 DraftSuppliersOrders=Προσχέδια παραγγελιών αγοράς
 OnProcessOrders=Παραγγελίες σε εξέλιξη
@@ -131,6 +135,7 @@ SupplierOrderClassifiedBilled=Η παραγγελία αγοράς %s έχει 
 OtherOrders=Άλλες παραγγελίες
 SupplierOrderValidatedAndApproved=Η παραγγελία του προμηθευτή έχει επικυρωθεί και εγκριθεί: %s
 SupplierOrderValidated=Η παραγγελία του προμηθευτή είναι επικυρωμένη: %s
+OrderShowDetail=Εμφάνιση λεπτομερειών παραγγελίας
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Εκπρόσωπος εξέλιξης εντολής πώλησης
 TypeContact_commande_internal_SHIPPING=Εκπρόσωπος εξέλιξης αποστολής
@@ -152,8 +157,8 @@ OrderByEMail=Email
 OrderByWWW=Online
 OrderByPhone=Τηλέφωνο
 # Documents models
-PDFEinsteinDescription=Ένα πλήρες μοντέλο παραγγελιών (παλιά εφαρμογή του προτύπου Eratosthene)
-PDFEratostheneDescription=Ένα πλήρες μοντέλο παραγγελιών
+PDFEinsteinDescription=Ένα πλήρες πρότυπο παραγγελιών (παλιά εφαρμογή του προτύπου Eratosthene)
+PDFEratostheneDescription=Ένα πλήρες υπόδειγμα παραγγελιών
 PDFEdisonDescription=Ένα απλό πρότυπο παραγγελιών
 PDFProformaDescription=Ένα πλήρες πρότυπο προτιμολογίου (Proforma)
 CreateInvoiceForThisCustomer=Τιμολόγηση παραγγελιών
@@ -199,3 +204,5 @@ StatusSupplierOrderApproved=Εγκρίθηκε
 StatusSupplierOrderRefused=Απορρίφθηκε
 StatusSupplierOrderReceivedPartially=Εν μέρει παραλήφθηκε
 StatusSupplierOrderReceivedAll=Όλα τα προϊόντα παραλήφθηκαν
+NeedAtLeastOneInvoice = Πρέπει να υπάρχει τουλάχιστον ένα Τιμολόγιο
+LineAlreadyDispatched = Η γραμμή παραγγελίας έχει ήδη παραληφθεί.
diff --git a/htdocs/langs/el_GR/other.lang b/htdocs/langs/el_GR/other.lang
index ef1066eb4d7..29fbaf8116c 100644
--- a/htdocs/langs/el_GR/other.lang
+++ b/htdocs/langs/el_GR/other.lang
@@ -199,7 +199,7 @@ NumberOfSupplierOrders=Αριθμός παραγγελιών αγοράς
 NumberOfSupplierInvoices=Αριθμός τιμολογίων προμηθευτή
 NumberOfContracts=Αριθμός συμβάσεων
 NumberOfMos=Αριθμός παραγγελιών παραγωγής
-NumberOfUnitsProposals=Αριθμός μονάδων στις προτάσεις
+NumberOfUnitsProposals=Αριθμός μονάδων στις προσφορές
 NumberOfUnitsCustomerOrders=Αριθμός μονάδων σε παραγγελίες πώλησης
 NumberOfUnitsCustomerInvoices=Αριθμός μονάδων σε τιμολόγια πελατών
 NumberOfUnitsSupplierProposals=Αριθμός μονάδων σε προσφορές προμηθευτών
diff --git a/htdocs/langs/el_GR/products.lang b/htdocs/langs/el_GR/products.lang
index ac8eac8a0da..0fd7581f1b9 100644
--- a/htdocs/langs/el_GR/products.lang
+++ b/htdocs/langs/el_GR/products.lang
@@ -20,7 +20,7 @@ NewService=Νέα Υπηρεσία
 ProductVatMassChange=Καθολική ενημέρωση ΦΠΑ
 ProductVatMassChangeDesc=Αυτό το εργαλείο ενημερώνει τον συντελεστή ΦΠΑ που ορίζεται σε <b><u>ΟΛΑ</u></b> προϊόντα και υπηρεσίες!
 MassBarcodeInit=Μαζική ενεργοποίηση barcode
-MassBarcodeInitDesc=Αυτή η σελίδα μπορεί να χρησιμοποιηθεί για την ενεργοποίηση ενός barcode σε αντικείμενα που δεν έχουν καθορισμένο barcode. Ελέγξτε νωρίτερα ότι έχει ολοκληρωθεί η ρύθμιση της μονάδας barcode .
+MassBarcodeInitDesc=Αυτή η σελίδα μπορεί να χρησιμοποιηθεί για την ενεργοποίηση ενός barcode σε αντικείμενα που δεν έχουν καθορισμένο barcode. Ελέγξτε νωρίτερα ότι έχει ολοκληρωθεί η ρύθμιση της ενότητας barcode .
 ProductAccountancyBuyCode=Λογιστικός Κωδικός (Αγορά)
 ProductAccountancyBuyIntraCode=Λογιστικός κωδικός (ενδοκοινοτική αγορά)
 ProductAccountancyBuyExportCode=Λογιστικός κωδικός (εισαγωγή αγοράς)
@@ -75,7 +75,7 @@ SellingPriceTTC=Τιμή Πώλησης (με Φ.Π.Α)
 SellingMinPriceTTC=Ελάχιστη τιμή πώλησης (με Φ.Π.Α)
 CostPriceDescription=Αυτό το πεδίο τιμών (εκτός Φ.Π.Α) μπορεί να χρησιμοποιηθεί για την αποθήκευση του μέσου ποσού που το προϊόν αυτό κοστίζει στην εταιρεία σας. Μπορεί να είναι οποιαδήποτε τιμή εσείς υπολογίζετε, για παράδειγμα, από τη μέση τιμή αγοράς συν το μέσο κόστος παραγωγής και διανομής.
 CostPriceUsage=Αυτή η τιμή θα μπορούσε να χρησιμοποιηθεί για υπολογισμό περιθωρίου.
-ManufacturingPrice=Τιμή κατασκευής
+ManufacturingPrice=Τιμή παραγωγής
 SoldAmount=Ποσό που πουλήθηκε
 PurchasedAmount=Ποσό που αγοράστηκε
 NewPrice=Νέα Τιμή
@@ -103,18 +103,18 @@ BarCode=Barcode
 BarcodeType=Τύπος Barcode
 SetDefaultBarcodeType=Ορισμός τύπου barcode
 BarcodeValue=Τιμή Barcode
-NoteNotVisibleOnBill=Σημείωση (μη ορατή σε τιμολόγια, προτάσεις...)
+NoteNotVisibleOnBill=Σημείωση (μη ορατή σε τιμολόγια, προσφορές...)
 ServiceLimitedDuration=Εάν το προϊόν είναι μια υπηρεσία με περιορισμένη διάρκεια:
-FillWithLastServiceDates=Συμπληρώστε με ημερομηνίες τελευταίας γραμμής σέρβις
+FillWithLastServiceDates=Συμπληρώστε με ημερομηνίες τελευταίας γραμμής υπηρεσίας
 MultiPricesAbility=Πολλαπλά τμήματα τιμών ανά προϊόν / υπηρεσία (κάθε πελάτης βρίσκεται σε ένα τμήμα τιμών)
 MultiPricesNumPrices=Αριθμός διαφορετικής τιμής
-DefaultPriceType=Προκαθορισμένη βάση τιμών (συμπεριλαμβανομένου φόρου) κατά την προσθήκη νέων τιμών πώλησης
+DefaultPriceType=Προκαθορισμένη βάση τιμών (με ή χωρίς Φ.Π.Α.) κατά την προσθήκη νέων τιμών πώλησης
 AssociatedProductsAbility=Ενεργοποίηση κιτ (σετ διαφόρων προϊόντων)
 VariantsAbility=Ενεργοποίηση παραλλαγών (παραλλαγές προϊόντων, για παράδειγμα χρώμα, μέγεθος)
 AssociatedProducts=Κιτ
 AssociatedProductsNumber=Αριθμός προϊόντων που συνθέτουν αυτό το κιτ
 ParentProductsNumber=Αριθμός γονικής συσκευασίας προϊόντος
-ParentProducts=Μητρικά προϊόντα
+ParentProducts=Γονικά προϊόντα
 IfZeroItIsNotAVirtualProduct=Αν 0, αυτό το προϊόν δεν είναι κιτ
 IfZeroItIsNotUsedByVirtualProduct= \nΑν 0, αυτό το προϊόν δεν είναι μέρος κάποιου κιτ
 KeywordFilter=Φίλτρο λέξης-κλειδιού
@@ -124,7 +124,7 @@ NoMatchFound=Δεν βρέθηκε κατάλληλη εγγραφή
 ListOfProductsServices=Κατάλογος προϊόντων / υπηρεσιών
 ProductAssociationList=Κατάλογος προϊόντων/υπηρεσιών που αποτελούν μέρος(η) αυτού του κιτ
 ProductParentList=Λίστα των κιτ με αυτό το προϊόν ως παρελκόμενο
-ErrorAssociationIsFatherOfThis=Ένα από τα προϊόντα που θα επιλεγούν είναι γονέας με την τρέχουσα προϊόν
+ErrorAssociationIsFatherOfThis=Ένα από τα επιλεγμένα προϊόντα είναι γονικό του τρέχοντος προϊόντος
 DeleteProduct=Διαγραφή προϊόντος/υπηρεσίας
 ConfirmDeleteProduct=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτό το προϊόν / υπηρεσία;
 ProductDeleted=Προϊόν / Υπηρεσία "%s"; διαγράφηκε από τη βάση δεδομένων.
@@ -162,7 +162,7 @@ ConfirmCloneProduct=Είστε σίγουροι ότι θέλετε να κλω
 CloneContentProduct=Επαναχρησιμοποιήστε όλες τις κύριες πληροφορίες του προϊόντος/υπηρεσίας
 ClonePricesProduct=Επαναχρησιμοποιήστε τις τιμες
 CloneCategoriesProduct=Επαναχρησιμοποιήστε συνδεδεμένες ετικέτες/κατηγορίες
-CloneCompositionProduct=Επαναχρησιμοποιήστε εικονικα προϊόντα/υπηρεσιες
+CloneCompositionProduct=Αντιγραφή εικονικών προϊόντων/υπηρεσιών
 CloneCombinationsProduct=Επαναχρησιμοποιήστε τις παραλλαγές προϊόντων
 ProductIsUsed=Μεταχειρισμένο
 NewRefForClone=Αναφ. νέου προϊόντος/υπηρεσίας
@@ -201,7 +201,7 @@ m3=m³
 liter=Λίτρο
 l=Λίτρο
 unitP=Κομμάτι
-unitSET=Σειρά
+unitSET=Set
 unitS=Δευτερόλεπτο
 unitH=Ώρα
 unitD=Ημέρα
@@ -246,8 +246,8 @@ PriceByQuantity=Διαφορετικές τιμές ανά ποσότητα
 DisablePriceByQty=Απενεργοποιήστε τις τιμές ανά ποσότητα
 PriceByQuantityRange=Εύρος ποσότητας
 MultipriceRules=Αυτόματες τιμές για το τμήμα
-UseMultipriceRules=Χρησιμοποιήστε κανόνες για το τμήμα των τιμών (που ορίζονται στην εγκατάσταση μονάδας προϊόντος) για να υπολογίσετε αυτόματα τις τιμές όλων των άλλων τμημάτων σύμφωνα με τον πρώτο τομέα
-PercentVariationOver=Παραλλαγή %% μέσω %s
+UseMultipriceRules=Χρησιμοποιήστε κανόνες για το τμήμα των τιμών (που ορίζονται στην εγκατάσταση ενότητας προϊόντος) για να υπολογίσετε αυτόματα τις τιμές όλων των άλλων τμημάτων σύμφωνα με το πρώτο τμήμα
+PercentVariationOver=%%Παραλλαγή  μέσω %s
 PercentDiscountOver=%% έκπτωση πάνω από %s
 KeepEmptyForAutoCalculation=Κρατήστε κενό για να το υπολογίσετε αυτομάτως από το βάρος ή τον όγκο των προϊόντων
 VariantRefExample=Παραδείγματα: ΧΡΩΜΑ, ΜΕΓΕΘΟΣ
@@ -256,8 +256,8 @@ VariantLabelExample=Παραδείγματα: Χρώμα, Μέγεθος
 Build=Παράγω
 ProductsMultiPrice=Προϊόντα και τιμές για κάθε τμήμα τιμών
 ProductsOrServiceMultiPrice=Τιμές πελατών (προϊόντων ή υπηρεσιών, πολλαπλές τιμές)
-ProductSellByQuarterHT=Κύκλος εργασιών τριμηνιαία πριν από τη φορολογία
-ServiceSellByQuarterHT=Κύκλος εργασιών ανά τρίμηνο προ φόρων
+ProductSellByQuarterHT=Κύκλος εργασιών προϊόντων ανά τρίμηνο προ φόρων
+ServiceSellByQuarterHT=Κύκλος εργασιών υπηρεσιών ανά τρίμηνο προ φόρων
 Quarter1=1ο. Τέταρτο
 Quarter2=2ο. Τέταρτο
 Quarter3=3η. Τέταρτο
@@ -271,7 +271,7 @@ FillBarCodeTypeAndValueManually=Συμπληρώστε τον τύπο barcode 
 FillBarCodeTypeAndValueFromProduct=Συμπληρώστε τον τύπο barcode και αξία από το barcode του προϊόντος.
 FillBarCodeTypeAndValueFromThirdParty=Συμπληρώστε τον τύπο και την τιμή του γραμμικού κώδικα από τον γραμμωτό κώδικα ενός τρίτου μέρους.
 DefinitionOfBarCodeForProductNotComplete=Ο ορισμός του τύπου ή της αξίας του γραμμικού κώδικα δεν έχει ολοκληρωθεί για το προϊόν %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Ορισμός του τύπου ή της αξίας του μη ολοκληρωμένου γραμμικού κώδικα για το τρίτο μέρος %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Ο ορισμός του τύπου ή της αξίας του γραμμικού κώδικα δεν έχει ολοκληρωθεί για το τρίτο μέρος %s.
 BarCodeDataForProduct=Πληροφορίες γραμμικού κώδικα του προϊόντος %s:
 BarCodeDataForThirdparty=Πληροφορίες γραμμικού κώδικα τρίτου μέρους %s:
 ResetBarcodeForAllRecords=Ορίστε την τιμή του γραμμικού κώδικα για όλες τις εγγραφές (αυτό επίσης θα επαναφέρει την τιμή του γραμμικού κώδικα που έχει ήδη καθοριστεί με νέες τιμές)
@@ -280,38 +280,38 @@ PriceCatalogue=Μια ενιαία τιμή πώλησης ανά προϊόν /
 PricingRule=Κανόνες για τις τιμές πώλησης
 AddCustomerPrice=Προσθήκη τιμής ανά πελάτη
 ForceUpdateChildPriceSoc=Ορίστε την ίδια τιμή στις θυγατρικές του πελάτη
-PriceByCustomerLog=Καταγραφή προηγούμενων τιμών πελατών
+PriceByCustomerLog=Αρχείο καταγραφής προηγούμενων τιμών πελατών
 MinimumPriceLimit=Η ελάχιστη τιμή δεν μπορεί να είναι χαμηλότερη από %s
 MinimumRecommendedPrice=Η ελάχιστη προτεινόμενη τιμή είναι: %s
 PriceExpressionEditor=Επεξεργαστής συνάρτησης τιμών
 PriceExpressionSelected=Επιλεγμένη έκφραση τιμής
 PriceExpressionEditorHelp1="τιμή = 2 + 2" ή "2 + 2" για τον καθορισμό της τιμής. Χρησιμοποιήστε ; για να διαχωρίσετε τις εκφράσεις
-PriceExpressionEditorHelp2=Μπορείτε να έχετε πρόσβαση σε ExtraFields με μεταβλητές όπως <b># extrafield_myextrafieldkey #</b> και παγκόσμιες μεταβλητές με <b># global_mycode #</b>
-PriceExpressionEditorHelp3=Και στις δύο τιμές προϊόντων / υπηρεσιών και πωλητών υπάρχουν οι παρακάτω μεταβλητές: <br> <b># tva_tx # # localtax1_tx # # localtax2_tx # # βάρος # # μήκος # # επιφάνεια # # price_min #</b>
-PriceExpressionEditorHelp4=Μόνο στην τιμή προϊόντος / υπηρεσίας: <b># provider_min_price #</b> <br> Μόνο στις τιμές πωλητών: <b># # προμηθευτής και # προμηθευτής_tva_tx #</b>
-PriceExpressionEditorHelp5=Διαθέσιμες συνολικές τιμές:
+PriceExpressionEditorHelp2=Μπορείτε να αποκτήσετε πρόσβαση στα Επιπλέον πεδία με μεταβλητές όπως <b> #extrafield_myextrafieldkey# </b> και καθολικές μεταβλητές με <b> #global_mycode#</b>
+PriceExpressionEditorHelp3=Στις τιμές προϊόντων / υπηρεσιών και πωλητών υπάρχουν οι παρακάτω μεταβλητές: <br> <b># tva_tx # # localtax1_tx # # localtax2_tx # # βάρος # # μήκος # # επιφάνεια # # price_min #</b>
+PriceExpressionEditorHelp4=Μόνο σε τιμή προϊόντος/υπηρεσίας: <b> #supplier_min_price# </b> <br> Μόνο σε τιμές προμηθευτή: <b> #supplier_quantity# και #supplier_tva_tx#</b>
+PriceExpressionEditorHelp5=Διαθέσιμες καθολικές τιμές:
 PriceMode=Λειτουργία Τιμής
 PriceNumeric=Αριθμός
 DefaultPrice=Προεπιλεγμένη τιμή
 DefaultPriceLog=Αρχείο προηγούμενων προεπιλεγμένων τιμών
-ComposedProductIncDecStock=Αύξηση/Μείωση αποθεμάτων στην μητρική
-ComposedProduct=Child products
+ComposedProductIncDecStock=Αύξηση/Μείωση αποθέματος κατά την αλλαγή του αρχικού προϊόντος
+ComposedProduct=Υποπροϊόντα
 MinSupplierPrice=Ελάχιστη τιμή αγοράς
 MinCustomerPrice=Ελάχιστη τιμή πώλησης
 NoDynamicPrice=Χωρίς δυναμική τιμή
 DynamicPriceConfiguration=Διαμόρφωση δυναμικών τιμών
 DynamicPriceDesc=Μπορείτε να ορίσετε μαθηματικούς τύπους για τον υπολογισμό των τιμών των πελατών ή των προμηθευτών. Τέτοιοι τύποι μπορούν να χρησιμοποιήσουν όλους τους μαθηματικούς χειριστές, κάποιες σταθερές και μεταβλητές. Μπορείτε να ορίσετε εδώ τις μεταβλητές που θέλετε να χρησιμοποιήσετε. Αν η μεταβλητή χρειάζεται αυτόματη ενημέρωση, μπορείτε να ορίσετε την εξωτερική διεύθυνση URL ώστε να επιτρέψει στο Dolibarr να ενημερώσει αυτόματα την τιμή.
 AddVariable=Προσθήκη μεταβλητής
-AddUpdater=Προσθήκη του Updater
+AddUpdater=Προσθήκη URL ενημέρωσης
 GlobalVariables=Καθολικές μεταβλητές
 VariableToUpdate=Μεταβλητή για ενημέρωση
 GlobalVariableUpdaters=Εξωτερικές ενημερώσεις για μεταβλητές
 GlobalVariableUpdaterType0=Δεδομένα JSON
 GlobalVariableUpdaterHelp0=Αναλύει τα δεδομένα JSON από συγκεκριμένη διεύθυνση URL, το VALUE καθορίζει τη θέση της αντίστοιχης τιμής,
-GlobalVariableUpdaterHelpFormat0=Μορφή αίτησης {&quot;URL&quot;: &quot;http://example.com/urlofjson&quot;, &quot;VALUE&quot;: &quot;array1, array2, targetvalue&quot;}
+GlobalVariableUpdaterHelpFormat0=Μορφή για αίτημα {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
 GlobalVariableUpdaterType1=Δεδομένα WebService
-GlobalVariableUpdaterHelp1=Parses δεδομένα WebService από συγκεκριμένη διεύθυνση URL, NS προσδιορίζει το χώρο ονομάτων, VALUE καθορίζει τη θέση της σχετικής τιμής, τα δεδομένα πρέπει να περιέχουν τα δεδομένα για αποστολή και METHOD είναι η μέθοδος κλήσης WS
-GlobalVariableUpdaterHelpFormat1=Η φόρμα για το αίτημα είναι {&quot;URL&quot;: &quot;http://example.com/urlofws&quot;, &quot;VALUE&quot;: &quot;array, targetvalue&quot;, &quot;NS&quot;: &quot;http://example.com/urlofns&quot; : &quot;myWSMethod&quot;, &quot;DATA&quot;: {&quot;your&quot;: &quot;δεδομένα&quot;, &quot;to&quot;: &quot;αποστολή&quot;}}
+GlobalVariableUpdaterHelp1=Αναλύει δεδομένα WebService από καθορισμένο URL, το NS καθορίζει το namespace, το VALUE καθορίζει τη θέση της σχετικής τιμής, τα DATA πρέπει να περιέχουν τα δεδομένα προς αποστολή και το METHOD είναι η μέθοδος κλησης WS
+GlobalVariableUpdaterHelpFormat1=Η μορφή αιτήματος είναι {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD" : "myWSMethod", "DATA": {"your": "data", "to": "send"}}
 UpdateInterval=Διάρκεια ενημέρωσης (λεπτά)
 LastUpdated=Τελευταία ενημέρωση
 CorrectlyUpdated=Ενημερώθηκε σωστά
@@ -331,21 +331,21 @@ ProductWeight=Βάρος για 1 προϊόν
 ProductVolume=Όγκος για 1 προϊόν
 WeightUnits=Μονάδα βάρους
 VolumeUnits=Μονάδα όγκου
-WidthUnits=Πλάτος
-LengthUnits=Μήκος
-HeightUnits=Ύψος
+WidthUnits=Μονάδα πλάτους
+LengthUnits=Μονάδα μήκους
+HeightUnits=Μονάδα ύψους
 SurfaceUnits=Μονάδα επιφάνειας
 SizeUnits=Μονάδα μεγέθους
 DeleteProductBuyPrice=Διαγραφή τιμής αγοράς
-ConfirmDeleteProductBuyPrice=Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτήν την τιμή αγοράς;
+ConfirmDeleteProductBuyPrice=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτήν την τιμή αγοράς;
 SubProduct=Υποπροϊόν
-ProductSheet=Φύλλο προϊόντος
-ServiceSheet=Φύλλο εξυπηρέτησης
+ProductSheet=Κατάσταση(Φύλλο) προϊόντων
+ServiceSheet=Κατάσταση(Φύλλο) υπηρεσιών
 PossibleValues=Πιθανές τιμές
-GoOnMenuToCreateVairants=Πηγαίνετε στο μενού %s - %s για να προετοιμάσετε παραλλαγές χαρακτηριστικών (όπως χρώματα, μέγεθος, ...)
+GoOnMenuToCreateVairants=Μεταβείτε στο μενού %s - %s για να προετοιμάσετε παραλλαγές χαρακτηριστικών (όπως χρώματα, μέγεθος, ...)
 UseProductFournDesc=Προσθέστε μια δυνατότητα για να ορίσετε την περιγραφή του προϊόντος που ορίστηκε από τους προμηθευτές (για κάθε αναφορά προμηθευτή) επιπρόσθετα της περιγραφής για τους πελάτες
 ProductSupplierDescription=Περιγραφή προμηθευτή για το προϊόν
-UseProductSupplierPackaging=Χρησιμοποιήστε τη συσκευασία στις τιμές προμηθευτή (επανυπολογίστε τις ποσότητες σύμφωνα με τη συσκευασία που καθορίζεται στην τιμή προμηθευτή κατά την προσθήκη / ενημέρωση της γραμμής στα έγγραφα προμηθευτών)
+UseProductSupplierPackaging=Χρησιμοποιήστε την συσκευασία για τιμές στρογγυλοποιημένες σε πολλαπλές για τιμές αγοράς (υπολογίστε εκ νέου τις ποσότητες σύμφωνα με τα πολλαπλάσια που ορίζονται στις τιμές αγοράς κατά την προσθήκη/ενημέρωση γραμμής σε έγγραφα προμηθευτή)
 PackagingForThisProduct=Συσκευασία
 PackagingForThisProductDesc=Θα αγοράσετε αυτόματα ένα πολλαπλάσιο αυτής της ποσότητας.
 QtyRecalculatedWithPackaging=Η ποσότητα της γραμμής υπολογίστηκε εκ νέου σύμφωνα με τη συσκευασία του προμηθευτή
@@ -355,12 +355,12 @@ VariantAttributes=Χαρακτηριστικά παραλλαγής
 ProductAttributes=Χαρακτηριστικά παραλλαγών για προϊόντα
 ProductAttributeName=Χαρακτηριστικό παραλλαγής %s
 ProductAttribute=Χαρακτηριστικό παραλλαγής
-ProductAttributeDeleteDialog=Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτό το χαρακτηριστικό; Όλες οι τιμές θα διαγραφούν
-ProductAttributeValueDeleteDialog=Είστε βέβαιοι ότι θέλετε να διαγράψετε την τιμή &quot;%s&quot; με αναφορά &quot;%s&quot; αυτού του χαρακτηριστικού;
-ProductCombinationDeleteDialog=Είστε βέβαιοι ότι θέλετε να διαγράψετε την παραλλαγή του προϊόντος &quot; <strong>%s</strong> &quot;;
+ProductAttributeDeleteDialog=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτό το χαρακτηριστικό; Όλες οι τιμές θα διαγραφούν
+ProductAttributeValueDeleteDialog=Είστε σίγουροι ότι θέλετε να διαγράψετε την τιμή "%s" με αναφορά "%s" αυτού του χαρακτηριστικού;
+ProductCombinationDeleteDialog=Είστε σίγουροι ότι θέλετε να διαγράψετε την παραλλαγή του προϊόντος "<strong>%s</strong> ";
 ProductCombinationAlreadyUsed=Παρουσιάστηκε σφάλμα κατά τη διαγραφή της παραλλαγής. Ελέγξτε ότι δεν χρησιμοποιείται σε οποιοδήποτε αντικείμενο
 ProductCombinations=Παραλλαγές
-PropagateVariant=Διαφορετικές παραλλαγές
+PropagateVariant=Παραγωγή παραλλαγών
 HideProductCombinations=Απόκρυψη παραλλαγών προϊόντων στον επιλογέα προϊόντων
 ProductCombination=Παραλλαγή
 NewProductCombination=Νέα παραλλαγή
@@ -370,36 +370,36 @@ EditProductCombinations=Επεξεργασία παραλλαγών
 SelectCombination=Επιλέξτε συνδυασμό
 ProductCombinationGenerator=Γεννήτρια παραλλαγών
 Features=Χαρακτηριστικά
-PriceImpact=Επιπτώσεις στις τιμές
+PriceImpact=Επίπτωση στην τιμή
 ImpactOnPriceLevel=Αντίκτυπος στο επίπεδο τιμών %s
 ApplyToAllPriceImpactLevel= Εφαρμογή σε όλα τα επίπεδα
 ApplyToAllPriceImpactLevelHelp=Κάνοντας κλικ εδώ, ορίζετε τον ίδιο αντίκτυπο στην τιμή σε όλα τα επίπεδα
-WeightImpact=Επιπτώσεις στο βάρος
+WeightImpact=Επίπτωση στο βάρος
 NewProductAttribute=Νέο χαρακτηριστικό
 NewProductAttributeValue=Νέα τιμή χαρακτηριστικού
 ErrorCreatingProductAttributeValue=Παρουσιάστηκε σφάλμα κατά τη δημιουργία της τιμής του χαρακτηριστικού. Θα μπορούσε να είναι επειδή υπάρχει ήδη μια υπάρχουσα τιμή με αυτή την αναφορά
 ProductCombinationGeneratorWarning=Εάν συνεχίσετε, πριν δημιουργήσετε νέες παραλλαγές, όλες οι προηγούμενες θα ΔΙΑΓΡΑΦΟΥΝ. Οι ήδη υπάρχουσες θα ενημερωθούν με τις νέες τιμές
 TooMuchCombinationsWarning=Η δημιουργία πολλών παραλλαγών μπορεί να έχει ως αποτέλεσμα υψηλή χρήση CPU και μνήμης με συνέπεια το Dolibarr να μην μπορεί να τις δημιουργήσει. Η ενεργοποίηση της επιλογής "%s" μπορεί να βοηθήσει στη μείωση της χρήσης μνήμης.
 DoNotRemovePreviousCombinations=Μην αφαιρείτε προηγούμενες παραλλαγές
-UsePercentageVariations=Χρησιμοποιήστε ποσοστιαίες παραλλαγές
-PercentageVariation=Ποσοστιαία μεταβολή
+UsePercentageVariations=Ποσοστό χρήσης παραλλαγών
+PercentageVariation=Ποσοστό παραλλαγής
 ErrorDeletingGeneratedProducts=Παρουσιάστηκε σφάλμα κατά την προσπάθεια διαγραφής των υπαρχουσών παραλλαγών προϊόντων
 NbOfDifferentValues=Αριθ. Διαφορετικών τιμών
 NbProducts=Αριθμός προϊόντων
-ParentProduct=Το γονικό προϊόν
+ParentProduct=Αρχικό προϊόν
 HideChildProducts=Απόκρυψη παραλλαγών προϊόντων
 ShowChildProducts=Εμφάνιση παραλλαγών προϊόντων
-NoEditVariants=Μεταβείτε στην καρτέλα γονικής κάρτας προϊόντος και επεξεργαστείτε τις επιπτώσεις των τιμών των παραλλαγών στην καρτέλα παραλλαγών
-ConfirmCloneProductCombinations=Θέλετε να αντιγράψετε όλες τις παραλλαγές προϊόντων στο άλλο γονικό προϊόν με τη δεδομένη αναφορά;
-CloneDestinationReference=Παραπομπή προϊόντος προορισμού
+NoEditVariants=Μεταβείτε στην καρτέλα  του αρχικού προϊόντος και επεξεργαστείτε τις επιπτώσεις των τιμών των παραλλαγών στην καρτέλα παραλλαγών
+ConfirmCloneProductCombinations=Θέλετε να αντιγράψετε όλες τις παραλλαγές προϊόντων στο άλλο αρχικό προϊόν με τη συγκεκριμένη αναφορά;
+CloneDestinationReference=Αναφορά προϊόντος προορισμού
 ErrorCopyProductCombinations=Παρουσιάστηκε σφάλμα κατά την αντιγραφή των παραλλαγών του προϊόντος
 ErrorDestinationProductNotFound=Το προϊόν προορισμού δεν βρέθηκε
 ErrorProductCombinationNotFound=Η παραλλαγή προϊόντος δεν βρέθηκε
 ActionAvailableOnVariantProductOnly=Η ενέργεια είναι διαθέσιμη μόνο για την παραλλαγή του προϊόντος
 ProductsPricePerCustomer=Τιμές προϊόντων ανά πελάτη
 ProductSupplierExtraFields=Πρόσθετα χαρακτηριστικά (τιμές προμηθευτή)
-DeleteLinkedProduct=Διαγράψτε το θυγατρικό προϊόν που συνδέεται με τον συνδυασμό
-AmountUsedToUpdateWAP=Ποσό που θα χρησιμοποιηθεί για την ενημέρωση της σταθμισμένης μέσης τιμής
+DeleteLinkedProduct=Διαγράψτε το υποπροϊόν που συνδέεται με τον συνδυασμό
+AmountUsedToUpdateWAP=Ποσό μονάδας που θα χρησιμοποιηθεί για την ενημέρωση της σταθμισμένης μέσης τιμής
 PMPValue=Σταθμισμένη μέση τιμή
 PMPValueShort=WAP
 mandatoryperiod=Υποχρεωτικές περίοδοι
@@ -407,7 +407,7 @@ mandatoryPeriodNeedTobeSet=Σημείωση: Πρέπει να καθοριστ
 mandatoryPeriodNeedTobeSetMsgValidate=Μια υπηρεσία απαιτεί περίοδο έναρξης και λήξης
 mandatoryHelper=Επιλέξτε αυτό εάν θέλετε ένα μήνυμα στον χρήστη κατά τη δημιουργία/επικύρωση τιμολογίου, εμπορικής πρότασης, παραγγελίας πώλησης χωρίς να εισάγετε ημερομηνία έναρξης και λήξης στις γραμμές αυτής της υπηρεσίας. <br> Σημειώστε ότι το μήνυμα είναι μια προειδοποίηση και όχι ένα σφάλμα αποκλεισμού.
 DefaultBOM=Προεπιλεγμένο BOM
-DefaultBOMDesc=Το προεπιλεγμένο BOM συνιστάται να χρησιμοποιείται για την κατασκευή αυτού του προϊόντος. Αυτό το πεδίο μπορεί να οριστεί μόνο εάν η φύση του προϊόντος είναι "%s".
+DefaultBOMDesc=Το προεπιλεγμένο BOM που συνιστάται να χρησιμοποιείται για την κατασκευή αυτού του προϊόντος. Αυτό το πεδίο μπορεί να οριστεί μόνο εάν η φύση του προϊόντος είναι "%s".
 Rank=Κατάταξη
 MergeOriginProduct=Διπλότυπο προϊόν (προϊόν που θέλετε να διαγράψετε)
 MergeProducts=Συγχώνευση προϊόντων
@@ -416,10 +416,11 @@ ProductsMergeSuccess=Τα προϊόντα έχουν συγχωνευθεί
 ErrorsProductsMerge=Σφάλματα κατά τη συγχώνευση προϊόντων
 SwitchOnSaleStatus=Ενεργοποίηση κατάστασης πώλησης
 SwitchOnPurchaseStatus=Ενεργοποίηση κατάσταση αγοράς
-StockMouvementExtraFields= Extra Fields (κίνηση μετοχών)
-InventoryExtraFields= Επιπλέον πεδία (απόθεμα)
+UpdatePrice=Αύξηση/μείωση τιμής πελάτη
+StockMouvementExtraFields= Επιπλέον πεδία (κίνηση αποθεμάτων)
+InventoryExtraFields= Επιπλέον πεδία (απογραφή)
 ScanOrTypeOrCopyPasteYourBarCodes=Σαρώστε ή πληκτρολογήστε ή αντιγράψτε/επικολλήστε τους γραμμωτούς κώδικες σας
-PuttingPricesUpToDate=Ενημερώστε τις τιμές με τις τρέχουσες γνωστές τιμές
+PuttingPricesUpToDate=Ενημέρωση τιμών με τις τρέχουσες γνωστές τιμές
 PMPExpected=Αναμενόμενο PMP
 ExpectedValuation=Αναμενόμενη Αποτίμηση
 PMPReal=Πραγματικό PMP
@@ -427,3 +428,4 @@ RealValuation=Πραγματική Αποτίμηση
 ConfirmEditExtrafield = Επιλέξτε το επιπλέον πεδίο που θέλετε να τροποποιήσετε
 ConfirmEditExtrafieldQuestion = Είστε σιγουροι ότι θέλετε να τροποποιήσετε αυτό το επιπλέον πεδίο;
 ModifyValueExtrafields = Τροποποίηση της τιμής ενός επιπλέον πεδίου
+OrProductsWithCategories=Ή προϊόντα με ετικέτες/κατηγορίες
diff --git a/htdocs/langs/el_GR/projects.lang b/htdocs/langs/el_GR/projects.lang
index 7e7dbb4f0b2..4e12b625d84 100644
--- a/htdocs/langs/el_GR/projects.lang
+++ b/htdocs/langs/el_GR/projects.lang
@@ -169,7 +169,7 @@ OpportunityProbability=Πιθανότητα προοπτικής
 OpportunityProbabilityShort=Πιθαν. προοπτικής
 OpportunityAmount=Ποσό προοπτικής
 OpportunityAmountShort=Ποσό προοπτικής
-OpportunityWeightedAmount=Amount of opportunity, weighted by probability
+OpportunityWeightedAmount=Ποσό ευκαιρίας, σταθμισμένο με πιθανότητα
 OpportunityWeightedAmountShort=Σταθμισμένο ποσό ευκαιρίας
 OpportunityAmountAverageShort=Μέσο ποσό προοπτικής
 OpportunityAmountWeigthedShort=Σταθμισμένο ποσό προοπτικής
@@ -259,6 +259,7 @@ RecordsClosed=%s κλειστά έργα
 SendProjectRef=Πληροφορίες έργου %s
 ModuleSalaryToDefineHourlyRateMustBeEnabled=Η ενότητα "Μισθοί" πρέπει να είναι ενεργοποιημένη για να καθορίζει την ωριαία τιμή του εργαζόμενου ώστε να έχει αξιοποιηθεί ο χρόνος που δαπανάται
 NewTaskRefSuggested=Η αναφορά εργασίας χρησιμοποιείται ήδη, απαιτείται νέα αναφορά εργασίας
+NumberOfTasksCloned=%s κλωνοποιημένες εργασίες
 TimeSpentInvoiced=Τιμολογήθηκε ο χρόνος που δαπανήθηκε
 TimeSpentForIntervention=Χρόνος που δαπανήθηκε
 TimeSpentForInvoice=Ο χρόνος που δαπανήθηκε
diff --git a/htdocs/langs/el_GR/propal.lang b/htdocs/langs/el_GR/propal.lang
index d60cbe650d6..0f438a2e7fb 100644
--- a/htdocs/langs/el_GR/propal.lang
+++ b/htdocs/langs/el_GR/propal.lang
@@ -3,7 +3,7 @@ Proposals=Εμπορικές προσφορές
 Proposal=Εμπορική προσφορά
 ProposalShort=Προσφορά
 ProposalsDraft=Προσχέδιο προσφοράς
-ProposalsOpened=Ανοιχτές εμπορικές προσφορές
+ProposalsOpened=Ανοιχτές προσφορές
 CommercialProposal=Προσφορά
 PdfCommercialProposalTitle=Προσφορά
 ProposalCard=Καρτέλα Προσφοράς
@@ -13,8 +13,8 @@ Prospect=Προοπτική
 DeleteProp=Διαγραφή Προσφοράς
 ValidateProp=Επικύρωση Προσφοράς
 AddProp=Δημιουργία προσφοράς
-ConfirmDeleteProp=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτήν την εμπορική προσφορά;
-ConfirmValidateProp=Είστε σίγουροι ότι θέλετε να επικυρώσετε αυτήν την εμπορική προσφορά με το όνομα <b>%s</b> ;
+ConfirmDeleteProp=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτήν την προσφορά;
+ConfirmValidateProp=Είστε σίγουροι ότι θέλετε να επικυρώσετε αυτήν την προσφορά με το όνομα <b>%s</b> ;
 LastPropals=Τελευταίες %s προσφορές
 LastModifiedProposals=Τελευταίες %s τροποποιημένες προσφορές
 AllPropals=Όλες οι Προσφορές
@@ -39,7 +39,7 @@ PropalStatusSignedShort=Υπογεγραμμένη
 PropalStatusNotSignedShort=Δεν έχει υπογραφεί
 PropalStatusBilledShort=Τιμολογήθηκε
 PropalsToClose=Προσφορές προς κλείσιμο
-PropalsToBill=Υπογεγραμμένες εμπορικές προσφορές προς τιμολόγηση
+PropalsToBill=Υπογεγραμμένες προσφορές προς τιμολόγηση
 ListOfProposals=Λίστα Προσφορών
 ActionsOnPropal=Ενέργειες στην Προσφορά
 RefProposal=Αναφ. προσφοράς
@@ -107,7 +107,7 @@ PropalAlreadyRefused=Η προσφορά έχει ήδη απορριφθεί
 PropalAlreadySigned=Η πρόσφορα ειναι ήδη αποδεκτή
 PropalRefused=Η προσφορά απορρίφθηκε
 PropalSigned=Πρόσφορα αποδεκτή
-ProposalCustomerSignature=Γραπτή αποδοχή, σφραγίδα εταιρείας, ημερομηνία και υπογραφή
+ProposalCustomerSignature=Για αποδοχή: σφραγίδα εταιρείας, ημερομηνία και υπογραφή 
 ProposalsStatisticsSuppliers=Στατιστικά στοιχεία προσφορών προμηθευτών
 RefusePropal=Απόρριψη προσφοράς
 Sign=Υπογραφή
diff --git a/htdocs/langs/el_GR/stripe.lang b/htdocs/langs/el_GR/stripe.lang
index 8cd53bcd79e..6e926b238b0 100644
--- a/htdocs/langs/el_GR/stripe.lang
+++ b/htdocs/langs/el_GR/stripe.lang
@@ -41,7 +41,8 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
 ONLINE_PAYMENT_WAREHOUSE=Απόθεμα προς χρήση για μείωση αποθεμάτων όταν πραγματοποιείται η ηλεκτρονική πληρωμή <br> (TODO Όταν η επιλογή μείωσης αποθεμάτων γίνεται σε μια ενέργεια στο τιμολόγιο και η ηλεκτρονική πληρωμή δημιουργεί από μόνη της το τιμολόγιο;)
 StripeLiveEnabled=Η λειτουργία Stripe live είναι ενεργοποιημένη (διαφορετικά η λειτουργία test / sandbox)
 StripeImportPayment=Εισαγωγή πληρωμών Stripe
-ExampleOfTestCreditCard=Παράδειγμα πιστωτικής κάρτας για δοκιμή: %s => έγκυρο, %s => σφάλμα CVC, %s => έληξε, %s => η χρέωση αποτυγχάνει
+ExampleOfTestCreditCard=Παράδειγμα πιστωτικής κάρτας για δοκιμή SEPA: %s => έγκυρο, %s => σφάλμα CVC, %s => έληξε, %s => η χρέωση αποτυγχάνει
+ExampleOfTestBankAcountForSEPA=Παράδειγμα BAN τραπεζικού λογαριασμού για δοκιμή πάγιας εντολής: %s
 StripeGateways=Stripe gateways
 OAUTH_STRIPE_TEST_ID=Το αναγνωριστικό πελάτη Stripe Connect (ca _...)
 OAUTH_STRIPE_LIVE_ID=Το αναγνωριστικό πελάτη Stripe Connect (ca _...)
@@ -61,6 +62,7 @@ DeleteACard=Διαγραφή κάρτας
 ConfirmDeleteCard=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτήν την πιστωτική ή χρεωστική κάρτα;
 CreateCustomerOnStripe=Δημιουργία πελάτη στο Stripe
 CreateCardOnStripe=Δημιουργία κάρτας στο Stripe
+CreateBANOnStripe=Δημιουργία τράπεζας στο Stripe
 ShowInStripe=Εμφάνιση στο Stripe
 StripeUserAccountForActions=Λογαριασμός χρήστη που θα χρησιμοποιηθεί για την ειδοποίηση μέσω ηλεκτρονικού ταχυδρομείου ορισμένων ενεργειών Stripe (πληρωμές Stripe)
 StripePayoutList=Λίστα των πληρωμών Stripe
@@ -69,4 +71,8 @@ ToOfferALinkForLiveWebhook=Σύνδεσμος για τη ρύθμιση του
 PaymentWillBeRecordedForNextPeriod=Η πληρωμή θα καταγραφεί για την επόμενη περίοδο.
 ClickHereToTryAgain=<a href="%s">Κάντε κλικ εδώ για να δοκιμάσετε ξανά ...</a>
 CreationOfPaymentModeMustBeDoneFromStripeInterface=Λόγω των κανόνων ισχυρού ελέγχου ταυτότητας πελατών, η δημιουργία κάρτας πρέπει να γίνει από την Stripe. Μπορείτε να κάνετε κλικ εδώ για να ενεργοποιήσετε την εγγραφή πελατών Stripe: %s
-TERMINAL_LOCATION=Τοποθεσία (διεύθυνση) για τερματικά
+STRIPE_CARD_PRESENT=Δώροκάρτα για τερματικά Stripe
+TERMINAL_LOCATION=Τοποθεσία (διεύθυνση) για Stripe Terminals
+RequestDirectDebitWithStripe=Άμεση Χρέωση με Stripe
+STRIPE_SEPA_DIRECT_DEBIT=Ενεργοποιήστε τις πληρωμές άμεσης χρέωσης μέσω Stripe
+
diff --git a/htdocs/langs/el_GR/ticket.lang b/htdocs/langs/el_GR/ticket.lang
index 9cdf84ef881..399e7de949b 100644
--- a/htdocs/langs/el_GR/ticket.lang
+++ b/htdocs/langs/el_GR/ticket.lang
@@ -26,6 +26,7 @@ Permission56002=Τροποποίηση tickets
 Permission56003=Διαγραφή tickets
 Permission56004=Διαχείριση tickets
 Permission56005=Δείτε τα tickets όλων των τρίτων (δεν ισχύει για εξωτερικούς χρήστες, πάντα περιορίζονται στο τρίτο μέρος από το οποίο εξαρτώνται)
+Permission56006=Εξαγωγή των tickets
 
 Tickets=Tickets
 TicketDictType=Ticket - Τύποι
@@ -61,6 +62,8 @@ TypeContact_ticket_external_CONTRIBUTOR=Εξωτερικός συνεργάτη
 OriginEmail=Email πελάτη που άνοιξε το ticket
 Notify_TICKET_SENTBYMAIL=Στείλτε μήνυμα ticket μέσω email
 
+ExportDataset_ticket_1=Tickets
+
 # Status
 Read=Έχει αναγνωστεί
 Assigned=Έχει ανατεθεί
diff --git a/htdocs/langs/el_GR/users.lang b/htdocs/langs/el_GR/users.lang
index 24f318bfb6e..ef21d43871c 100644
--- a/htdocs/langs/el_GR/users.lang
+++ b/htdocs/langs/el_GR/users.lang
@@ -47,7 +47,7 @@ RemoveFromGroup=Αφαίρεση από την ομάδα
 PasswordChangedAndSentTo=Ο κωδικός πρόσβασης άλλαξε και στάλθηκε στο <b> %s </b> .
 PasswordChangeRequest=Αίτημα αλλαγής κωδικού πρόσβασης για <b>%s</b>
 PasswordChangeRequestSent=Το αίτημα για αλλαγή κωδικού πρόσβασης για <b> %s </b> στάλθηκε στο <b> %s </b>.
-IfLoginExistPasswordRequestSent=Εάν αυτή η σύνδεση αφορά έγκυρο λογαριασμό, έχει σταλεί ένα email για επαναφορά του κωδικού πρόσβασης.
+IfLoginExistPasswordRequestSent=Εάν αυτή η σύνδεση είναι έγκυρος λογαριασμός (με έγκυρο email), έχει σταλεί ένα email για επαναφορά του κωδικού πρόσβασης.
 IfEmailExistPasswordRequestSent=Εάν αυτό το email είναι έγκυρος λογαριασμός, έχει σταλεί ένα email για επαναφορά του κωδικού πρόσβασης.
 ConfirmPasswordReset=Επιβεβαίωση της επαναφοράς κωδικού πρόσβασης
 MenuUsersAndGroups=Χρήστες και Ομάδες
@@ -55,7 +55,7 @@ LastGroupsCreated=Οι τελευταίες %s ομάδες που δημιου
 LastUsersCreated=Τελευταίοι %s χρήστες που δημιουργήθηκαν
 ShowGroup=Εμφάνιση ομάδας
 ShowUser=Εμφάνιση χρήστη
-NonAffectedUsers=Non affected users
+NonAffectedUsers=Χρήστες χωρίς ανατεθειμένη εργασία
 UserModified=Ο χρήστης τροποποιήθηκε με επιτυχία
 PhotoFile=Αρχείο φωτογραφίας
 ListOfUsersInGroup=Λίστα χρηστών σε αυτήν την ομάδα
@@ -66,11 +66,11 @@ LinkedToDolibarrUser=Σύνδεσμος προς χρήστη
 LinkedToDolibarrThirdParty=Σύνδεσμος προς τρίτο μέρος
 CreateDolibarrLogin=Δημιουργία ενός χρήστη
 CreateDolibarrThirdParty=Δημιουργία τρίτου μέρους
-LoginAccountDisableInDolibarr=Ο λογαριασμός απενεργοποιήθηκε στο Dolibarr.
-UsePersonalValue=Use personal value
-InternalUser=Εσωτερικός χρήστης
+LoginAccountDisableInDolibarr=Ο λογαριασμός απενεργοποιήθηκε στο Dolibarr
+PASSWORDInDolibarr=Ο κωδικός έχει τροποποιηθεί στο Dolibarr
+UsePersonalValue=Χρήση προσωπικής επιλογής
 ExportDataset_user_1=Οι χρήστες και οι ιδιότητές τους
-DomainUser=Domain user %s
+DomainUser=Χρήστης τομέα %s
 Reactivate=Επανενεργοποίηση
 CreateInternalUserDesc=Αυτή η φόρμα σάς επιτρέπει να δημιουργήσετε έναν εσωτερικό χρήστη στην εταιρεία/οργανισμό σας. Για να δημιουργήσετε έναν εξωτερικό χρήστη (πελάτη, προμηθευτή κ.λπ. ..), χρησιμοποιήστε το κουμπί "Δημιουργία χρήστη Dolibarr" από την κάρτα επικοινωνίας αυτού του τρίτου μέρους.
 InternalExternalDesc=Ένας <b>εσωτερικός</b>  χρήστης είναι ένας χρήστης που ανήκει στην εταιρεία/οργανισμό σας ή είναι συνεργάτης χρήστης εκτός του οργανισμού σας που μπορεί να χρειάζεται να δει περισσότερα δεδομένα από τα δεδομένα που σχετίζονται με την εταιρεία του (το σύστημα δικαιωμάτων θα καθορίσει τι μπορεί ή τι δεν μπορεί να δει ή να κάνει).<br> Ένας <b>εξωτερικός</b>  χρήστης είναι ένας πελάτης, προμηθευτής ή άλλος που πρέπει να βλέπει ΜΟΝΟ δεδομένα που σχετίζονται με τον εαυτό του (Η δημιουργία εξωτερικού χρήστη για τρίτο μέρος μπορεί να γίνει από την εγγραφή επαφής του τρίτου μέρους). <br> <br> Και στις δύο περιπτώσεις, πρέπει να εκχωρήσετε δικαιώματα για τις δυνατότητες που χρειάζεται ο χρήστης.
@@ -79,7 +79,7 @@ Inherited=Κληρονομήθηκε
 UserWillBe=Ο χρήστης που δημιουργήθηκε θα είναι
 UserWillBeInternalUser=Ο χρήστης που δημιουργήθηκε θα είναι εσωτερικός χρήστης (επειδή δεν συνδέεται με συγκεκριμένο τρίτο μέρος)
 UserWillBeExternalUser=Ο χρήστης που δημιουργήθηκε θα είναι εξωτερικός χρήστης (επειδή συνδέεται με ένα συγκεκριμένο τρίτο μέρος)
-IdPhoneCaller=Id phone caller
+IdPhoneCaller=Id καλούντος
 NewUserCreated=Ο χρήστης %s δημιουργήθηκε
 NewUserPassword=Αλλαγή κωδικού πρόσβασης για %s
 NewPasswordValidated=Ο νέος σας κωδικός έχει επικυρωθεί και πρέπει να χρησιμοποιηθεί τώρα για να συνδεθείτε.
@@ -93,7 +93,7 @@ GroupDeleted=Η ομάδα %s καταργήθηκε
 ConfirmCreateContact=Είστε σίγουροι ότι θέλετε να δημιουργήσετε καινούριο λογαριασμό Dolibarr γι΄ αυτή την επαφή;
 ConfirmCreateLogin=Είστε σίγουροι ότι θέλετε να δημιουργήσετε καινούριο λογαριασμό Dolibarr γι΄ αυτό το μέλος;
 ConfirmCreateThirdParty=Είστε σίγουροι ότι θέλετε να δημιουργήσετε ένα τρίτο μέρος για αυτό το μέλος;
-LoginToCreate=Login to create
+LoginToCreate=Χρήστης σύνδεσης για δημιουργία
 NameToCreate=Όνομα τρίτου μέρους προς δημιουργία
 YourRole=Οι ρόλοι σας
 YourQuotaOfUsersIsReached=Συμπληρώθηκε το όριο ενεργών χρηστών σας!
@@ -128,3 +128,8 @@ DateLastLogin=Ημερομηνία τελευταίας σύνδεσης
 DatePreviousLogin=Ημερομηνία προηγούμενης σύνδεσης
 IPLastLogin=IP τελευταίας σύνδεσης
 IPPreviousLogin=IP προηγούμενης σύνδεσης
+ShowAllPerms=Εμφάνιση όλων των γραμμών δικαιωμάτων
+HideAllPerms=Απόκρυψη όλων των γραμμών δικαιωμάτων
+UserPublicPageDesc=Μπορείτε να ενεργοποιήσετε μια εικονική κάρτα για αυτόν τον χρήστη. Ένα url με το προφίλ χρήστη και έναν γραμμωτό κώδικα θα είναι διαθέσιμο για να επιτρέπεται σε οποιονδήποτε διαθέτει smartphone να το σαρώσει και να προσθέσει την επαφή σας στο βιβλίο διευθύνσεών του.
+EnablePublicVirtualCard=Ενεργοποιήστε τη δημόσια εικονική κάρτα χρήστη
+PublicVirtualCardUrl=Δημόσια εικονική κάρτα χρήστη
diff --git a/htdocs/langs/el_GR/website.lang b/htdocs/langs/el_GR/website.lang
index 5a801bdc195..f90c3118809 100644
--- a/htdocs/langs/el_GR/website.lang
+++ b/htdocs/langs/el_GR/website.lang
@@ -155,3 +155,5 @@ WebpageMustBeDisabled=Η ιστοσελίδα πρέπει να είναι σε
 SetWebsiteOnlineBefore=Όταν ο ιστότοπος είναι εκτός σύνδεσης, όλες οι σελίδες είναι εκτός σύνδεσης. Αλλάξτε την κατάσταση του ιστότοπου πρώτα.
 Booking=Κράτηση
 Reservation=Κράτηση
+PagesViewedPreviousMonth=Σελίδες που προβλήθηκαν (προηγούμενος μήνας)
+PagesViewedTotal=Σελίδες που προβλήθηκαν (σύνολο)
diff --git a/htdocs/langs/en_AE/stripe.lang b/htdocs/langs/en_AE/stripe.lang
new file mode 100644
index 00000000000..ae44362fd94
--- /dev/null
+++ b/htdocs/langs/en_AE/stripe.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - stripe
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+TERMINAL_LOCATION=Location (address) for Stripe Terminals
diff --git a/htdocs/langs/en_AU/stripe.lang b/htdocs/langs/en_AU/stripe.lang
new file mode 100644
index 00000000000..ae44362fd94
--- /dev/null
+++ b/htdocs/langs/en_AU/stripe.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - stripe
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+TERMINAL_LOCATION=Location (address) for Stripe Terminals
diff --git a/htdocs/langs/en_CA/stripe.lang b/htdocs/langs/en_CA/stripe.lang
new file mode 100644
index 00000000000..ae44362fd94
--- /dev/null
+++ b/htdocs/langs/en_CA/stripe.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - stripe
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+TERMINAL_LOCATION=Location (address) for Stripe Terminals
diff --git a/htdocs/langs/en_GB/accountancy.lang b/htdocs/langs/en_GB/accountancy.lang
index b1f36ec14ad..ec24e4e1046 100644
--- a/htdocs/langs/en_GB/accountancy.lang
+++ b/htdocs/langs/en_GB/accountancy.lang
@@ -24,7 +24,6 @@ Addanaccount=Add a financial account
 AccountAccounting=Financial Account
 ShowAccountingAccount=Show finance account
 ShowAccountingJournal=Show finance journal
-AccountAccountingSuggest=Suggested Financial Account
 MenuVatAccounts=VAT accounts
 ProductsBinding=Product accounts
 Binding=Link to accounts
@@ -53,6 +52,7 @@ LabelAccount=Account name
 LabelOperation=Account operation
 NumPiece=Item number
 AccountingCategory=Custom group of accounts
+AccountingCategories=Custom groups of accounts
 AccountingAccountGroupsDesc=Here you can define some groups of financial accounts. They will be used for personalised accounting reports.
 ByPersonalizedAccountGroups=By personalised groups
 FeeAccountNotDefined=Account for fees not defined
diff --git a/htdocs/langs/en_GB/stripe.lang b/htdocs/langs/en_GB/stripe.lang
new file mode 100644
index 00000000000..ae44362fd94
--- /dev/null
+++ b/htdocs/langs/en_GB/stripe.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - stripe
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+TERMINAL_LOCATION=Location (address) for Stripe Terminals
diff --git a/htdocs/langs/en_IN/stripe.lang b/htdocs/langs/en_IN/stripe.lang
new file mode 100644
index 00000000000..ae44362fd94
--- /dev/null
+++ b/htdocs/langs/en_IN/stripe.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - stripe
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+TERMINAL_LOCATION=Location (address) for Stripe Terminals
diff --git a/htdocs/langs/en_SG/stripe.lang b/htdocs/langs/en_SG/stripe.lang
new file mode 100644
index 00000000000..ae44362fd94
--- /dev/null
+++ b/htdocs/langs/en_SG/stripe.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - stripe
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+TERMINAL_LOCATION=Location (address) for Stripe Terminals
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 9e174dc3da1..b87c9fc4955 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -14,8 +14,8 @@ 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
+DefaultForService=Default for services
+DefaultForProduct=Default for products
 ProductForThisThirdparty=Product for this thirdparty
 ServiceForThisThirdparty=Service for this thirdparty
 CantSuggest=Can't suggest
@@ -101,7 +101,8 @@ ShowAccountingAccount=Show accounting account
 ShowAccountingJournal=Show accounting journal
 ShowAccountingAccountInLedger=Show accounting account in ledger
 ShowAccountingAccountInJournals=Show accounting account in journals
-AccountAccountingSuggest=Accounting account suggested
+DataUsedToSuggestAccount=Data used to suggest account
+AccountAccountingSuggest=Account suggested
 MenuDefaultAccounts=Default accounts
 MenuBankAccounts=Bank accounts
 MenuVatAccounts=Vat accounts
@@ -405,7 +406,7 @@ 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.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the thirdparty, or change the product account suggested for binding if needed.
 ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
 ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
 ## Dictionary
@@ -476,5 +477,7 @@ 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.
 ExpenseReportJournal=Expense Report Journal
+DocsAlreadyExportedAreExcluded=Docs already exported are excluded
+ClickToHideAlreadyExportedLines=Click to hide already exported lines
 
 NAccounts=%s accounts
diff --git a/htdocs/langs/en_US/boxes.lang b/htdocs/langs/en_US/boxes.lang
index 0ac1ecce545..9e80e36b119 100644
--- a/htdocs/langs/en_US/boxes.lang
+++ b/htdocs/langs/en_US/boxes.lang
@@ -24,6 +24,7 @@ BoxFicheInter=Latest interventions
 BoxCurrentAccounts=Open accounts balance
 BoxTitleMemberNextBirthdays=Birthdays of this month (members)
 BoxTitleMembersByType=Members by type and status
+BoxTitleMembersByTags=Members by tags and status
 BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=Latest %s news from %s
 BoxTitleLastProducts=Products/Services: last %s modified
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index 911ba31bc25..e17c7bcb90e 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -503,3 +503,4 @@ TwoRecordsOfCompanyName=more than one record exists for this company, please con
 CompanySection=Company section
 ShowSocialNetworks=Show social networks
 HideSocialNetworks=Hide social networks
+
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index b779c901b54..50d5c0e90d7 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -303,7 +303,7 @@ ErrorValueForTooLow=Value for <b>%s</b> is too low
 ErrorValueCantBeNull=Value for <b>%s</b> can't be null
 ErrorDateOfMovementLowerThanDateOfFileTransmission=The date of the bank transaction can't be lower than the date of the file transmission
 ErrorTooMuchFileInForm=Too much files in form, the maximum number is %s file(s)
-ErrorSessionInvalidatedAfterPasswordChange=The session was invalidated after a password change. Please relogin.
+ErrorSessionInvalidatedAfterPasswordChange=The session was been invalidated following a change of password, status or dates of validity. Please relogin.
 
 # 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/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 0d06736a23d..4c4d79398b2 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -916,13 +916,14 @@ ExportFilteredList=Export filtered list
 ExportList=Export list
 ExportOptions=Export Options
 IncludeDocsAlreadyExported=Include docs already exported
-ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
-ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
+ExportOfPiecesAlreadyExportedIsEnable=Documents already exported are visible and will be exported
+ExportOfPiecesAlreadyExportedIsDisable=Documents already exported are hidden and won't be exported
 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...
+GroupByX=Group by %s
 ViewFlatList=View flat list
 ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
@@ -1220,4 +1221,7 @@ NoSpecificContactAddressBis=This tab is dedicated to force specific contacts or
 HideOnVCard=Hide %s
 AddToContacts=Add address to my contacts
 LastAccess=Last access
-UploadAnImageToSeeAPhotoHere=Upload an image from the tab %s to see a photo here
\ No newline at end of file
+UploadAnImageToSeeAPhotoHere=Upload an image from the tab %s to see a photo here
+LastPasswordChangeDate=Last password change date
+PublicVirtualCardUrl=Public virtual user card 
+TreeView=Tree view
diff --git a/htdocs/langs/en_US/mrp.lang b/htdocs/langs/en_US/mrp.lang
index 6bdea0cc951..82cf7c38012 100644
--- a/htdocs/langs/en_US/mrp.lang
+++ b/htdocs/langs/en_US/mrp.lang
@@ -102,6 +102,7 @@ NbOperatorsRequired=Number of operators required
 THMOperatorEstimated=Estimated operator THM
 THMMachineEstimated=Estimated machine THM
 WorkstationType=Workstation type
+DefaultWorkstation=Default workstation
 Human=Human
 Machine=Machine
 HumanMachine=Human / Machine
diff --git a/htdocs/langs/en_US/ticket.lang b/htdocs/langs/en_US/ticket.lang
index ea560012afc..de54d475591 100644
--- a/htdocs/langs/en_US/ticket.lang
+++ b/htdocs/langs/en_US/ticket.lang
@@ -26,6 +26,7 @@ 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)
+Permission56006=Export tickets
 
 Tickets=Tickets
 TicketDictType=Ticket - Types
@@ -61,6 +62,8 @@ TypeContact_ticket_external_CONTRIBUTOR=External contributor
 OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
+ExportDataset_ticket_1=Tickets
+
 # Status
 Read=Read
 Assigned=Assigned
diff --git a/htdocs/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang
index 05c9ebb339d..f6b93d5295d 100644
--- a/htdocs/langs/en_US/users.lang
+++ b/htdocs/langs/en_US/users.lang
@@ -132,4 +132,3 @@ ShowAllPerms=Show all permission rows
 HideAllPerms=Hide all permission rows
 UserPublicPageDesc=You can enable a virtual card for this user. An url with the user profile and a barcode will be available to allow anybody with a smartphone to scan it and add your contact to its address book.
 EnablePublicVirtualCard=Enable the public virtual user card
-PublicVirtualCardUrl=Public virtual user card
\ No newline at end of file
diff --git a/htdocs/langs/en_ZA/stripe.lang b/htdocs/langs/en_ZA/stripe.lang
new file mode 100644
index 00000000000..ae44362fd94
--- /dev/null
+++ b/htdocs/langs/en_ZA/stripe.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - stripe
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+TERMINAL_LOCATION=Location (address) for Stripe Terminals
diff --git a/htdocs/langs/es_AR/accountancy.lang b/htdocs/langs/es_AR/accountancy.lang
index f2465f8da73..4d4d9531d99 100644
--- a/htdocs/langs/es_AR/accountancy.lang
+++ b/htdocs/langs/es_AR/accountancy.lang
@@ -8,13 +8,13 @@ ACCOUNTING_EXPORT_DEVISE=Exportar moneda
 Selectformat=Elegir el formato del archivo
 ACCOUNTING_EXPORT_FORMAT=Seleccione el formato para el archivo
 ACCOUNTING_EXPORT_PREFIX_SPEC=Especificar el prefijo para el nombre de archivo
-DefaultForService=Predeterminado para servicio
-DefaultForProduct=Predeterminado para producto
 AccountancySetupDoneFromAccountancyMenu=La mayor parte de la configuración de la contabilidad se hace desde el menú %s
 Journalization=Contabilización
 Journals=Diarios Contables
 JournalFinancial=Diarios Financieros
 AssignDedicatedAccountingAccount=Nueva cuenta para asignar
 InvoiceLabel=Etiqueta de la factura
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
+AccountingCategory=Custom group of accounts
+AccountingCategories=Custom groups of accounts
+AccountingJournalType5=Informe de gastos
 ConfirmMassDeleteBookkeepingWriting=Confirmar Eliminar en Masa
diff --git a/htdocs/langs/es_AR/main.lang b/htdocs/langs/es_AR/main.lang
index cfff93840e7..9d96140997b 100644
--- a/htdocs/langs/es_AR/main.lang
+++ b/htdocs/langs/es_AR/main.lang
@@ -499,8 +499,6 @@ Exports=Exporta
 ExportFilteredList=Exportar lista filtrada
 ExportList=Exportar lista
 ExportOptions=Exportar Opciones
-ExportOfPiecesAlreadyExportedIsEnable=Exportar piezas que ya fueron exportadas está habilitado
-ExportOfPiecesAlreadyExportedIsDisable=Exportar piezas que ya fueron exportadas está deshabilitado
 AllExportedMovementsWereRecordedAsExported=Todos los movimientos de exportaciones fueron registrados como exportados
 NotAllExportedMovementsCouldBeRecordedAsExported=No todos los movimientos de exportados pueden registrarse como exportados
 Miscellaneous=Miscelanias
@@ -581,4 +579,9 @@ CustomReports=Informes de clientes
 SelectYourGraphOptionsFirst=Elija sus opciones de gráfico para construir un gráfico
 XAxis=Eje-X
 YAxis=Eje-Y
+AffectTag=Assign a Tag
+AffectUser=Assign a User
+SetSupervisor=Set the supervisor
+ProjectRole=Role assigned on each project/opportunity
+TasksRole=Role assigned on each task (if used)
 Terminated=Terminado
diff --git a/htdocs/langs/es_AR/stripe.lang b/htdocs/langs/es_AR/stripe.lang
new file mode 100644
index 00000000000..ae44362fd94
--- /dev/null
+++ b/htdocs/langs/es_AR/stripe.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - stripe
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+TERMINAL_LOCATION=Location (address) for Stripe Terminals
diff --git a/htdocs/langs/es_AR/users.lang b/htdocs/langs/es_AR/users.lang
index de855ed3819..7049c06cc60 100644
--- a/htdocs/langs/es_AR/users.lang
+++ b/htdocs/langs/es_AR/users.lang
@@ -42,7 +42,6 @@ LinkToCompanyContact=Enlazar a un tercero / contacto
 LinkedToDolibarrMember=Enlazar al miembro
 CreateDolibarrLogin=Crear un usuario
 CreateDolibarrThirdParty=Crea un tercero
-LoginAccountDisableInDolibarr=Cuenta deshabilitada en Dolibarr.
 UsePersonalValue=Usar valor personal
 ExportDataset_user_1=Usuarios y sus propiedades
 DomainUser=Usuario de dominio %s
diff --git a/htdocs/langs/es_BO/stripe.lang b/htdocs/langs/es_BO/stripe.lang
new file mode 100644
index 00000000000..ae44362fd94
--- /dev/null
+++ b/htdocs/langs/es_BO/stripe.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - stripe
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+TERMINAL_LOCATION=Location (address) for Stripe Terminals
diff --git a/htdocs/langs/es_CL/accountancy.lang b/htdocs/langs/es_CL/accountancy.lang
index b3f110ea367..ed300a37675 100644
--- a/htdocs/langs/es_CL/accountancy.lang
+++ b/htdocs/langs/es_CL/accountancy.lang
@@ -9,8 +9,6 @@ ACCOUNTING_EXPORT_DEVISE=Moneda de exportación
 Selectformat=Seleccione el formato para el archivo
 ACCOUNTING_EXPORT_FORMAT=Seleccione el formato para el archivo
 ACCOUNTING_EXPORT_PREFIX_SPEC=Especifíque el prefijo para el nombre de archivo
-DefaultForService=Predeterminado para servicio
-DefaultForProduct=Predeterminado para producto
 CantSuggest=No puedo sugerir
 AccountancySetupDoneFromAccountancyMenu=La mayoría de las configuraciones de la contabilidad se realizan desde el menú %s
 Journalization=Periodización
@@ -105,6 +103,8 @@ LetteringCode=Codigo de letras
 JournalLabel=Etiqueta de revista
 NumPiece=Pieza número
 TransactionNumShort=Num. transacción
+AccountingCategory=Custom group of accounts
+AccountingCategories=Custom groups of accounts
 AccountingAccountGroupsDesc=Puede definir aquí algunos grupos de cuentas contables. Se usarán para informes de contabilidad personalizados.
 DelYear=Año para borrar
 DelJournal=Diario para eliminar
diff --git a/htdocs/langs/es_CL/main.lang b/htdocs/langs/es_CL/main.lang
index fc98ae0954b..25b1b4408f8 100644
--- a/htdocs/langs/es_CL/main.lang
+++ b/htdocs/langs/es_CL/main.lang
@@ -448,8 +448,6 @@ ClassifyUnbilled=Clasificar sin facturar
 FrontOffice=Oficina frontal
 ExportFilteredList=Exportar lista filtrada
 ExportList=Lista de exportación
-ExportOfPiecesAlreadyExportedIsEnable=Se habilita la exportación de piezas ya exportadas.
-ExportOfPiecesAlreadyExportedIsDisable=La exportación de piezas ya exportadas está deshabilitada.
 AllExportedMovementsWereRecordedAsExported=Todos los movimientos exportados fueron registrados como exportados.
 NotAllExportedMovementsCouldBeRecordedAsExported=No todos los movimientos exportados pudieron registrarse como exportados
 Miscellaneous=Diverso
@@ -532,3 +530,8 @@ ContactDefault_invoice_supplier=Factura del proveedor
 ContactDefault_propal=Cotización
 ContactDefault_supplier_proposal=Propuesta de proveedor
 ContactAddedAutomatically=Contacto agregado de roles de terceros de contacto
+AffectTag=Assign a Tag
+AffectUser=Assign a User
+SetSupervisor=Set the supervisor
+ProjectRole=Role assigned on each project/opportunity
+TasksRole=Role assigned on each task (if used)
diff --git a/htdocs/langs/es_CL/stripe.lang b/htdocs/langs/es_CL/stripe.lang
index 84e773250a6..81cdc4cac04 100644
--- a/htdocs/langs/es_CL/stripe.lang
+++ b/htdocs/langs/es_CL/stripe.lang
@@ -20,7 +20,7 @@ STRIPE_LIVE_SECRET_KEY=Clave secreta en vivo
 STRIPE_LIVE_PUBLISHABLE_KEY=Clave en vivo publicable
 StripeLiveEnabled=Stripe live enabled (de lo contrario, prueba / modo de espacio aislado)
 StripeImportPayment=Importar pagos en franja
-ExampleOfTestCreditCard=Ejemplo de tarjeta de crédito para la prueba: %s =&gt; válido, %s =&gt; error CVC, %s =&gt; caducado, %s =&gt; cargo falla
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
 StripeGateways=Pasarelas de banda
 BankAccountForBankTransfer=Cuenta bancaria para pagos de fondos
 StripeAccount=Cuenta de banda
@@ -34,3 +34,4 @@ ShowInStripe=Mostrar en raya
 StripeUserAccountForActions=Cuenta de usuario para usar para la notificación por correo electrónico de algunos eventos de Stripe (pagos de Stripe)
 StripePayoutList=Lista de pagos de la raya
 ToOfferALinkForLiveWebhook=Enlace para configurar Stripe WebHook para llamar a la IPN (modo en vivo)
+TERMINAL_LOCATION=Location (address) for Stripe Terminals
diff --git a/htdocs/langs/es_CL/users.lang b/htdocs/langs/es_CL/users.lang
index e84167b6a69..c21d55dcd29 100644
--- a/htdocs/langs/es_CL/users.lang
+++ b/htdocs/langs/es_CL/users.lang
@@ -48,7 +48,6 @@ LinkToCompanyContact=Enlace a un tercero / contacto
 LinkedToDolibarrMember=Enlace al miembro
 CreateDolibarrLogin=Crear un usuario
 CreateDolibarrThirdParty=Crea un tercero
-LoginAccountDisableInDolibarr=Cuenta desactivada en Dolibarr.
 UsePersonalValue=Use valor personal
 DomainUser=Usuario del dominio %s
 CreateInternalUserDesc=Este formulario le permite crear un usuario interno en su empresa / organización. Para crear un usuario externo (cliente, proveedor, etc.), use el botón &quot;Crear usuario de Dolibarr&quot; de la tarjeta de contacto de ese tercero.
diff --git a/htdocs/langs/es_CO/accountancy.lang b/htdocs/langs/es_CO/accountancy.lang
index 52afc52a574..64836ed84cd 100644
--- a/htdocs/langs/es_CO/accountancy.lang
+++ b/htdocs/langs/es_CO/accountancy.lang
@@ -9,8 +9,6 @@ ACCOUNTING_EXPORT_DEVISE=Moneda de exportación
 Selectformat=Selecciona el formato para el archivo.
 ACCOUNTING_EXPORT_FORMAT=Selecciona el formato para el archivo.
 ACCOUNTING_EXPORT_PREFIX_SPEC=Especifique el prefijo para el nombre del archivo.
-DefaultForService=Por defecto para el servicio
-DefaultForProduct=Predeterminado para producto
 CantSuggest=No puedo sugerir
 ConfigAccountingExpert=Configuración de la contabilidad del módulo (doble entrada)
 Journalization=Periodización
@@ -138,7 +136,7 @@ Codejournal=diario
 JournalLabel=Etiqueta de diario
 NumPiece=Número de pieza
 TransactionNumShort=Num. transacción
-AccountingCategory=Grupo personalizado de cuentas
+AccountingCategories=Custom groups of accounts
 GroupByAccountAccounting=Agrupar por cuenta del libro mayor
 AccountingAccountGroupsDesc=Puede definir aquí algunos grupos de cuentas contables. Serán utilizados para informes contables personalizados.
 ByPredefinedAccountGroups=Por grupos predefinidos.
@@ -175,12 +173,6 @@ PcgtypeDesc=Los grupos de cuentas se utilizan como criterios de 'filtro' y 'agru
 Reconcilable=Conciliable
 TotalVente=Rotación total antes de impuestos
 TotalMarge=Margen total de ventas
-DescVentilCustomer=Consulta aquí la lista de líneas de factura de cliente vinculadas (o no) a una cuenta de producto desde plan de cuentas
-DescVentilMore=En la mayoría de los casos, si usa productos o servicios predefinidos y configura la cuenta (desde el plan de cuentas) en la tarjeta de producto/servicio, la aplicación podrá realizar todos los enlaces entre sus líneas de factura y la cuenta contable de su plan. de cuentas, con solo un clic con el botón <strong> "%s" </strong> . Si la cuenta no se configuró en las tarjetas de productos/servicios o si todavía tiene algunas líneas no vinculadas a una cuenta, deberá realizar un enlace manual desde el menú "<strong> %s </strong>".
-DescVentilDoneCustomer=Consulta aquí el listado de las líneas de facturas clientes y su cuenta de producto desde plan de cuentas
-DescVentilTodoCustomer=Enlazar líneas de factura que aún no están enlazadas con una cuenta de producto del plan de cuentas
-ChangeAccount=Cambie la cuenta de producto/servicio (del plan de cuentas) para las líneas seleccionadas con la siguiente cuenta:
-DescVentilSupplier=Consulte aquí la lista de líneas de factura de proveedor vinculadas o aún no vinculadas a una cuenta de producto del plan de cuentas (solo se ven los registros que aún no se han transferido en contabilidad)
 DescVentilDoneSupplier=Consulte aquí el listado de las líneas de facturas de proveedores y su cuenta contable
 DescVentilTodoExpenseReport=Líneas de informe de gastos de enlace no vinculadas con una cuenta contable de comisiones
 DescVentilExpenseReport=Consulte aquí la lista de líneas de informe de gastos vinculadas (o no) a una cuenta de contabilidad de comisiones.
@@ -188,12 +180,11 @@ DescVentilExpenseReportMore=Si configura una cuenta contable según el tipo de l
 DescVentilDoneExpenseReport=Consulte aquí la lista de líneas de informes de gastos y sus cuentas contables.
 DescValidateMovements=Se prohíbe cualquier modificación o eliminación de la escritura, las letras y las eliminaciones. Todas las entradas para un ejercicio deben ser validadas, de lo contrario no será posible cerrar
 AutomaticBindingDone=Enlaces automáticos realizados (%s) - El enlace automático no es posible para algunos registros (%s)
-ErrorAccountancyCodeIsAlreadyUse=Error, no puede eliminar o deshabilitar esta cuenta de plan de cuentas porque se usa
+MvtNotCorrectlyBalanced=Movimiento no equilibrado correctamente. Débito = %s & Crédito = %s
 Balancing=Equilibrio
 FicheVentilation=Tarjeta de encuadernación
 GeneralLedgerIsWritten=Las transacciones están escritas en el libro mayor.
 GeneralLedgerSomeRecordWasNotRecorded=Algunas de las transacciones no pudieron ser periodizadas. Si no hay otro mensaje de error, probablemente sea porque ya estaban registrados.
-ListOfProductsWithoutAccountingAccount=Lista de productos no vinculados a ninguna cuenta o plan de cuentas
 ChangeBinding=Cambiar el enlace
 Accounted=Contabilizado en libro mayor
 NotYetAccounted=Aún no transferido a contabilidad
@@ -258,7 +249,6 @@ PredefinedGroups=Grupos predefinidos
 WithValidAccount=Con cuenta dedicada válida.
 ValueNotIntoChartOfAccount=Este valor de la cuenta contable no existe en el plan de cuentas.
 SaleEECWithVAT=Venta en EEC con IVA no nulo, por lo que suponemos que NO es una venta intracomunitaria y la cuenta sugerida es la cuenta estándar del producto.
-SaleEECWithoutVATNumber=Venta en CEE sin IVA, pero no se define el ID de IVA del tercero. Recurrimos a la cuenta de producto para las ventas estándar. Puede corregir el ID de IVA del tercero o la cuenta del producto si es necesario.
 ForbiddenTransactionAlreadyExported=Prohibido: La transacción ha sido validada y/o exportada.
 ForbiddenTransactionAlreadyValidated=Prohibido: La transacción ha sido validada.
 LetteringAuto=conciliar automáticamente
diff --git a/htdocs/langs/es_CO/admin.lang b/htdocs/langs/es_CO/admin.lang
index 34e0d7f39ca..3a97bbd7d88 100644
--- a/htdocs/langs/es_CO/admin.lang
+++ b/htdocs/langs/es_CO/admin.lang
@@ -735,9 +735,6 @@ Permission2503=Presentar o borrar documentos
 Permission2515=Configurar directorios de documentos
 Permission2801=Usar el cliente FTP en modo de lectura (solo navegar y descargar)
 Permission2802=Usar el cliente FTP en modo de escritura (eliminar o cargar archivos)
-Permission4021=Leer evaluaciones (tuyas y de tus subordinados)
-Permission4022=Crear/modificar evaluaciones
-Permission4033=Leer todas las evaluaciones (incluso las de usuarios no subordinados)
 Permission10001=Leer el contenido del sitio web
 Permission10002=Crear / modificar el contenido del sitio web (contenido html y javascript)
 Permission10003=Crear / modificar el contenido del sitio web (código php dinámico). Peligroso, debe reservarse para desarrolladores restringidos.
@@ -1638,10 +1635,8 @@ ConfFileIsReadableOrWritableByAnyUsers=El archivo conf. puede ser leido y escrit
 MailToSendEventOrganization=Organización del evento
 MailToPartnership=Camaradería
 YouShouldDisablePHPFunctions=<b>Debería deshabilitar las funciones de PHP</b>
-PHPFunctionsRequiredForCLI=Para fines de shell (como la copia de seguridad de trabajos programados o la ejecución de un programa antivirus), debe mantener 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=Algunas rutas restringidas para archivos de datos
 DatabasePasswordNotObfuscated=La contraseña de la base de datos NO está ofuscada en el archivo conf
 YouShouldSetThisToOff=Debes configurar esto en 0 o apagarlo
 InstallAndUpgradeLockedBy=La instalación y las actualizaciones están bloqueadas por el archivo <b> %s </b>
diff --git a/htdocs/langs/es_CO/companies.lang b/htdocs/langs/es_CO/companies.lang
index f1ccfe0423d..934d21de7ec 100644
--- a/htdocs/langs/es_CO/companies.lang
+++ b/htdocs/langs/es_CO/companies.lang
@@ -57,12 +57,11 @@ VATIntra=RUT
 VATIntraShort=RUT
 VATReturn=Devolución de IVA
 SupplierRelativeDiscount=Descuento relativo del proveedor
-HasRelativeDiscountFromSupplier=Tiene un descuento predeterminado de <b> %s%% </b> de este proveedor
-HasNoRelativeDiscountFromSupplier=Sin descuento relativo predeterminado de este proveedor
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> with this vendor
+HasNoRelativeDiscountFromSupplier=No default relative discount with this vendor
 CompanyHasAbsoluteDiscount=Este cliente tiene descuentos disponibles (notas de crédito o anticipos) para <b> %s </b> %s
 CompanyHasDownPaymentOrCommercialDiscount=Este cliente tiene descuentos disponibles (comerciales, anticipos) para <b> %s </b> %s
 CompanyHasCreditNote=Este cliente tiene <b>%s %s</b> anticipos disponibles
-HasNoAbsoluteDiscountFromSupplier=No hay descuento/crédito disponible de este proveedor
 HasAbsoluteDiscountFromSupplier=Tiene descuentos disponibles (notas de crédito o anticipos) para <b> %s </b> %s de este proveedor
 HasDownPaymentOrCommercialDiscountFromSupplier=Tiene descuentos disponibles (comerciales, anticipos) para <b> %s </b> %s de este proveedor
 HasCreditNoteFromSupplier=Tiene notas de crédito para <b> %s </b> %s de este proveedor
@@ -129,3 +128,5 @@ PaymentTypeBoth=Tipo de pago - Cliente y proveedor
 MulticurrencyUsed=Usar multidivisa
 MulticurrencyCurrency=Moneda
 CurrentOutstandingBillLate=Factura por pagar: Atrasada
+EmailAlreadyExistsPleaseRewriteYourCompanyName=el E-mail ya existe, vuelva a escribir el nombre de su empresa
+TwoRecordsOfCompanyName=more than one record exists for this company, please contact us to complete your partnership request
diff --git a/htdocs/langs/es_CO/eventorganization.lang b/htdocs/langs/es_CO/eventorganization.lang
index e633590b492..fc0dddddc18 100644
--- a/htdocs/langs/es_CO/eventorganization.lang
+++ b/htdocs/langs/es_CO/eventorganization.lang
@@ -5,7 +5,6 @@ Settings=Ajustes
 EVENTORGANIZATION_TASK_LABELTooltip =When you validate an event to organize, some tasks can be automatically created in the project <br>  <br> For example:  <br> Send Call for Conferences <br> Send Call for Booths <br> Validate suggestions of Conferences <br> Validate application for Booths <br> Open subscriptions to the event for attendees <br> Enviar un recordatorio del evento a los oradores <br> Enviar un recordatorio del evento a los anfitriones del stand <br> Enviar un recordatorio del evento a los asistentes
 EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT =Plantilla de correo electrónico para enviar después de que se haya pagado la inscripción a un evento.
 EventOrganizationConfOrBooth=Conferencia o stand
-EventOrganizationConfOrBoothes=Conferencias o Stands
 ManageOrganizeEvent =Gestionar la organización de un evento
 ConferenceOrBooth =Conferencia o stand
 ConferenceOrBoothTab =Conferencia o stand
@@ -15,8 +14,6 @@ ToSpeakers=A los altavoces
 AllowUnknownPeopleSuggestConf=Permitir que las personas sugieran conferencias
 AllowUnknownPeopleSuggestBooth=Permitir que las personas soliciten un stand
 NbVotes=Numero de votos
-ListOfSuggestedBooths=Stands sugeridos
-ListOfConferencesOrBooths=Proyecto de conferencias o stands de evento
 RegistrationAndPaymentWereAlreadyRecorder=Ya se registró un registro y un pago para el correo electrónico <b> %s </b>
 EmailAttendee=Correo electrónico del asistente
 EmailCompanyForInvoice=Correo electrónico de la empresa (para la factura, si es diferente del correo electrónico del asistente)
diff --git a/htdocs/langs/es_CO/main.lang b/htdocs/langs/es_CO/main.lang
index 03ec062beaf..6e5376a6157 100644
--- a/htdocs/langs/es_CO/main.lang
+++ b/htdocs/langs/es_CO/main.lang
@@ -251,8 +251,6 @@ FrontOffice=Oficina frontal
 Exports=Las exportaciones
 ExportFilteredList=Exportar lista filtrada
 ExportList=Lista de exportación
-ExportOfPiecesAlreadyExportedIsEnable=La exportación de piezas ya exportadas está habilitada.
-ExportOfPiecesAlreadyExportedIsDisable=La exportación de piezas ya exportadas está deshabilitada.
 AllExportedMovementsWereRecordedAsExported=Todos los movimientos exportados se registraron como exportados
 NotAllExportedMovementsCouldBeRecordedAsExported=No todos los movimientos exportados se pueden registrar como exportados
 Miscellaneous=Diverso
@@ -339,10 +337,11 @@ UpToDate=Al día
 OutOfDate=Vencido
 EventReminder=Recordatorio de evento
 Civility=Civilidad
-AffectTag=Asignar etiqueta
-AffectUser=Asignar usuario
-ConfirmAffectTag=Asignación de etiquetas masivas
-ConfirmAffectUser=Asignación masiva de usuarios
+AffectTag=Assign a Tag
+AffectUser=Assign a User
+SetSupervisor=Set the supervisor
+ProjectRole=Role assigned on each project/opportunity
+TasksRole=Role assigned on each task (if used)
 ConfirmSetSupervisor=Conjunto de supervisor a granel
 ConfirmAffectTagQuestion=¿Está seguro de que desea asignar etiquetas a los %s registros seleccionados?
 ConfirmAffectUserQuestion=¿Está seguro de que desea asignar usuarios a los %s registros seleccionados?
@@ -352,7 +351,6 @@ InformationOnLinkToContract=Esta cantidad es solo el total de todas las líneas
 ConfirmCancel=Estas seguro que quieres cancelar
 EmailMsgID=MsgID de correo electrónico
 EmailDate=Fecha de E-mail
-SetToStatus=Establecer en el estado %s
 SetToEnabled=Establecer como habilitado
 SetToDisabled=Establecer como deshabilitado
 ConfirmMassEnablingQuestion=¿Está seguro de que desea habilitar los %s registro(s) seleccionado(s)?
@@ -371,5 +369,4 @@ CanceledShown=Se muestra cancelada
 Terminate=Terminar
 Terminated=Terminado
 ConfirmAllocateCommercialQuestion=¿Está seguro de que desea asignar los %s registros seleccionados?
-CommercialsAffected=Representantes de ventas asignados
 CommercialAffected=representante de ventas asignado
diff --git a/htdocs/langs/es_CO/mrp.lang b/htdocs/langs/es_CO/mrp.lang
index 2cfafcc346e..7f31aabc1af 100644
--- a/htdocs/langs/es_CO/mrp.lang
+++ b/htdocs/langs/es_CO/mrp.lang
@@ -5,7 +5,6 @@ LatestBOMModified=Último %s Listas de materiales modificadas
 LatestMOModified=Últimas órdenes de fabricación %s modificadas
 Bom=Facturas de material
 BOMsSetup=Configuración de la lista de materiales del módulo
-ListOfBOMs=Listas de materiales - BOM
 ListOfManufacturingOrders=Órdenes de Fabricación
 BOMsNumberingModules=Plantillas de numeración de listas de materiales
 BOMsModelModule=Plantillas de documentos BOM
diff --git a/htdocs/langs/es_CO/stripe.lang b/htdocs/langs/es_CO/stripe.lang
index e4412f149cc..aaea5c1e0f1 100644
--- a/htdocs/langs/es_CO/stripe.lang
+++ b/htdocs/langs/es_CO/stripe.lang
@@ -20,7 +20,7 @@ STRIPE_LIVE_WEBHOOK_KEY=Clave en vivo de webhook
 ONLINE_PAYMENT_WAREHOUSE=Existencias a utilizar para la disminución de existencias cuando se realiza el pago en línea <br> (TODO ¿Cuándo se realiza la opción para disminuir las existencias en una acción en la factura y el pago en línea genera la factura por sí mismo?)
 StripeLiveEnabled=Stripe live habilitado (de lo contrario, modo prueba / sandbox)
 StripeImportPayment=Importar pagos de Stripe
-ExampleOfTestCreditCard=Ejemplo de tarjeta de crédito para prueba: %s => válido, %s => error CVC, %s => caducado, %s => falla de carga
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
 StripeGateways=Pasarelas de banda
 OAUTH_STRIPE_TEST_ID=ID de cliente de Stripe Connect (ca _...)
 OAUTH_STRIPE_LIVE_ID=ID de cliente de Stripe Connect (ca _...)
@@ -37,3 +37,4 @@ ToOfferALinkForTestWebhook=Enlace para configurar Stripe WebHook para llamar al
 ToOfferALinkForLiveWebhook=Enlace para configurar Stripe WebHook para llamar al IPN (modo en vivo)
 ClickHereToTryAgain=<a href="%s"> Haga clic aquí para volver a intentarlo ... </a>
 CreationOfPaymentModeMustBeDoneFromStripeInterface=Debido a las reglas estrictas de autenticación de clientes, la creación de una tarjeta debe realizarse desde el backoffice de Stripe. Puede hacer clic aquí para activar el registro de cliente de Stripe: %s
+TERMINAL_LOCATION=Location (address) for Stripe Terminals
diff --git a/htdocs/langs/es_CO/users.lang b/htdocs/langs/es_CO/users.lang
index 7569c03c066..dc2ca31937e 100644
--- a/htdocs/langs/es_CO/users.lang
+++ b/htdocs/langs/es_CO/users.lang
@@ -46,7 +46,6 @@ LinkToCompanyContact=Enlace a un tercero / contacto
 LinkedToDolibarrMember=Enlace al miembro
 CreateDolibarrLogin=Crea un usuario
 CreateDolibarrThirdParty=Crea un tercero
-LoginAccountDisableInDolibarr=Cuenta deshabilitada en Dolibarr.
 UsePersonalValue=Use valor personal
 ExportDataset_user_1=Usuarios y sus propiedades
 DomainUser=Usuario de dominio %s
diff --git a/htdocs/langs/es_CR/accountancy.lang b/htdocs/langs/es_CR/accountancy.lang
new file mode 100644
index 00000000000..cf74ffb05a8
--- /dev/null
+++ b/htdocs/langs/es_CR/accountancy.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - accountancy
+AccountingCategory=Custom group of accounts
+AccountingCategories=Custom groups of accounts
diff --git a/htdocs/langs/es_CR/admin.lang b/htdocs/langs/es_CR/admin.lang
index 52d3b029a72..485e2d7adf4 100644
--- a/htdocs/langs/es_CR/admin.lang
+++ b/htdocs/langs/es_CR/admin.lang
@@ -1,3 +1,8 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Imprimir en PDF referencia y período de producto
+BoldLabelOnPDF=Imprimir etiqueta del producto en Negrita en el PDF
+VersionProgram=Versión del programa
+VersionLastInstall=Versión inicial instalada
+VersionLastUpgrade=Actualizar a la versión más reciente
 OperationParamDesc=Define the rules to use to extract some data or set values to use for operation.<br><br>Example to extract a company name from email subject into a temporary variable:<br>tmp_var=EXTRACT:SUBJECT:Message from company ([^\n]*)<br><br>Examples to set the properties of an object to create:<br>objproperty1=SET:a hard coded value<br>objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:a value (value is set only if property 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.<br>For example, if you want to create a thirdparty with a name extracted from a string 'Name: name to find' present into the body, use the 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>
diff --git a/htdocs/langs/es_CR/companies.lang b/htdocs/langs/es_CR/companies.lang
new file mode 100644
index 00000000000..37c93f8f77d
--- /dev/null
+++ b/htdocs/langs/es_CR/companies.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - companies
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> with this vendor
+HasNoRelativeDiscountFromSupplier=No default relative discount with this vendor
+TwoRecordsOfCompanyName=more than one record exists for this company, please contact us to complete your partnership request
diff --git a/htdocs/langs/es_CR/stripe.lang b/htdocs/langs/es_CR/stripe.lang
new file mode 100644
index 00000000000..ae44362fd94
--- /dev/null
+++ b/htdocs/langs/es_CR/stripe.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - stripe
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+TERMINAL_LOCATION=Location (address) for Stripe Terminals
diff --git a/htdocs/langs/es_DO/stripe.lang b/htdocs/langs/es_DO/stripe.lang
new file mode 100644
index 00000000000..ae44362fd94
--- /dev/null
+++ b/htdocs/langs/es_DO/stripe.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - stripe
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+TERMINAL_LOCATION=Location (address) for Stripe Terminals
diff --git a/htdocs/langs/es_EC/accountancy.lang b/htdocs/langs/es_EC/accountancy.lang
index a9c11f18148..a89937dc114 100644
--- a/htdocs/langs/es_EC/accountancy.lang
+++ b/htdocs/langs/es_EC/accountancy.lang
@@ -7,7 +7,6 @@ ACCOUNTING_EXPORT_LABEL=Etiqueta de exportación
 ACCOUNTING_EXPORT_AMOUNT=Cantidad de la exportación
 ACCOUNTING_EXPORT_DEVISE=Moneda de exportación
 ACCOUNTING_EXPORT_PREFIX_SPEC=Especifique el prefijo para el nombre de archivo
-DefaultForService=Predeterminado para servicio
 CantSuggest=No puedo sugerir
 AccountancySetupDoneFromAccountancyMenu=La mayoría de la configuración de la contabilidad se realiza desde el menú%s
 Journals=Revistas
@@ -104,6 +103,8 @@ LetteringCode=Codigo de letras
 Codejournal=diario
 NumPiece=Número de pieza
 TransactionNumShort=Num. transacción
+AccountingCategory=Custom group of accounts
+AccountingCategories=Custom groups of accounts
 AccountingAccountGroupsDesc=Puede definir aquí algunos grupos de cuentas contables. Se usarán para informes de contabilidad personalizados.
 DelMonth=Mes para borrar
 DelJournal=Diario para borrar
diff --git a/htdocs/langs/es_EC/main.lang b/htdocs/langs/es_EC/main.lang
index 380410b1ba1..efe82c21ed2 100644
--- a/htdocs/langs/es_EC/main.lang
+++ b/htdocs/langs/es_EC/main.lang
@@ -477,8 +477,6 @@ ClassifyBilled=Clasificar facturas
 ClassifyUnbilled=Clasificar sin facturar
 ExportFilteredList=Exportar lista filtrada
 ExportList=Exportar lista
-ExportOfPiecesAlreadyExportedIsEnable=La exportación de piezas ya exportadas está habilitada
-ExportOfPiecesAlreadyExportedIsDisable=La exportación de piezas ya exportadas está desactivada
 AllExportedMovementsWereRecordedAsExported=Todos los movimientos exportados se registraron como exportados
 NotAllExportedMovementsCouldBeRecordedAsExported=No todos los movimientos exportados pueden registrarse como exportados
 Miscellaneous=Varios
@@ -552,6 +550,11 @@ ContactDefault_order_supplier=Orden de compra
 ContactDefault_propal=Propuesta
 ContactDefault_supplier_proposal=Propuesta de proveedor
 ContactAddedAutomatically=Contacto agregado de roles de terceros de contacto
+AffectTag=Assign a Tag
+AffectUser=Assign a User
+SetSupervisor=Set the supervisor
+ProjectRole=Role assigned on each project/opportunity
+TasksRole=Role assigned on each task (if used)
 ClientTZ=Zona horaria del cliente
 Terminate=Terminar
 Terminated=Terminado
diff --git a/htdocs/langs/es_EC/stripe.lang b/htdocs/langs/es_EC/stripe.lang
index 66061813b5a..7773d475ebf 100644
--- a/htdocs/langs/es_EC/stripe.lang
+++ b/htdocs/langs/es_EC/stripe.lang
@@ -18,7 +18,7 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook clave en vivo
 ONLINE_PAYMENT_WAREHOUSE=Stock para usar en la disminución de inventario cuando se realiza el pago en línea <br> (TODO Cuando la opción para disminuir el inventario se realiza en una acción en la factura y el pago en línea se genera la factura?)
 StripeLiveEnabled=Stripe activado en vivo (de lo contrario modo prueba/sandbox)
 StripeImportPayment=Importar pagos en franja
-ExampleOfTestCreditCard=Ejemplo de tarjeta de crédito para prueba: %s => válido, %s => error CVC, %s => vencido, %s => el cargo falla
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
 StripeGateways=Gateways de Tripe
 BankAccountForBankTransfer=Cuenta bancaria para pagos de fondos
 StripeAccount=Cuenta de Stripe
@@ -32,3 +32,4 @@ StripeUserAccountForActions=Cuenta de usuario para usar para la notificación po
 ToOfferALinkForTestWebhook=Enlace para configurar Stripe WebHook para llamar a IPN (modo de prueba)
 ToOfferALinkForLiveWebhook=Enlace para configurar Stripe WebHook para llamar a IPN (modo en vivo)
 ClickHereToTryAgain=<a href="%s">Haga clic aquí para volver a intentarlo...</a>
+TERMINAL_LOCATION=Location (address) for Stripe Terminals
diff --git a/htdocs/langs/es_EC/users.lang b/htdocs/langs/es_EC/users.lang
index b212c2d9aaa..28f9a6c1fab 100644
--- a/htdocs/langs/es_EC/users.lang
+++ b/htdocs/langs/es_EC/users.lang
@@ -44,7 +44,6 @@ ListOfGroupsForUser=Lista de grupos de este usuario
 LinkToCompanyContact=Enlace a un tercero / contacto
 LinkedToDolibarrMember=Enlace al miembro
 CreateDolibarrLogin=Crear un usuario
-LoginAccountDisableInDolibarr=Cuenta desactivada en Dolibarr.
 UsePersonalValue=Usar valor personal
 DomainUser=Usuario del dominio %s
 CreateInternalUserDesc=Este formulario le permite crear un usuario interno en su empresa / organización. Para crear un usuario externo (cliente, proveedor, etc.), use el botón 'Crear usuario Dolibarr' de la tarjeta de contacto de ese tercero.
diff --git a/htdocs/langs/es_ES/accountancy.lang b/htdocs/langs/es_ES/accountancy.lang
index 23feaa1f9f3..c4411ff9984 100644
--- a/htdocs/langs/es_ES/accountancy.lang
+++ b/htdocs/langs/es_ES/accountancy.lang
@@ -14,8 +14,8 @@ ACCOUNTING_EXPORT_ENDLINE=Seleccione el tipo de retorno de carro
 ACCOUNTING_EXPORT_PREFIX_SPEC=Especifique el prefijo del nombre de archivo
 ThisService=Este servicio
 ThisProduct=Este producto
-DefaultForService=Predeterminado para el servicio
-DefaultForProduct=Predeterminado para el producto
+DefaultForService=Predeterminado para servicios
+DefaultForProduct=Predeterminado para productos
 ProductForThisThirdparty=Producto para este tercero
 ServiceForThisThirdparty=Servicio para este tercero
 CantSuggest=No se puede sugerir
@@ -101,7 +101,8 @@ ShowAccountingAccount=Mostrar diario de cuentas
 ShowAccountingJournal=Mostrar diario contable
 ShowAccountingAccountInLedger=Mostrar cuenta contable en el libro mayor
 ShowAccountingAccountInJournals=Mostrar cuenta contable en diarios
-AccountAccountingSuggest=Cuenta contable sugerida
+DataUsedToSuggestAccount=Datos utilizados para sugerir la cuenta
+AccountAccountingSuggest=Cuenta sugerida
 MenuDefaultAccounts=Cuentas contables por defecto
 MenuBankAccounts=Cuentas Bancarias
 MenuVatAccounts=Cuentas de IVA
@@ -126,6 +127,7 @@ WriteBookKeeping=Registrar transacciones en contabilidad.
 Bookkeeping=Libro Mayor
 BookkeepingSubAccount=Libro mayor auxiliar
 AccountBalance=Saldo de la cuenta
+AccountBalanceSubAccount=Saldo de subcuentas
 ObjectsRef=Referencia de objeto origen
 CAHTF=Total compras a proveedor antes de impuestos
 TotalExpenseReport=Total informe de gastos
@@ -178,31 +180,32 @@ ACCOUNTING_RESULT_PROFIT=Cuenta contable de resultados (Ganancias)
 ACCOUNTING_RESULT_LOSS=Cuenta contable de resultados (Pérdidas)
 ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Diario de cierre
 
-ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account (from the Chart Of Account) to be used as the account for transitional bank transfers
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Cuenta (del Plan Contable) que se utilizará como cuenta para transferencias bancarias transitorias
 TransitionalAccount=Cuenta de transferencia bancaria de transición
 
-ACCOUNTING_ACCOUNT_SUSPENSE=Account (from the Chart Of Account) to be used as the account for unallocated funds either received or paid i.e. funds in "wait[ing]"
-DONATION_ACCOUNTINGACCOUNT=Account (from the Chart Of Account) to be used to register donations (Donation module)
-ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Account (from the Chart Of Account) to be used to register memberships subscriptions (Membership module - if membership recorded without invoice)
+ACCOUNTING_ACCOUNT_SUSPENSE=Cuenta (del Plan Contable) que se utilizará como cuenta para fondos no asignados recibidos o pagados, es decir, fondos "en espera"
+DONATION_ACCOUNTINGACCOUNT=Cuenta (del Plan Contable) que se utilizará para registrar donaciones (módulo de donaciones)
+ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Cuenta (del Plan Contable) que se utilizará para registrar las suscripciones de membresía (módulo de membresía, si la membresía se registró sin factura)
 
-ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Account (from the Chart Of Account) to be used as the default account to register customer deposit
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Cuenta (del Plan Contable) que se utilizará como cuenta predeterminada para registrar el depósito del cliente
 UseAuxiliaryAccountOnCustomerDeposit=Almacene la cuenta del cliente como cuenta individual en el libro mayor auxiliar para las líneas de anticipos (si está deshabilitada, la cuenta individual para las líneas de anticipos permanecerá vacía)
-ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Account (from the Chart Of Account) to be used as the default
+ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Cuenta (del Plan Contable) que se utilizará como predeterminada
 UseAuxiliaryAccountOnSupplierDeposit=Almacene la cuenta del proveedor como cuenta individual en el libro mayor auxiliar para las líneas de anticipos (si está deshabilitada, la cuenta individual para las líneas de anticipos permanecerá vacía)
+ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY=Cuenta contable por defecto para registrar la garantía retenida por el cliente
 
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased within same country (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased from EEC to another EEC country (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased and imported from any other foreign country (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the sold products (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products sold from EEC to another EEC country (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products sold and exported to any other foreign country (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Cuenta (del Plan Contable) que se usará como cuenta predeterminada para los productos comprados dentro del mismo país (se usa si no está definida en la hoja del producto)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Cuenta (del Plan Contable) que se usará como cuenta predeterminada para los productos comprados de la UE a otro país de UE (se usa si no está definido en la hoja de producto)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Cuenta (del Plan Contable) que se utilizará como cuenta predeterminada para los productos comprados e importados de cualquier otro país extracomunitario (utilizada si no está definida en la ficha del producto)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Cuenta (del Plan Contable) que se usará como cuenta predeterminada para los productos vendidos (se usa si no está definida en la hoja de producto)
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Cuenta (del Plan Contable) que se utilizará como cuenta predeterminada para los productos vendidos desde la UE a otro país de la UE (utilizada si no está definida en la ficha del producto)
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Cuenta (del Plan Contable) que se utilizará como cuenta predeterminada para los productos vendidos y exportados a cualquier otro país extracomunitario (utilizada si no está definida en la ficha del producto)
 
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the services purchased within same country (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the services purchased from EEC to another EEC country (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the services purchased and imported from other foreign country (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the sold services (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the services sold from EEC to another EEC country (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the services sold and exported to any other foreign country (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Cuenta (del Plan Contable) que se usará como cuenta predeterminada para los servicios comprados dentro del mismo país (se usa si no está definida en la hoja de servicios)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Cuenta (del Plan Contable) que se usará como cuenta predeterminada para los servicios comprados de la UE a otro país de UE (se usa si no está definido en la hoja de servicio)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Cuenta (del Plan Contable) que se usará como cuenta predeterminada para los servicios comprados e importados de otro país extracomunitario (se usa si no está definido en la hoja de servicios)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Cuenta (del Plan Contable) que se usará como cuenta predeterminada para los servicios vendidos (se usa si no está definida en la hoja de servicios)
+ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Cuenta (del Plan Contable) que se utilizará como cuenta predeterminada para los servicios vendidos desde la UE a otro país de la UE (utilizada si no está definida en la hoja de servicio)
+ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Cuenta (del Plan Contable) que se usará como cuenta predeterminada para los servicios vendidos y exportados a cualquier otro país extracomunitario (se usa si no está definido en la hoja de servicios)
 
 Doctype=Tipo de documento
 Docdate=Fecha
@@ -217,7 +220,8 @@ Codejournal=Diario
 JournalLabel=Etiqueta del diario
 NumPiece=Apunte
 TransactionNumShort=Núm. transacción
-AccountingCategory=Custom group of accounts
+AccountingCategory=Grupo personalizado de cuentas
+AccountingCategories=Grupos de cuentas personalizados
 GroupByAccountAccounting=Agrupar por cuenta del Libro Mayor
 GroupBySubAccountAccounting=Agrupar por cuenta de libro mayor auxiliar
 AccountingAccountGroupsDesc=Puedes definir aquí algunos grupos de cuentas contables. Se usarán para informes de contabilidad personalizados.
@@ -265,19 +269,20 @@ ShowSubtotalByGroup=Mostrar subtotal por nivel
 
 Pcgtype=Grupo de cuenta
 PcgtypeDesc=Los grupos de cuentas se utilizan como criterios predefinidos de "filtro" y "agrupación" para algunos informes contables. Por ejemplo, 'INGRESOS' o 'GASTOS' se utilizan como grupos para las cuentas contables de productos para construir el informe de gastos / ingresos.
+AccountingCategoriesDesc=El grupo personalizado de cuentas se puede usar para agrupar cuentas contables en un solo nombre para facilitar el uso de filtros o la creación de informes personalizados.
 
 Reconcilable=Reconciliable
 
 TotalVente=Total facturación antes de impuestos
 TotalMarge=Total margen ventas
 
-DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product account from chart of account
-DescVentilMore=In most cases, if you use predefined products or services and you set the account (from chart of account) 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 account from chart of account
-DescVentilTodoCustomer=Bind invoice lines not already bound with a product account from chart of account
-ChangeAccount=Change the product/service account (from chart of account) for the selected lines with the following account:
+DescVentilCustomer=Consulta aquí la lista de líneas de factura de cliente vinculadas (o no) a una cuenta de producto desde plan de cuentas
+DescVentilMore=En la mayoría de los casos, si usa productos o servicios predefinidos y configura la cuenta (desde el plan de cuentas) en la tarjeta de producto/servicio, la aplicación podrá realizar todos los enlaces entre sus líneas de factura y la cuenta contable de su plan. de cuentas, con solo un clic con el botón <strong> "%s" </strong> . Si la cuenta no se configuró en las tarjetas de productos/servicios o si todavía tiene algunas líneas no vinculadas a una cuenta, deberá realizar un enlace manual desde el menú "<strong> %s </strong>".
+DescVentilDoneCustomer=Consulta aquí el listado de las líneas de facturas clientes y su cuenta de producto desde plan de cuentas
+DescVentilTodoCustomer=Enlazar líneas de factura que aún no están enlazadas con una cuenta de producto del plan de cuentas
+ChangeAccount=Cambie la cuenta de producto/servicio (del plan de cuentas) para las líneas seleccionadas con la siguiente cuenta:
 Vide=-
-DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product account from chart of account (only record not already transfered in accountancy are visible)
+DescVentilSupplier=Consulte aquí la lista de líneas de factura de proveedor vinculadas o aún no vinculadas a una cuenta de producto del plan de cuentas (solo se ven los registros que aún no se han transferido en contabilidad)
 DescVentilDoneSupplier=Consulte aquí las líneas de facturas de proveedores y sus cuentas contables
 DescVentilTodoExpenseReport=Contabilizar líneas de informes de gastos aún no contabilizadas con una cuenta contable de gastos
 DescVentilExpenseReport=Consulte aquí la lista de líneas de informes de gastos (o no) a una cuenta contable de gastos
@@ -294,15 +299,16 @@ DescValidateMovements=Se prohíbe cualquier modificación o eliminación de regi
 
 ValidateHistory=Vincular automáticamente
 AutomaticBindingDone=Vinculaciones automáticas realizadas (%s) - La vinculación automática no es posible para algunos registros (%s)
+DoManualBindingForFailedRecord=Tiene que hacer un enlace manual para las filas %s no enlazadas automáticamente.
 
-ErrorAccountancyCodeIsAlreadyUse=Error, you cannot remove or disable this account of chart of account because it is used
-MvtNotCorrectlyBalanced=Movimiento no equilibrado correctamente. Débito = %s & Crédito = %s
+ErrorAccountancyCodeIsAlreadyUse=Error, no puede eliminar o deshabilitar esta cuenta de plan de cuentas porque se usa
+MvtNotCorrectlyBalanced=Movimiento descuadrado. Débito = %s & Crédito = %s
 Balancing=Saldo
 FicheVentilation=Ficha contable
 GeneralLedgerIsWritten=Transacciones escritas en el Libro Mayor
 GeneralLedgerSomeRecordWasNotRecorded=Algunas de las operaciones no pueden contabilizarse. Si no hay otro mensaje de error, es probable que ya estén contabilizadas.
 NoNewRecordSaved=No más registros para transferir
-ListOfProductsWithoutAccountingAccount=List of products not bound to any account of chart of account
+ListOfProductsWithoutAccountingAccount=Lista de productos no vinculados a ninguna cuenta o plan de cuentas
 ChangeBinding=Cambiar la unión
 Accounted=Contabilizada en el Libro Mayor
 NotYetAccounted=Aún no contabilizado en el libro mayor
@@ -337,11 +343,13 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=Deshabilitar la vinculación y la transferen
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Deshabilitar la vinculación y transferencia en contabilidad en compras (las facturas de proveedores no se tendrán en cuenta en la contabilidad)
 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)
 ACCOUNTING_ENABLE_LETTERING=Habilitar la función de letras en la contabilidad.
+ACCOUNTING_ENABLE_AUTOLETTERING=Habilite las letras automáticas al transferir a contabilidad
 
 ## Export
 NotExportLettering=No exportar las letras al generar el archivo.
 NotifiedExportDate=Marcar las líneas exportadas como Exportadas <span class="warning"> (para modificar una línea, deberá eliminar toda la transacción y volver a transferirla a contabilidad) </span>
 NotifiedValidationDate=Valide y bloquee las entradas exportadas <span class="warning"> (mismo efecto que la función "%s", la modificación y eliminación de las líneas DEFINITIVAMENTE no será posible) </span>
+NotifiedExportFull=¿Exportar documentos?
 DateValidationAndLock=Validación de fecha y bloqueo
 ConfirmExportFile=¿Confirmación de la generación del archivo de exportación contable?
 ExportDraftJournal=Exportar libro borrador
@@ -398,7 +406,7 @@ SaleLocal=Venta local
 SaleExport=Venta de exportación
 SaleEEC=Venta en CEE
 SaleEECWithVAT=Venta en CEE con un IVA no nulo, por lo que suponemos que esto NO es una venta intracomunitaria y la cuenta sugerida es la cuenta de producto estándar.
-SaleEECWithoutVATNumber=Venta en CEE sin IVA pero el ID de IVA de un tercero no está definido. Recurrimos a la cuenta del producto para ventas estándar. Puede corregir el ID de IVA de un tercero o la cuenta del producto si es necesario.
+SaleEECWithoutVATNumber=Venta en CEE sin IVA pero no se define el ID de IVA de terceros. Recurrimos a la cuenta para las ventas estándar. Puede corregir el ID de IVA del tercero o cambiar la cuenta de producto sugerida para el enlace si es necesario.
 ForbiddenTransactionAlreadyExported=Prohibido: La transacción ha sido validada y / o exportada.
 ForbiddenTransactionAlreadyValidated=Prohibido: la transacción ha sido validada.
 ## Dictionary
@@ -442,6 +450,7 @@ AccountancyErrorMismatchLetterCode=Discrepancia en el código de conciliación
 AccountancyErrorMismatchBalanceAmount=El saldo (%s) no es igual a 0
 AccountancyErrorLetteringBookkeeping=Se han producido errores con respecto a las transacciones: %s
 ErrorAccountNumberAlreadyExists=El número de contabilidad %s ya existe
+ErrorArchiveAddFile=No se puede poner el archivo "%s" en el archivo
 
 ## Import
 ImportAccountingEntries=Entradas contables
@@ -468,5 +477,7 @@ FECFormatMulticurrencyCode=Código multidivisa (Idevise)
 DateExport=Fecha de exportación
 WarningReportNotReliable=Advertencia, este informe no se basa en el Libro mayor, por lo que no contiene modificaciones manualmente modificadas en el Libro mayor.. Si su diario está actualizado, la vista contable es más precisa.
 ExpenseReportJournal=Informe de gastos diario
+DocsAlreadyExportedAreExcluded=Los documentos ya exportados están excluidos
+ClickToHideAlreadyExportedLines=Haga clic para ocultar líneas ya exportadas
 
 NAccounts=%s cuentas
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index 495988c089b..106fcde2207 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -645,6 +645,8 @@ Module2300Name=Tareas programadas
 Module2300Desc=Gestión del Trabajo programado (alias cron)
 Module2400Name=Eventos/Agenda
 Module2400Desc=Sigue los eventos o citas. Registra eventos automáticos a fin de realizar seguimiento o registra eventos manuales o reuniones. Este es el módulo más importante para una buena gestión de relaciones con clientes o proveedores.
+Module2430Name=Sistema de calendario de reservas
+Module2430Desc=Proporcione un calendario en línea para que cualquier persona pueda reservar citas, de acuerdo con rangos o disponibilidades predefinidos.
 Module2500Name=GED / SGD
 Module2500Desc=Sistema de Gestión de Documentos / Gestión Electrónica de Contenidos. Organización automática de sus documentos generados o almacenados. Compártalos cuando lo necesite.
 Module2600Name=API / Servicios web (servidor SOAP)
@@ -660,6 +662,8 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=Capacidades de conversión GeoIP Maxmind
 Module3200Name=Archivos inalterables
 Module3200Desc=Activar el registro inalterable de eventos empresariales. Los eventos se archivan en tiempo real. El registro es una tabla de sucesos encadenados que se pueden leer y exportar. Este módulo puede ser obligatorio en algunos países.
+Module3300Name=Constructor de módulos
+Module3200Desc=Activar el registro inalterable de eventos empresariales. Los eventos se archivan en tiempo real. El registro es una tabla de sucesos encadenados que se pueden leer y exportar. Este módulo puede ser obligatorio en algunos países.
 Module3400Name=Redes sociales
 Module3400Desc=Habilita campos de Redes Sociales en terceros y direcciones (skype, twitter, facebook...).
 Module4000Name=RRHH
@@ -974,14 +978,14 @@ Permission3301=Generar nuevos módulos
 Permission4001=Leer habilidad/trabajo/puesto
 Permission4002=Crear/modificar habilidad/trabajo/puesto
 Permission4003=Eliminar habilidad/trabajo/puesto
-Permission4021=Read evaluations (yours and your subordinates)
-Permission4022=Create/modify evaluations
+Permission4021=Leer evaluaciones (tuyas y de tus subordinados)
+Permission4022=Crear/modificar evaluaciones
 Permission4023=Validar evaluación
 Permission4025=Eliminar evaluación
 Permission4028=Ver menú de comparación
 Permission4031=Leer información personal
 Permission4032=escribir información personal
-Permission4033=Read all evaluations (even those of user not subordinates)
+Permission4033=Leer todas las evaluaciones (incluso las de usuarios no subordinados)
 Permission10001=Leer contenido del sitio web
 Permission10002=Crear modificar contenido del sitio web (contenido html y javascript)
 Permission10003=Crear/modificar contenido del sitio web (código php dinámico). Peligroso, debe reservarse a desarrolladores restringidos.
@@ -1270,6 +1274,7 @@ TriggerActiveAsModuleActive=Triggers de este archivo activos ya que el módulo <
 GeneratedPasswordDesc=Elija el método que se utilizará para las contraseñas generadas automáticamente.
 DictionaryDesc=Inserte aquí los datos de referencia. Puede añadir sus datos a los predefinidos.
 ConstDesc=Esta página le permite editar (anular) parámetros que no están disponibles en otras páginas. Estos están reservados principalmente a desarrolladores o soluciones avanzadas.
+MiscellaneousOptions=Opciones varias
 MiscellaneousDesc=Todos los otros parámetros relacionados con la seguridad se definen aquí.
 LimitsSetup=Configuración de límites y precisiones
 LimitsDesc=Puede definir aquí los límites y precisiones utilizados por Dolibarr
@@ -1303,7 +1308,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=Debe ejecutar el comando desde
 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.
-SimpleRefNumRefModelDesc=Returns the reference number in the format n where n is a sequential auto-incrementing number with no reset
+SimpleRefNumRefModelDesc=Devuelve el número de referencia en el formato n, donde n es un número de incremento automático secuencial sin restablecimiento
 AdvancedNumRefModelDesc=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
@@ -1491,7 +1496,7 @@ WatermarkOnDraftContractCards=Marca de agua en contratos (nada si está vacía)
 ##### Members #####
 MembersSetup=Configuración del módulo Asociaciones
 MemberMainOptions=Opciones principales
-MemberCodeChecker=Options for automatic generation of member codes
+MemberCodeChecker=Opciones para la generación automática de códigos de miembros
 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í"
@@ -1826,6 +1831,9 @@ AGENDA_USE_EVENT_TYPE=Usar tipos de evento (gestionados en el menú Configuraci
 AGENDA_USE_EVENT_TYPE_DEFAULT=Establecer automáticamente este valor por defecto para el tipo de evento en la creación de un evento
 AGENDA_DEFAULT_FILTER_TYPE=Establecer por defecto este tipo de evento en el filtro de búsqueda en la vista de la agenda
 AGENDA_DEFAULT_FILTER_STATUS=Establecer por defecto este estado de eventos en el filtro de búsqueda en la vista de la agenda
+AGENDA_EVENT_PAST_COLOR=Color de eventos pasados
+AGENDA_EVENT_CURRENT_COLOR=Color del evento actual
+AGENDA_EVENT_FUTURE_COLOR=Color de evento futuro
 AGENDA_DEFAULT_VIEW=Establecer la vista por defecto al seleccionar el menú Agenda
 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
@@ -2129,6 +2137,7 @@ CodeLastResult=Resultado último código
 NbOfEmailsInInbox=Número de emails en el directorio fuente
 LoadThirdPartyFromName=Cargar terceros buscando en %s (solo carga)
 LoadThirdPartyFromNameOrCreate=Cargar terceros terceros buscando en %s (crear si no se encuentra)
+LoadContactFromEmailOrCreate=Cargue la búsqueda de contactos en %s (crear si no se encuentra)
 AttachJoinedDocumentsToObject=Guarde los archivos adjuntos en los documentos del objeto si se encuentra una referencia de un objeto en el asunto del correo electrónico.
 WithDolTrackingID=Mensaje de una conversación iniciada por un primer e-mail enviado desde Dolibarr
 WithoutDolTrackingID=Mensaje de una conversación iniciada por un primer e-mail NO enviado desde Dolibarr
@@ -2232,12 +2241,12 @@ MailToPartnership=Partner
 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 en código personalizado, debe deshabilitar las funciones PHP
-PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an antivirus program), you must keep PHP functions
+PHPFunctionsRequiredForCLI=Para fines de shell (como la copia de seguridad de trabajos programados o la ejecución de un programa antivirus), 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
 Recommended=Recomendada
 NotRecommended=No recomendado
-ARestrictedPath=Some restricted path for data files
+ARestrictedPath=Algunas rutas restringidas para archivos de datos
 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
@@ -2355,3 +2364,5 @@ AllowExternalDownload=Permitir descarga externa (sin inicio de sesión, usando u
 DeadlineDayVATSubmission=Fecha límite para la presentación de IVA en el próximo mes
 MaxNumberOfAttachementOnForms=Número máximo de archivos unidos en un formulario
 IfDefinedUseAValueBeetween=Si está definido, use un valor entre %s y %s
+Reload=Recargar
+ConfirmReload=Confirmar recarga de módulo
diff --git a/htdocs/langs/es_ES/boxes.lang b/htdocs/langs/es_ES/boxes.lang
index 5df1fa1126d..3109afd00fc 100644
--- a/htdocs/langs/es_ES/boxes.lang
+++ b/htdocs/langs/es_ES/boxes.lang
@@ -24,6 +24,7 @@ BoxFicheInter=Últimas intervenciones
 BoxCurrentAccounts=Balance de cuentas abiertas
 BoxTitleMemberNextBirthdays=Cumpleaños de este mes (miembros)
 BoxTitleMembersByType=Miembros por tipo y estado
+BoxTitleMembersByTags=Miembros por etiquetas y estado
 BoxTitleMembersSubscriptionsByYear=Suscripciones de miembros por año
 BoxTitleLastRssInfos=Últimas %s noticias de %s
 BoxTitleLastProducts=Productos/Servicios: últimos %s modificados
diff --git a/htdocs/langs/es_ES/companies.lang b/htdocs/langs/es_ES/companies.lang
index e12c0e84e1f..64619107e23 100644
--- a/htdocs/langs/es_ES/companies.lang
+++ b/htdocs/langs/es_ES/companies.lang
@@ -312,12 +312,12 @@ CustomerRelativeDiscountShort=Descuento relativo
 CustomerAbsoluteDiscountShort=Descuento fijo
 CompanyHasRelativeDiscount=Este cliente tiene un descuento por defecto de <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Este cliente no tiene descuentos relativos por defecto
-HasRelativeDiscountFromSupplier=Tiene un descuento predeterminado de <b> %s%%</b> en este proveedor
-HasNoRelativeDiscountFromSupplier=No tiene descuento relativo predeterminado en este proveedor
+HasRelativeDiscountFromSupplier=Tiene un descuento predeterminado de <b> %s%% </b> con este proveedor
+HasNoRelativeDiscountFromSupplier=Sin descuento relativo predeterminado con este proveedor
 CompanyHasAbsoluteDiscount=Este cliente tiene <b>%s %s</b> en descuentos (abonos o anticipos) disponibles
 CompanyHasDownPaymentOrCommercialDiscount=Este cliente tiene descuentos disponibles (anticipos, comerciales) para <b>%s</b> %s
 CompanyHasCreditNote=Este cliente tiene <b>%s %s</b> en anticipos disponibles
-HasNoAbsoluteDiscountFromSupplier=No tiene crédito de descuento disponible en este proveedor
+HasNoAbsoluteDiscountFromSupplier=No hay descuento/crédito disponible de este proveedor
 HasAbsoluteDiscountFromSupplier=Tiene descuentos disponibles (notas de créditos o anticipos) para <b> %s </b> %s en este proveedor
 HasDownPaymentOrCommercialDiscountFromSupplier=Tiene descuentos disponibles (comerciales, anticipos) para <b> %s </b> %s en este proveedor
 HasCreditNoteFromSupplier=Tiene abonos para <b> %s </b> %s en este proveedor
@@ -444,7 +444,7 @@ AddAddress=Añadir dirección
 SupplierCategory=Categoría de proveedor
 JuridicalStatus200=Independiente
 DeleteFile=Eliminación de un archivo
-ConfirmDeleteFile=¿Está seguro de querer eliminar este archivo?
+ConfirmDeleteFile=¿Está seguro de que desea eliminar este archivo <b> %s </b>?
 AllocateCommercial=Asignado a comercial
 Organization=Organismo
 FiscalYearInformation=Información del año fiscal
@@ -498,3 +498,8 @@ RestOfEurope=Resto de Europa (CEE)
 OutOfEurope=Fuera de Europa (CEE)
 CurrentOutstandingBillLate=Factura actual pendiente con retraso
 BecarefullChangeThirdpartyBeforeAddProductToInvoice=Tenga cuidado, dependiendo de la configuración del precio de su producto, debe cambiar de tercero antes de agregar el producto al POS.
+EmailAlreadyExistsPleaseRewriteYourCompanyName=el correo electrónico ya existe, vuelva a escribir el nombre de su empresa
+TwoRecordsOfCompanyName=existe más de un registro para esta empresa, contáctenos para completar su solicitud de asociación
+CompanySection=Sección de empresa
+ShowSocialNetworks=Mostrar redes sociales
+HideSocialNetworks=Ocultar redes sociales
diff --git a/htdocs/langs/es_ES/errors.lang b/htdocs/langs/es_ES/errors.lang
index 05b14db7725..452510379f0 100644
--- a/htdocs/langs/es_ES/errors.lang
+++ b/htdocs/langs/es_ES/errors.lang
@@ -303,6 +303,7 @@ ErrorValueForTooLow=El valor para <b> %s </b> es demasiado bajo
 ErrorValueCantBeNull=El valor para <b> %s </b> no puede ser nulo
 ErrorDateOfMovementLowerThanDateOfFileTransmission=La fecha de la transacción bancaria no puede ser anterior a la fecha de transmisión del archivo
 ErrorTooMuchFileInForm=Demasiados archivos en el formulario, el número máximo es %s archivo(s)
+ErrorSessionInvalidatedAfterPasswordChange=La sesión ha sido invalidada tras un cambio de contraseña, estado o fechas de validez. Vuelva a iniciar sesión.
 
 # 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.
@@ -325,6 +326,7 @@ WarningPaymentDateLowerThanInvoiceDate=La fecha de pago (%s) es anterior a la fe
 WarningTooManyDataPleaseUseMoreFilters=Demasiados datos (más de %s líneas). Utilice más filtros o establezca la constante %s a un límite más alto.
 WarningSomeLinesWithNullHourlyRate=Algunas veces se realizaron registrod a usuarios, con su precio por hora sin definir. Se utilizó un valor de 0 %s por hora, esto puede dar lugar a la valoración incorrecta del tiempo invertido.
 WarningYourLoginWasModifiedPleaseLogin=Su cuenta de acceso ha sido modificada. Por razones de seguridad, tendrá que iniciar sesión con su nuevo acceso antes de la próxima acción.
+WarningYourPasswordWasModifiedPleaseLogin=Su contraseña fue modificada. Por motivos de seguridad, tendrá que iniciar sesión ahora con su nueva contraseña.
 WarningAnEntryAlreadyExistForTransKey=Ya existe una entrada para la clave de traducción para este idioma
 WarningNumberOfRecipientIsRestrictedInMassAction=Atención, el número de destinatarios diferentes está limitado a <b>%s</b>cuando se usan las acciones masivas en las listas
 WarningDateOfLineMustBeInExpenseReportRange=Advertencia, la fecha de la línea no está en el rango del informe de gastos
diff --git a/htdocs/langs/es_ES/eventorganization.lang b/htdocs/langs/es_ES/eventorganization.lang
index 09528daad51..a0748c54a8d 100644
--- a/htdocs/langs/es_ES/eventorganization.lang
+++ b/htdocs/langs/es_ES/eventorganization.lang
@@ -54,7 +54,7 @@ EVENTORGANIZATION_FILTERATTENDEES_TYPE = En el formulario para crear/agregar un
 # Object
 #
 EventOrganizationConfOrBooth= Conferencia o cabina
-EventOrganizationConfOrBoothes=Conferences or Boothes
+EventOrganizationConfOrBoothes=Conferencias o Stands
 ManageOrganizeEvent = Gestionar la organización de eventos
 ConferenceOrBooth = Conferencia o cabina
 ConferenceOrBoothTab = Conferencia o cabina
@@ -115,8 +115,8 @@ EvntOrgRegistrationHelpMessage = Aquí puede votar por una conferencia o sugerir
 EvntOrgRegistrationConfHelpMessage = Aquí, puede sugerir una nueva conferencia para animar durante el evento.
 EvntOrgRegistrationBoothHelpMessage = Aquí, puede postularse para tener un stand durante el evento.
 ListOfSuggestedConferences = Lista de conferencias sugeridas
-ListOfSuggestedBooths=Suggested booths
-ListOfConferencesOrBooths=Conferences or booths of event project
+ListOfSuggestedBooths=Stands sugeridos
+ListOfConferencesOrBooths=Proyecto de conferencias o stands de evento
 SuggestConference = Sugerir una nueva conferencia
 SuggestBooth = Sugerir un stand
 ViewAndVote = Ver y votar eventos sugeridos
@@ -172,3 +172,5 @@ ErrorSeveralCompaniesWithEmailContactUs=Se han encontrado varias empresas con es
 ErrorSeveralCompaniesWithNameContactUs=Se han encontrado varias empresas con este nombre por lo que no podemos validar automáticamente su registro. Póngase en contacto con nosotros en %s para una validación manual
 NoPublicActionsAllowedForThisEvent=No hay acciones públicas abiertas al público para este evento.
 MaxNbOfAttendees=Número máximo de asistentes
+DateStartEvent=Fecha de inicio del evento
+DateEndEvent=Fecha de finalización del evento
diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang
index 74e2e5dbe69..2d313c230e8 100644
--- a/htdocs/langs/es_ES/main.lang
+++ b/htdocs/langs/es_ES/main.lang
@@ -226,6 +226,7 @@ NoUserGroupDefined=No hay definido grupo de usuarios
 Password=Contraseña
 PasswordRetype=Repite tu contraseña
 NoteSomeFeaturesAreDisabled=Atención, sólo unos pocos módulos/funcionalidades han sido activados en esta demo.
+YourUserFile=Tu ficha de usuario
 Name=Nombre
 NameSlashCompany=Nombre / Empresa
 Person=Persona
@@ -897,6 +898,9 @@ MassFilesArea=Área de archivos generados por acciones masivas
 ShowTempMassFilesArea=Mostrar área de archivos generados por acciones masivas
 ConfirmMassDeletion=Confirmación de borrado en lote
 ConfirmMassDeletionQuestion=¿Estás seguro que quieres eliminar los %s registro(s) seleccionado(s)?
+ConfirmMassClone=Confirmación de clonación masiva
+ConfirmMassCloneQuestion=Seleccionar proyecto para clonar
+ConfirmMassCloneToOneProject=Clonar al proyecto %s
 RelatedObjects=Objetos relacionados
 ClassifyBilled=Clasificar facturado
 ClassifyUnbilled=Clasificar no facturado
@@ -912,8 +916,8 @@ ExportFilteredList=Listado filtrado de exportación
 ExportList=Listado de exportación
 ExportOptions=Opciones de exportación
 IncludeDocsAlreadyExported=Incluir documentos ya exportados
-ExportOfPiecesAlreadyExportedIsEnable=Exportar piezas ya exportadas está activado
-ExportOfPiecesAlreadyExportedIsDisable=Exportar piezas ya exportadas está desactivado
+ExportOfPiecesAlreadyExportedIsEnable=Los documentos ya exportados son visibles y se exportarán
+ExportOfPiecesAlreadyExportedIsDisable=Los documentos ya exportados están ocultos y no se exportarán
 AllExportedMovementsWereRecordedAsExported=Todos los movimientos exportados han sido registrados como exportados
 NotAllExportedMovementsCouldBeRecordedAsExported=No todos los movimientos exportados pueden ser registrados como exportados
 Miscellaneous=Miscelánea
@@ -1128,6 +1132,7 @@ DeleteFileText=¿Realmente quieres eliminar este archivo?
 ShowOtherLanguages=Mostrar otros idiomas
 SwitchInEditModeToAddTranslation=Cambie al modo de edición para agregar traducciones para este idioma
 NotUsedForThisCustomer=No se utiliza para este cliente.
+NotUsedForThisVendor=No se utiliza para este proveedor
 AmountMustBePositive=El importe debe ser positivo
 ByStatus=Por estado
 InformationMessage=Información
@@ -1148,18 +1153,18 @@ EventReminder=Recordatorio evento
 UpdateForAllLines=Actualización para todas las líneas
 OnHold=En espera
 Civility=Título Cortesía
-AffectTag=Assign Tag
-AffectUser=Assign User
-SetSupervisor=Establecer supervisor
+AffectTag=Asignar una etiqueta
+AffectUser=Asignar un usuario
+SetSupervisor=Establecer el supervisor
 CreateExternalUser=Crear usuario externo
-ConfirmAffectTag=Bulk Tag Assignement
-ConfirmAffectUser=Bulk User Assignement
-ProjectRole=Rol asignado en cada proyecto
-TasksRole=Rol asignado en cada tarea de cada proyecto
+ConfirmAffectTag=Asignación de etiquetas masivas
+ConfirmAffectUser=Asignación masiva de usuarios
+ProjectRole=Rol asignado en cada proyecto/oportunidad
+TasksRole=Rol asignado en cada tarea (si se usa)
 ConfirmSetSupervisor=Conjunto de supervisor masivo
 ConfirmUpdatePrice=Elija una tarifa de precio de aumento/disminución
-ConfirmAffectTagQuestion=Are you sure you want to assign tags to the %s selected record(s)?
-ConfirmAffectUserQuestion=Are you sure you want to assign users to the %s selected record(s)?
+ConfirmAffectTagQuestion=¿Está seguro de que desea asignar etiquetas a los registros seleccionados %s?
+ConfirmAffectUserQuestion=¿Está seguro de que desea asignar usuarios a los registros seleccionados %s?
 ConfirmSetSupervisorQuestion=¿Está seguro de que desea configurar el supervisor para los %sregistros seleccionados?
 ConfirmUpdatePriceQuestion=¿Está seguro de que desea actualizar el precio de los %sregistros seleccionados?
 CategTypeNotFound=No se encontró ningún tipo de etiqueta para el tipo de registros
@@ -1170,7 +1175,7 @@ InformationOnLinkToContract=Este importe es solo el total de todas las líneas d
 ConfirmCancel=Estás seguro que quieres cancelar
 EmailMsgID=MsgID de e-mail
 EmailDate=Fecha de correo electrónico
-SetToStatus=Set to status %s
+SetToStatus=Establecer en el estado %s
 SetToEnabled=Establecer como activado
 SetToDisabled=Establecer como desactivado
 ConfirmMassEnabling=confirmación de habilitación masiva
@@ -1199,8 +1204,8 @@ Terminated=De baja
 AddLineOnPosition=Agregar línea en la posición (al final si está vacío)
 ConfirmAllocateCommercial=Asignar confirmación de representante de ventas
 ConfirmAllocateCommercialQuestion=¿Está seguro de que desea asignar los %sregistros seleccionados?
-CommercialsAffected=Sales representatives assigned
-CommercialAffected=Sales representative assigned
+CommercialsAffected=Representantes de ventas asignados
+CommercialAffected=Representante de ventas asignado
 YourMessage=Tu mensaje
 YourMessageHasBeenReceived=Tu mensaje ha sido recibido. Le responderemos o contactaremos con usted lo antes posible.
 UrlToCheck=URL para comprobar
@@ -1210,3 +1215,10 @@ CreatedByPublicPortal=Creado desde el portal público
 UserAgent=Agente de usuario
 InternalUser=Usuario interno
 ExternalUser=Usuario externo
+NoSpecificContactAddress=Sin contacto o dirección específica
+NoSpecificContactAddressBis=Esta pestaña está dedicada a forzar contactos o direcciones específicas para el objeto actual. Úselo solo si desea definir uno o varios contactos o direcciones específicas para el objeto cuando la información sobre el tercero no es suficiente o no es precisa.
+HideOnVCard=Ocultar %s
+AddToContacts=Agregar dirección a mis contactos
+LastAccess=Ultimo acceso
+UploadAnImageToSeeAPhotoHere=Sube una imagen de la pestaña %s para ver una foto aquí
+LastPasswordChangeDate=Última fecha de cambio de contraseña
diff --git a/htdocs/langs/es_ES/mrp.lang b/htdocs/langs/es_ES/mrp.lang
index 3ef082668bf..9acab0b9cf3 100644
--- a/htdocs/langs/es_ES/mrp.lang
+++ b/htdocs/langs/es_ES/mrp.lang
@@ -11,7 +11,7 @@ Bom=Lista de materiales
 BillOfMaterials=Lista de materiales
 BillOfMaterialsLines=Líneas de lista de materiales
 BOMsSetup=Configuración del módulo BOM
-ListOfBOMs=Bills of material - BOM
+ListOfBOMs=Listas de materiales - BOM
 ListOfManufacturingOrders=Órdenes de fabricación
 NewBOM=Nueva lista de materiales
 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.
@@ -102,6 +102,7 @@ NbOperatorsRequired=Número de operadores necesarios
 THMOperatorEstimated=THM estimado del operador
 THMMachineEstimated=THM estimado de la máquina
 WorkstationType=Tipo de estación de trabajo
+DefaultWorkstation=Estación de trabajo predeterminada
 Human=Humano
 Machine=Máquina
 HumanMachine=Humano / Máquina
@@ -116,5 +117,5 @@ ParentMo=MO Padre
 MOChild=MO Hijo
 BomCantAddChildBom=La nomenclatura %s ya está presente en el árbol que conduce a la nomenclatura %s
 BOMNetNeeds = Necesidades netas de la lista de materiales
-BOMProductsList=BOM's products
-BOMServicesList=BOM's services
+BOMProductsList=Productos de BOM
+BOMServicesList=Servicios de BOM
diff --git a/htdocs/langs/es_ES/orders.lang b/htdocs/langs/es_ES/orders.lang
index ca42b8cba96..8a5a494940a 100644
--- a/htdocs/langs/es_ES/orders.lang
+++ b/htdocs/langs/es_ES/orders.lang
@@ -96,6 +96,10 @@ OrdersStatisticsSuppliers=Estadísticas de pedidos a proveedores
 NumberOfOrdersByMonth=Número de pedidos por mes
 AmountOfOrdersByMonthHT=Importe total de pedidos por mes (sin IVA)
 ListOfOrders=Listado de pedidos
+ListOrderLigne=Lineas de pedidos
+productobuy=Productos para comprar solo
+productonly=Solo productos
+disablelinefree=Sin líneas libres
 CloseOrder=Cerrar pedido
 ConfirmCloseOrder=¿Está seguro de querer clasificar este pedido como enviado? Una vez enviado un pedido, solo podrá facturarse
 ConfirmDeleteOrder=¿Está seguro de querer eliminar este pedido?
@@ -131,6 +135,7 @@ SupplierOrderClassifiedBilled=Pedido a proveedor %s clasificado como facturado
 OtherOrders=Otros pedidos
 SupplierOrderValidatedAndApproved=El pedido del proveedor está validado y aprobado: %s
 SupplierOrderValidated=El pedido del proveedor está validado: %s
+OrderShowDetail=Mostrar detalle del pedido
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Responsable seguimiento pedido cliente
 TypeContact_commande_internal_SHIPPING=Responsable envío pedido cliente
@@ -199,3 +204,5 @@ StatusSupplierOrderApproved=Aprobado
 StatusSupplierOrderRefused=Rechazado
 StatusSupplierOrderReceivedPartially=Recibido parcialmente
 StatusSupplierOrderReceivedAll=Todos los productos recibidos
+NeedAtLeastOneInvoice = Tiene que haber al menos una Factura
+LineAlreadyDispatched = La línea de pedido ya se recibió.
diff --git a/htdocs/langs/es_ES/stripe.lang b/htdocs/langs/es_ES/stripe.lang
index eccb8b77b3b..a463b543633 100644
--- a/htdocs/langs/es_ES/stripe.lang
+++ b/htdocs/langs/es_ES/stripe.lang
@@ -41,7 +41,8 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
 ONLINE_PAYMENT_WAREHOUSE=Stock para usar para la disminución de stock cuando se realiza el pago en línea <br> (TODO Cuando la opción para disminuir stock se realiza en una acción en la factura y el pago en línea se genera la factura?)
 StripeLiveEnabled=Stripe live activado (de lo contrario en modo test/sandbox)
 StripeImportPayment=Importar pagos Stripe
-ExampleOfTestCreditCard=Ejemplo de tarjeta de crédito para pruebas: %s=> válida,%s => error CVC, %s => caducada, %s => la carga falla
+ExampleOfTestCreditCard=Ejemplo de tarjeta de crédito para prueba SEPA: %s => válida, %s => error CVC, %s => caducada, %s => fallo en el cargo
+ExampleOfTestBankAcountForSEPA=Ejemplo de cuenta bancaria IBAN para prueba de débito directo: %s
 StripeGateways=Pasarelas de Stripe
 OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca _...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca _...)
@@ -61,6 +62,7 @@ DeleteACard=Eliminar tarjeta
 ConfirmDeleteCard=¿Está seguro de querer eliminar esta tarjeta de crédito o débito?
 CreateCustomerOnStripe=Crear cliente en Stripe
 CreateCardOnStripe=Crea una tarjeta en Stripe
+CreateBANOnStripe=Crear banco en Stripe
 ShowInStripe=Mostrar en Stripe
 StripeUserAccountForActions=Cuenta de usuario para usar en algunos e-mails de notificación de eventos Stripe (pagos de Stripe)
 StripePayoutList=Lista de pagos de Stripe
@@ -69,4 +71,8 @@ ToOfferALinkForLiveWebhook=Enlace para configurar Stripe WebHook para llamar a l
 PaymentWillBeRecordedForNextPeriod=El pago se registrará para el próximo período.
 ClickHereToTryAgain=<a href="%s">Haga clic aquí para volver a intentarlo ...</a>
 CreationOfPaymentModeMustBeDoneFromStripeInterface=Debido a las fuertes reglas de autenticación del cliente, la creación de una tarjeta debe hacerse desde la oficina administrativa de Stripe. Puede hacer clic aquí para activar el registro de cliente de Stripe: %s
-TERMINAL_LOCATION=Ubicación (dirección) para terminales
+STRIPE_CARD_PRESENT=Tarjeta Presente para Terminales Stripe
+TERMINAL_LOCATION=Ubicación (dirección) para terminales Stripe
+RequestDirectDebitWithStripe=Solicitar Débito Directo con Stripe
+STRIPE_SEPA_DIRECT_DEBIT=Habilitar los pagos de Débito Directo a través de Stripe
+
diff --git a/htdocs/langs/es_ES/ticket.lang b/htdocs/langs/es_ES/ticket.lang
index c54e1bde536..9b731c8f1bd 100644
--- a/htdocs/langs/es_ES/ticket.lang
+++ b/htdocs/langs/es_ES/ticket.lang
@@ -26,6 +26,7 @@ Permission56002=Modificar tickets
 Permission56003=Eliminar tickets
 Permission56004=Administrar tickets
 Permission56005=Ver tickets de todos los terceros (no aplicable para usuarios externos, siempre estará limitada al tercero del que dependen)
+Permission56006=Exportar tickets
 
 Tickets=Tickets
 TicketDictType=Tipo de tickets
@@ -61,6 +62,8 @@ TypeContact_ticket_external_CONTRIBUTOR=Contribuidor externo
 OriginEmail=Email del emisor
 Notify_TICKET_SENTBYMAIL=Enviar mensaje de ticket por e-mail
 
+ExportDataset_ticket_1=Tickets
+
 # Status
 Read=Leido
 Assigned=Asignado
diff --git a/htdocs/langs/es_ES/users.lang b/htdocs/langs/es_ES/users.lang
index e6d8164287c..aa3901d511f 100644
--- a/htdocs/langs/es_ES/users.lang
+++ b/htdocs/langs/es_ES/users.lang
@@ -66,7 +66,8 @@ LinkedToDolibarrUser=Enlace al usuario
 LinkedToDolibarrThirdParty=Enlace a un tercero
 CreateDolibarrLogin=Crear una cuenta de usuario
 CreateDolibarrThirdParty=Crear un tercero
-LoginAccountDisableInDolibarr=La cuenta está desactivada en Dolibarr
+LoginAccountDisableInDolibarr=Cuenta deshabilitada en Dolibarr
+PASSWORDInDolibarr=Contraseña modificada en Dolibarr
 UsePersonalValue=Utilizar valores personalizados
 ExportDataset_user_1=Usuarios y sus propiedades.
 DomainUser=Usuario de dominio
@@ -129,3 +130,6 @@ IPLastLogin=IP último inicio de sesión
 IPPreviousLogin=IP inicio de sesión anterior
 ShowAllPerms=Mostrar todas las filas de permisos
 HideAllPerms=Ocultar todas las filas de permisos
+UserPublicPageDesc=Puede habilitar una tarjeta virtual para este usuario. Una URL con el perfil de usuario y un código de barras estará disponible para permitir que cualquier persona con un teléfono inteligente lo escanee y agregue su contacto a su libreta de direcciones.
+EnablePublicVirtualCard=Habilitar la tarjeta de usuario virtual pública
+PublicVirtualCardUrl=Tarjeta de usuario virtual pública
diff --git a/htdocs/langs/es_GT/stripe.lang b/htdocs/langs/es_GT/stripe.lang
new file mode 100644
index 00000000000..ae44362fd94
--- /dev/null
+++ b/htdocs/langs/es_GT/stripe.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - stripe
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+TERMINAL_LOCATION=Location (address) for Stripe Terminals
diff --git a/htdocs/langs/es_HN/stripe.lang b/htdocs/langs/es_HN/stripe.lang
new file mode 100644
index 00000000000..ae44362fd94
--- /dev/null
+++ b/htdocs/langs/es_HN/stripe.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - stripe
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+TERMINAL_LOCATION=Location (address) for Stripe Terminals
diff --git a/htdocs/langs/es_MX/accountancy.lang b/htdocs/langs/es_MX/accountancy.lang
index 50e369435ae..30bd464f5a7 100644
--- a/htdocs/langs/es_MX/accountancy.lang
+++ b/htdocs/langs/es_MX/accountancy.lang
@@ -4,7 +4,6 @@ ACCOUNTING_EXPORT_DATE=Formato de fecha para el archivo de exportación
 ACCOUNTING_EXPORT_PIECE=Exportar el número de pieza
 ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Exportación con cuenta global
 ACCOUNTING_EXPORT_ENDLINE=Seleccione el estilo del salto de línea
-DefaultForService=Predeterminado para servicio
 Chartofaccounts=Gráfico de cuentas
 CurrentDedicatedAccountingAccount=Cuenta actual dedicada 
 AssignDedicatedAccountingAccount=Nueva cuenta para asignar
@@ -85,6 +84,8 @@ ACCOUNTING_RESULT_LOSS=Cuenta contable de resultados (Pérdida)
 ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Cierre Diario
 TransitionalAccount=Cuenta de transferencia bancaria transitoria
 LabelAccount=Descripción de la cuenta
+AccountingCategory=Custom group of accounts
+AccountingCategories=Custom groups of accounts
 DelYear=Año a borrar
 DelJournal=Diario a borrar
 DescFinanceJournal=Diario financiero incluyendo todos los tipos de pagos por cuenta bancaria
diff --git a/htdocs/langs/es_MX/stripe.lang b/htdocs/langs/es_MX/stripe.lang
new file mode 100644
index 00000000000..ae44362fd94
--- /dev/null
+++ b/htdocs/langs/es_MX/stripe.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - stripe
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+TERMINAL_LOCATION=Location (address) for Stripe Terminals
diff --git a/htdocs/langs/es_PA/stripe.lang b/htdocs/langs/es_PA/stripe.lang
new file mode 100644
index 00000000000..ae44362fd94
--- /dev/null
+++ b/htdocs/langs/es_PA/stripe.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - stripe
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+TERMINAL_LOCATION=Location (address) for Stripe Terminals
diff --git a/htdocs/langs/es_PE/accountancy.lang b/htdocs/langs/es_PE/accountancy.lang
index a43c2546c0d..b7e61c4a997 100644
--- a/htdocs/langs/es_PE/accountancy.lang
+++ b/htdocs/langs/es_PE/accountancy.lang
@@ -9,8 +9,6 @@ ACCOUNTING_EXPORT_AMOUNT=Monto de exportación
 ACCOUNTING_EXPORT_DEVISE=Moneda de exportación
 ACCOUNTING_EXPORT_ENDLINE=Seleccionar el tipo de retorno de carro
 ACCOUNTING_EXPORT_PREFIX_SPEC=Especifique el prefijo del nombre del fichero
-DefaultForService=Servicio por defecto
-DefaultForProduct=Producto por defecto
 Journals=Revistas
 JournalFinancial=Revistas financieras
 BackToChartofaccounts=Retornar gráfico de cuentas
@@ -37,5 +35,7 @@ ACCOUNTING_LENGTH_GACCOUNT=Longitud de las cuentas de contabilidad general (si e
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Informe de Gastos Diario
 ACCOUNTING_SOCIAL_JOURNAL=Diario Social
 Codejournal=Periódico
+AccountingCategory=Custom group of accounts
+AccountingCategories=Custom groups of accounts
 FinanceJournal=Periodo Financiero
 TotalMarge=Margen total de ventas
diff --git a/htdocs/langs/es_PE/stripe.lang b/htdocs/langs/es_PE/stripe.lang
new file mode 100644
index 00000000000..ae44362fd94
--- /dev/null
+++ b/htdocs/langs/es_PE/stripe.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - stripe
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+TERMINAL_LOCATION=Location (address) for Stripe Terminals
diff --git a/htdocs/langs/es_PY/stripe.lang b/htdocs/langs/es_PY/stripe.lang
new file mode 100644
index 00000000000..ae44362fd94
--- /dev/null
+++ b/htdocs/langs/es_PY/stripe.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - stripe
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+TERMINAL_LOCATION=Location (address) for Stripe Terminals
diff --git a/htdocs/langs/es_US/stripe.lang b/htdocs/langs/es_US/stripe.lang
new file mode 100644
index 00000000000..ae44362fd94
--- /dev/null
+++ b/htdocs/langs/es_US/stripe.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - stripe
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+TERMINAL_LOCATION=Location (address) for Stripe Terminals
diff --git a/htdocs/langs/es_UY/stripe.lang b/htdocs/langs/es_UY/stripe.lang
new file mode 100644
index 00000000000..ae44362fd94
--- /dev/null
+++ b/htdocs/langs/es_UY/stripe.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - stripe
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+TERMINAL_LOCATION=Location (address) for Stripe Terminals
diff --git a/htdocs/langs/es_VE/accountancy.lang b/htdocs/langs/es_VE/accountancy.lang
new file mode 100644
index 00000000000..cf74ffb05a8
--- /dev/null
+++ b/htdocs/langs/es_VE/accountancy.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - accountancy
+AccountingCategory=Custom group of accounts
+AccountingCategories=Custom groups of accounts
diff --git a/htdocs/langs/es_VE/stripe.lang b/htdocs/langs/es_VE/stripe.lang
new file mode 100644
index 00000000000..ae44362fd94
--- /dev/null
+++ b/htdocs/langs/es_VE/stripe.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - stripe
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+TERMINAL_LOCATION=Location (address) for Stripe Terminals
diff --git a/htdocs/langs/et_EE/users.lang b/htdocs/langs/et_EE/users.lang
index 5a64e4c5b2a..06d8fde378a 100644
--- a/htdocs/langs/et_EE/users.lang
+++ b/htdocs/langs/et_EE/users.lang
@@ -66,7 +66,8 @@ LinkedToDolibarrUser=Link to user
 LinkedToDolibarrThirdParty=Link to third party
 CreateDolibarrLogin=Loo kasutaja
 CreateDolibarrThirdParty=Loo kolmas isi
-LoginAccountDisableInDolibarr=Konto on Dolibarris blokeeritud.
+LoginAccountDisableInDolibarr=Account disabled in Dolibarr
+PASSWORDInDolibarr=Password modified in Dolibarr
 UsePersonalValue=Kasuta isikustatud väärtust
 ExportDataset_user_1=Users and their properties
 DomainUser=Domeeni kasutaja %s
@@ -129,3 +130,6 @@ IPLastLogin=IP last login
 IPPreviousLogin=IP previous login
 ShowAllPerms=Show all permission rows
 HideAllPerms=Hide all permission rows
+UserPublicPageDesc=You can enable a virtual card for this user. An url with the user profile and a barcode will be available to allow anybody with a smartphone to scan it and add your contact to its address book.
+EnablePublicVirtualCard=Enable the public virtual user card
+PublicVirtualCardUrl=Public virtual user card
diff --git a/htdocs/langs/fa_IR/accountancy.lang b/htdocs/langs/fa_IR/accountancy.lang
index 5b47b8f01da..2d0970ce61f 100644
--- a/htdocs/langs/fa_IR/accountancy.lang
+++ b/htdocs/langs/fa_IR/accountancy.lang
@@ -14,8 +14,8 @@ ACCOUNTING_EXPORT_ENDLINE=انتخاب نوع بازگشت محموله
 ACCOUNTING_EXPORT_PREFIX_SPEC=انتخاب پیش‌وند نام فایل
 ThisService=این خدمت
 ThisProduct=این محصول
-DefaultForService=پیش‌فرض برای خدمات
-DefaultForProduct=پیش‌فرض برای محصول
+DefaultForService=Default for services
+DefaultForProduct=Default for products
 ProductForThisThirdparty=Product for this thirdparty
 ServiceForThisThirdparty=Service for this thirdparty
 CantSuggest=امکان پیش‌نهاد نیست
@@ -101,7 +101,8 @@ ShowAccountingAccount=نمایش حساب حساب‌داری
 ShowAccountingJournal=نمایش دفترنویسی حساب‌داری
 ShowAccountingAccountInLedger=Show accounting account in ledger
 ShowAccountingAccountInJournals=Show accounting account in journals
-AccountAccountingSuggest=حساب حسابداری پیشنهاد شده
+DataUsedToSuggestAccount=Data used to suggest account
+AccountAccountingSuggest=Account suggested
 MenuDefaultAccounts=حساب‌های پیش‌فرض
 MenuBankAccounts=حسابهای بانکی
 MenuVatAccounts=حساب‌های مالیات بر ارزش افزوده
@@ -126,6 +127,7 @@ WriteBookKeeping=Record transactions in accounting
 Bookkeeping=دفترکل
 BookkeepingSubAccount=Subledger
 AccountBalance=موجودی حساب
+AccountBalanceSubAccount=Sub-accounts balance
 ObjectsRef=مرجع شیء منبع
 CAHTF=خرید کل تامین کننده قبل از مالیات
 TotalExpenseReport=گزارش هزینۀ کل
@@ -189,6 +191,7 @@ ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Account (from the Chart Of Account) to be us
 UseAuxiliaryAccountOnCustomerDeposit=Store customer account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
 ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Account (from the Chart Of Account) to be used as the default
 UseAuxiliaryAccountOnSupplierDeposit=Store supplier account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
+ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY=Accounting account by default to register customer retained warranty
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased within same country (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased from EEC to another EEC country (used if not defined in the product sheet)
@@ -218,6 +221,7 @@ JournalLabel=برچسب دفتر
 NumPiece=شمارۀ بخش
 TransactionNumShort=تعداد تراکنش‌ها
 AccountingCategory=Custom group of accounts
+AccountingCategories=Custom groups of accounts
 GroupByAccountAccounting=Group by general ledger account
 GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=در این قسمت می‌توانید گروه‌های متشکل از حساب‌حساب‌داری بسازید. این گروه‌ها برای گزارش‌های دل‌خواه حساب‌داری استفاده می‌شود.
@@ -265,6 +269,7 @@ ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=گروه حساب
 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.
+AccountingCategoriesDesc=Custom group of accounts can be used to group accounting accounts into one name to ease filter use or building of custom reports.
 
 Reconcilable=Reconcilable
 
@@ -294,6 +299,7 @@ DescValidateMovements=Any modification or deletion of writing, lettering and del
 
 ValidateHistory=بندکردن خودکار
 AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
+DoManualBindingForFailedRecord=You have to do a manual link for the %s row(s) not linked automatically.
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot remove or disable this account of chart of account because it is used
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s & Credit = %s
@@ -337,11 +343,13 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on
 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_ENABLE_LETTERING=Enable the lettering function in the accounting
+ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
 
 ## Export
 NotExportLettering=Do not export the lettering when generating the file
 NotifiedExportDate=Flag exported lines as Exported <span class="warning">(to modify a line, you will need to delete the whole transaction and re-transfert it into accounting)</span>
 NotifiedValidationDate=Validate and Lock the exported entries <span class="warning">(same effect than the "%s" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+NotifiedExportFull=Export documents ?
 DateValidationAndLock=Date validation and lock
 ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=صادرکردن پیش‌نویس دفتر
@@ -398,7 +406,7 @@ 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.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the thirdparty, or change the product account suggested for binding if needed.
 ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
 ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
 ## Dictionary
@@ -442,6 +450,7 @@ AccountancyErrorMismatchLetterCode=Mismatch in reconcile code
 AccountancyErrorMismatchBalanceAmount=The balance (%s) is not equal to 0
 AccountancyErrorLetteringBookkeeping=Errors have occurred concerning the transactions: %s
 ErrorAccountNumberAlreadyExists=The accounting number %s already exists
+ErrorArchiveAddFile=Can't put "%s" file in archive
 
 ## Import
 ImportAccountingEntries=ورودی‌های حساب‌داری
@@ -468,5 +477,7 @@ FECFormatMulticurrencyCode=Multicurrency code (Idevise)
 DateExport=Date export
 WarningReportNotReliable=هشدار! این گزارش بر مبنای دفتر کل نمی‌باشد، بنابراین دربردارندۀ تراکنش‌هائی که به شکل دستی در دفترکل ویرایش شده‌اند نیست. در صورتی که دفترنویسی شما روزآمد باشد، نمای «دفترنویسی» دقیق‌تر است.
 ExpenseReportJournal=دفتر گزارش هزینه‌ها
+DocsAlreadyExportedAreExcluded=Docs already exported are excluded
+ClickToHideAlreadyExportedLines=Click to hide already exported lines
 
 NAccounts=%s accounts
diff --git a/htdocs/langs/fa_IR/main.lang b/htdocs/langs/fa_IR/main.lang
index 19e748d4087..1d818d1e42a 100644
--- a/htdocs/langs/fa_IR/main.lang
+++ b/htdocs/langs/fa_IR/main.lang
@@ -226,6 +226,7 @@ NoUserGroupDefined=هیچ گروه‌کاربری تعریف نشده است
 Password=گذرواژه
 PasswordRetype=Repeat your password
 NoteSomeFeaturesAreDisabled=توجه داشته باشید بسیاری از قابلیت‌ها/واحدها در این نسخۀ نمایشی غیر فهال است
+YourUserFile=Your user file
 Name=نام
 NameSlashCompany=نام / شرکت
 Person=شخص
@@ -897,6 +898,9 @@ MassFilesArea=محل فایل‌های تولید شده توسط کنش‌ها
 ShowTempMassFilesArea=نمایش محل فایل‌های تولید شده با کنش‌های گروهی
 ConfirmMassDeletion=تائید حذف گروهی
 ConfirmMassDeletionQuestion=آیا مطمئنید می‌خواهید (%s) ردیف انتخاب شده را حذف کنید؟
+ConfirmMassClone=Bulk clone confirmation
+ConfirmMassCloneQuestion=Select project to clone to
+ConfirmMassCloneToOneProject=Clone to project %s
 RelatedObjects=اشیاء مربوطه
 ClassifyBilled=طبقه‌بندی صورت‌شده‌ها
 ClassifyUnbilled=طبقه‌بندی صورت‌نشده‌ها
@@ -912,8 +916,8 @@ ExportFilteredList=فهرست گزینشی صادرا
 ExportList=فهرست صادرات
 ExportOptions=گزینه‌های صادرکردن
 IncludeDocsAlreadyExported=دربرگرفتن مستنداتی که قبلا صادر شده‌اند
-ExportOfPiecesAlreadyExportedIsEnable=دربرگیری بخش‌هائی که قبلا صادر شده‌اند فعال است
-ExportOfPiecesAlreadyExportedIsDisable=دربرگیری بخش‌هائی که قبلا صادر شده‌اند غیر فعال است
+ExportOfPiecesAlreadyExportedIsEnable=Documents already exported are visible and will be exported
+ExportOfPiecesAlreadyExportedIsDisable=Documents already exported are hidden and won't be exported
 AllExportedMovementsWereRecordedAsExported=همۀ جابه‌جائی‌های صادر شده به عنوان صادرشده ثبت شد
 NotAllExportedMovementsCouldBeRecordedAsExported=همۀ جابه‌جائی‌های صادرشده نمی‌توانند به‌عنوان صادرشده ثبت شوند
 Miscellaneous=متفرقه
@@ -1128,6 +1132,7 @@ 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
+NotUsedForThisVendor=Not used for this vendor
 AmountMustBePositive=Amount must be positive
 ByStatus=By status
 InformationMessage=اطلاعات
@@ -1148,14 +1153,14 @@ EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
 OnHold=On hold
 Civility=Civility
-AffectTag=Assign Tag
-AffectUser=Assign User
-SetSupervisor=Set Supervisor
+AffectTag=Assign a Tag
+AffectUser=Assign a User
+SetSupervisor=Set the supervisor
 CreateExternalUser=Create external user
 ConfirmAffectTag=Bulk Tag Assignement
 ConfirmAffectUser=Bulk User Assignement
-ProjectRole=Role assigned on each project
-TasksRole=Role assigned on each task of each project
+ProjectRole=Role assigned on each project/opportunity
+TasksRole=Role assigned on each task (if used)
 ConfirmSetSupervisor=Bulk Supervisor Set
 ConfirmUpdatePrice=Choose a increase/decrease price rate
 ConfirmAffectTagQuestion=Are you sure you want to assign tags to the %s selected record(s)?
@@ -1210,3 +1215,10 @@ CreatedByPublicPortal=Created from Public portal
 UserAgent=User Agent
 InternalUser=کاربر داخلی
 ExternalUser=کاربر خارجی
+NoSpecificContactAddress=No specific contact or address
+NoSpecificContactAddressBis=This tab is dedicated to force specific contacts or addresses for the current object. Use it only if you want to define one or several specific contacts or addresses for the object when the information on the thirdparty is not enough or not accurate.
+HideOnVCard=Hide %s
+AddToContacts=Add address to my contacts
+LastAccess=Last access
+UploadAnImageToSeeAPhotoHere=Upload an image from the tab %s to see a photo here
+LastPasswordChangeDate=Last password change date
diff --git a/htdocs/langs/fa_IR/ticket.lang b/htdocs/langs/fa_IR/ticket.lang
index 82366e4da30..3224cdeccb6 100644
--- a/htdocs/langs/fa_IR/ticket.lang
+++ b/htdocs/langs/fa_IR/ticket.lang
@@ -26,6 +26,7 @@ Permission56002=ویرایش برگه‌ه
 Permission56003=حذف برگه‌ها
 Permission56004=مدیریت برگه‌ها
 Permission56005=نمایش همۀ برگه‌های مربوط به اشخاص سوم (برای کاربران خارجی مؤثر نیست و همواره به شخص‌سومی که به‌آن وصل است وابسته است)
+Permission56006=Export tickets
 
 Tickets=برگه‌های پشتیبانی
 TicketDictType=برگه‌ها - انواع
@@ -61,6 +62,8 @@ TypeContact_ticket_external_CONTRIBUTOR=مشارکت‌کنندۀ بیرونی
 OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=ارسال پیام برگه با رایانامه
 
+ExportDataset_ticket_1=برگه‌های پشتیبانی
+
 # Status
 Read=خوانده‌شده
 Assigned=نسبت‌داده شده
diff --git a/htdocs/langs/fa_IR/users.lang b/htdocs/langs/fa_IR/users.lang
index 08839378ffa..eae16b0b173 100644
--- a/htdocs/langs/fa_IR/users.lang
+++ b/htdocs/langs/fa_IR/users.lang
@@ -66,7 +66,8 @@ LinkedToDolibarrUser=Link to user
 LinkedToDolibarrThirdParty=Link to third party
 CreateDolibarrLogin=ساختن یک کاربر
 CreateDolibarrThirdParty=ایجاد یک شخص‌سوم
-LoginAccountDisableInDolibarr=حساب در Dolibarr غیرفعال است
+LoginAccountDisableInDolibarr=Account disabled in Dolibarr
+PASSWORDInDolibarr=Password modified in Dolibarr
 UsePersonalValue=استفاده از مقداردهی شخصی
 ExportDataset_user_1=کاربران و مشخصات آنها
 DomainUser=کاربر دامنه %s
@@ -129,3 +130,6 @@ IPLastLogin=IP last login
 IPPreviousLogin=IP previous login
 ShowAllPerms=Show all permission rows
 HideAllPerms=Hide all permission rows
+UserPublicPageDesc=You can enable a virtual card for this user. An url with the user profile and a barcode will be available to allow anybody with a smartphone to scan it and add your contact to its address book.
+EnablePublicVirtualCard=Enable the public virtual user card
+PublicVirtualCardUrl=Public virtual user card
diff --git a/htdocs/langs/fi_FI/accountancy.lang b/htdocs/langs/fi_FI/accountancy.lang
index 0678ec04501..c74f9bf06b5 100644
--- a/htdocs/langs/fi_FI/accountancy.lang
+++ b/htdocs/langs/fi_FI/accountancy.lang
@@ -14,8 +14,8 @@ ACCOUNTING_EXPORT_ENDLINE=Select the carriage return type
 ACCOUNTING_EXPORT_PREFIX_SPEC=Määritä tiedostonimen etuliite
 ThisService=Tämä palvelu
 ThisProduct=Tämä tuote
-DefaultForService=Oletusarvo palvelulle
-DefaultForProduct=Oletusarvo tuotteelle
+DefaultForService=Default for services
+DefaultForProduct=Default for products
 ProductForThisThirdparty=Product for this thirdparty
 ServiceForThisThirdparty=Service for this thirdparty
 CantSuggest=Ei ehdotuksia
@@ -101,7 +101,8 @@ ShowAccountingAccount=Show accounting account
 ShowAccountingJournal=Show accounting journal
 ShowAccountingAccountInLedger=Show accounting account in ledger
 ShowAccountingAccountInJournals=Show accounting account in journals
-AccountAccountingSuggest=Ehdotettu kirjanpitotili
+DataUsedToSuggestAccount=Data used to suggest account
+AccountAccountingSuggest=Account suggested
 MenuDefaultAccounts=Oletustilit
 MenuBankAccounts=Pankkitilit
 MenuVatAccounts=Arvonlisäverotilit
@@ -126,6 +127,7 @@ WriteBookKeeping=Record transactions in accounting
 Bookkeeping=Pääkirjanpito
 BookkeepingSubAccount=Subledger
 AccountBalance=Tilin saldo
+AccountBalanceSubAccount=Sub-accounts balance
 ObjectsRef=Source object ref
 CAHTF=Total purchase vendor before tax
 TotalExpenseReport=Total expense report
@@ -189,6 +191,7 @@ ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Account (from the Chart Of Account) to be us
 UseAuxiliaryAccountOnCustomerDeposit=Store customer account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
 ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Account (from the Chart Of Account) to be used as the default
 UseAuxiliaryAccountOnSupplierDeposit=Store supplier account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
+ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY=Accounting account by default to register customer retained warranty
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased within same country (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased from EEC to another EEC country (used if not defined in the product sheet)
@@ -218,6 +221,7 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Custom group of accounts
+AccountingCategories=Custom groups of accounts
 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.
@@ -265,6 +269,7 @@ ShowSubtotalByGroup=Show subtotal by level
 
 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.
+AccountingCategoriesDesc=Custom group of accounts can be used to group accounting accounts into one name to ease filter use or building of custom reports.
 
 Reconcilable=Reconcilable
 
@@ -294,6 +299,7 @@ DescValidateMovements=Any modification or deletion of writing, lettering and del
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
+DoManualBindingForFailedRecord=You have to do a manual link for the %s row(s) not linked automatically.
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot remove or disable this account of chart of account because it is used
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s & Credit = %s
@@ -337,11 +343,13 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on
 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_ENABLE_LETTERING=Enable the lettering function in the accounting
+ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
 
 ## Export
 NotExportLettering=Do not export the lettering when generating the file
 NotifiedExportDate=Flag exported lines as Exported <span class="warning">(to modify a line, you will need to delete the whole transaction and re-transfert it into accounting)</span>
 NotifiedValidationDate=Validate and Lock the exported entries <span class="warning">(same effect than the "%s" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+NotifiedExportFull=Export documents ?
 DateValidationAndLock=Date validation and lock
 ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Export draft journal
@@ -398,7 +406,7 @@ 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.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the thirdparty, or change the product account suggested for binding if needed.
 ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
 ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
 ## Dictionary
@@ -442,6 +450,7 @@ AccountancyErrorMismatchLetterCode=Mismatch in reconcile code
 AccountancyErrorMismatchBalanceAmount=The balance (%s) is not equal to 0
 AccountancyErrorLetteringBookkeeping=Errors have occurred concerning the transactions: %s
 ErrorAccountNumberAlreadyExists=The accounting number %s already exists
+ErrorArchiveAddFile=Can't put "%s" file in archive
 
 ## Import
 ImportAccountingEntries=Accounting entries
@@ -468,5 +477,7 @@ 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.
 ExpenseReportJournal=Expense Report Journal
+DocsAlreadyExportedAreExcluded=Docs already exported are excluded
+ClickToHideAlreadyExportedLines=Click to hide already exported lines
 
 NAccounts=%s accounts
diff --git a/htdocs/langs/fi_FI/ticket.lang b/htdocs/langs/fi_FI/ticket.lang
index 426a643557d..8d8c3b74108 100644
--- a/htdocs/langs/fi_FI/ticket.lang
+++ b/htdocs/langs/fi_FI/ticket.lang
@@ -26,6 +26,7 @@ Permission56002=Modify tickets
 Permission56003=Poista tiketit
 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)
+Permission56006=Export tickets
 
 Tickets=Tiketit
 TicketDictType=Ticket - Types
@@ -61,6 +62,8 @@ TypeContact_ticket_external_CONTRIBUTOR=External contributor
 OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
+ExportDataset_ticket_1=Tiketit
+
 # Status
 Read=Luettu
 Assigned=Assigned
diff --git a/htdocs/langs/fi_FI/users.lang b/htdocs/langs/fi_FI/users.lang
index 00493d036ae..5b042db67d6 100644
--- a/htdocs/langs/fi_FI/users.lang
+++ b/htdocs/langs/fi_FI/users.lang
@@ -66,7 +66,8 @@ LinkedToDolibarrUser=Link to user
 LinkedToDolibarrThirdParty=Link to third party
 CreateDolibarrLogin=Luo Dolibarr huomioon
 CreateDolibarrThirdParty=Luo kolmasosaa osapuoli
-LoginAccountDisableInDolibarr=Huomioon vammaisten Dolibarr.
+LoginAccountDisableInDolibarr=Account disabled in Dolibarr
+PASSWORDInDolibarr=Password modified in Dolibarr
 UsePersonalValue=Käytä henkilökohtaista arvo
 ExportDataset_user_1=Users and their properties
 DomainUser=Domain käyttäjän %s
@@ -129,3 +130,6 @@ IPLastLogin=IP last login
 IPPreviousLogin=IP previous login
 ShowAllPerms=Show all permission rows
 HideAllPerms=Hide all permission rows
+UserPublicPageDesc=You can enable a virtual card for this user. An url with the user profile and a barcode will be available to allow anybody with a smartphone to scan it and add your contact to its address book.
+EnablePublicVirtualCard=Enable the public virtual user card
+PublicVirtualCardUrl=Public virtual user card
diff --git a/htdocs/langs/fr_BE/stripe.lang b/htdocs/langs/fr_BE/stripe.lang
new file mode 100644
index 00000000000..ae44362fd94
--- /dev/null
+++ b/htdocs/langs/fr_BE/stripe.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - stripe
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+TERMINAL_LOCATION=Location (address) for Stripe Terminals
diff --git a/htdocs/langs/fr_CA/accountancy.lang b/htdocs/langs/fr_CA/accountancy.lang
index 19b2f9918d8..5d526c789eb 100644
--- a/htdocs/langs/fr_CA/accountancy.lang
+++ b/htdocs/langs/fr_CA/accountancy.lang
@@ -10,8 +10,6 @@ Selectformat=Sélectionner le format de date pour le fichier
 ACCOUNTING_EXPORT_FORMAT=Sélectionner le format de date pour le fichier
 ACCOUNTING_EXPORT_ENDLINE=Sélectionner le type de retour de chariot
 ACCOUNTING_EXPORT_PREFIX_SPEC=Spécifiez le préfixe du nom de fichier
-DefaultForService=Par défaut pour le service
-DefaultForProduct=Défaut pour le produit
 ProductForThisThirdparty=Produit pour ce tier
 ServiceForThisThirdparty=Service pour ce tier
 CantSuggest=Ne peut pas suggérer
@@ -55,7 +53,6 @@ AccountancyAreaDescClosePeriod=ÉTAPE%s: Période de fermeture afin que nous ne
 Selectchartofaccounts=Sélectionnez le plan des comptes actif
 SubledgerAccountLabel=Étiquette de compte auxiliaire
 ShowAccountingJournal=Afficher le journal comptable
-AccountAccountingSuggest=Compte comptable suggéré
 MenuTaxAccounts=Comptes d'impôts
 MenuExpenseReportAccounts=Comptes de comptes de dépenses
 MenuLoanAccounts=Comptes de prêts
@@ -90,6 +87,8 @@ ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Tronquer le formulaire de description de c
 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
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Note de frais
+AccountingCategory=Custom group of accounts
+AccountingCategories=Custom groups of accounts
 NotMatch=Pas encore défini
 FinanceJournal=Journal des finances
 ExpenseReportsJournal=Journal des rapports de dépenses
diff --git a/htdocs/langs/fr_CA/categories.lang b/htdocs/langs/fr_CA/categories.lang
index 6357b823f41..df1c2447d89 100644
--- a/htdocs/langs/fr_CA/categories.lang
+++ b/htdocs/langs/fr_CA/categories.lang
@@ -15,7 +15,6 @@ ProductsCategoryShort=Tags/catégories de produits
 MembersCategoryShort=Tags/catégories de membres
 CustomersCategoriesShort=Tags/catégories de clients
 ProspectsCategoriesShort=Prospects tags/catégories
-ProductsCategoriesShort=Tags/catégories de produits
 MembersCategoriesShort=Tags/catégories de membres
 AccountsCategoriesShort=Étiquettes / catégories de comptes
 ProjectsCategoriesShort=Projets Tags / catégories
diff --git a/htdocs/langs/fr_CH/stripe.lang b/htdocs/langs/fr_CH/stripe.lang
new file mode 100644
index 00000000000..ae44362fd94
--- /dev/null
+++ b/htdocs/langs/fr_CH/stripe.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - stripe
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+TERMINAL_LOCATION=Location (address) for Stripe Terminals
diff --git a/htdocs/langs/fr_CI/stripe.lang b/htdocs/langs/fr_CI/stripe.lang
new file mode 100644
index 00000000000..ae44362fd94
--- /dev/null
+++ b/htdocs/langs/fr_CI/stripe.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - stripe
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+TERMINAL_LOCATION=Location (address) for Stripe Terminals
diff --git a/htdocs/langs/fr_CM/stripe.lang b/htdocs/langs/fr_CM/stripe.lang
new file mode 100644
index 00000000000..ae44362fd94
--- /dev/null
+++ b/htdocs/langs/fr_CM/stripe.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - stripe
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+TERMINAL_LOCATION=Location (address) for Stripe Terminals
diff --git a/htdocs/langs/fr_FR/accountancy.lang b/htdocs/langs/fr_FR/accountancy.lang
index 291f9a14a5c..1657663dea8 100644
--- a/htdocs/langs/fr_FR/accountancy.lang
+++ b/htdocs/langs/fr_FR/accountancy.lang
@@ -101,7 +101,8 @@ ShowAccountingAccount=Afficher le compte comptable
 ShowAccountingJournal=Afficher le journal
 ShowAccountingAccountInLedger=Afficher le compte comptable dans le grand livre
 ShowAccountingAccountInJournals=Afficher le compte comptable dans les journaux
-AccountAccountingSuggest=Code comptable suggéré
+DataUsedToSuggestAccount=Données utilisées pour suggérer le compte comptable
+AccountAccountingSuggest=Compte comptable suggéré
 MenuDefaultAccounts=Comptes par défaut
 MenuBankAccounts=Comptes bancaires
 MenuVatAccounts=Comptes TVA
@@ -126,6 +127,7 @@ WriteBookKeeping=Enregistrer les transactions en comptabilité
 Bookkeeping=Grand livre
 BookkeepingSubAccount=Grand livre auxiliaire
 AccountBalance=Balance des comptes
+AccountBalanceSubAccount=Balance des comptes de tiers
 ObjectsRef=Référence de l'objet source
 CAHTF=Total achat fournisseur HT
 TotalExpenseReport=Total note de frais
@@ -167,9 +169,9 @@ ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Sur virement comptable, quelle est la pér
 
 ACCOUNTING_SELL_JOURNAL=Journal des ventes (ventes et retours)
 ACCOUNTING_PURCHASE_JOURNAL=Journal des achats (achats et retours)
-ACCOUNTING_BANK_JOURNAL=Journal de caisse (encaissements et décaissements)
+ACCOUNTING_BANK_JOURNAL=Journal de trésorerie (encaissements et décaissements)
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Journal des notes de frais
-ACCOUNTING_MISCELLANEOUS_JOURNAL=Journal général
+ACCOUNTING_MISCELLANEOUS_JOURNAL=Journal des opérations diverses
 ACCOUNTING_HAS_NEW_JOURNAL=Journal des A-nouveaux
 ACCOUNTING_INVENTORY_JOURNAL=Journal d'inventaire
 ACCOUNTING_SOCIAL_JOURNAL=Journal de paie
@@ -178,31 +180,32 @@ ACCOUNTING_RESULT_PROFIT=Compte de résultat (Profit)
 ACCOUNTING_RESULT_LOSS=Compte de résultat (perte)
 ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Journal de fermeture
 
-ACCOUNTING_ACCOUNT_TRANSFER_CASH=Compte (du plan comptable) à utiliser comme compte pour les virements bancaires transitoires
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Compte comptable de virement interne
 TransitionalAccount=Compte transitoire de virement bancaire
 
-ACCOUNTING_ACCOUNT_SUSPENSE=Compte (du plan comptable) à utiliser comme compte pour les fonds non alloués reçus ou payés, c'est-à-dire les fonds en "attente"
-DONATION_ACCOUNTINGACCOUNT=Compte (du plan comptable) à utiliser pour enregistrer les dons (module Donation)
-ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Compte (du plan comptable) à utiliser pour enregistrer les souscriptions d'adhésions (module d'adhésion - si adhésion enregistrée sans facture)
+ACCOUNTING_ACCOUNT_SUSPENSE=Compte comptable d'attente
+DONATION_ACCOUNTINGACCOUNT=Compte comptable pour la comptabilisation des dons
+ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Compte comptable pour la comptabilisation des adhésions des adhérents
 
-ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Compte (du plan comptable) à utiliser comme compte par défaut pour enregistrer le dépôt du client
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Compte (du plan comptable) à utiliser comme compte par défaut pour enregistrer les acomptes client
 UseAuxiliaryAccountOnCustomerDeposit=Enregistrer le compte client comme compte individuel dans le grand livre auxiliaire pour les lignes d'acompte (si désactivé, le compte individuel pour les lignes d'acompte restera vide)
-ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Compte (du plan comptable) à utiliser par défaut
-UseAuxiliaryAccountOnSupplierDeposit=Stocker le compte fournisseur comme compte individuel dans le grand livre auxiliaire pour les lignes d'acomptes (si désactivé, le compte individuel pour les lignes d'acompte restera vide)
+ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Compte comptable par défaut pour enregistrer l'acompte fournisseur
+UseAuxiliaryAccountOnSupplierDeposit=Utiliser le compte comptable auxiliaire fournisseur dans le grand livre auxiliaire pour les lignes d'acomptes fournisseurs (si désactivé, le compte comptable auxiliaire pour les lignes d'acompte restera vide)
+ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY=Compte comptable par défaut pour l'enregistrement des retenues de garantie clients
 
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Compte (du plan comptable) à utiliser comme compte par défaut pour les produits achetés dans le même pays (utilisé s'il n'est pas défini dans la fiche produit)
-ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Compte (du plan comptable) à utiliser comme compte par défaut pour les produits achetés de la CEE vers un autre pays de la CEE (utilisé si non défini dans la fiche produit)
-ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Compte (du plan comptable) à utiliser comme compte par défaut pour les produits achetés et importés de tout autre pays étranger (utilisé s'il n'est pas défini dans la fiche produit)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Compte (du plan comptable) à utiliser comme compte par défaut pour les produits vendus (utilisé si non défini dans la fiche produit)
-ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Compte (du Plan Comptable) à utiliser comme compte par défaut pour les produits vendus depuis la CEE vers un autre pays de la CEE (utilisé si non défini dans la fiche produit)
-ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Compte (du plan comptable) à utiliser comme compte par défaut pour les produits vendus et exportés vers tout autre pays étranger (utilisé s'il n'est pas défini dans la fiche produit)
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Compte comptable par défaut pour les produits achetés  dans le même pays (utilisé si non défini dans la fiche produit)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Compte comptable par défaut pour les produits achetés dans la CEE (utilisé si non défini dans la fiche produit)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Compte comptable par défaut pour les produits achetés et importés hors de la CEE (utilisé si non défini dans la fiche produit)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Compte comptable par défaut pour les produits vendus (utilisé si non défini dans la fiche produit)
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Compte comptable par défaut pour les produits vendus dans la CEE (utilisé si non définie dans la fiche produit)
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Compte comptable par défaut pour les produits vendus et exportés hors de la CEE (utilisé si non définie dans la fiche produit)
 
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Compte (du plan comptable) à utiliser comme compte par défaut pour les services achetés dans le même pays (utilisé s'il n'est pas défini dans la feuille de services)
-ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Compte (du plan comptable) à utiliser comme compte par défaut pour les services achetés depuis la CEE vers un autre pays de la CEE (utilisé s'il n'est pas défini dans la feuille de services)
-ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Compte (du plan comptable) à utiliser comme compte par défaut pour les services achetés et importés d'un autre pays étranger (utilisé s'il n'est pas défini dans la feuille de service)
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Compte (du plan comptable) à utiliser comme compte par défaut pour les services vendus (utilisé s'il n'est pas défini dans la feuille de services)
-ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Compte (du Plan Comptable) à utiliser comme compte par défaut pour les prestations vendues depuis la CEE vers un autre pays de la CEE (utilisé si non défini dans la fiche service)
-ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Compte (du plan comptable) à utiliser comme compte par défaut pour les services vendus et exportés vers tout autre pays étranger (utilisé s'il n'est pas défini dans la feuille de service)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Compte comptable par défaut pour les services achetés dans le pays (utilisé si non défini dans la fiche service)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Compte comptable par défaut pour les services achetés dans la CEE (utilisé si non défini dans la fiche service)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Compte comptable par défaut pour les services achetés et importés hors de la CEE (utilisé si non défini dans la fiche service)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Compte comptable par défaut pour les services vendus (utilisé si non défini dans la fiche service)
+ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Compte comptable par défaut pour les services vendus dans la CEE (utilisé si non défini dans la fiche service)
+ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Compte comptable par défaut pour les services vendus et exportés hors de la CEE (utilisé si non définie dans la fiche produit)
 
 Doctype=Type de documents
 Docdate=Date
@@ -218,6 +221,7 @@ JournalLabel=Libellé journal
 NumPiece=Numéro de pièce
 TransactionNumShort=Num. transaction
 AccountingCategory=Groupe de comptes personnalisé
+AccountingCategories=Groupes de comptes personnalisés
 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
@@ -265,19 +269,20 @@ ShowSubtotalByGroup=Afficher le sous-total par niveau
 
 Pcgtype=Groupe de comptes comptables
 PcgtypeDesc=Les groupes de comptes sont utilisés comme critères de filtre et de regroupement prédéfinis pour certains rapports de comptabilité. Par exemple, «INCOME» ou «EXPENSE» sont utilisés en tant que groupes pour la comptabilité afin de générer le rapport dépenses / revenus.
+AccountingCategoriesDesc=Un groupe de comptes personnalisé peut être utilisé pour regrouper les comptes comptables en un seul nom afin de faciliter l'utilisation du filtre ou la création de rapports personnalisés.
 
 Reconcilable=Rapprochable
 
 TotalVente=Total chiffre affaires hors taxe
 TotalMarge=Total marge
 
-DescVentilCustomer=Consultez ici la liste des lignes de facture client liées (ou non) à un compte produit du plan comptable
-DescVentilMore=Dans la plupart des cas, si vous utilisez des produits ou services prédéfinis et que vous paramétrez le compte (du plan comptable) sur la fiche produit/service, l'application pourra faire toute la liaison entre vos lignes de facture et le compte comptable de votre plan comptable des comptes, juste en un clic avec le bouton <strong> "%s" </strong> . Si le compte n'a pas été défini sur les fiches produits/services ou s'il vous reste des lignes non liées à un compte, vous devrez effectuer une liaison manuelle depuis le menu " <strong> %s </strong> ".
-DescVentilDoneCustomer=Consultez ici la liste des lignes de factures clients et leur compte produit à partir du plan comptable
-DescVentilTodoCustomer=Lier les lignes de facture qui ne sont pas déjà liées à un compte produit à partir d'un plan comptable
-ChangeAccount=Modifiez le compte de produit/service (du plan comptable) pour les lignes sélectionnées avec le compte suivant :
+DescVentilCustomer=Consultez ici la liste des lignes de facture client lié (ou non) à un compte comptable produit ou service
+DescVentilMore=Dans la plupart des cas, si vous utilisez des produits ou services prédéfinis et que vous paramétrez le compte (du plan comptable) sur la fiche produit/service, l'application pourra faire toute la liaison entre vos lignes de facture et le compte comptable de votre plan comptable des comptes, juste en un clic avec le bouton <strong>"%s"</strong> . Si le compte n'a pas été défini sur les fiches produits/services ou s'il vous reste des lignes non liées à un compte, vous devrez effectuer une liaison manuelle depuis le menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consultez ici la liste des lignes de factures clients et leur compte comptable produits
+DescVentilTodoCustomer=Lier les lignes de factures non déjà liées à un compte comptable produit
+ChangeAccount=Modifiez le compte comptable de produit/service pour les lignes sélectionnées avec le compte suivant :
 Vide=-
-DescVentilSupplier=Consultez ici la liste des lignes de facture fournisseur liées ou non encore liées à un compte article du plan comptable (seuls les enregistrements non encore transférés en comptabilité sont visibles)
+DescVentilSupplier=Consultez ici la liste des lignes de factures fournisseur liées ou pas encore liées à un compte comptable produit/service (seuls les enregistrements pas encore transférés en comptabilités sont visibles)
 DescVentilDoneSupplier=Consultez ici la liste des lignes de factures fournisseurs et leur compte comptable
 DescVentilTodoExpenseReport=Lier les lignes de note de frais par encore liées à un compte comptable
 DescVentilExpenseReport=Consultez ici la liste des lignes de notes de frais liées (ou non) à un compte comptable
@@ -294,15 +299,16 @@ DescValidateMovements=Toute modification ou suppression d'écriture, de lettrage
 
 ValidateHistory=Lier automatiquement
 AutomaticBindingDone=Liaisons automatiques effectuées (%s) - Liaison automatique impossible pour certains enregistrements (%s)
+DoManualBindingForFailedRecord=Vous devez réaliser un rapprochement manuel pour la/les %s ligne·s non rapproché·es automatiquement.
 
-ErrorAccountancyCodeIsAlreadyUse=Erreur, vous ne pouvez pas supprimer ou désactiver ce compte de plan comptable car il est utilisé
+ErrorAccountancyCodeIsAlreadyUse=Erreur, vous ne pouvez pas supprimer ou désactiver ce compte comptable car il est utilisé
 MvtNotCorrectlyBalanced=Mouvement non équilibré. Débit = %s & Crédit = %s
 Balancing=Équilibrage
 FicheVentilation=Fiche lien
 GeneralLedgerIsWritten=Les transactions sont enregistrées dans le grand livre
 GeneralLedgerSomeRecordWasNotRecorded=Certaines des opérations n'ont pu être journalisées. S'il n'y a pas d'autres messages, c'est probablement car elles sont déjà comptabilisées.
 NoNewRecordSaved=Aucune ligne à transférer
-ListOfProductsWithoutAccountingAccount=Liste des produits non liés à un compte de plan comptable
+ListOfProductsWithoutAccountingAccount=Liste des produits non liés à un compte comptable
 ChangeBinding=Changer les liens
 Accounted=En comptabilité
 NotYetAccounted=Pas encore transféré en comptabilité
@@ -337,12 +343,13 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=Désactiver la liaison et le transfert en co
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Désactiver la liaison et le transfert en comptabilité des factures d'achats (les factures fournisseurs ne seront pas prises en compte en comptabilité).
 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é).
 ACCOUNTING_ENABLE_LETTERING=Activer la fonction de lettrage dans la comptabilité
+ACCOUNTING_ENABLE_AUTOLETTERING=Activer le lettrage automatique lors du transfert en comptabilité
 
 ## Export
 NotExportLettering=Ne pas exporter le lettrage lors de la génération du fichier
 NotifiedExportDate=Marquer les lignes exportées comme Exportées <span class="warning"> (pour modifier une ligne, vous devrez supprimer toute la transaction et la retransférer en comptabilité) </span>
 NotifiedValidationDate=Validez et verrouillez les entrées exportées <span class="warning"> (même effet que la fonctionnalité "%s", la modification et la suppression des lignes ne seront définitivement plus possibles) </span>
-NotifiedExportFull=Exporter les pièces ?
+NotifiedExportFull=Exporter les documents sources ?
 DateValidationAndLock=Validation et verrouillage de la date
 ConfirmExportFile=Confirmation de la génération du fichier d'export comptable ?
 ExportDraftJournal=Exporter le journal brouillon
@@ -399,7 +406,7 @@ SaleLocal=Vente locale
 SaleExport=Vente export
 SaleEEC=Vente dans la CEE
 SaleEECWithVAT=Vente dans la CEE avec un taux de TVA non nul, on considère qu'il s'agit d'une vente intracommunutaire à un assujetti à la TVA et le compte comptable suggéré est le compte comptable de vente classique.
-SaleEECWithoutVATNumber=Vente dans la CEE avec un taux de TVA nul mais sans numéro de TVA intracommunutaire renseigné dans la fiche du tiers. Nous forçons ainsi le compte comptable de vente classique. Il est nécessaire de renseigner le numéro de TVA intracommunautaire dans la fiche du tiers ou changer le compte comptable de vente si nécessaire.
+SaleEECWithoutVATNumber=Vente dans la CEE sans TVA, mais le N° de TVA du tiers n'est pas défini. On se rabat sur le compte pour les ventes normales. Vous pouvez corriger le N° de TVA du tiers , ou changer le compte de produit associé si nécessaire.
 ForbiddenTransactionAlreadyExported=Interdit : La transaction a été validée et/ou exportée.
 ForbiddenTransactionAlreadyValidated=Interdit : La transaction a été validée.
 ## Dictionary
@@ -443,7 +450,7 @@ AccountancyErrorMismatchLetterCode=Non-concordance dans le code de réconciliati
 AccountancyErrorMismatchBalanceAmount=Le solde (%s) n'est pas égal à 0
 AccountancyErrorLetteringBookkeeping=Des erreurs sont survenues concernant les transactions : %s
 ErrorAccountNumberAlreadyExists=Le code comptable %s existe déjà
-ErrorArchiveAddFile=Impossible d'ajouter le fichier "%s" dans l'archive
+ErrorArchiveAddFile=Impossible de mettre le fichier "%s" dans l'archive
 
 ## Import
 ImportAccountingEntries=Écritures comptables
@@ -470,5 +477,7 @@ FECFormatMulticurrencyCode=Code multidevise (Idevise)
 DateExport=Date d'export
 WarningReportNotReliable=Attention : ce rapport n'est pas basé sur le grand livre et ne contient donc pas les écritures manuelles qui lui ont été ajoutées. Si votre journalisation est à jour, la vue depuis le grand livre sera plus précise.
 ExpenseReportJournal=Journal des notes de frais
+DocsAlreadyExportedAreExcluded=Les documents déjà exportés sont exclus
+ClickToHideAlreadyExportedLines=Cliquer pour cacher les documents déjà exportés
 
 NAccounts=%s comptes
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 11721181cc8..5ca2bd11ffd 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -645,6 +645,8 @@ Module2300Name=Travaux planifiés
 Module2300Desc=Gestion des travaux planifiées (alias cron ou table chrono)
 Module2400Name=Événements/Agenda
 Module2400Desc=Gestion des événements. Laissez l'application tracer automatiquement les événements pour des besoins de suivi ou enregistrer manuellement des événements ou rendez-vous dans l'agenda. Ceci est le module le plus important pour une bonne Gestion de la Relation Client ou Fournisseur.
+Module2430Name=Système de calendrier de réservation
+Module2430Desc=Proposez un calendrier en ligne pour permettre à quiconque de réserver un rendez-vous, en fonction de plages et de disponibilités prédéfinies.
 Module2500Name=GED
 Module2500Desc=Gestion de documents (GED). Stockage automatic des documents générés ou stockés. Fonction de partage.
 Module2600Name=API / Web services (serveur SOAP)
@@ -660,6 +662,8 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=Capacités de conversion GeoIP Maxmind
 Module3200Name=Archives/Logs Inaltérables
 Module3200Desc=Active la journalisation de certains événements métiers dans une log/archive inaltérable. Les événements sont archivés en temps réel. L'archive est une table d'événements chaînés qui peut être lu uniquement et exporté. Ce module permet d'être compatible avec les exigences des lois de certains pays (comme par exemple la loi Finance 2016 ou norme 525 en France).
+Module3300Name=Module Builder
+Module3200Desc=Active la journalisation de certains événements métiers dans une log/archive inaltérable. Les événements sont archivés en temps réel. L'archive est une table d'événements chaînés qui peut être lu uniquement et exporté. Ce module permet d'être compatible avec les exigences des lois de certains pays (comme par exemple la loi Finance 2016 ou norme 525 en France).
 Module3400Name=Réseaux sociaux
 Module3400Desc=Activez les champs de réseaux sociaux dans les tiers et les adresses (skype, twitter, facebook, ...).
 Module4000Name=GRH
@@ -845,7 +849,7 @@ Permission286=Exporter les contacts
 Permission291=Consulter les tarifs
 Permission292=Définir les permissions sur les tarifs
 Permission293=Modifier les tarifs clients
-Permission301=Générer le PDF du code barre 
+Permission301=Générer la planche PDF de code barres 
 Permission304=Créer/modifier les codes-barres
 Permission305=Supprimer les codes-barres
 Permission311=Consulter les services
@@ -974,7 +978,7 @@ Permission3301=Générer de nouveaux modules
 Permission4001=Lire compétence/emploi/poste
 Permission4002=Créer/modifier une compétence/un emploi/un poste
 Permission4003=Supprimer compétence/emploi/poste
-Permission4021=Lire les évaluations (la vôtre et celle de vos subordonnés)
+Permission4021=Lire les évaluations (les vôtres et celle de vos subordonnés)
 Permission4022=Créer/modifier des évaluations
 Permission4023=Valider l'évaluation
 Permission4025=Supprimer l'évaluation
@@ -1246,7 +1250,7 @@ BrowserName=Nom du navigateur
 BrowserOS=OS du navigateur
 ListOfSecurityEvents=Liste des événements de sécurité Dolibarr
 SecurityEventsPurged=Evenement de sécurité purgés
-TrackableSecurityEvents=événement de sécurité traçable
+TrackableSecurityEvents=Evénement de sécurité traçable
 LogEventDesc=Vous pouvez activer ici l'historique des événements d'audit de sécurité. Cet historique est consultable par les administrateurs dans le menu <b>%s - %s</b>. Attention, cette fonctionnalité peut générer un gros volume de données.
 AreaForAdminOnly=Les paramètres d'installation ne peuvent être remplis que par les <b>utilisateurs administrateurs</b> uniquement.
 SystemInfoDesc=Les informations systèmes sont des informations techniques diverses accessibles en lecture seule aux administrateurs uniquement.
@@ -1270,6 +1274,7 @@ TriggerActiveAsModuleActive=Déclencheurs de ce fichier actifs car le module <b>
 GeneratedPasswordDesc=Définissez ici quelle règle vous voulez utiliser pour générer les mots de passe quand vous demandez à générer un nouveau mot de passe
 DictionaryDesc=Définissez ici les données de référence. Vous pouvez compléter/modifier les données prédéfinies avec les vôtres.
 ConstDesc=Cette page vous permet d'éditer (remplacer) des paramètres non disponibles dans d'autres pages. Il s'agit principalement de paramètres réservés pour les développeurs et dépannage avancé uniquement. <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank">Consultez ici</a> la liste des options.
+MiscellaneousOptions=Options diverses
 MiscellaneousDesc=Définissez ici les autres paramètres en rapport avec la sécurité.
 LimitsSetup=Configuration des limites et précisions
 LimitsDesc=Vous pouvez définir ici les limites, précisions et optimisations utilisées par Dolibarr
@@ -1491,7 +1496,7 @@ WatermarkOnDraftContractCards=Filigrane sur les brouillons de contrats (aucun si
 ##### Members #####
 MembersSetup=Configuration du module Adhérents
 MemberMainOptions=Options principales
-MemberCodeChecker=Options de génération automatique des codes membres
+MemberCodeChecker=Options de génération automatique des codes des adhérents
 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.
@@ -1856,7 +1861,7 @@ StockDecreaseForPointOfSaleDisabledbyBatch=La décrémentation de stock depuis c
 CashDeskYouDidNotDisableStockDecease=Vous n'avez pas désactivé la réduction de stock lors d'une vente depuis le Point de vente. Par conséquent, un entrepôt est nécessaire.
 CashDeskForceDecreaseStockLabel=La diminution des stocks de produits soumis à numéros de lots a été forcée.
 CashDeskForceDecreaseStockDesc=Diminuez d'abord par les dates de DMD/DLUO ou DLC les plus anciennes
-CashDeskReaderKeyCodeForEnter=Code ASCII clé pour "Enter" défini dans le lecteur de code-barres (Exemple : 13)
+CashDeskReaderKeyCodeForEnter=Code ASCII clé pour "Entrer" défini dans le lecteur de code-barres (Exemple : 13)
 ##### Bookmark #####
 BookmarkSetup=Configuration du module Marque-pages
 BookmarkDesc=Ce module vous permet de gérer des liens et raccourcis. Il permet aussi d'ajouter n'importe quelle page de Dolibarr ou lien web dans le menu d'accès rapide sur la gauche.
@@ -1946,7 +1951,7 @@ BackupZipWizard=Assistant pour générer l'archive du répertoire documents
 SomethingMakeInstallFromWebNotPossible=L'installation de module externe est impossible depuis l'interface web pour la raison suivante : 
 SomethingMakeInstallFromWebNotPossible2=Pour cette raison, le processus de mise à jour décrit ici est une processus manuel que seul un utilisateur ayant des droits privilégiés peut réaliser.
 InstallModuleFromWebHasBeenDisabledContactUs=L'installation ou le développement de modules externes ou de sites Web dynamiques, à partir de l'application, est actuellement verrouillé pour des raisons de sécurité. Veuillez nous contacter si vous avez besoin d'activer cette fonctionnalité.
-InstallModuleFromWebHasBeenDisabledByFile=L'installation de module externe depuis l'application a été désactivé par l'administrator. Vous devez lui demander de supprimer le fichier <strong>%s</strong> pour permettre cette fonctionnalité.
+InstallModuleFromWebHasBeenDisabledByFile=L'installation de module externe depuis l'application a été désactivé par l'administrateur. Vous devez lui demander de supprimer le fichier <strong>%s</strong> pour permettre cette fonctionnalité.
 ConfFileMustContainCustom=Installer ou créer un module externe à partir de l'application nécessite de sauvegarder les fichiers du module dans le répertoire <strong>%s</strong>. Pour que ce répertoire soit reconnu par Dolibarr, vous devez paramétrer le fichier de configuration <strong>conf/conf.php</strong> en ajoutant les 2 lignes suivantes :<br><strong>$dolibarr_main_url_root_alt='/custom'</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Mettre en surbrillance les lignes de la table lorsque la souris passe au-dessus
 HighlightLinesColor=Couleur de la ligne de surbrillance lorsque la souris passe au-dessus (mettre 'ffffff' pour ne pas mettre en surbrillance)
@@ -2073,8 +2078,8 @@ RemoveSpecialChars=Supprimer les caractères spéciaux
 COMPANY_AQUARIUM_CLEAN_REGEX=Filtre Regex pour nettoyer la valeur (COMPANY_AQUARIUM_CLEAN_REGEX)
 COMPANY_DIGITARIA_CLEAN_REGEX=Filtre de regex pour nettoyer la valeur (COMPANY_DIGITARIA_CLEAN_REGEX)
 COMPANY_DIGITARIA_UNIQUE_CODE=Doublons non autorisés
-RemoveSpecialWords=Nettoyer certains mots lors de la génération de sous-comptes pour les clients ou les fournisseurs
-RemoveSpecialWordsHelp=Précisez les mots à nettoyer avant de calculer le compte client ou fournisseur. Utiliser un ";" entre chaque mot
+RemoveSpecialWords=Nettoyer certains mots lors de la génération des comptes comptables des tiers pour les clients ou les fournisseurs
+RemoveSpecialWordsHelp=Précisez les mots à nettoyer avant de calculer le compte comptable des tiers client ou fournisseur. Utiliser un ";" entre chaque mot
 GDPRContact=Responsable de la protection des données (DPO ou contact RGPD)
 GDPRContactDesc=Si vous stockez des données personnelles dans votre système d'information, vous pouvez nommer ici le contact responsable du règlement général sur la protection des données
 HelpOnTooltip=Texte d'aide à afficher dans l'info-bulle
@@ -2359,3 +2364,5 @@ AllowExternalDownload=Autoriser le téléchargement externe (sans connexion, en
 DeadlineDayVATSubmission=Date limite pour la soumission de la TVA le mois suivant
 MaxNumberOfAttachementOnForms=Nombre maximum de fichiers joints dans un formulaire
 IfDefinedUseAValueBeetween=Si défini, utilisez une valeur entre %s et %s
+Reload=Recharger
+ConfirmReload=Confirmer le rechargement du module
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index 571c9316496..48e9bc5120e 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -629,5 +629,5 @@ BulkPaymentNotPossibleForInvoice=L'enregistrement  de paiements en masse n'est p
 MentionVATDebitOptionIsOn=Option de paiement de taxe sur débits
 MentionCategoryOfOperations=Catégorie d'opérations
 MentionCategoryOfOperations0=Livraison de marchandises
-MentionCategoryOfOperations1=Fourniture de services
+MentionCategoryOfOperations1=Prestation de services
 MentionCategoryOfOperations2=Mixte - Livraison de biens & prestation de services
diff --git a/htdocs/langs/fr_FR/boxes.lang b/htdocs/langs/fr_FR/boxes.lang
index cb09a89023c..085026a0761 100644
--- a/htdocs/langs/fr_FR/boxes.lang
+++ b/htdocs/langs/fr_FR/boxes.lang
@@ -24,6 +24,7 @@ BoxFicheInter=Dernières interventions
 BoxCurrentAccounts=Balance des comptes ouverts
 BoxTitleMemberNextBirthdays=Anniversaires de ce mois (adhérents)
 BoxTitleMembersByType=Adhérents par type et par statut
+BoxTitleMembersByTags=Adhérents par étiquette et état
 BoxTitleMembersSubscriptionsByYear=Cotisations des adhérents par année
 BoxTitleLastRssInfos=Les %s dernières informations de %s
 BoxTitleLastProducts=Les %s derniers produits/services modifiés
diff --git a/htdocs/langs/fr_FR/categories.lang b/htdocs/langs/fr_FR/categories.lang
index 235602b4600..9ec6102dc3b 100644
--- a/htdocs/langs/fr_FR/categories.lang
+++ b/htdocs/langs/fr_FR/categories.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - categories
-Rubrique=Tag/Catégorie
+Rubrique=Tag/catégorie
 Rubriques=Tags/catégories
 RubriquesTransactions=Tags/catégories des transactions
 categories=tags/catégories
@@ -54,26 +54,26 @@ SuppliersCategoryShort=Tag/catégorie de fournisseurs
 CustomersCategoryShort=Tag/catégorie de clients
 ProductsCategoryShort=Tag/catégorie de produits
 MembersCategoryShort=Tag/catégorie adhérents
-SuppliersCategoriesShort=Tags fournisseurs
-CustomersCategoriesShort=Tags clients
-ProspectsCategoriesShort=Tags prospects
-CustomersProspectsCategoriesShort=Tags clients/prosp.
-ProductsCategoriesShort=Tags de produits
-MembersCategoriesShort=Tags des adhérents
-ContactCategoriesShort=Tags de contacts
-AccountsCategoriesShort=Tags des comptes
-ProjectsCategoriesShort=Tags de projets
-UsersCategoriesShort=Tags utilisateurs
+SuppliersCategoriesShort=Tags/catégories fournisseurs
+CustomersCategoriesShort=Tags/catégories clients
+ProspectsCategoriesShort=Tags/catégories prospects
+CustomersProspectsCategoriesShort=Tags/catégories clients/prosp.
+ProductsCategoriesShort=Tags/catégories de produits
+MembersCategoriesShort=Tags/catégories des adhérents
+ContactCategoriesShort=Tags/catégories de contacts
+AccountsCategoriesShort=Tags/catégories des comptes
+ProjectsCategoriesShort=Tags/catégories de projets
+UsersCategoriesShort=Tags/catégories utilisateurs
 StockCategoriesShort=Tags/catégories d’entrepôt
 ThisCategoryHasNoItems=Cette catégorie ne contient aucun élément.
 CategId=ID du(de la) tag/catégorie
-ParentCategory=Catégorie parente
-ParentCategoryID=ID de la balise/catégorie parent
+ParentCategory=Tag/catégorie parent
+ParentCategoryID=ID du tag/catégorie parent
 ParentCategoryLabel=Libellé du tag/catégorie parent
 CatSupList=Liste des tags/catégories des fournisseurs
 CatCusList=Liste des tags/catégories des clients/prospects
 CatProdList=Liste des tags/catégories de produits/services
-CatMemberList=Liste des tags/catégories de membres
+CatMemberList=Liste des tags/catégories des adhérents
 CatContactList=Liste des tags/catégories des contacts
 CatProjectsList=Liste des tags/catégories des projets
 CatUsersList=Liste des tags/catégories des utilisateurs
@@ -81,7 +81,7 @@ CatSupLinks=Liens entre fournisseurs et tags/catégories
 CatCusLinks=Liens entre clients/prospects et tags/catégories
 CatContactsLinks=Liens entre contacts/adresses et tags/catégories
 CatProdLinks=Liens entre produits/services et tags/catégories
-CatMembersLinks=Liens entre membres et tags/catégories
+CatMembersLinks=Liens entre adhérents et tags/catégories
 CatProjectsLinks=Liens entre projets et tags/catégories
 CatUsersLinks=Liaisons entre les utilisateurs et les tags/catégories
 DeleteFromCat=Enlever des tags/catégories
diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang
index f66d2005c73..35f1050a1db 100644
--- a/htdocs/langs/fr_FR/companies.lang
+++ b/htdocs/langs/fr_FR/companies.lang
@@ -312,12 +312,12 @@ CustomerRelativeDiscountShort=Remise relative
 CustomerAbsoluteDiscountShort=Remise fixe
 CompanyHasRelativeDiscount=Ce client a une remise par défaut de <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Ce client n'a pas de remise relative par défaut
-HasRelativeDiscountFromSupplier=Vous avez une réduction par défaut de <b> %s%% </b> chez ce fournisseur
-HasNoRelativeDiscountFromSupplier=Aucune remise relative par défaut de ce fournisseur
+HasRelativeDiscountFromSupplier=Vous bénéficier d'une remise par défaut de <b>%s%%</b> avec ce vendeur.
+HasNoRelativeDiscountFromSupplier=Aucune remise relative par défaut chez ce fournisseur
 CompanyHasAbsoluteDiscount=Ce client dispose de crédits disponibles (avoirs ou acomptes) pour un montant de <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=Ce client a une réduction disponible (commercial, acompte) pour <b>%s</b>%s
 CompanyHasCreditNote=Ce client a <b>%s</b> %s d'avoirs disponibles
-HasNoAbsoluteDiscountFromSupplier=Aucun rabais/crédit disponible auprès de ce fournisseur
+HasNoAbsoluteDiscountFromSupplier=Aucun rabais/crédit disponible chez ce fournisseur
 HasAbsoluteDiscountFromSupplier=Vous avez des crédits disponibles (avoirs ou acomptes) pour <b> %s </b> %s chez ce fournisseur
 HasDownPaymentOrCommercialDiscountFromSupplier=Vous avez des crédits disponibles (bon de réductions, acomptes) pour <b> %s </b> %s chez ce fournisseur
 HasCreditNoteFromSupplier=Vous avez des avoirs pour <b> %s </b> %s chez ce fournisseur
@@ -499,4 +499,7 @@ OutOfEurope=Hors Union Européenne (UE)
 CurrentOutstandingBillLate=Montant impayé arrivé à échéance
 BecarefullChangeThirdpartyBeforeAddProductToInvoice=Attention : selon votre configuration des prix des produits/services, vous devriez changer le tiers avant d'ajouter le produit
 EmailAlreadyExistsPleaseRewriteYourCompanyName=l'e-mail existe déjà, veuillez réécrire le nom de votre entreprise
-TwoRecordsOfCompanyName=plusieurs fiches existent pour cette entreprise merci de nous contacter pour compléter votre demande de partenariat"
+TwoRecordsOfCompanyName=plus d'un enregistrement existe pour cette entreprise, veuillez nous contacter pour finaliser votre demande de partenariat
+CompanySection=Section société
+ShowSocialNetworks=Afficher les réseaux sociaux
+HideSocialNetworks=Masquer les réseaux sociaux
diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang
index 58b04bc67bd..7b039cba206 100644
--- a/htdocs/langs/fr_FR/compta.lang
+++ b/htdocs/langs/fr_FR/compta.lang
@@ -246,12 +246,12 @@ TurnoverPerProductInCommitmentAccountingNotRelevant=Le rapport de chiffre d'affa
 TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=Le rapport de Chiffre d'affaires encaissé par taux de TVA n'est pas disponible. Ce rapport est uniquement disponible pour le chiffre d'affaires facturé.
 CalculationMode=Mode de calcul
 AccountancyJournal=Code journal comptable
-ACCOUNTING_VAT_SOLD_ACCOUNT=Compte (du plan comptable) à utiliser comme compte par défaut pour la TVA sur les ventes (utilisé s'il n'est pas défini dans la configuration du dictionnaire TVA)
-ACCOUNTING_VAT_BUY_ACCOUNT=Compte (du plan comptable) à utiliser comme compte par défaut pour la TVA sur les achats (utilisé s'il n'est pas défini dans la configuration du dictionnaire TVA)
-ACCOUNTING_VAT_PAY_ACCOUNT=Compte (du plan comptable) à utiliser comme compte par défaut pour le paiement de la TVA
-ACCOUNTING_ACCOUNT_CUSTOMER=Compte (du plan comptable) utilisé pour les tiers "clients"
+ACCOUNTING_VAT_SOLD_ACCOUNT=Compte comptable à utiliser comme compte par défaut pour la TVA sur les ventes (utilisé s'il n'est pas défini dans la configuration du dictionnaire TVA)
+ACCOUNTING_VAT_BUY_ACCOUNT=Compte comptable à utiliser comme compte par défaut pour la TVA sur les achats (utilisé s'il n'est pas défini dans la configuration du dictionnaire TVA)
+ACCOUNTING_VAT_PAY_ACCOUNT=Compte comptable à utiliser comme compte par défaut pour le paiement de la TVA
+ACCOUNTING_ACCOUNT_CUSTOMER=Compte comptable utilisé pour les tiers "clients"
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Le compte comptable dédié défini sur la fiche tiers sera utilisé pour l'affectation du compte auxiliaire uniquement. Celui-ci sera utilisé pour la comptabilité générale et comme valeur par défaut de la comptabilité auxiliaire si le compte comptable client dédié du ties n'est pas défini. 
-ACCOUNTING_ACCOUNT_SUPPLIER=Compte (du Plan Comptable) utilisé pour les tiers "fournisseurs"
+ACCOUNTING_ACCOUNT_SUPPLIER=Compte comptable utilisé pour les tiers "fournisseurs"
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Le compte de comptabilité dédié défini sur la fiche Tiers sera utilisé pour la comptabilité auxiliaire uniquement. Celui-ci sera utilisé pour le grand livre et comme valeur par défaut de la comptabilité auxiliaire si le compte de comptabilité fournisseur dédié au tiers n'est pas défini.
 ConfirmCloneTax=Confirmer le clonage de la charge sociale/fiscale
 ConfirmCloneVAT=Confirmer le clonage d'une déclaration de TVA
diff --git a/htdocs/langs/fr_FR/contracts.lang b/htdocs/langs/fr_FR/contracts.lang
index 7d6bfc6f2e0..3aa7c41617a 100644
--- a/htdocs/langs/fr_FR/contracts.lang
+++ b/htdocs/langs/fr_FR/contracts.lang
@@ -101,7 +101,6 @@ TypeContact_contrat_external_BILLING=Contact client facturation contrat
 TypeContact_contrat_external_CUSTOMER=Contact client suivi contrat
 TypeContact_contrat_external_SALESREPSIGN=Contact client signataire contrat
 HideClosedServiceByDefault=Masquer les services fermés par défaut
-AllowOnlineSign=Autoriser la signature en ligne
 ShowClosedServices=Afficher les services fermés
 HideClosedServices=Masquer les services fermés
 UserStartingService=Utilisateur démarrant le service
diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
index 558f9ce9ce1..9d27c0e671b 100644
--- a/htdocs/langs/fr_FR/errors.lang
+++ b/htdocs/langs/fr_FR/errors.lang
@@ -303,6 +303,7 @@ ErrorValueForTooLow=La valeur pour <b>%s</b> est trop faible
 ErrorValueCantBeNull=La valeur pour <b>%s</b> ne peut pas être nulle
 ErrorDateOfMovementLowerThanDateOfFileTransmission=La date de l'opération bancaire ne peut être inférieure à la date de transmission du fichier
 ErrorTooMuchFileInForm=Trop de fichiers dans le formulaire, le nombre maximum est de %s fichier(s)
+ErrorSessionInvalidatedAfterPasswordChange=La session a été invalidée suite à un changement de mot de passe, d'état ou de dates de validité. Veuillez vous reconnecter.
 
 # 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.
@@ -324,7 +325,8 @@ WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Fonction désactivée qua
 WarningPaymentDateLowerThanInvoiceDate=La date de paiement (%s) est inférieure à la date de facturation (%s) de la facture %s.
 WarningTooManyDataPleaseUseMoreFilters=Trop de données (plus de %s lignes). Utilisez davantage de filtres ou régler la constante %s pour augmenter la limite à une valeur plus élevée.
 WarningSomeLinesWithNullHourlyRate=Des temps ont été enregistrés par des utilisateurs lorsque leur taux horaire n'était défini. Une valeur de 0 %s a été utilisée, mais cela peut entraîner une mauvaise évaluation du temps passé.
-WarningYourLoginWasModifiedPleaseLogin=Votre identifiant a été modifié. Par sécurité, vous devrez vous identifier avec votre nouvel identifiant avant la prochaine action.
+WarningYourLoginWasModifiedPleaseLogin=Votre identifiant a été modifié. Par sécurité, vous devrez vous identifier avec votre nouvel identifiant avant l'action suivante.
+WarningYourPasswordWasModifiedPleaseLogin=Votre mot de passe a été modifié. Pour des raisons de sécurité, vous devez vous connecter maintenant avec votre nouveau mot de passe.
 WarningAnEntryAlreadyExistForTransKey=Une donnée identique existe déjà pour la traduction du code dans cette langue
 WarningNumberOfRecipientIsRestrictedInMassAction=Attention, le nombre de destinataires différents est limité à <b>%s</b> lorsque vous utilisez les actions en masse sur les listes
 WarningDateOfLineMustBeInExpenseReportRange=Attention, la date de la ligne n'est pas dans la plage de la note de frais
diff --git a/htdocs/langs/fr_FR/eventorganization.lang b/htdocs/langs/fr_FR/eventorganization.lang
index a428430c102..8caeb49c807 100644
--- a/htdocs/langs/fr_FR/eventorganization.lang
+++ b/htdocs/langs/fr_FR/eventorganization.lang
@@ -172,3 +172,5 @@ ErrorSeveralCompaniesWithEmailContactUs=Plusieurs entreprises avec cet email ont
 ErrorSeveralCompaniesWithNameContactUs=Plusieurs sociétés portant ce nom ont été trouvées, nous ne pouvons donc pas valider automatiquement votre inscription. Veuillez nous contacter à %s pour une validation manuelle
 NoPublicActionsAllowedForThisEvent=Aucune action publique n'est ouverte au public pour cet événement
 MaxNbOfAttendees=Nombre maximum de participants
+DateStartEvent=Date de début de l'événement
+DateEndEvent=Date de fin de l'événement
diff --git a/htdocs/langs/fr_FR/holiday.lang b/htdocs/langs/fr_FR/holiday.lang
index bca4ba1dd2d..642a67cb11c 100644
--- a/htdocs/langs/fr_FR/holiday.lang
+++ b/htdocs/langs/fr_FR/holiday.lang
@@ -149,10 +149,10 @@ XIsAUsualNonWorkingDay=%s est généralement un jour NON ouvrable
 BlockHolidayIfNegative=Bloqué lorsque le solde est négatif
 LeaveRequestCreationBlockedBecauseBalanceIsNegative=La création de cette demande de congé est bloquée car votre solde est négatif
 ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=La demande de congé %s doit être brouillon, annulée ou refusée pour être supprimée
-IncreaseHolidays=Augmenter le nombre de jours de vacances
-HolidayRecordsIncreased= %s registres de vacances augmentés
-HolidayRecordIncreased=Registre de vacances augmenté
-ConfirmMassIncreaseHoliday=Augmentation en masse des vacances
+IncreaseHolidays=Augmenter le solde des congés
+HolidayRecordsIncreased= %s soldes de congés augmentés
+HolidayRecordIncreased=Solde des congés augmenté
+ConfirmMassIncreaseHoliday=Augmentation massive du solde des congés
 NumberDayAddMass=Nombre de jours à ajouter à la sélection
 ConfirmMassIncreaseHolidayQuestion=Êtes-vous sûr de vouloir augmenter les vacances du ou des enregistrement(s) sélectionnés %s ?
 HolidayQtyNotModified=Le solde des jours restants pour %s n'a pas été modifié
diff --git a/htdocs/langs/fr_FR/languages.lang b/htdocs/langs/fr_FR/languages.lang
index 168b938f1cd..db6594f3a46 100644
--- a/htdocs/langs/fr_FR/languages.lang
+++ b/htdocs/langs/fr_FR/languages.lang
@@ -24,7 +24,7 @@ Language_de_DE=Allemand
 Language_de_AT=Allemand (Autriche)
 Language_de_CH=Allemand (Suisse)
 Language_de_LU=Allemand (Luxembourg)
-Language_el_GR=Grèque
+Language_el_GR=Grec
 Language_el_CY=Grec (Chypre)
 Language_en_AE=Anglais  (EAU)
 Language_en_AU=Anglais (Australie)
diff --git a/htdocs/langs/fr_FR/loan.lang b/htdocs/langs/fr_FR/loan.lang
index ba9e734d14c..8d71881dadf 100644
--- a/htdocs/langs/fr_FR/loan.lang
+++ b/htdocs/langs/fr_FR/loan.lang
@@ -28,7 +28,7 @@ CantUseScheduleWithLoanStartedToPaid = Impossible de générer un échéancier p
 CantModifyInterestIfScheduleIsUsed = Vous ne pouvez pas modifier l'intérêt si vous utilisez le calendrier
 # Admin
 ConfigLoan=Configuration du module Emprunt
-LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Compte (du plan comptable) à utiliser par défaut pour le capital (module Prêt)
-LOAN_ACCOUNTING_ACCOUNT_INTEREST=Compte (du plan comptable) à utiliser par défaut pour les intérêts (module Prêt)
-LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Compte (du plan comptable) à utiliser par défaut pour l'assurance (module Prêt)
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Compte comptable à utiliser par défaut pour le capital (module emprunt)
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Compte comptable à utiliser par défaut pour les intérêts (module emprunt)
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Compte comptable à utiliser par défaut pour l'assurance (module emprunt)
 CreateCalcSchedule=Créer / Modifier échéancier de prêt
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index f6062f39db3..d809f719a7b 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -226,6 +226,7 @@ NoUserGroupDefined=Pas de groupe utilisateur défini
 Password=Mot de passe
 PasswordRetype=Ressaisir le mot de passe
 NoteSomeFeaturesAreDisabled=Notez que de nombreuses fonctionnalités ne sont pas activées sur le site de démonstration.
+YourUserFile=Votre fiche utilisateur
 Name=Nom
 NameSlashCompany=Nom / Société
 Person=Personne
@@ -322,7 +323,7 @@ DurationDays=jours
 Year=Année
 Month=Mois
 Week=Semaine
-WeekShort=Semaine
+WeekShort=Sem.
 Day=Jour
 Hour=Heure
 Minute=Minute
@@ -897,6 +898,9 @@ MassFilesArea=Zone des fichiers générés en masse
 ShowTempMassFilesArea=Afficher la zone des fichiers générés en masse
 ConfirmMassDeletion=Confirmation de suppression en masse
 ConfirmMassDeletionQuestion=Êtes-vous sur de vouloir supprimer les %s enregistrement(s) sélectionné(s) ?
+ConfirmMassClone=Confirmation de clonage en masse
+ConfirmMassCloneQuestion=Sélectionner le projet vers lequel cloner
+ConfirmMassCloneToOneProject=Cloner vers le projet %s
 RelatedObjects=Objets liés
 ClassifyBilled=Classer facturé
 ClassifyUnbilled=Classer non facturé
@@ -912,8 +916,8 @@ ExportFilteredList=Exporter liste filtrée
 ExportList=Exporter liste
 ExportOptions=Options d'export
 IncludeDocsAlreadyExported=Inclure les documents déjà exportés
-ExportOfPiecesAlreadyExportedIsEnable=L'exportation de pièces déjà exportées est activée
-ExportOfPiecesAlreadyExportedIsDisable=L'exportation des pièces déjà exportées est désactivée
+ExportOfPiecesAlreadyExportedIsEnable=Les documents déjà exportés sont visibles et seront exportés
+ExportOfPiecesAlreadyExportedIsDisable=Les documents déjà exportés sont cachés et ne seront pas exportés
 AllExportedMovementsWereRecordedAsExported=Tous les mouvements exportés ont été enregistrés comme exportés
 NotAllExportedMovementsCouldBeRecordedAsExported=Tous les mouvements exportés n'ont pas pu être enregistrés comme exportés
 Miscellaneous=Divers
@@ -1128,6 +1132,7 @@ DeleteFileText=Voulez-vous vraiment supprimer ce fichier?
 ShowOtherLanguages=Afficher les autres langues
 SwitchInEditModeToAddTranslation=Passer en mode édition pour ajouter des traductions pour cette langue
 NotUsedForThisCustomer=Non utilisé pour ce client
+NotUsedForThisVendor=Non utilisé pour ce fournisseur
 AmountMustBePositive=Le montant doit être positif.
 ByStatus=Par statut
 InformationMessage=Information
@@ -1149,16 +1154,16 @@ UpdateForAllLines=Mise à jour de toutes les lignes
 OnHold=En attente
 Civility=Civilité
 AffectTag=Affecter un tag/catégorie
-AffectUser=Attribuer un utilisateur
+AffectUser=Assigné un utilisateur
 SetSupervisor=Définir le responsable
 CreateExternalUser=Créer utilisateur externe
-ConfirmAffectTag=Attribution de balises en masse
+ConfirmAffectTag=Attribution de tags/catégories en masse
 ConfirmAffectUser=Affectation d'utilisateurs en masse
-ProjectRole=Rôle attribué sur chaque projet
-TasksRole=Rôle attribué sur chaque tâche de chaque projet
+ProjectRole=Rôle affecté à chaque projet/opportunité
+TasksRole=Rôle affecté à chaque tâche (si utilisés)
 ConfirmSetSupervisor=Ensemble de superviseur en vrac
 ConfirmUpdatePrice=Choisissez un taux de prix d'augmentation/diminution
-ConfirmAffectTagQuestion=Voulez-vous vraiment attribuer des balises aux enregistrements sélectionnés %s ?
+ConfirmAffectTagQuestion=Voulez-vous vraiment attribuer des tags/catégories aux enregistrements sélectionnés %s ?
 ConfirmAffectUserQuestion=Voulez-vous vraiment affecter des utilisateurs aux enregistrements sélectionnés %s ?
 ConfirmSetSupervisorQuestion=Êtes-vous sûr de vouloir définir le superviseur sur le ou les enregistrements sélectionnés %s ?
 ConfirmUpdatePriceQuestion=Voulez-vous vraiment mettre à jour le prix du ou des enregistrements %s sélectionnés ?
@@ -1210,3 +1215,10 @@ CreatedByPublicPortal=Créé à partir du portail public
 UserAgent=User Agent
 InternalUser=Utilisateur interne
 ExternalUser=Utilisateur externe
+NoSpecificContactAddress=Pas de contact ou d'adresse spécifique
+NoSpecificContactAddressBis=Cet onglet est spécialement prévu pour forcer des contacts ou adresses spécifiques pour l'objet courant. Ne l'utilisez que dans les cas où vous souhaitez définir des contacts ou adresses spécifiques pour l'objet parce que les informations du tiers est incomplète ou inexacte.
+HideOnVCard=Cacher %s
+AddToContacts=Ajouter l'adresse à mes contacts
+LastAccess=Dernier accès
+UploadAnImageToSeeAPhotoHere=Téléverser une image depuis l'onglet %s pour afficher une image ici
+LastPasswordChangeDate=Date du dernier changement de mot de passe
diff --git a/htdocs/langs/fr_FR/mrp.lang b/htdocs/langs/fr_FR/mrp.lang
index 557b1f09175..26942e14743 100644
--- a/htdocs/langs/fr_FR/mrp.lang
+++ b/htdocs/langs/fr_FR/mrp.lang
@@ -11,7 +11,7 @@ Bom=Nomenclatures produits (BOM)
 BillOfMaterials=Nomenclature BOM
 BillOfMaterialsLines=Lignes de nomenclature
 BOMsSetup=Configuration du module BOM
-ListOfBOMs=Nomenclatures - Nomenclature
+ListOfBOMs=Nomenclatures - BOM
 ListOfManufacturingOrders=Ordres Fabrication
 NewBOM=Nouveau BOM
 ProductBOMHelp=Produit à créer (ou désassembler) avec cette nomenclature. <br> Remarque: les produits avec la propriété 'Nature de produit' = 'Matière première' ne sont pas visibles dans cette liste.
@@ -102,6 +102,7 @@ NbOperatorsRequired=Nombre d'opérateurs requis
 THMOperatorEstimated=THM estimé de l'opérateur
 THMMachineEstimated=THM machine estimé
 WorkstationType=Type de poste de travail
+DefaultWorkstation=Poste de travail par défaut
 Human=Humain
 Machine=Machine
 HumanMachine=Humain/machine
diff --git a/htdocs/langs/fr_FR/orders.lang b/htdocs/langs/fr_FR/orders.lang
index 06c090a5f30..b58352c8c7b 100644
--- a/htdocs/langs/fr_FR/orders.lang
+++ b/htdocs/langs/fr_FR/orders.lang
@@ -96,6 +96,10 @@ OrdersStatisticsSuppliers=Statistiques des commandes fournisseurs
 NumberOfOrdersByMonth=Nombre de commandes par mois
 AmountOfOrdersByMonthHT=Montant total de commandes par mois (HT)
 ListOfOrders=Liste des commandes
+ListOrderLigne=Lignes de commandes
+productobuy=Produits à l'achat uniquement
+productonly=Produits seulement
+disablelinefree=Pas de ligne libre
 CloseOrder=Clôturer commande
 ConfirmCloseOrder=Êtes-vous sûr de vouloir classer cette commande à Délivrée ? Une fois une commande délivrée, elle peut aussi être passée à facturée.
 ConfirmDeleteOrder=Êtes-vous sûr de vouloir effacer cette commande ?
@@ -131,6 +135,7 @@ SupplierOrderClassifiedBilled=Commande fournisseur %s classée facturée
 OtherOrders=Autres commandes
 SupplierOrderValidatedAndApproved=Commande fournisseur validée et approuvée : %s
 SupplierOrderValidated=Commande fournisseur validée : %s
+OrderShowDetail=Afficher les détails de la commande
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Responsable suivi commande client
 TypeContact_commande_internal_SHIPPING=Responsable envoi commande client
@@ -199,3 +204,5 @@ StatusSupplierOrderApproved=Approuvé
 StatusSupplierOrderRefused=Refusé
 StatusSupplierOrderReceivedPartially=Reçue partiellement
 StatusSupplierOrderReceivedAll=Tous les produits reçus
+NeedAtLeastOneInvoice = Au moins une commande doit être présente
+LineAlreadyDispatched = La ligne de commande a déjà été réceptionnée.
diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang
index ed91bb7707e..0a5d3f3f8ad 100644
--- a/htdocs/langs/fr_FR/products.lang
+++ b/htdocs/langs/fr_FR/products.lang
@@ -315,7 +315,7 @@ GlobalVariableUpdaterHelpFormat1=Le format est {"URL": "http://example.com/urlof
 UpdateInterval=Intervale de mise à jour (minutes)
 LastUpdated=Dernière mise à jour
 CorrectlyUpdated=Mise à jour avec succès
-PropalMergePdfProductActualFile=Fichiers utilisés pour l'ajout au PDF des devis sont
+PropalMergePdfProductActualFile=Fichiers utilisés pour l'ajout au PDF Azur sont
 PropalMergePdfProductChooseFile=Sélectionnez les fichiers PDF
 IncludingProductWithTag=Comprenant des produits/services avec le tag/catégorie
 DefaultPriceRealPriceMayDependOnCustomer=Prix ​​par défaut, le prix réel peut dépendre du client
diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang
index d3f7edb1e85..ba39ce47dc2 100644
--- a/htdocs/langs/fr_FR/projects.lang
+++ b/htdocs/langs/fr_FR/projects.lang
@@ -259,6 +259,7 @@ RecordsClosed=%s projet(s) fermé(s)
 SendProjectRef=A propos du projet %s
 ModuleSalaryToDefineHourlyRateMustBeEnabled=Le module 'Paiement des salaires des employés' doit être activé pour définir le taux horaire des employés afin de valoriser le temps passé
 NewTaskRefSuggested=Réf de tâche déjà utilisée, une nouvelle référence de tâche est requise
+NumberOfTasksCloned=%s tâche·s clonées
 TimeSpentInvoiced=Temps passé facturé
 TimeSpentForIntervention=Temps consommé
 TimeSpentForInvoice=Temps consommés
diff --git a/htdocs/langs/fr_FR/salaries.lang b/htdocs/langs/fr_FR/salaries.lang
index 9b89cf2fb68..939f83f96c6 100644
--- a/htdocs/langs/fr_FR/salaries.lang
+++ b/htdocs/langs/fr_FR/salaries.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - salaries
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Compte (issu du Plan Comptable) utilisé par défaut pour les tiers "utilisateurs"
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=Le compte dédié défini sur la carte utilisateur sera utilisé uniquement pour la comptabilité Subledger. Celui-ci sera utilisé pour le grand livre et comme valeur par défaut de la comptabilité auxiliaire si le compte de comptabilité utilisateur dédié à l'utilisateur n'est pas défini.
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Compte comptable utilisé par défaut pour les tiers "utilisateurs"
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=Le compte dédié défini sur la fiche utilisateur sera utilisé en tant que compte comptable de tiers (Compte auxiliaire).
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Compte comptable par défaut pour les paiements de salaires
 CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=Par défaut, laissez vide l’option "Créer automatiquement un paiement complet" lors de la création d’un salaire
 Salary=Salaire
diff --git a/htdocs/langs/fr_FR/stripe.lang b/htdocs/langs/fr_FR/stripe.lang
index 07bacfaf054..629b3d16bea 100644
--- a/htdocs/langs/fr_FR/stripe.lang
+++ b/htdocs/langs/fr_FR/stripe.lang
@@ -41,7 +41,8 @@ STRIPE_LIVE_WEBHOOK_KEY=Clé live des Webhooks
 ONLINE_PAYMENT_WAREHOUSE=Stock à utiliser pour diminuer le stock lorsque le paiement en ligne est effectué <br> (TODO Quand l'option de réduction de stock est effectuée sur une action sur facture et que le paiement en ligne génère lui-même la facture?)
 StripeLiveEnabled=Mode live activé (sinon mode test/bac a sable)
 StripeImportPayment=Importer paiements Stripe
-ExampleOfTestCreditCard=Exemple de carte de crédit pour le test: %s => valide, %s => erreur CVC, %s => expiré, %s => paiement en échec
+ExampleOfTestCreditCard=Exemple de carte de crédit pour le test SEPA : %s => valide, %s => erreur CVC, %s => expirée, %s => débit refusé
+ExampleOfTestBankAcountForSEPA=Example de numéro de compte en banque (BAN) pour le test de débit direct : %s
 StripeGateways=Stripe gateways
 OAUTH_STRIPE_TEST_ID=Stripe Connect ID client (ca _...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect ID client (ca _...)
@@ -70,5 +71,8 @@ ToOfferALinkForLiveWebhook=Lien pour la configuration de Stripe WebHook pour app
 PaymentWillBeRecordedForNextPeriod=Le paiement sera enregistré pour la prochaine période.
 ClickHereToTryAgain=<a href="%s">Cliquez ici pour essayer à nouveau...</a>
 CreationOfPaymentModeMustBeDoneFromStripeInterface=En raison des règles d'Authentification Client Forte, la création d'une carte doit être effectuée à partir du backoffice de Stripe. Vous pouvez cliquer ici pour basculer sur la fiche client Stripe: %s
-TERMINAL_LOCATION=Emplacement (adresse) des terminaux
+STRIPE_CARD_PRESENT=Carte présente pour les terminaux Stripe
+TERMINAL_LOCATION=Localisation (adresse) pour les terminaux Stripe
 RequestDirectDebitWithStripe=Demander un prélèvement automatique avec Stripe
+STRIPE_SEPA_DIRECT_DEBIT=Activer les paiements par débit direct avec Stripe
+
diff --git a/htdocs/langs/fr_FR/ticket.lang b/htdocs/langs/fr_FR/ticket.lang
index e86f35a52ba..f33c00f2143 100644
--- a/htdocs/langs/fr_FR/ticket.lang
+++ b/htdocs/langs/fr_FR/ticket.lang
@@ -19,13 +19,14 @@
 #
 
 Module56000Name=Gestionnaire de tickets
-Module56000Desc=Gestionnaire de tickets d'assistance ou de gestion de demandes internes/clients/fournisseurs
+Module56000Desc=Gestionnaire de tickets ou de gestion de demandes internes/clients/fournisseurs
 
 Permission56001=Voir tickets
 Permission56002=Modifier des tickets
 Permission56003=Supprimer tickets
 Permission56004=Gérer les tickets
 Permission56005=Voir les tickets de tous les tiers (non effectif pour les utilisateurs externes, toujours limité au tiers dont ils dépendent)
+Permission56006=Exporter les tickets
 
 Tickets=Tickets
 TicketDictType=Ticket - Types
@@ -61,6 +62,8 @@ TypeContact_ticket_external_CONTRIBUTOR=Contributeur externe
 OriginEmail=Email demandeur
 Notify_TICKET_SENTBYMAIL=Envoi d'un message du ticket par e-mail
 
+ExportDataset_ticket_1=Tickets
+
 # Status
 Read=Lu
 Assigned=Assigné
diff --git a/htdocs/langs/fr_FR/users.lang b/htdocs/langs/fr_FR/users.lang
index 1d2873de4d9..1f55490f476 100644
--- a/htdocs/langs/fr_FR/users.lang
+++ b/htdocs/langs/fr_FR/users.lang
@@ -66,7 +66,8 @@ LinkedToDolibarrUser=Lien vers l'utilisateur
 LinkedToDolibarrThirdParty=Lien vers le tiers
 CreateDolibarrLogin=Créer un compte utilisateur
 CreateDolibarrThirdParty=Créer un tiers
-LoginAccountDisableInDolibarr=Le compte est désactivé sur Dolibarr.
+LoginAccountDisableInDolibarr=Compte désactivé dans Dolibarr
+PASSWORDInDolibarr=Mot de passe modifié dans Dolibarr
 UsePersonalValue=Utiliser valeur personnalisée
 ExportDataset_user_1=Utilisateurs et attributs
 DomainUser=Utilisateur du domaine %s
@@ -129,3 +130,6 @@ IPLastLogin=IP dernière connexion
 IPPreviousLogin=Connexion précédente IP
 ShowAllPerms=Afficher toutes les lignes d'autorisation
 HideAllPerms=Masquer toutes les lignes d'autorisation
+UserPublicPageDesc=Vous pouvez activer une carte virtuelle pour cet utilisateur. Une URL avec le profil utilisateur et un code barre sera disponible pour permettre à quiconque muni d'un smartphone de le scanner et d'ajouter le contact à son carnet d'adresse.
+EnablePublicVirtualCard=Activer la fiche utilisateur virtuelle publique
+PublicVirtualCardUrl=Fiche utilisateur virtuelle publique
diff --git a/htdocs/langs/fr_FR/website.lang b/htdocs/langs/fr_FR/website.lang
index da4c702a2cb..8732a9a49a9 100644
--- a/htdocs/langs/fr_FR/website.lang
+++ b/htdocs/langs/fr_FR/website.lang
@@ -155,3 +155,5 @@ WebpageMustBeDisabled=La page Web doit avoir le statut "%s"
 SetWebsiteOnlineBefore=Lorsque le site Web est hors ligne, toutes les pages sont hors ligne. Changez d'abord le statut du site Web.
 Booking=Réservation
 Reservation=Réservation
+PagesViewedPreviousMonth=Pages vues (mois précédent)
+PagesViewedTotal=Pages vues (total)
diff --git a/htdocs/langs/fr_GA/stripe.lang b/htdocs/langs/fr_GA/stripe.lang
new file mode 100644
index 00000000000..ae44362fd94
--- /dev/null
+++ b/htdocs/langs/fr_GA/stripe.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - stripe
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+TERMINAL_LOCATION=Location (address) for Stripe Terminals
diff --git a/htdocs/langs/gl_ES/accountancy.lang b/htdocs/langs/gl_ES/accountancy.lang
index 1bcb5190340..52275ead14b 100644
--- a/htdocs/langs/gl_ES/accountancy.lang
+++ b/htdocs/langs/gl_ES/accountancy.lang
@@ -14,8 +14,8 @@ ACCOUNTING_EXPORT_ENDLINE=Seleccione o tipo de retorno de carro
 ACCOUNTING_EXPORT_PREFIX_SPEC=Especifique o prefixo do nome de ficheiro
 ThisService=Este servizo
 ThisProduct=Este produto
-DefaultForService=Predeterminado para o servizo
-DefaultForProduct=Predeterminado para o produto
+DefaultForService=Predeterminado para os servizos
+DefaultForProduct=Predeterminado para produtos
 ProductForThisThirdparty=Produto para este terceiro
 ServiceForThisThirdparty=Servizo para este terceiro
 CantSuggest=Non pode suxerirse
@@ -101,6 +101,7 @@ ShowAccountingAccount=Amosar contabilidade
 ShowAccountingJournal=Amosar diario contable
 ShowAccountingAccountInLedger=Amosar a conta contable no libro maior
 ShowAccountingAccountInJournals=Amosar a conta contable nos diarios
+DataUsedToSuggestAccount=Datos utilizados para suxerir conta
 AccountAccountingSuggest=Conta contable suxerida
 MenuDefaultAccounts=Contas contables por defecto
 MenuBankAccounts=Contas Bancarias
@@ -126,6 +127,7 @@ WriteBookKeeping=Rexistrar movementos en contabilidade
 Bookkeeping=Libro Maior
 BookkeepingSubAccount=Librp maior auxiliar
 AccountBalance=Saldo da conta
+AccountBalanceSubAccount=Saldo de subcontas
 ObjectsRef=Referencia de obxecto orixe
 CAHTF=Total compras a provedor antes de impostos
 TotalExpenseReport=Total informe de gastos
@@ -189,6 +191,7 @@ ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Conta (do Plan Contable) que se utilizará c
 UseAuxiliaryAccountOnCustomerDeposit=Almacenar a conta do cliente como unha conta individual para as liñas de anicipo no Libro Maior subsidiario (se está desactivada, a conta individual para as liñas de anticipo permanecerá baleira)
 ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Conta (do Plan Contable) que se utilizará como predeterminada
 UseAuxiliaryAccountOnSupplierDeposit=Almacenar a conta do provedor como unha conta individual no libro maior subsidiario para as liñas de anticipo (se está desactivada, a conta individual para as liñas de anticipo permanecerá baleira)
+ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY=Conta contable por defecto para rexistrar a garantía establecida para o cliente
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Conta (do Plan Contable) que se utilizará como conta predeterminada para os produtos adquiridos no mesmo país (utilizada se non está definida na ficha do produto)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Conta (do Plan Contable) que se utilizará como conta predeterminada para os produtos comprados na CEE a outro país da CEE (utilizada se non está definida na ficha do produto)
@@ -218,6 +221,7 @@ JournalLabel=Etiqueta diario
 NumPiece=Apunte
 TransactionNumShort=Núm. transacción
 AccountingCategory=Grupo de contas personalizado
+AccountingCategories=Grupos de contas personalizados
 GroupByAccountAccounting=Agrupar por conta contable
 GroupBySubAccountAccounting=Agrupar por subconta contable
 AccountingAccountGroupsDesc=Pode definir aquí algúns grupos de contas contables. Serán usadas para informes de contabilidade persoalizados.
@@ -265,6 +269,7 @@ ShowSubtotalByGroup=Amosar subtotal por nivel
 
 Pcgtype=Grupo de conta
 PcgtypeDesc=Grupo e subgrupo de conta utilízanse como criterios predefinidos de "filtro" e "agrupación" para algúns informes de contabilidade. Por exemplo, "INGRESOS" ou "GASTOS" usanse como grupos para contas contables de produtos para construir o informe de gastos/ingresos.
+AccountingCategoriesDesc=O grupo de contas personalizado pódese usar para agrupar as contas de contabilidade nun só nome para facilitar o uso de filtros ou a creación de informes personalizados.
 
 Reconcilable=Reconciliable
 
@@ -294,6 +299,7 @@ DescValidateMovements=Prohíbese calquera modificación ou eliminación de rexis
 
 ValidateHistory=Contabilizar automáticamente
 AutomaticBindingDone=Ligazóns automáticas finalizadas (%s) -A ligazón automática non é posible para algún rexistro (%s) 
+DoManualBindingForFailedRecord=Ten que facer unha ligazón manual para a(s) fila(s) %s non ligadas automaticamente.
 
 ErrorAccountancyCodeIsAlreadyUse=Produciuse un erro, non pode eliminar nin desactivar esta conta do plan contable porque está en uso
 MvtNotCorrectlyBalanced=Asento con balance contable incorrecto. Débito = %s e crédito = %s
@@ -337,11 +343,13 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=Desactivar a ligazón e transferencia na con
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Desactivar a ligazón e transferencia na contabilidade das compras (as facturas do provedor non se terán en conta na contabilidade)
 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)
 ACCOUNTING_ENABLE_LETTERING=Activa a función de letras na contabilidade
+ACCOUNTING_ENABLE_AUTOLETTERING=Activa a marcación automática ao transferir á contabilidade
 
 ## Export
 NotExportLettering=Non exporte as letras ao xerar o ficheiro
 NotifiedExportDate=Marcar as liñas exportadas como Exportadas <span class="warning"> (para modificar unha liña, terá que eliminar toda a transacción e transferila de novo á contabilidade) </span>
 NotifiedValidationDate=Validar e bloquear as entradas exportadas <span class="warning"> (o mesmo efecto que a función "%s", a modificación e eliminación das liñas DEFINITIVAMENTE non será posible) </span>
+NotifiedExportFull=Exportar documentos?
 DateValidationAndLock=Data validación e bloqueo
 ConfirmExportFile=Confirmación da xeración do ficheiro de exportación contable? 
 ExportDraftJournal=Exportar libro borrador
@@ -398,7 +406,7 @@ SaleLocal=Venda local
 SaleExport=Venda de exportación
 SaleEEC=Venda na CEE
 SaleEECWithVAT=Vendas na CEE con IVE non nulo, polo que supoñemos que isto non é unha venda intracomunitaria e a conta suxerida é a conta estandar de produto.
-SaleEECWithoutVATNumber=Venda na CEE sen IVE pero non se define o número de identificación do IVE de terceiros. Respondemos á conta do produto para as vendas estándar. Pode corrixir o ID de IVE de terceiros ou a conta do produto se é preciso.
+SaleEECWithoutVATNumber=Venda na CEE sen IVE pero non se define o número de identificación do IVE do terceiro. Voltamos á conta das vendas estándar. Pode corrixir o número de identificación de IVE do terceiro ou cambiar a conta do produto suxerida se é preciso.
 ForbiddenTransactionAlreadyExported=Prohibido: a transacción foi validada e/ou exportada. 
 ForbiddenTransactionAlreadyValidated=Prohibido: a transacción foi validada.
 ## Dictionary
@@ -442,6 +450,7 @@ AccountancyErrorMismatchLetterCode=Erro no código de conciliación
 AccountancyErrorMismatchBalanceAmount=O saldo (%s) non é igual a 0
 AccountancyErrorLetteringBookkeeping=Producíronse erros nas transaccións: %s
 ErrorAccountNumberAlreadyExists=O número contable %s xa existe
+ErrorArchiveAddFile=Non se pode poñer o ficheiro "%s" no arquivo
 
 ## Import
 ImportAccountingEntries=Entradas contables
@@ -468,5 +477,7 @@ FECFormatMulticurrencyCode=Código multidivisa (Idivisa)
 DateExport=Data de exportación
 WarningReportNotReliable=Advertencia, este informe non está baseado no Libro Maior, polo que non contén modificacións manualmente realizadas no Libro Maior. Se o seu diario está actualizado, a vista contable é mais precisa.
 ExpenseReportJournal=Informe de gastos diario
+DocsAlreadyExportedAreExcluded=Exclúense os documentos xa exportados
+ClickToHideAlreadyExportedLines=Prema para ocultar as liñas xa exportadas
 
 NAccounts=%s contas
diff --git a/htdocs/langs/gl_ES/admin.lang b/htdocs/langs/gl_ES/admin.lang
index a45c5ed97ba..325d245ce24 100644
--- a/htdocs/langs/gl_ES/admin.lang
+++ b/htdocs/langs/gl_ES/admin.lang
@@ -645,6 +645,8 @@ Module2300Name=Tarefas programadas
 Module2300Desc=Xestión do traballo programado (alias cron ou chrono taboa)
 Module2400Name=Eventos/Axenda
 Module2400Desc=Siga os eventos ou citas. Deixe que Dolibarr rexistre eventos automáticos co fin de realizar seguimento ou rexistre eventos manuais ou xuntanzas. Este é o módulo principal para unha bona xestión de relacións cos clientes ou provedores.
+Module2430Name=Sistema de calendario de reservas
+Module2430Desc=Proporciona un calendario en liña para que calquera persoa poida reservar citas, segundo intervalos ou dispoñibilidades predefinidos.
 Module2500Name=GED / SGD
 Module2500Desc=Sistema de Xestión de Documentos / Xestión Electrónica de Contidos. Organización automática dos seus documentos xerados o almacenados. Compárta cando o precise.
 Module2600Name=API/Servizos web (servidor SOAP)
@@ -660,6 +662,8 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=Capacidades de conversión GeoIP Maxmind
 Module3200Name=Ficheiros inalterables
 Module3200Desc=Activar o rexistro inalterable de eventos empresarais. Os eventos arquívanse en tempo real. O rexistro é unha taboa de sucesos encadeados que poden lerse e exportar. Este módulo pode ser obrigatorio nalgúns países.
+Module3300Name=Diseñador de módulos
+Module3200Desc=Activar o rexistro inalterable de eventos empresarais. Os eventos arquívanse en tempo real. O rexistro é unha taboa de sucesos encadeados que poden lerse e exportar. Este módulo pode ser obrigatorio nalgúns países.
 Module3400Name=Redes sociais
 Module3400Desc=Active os campos das redes sociais en terceiros e enderezos (skype, twitter, facebook, ...).
 Module4000Name=RRHH
@@ -1270,6 +1274,7 @@ TriggerActiveAsModuleActive=Triggers deste ficheiro activos posto que o módulo
 GeneratedPasswordDesc=Indique aquí que norma quere utilizar para xerar as contrasinais cando precise xerar un novo contrasinal
 DictionaryDesc=Inserte aquí os datos de referencia. Pode engadir os seus datos aos predefinidos.
 ConstDesc=Esta páxina permítelle editar (substituír) parámetros non dispoñibles noutras páxinas. Estes son principalmente parámetros reservados só para desenvolvedores ou solución avanzadas de problemas.
+MiscellaneousOptions=Opcións varias
 MiscellaneousDesc=Todos os outros parámetros relacionados coa seguridad definense aquí.
 LimitsSetup=Configuración de límites e precisións
 LimitsDesc=Pode definir aquí os límites e precisións utilizados por Dolibarr
@@ -1826,6 +1831,9 @@ AGENDA_USE_EVENT_TYPE=Usar tipos de eventos (xestionados no menú Configuración
 AGENDA_USE_EVENT_TYPE_DEFAULT=Definir automaticamente este valor predeterminado para o tipo de evento no formulario de creación de eventos
 AGENDA_DEFAULT_FILTER_TYPE=Establecer automaticamente este tipo de eventos no filtro de busca da vista de axenda
 AGENDA_DEFAULT_FILTER_STATUS=Establecer automaticamente este estado para eventos no filtro de busca da vista de axenda
+AGENDA_EVENT_PAST_COLOR=Cor do evento pasado
+AGENDA_EVENT_CURRENT_COLOR=Cor do evento actual
+AGENDA_EVENT_FUTURE_COLOR=Cor do evento futuro
 AGENDA_DEFAULT_VIEW=Cal vista desexa abrir de xeito predeterminado ao seleccionar o menú Axenda
 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
@@ -2129,6 +2137,7 @@ CodeLastResult=Código de resultado máis recente
 NbOfEmailsInInbox=Número de correos electrónicos no directorio de orixe
 LoadThirdPartyFromName=Cargar busca de terceiros en %s (só cargar)
 LoadThirdPartyFromNameOrCreate=Cargar a busca de terceiros en %s (crea se non se atopa)
+LoadContactFromEmailOrCreate=Cargar contacto buscando en %s (crear se non se atopa)
 AttachJoinedDocumentsToObject=Garda os ficheiros axuntos en documentos de obxecto se se atopa unha referencia dun obxecto no asunto do correo electrónico.
 WithDolTrackingID=Mensaxe dunha conversa iniciada por un primeiro correo electrónico enviado desde Dolibarr
 WithoutDolTrackingID=Mensaxe dunha conversa iniciada por un primeiro correo electrónico NON enviado desde Dolibarr
@@ -2355,3 +2364,5 @@ AllowExternalDownload=Permitir descarga externa (sen iniciar sesión, usando unh
 DeadlineDayVATSubmission=Día límite para a presentación de IVE no mes seguinte
 MaxNumberOfAttachementOnForms=Número máximo de ficheiros unidos nun formulario
 IfDefinedUseAValueBeetween=Se está definido, use un valor entre %s e %s
+Reload=Recarga
+ConfirmReload=Confirmar recarga do módulo
diff --git a/htdocs/langs/gl_ES/boxes.lang b/htdocs/langs/gl_ES/boxes.lang
index 3f7b5a246e8..31a4f631c89 100644
--- a/htdocs/langs/gl_ES/boxes.lang
+++ b/htdocs/langs/gl_ES/boxes.lang
@@ -24,6 +24,7 @@ BoxFicheInter=Últimas intervencións
 BoxCurrentAccounts=Balance de contas abertas
 BoxTitleMemberNextBirthdays=Cumpreanos neste mes (Membros)
 BoxTitleMembersByType=Membros por tipo e estado
+BoxTitleMembersByTags=Membros por etiquetas e estado
 BoxTitleMembersSubscriptionsByYear=Subscricións de membros por ano 
 BoxTitleLastRssInfos=Últimas %s novas de %s
 BoxTitleLastProducts=Produtos/Servizos: Últimos %s modificados
diff --git a/htdocs/langs/gl_ES/companies.lang b/htdocs/langs/gl_ES/companies.lang
index 8061a2900be..10518100b75 100644
--- a/htdocs/langs/gl_ES/companies.lang
+++ b/htdocs/langs/gl_ES/companies.lang
@@ -312,12 +312,12 @@ CustomerRelativeDiscountShort=Desconto relativo
 CustomerAbsoluteDiscountShort=Desconto fixo
 CompanyHasRelativeDiscount=Este cliente ten un desconto por defecto de <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Este cliente non ten descontos relativos por defecto
-HasRelativeDiscountFromSupplier=Ten un desconto predeterminado de <b> %s%%</b> neste provedor
-HasNoRelativeDiscountFromSupplier=Non ten desconto relativo predeterminado neste provedor
+HasRelativeDiscountFromSupplier=Ten un desconto predeterminado de <b> %s%% </b> con este provedor
+HasNoRelativeDiscountFromSupplier=Non hai desconto relativo predeterminado neste provedor
 CompanyHasAbsoluteDiscount=Este cliente ten descontos (abonos ou anticipos) dispoñibles para <b>%s %s</b>
 CompanyHasDownPaymentOrCommercialDiscount=Este cliente ten descontos dispoñibles (anticipos, comerciais) para <b>%s</b> %s
 CompanyHasCreditNote=Este cliente ten anticipos dispoñibles en <b>%s %s</b>
-HasNoAbsoluteDiscountFromSupplier=Non ten ningún crédito de desconto dispoñible neste provedor
+HasNoAbsoluteDiscountFromSupplier=Non hai desconto/crédito dispoñible deste vendedor
 HasAbsoluteDiscountFromSupplier=Ten descontos dispoñibles (notas de créditos ou anticipos) para <b> %s </b> %s deste provedor
 HasDownPaymentOrCommercialDiscountFromSupplier=Ten descontos dispoñibles (comerciais, anticipos) para <b> %s </b> %s deste provedor
 HasCreditNoteFromSupplier=Ten abonos para <b> %s </b> %s deste provedor
@@ -444,7 +444,7 @@ AddAddress=Engadir enderezo
 SupplierCategory=Categoría de provedor
 JuridicalStatus200=Independente
 DeleteFile=Eliminación dun ficheiro
-ConfirmDeleteFile=¿Está certo de querer eliminar este ficheiro?
+ConfirmDeleteFile=Está certo de querer eliminar este ficheiro <b> %s </b>?
 AllocateCommercial=Asignado a comercial
 Organization=Organización
 FiscalYearInformation=Ano fiscal
@@ -498,3 +498,8 @@ RestOfEurope=Resto de Europa (EEC)
 OutOfEurope=Fora de Europa (EEC)
 CurrentOutstandingBillLate=Factura actual pendente atrasada
 BecarefullChangeThirdpartyBeforeAddProductToInvoice=Ter coidado, dependendo da configuración do prezo do produto, debería mudarse o terceiro antes de engadir o produto ao TPV.
+EmailAlreadyExistsPleaseRewriteYourCompanyName=o correo electrónico xa existe, reescriba o nome da súa empresa
+TwoRecordsOfCompanyName=existe máis dun rexistro para esta empresa, póñase en contacto connosco para completar a súa solicitude de asociación
+CompanySection=Sección empresa
+ShowSocialNetworks=Amosar redes sociais
+HideSocialNetworks=Ocultar redes sociais
diff --git a/htdocs/langs/gl_ES/errors.lang b/htdocs/langs/gl_ES/errors.lang
index 06f0cd7f434..a9add42b94d 100644
--- a/htdocs/langs/gl_ES/errors.lang
+++ b/htdocs/langs/gl_ES/errors.lang
@@ -303,6 +303,7 @@ ErrorValueForTooLow=O valor de <b> %s </b> é demasiado baixo
 ErrorValueCantBeNull=O valor para <b> %s </b> non pode ser nulo
 ErrorDateOfMovementLowerThanDateOfFileTransmission=A data da transacción bancaria non pode ser inferior á data de transmisión do ficheiro
 ErrorTooMuchFileInForm=Hai demasiados ficheiros no formulario, o número máximo é %s ficheiro(s)
+ErrorSessionInvalidatedAfterPasswordChange=A sesión foi invalidada despois do cambio de contrasinal, estado ou datas de validez. Reinicie sesión.
 
 # 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.
@@ -325,6 +326,7 @@ WarningPaymentDateLowerThanInvoiceDate=A data de pagamento (%s) é anterior á d
 WarningTooManyDataPleaseUseMoreFilters=Datos de mais (máis de %s liñas). Utilice máis filtros ou estableza a constante %s nun límite máis alto.
 WarningSomeLinesWithNullHourlyRate=Algunhas veces algúns usuarios rexistráronse mentres a súa tarifa por hora non estaba definida. Utilizouse un valor do 0 %s por hora, pero isto pode resultar nunha avaliación incorrecta do tempo empregado.
 WarningYourLoginWasModifiedPleaseLogin=Modificouse o seu inicio de sesión. Por motivos de seguridade, terá que iniciar sesión co novo inicio de sesión antes da seguinte acción.
+WarningYourPasswordWasModifiedPleaseLogin=O seu contrasinal foi modificado. Por motivos de seguridade, terá que iniciar sesión agora co seu novo contrasinal.
 WarningAnEntryAlreadyExistForTransKey=Xa existe unha entrada para a clave de tradución para este idioma
 WarningNumberOfRecipientIsRestrictedInMassAction=Aviso, o número de destinatarios diferentes está limitado a <b>%s</b> cando se usan as accións masivas nas listaxes
 WarningDateOfLineMustBeInExpenseReportRange=Aviso, a data da liña non está no rango do informe de gastos
diff --git a/htdocs/langs/gl_ES/eventorganization.lang b/htdocs/langs/gl_ES/eventorganization.lang
index 0899a9ef2aa..348a6227083 100644
--- a/htdocs/langs/gl_ES/eventorganization.lang
+++ b/htdocs/langs/gl_ES/eventorganization.lang
@@ -172,3 +172,5 @@ ErrorSeveralCompaniesWithEmailContactUs=Atopáronse varias empresas con este cor
 ErrorSeveralCompaniesWithNameContactUs=Atopáronse varias empresas con este nome polo que non podemos validar automaticamente a súa inscrición. Póñase en contacto connosco en %s para unha validación manual 
 NoPublicActionsAllowedForThisEvent=Non hai accións públicas abertas ao público para este evento 
 MaxNbOfAttendees=Número máximo de asistentes
+DateStartEvent=Data de inicio do evento
+DateEndEvent=Data de finalización do evento
diff --git a/htdocs/langs/gl_ES/main.lang b/htdocs/langs/gl_ES/main.lang
index 54f5b211c87..c36035f9294 100644
--- a/htdocs/langs/gl_ES/main.lang
+++ b/htdocs/langs/gl_ES/main.lang
@@ -226,6 +226,7 @@ NoUserGroupDefined=Non hai definido grupo de usuarios
 Password=Contrasinal
 PasswordRetype=Repita o seu contrasinal
 NoteSomeFeaturesAreDisabled=Ten conta que moitos módulos/funcionalidades foron desactivados nesta demo.
+YourUserFile=O seu ficheiro de usuario
 Name=Nome
 NameSlashCompany=Nome / Empresa
 Person=Persoa
@@ -897,6 +898,9 @@ MassFilesArea=Área de ficheiros xerados por accións masivas
 ShowTempMassFilesArea=Amosar área de ficheiros xerados por accións masivas
 ConfirmMassDeletion=Confirmación borrado masivo
 ConfirmMassDeletionQuestion=¿Estás certo de querer eliminar os %s rexistro(s) seleccionado(s)?
+ConfirmMassClone=Confirmación de clonación masiva
+ConfirmMassCloneQuestion=Seleccione o proxecto para clonar a
+ConfirmMassCloneToOneProject=Clonar o proxecto %s
 RelatedObjects=Obxectos relacionados
 ClassifyBilled=Clasificar facturado
 ClassifyUnbilled=Clasificar non facturado
@@ -912,8 +916,8 @@ ExportFilteredList=Listaxe filtrado de exportación
 ExportList=Listaxe de exportación
 ExportOptions=Opcións de exportación
 IncludeDocsAlreadyExported=Incluir documentos xa exportados
-ExportOfPiecesAlreadyExportedIsEnable=Exportar pezas xa exportadas está activado
-ExportOfPiecesAlreadyExportedIsDisable=Exportar pezas xa exportadas está desactivado
+ExportOfPiecesAlreadyExportedIsEnable=Os documentos xa exportados están visibles e exportaranse
+ExportOfPiecesAlreadyExportedIsDisable=Os documentos xa exportados están ocultos e non se exportarán
 AllExportedMovementsWereRecordedAsExported=Todos os movementos exportados foron rexistrados como exportados
 NotAllExportedMovementsCouldBeRecordedAsExported=Non todos os movementos exportados poden ser rexistrados como exportados
 Miscellaneous=Miscelánea
@@ -1128,6 +1132,7 @@ DeleteFileText=Está certo de querer borrar este ficheiro?
 ShowOtherLanguages=Amosar outras lingoas
 SwitchInEditModeToAddTranslation=Cambie ao modo de edición para engadir traduciáns a esta lingoa
 NotUsedForThisCustomer=Non usado neste cliente
+NotUsedForThisVendor=Non usado para este provedor
 AmountMustBePositive=O importe ten que ser positivo
 ByStatus=By status
 InformationMessage=Información
@@ -1148,14 +1153,14 @@ EventReminder=Recordatorio de evento
 UpdateForAllLines=Actualizar todas as liñas
 OnHold=Agardando
 Civility=Cortesía
-AffectTag=Asignar etiqueta
-AffectUser=Asignar usuario
-SetSupervisor=Configurar Supervisor
+AffectTag=Asignar unha etiqueta
+AffectUser=Asignar un usuario
+SetSupervisor=Establece o supervisor
 CreateExternalUser=Crear usuario externo
 ConfirmAffectTag=Asignación masiva de etiquetas
 ConfirmAffectUser=Asignación masiva de usuarios
-ProjectRole=Papel asignado en cada proxecto
-TasksRole=Papel asignado en cada tarefa de cada proxecto
+ProjectRole=Papel asignado en cada proxecto/oportunidade
+TasksRole=Papel asignado a cada tarefa (se se usa)
 ConfirmSetSupervisor=Configuración masiva de supervisores
 ConfirmUpdatePrice=Escolla un aumento/diminución da taxa de prezo
 ConfirmAffectTagQuestion=Está certo de querer asignar etiquetas aos rexistros seleccionados %s?
@@ -1210,3 +1215,10 @@ CreatedByPublicPortal=Creado a partir do portal público
 UserAgent=Axente de usuario
 InternalUser=Usuario interno
 ExternalUser=Usuario externo
+NoSpecificContactAddress=Sen contacto nin enderezo específico
+NoSpecificContactAddressBis=Esta lapela está dedicada a forzar contactos ou enderezos específicos para o obxecto actual. Utilíce só se quere definir un ou varios contactos ou enderezos específicos para o obxecto cando a información do terceiro non sexa suficiente ou non sexa precisa.
+HideOnVCard=Ocultar %s
+AddToContacts=Engadir enderezo aos meus contactos
+LastAccess=Último acceso
+UploadAnImageToSeeAPhotoHere=Cargue unha imaxe da pestana %s para ver unha foto aquí
+LastPasswordChangeDate=Última data de modificación de contrasinal
diff --git a/htdocs/langs/gl_ES/mrp.lang b/htdocs/langs/gl_ES/mrp.lang
index 631d42bb8ee..71c2483e2aa 100644
--- a/htdocs/langs/gl_ES/mrp.lang
+++ b/htdocs/langs/gl_ES/mrp.lang
@@ -102,6 +102,7 @@ NbOperatorsRequired=Número de operadores precisos
 THMOperatorEstimated=THM estimada operador
 THMMachineEstimated=THM estimada máquina
 WorkstationType=Tipo de estación de traballo
+DefaultWorkstation=Estación de traballo predeterminada
 Human=Humano
 Machine=Máquina
 HumanMachine=Humano/Máquina
diff --git a/htdocs/langs/gl_ES/orders.lang b/htdocs/langs/gl_ES/orders.lang
index 474de37aa95..ed2a1a9f74d 100644
--- a/htdocs/langs/gl_ES/orders.lang
+++ b/htdocs/langs/gl_ES/orders.lang
@@ -96,6 +96,10 @@ OrdersStatisticsSuppliers=Estatísticas de pedimentos a provedor
 NumberOfOrdersByMonth=Número de pedimentos por mes
 AmountOfOrdersByMonthHT=Importe total de pedimentos por mes (sen IVE)
 ListOfOrders=Listaxe de pedimentos
+ListOrderLigne=Liñas de pedimentos
+productobuy=Só produtos para mercar
+productonly=Só produtos
+disablelinefree=Sen liñas libres
 CloseOrder=Pechar pedimento
 ConfirmCloseOrder=¿Está certo de querer clasificar este pedimento como enviado? Una vez enviado un pedimento, solo podrá facturarse
 ConfirmDeleteOrder=¿Está certo de querer eliminar este pedimento?
@@ -131,6 +135,7 @@ SupplierOrderClassifiedBilled=Pedimento a provedor %s facturado
 OtherOrders=Outros pedimentos
 SupplierOrderValidatedAndApproved=A orde do provedor está validada e aprobada: %s
 SupplierOrderValidated=A orde do provedor está validada: %s
+OrderShowDetail=Amosar detalles do pedimento
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Responsable seguimento do pedimento cliente
 TypeContact_commande_internal_SHIPPING=Responsable envío pedimento cliente
@@ -199,3 +204,5 @@ StatusSupplierOrderApproved=Aprobado
 StatusSupplierOrderRefused=Rexeitado
 StatusSupplierOrderReceivedPartially=Recibido parcialmente
 StatusSupplierOrderReceivedAll=Todos os produtos recibidos
+NeedAtLeastOneInvoice = Ten que haber polo menos unha factura
+LineAlreadyDispatched = A liña de pedimento xa está recibida.
diff --git a/htdocs/langs/gl_ES/stripe.lang b/htdocs/langs/gl_ES/stripe.lang
index a661bca00b4..aefbbeb8840 100644
--- a/htdocs/langs/gl_ES/stripe.lang
+++ b/htdocs/langs/gl_ES/stripe.lang
@@ -41,7 +41,8 @@ STRIPE_LIVE_WEBHOOK_KEY=Chave live de Webhook
 ONLINE_PAYMENT_WAREHOUSE=Stock que se usará para diminuír o stock cando se faga o pagamento en liña <br> (TODO Cando se fai a opción de diminuír o stock nunha acción de factura e o pagamento en liña xera a factura?)
 StripeLiveEnabled=Stripe live activado (se non, proba modo sandbox)
 StripeImportPayment=Importar pagamentos de Stripe
-ExampleOfTestCreditCard=Exemplo de tarxeta de crédito para a proba:%s => válido,%s => erro CVC,%s => caducado,%s => falla de carga
+ExampleOfTestCreditCard=Exemplo de tarxeta de crédito para a proba SEPA: %s => válido, %s => erro CVC, %s => caducado, %s => fallo de carga
+ExampleOfTestBankAcountForSEPA=Exemplo de conta bancaria BAN para a proba de domiciliación bancaria: %s
 StripeGateways=Pasarelas de Stripe
 OAUTH_STRIPE_TEST_ID=Id de cliente de Stripe Connect (ca _...)
 OAUTH_STRIPE_LIVE_ID=Id de cliente Stripe Connect (ca _...)
@@ -61,6 +62,7 @@ DeleteACard=Eliminar tarxeta
 ConfirmDeleteCard=Este certo querer eliminar esta tarxeta de Crédito ou Débito?
 CreateCustomerOnStripe=Crear cliente en Stripe
 CreateCardOnStripe=Crear unha tarxeta en Stripe
+CreateBANOnStripe=Crear un banco en Stripe
 ShowInStripe=Amosar en Stripe
 StripeUserAccountForActions=Conta de usuario a utilizar para a notificación por correo electrónico dalgúns eventos de Stripe (pagos de Stripe)
 StripePayoutList=Listaxe de pagamentos de Stripe
@@ -69,4 +71,8 @@ ToOfferALinkForLiveWebhook=Ligazón para configurar Stripe WebHook para chamar a
 PaymentWillBeRecordedForNextPeriod=O pago será rexistrado para o seguinte período.
 ClickHereToTryAgain=<a href="%s"> Faga clic aquí para tentalo de novo ... </a>
 CreationOfPaymentModeMustBeDoneFromStripeInterface=Debido a fortes regras de autenticación do cliente, a creación dunha tarxeta debe facerse desde o backoffice de Stripe. Pode facer clic aquí para activar o rexistro de cliente de Stripe:%s
-TERMINAL_LOCATION=Localización (enderezo) dos terminais
+STRIPE_CARD_PRESENT=Transacción de tarxeta presente para terminais Stripe
+TERMINAL_LOCATION=Localización (enderezo) para terminais Stripe
+RequestDirectDebitWithStripe=Solicite domiciliación bancaria con Stripe
+STRIPE_SEPA_DIRECT_DEBIT=Activa os pagamentos por domiciliación bancaria a través de Stripe
+
diff --git a/htdocs/langs/gl_ES/ticket.lang b/htdocs/langs/gl_ES/ticket.lang
index da768656b3d..85e093b9f1d 100644
--- a/htdocs/langs/gl_ES/ticket.lang
+++ b/htdocs/langs/gl_ES/ticket.lang
@@ -26,6 +26,7 @@ Permission56002=Modificar tickets
 Permission56003=Eliminar tickets
 Permission56004=Administrar tickets
 Permission56005=Ver tickets de todos os terceiros (non aplicable para usuarios externos, sempre estará limitado ao terceiro do que dependen)
+Permission56006=Exportar tickets
 
 Tickets=Tickets
 TicketDictType=Tipo de tickets
@@ -61,6 +62,8 @@ TypeContact_ticket_external_CONTRIBUTOR=Contribuidor externo
 OriginEmail=Correo electrónico do redactor
 Notify_TICKET_SENTBYMAIL=Enviar mensaxe de ticket por e-mail
 
+ExportDataset_ticket_1=Tickets
+
 # Status
 Read=Lido
 Assigned=Asignado
diff --git a/htdocs/langs/gl_ES/users.lang b/htdocs/langs/gl_ES/users.lang
index 54359db27a7..801c125e210 100644
--- a/htdocs/langs/gl_ES/users.lang
+++ b/htdocs/langs/gl_ES/users.lang
@@ -66,7 +66,8 @@ LinkedToDolibarrUser=Ligazón ao usuario
 LinkedToDolibarrThirdParty=Ligazón ao terceiro
 CreateDolibarrLogin=Crear un usuario
 CreateDolibarrThirdParty=Crear un terceiro
-LoginAccountDisableInDolibarr=A conta está desactivada en Dolibarr
+LoginAccountDisableInDolibarr=Conta desactivada en Dolibarr
+PASSWORDInDolibarr=Contrasinal modificado en Dolibarr
 UsePersonalValue=Utilizar valores persoalizados
 ExportDataset_user_1=Usuarios e as súas propiedades.
 DomainUser=Usuario de dominio
@@ -129,3 +130,6 @@ IPLastLogin=IP último inicio de sesión
 IPPreviousLogin=IP de inicio de sesión anterior
 ShowAllPerms=Mostra todas as filas de permisos
 HideAllPerms=Ocultar todas as filas de permisos
+UserPublicPageDesc=Pode activar unha tarxeta virtual para este usuario. Haberá dispoñible un URL co perfil de usuario e un código de barras para que calquera persoa que teña un teléfono intelixente poida escaneala e engadir o seu contacto á súa axenda de enderezos.
+EnablePublicVirtualCard=Activa a tarxeta de usuario virtual pública
+PublicVirtualCardUrl=Tarxeta de usuario virtual pública
diff --git a/htdocs/langs/hi_IN/accountancy.lang b/htdocs/langs/hi_IN/accountancy.lang
index 13a1024d44e..358d35903bc 100644
--- a/htdocs/langs/hi_IN/accountancy.lang
+++ b/htdocs/langs/hi_IN/accountancy.lang
@@ -14,8 +14,8 @@ ACCOUNTING_EXPORT_ENDLINE=परिवहन लागत वापसी प्
 ACCOUNTING_EXPORT_PREFIX_SPEC=फ़ाइल नाम के लिए उपसर्ग निर्दिष्ट करें
 ThisService=यह सेवा
 ThisProduct=यह उत्पाद
-DefaultForService=सेवा के लिए डिफ़ॉल्ट
-DefaultForProduct=उत्पाद के लिए डिफ़ॉल्ट
+DefaultForService=Default for services
+DefaultForProduct=Default for products
 ProductForThisThirdparty=Product for this thirdparty
 ServiceForThisThirdparty=Service for this thirdparty
 CantSuggest=सुझाव नहीं दे सकते
@@ -48,8 +48,9 @@ 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 in CSV and PDFs) that are used to generate your accountancy.
+ExportAccountingSourceDocHelp=With this tool, you can search and export the source events that are used to generate your accountancy. <br>The exported ZIP file will contain the lists of requested items in CSV, as well as their attached files in their original format (PDF, ODT, DOCX...).
 ExportAccountingSourceDocHelp2=To export your journals, use the menu entry %s - %s.
+ExportAccountingProjectHelp=Specify a project if you need an accounting report only for a specific project. Expense reports and loan payments are not included in project reports.
 VueByAccountAccounting=View by accounting account
 VueBySubAccountAccounting=View by accounting subaccount
 
@@ -58,28 +59,29 @@ MainAccountForSuppliersNotDefined=Main accounting account for vendors not define
 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
+UserAccountNotDefined=Accounting account for user not defined in setup
 
 AccountancyArea=लेखा क्षेत्र
 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)
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you automaticaly the correct default accounting account when transferring data in accounting
 AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
 
-AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
+AccountancyAreaDescJournalSetup=STEP %s: 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
 
 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.
+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.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for Taxes (special expenses). 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.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your Products/Services. For this, use the menu entry %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>.
@@ -99,7 +101,8 @@ ShowAccountingAccount=Show accounting account
 ShowAccountingJournal=Show accounting journal
 ShowAccountingAccountInLedger=Show accounting account in ledger
 ShowAccountingAccountInJournals=Show accounting account in journals
-AccountAccountingSuggest=Accounting account suggested
+DataUsedToSuggestAccount=Data used to suggest account
+AccountAccountingSuggest=Account suggested
 MenuDefaultAccounts=Default accounts
 MenuBankAccounts=Bank accounts
 MenuVatAccounts=Vat accounts
@@ -112,7 +115,7 @@ MenuAccountancyClosure=Closure
 MenuAccountancyValidationMovements=Validate movements
 ProductsBinding=Products accounts
 TransferInAccounting=Transfer in accounting
-RegistrationInAccounting=Registration in accounting
+RegistrationInAccounting=Recording in accounting
 Binding=Binding to accounts
 CustomersVentilation=Customer invoice binding
 SuppliersVentilation=Vendor invoice binding
@@ -120,10 +123,11 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Register transactions in accounting
+WriteBookKeeping=Record transactions in accounting
 Bookkeeping=Ledger
 BookkeepingSubAccount=Subledger
 AccountBalance=Account balance
+AccountBalanceSubAccount=Sub-accounts balance
 ObjectsRef=Source object ref
 CAHTF=Total purchase vendor before tax
 TotalExpenseReport=Total expense report
@@ -161,41 +165,47 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun
 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_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, what is the period selected by default
 
-ACCOUNTING_SELL_JOURNAL=Sell journal
-ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
-ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTING_SELL_JOURNAL=Sales journal (sales and returns)
+ACCOUNTING_PURCHASE_JOURNAL=Purchase journal (purchase and returns)
+ACCOUNTING_BANK_JOURNAL=Cash journal (receipts and disbursements)
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
-ACCOUNTING_SOCIAL_JOURNAL=Social journal
+ACCOUNTING_MISCELLANEOUS_JOURNAL=General journal
 ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
+ACCOUNTING_INVENTORY_JOURNAL=Inventory journal
+ACCOUNTING_SOCIAL_JOURNAL=Social journal
 
 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=Account (from the Chart Of Account) to be used as the account for transitional bank transfers
 TransitionalAccount=Transitional bank transfer account
 
-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=Account (from the Chart Of Account) to be used as the account for unallocated funds either received or paid i.e. funds in "wait[ing]"
+DONATION_ACCOUNTINGACCOUNT=Account (from the Chart Of Account) to be used to register donations (Donation module)
+ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Account (from the Chart Of Account) to be used to register memberships subscriptions (Membership module - if membership recorded without invoice)
 
-ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Account (from the Chart Of Account) to be used as the default account to register customer deposit
+UseAuxiliaryAccountOnCustomerDeposit=Store customer account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
+ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Account (from the Chart Of Account) to be used as the default
+UseAuxiliaryAccountOnSupplierDeposit=Store supplier account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
+ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY=Accounting account by default to register customer retained warranty
 
-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=Account (from the Chart Of Account) to be used as the default account for the products purchased within same country (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased from EEC to another EEC country (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased and imported from any other foreign country (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the sold products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products sold from EEC to another EEC country (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products sold and exported to any other foreign country (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_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=Account (from the Chart Of Account) to be used as the default account for the services purchased within same country (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the services purchased from EEC to another EEC country (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the services purchased and imported from other foreign country (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the sold services (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the services sold from EEC to another EEC country (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the services sold and exported to any other foreign country (used if not defined in the service sheet)
 
 Doctype=Type of document
 Docdate=Date
@@ -210,7 +220,8 @@ Codejournal=Journal
 JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Custom group
+AccountingCategory=Custom group of accounts
+AccountingCategories=Custom groups of accounts
 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.
@@ -219,12 +230,12 @@ ByPredefinedAccountGroups=By predefined groups
 ByPersonalizedAccountGroups=By personalized groups
 ByYear=By year
 NotMatch=Not Set
-DeleteMvt=Delete some operation lines from accounting
+DeleteMvt=Delete some 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)
+ConfirmDeleteMvt=This will delete all lines in accountancy 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 lines related to the same transaction will be deleted)
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
@@ -258,19 +269,20 @@ ShowSubtotalByGroup=Show subtotal by level
 
 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.
+AccountingCategoriesDesc=Custom group of accounts can be used to group accounting accounts into one name to ease filter use or building of custom reports.
 
 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=Consult here the list of customer invoice lines bound (or not) to a product account from chart of account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account (from chart of account) 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 account from chart of account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product account from chart of account
+ChangeAccount=Change the product/service account (from chart of account) for the selected lines with the following account:
 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=Consult here the list of vendor invoice lines bound or not yet bound to a product account from chart of 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
@@ -278,30 +290,32 @@ DescVentilExpenseReportMore=If you setup accounting account on type of expense r
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
 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
+DescClosure=Consult here the number of movements by month not yet validated & locked
+OverviewOfMovementsNotValidated=Overview of movements not validated and locked
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated and locked
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated and locked
+ValidateMovements=Validate and lock 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 bindings done (%s) - Automatic binding not possible for some record (%s)
+DoManualBindingForFailedRecord=You have to do a manual link for the %s row(s) not linked automatically.
 
-ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
+ErrorAccountancyCodeIsAlreadyUse=Error, you cannot remove or disable this account of chart of 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
+NoNewRecordSaved=No more record to transfer
+ListOfProductsWithoutAccountingAccount=List of products not bound to any account of chart of account
 ChangeBinding=Change the binding
 Accounted=Accounted in ledger
 NotYetAccounted=Not yet transferred to accounting
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
-WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
+WarningRecordWithoutSubledgerAreExcluded=Warning, all lines without subledger account defined are filtered and excluded from this view
+AccountRemovedFromCurrentChartOfAccount=Accounting account that does not exist in the current chart of accounts
 
 ## Admin
 BindingOptions=Binding options
@@ -317,9 +331,10 @@ AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Sales
 AccountingJournalType3=Purchases
 AccountingJournalType4=Bank
-AccountingJournalType5=Expenses report
+AccountingJournalType5=Expense reports
 AccountingJournalType8=Inventory
 AccountingJournalType9=Has-new
+GenerationOfAccountingEntries=Generation of accounting entries
 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
@@ -327,10 +342,15 @@ 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)
+ACCOUNTING_ENABLE_LETTERING=Enable the lettering function in the accounting
+ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
 
 ## Export
-NotifiedExportDate=Flag exported lines as exported (modification of the lines will not be possible)
-NotifiedValidationDate=Validate the exported entries (modification or deletion of the lines will not be possible)
+NotExportLettering=Do not export the lettering when generating the file
+NotifiedExportDate=Flag exported lines as Exported <span class="warning">(to modify a line, you will need to delete the whole transaction and re-transfert it into accounting)</span>
+NotifiedValidationDate=Validate and Lock the exported entries <span class="warning">(same effect than the "%s" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+NotifiedExportFull=Export documents ?
+DateValidationAndLock=Date validation and lock
 ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Export draft journal
 Modelcsv=Model of export
@@ -386,7 +406,7 @@ 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.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the thirdparty, or change the product account suggested for binding if needed.
 ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
 ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
 ## Dictionary
@@ -394,6 +414,26 @@ Range=Range of accounting account
 Calculated=Calculated
 Formula=Formula
 
+## Reconcile
+LetteringAuto=Reconcile auto
+LetteringManual=Reconcile manual
+Unlettering=Unreconcile
+UnletteringAuto=Unreconcile auto
+UnletteringManual=Unreconcile manual
+AccountancyNoLetteringModified=No reconcile modified
+AccountancyOneLetteringModifiedSuccessfully=One reconcile successfully modified
+AccountancyLetteringModifiedSuccessfully=%s reconcile successfully modified
+AccountancyNoUnletteringModified=No unreconcile modified
+AccountancyOneUnletteringModifiedSuccessfully=One unreconcile successfully modified
+AccountancyUnletteringModifiedSuccessfully=%s unreconcile successfully modified
+
+## Confirm box
+ConfirmMassUnletteringAuto=Bulk auto unreconcile confirmation
+ConfirmMassUnletteringManual=Bulk manual unreconcile confirmation
+ConfirmMassUnletteringQuestion=Are you sure you want to unreconcile the %s selected record(s)?
+ConfirmMassDeleteBookkeepingWriting=Bulk Delete confirmation
+ConfirmMassDeleteBookkeepingWritingQuestion=This will delete the transaction from the accounting (all lines related to the same transaction will be deleted) Are you sure you want to delete the %s selected record(s)?
+
 ## 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)
@@ -406,6 +446,11 @@ Binded=Lines bound
 ToBind=Lines to bind
 UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to make the binding manually
 SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Sorry this module is not compatible with the experimental feature of situation invoices
+AccountancyErrorMismatchLetterCode=Mismatch in reconcile code
+AccountancyErrorMismatchBalanceAmount=The balance (%s) is not equal to 0
+AccountancyErrorLetteringBookkeeping=Errors have occurred concerning the transactions: %s
+ErrorAccountNumberAlreadyExists=The accounting number %s already exists
+ErrorArchiveAddFile=Can't put "%s" file in archive
 
 ## Import
 ImportAccountingEntries=Accounting entries
@@ -432,6 +477,7 @@ 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.
 ExpenseReportJournal=Expense Report Journal
-InventoryJournal=Inventory Journal
+DocsAlreadyExportedAreExcluded=Docs already exported are excluded
+ClickToHideAlreadyExportedLines=Click to hide already exported lines
 
 NAccounts=%s accounts
diff --git a/htdocs/langs/hr_HR/accountancy.lang b/htdocs/langs/hr_HR/accountancy.lang
index 43afc7a404c..845a2f65e99 100644
--- a/htdocs/langs/hr_HR/accountancy.lang
+++ b/htdocs/langs/hr_HR/accountancy.lang
@@ -14,8 +14,8 @@ ACCOUNTING_EXPORT_ENDLINE=Select the carriage return type
 ACCOUNTING_EXPORT_PREFIX_SPEC=Specify the prefix for the file name
 ThisService=Ova usluga
 ThisProduct=Ovaj proizvod
-DefaultForService=Predefinirano za uslugu
-DefaultForProduct=Predefinirano za proizvod
+DefaultForService=Default for services
+DefaultForProduct=Default for products
 ProductForThisThirdparty=Proizvod za ovu treću stranu
 ServiceForThisThirdparty=Usluga za ovu treću stranu
 CantSuggest=Ne mogu predložiti
@@ -101,7 +101,8 @@ ShowAccountingAccount=Prikaži računovodstveni račun
 ShowAccountingJournal=Prikaži računovodstveni dnevnik
 ShowAccountingAccountInLedger=Prikaži računovodstveni račun u knjizi
 ShowAccountingAccountInJournals=Show accounting account in journals
-AccountAccountingSuggest=Accounting account suggested
+DataUsedToSuggestAccount=Data used to suggest account
+AccountAccountingSuggest=Account suggested
 MenuDefaultAccounts=Zadani računi
 MenuBankAccounts=Bankovni računi
 MenuVatAccounts=PDV računi
@@ -126,6 +127,7 @@ WriteBookKeeping=Record transactions in accounting
 Bookkeeping=Knjiga
 BookkeepingSubAccount=Podknjiga
 AccountBalance=Stanje računa
+AccountBalanceSubAccount=Sub-accounts balance
 ObjectsRef=Source object ref
 CAHTF=Total purchase vendor before tax
 TotalExpenseReport=Izvješće o ukupnim troškovima
@@ -189,6 +191,7 @@ ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Account (from the Chart Of Account) to be us
 UseAuxiliaryAccountOnCustomerDeposit=Store customer account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
 ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Account (from the Chart Of Account) to be used as the default
 UseAuxiliaryAccountOnSupplierDeposit=Store supplier account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
+ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY=Accounting account by default to register customer retained warranty
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased within same country (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased from EEC to another EEC country (used if not defined in the product sheet)
@@ -218,6 +221,7 @@ JournalLabel=Journal label
 NumPiece=Broj komada
 TransactionNumShort=Broj prijenosa
 AccountingCategory=Custom group of accounts
+AccountingCategories=Custom groups of accounts
 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.
@@ -265,6 +269,7 @@ ShowSubtotalByGroup=Prikaži međuzbroj po razini
 
 Pcgtype=Klasa računa
 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.
+AccountingCategoriesDesc=Custom group of accounts can be used to group accounting accounts into one name to ease filter use or building of custom reports.
 
 Reconcilable=Za usklađivanje
 
@@ -294,6 +299,7 @@ DescValidateMovements=Any modification or deletion of writing, lettering and del
 
 ValidateHistory=Vezati automatski
 AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
+DoManualBindingForFailedRecord=You have to do a manual link for the %s row(s) not linked automatically.
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot remove or disable this account of chart of account because it is used
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s & Credit = %s
@@ -337,11 +343,13 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on
 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_ENABLE_LETTERING=Enable the lettering function in the accounting
+ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
 
 ## Export
 NotExportLettering=Do not export the lettering when generating the file
 NotifiedExportDate=Flag exported lines as Exported <span class="warning">(to modify a line, you will need to delete the whole transaction and re-transfert it into accounting)</span>
 NotifiedValidationDate=Validate and Lock the exported entries <span class="warning">(same effect than the "%s" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+NotifiedExportFull=Export documents ?
 DateValidationAndLock=Potvrda datuma i zaključavanje
 ConfirmExportFile=Potvrda generiranja datoteke za izvoz računovodstva?
 ExportDraftJournal=Export draft journal
@@ -398,7 +406,7 @@ SaleLocal=Lokalna prodaja
 SaleExport=Izvozna prodaja
 SaleEEC=Prodaja u 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.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the thirdparty, or change the product account suggested for binding if needed.
 ForbiddenTransactionAlreadyExported=Zabranjeno: Transakcija je potvrđena i/ili izvezena.
 ForbiddenTransactionAlreadyValidated=Zabranjeno: Transakcija je potvrđena.
 ## Dictionary
@@ -442,6 +450,7 @@ AccountancyErrorMismatchLetterCode=Mismatch in reconcile code
 AccountancyErrorMismatchBalanceAmount=The balance (%s) is not equal to 0
 AccountancyErrorLetteringBookkeeping=Errors have occurred concerning the transactions: %s
 ErrorAccountNumberAlreadyExists=The accounting number %s already exists
+ErrorArchiveAddFile=Can't put "%s" file in archive
 
 ## Import
 ImportAccountingEntries=Accounting entries
@@ -468,5 +477,7 @@ FECFormatMulticurrencyCode=Viševalutni kod (Idevise)
 DateExport=Datum izvoza
 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.
 ExpenseReportJournal=Dnevnik izvješća o troškovima
+DocsAlreadyExportedAreExcluded=Docs already exported are excluded
+ClickToHideAlreadyExportedLines=Click to hide already exported lines
 
 NAccounts=%s računi
diff --git a/htdocs/langs/hr_HR/admin.lang b/htdocs/langs/hr_HR/admin.lang
index 67b67267f44..9ee2f7d5163 100644
--- a/htdocs/langs/hr_HR/admin.lang
+++ b/htdocs/langs/hr_HR/admin.lang
@@ -5,7 +5,7 @@ Foundation=Zaklada
 Version=Inačica
 Publisher=Izdavač
 VersionProgram=Inačica programa
-VersionLastInstall=Inicijalno instalirana verzija
+VersionLastInstall=Prva postavljena inačica
 VersionLastUpgrade=Zadnja verzija nadogradnje
 VersionExperimental=Eksperimentalno
 VersionDevelopment=Razvoj
@@ -208,7 +208,7 @@ AutoDetectLang=Automatski detektiraj (jezik web preglednika)
 FeatureDisabledInDemo=Mogućnost onemogućena u demo verziji
 FeatureAvailableOnlyOnStable=Značajka dostupna samo na službenim stabilnim verzijama
 BoxesDesc=Widgeti su komponente koje prikazuju neke informacije koje možete dodati da biste personalizirali neke stranice. Možete birati između prikazivanja widgeta ili ne tako da odaberete ciljnu stranicu i kliknete 'Aktiviraj' ili klikom na koš za smeće da ga onemogućite.
-OnlyActiveElementsAreShown=Prikazani su samo elementi sa  <a href="%s">omogučenih modula</a>
+OnlyActiveElementsAreShown=Prikazani su samo elementi sa  <a href="%s">omogućenih modula</a>
 ModulesDesc=Moduli/aplikacije određuju koje su značajke dostupne u softveru. Neki moduli zahtijevaju da se dozvole dodijele korisnicima nakon aktivacije modula. Kliknite gumb za uključivanje/isključivanje <span class="small valignmiddle"> %s </span> svakog modula kako biste omogućili ili onemogućili modul/aplikaciju.
 ModulesDesc2=Kliknite gumb kotačića <span class="small valignmiddle"> %s </span> da biste konfigurirali modul/aplikaciju.
 ModulesMarketPlaceDesc=Možete pronaći više modula za download na vanjskim internet web lokacijama 
@@ -645,6 +645,8 @@ Module2300Name=Planirani poslovi
 Module2300Desc=Upravljanje planiranim poslovima (alias cron ili chrono tablica)
 Module2400Name=Događaji/Raspored
 Module2400Desc=Pratite događaje. Zabilježite automatske događaje u svrhu praćenja ili zabilježite ručne događaje ili sastanke. Ovo je glavni modul za dobro upravljanje odnosima s kupcima ili dobavljačima.
+Module2430Name=Booking Calendar System
+Module2430Desc=Provide an online calendar to allow anyone to book rendez-vous, according to predefined ranges or availabilities.
 Module2500Name=DMS / ECM
 Module2500Desc=Sustav za upravljanje dokumentima / Upravljanje elektroničkim sadržajem. Automatska organizacija vaših generiranih ili pohranjenih dokumenata. Podijelite ih kada trebate.
 Module2600Name=API / Web services (SOAP server)
@@ -660,6 +662,8 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind mogućnosti konverzije
 Module3200Name=Nepromjenjivi arhivi
 Module3200Desc=Omogućite nepromjenjivi zapisnik poslovnih događaja. Događaji se arhiviraju u stvarnom vremenu. Dnevnik je tablica samo za čitanje vezanih događaja koji se mogu izvesti. Ovaj modul može biti obavezan za neke zemlje.
+Module3300Name=Module Builder
+Module3200Desc=Omogućite nepromjenjivi zapisnik poslovnih događaja. Događaji se arhiviraju u stvarnom vremenu. Dnevnik je tablica samo za čitanje vezanih događaja koji se mogu izvesti. Ovaj modul može biti obavezan za neke zemlje.
 Module3400Name=Društvene mreže
 Module3400Desc=Omogućite polja društvenih mreža trećim stranama i adresama (skype, twitter, facebook, ...).
 Module4000Name=Djelatnici
@@ -1188,7 +1192,7 @@ CompanyInfo=Tvrtka/Organizacija
 CompanyIds=Identiteti tvrtke/organizacije
 CompanyName=Naziv
 CompanyAddress=Adresa
-CompanyZip=PBR
+CompanyZip=Poštanski broj
 CompanyTown=Grad
 CompanyCountry=Zemlja
 CompanyCurrency=Glavna valuta
@@ -1270,6 +1274,7 @@ TriggerActiveAsModuleActive=Okidači u ovoj datoteci su aktivni jer je modul <b>
 GeneratedPasswordDesc=Odaberite metodu koja će se koristiti za automatski generirane lozinke.
 DictionaryDesc=Unesite sve referentne podatke. Možete postaviti svoje vrijednosti kao zadane.
 ConstDesc=Ova stranica vam omogućuje uređivanje (nadjačavanje) parametara koji nisu dostupni na drugim stranicama. Ovo su uglavnom rezervirani parametri samo za programere/napredno rješavanje problema.
+MiscellaneousOptions=Miscellaneous options
 MiscellaneousDesc=Svi ostali sigurnosni parametri su definirani ovdje.
 LimitsSetup=Podešavanje limita/preciznosti
 LimitsDesc=Ovdje možete definirati ograničenja, preciznosti i optimizacije koje koristi Dolibarr
@@ -1826,6 +1831,9 @@ AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries ->
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatski postavite ovu zadanu vrijednost za vrstu događaja u obrascu za kreiranje događaja
 AGENDA_DEFAULT_FILTER_TYPE=Automatski postavite ovu vrstu događaja u filter pretraživanja prikaza dnevnog reda
 AGENDA_DEFAULT_FILTER_STATUS=Automatski postavite ovaj status za događaje u filteru pretraživanja prikaza dnevnog reda
+AGENDA_EVENT_PAST_COLOR=Past event color
+AGENDA_EVENT_CURRENT_COLOR=Current event color
+AGENDA_EVENT_FUTURE_COLOR=Future event color
 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_REMINDER_BROWSER_SOUND=Omogući zvučnu obavijest
@@ -2129,6 +2137,7 @@ CodeLastResult=Najnoviji kod rezultata
 NbOfEmailsInInbox=Broj e-poruka u izvornom direktoriju
 LoadThirdPartyFromName=Učitaj traženje treće strane na %s (samo učitavanje)
 LoadThirdPartyFromNameOrCreate=Učitajte pretraživanje treće strane na %s (napravi ako nije pronađeno)
+LoadContactFromEmailOrCreate=Load contact searching on %s (create if not found)
 AttachJoinedDocumentsToObject=Spremite priložene datoteke u objektne dokumente ako se referenca objekta pronađe u temi e-pošte.
 WithDolTrackingID=Poruka iz razgovora pokrenutog prvom e-poštom poslanom od Dolibarra
 WithoutDolTrackingID=Poruka iz razgovora pokrenutog prvom e-poštom NIJE poslanom od Dolibarra
@@ -2355,3 +2364,5 @@ AllowExternalDownload=Allow external download (without login, using a shared lin
 DeadlineDayVATSubmission=Deadline day for vat submission on the next month
 MaxNumberOfAttachementOnForms=Max number of joinded files in a form
 IfDefinedUseAValueBeetween=If defined, use a value between %s and %s
+Reload=Reload
+ConfirmReload=Confirm module reload
diff --git a/htdocs/langs/hr_HR/main.lang b/htdocs/langs/hr_HR/main.lang
index 5672247a0b9..c7cc0152a0b 100644
--- a/htdocs/langs/hr_HR/main.lang
+++ b/htdocs/langs/hr_HR/main.lang
@@ -18,8 +18,8 @@ FormatDateShort=%d/%m/%Y
 FormatDateShortInput=%d/%m/%Y
 FormatDateShortJava=dd/MM/yyyy
 FormatDateShortJavaInput=dd/MM/yyyy
-FormatDateShortJQuery=dd/mm/yyyy
-FormatDateShortJQueryInput=dd/mm/yyyy
+FormatDateShortJQuery=dd/mm/yy
+FormatDateShortJQueryInput=dd/mm/yy
 FormatHourShortJQuery=HH:MI
 FormatHourShort=%I:%M %p
 FormatHourShortDuration=%H:%M
@@ -226,6 +226,7 @@ NoUserGroupDefined=Grupa korisnika nije izrađena
 Password=Zaporka
 PasswordRetype=Repeat your password
 NoteSomeFeaturesAreDisabled=Uzmite u obzir da je dosta mogućnosti i modula onemogućeno u ovom izlaganju.
+YourUserFile=Your user file
 Name=Ime
 NameSlashCompany=Ime / Tvrtka
 Person=Osoba
@@ -897,6 +898,9 @@ MassFilesArea=Sučelje za datoteke izrađene masovnom radnjama
 ShowTempMassFilesArea=Prikaži sučelje datoteka stvorenih masovnom akcijom
 ConfirmMassDeletion=Potvrda skupnog brisanja
 ConfirmMassDeletionQuestion=Jeste li sigurni da želite izbrisati %s odabrane zapise?
+ConfirmMassClone=Bulk clone confirmation
+ConfirmMassCloneQuestion=Select project to clone to
+ConfirmMassCloneToOneProject=Clone to project %s
 RelatedObjects=Povezani dokumenti
 ClassifyBilled=Označi kao zaračunato
 ClassifyUnbilled=Označi kao nezaračunato
@@ -912,8 +916,8 @@ ExportFilteredList=Izvoz pročišćenog popisa
 ExportList=Spis izvoza
 ExportOptions=Opcije izvoza
 IncludeDocsAlreadyExported=Uključuje već izvezene dokumente
-ExportOfPiecesAlreadyExportedIsEnable=Omogućen je izvoz već izvezenih komada
-ExportOfPiecesAlreadyExportedIsDisable=Onemogućen je izvoz već izvezenih komada
+ExportOfPiecesAlreadyExportedIsEnable=Documents already exported are visible and will be exported
+ExportOfPiecesAlreadyExportedIsDisable=Documents already exported are hidden and won't be exported
 AllExportedMovementsWereRecordedAsExported=Sva izvezena kretanja evidentirana su kao izvezena
 NotAllExportedMovementsCouldBeRecordedAsExported=Nisu svi izvezeni pokreti mogli biti zabilježeni kao izvezeni
 Miscellaneous=Ostalo
@@ -1128,6 +1132,7 @@ DeleteFileText=Jeste li sigurni da želite obrisati ovu datoteku?
 ShowOtherLanguages=Prikaži ostale jezike
 SwitchInEditModeToAddTranslation=Prijeđite u način uređivanja da biste dodali prijevode za ovaj jezik
 NotUsedForThisCustomer=Ne koristi se za ovog kupca
+NotUsedForThisVendor=Not used for this vendor
 AmountMustBePositive=Iznos mora biti pozitivan
 ByStatus=Po statusu
 InformationMessage=Podatak
@@ -1148,14 +1153,14 @@ EventReminder=Podsjetnik na događaj
 UpdateForAllLines=Ažuriranje za sve linije
 OnHold=Na čekanju
 Civility=Uljudnost
-AffectTag=Assign Tag
-AffectUser=Assign User
-SetSupervisor=Set Supervisor
+AffectTag=Assign a Tag
+AffectUser=Assign a User
+SetSupervisor=Set the supervisor
 CreateExternalUser=Stvorite vanjskog korisnika
 ConfirmAffectTag=Bulk Tag Assignement
 ConfirmAffectUser=Bulk User Assignement
-ProjectRole=Role assigned on each project
-TasksRole=Role assigned on each task of each project
+ProjectRole=Role assigned on each project/opportunity
+TasksRole=Role assigned on each task (if used)
 ConfirmSetSupervisor=Bulk Supervisor Set
 ConfirmUpdatePrice=Choose a increase/decrease price rate
 ConfirmAffectTagQuestion=Are you sure you want to assign tags to the %s selected record(s)?
@@ -1210,3 +1215,10 @@ CreatedByPublicPortal=Created from Public portal
 UserAgent=User Agent
 InternalUser=Interni korisnik
 ExternalUser=Vanjski korisnik
+NoSpecificContactAddress=No specific contact or address
+NoSpecificContactAddressBis=This tab is dedicated to force specific contacts or addresses for the current object. Use it only if you want to define one or several specific contacts or addresses for the object when the information on the thirdparty is not enough or not accurate.
+HideOnVCard=Hide %s
+AddToContacts=Add address to my contacts
+LastAccess=Last access
+UploadAnImageToSeeAPhotoHere=Upload an image from the tab %s to see a photo here
+LastPasswordChangeDate=Last password change date
diff --git a/htdocs/langs/hr_HR/ticket.lang b/htdocs/langs/hr_HR/ticket.lang
index e2eca0ca620..235ce683650 100644
--- a/htdocs/langs/hr_HR/ticket.lang
+++ b/htdocs/langs/hr_HR/ticket.lang
@@ -26,6 +26,7 @@ Permission56002=Izmijenite tikete
 Permission56003=Izbrišite tikete
 Permission56004=Upravljajte tiketima
 Permission56005=Pogledajte tikete svih trećih strana (nije na snazi za vanjske korisnike, uvijek su ograničene na treću stranu o kojoj ovise)
+Permission56006=Export tickets
 
 Tickets=Tiketi
 TicketDictType=Tiketi - Vrste
@@ -61,6 +62,8 @@ TypeContact_ticket_external_CONTRIBUTOR=Vanjski suradnik
 OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Pošaljite poruku o tiketu putem e-pošte
 
+ExportDataset_ticket_1=Tiketi
+
 # Status
 Read=Čitati
 Assigned=Dodijeljeno
diff --git a/htdocs/langs/hr_HR/users.lang b/htdocs/langs/hr_HR/users.lang
index 1d23fcb34d2..e84aee01882 100644
--- a/htdocs/langs/hr_HR/users.lang
+++ b/htdocs/langs/hr_HR/users.lang
@@ -66,7 +66,8 @@ LinkedToDolibarrUser=Poveži s korisnikom
 LinkedToDolibarrThirdParty=Link to third party
 CreateDolibarrLogin=Izradi korisnika
 CreateDolibarrThirdParty=Izradi treću osobu
-LoginAccountDisableInDolibarr=Račun je onemogučen u Dolibarr-u.
+LoginAccountDisableInDolibarr=Account disabled in Dolibarr
+PASSWORDInDolibarr=Password modified in Dolibarr
 UsePersonalValue=Koristi osobnu vrijednost
 ExportDataset_user_1=Users and their properties
 DomainUser=Korisnik na domeni %s
@@ -129,3 +130,6 @@ IPLastLogin=IP last login
 IPPreviousLogin=IP previous login
 ShowAllPerms=Show all permission rows
 HideAllPerms=Hide all permission rows
+UserPublicPageDesc=You can enable a virtual card for this user. An url with the user profile and a barcode will be available to allow anybody with a smartphone to scan it and add your contact to its address book.
+EnablePublicVirtualCard=Enable the public virtual user card
+PublicVirtualCardUrl=Public virtual user card
diff --git a/htdocs/langs/hu_HU/accountancy.lang b/htdocs/langs/hu_HU/accountancy.lang
index f0b8f7983f0..9b9ccc2575c 100644
--- a/htdocs/langs/hu_HU/accountancy.lang
+++ b/htdocs/langs/hu_HU/accountancy.lang
@@ -14,8 +14,8 @@ ACCOUNTING_EXPORT_ENDLINE=Válassza ki a kocsi-visszaküldésének típusát
 ACCOUNTING_EXPORT_PREFIX_SPEC=Adja meg a fájlnév előtagját
 ThisService=Ez a szolgáltatás
 ThisProduct=Ez a termék
-DefaultForService=Alapértelmezett szolgáltatás
-DefaultForProduct=Alapértelmezett termék
+DefaultForService=Default for services
+DefaultForProduct=Default for products
 ProductForThisThirdparty=Termék ennek a harmadik félnek
 ServiceForThisThirdparty=Szolgáltatás ennek a harmadik félnek
 CantSuggest=Nem tudok javasolni
@@ -101,7 +101,8 @@ ShowAccountingAccount=Számviteli számla megjelenítése
 ShowAccountingJournal=Számviteli napló megjelenítése
 ShowAccountingAccountInLedger=Számviteli számla megjelenítése a főkönyvben
 ShowAccountingAccountInJournals=Számviteli számla megjelenítése a naplókban
-AccountAccountingSuggest=Javasolt számviteli számla
+DataUsedToSuggestAccount=Data used to suggest account
+AccountAccountingSuggest=Account suggested
 MenuDefaultAccounts=Alapértelmezett számlák
 MenuBankAccounts=Bankszámlák
 MenuVatAccounts=Áfa-számlák
@@ -126,6 +127,7 @@ WriteBookKeeping=Tranzakciók rögzítése a számvitelben
 Bookkeeping=Főkönyv
 BookkeepingSubAccount=Alkönyv
 AccountBalance=Számlaegyenleg
+AccountBalanceSubAccount=Sub-accounts balance
 ObjectsRef=Forrásobjektum ref
 CAHTF=Teljes beszerzési eladó adózás előtt
 TotalExpenseReport=Összköltségjelentés
@@ -189,6 +191,7 @@ ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Account (from the Chart Of Account) to be us
 UseAuxiliaryAccountOnCustomerDeposit=Tárolja az ügyfél számát egyéni számlaként a alkönyvben az előlegsorokhoz (ha le van tiltva, az előlegsorokhoz tartozó egyéni számla üres marad)
 ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Account (from the Chart Of Account) to be used as the default
 UseAuxiliaryAccountOnSupplierDeposit=Tárolja a szállítói számlát egyéni számlaként a alkönyvben az előlegsorokhoz (letiltás esetén az előlegsorok egyéni számla üresen marad)
+ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY=Accounting account by default to register customer retained warranty
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased within same country (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased from EEC to another EEC country (used if not defined in the product sheet)
@@ -218,6 +221,7 @@ JournalLabel=Naplócímke
 NumPiece=Darabszám
 TransactionNumShort=Tranzakció száma
 AccountingCategory=Custom group of accounts
+AccountingCategories=Custom groups of accounts
 GroupByAccountAccounting=Főkönyvi számla szerinti csoportosítás
 GroupBySubAccountAccounting=Alkönyvi számla szerinti csoportosítás
 AccountingAccountGroupsDesc=Itt meghatározhatja a számviteli számlák néhány csoportját. Személyre szabott számviteli jelentések készítésére szolgálnak majd.
@@ -265,6 +269,7 @@ ShowSubtotalByGroup=Részösszeg megjelenítése szint szerint
 
 Pcgtype=Számla csoport
 PcgtypeDesc=A számlacsoport előre meghatározott "szűrő" és "csoportosítás" kritériumként használatos egyes számviteli jelentések esetében. Például a „BEVÉTEL” vagy „KIADÁS” csoportként használatos a termékek számviteli számláihoz a kiadás/bevétel jelentés összeállításához.
+AccountingCategoriesDesc=Custom group of accounts can be used to group accounting accounts into one name to ease filter use or building of custom reports.
 
 Reconcilable=Kibékíthető
 
@@ -294,6 +299,7 @@ DescValidateMovements=Az írások, betűk és törlések bármilyen módosítás
 
 ValidateHistory=Automatikus kötés
 AutomaticBindingDone=Automatikus összerendelés megtörtént (%s) - Az automatikus kötés bizonyos rekordokhoz (%s) nem lehetséges
+DoManualBindingForFailedRecord=You have to do a manual link for the %s row(s) not linked automatically.
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot remove or disable this account of chart of account because it is used
 MvtNotCorrectlyBalanced=A mozgás nem megfelelően kiegyensúlyozott. Terhelés = %s és jóváírás = %s
@@ -337,11 +343,13 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=A kötés és az átvitel letiltása az ért
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=A kötés és az átvitel letiltása a vásárlások könyvelésében (a szállítói számlák nem lesznek figyelembe véve a könyvelésben)
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=A kötés és az átvitel letiltása a könyvelésben a költségjelentéseken (a költségjelentéseket nem veszik figyelembe a könyvelésben)
 ACCOUNTING_ENABLE_LETTERING=Engedélyezze a feliratozás funkciót a számvitelben
+ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
 
 ## Export
 NotExportLettering=Ne exportálja a betűket a fájl létrehozásakor
 NotifiedExportDate=Az exportált sorok megjelölése Exportáltként <span class="warning"> (egy sor módosításához törölnie kell a teljes tranzakciót, és újra át kell vinnie a könyvelésbe) </span>
 NotifiedValidationDate=Érvényesítse és zárolja az exportált bejegyzéseket <span class="warning"> (ugyanaz a hatás, mint az "%s" funkciónál, a sorok módosítása és törlése BIZTOSAN nem lehetséges) </span>
+NotifiedExportFull=Export documents ?
 DateValidationAndLock=Dátumellenőrzés és zárolás
 ConfirmExportFile=A számviteli exportfájl létrehozásának megerősítése?
 ExportDraftJournal=Naplótervezet exportálása
@@ -398,7 +406,7 @@ SaleLocal=Helyi értékesítés
 SaleExport=Export értékesítés
 SaleEEC=Eladó az EGK-ban
 SaleEECWithVAT=Az EGK-ban történő értékesítés áfával nem nulla, ezért feltételezzük, hogy ez NEM közösségen belüli értékesítés, és a javasolt számla a szabványos termékszámla.
-SaleEECWithoutVATNumber=Az EGK-ban történő értékesítés áfa nélkül, de a harmadik fél áfaazonosítója nincs meghatározva. A szokásos értékesítéseknél a termékszámlát használjuk. Szükség esetén javíthatja a harmadik fél vagy a termékszámla áfaazonosítóját.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the thirdparty, or change the product account suggested for binding if needed.
 ForbiddenTransactionAlreadyExported=Tiltott: A tranzakciót ellenőrizték és/vagy exportálták.
 ForbiddenTransactionAlreadyValidated=Tiltott: A tranzakció érvényesítése megtörtént.
 ## Dictionary
@@ -442,6 +450,7 @@ AccountancyErrorMismatchLetterCode=Nem egyezik az egyeztető kód
 AccountancyErrorMismatchBalanceAmount=Az egyenleg (%s) nem egyenlő 0-val
 AccountancyErrorLetteringBookkeeping=Hibák történtek a következő tranzakciókkal kapcsolatban: %s
 ErrorAccountNumberAlreadyExists=Az %s számviteli szám már létezik
+ErrorArchiveAddFile=Can't put "%s" file in archive
 
 ## Import
 ImportAccountingEntries=Számviteli bejegyzések
@@ -468,5 +477,7 @@ FECFormatMulticurrencyCode=Több pénznem kódja (ötlet)
 DateExport=Dátum exportálás
 WarningReportNotReliable=Figyelem, ez a jelentés nem a Főkönyvön alapul, így nem tartalmaz a Főkönyvben kézzel módosított tranzakciót. Ha a naplózás naprakész, a könyvelési nézet pontosabb.
 ExpenseReportJournal=Költségjelentési napló
+DocsAlreadyExportedAreExcluded=Docs already exported are excluded
+ClickToHideAlreadyExportedLines=Click to hide already exported lines
 
 NAccounts=%s számlák
diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang
index 989bba0ff00..460c2ce847f 100644
--- a/htdocs/langs/hu_HU/admin.lang
+++ b/htdocs/langs/hu_HU/admin.lang
@@ -438,7 +438,7 @@ Unique=Egyedi
 Boolean=Logikai érték (egy jelölőnégyzet)
 ExtrafieldPhone = Telefon
 ExtrafieldPrice = Ár
-ExtrafieldPriceWithCurrency=Price with currency
+ExtrafieldPriceWithCurrency=Ár pénznemmel
 ExtrafieldMail = E-mail
 ExtrafieldUrl = Cím
 ExtrafieldIP = IP
@@ -516,7 +516,7 @@ PageUrlForDefaultValuesCreate=<br>Példa:<br>Az új harmadik felet létrehozó 
 PageUrlForDefaultValuesList=<br>Példa:<br>A harmadik feleket felsoroló oldal esetében ez a <strong>%s</strong>.<br>Az egyéni könyvtárba telepített külső modulok URL-címe esetén ne használja az "egyéni/"-t, így használjon egy elérési utat, például <strong>mymodule/mypagelist.php</strong>, és ne custom/mymodule/mypagelist.php.<br>Ha csak akkor szeretne alapértelmezett értéket, ha az url-nek van valamilyen paramétere, akkor használja a <strong>%s</strong> parancsot.
 AlsoDefaultValuesAreEffectiveForActionCreate=Azt is vegye figyelembe, hogy az űrlapkészítés alapértelmezett értékeinek felülírása csak a helyesen megtervezett oldalakon működik (vagyis a paraméter action=create vagy presend ...)
 EnableDefaultValues=Az alapértelmezett értékek testreszabásának engedélyezése
-EnableOverwriteTranslation=Allow customization of translations
+EnableOverwriteTranslation=A fordítások testreszabásának engedélyezése
 GoIntoTranslationMenuToChangeThis=A kódhoz tartozó kulcshoz fordítás található. Ezt az értéket a Kezdőlap-Beállítások-Fordítás menüben lehet megváltoztatni.
 WarningSettingSortOrder=Figyelem, az alapértelmezett rendezési sorrend beállítása technikai hibát okozhat, ha a listaoldalra lép, és egy mező ismeretlen. Ha ilyen hibát tapasztal, térjen vissza erre az oldalra az alapértelmezett rendezési sorrend eltávolításához és az alapértelmezett viselkedés visszaállításához.
 Field=Mező
@@ -645,6 +645,8 @@ Module2300Name=Időzített feladatok
 Module2300Desc=Ütemezett feladatok kezelése (alias cron vagy chrono table)
 Module2400Name=Események/Naptár
 Module2400Desc=Események nyomonkövetése. Automatikus események naplózása nyomkövetési célokra, vagy a kézzel létrehozott események és találkozók rögzítése. Ez a fő modul a megfelelő ügyfél- vagy kereskedelmi kapcsolatkezeléshez.
+Module2430Name=Foglaltsági naptár
+Module2430Desc=Provide an online calendar to allow anyone to book rendez-vous, according to predefined ranges or availabilities.
 Module2500Name=DMS / ECM
 Module2500Desc=Dokumentumkezelő rendszer / elektronikus tartalomkezelés. A generált vagy tárolt dokumentumok automatikus szervezése. Ossza meg őket, amikor szükséges.
 Module2600Name=API / Web services (SOAP server)
@@ -660,6 +662,8 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP MaxMind konverziók képességek
 Module3200Name=Megváltoztathatatlan archívumok
 Module3200Desc=Az üzleti események megváltoztathatatlan naplójának engedélyezése. Az események valós időben archiválódnak. A napló a láncolt események csak olvasható táblázata, amely exportálható. Ez a modul bizonyos országokban kötelező lehet.
+Module3300Name=Modul Készítő
+Module3200Desc=Az üzleti események megváltoztathatatlan naplójának engedélyezése. Az események valós időben archiválódnak. A napló a láncolt események csak olvasható táblázata, amely exportálható. Ez a modul bizonyos országokban kötelező lehet.
 Module3400Name=Közösségi hálózatok
 Module3400Desc=Engedélyezze a közösségi hálózatok mezőit harmadik felek és címek számára (skype, twitter, facebook, ...).
 Module4000Name=HRM
@@ -1044,7 +1048,7 @@ DictionaryCompanyType=Partnerek típusai
 DictionaryCompanyJuridicalType=Partner jogi képviselői
 DictionaryProspectLevel=Kilátás lehetséges szintje a vállalatok számára
 DictionaryProspectContactLevel=Tekintse meg a kapcsolatok potenciális szintjét
-DictionaryCanton=Államok / Tartományok
+DictionaryCanton=Államok / Tartományok / Vármegyék
 DictionaryRegion=Régiók
 DictionaryCountry=Országok
 DictionaryCurrency=Pénznemek
@@ -1270,6 +1274,7 @@ TriggerActiveAsModuleActive=Triggerek ebben a fájlban vannak aktív <b>%s</b> m
 GeneratedPasswordDesc=Válassza ki a módszert a jelszavak automatikus létrehozásához.
 DictionaryDesc=Illessze be az összes referenciaadatot. Értékeit hozzáadhatja az alapértelmezett értékekhez.
 ConstDesc=Ezen az oldalon olyan paramétereket szerkeszthet (felülbírálhat), amelyek más oldalakon nem állnak rendelkezésre. Ezek többnyire csak a fejlesztők/haladó hibaelhárítás számára fenntartott paraméterek.
+MiscellaneousOptions=Miscellaneous options
 MiscellaneousDesc=Az összes többi biztonsággal kapcsolatos paraméter itt kerül meghatározásra.
 LimitsSetup=Korlátok / Precision beállítás
 LimitsDesc=Itt meghatározhatja a Dolibarr által használt korlátokat, pontosságokat és optimalizációkat
@@ -1826,6 +1831,9 @@ AGENDA_USE_EVENT_TYPE=Eseménytípusok használata (a Beállítás menüben -> S
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatikusan állítsa be ezt az alapértelmezett értéket az eseménytípushoz az esemény létrehozási űrlapon
 AGENDA_DEFAULT_FILTER_TYPE=Az ilyen típusú események automatikus beállítása a napirend nézet keresési szűrőjében
 AGENDA_DEFAULT_FILTER_STATUS=Automatikusan állítsa be ezt az állapotot az eseményekhez a napirendnézet keresőszűrőjében
+AGENDA_EVENT_PAST_COLOR=Past event color
+AGENDA_EVENT_CURRENT_COLOR=Current event color
+AGENDA_EVENT_FUTURE_COLOR=Future event color
 AGENDA_DEFAULT_VIEW=Melyik nézetet szeretné alapértelmezés szerint megnyitni a Napirend menü kiválasztásakor
 AGENDA_REMINDER_BROWSER=Eseményemlékeztető engedélyezése <b>a felhasználó böngészőjében</b> (Az emlékeztető dátumának elérésekor a böngésző felugró ablakot jelenít meg. Minden felhasználó letilthatja az ilyen értesítéseket a böngésző értesítési beállításaiból).
 AGENDA_REMINDER_BROWSER_SOUND=Hangjelzés engedélyezése
@@ -2129,6 +2137,7 @@ CodeLastResult=Legfrissebb eredménykód
 NbOfEmailsInInbox=E-mailek száma a forráskönyvtárban
 LoadThirdPartyFromName=Harmadik féltől származó keresés betöltése a következőn: %s (csak betöltés)
 LoadThirdPartyFromNameOrCreate=Harmadik féltől származó keresés betöltése a következőn: %s (létrehozás, ha nem található)
+LoadContactFromEmailOrCreate=Load contact searching on %s (create if not found)
 AttachJoinedDocumentsToObject=Mentse el a csatolt fájlokat objektum dokumentumokba, ha egy objektum hivatkozása található az e-mail témakörben.
 WithDolTrackingID=Üzenet egy beszélgetésből, amelyet a Dolibarrtól küldött első e-mail indított
 WithoutDolTrackingID=Üzenet egy beszélgetésből, amelyet a Dolibarrtól NEM küldött első e-mail indított
@@ -2355,3 +2364,5 @@ AllowExternalDownload=Allow external download (without login, using a shared lin
 DeadlineDayVATSubmission=Deadline day for vat submission on the next month
 MaxNumberOfAttachementOnForms=Max number of joinded files in a form
 IfDefinedUseAValueBeetween=If defined, use a value between %s and %s
+Reload=Reload
+ConfirmReload=Confirm module reload
diff --git a/htdocs/langs/hu_HU/companies.lang b/htdocs/langs/hu_HU/companies.lang
index c4de327829b..98415b9bd99 100644
--- a/htdocs/langs/hu_HU/companies.lang
+++ b/htdocs/langs/hu_HU/companies.lang
@@ -59,12 +59,12 @@ UserTitle=Cím
 NatureOfThirdParty=Harmadik fél természete
 NatureOfContact=A kapcsolattartás jellege
 Address=Cím
-State=Állam / Tartomány
+State=Állam / Tartomány / Vármegye
 StateId=Állami azonosító
-StateCode=Állam/Tartomány kódja
+StateCode=Állam/Tartomány/Vármegye kódja
 StateShort=Állam/Megye
 Region=Régió
-Region-State=Régió - Állam
+Region-State=Vármegye - Állam
 Country=Ország
 CountryCode=Az ország hívószáma
 CountryId=Országazonosító
@@ -312,12 +312,12 @@ CustomerRelativeDiscountShort=Relatív kedvezmény
 CustomerAbsoluteDiscountShort=Abszolút kedvezmény
 CompanyHasRelativeDiscount=A vevő alapértelmezett kedvezménye <b>%s%%</b>
 CompanyHasNoRelativeDiscount=A vevő nem rendelkezik relatív kedvezménnyel alapértelmezésben
-HasRelativeDiscountFromSupplier=Az alapértelmezett <b>%s%%</b> kedvezménye van ettől a szállítótól
-HasNoRelativeDiscountFromSupplier=Nincs alapértelmezett relatív engedménye ettől a szállítótól
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> with this vendor
+HasNoRelativeDiscountFromSupplier=No default relative discount with this vendor
 CompanyHasAbsoluteDiscount=Ennek az ügyfélnek kedvezményei vannak (jóváírás vagy előleg) a következőhöz: <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=Ennek az ügyfélnek kedvezményei vannak (kereskedelmi, előleg) a következőre: <b>%s</b> %s
 CompanyHasCreditNote=Ez a vevő még hitellel rendelkezik <b>%s %s</b>-ig
-HasNoAbsoluteDiscountFromSupplier=Nincs kedvezményes jóváírása ennél a szállítónál
+HasNoAbsoluteDiscountFromSupplier=No discount/credit available from this vendor
 HasAbsoluteDiscountFromSupplier=Kedvezményei vannak (jóváírások vagy előlegek) a következőhöz: <b>%s</b> %s ettől a szállítótól
 HasDownPaymentOrCommercialDiscountFromSupplier=Kereskedelmi kedvezmények, előlegek) a következőhöz: <b>%s</b> %s ettől a szállítótól
 HasCreditNoteFromSupplier=Önnek van jóváírása a következőhöz: <b>%s</b> %s ettől a szállítótól
@@ -444,7 +444,7 @@ AddAddress=Cím hozzáadása
 SupplierCategory=Szállító kategória
 JuridicalStatus200=Független
 DeleteFile=Fájl törlése
-ConfirmDeleteFile=Biztosan törölni akarja ezt a fájlt?
+ConfirmDeleteFile=Biztosan törli ezt a fájlt<b>%s</b>?
 AllocateCommercial=Értékesítési képviselőhöz hozzárendelve
 Organization=Szervezet
 FiscalYearInformation=Fizális év
@@ -498,3 +498,8 @@ RestOfEurope=Európa többi része (EGK)
 OutOfEurope=Európán kívül (EGK)
 CurrentOutstandingBillLate=A jelenlegi fennálló számla késik
 BecarefullChangeThirdpartyBeforeAddProductToInvoice=Legyen óvatos, a termék árbeállításaitól függően meg kell változtatnia a harmadik felet, mielőtt hozzáadná a terméket a POS-hoz.
+EmailAlreadyExistsPleaseRewriteYourCompanyName=e-mail cím már létezik, kérjük írja át a cég nevét
+TwoRecordsOfCompanyName=more than one record exists for this company, please contact us to complete your partnership request
+CompanySection=Company section
+ShowSocialNetworks=Show social networks
+HideSocialNetworks=Hide social networks
diff --git a/htdocs/langs/hu_HU/main.lang b/htdocs/langs/hu_HU/main.lang
index d5d9d347d7d..79b246a6076 100644
--- a/htdocs/langs/hu_HU/main.lang
+++ b/htdocs/langs/hu_HU/main.lang
@@ -226,6 +226,7 @@ NoUserGroupDefined=Nincs felhasználói csoport meghatározva
 Password=Jelszó
 PasswordRetype=Ismételje meg a jelszavát
 NoteSomeFeaturesAreDisabled=Megjegyzés: rengeteg modul/eszköz ki van kapcsolva ebben a demóban.
+YourUserFile=Your user file
 Name=Név
 NameSlashCompany=Név / Cég
 Person=Személy
@@ -897,6 +898,9 @@ MassFilesArea=Tömeges műveletek által létrehozott fájlok területe
 ShowTempMassFilesArea=A tömeges műveletek által létrehozott fájlok területének megjelenítése
 ConfirmMassDeletion=Tömeges törlés megerősítése
 ConfirmMassDeletionQuestion=Biztosan törölni szeretné a %s kiválasztott rekordo(ka)t?
+ConfirmMassClone=Bulk clone confirmation
+ConfirmMassCloneQuestion=Select project to clone to
+ConfirmMassCloneToOneProject=Clone to project %s
 RelatedObjects=Kapcsolódó objektumok
 ClassifyBilled=Minősítse kiszámlázottként
 ClassifyUnbilled=Számlázatlan osztályozás
@@ -912,8 +916,8 @@ ExportFilteredList=Szűrt lista exportálása
 ExportList=Lista exportálása
 ExportOptions=Exportálási beállítások
 IncludeDocsAlreadyExported=A már exportált dokumentumokat tartalmazza
-ExportOfPiecesAlreadyExportedIsEnable=A már exportált darabok exportálása engedélyezett
-ExportOfPiecesAlreadyExportedIsDisable=A már exportált darabok exportálása le van tiltva
+ExportOfPiecesAlreadyExportedIsEnable=Documents already exported are visible and will be exported
+ExportOfPiecesAlreadyExportedIsDisable=Documents already exported are hidden and won't be exported
 AllExportedMovementsWereRecordedAsExported=Minden exportált mozgás exportáltként lett rögzítve
 NotAllExportedMovementsCouldBeRecordedAsExported=Nem minden exportált mozgás rögzíthető exportáltként
 Miscellaneous=Vegyes
@@ -1128,6 +1132,7 @@ DeleteFileText=Valóban törölni szeretné ezt a fájlt?
 ShowOtherLanguages=Más nyelvek megjelenítése
 SwitchInEditModeToAddTranslation=Váltson szerkesztési módba fordítások hozzáadásához ehhez a nyelvhez
 NotUsedForThisCustomer=Nem használt ennél az ügyfélnél
+NotUsedForThisVendor=Not used for this vendor
 AmountMustBePositive=Az összegnek pozitívnak kell lennie
 ByStatus=Állapot szerint
 InformationMessage=Információ
@@ -1148,14 +1153,14 @@ EventReminder=Esemény emlékeztető
 UpdateForAllLines=Frissítés minden vonalhoz
 OnHold=Tart
 Civility=Udvariasság
-AffectTag=Assign Tag
-AffectUser=Assign User
-SetSupervisor=Set Supervisor
+AffectTag=Assign a Tag
+AffectUser=Assign a User
+SetSupervisor=Set the supervisor
 CreateExternalUser=Külső felhasználó létrehozása
 ConfirmAffectTag=Bulk Tag Assignement
 ConfirmAffectUser=Bulk User Assignement
-ProjectRole=Role assigned on each project
-TasksRole=Role assigned on each task of each project
+ProjectRole=Role assigned on each project/opportunity
+TasksRole=Role assigned on each task (if used)
 ConfirmSetSupervisor=Bulk Supervisor Set
 ConfirmUpdatePrice=Choose a increase/decrease price rate
 ConfirmAffectTagQuestion=Are you sure you want to assign tags to the %s selected record(s)?
@@ -1210,3 +1215,10 @@ CreatedByPublicPortal=Nyilvános portálról készült
 UserAgent=Felhasználói ügynök
 InternalUser=Belső felahsználó
 ExternalUser=Külső felhasználó
+NoSpecificContactAddress=No specific contact or address
+NoSpecificContactAddressBis=This tab is dedicated to force specific contacts or addresses for the current object. Use it only if you want to define one or several specific contacts or addresses for the object when the information on the thirdparty is not enough or not accurate.
+HideOnVCard=Hide %s
+AddToContacts=Add address to my contacts
+LastAccess=Last access
+UploadAnImageToSeeAPhotoHere=Upload an image from the tab %s to see a photo here
+LastPasswordChangeDate=Last password change date
diff --git a/htdocs/langs/hu_HU/projects.lang b/htdocs/langs/hu_HU/projects.lang
index 2d6e5d04ec5..d652acf4a43 100644
--- a/htdocs/langs/hu_HU/projects.lang
+++ b/htdocs/langs/hu_HU/projects.lang
@@ -34,8 +34,8 @@ ConfirmDeleteAProject=Biztosan törölni szeretné ezt a projektet?
 ConfirmDeleteATask=Biztosan törölni szeretné ezt a feladatot?
 OpenedProjects=Nyitott projektek
 OpenedTasks=Nyitott feladatok
-OpportunitiesStatusForOpenedProjects=A nyitott projektek számát állapot szerint vezeti
-OpportunitiesStatusForProjects=A projektek számát állapot szerint vezeti
+OpportunitiesStatusForOpenedProjects=A nyitott projektek előrehaladásának száma állapot szerint
+OpportunitiesStatusForProjects=A projektek előrehaladásának száma állapot szerint
 ShowProject=Projekt megjelenítése
 ShowTask=Feladat megjelenítése
 SetThirdParty=Harmadik fél beállítása
@@ -222,34 +222,34 @@ ProjectOppAmountOfProjectsByMonth=Az előrehaladások mennyisége havonta
 ProjectWeightedOppAmountOfProjectsByMonth=Az előrehaladások súlyozott mennyisége hónaponként
 ProjectOpenedProjectByOppStatus=Nyitott projekt | előrehaladás előrehaladási státusz szerint
 ProjectsStatistics=Statisztikák projektekről vagy előrehaladásokról
-TasksStatistics=Statisztikák projektek vagy lehetőségek feladatairól
+TasksStatistics=Statisztikák projektek vagy előrehaladások feladatairól
 TaskAssignedToEnterTime=Feladat hozzárendelve. Lehetővé kell tenni az idő megadását erre a feladatra.
-IdTaskTime=Id feladat ideje
+IdTaskTime=Azonosító feladat ideje
 YouCanCompleteRef=Ha a ref-et valamilyen utótaggal szeretné kiegészíteni, akkor javasolt egy - karakter hozzáadása az elválasztáshoz, így az automatikus számozás továbbra is megfelelően fog működni a következő projekteknél. Például %s-MYSUFFIX
 OpenedProjectsByThirdparties=Harmadik felek által nyitott projektek
-OnlyOpportunitiesShort=Csak potenciális ügyfelek
-OpenedOpportunitiesShort=Nyitott lehetőségek
-NotOpenedOpportunitiesShort=Nem nyitott lehetőség
-NotAnOpportunityShort=Nem vezető
-OpportunityTotalAmount=A lehetőségek teljes mennyisége
-OpportunityPonderatedAmount=A lehetőségek súlyozott mennyisége
-OpportunityPonderatedAmountDesc=Valószínűséggel súlyozott leadek összege
-OppStatusPROSP=Potenciális
+OnlyOpportunitiesShort=Csak előrehaladások
+OpenedOpportunitiesShort=Nyitott előrehaladások
+NotOpenedOpportunitiesShort=Nem nyitott előrehaladás
+NotAnOpportunityShort=Nem előrehaladás
+OpportunityTotalAmount=Az előrehaladások teljes mennyisége
+OpportunityPonderatedAmount=Az előrehaladások súlyozott mennyisége
+OpportunityPonderatedAmountDesc=Az előrehaladások valószínűséggel súlyozott összege
+OppStatusPROSP=Előrelátás
 OppStatusQUAL=Minősítés
-OppStatusPROPO=Javaslat
+OppStatusPROPO=Árajánlat
 OppStatusNEGO=Tárgyalás
-OppStatusPENDING=Függőben
-OppStatusWON=Nyert
+OppStatusPENDING=Függőben levő
+OppStatusWON=Megnyert
 OppStatusLOST=Elveszett
 Budget=Költségvetés
-AllowToLinkFromOtherCompany=Allow to link an element with a project of other company<br><br><u>Supported values:</u><br>- Keep empty: Can link elements with any projects in the same company (default)<br>- "all": Can link elements with any projects, even projects of other companies<br>- A list of third-party ids separated by commas: can link elements with any projects of these third partys (Example: 123,4795,53)<br>
-LatestProjects=A legújabb %s projekt
-LatestModifiedProjects=A legutóbbi %s módosított projekt
+AllowToLinkFromOtherCompany=Lehetővé teszi egy elem összekapcsolását egy másik vállalat projektjével <br><br><u>Támogatott értékek:</u><br>- Hagyja üresen: Az elemeket összekapcsolhatja az azonos vállalat bármely projektjével (alapértelmezett)<br>- "minden": Bármilyen projektekkel összekapcsolhatja az elemeket, akár más cégek projektjeivel is<br>- Harmadik fél azonosítóinak vesszővel elválasztott listája: Összekapcsolhatja az elemeket ezen harmadik felek bármely projektjével (Példa: 123,4795,53)<br>
+LatestProjects=A legutóbbi %s projektek
+LatestModifiedProjects=A legutóbbi %s módosított projektek
 OtherFilteredTasks=Egyéb szűrt feladatok
 NoAssignedTasks=Nem található hozzárendelt feladat (rendelje hozzá a projektet/feladatokat az aktuális felhasználóhoz a felső jelölőnégyzetből az idő megadásához)
-ThirdPartyRequiredToGenerateInvoice=Harmadik félnek meg kell határoznia a projektet, hogy ki tudja számlázni.
-ThirdPartyRequiredToGenerateInvoice=Harmadik félnek meg kell határoznia a projektet, hogy ki tudja számlázni.
-ChooseANotYetAssignedTask=Válasszon egy olyan feladatot, amely még nincs hozzárendelve
+ThirdPartyRequiredToGenerateInvoice=Egy harmadik félnek meg kell határoznia a projektet, hogy ki tudja számlázni.
+ThirdPartyRequiredToGenerateInvoice=Egy harmadik félnek meg kell határoznia a projektet, hogy ki tudja számlázni.
+ChooseANotYetAssignedTask=Válasszon egy olyan feladatot, amely még nincs hozzád rendelve
 # Comments trans
 AllowCommentOnTask=A felhasználók megjegyzéseinek engedélyezése a feladatokhoz
 AllowCommentOnProject=A felhasználók megjegyzéseinek engedélyezése a projektekhez
@@ -259,6 +259,7 @@ RecordsClosed=%s projekt lezárva
 SendProjectRef=Információs projekt %s
 ModuleSalaryToDefineHourlyRateMustBeEnabled=A 'Bérek' modult engedélyezni kell az alkalmazotti órabér meghatározásához, hogy az eltöltött idő értékelhető legyen
 NewTaskRefSuggested=Feladat ref. már használt, új feladat ref szükséges
+NumberOfTasksCloned=%s task(s) cloned
 TimeSpentInvoiced=Kiszámlázott idő
 TimeSpentForIntervention=Eltöltött idő
 TimeSpentForInvoice=Eltöltött idő
diff --git a/htdocs/langs/hu_HU/sms.lang b/htdocs/langs/hu_HU/sms.lang
index 26e69c3d78d..4b1465e7076 100644
--- a/htdocs/langs/hu_HU/sms.lang
+++ b/htdocs/langs/hu_HU/sms.lang
@@ -10,7 +10,7 @@ SmsRecipient=Cél
 SmsTitle=Leírás
 SmsFrom=Feladó
 SmsTo=Cél
-SmsTopic=Téma SMS
+SmsTopic=SMS témája
 SmsText=Üzenet
 SmsMessage=SMS-üzenet
 ShowSms=SMS megjelenítése
diff --git a/htdocs/langs/hu_HU/stripe.lang b/htdocs/langs/hu_HU/stripe.lang
index 1444c2bfd58..72835cc52b8 100644
--- a/htdocs/langs/hu_HU/stripe.lang
+++ b/htdocs/langs/hu_HU/stripe.lang
@@ -41,7 +41,8 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook élő kulcs
 ONLINE_PAYMENT_WAREHOUSE=A készlet csökkentésére használható készlet, amikor online fizetés megtörtént<br>(TODO Amikor a készletcsökkentési lehetőség megtörténik egy számlán végzett műveletnél, és az online fizetés önmagában generálja a számlát?)
 StripeLiveEnabled=Stripe live engedélyezve (egyébként teszt/sandbox mód)
 StripeImportPayment=Stripe fizetések importálása
-ExampleOfTestCreditCard=Példa hitelkártyára a teszteléshez: %s => érvényes, %s => CVC hiba, %s => lejárt, %s => terhelés sikertelen
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+ExampleOfTestBankAcountForSEPA=Example of bank account BAN for direct debit test: %s
 StripeGateways=Stripe átjárók
 OAUTH_STRIPE_TEST_ID=Stripe Connect kliensazonosító (ca_...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect kliensazonosító (ca_...)
@@ -61,6 +62,7 @@ DeleteACard=Kártya törlése
 ConfirmDeleteCard=Biztosan törölni szeretné ezt a hitel- vagy betéti kártyát?
 CreateCustomerOnStripe=Ügyfél létrehozása a Stripe-on
 CreateCardOnStripe=Kártya létrehozása a Stripe-on
+CreateBANOnStripe=Create bank on Stripe
 ShowInStripe=Stripe megjelenítés
 StripeUserAccountForActions=Felhasználói fiók, amely e-mailben értesíti egyes Stripe eseményekről (Stripe kifizetések)
 StripePayoutList=Stripe kifizetések listája
@@ -69,4 +71,8 @@ ToOfferALinkForLiveWebhook=Link a Stripe WebHook beállításához az IPN hívá
 PaymentWillBeRecordedForNextPeriod=A fizetés a következő időszakra kerül rögzítésre.
 ClickHereToTryAgain=<a href="%s">Kattintson ide az újrapróbálkozáshoz...</a>
 CreationOfPaymentModeMustBeDoneFromStripeInterface=Az erős ügyfél-hitelesítési szabályok miatt a kártyát a Stripe backoffice-ból kell létrehozni. Ide kattintva bekapcsolhatja a Stripe ügyfélrekordot: %s
-TERMINAL_LOCATION=A terminálok helye (címe).
+STRIPE_CARD_PRESENT=Card Present for Stripe Terminals
+TERMINAL_LOCATION=Location (address) for Stripe Terminals
+RequestDirectDebitWithStripe=Request Direct Debit with Stripe
+STRIPE_SEPA_DIRECT_DEBIT=Enable the Direct Debit payments through Stripe
+
diff --git a/htdocs/langs/hu_HU/ticket.lang b/htdocs/langs/hu_HU/ticket.lang
index 431c2e7fafb..e398527a5a8 100644
--- a/htdocs/langs/hu_HU/ticket.lang
+++ b/htdocs/langs/hu_HU/ticket.lang
@@ -26,6 +26,7 @@ Permission56002=Jegyek módosítása
 Permission56003=Jegyek törlése
 Permission56004=Jegyek kezelése
 Permission56005=Minden harmadik fél jegyeinek megtekintése (külső felhasználókra nem érvényes, mindig csak arra a harmadik félre korlátozódjon, akitől függnek)
+Permission56006=Export tickets
 
 Tickets=Jegyek
 TicketDictType=Jegy - típusok
@@ -61,6 +62,8 @@ TypeContact_ticket_external_CONTRIBUTOR=Külső közreműködő
 OriginEmail=Jelentés e-mail
 Notify_TICKET_SENTBYMAIL=Jegy üzenet küldése e-mailben
 
+ExportDataset_ticket_1=Jegyek
+
 # Status
 Read=Olvasás
 Assigned=Hozzárendelve
diff --git a/htdocs/langs/hu_HU/users.lang b/htdocs/langs/hu_HU/users.lang
index 0ac9fc3a4b2..84825d582c3 100644
--- a/htdocs/langs/hu_HU/users.lang
+++ b/htdocs/langs/hu_HU/users.lang
@@ -66,7 +66,8 @@ LinkedToDolibarrUser=Link a felhasználóhoz
 LinkedToDolibarrThirdParty=Link harmadik félhez
 CreateDolibarrLogin=Felhasználó létrehozása
 CreateDolibarrThirdParty=Harmadik fél létrehozása
-LoginAccountDisableInDolibarr=Fiók kiakapcsolva a Dolibarrban.
+LoginAccountDisableInDolibarr=Account disabled in Dolibarr
+PASSWORDInDolibarr=Password modified in Dolibarr
 UsePersonalValue=Személyes érték használata
 ExportDataset_user_1=Felhasználók és tulajdonságaik
 DomainUser=Domain felhasználók %s
@@ -129,3 +130,6 @@ IPLastLogin=Utolsó bejelentkezés IP címe
 IPPreviousLogin=Előző bejelentkezés IP címe
 ShowAllPerms=Show all permission rows
 HideAllPerms=Hide all permission rows
+UserPublicPageDesc=You can enable a virtual card for this user. An url with the user profile and a barcode will be available to allow anybody with a smartphone to scan it and add your contact to its address book.
+EnablePublicVirtualCard=Enable the public virtual user card
+PublicVirtualCardUrl=Public virtual user card
diff --git a/htdocs/langs/id_ID/accountancy.lang b/htdocs/langs/id_ID/accountancy.lang
index 285fde719c3..3bd57c6f8ad 100644
--- a/htdocs/langs/id_ID/accountancy.lang
+++ b/htdocs/langs/id_ID/accountancy.lang
@@ -14,8 +14,8 @@ ACCOUNTING_EXPORT_ENDLINE=Pilih jenis pengembalian angkutan
 ACCOUNTING_EXPORT_PREFIX_SPEC=Tentukan awalan untuk nama file
 ThisService=Layanan ini
 ThisProduct=Produk ini
-DefaultForService=Standar untuk Layanan
-DefaultForProduct=Standar untuk Produk
+DefaultForService=Default for services
+DefaultForProduct=Default for products
 ProductForThisThirdparty=Produk untuk pihak ketiga ini
 ServiceForThisThirdparty=Layanan untuk pihak ketiga ini
 CantSuggest=Tidak bisa menyarankan
@@ -101,7 +101,8 @@ ShowAccountingAccount=Tampilkan akun akuntansi
 ShowAccountingJournal=Tampilkan jurnal akuntansi
 ShowAccountingAccountInLedger=Tampilkan akun akuntansi dalam buku besar
 ShowAccountingAccountInJournals=Tampilkan akun akuntansi di jurnal
-AccountAccountingSuggest=Akun akuntansi yang disarankan
+DataUsedToSuggestAccount=Data used to suggest account
+AccountAccountingSuggest=Account suggested
 MenuDefaultAccounts=Akun standar
 MenuBankAccounts=Akun bank
 MenuVatAccounts=Akun PPN
@@ -126,6 +127,7 @@ WriteBookKeeping=Record transactions in accounting
 Bookkeeping=Buku Besar
 BookkeepingSubAccount=Subledger
 AccountBalance=Saldo akun
+AccountBalanceSubAccount=Sub-accounts balance
 ObjectsRef=Referensi sumber objek
 CAHTF=Jumlah total pembelian vendor sebelum pajak
 TotalExpenseReport=Jumlah total laporan pengeluaran
@@ -189,6 +191,7 @@ ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Account (from the Chart Of Account) to be us
 UseAuxiliaryAccountOnCustomerDeposit=Store customer account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
 ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Account (from the Chart Of Account) to be used as the default
 UseAuxiliaryAccountOnSupplierDeposit=Store supplier account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
+ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY=Accounting account by default to register customer retained warranty
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased within same country (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased from EEC to another EEC country (used if not defined in the product sheet)
@@ -218,6 +221,7 @@ JournalLabel=Label jurnal
 NumPiece=Jumlah potongan
 TransactionNumShort=Tidak. transaksi
 AccountingCategory=Custom group of accounts
+AccountingCategories=Custom groups of accounts
 GroupByAccountAccounting=Kelompokkan menurut akun buku besar
 GroupBySubAccountAccounting=Kelompokkan menurut akun subledger
 AccountingAccountGroupsDesc=Anda dapat mendefinisikan di sini beberapa grup akun akuntansi. Mereka akan digunakan untuk laporan akuntansi yang dipersonalisasi.
@@ -265,6 +269,7 @@ ShowSubtotalByGroup=Tunjukkan subtotal menurut level
 
 Pcgtype=Grup akun
 PcgtypeDesc=Grup akun digunakan sebagai kriteria 'filter' dan 'pengelompokan' yang telah ditentukan sebelumnya untuk beberapa laporan akuntansi. Misalnya, 'PENGHASILAN' atau 'BEBAN' digunakan sebagai grup untuk akun akuntansi produk untuk membangun laporan pengeluaran / pendapatan.
+AccountingCategoriesDesc=Custom group of accounts can be used to group accounting accounts into one name to ease filter use or building of custom reports.
 
 Reconcilable=Dapat didamaikan
 
@@ -294,6 +299,7 @@ DescValidateMovements=Setiap modifikasi atau penghapusan tulisan, huruf dan peng
 
 ValidateHistory=Mengikat Secara Otomatis
 AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
+DoManualBindingForFailedRecord=You have to do a manual link for the %s row(s) not linked automatically.
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot remove or disable this account of chart of account because it is used
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s & Credit = %s
@@ -337,11 +343,13 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=Nonaktifkan pengikatan & transfer akuntansi
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Nonaktifkan pengikatan & transfer akuntansi pada pembelian (faktur vendor tidak akan diperhitungkan dalam akuntansi)
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Nonaktifkan pengikatan & transfer akuntansi pada laporan pengeluaran (laporan pengeluaran tidak akan diperhitungkan dalam akuntansi)
 ACCOUNTING_ENABLE_LETTERING=Enable the lettering function in the accounting
+ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
 
 ## Export
 NotExportLettering=Do not export the lettering when generating the file
 NotifiedExportDate=Flag exported lines as Exported <span class="warning">(to modify a line, you will need to delete the whole transaction and re-transfert it into accounting)</span>
 NotifiedValidationDate=Validate and Lock the exported entries <span class="warning">(same effect than the "%s" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+NotifiedExportFull=Export documents ?
 DateValidationAndLock=Date validation and lock
 ConfirmExportFile=Konfirmasi pembuatan file ekspor akuntansi?
 ExportDraftJournal=Ekspor draft jurnal
@@ -398,7 +406,7 @@ SaleLocal=Penjualan lokal
 SaleExport=Penjualan ekspor
 SaleEEC=Dijual dalam EEC
 SaleEECWithVAT=Dijual dalam EEC dengan PPN bukan nol, jadi kami mengira ini BUKAN penjualan intracommunautary dan akun yang disarankan adalah akun produk standar.
-SaleEECWithoutVATNumber=Dijual dalam EEC tanpa PPN tetapi ID PPN pihak ketiga tidak ditentukan. Kami mundur pada akun produk untuk penjualan standar. Anda dapat memperbaiki ID PPN pihak ketiga atau akun produk jika diperlukan.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the thirdparty, or change the product account suggested for binding if needed.
 ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
 ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
 ## Dictionary
@@ -442,6 +450,7 @@ AccountancyErrorMismatchLetterCode=Mismatch in reconcile code
 AccountancyErrorMismatchBalanceAmount=The balance (%s) is not equal to 0
 AccountancyErrorLetteringBookkeeping=Errors have occurred concerning the transactions: %s
 ErrorAccountNumberAlreadyExists=The accounting number %s already exists
+ErrorArchiveAddFile=Can't put "%s" file in archive
 
 ## Import
 ImportAccountingEntries=Entri akuntansi
@@ -468,5 +477,7 @@ FECFormatMulticurrencyCode=Kode multi mata uang (Idevise)
 DateExport=Tanggal ekspor
 WarningReportNotReliable=Peringatan, laporan ini tidak didasarkan pada Buku Besar, jadi tidak mengandung transaksi yang dimodifikasi secara manual di Buku Besar. Jika jurnal Anda sudah mutakhir, tampilan pembukuan lebih akurat.
 ExpenseReportJournal=Jurnal Laporan Biaya
+DocsAlreadyExportedAreExcluded=Docs already exported are excluded
+ClickToHideAlreadyExportedLines=Click to hide already exported lines
 
 NAccounts=akun %s
diff --git a/htdocs/langs/id_ID/main.lang b/htdocs/langs/id_ID/main.lang
index fe79854e0be..c1561ca1878 100644
--- a/htdocs/langs/id_ID/main.lang
+++ b/htdocs/langs/id_ID/main.lang
@@ -226,6 +226,7 @@ NoUserGroupDefined=Tidak ada grup pengguna yang ditentukan
 Password=Kata kunci
 PasswordRetype=Repeat your password
 NoteSomeFeaturesAreDisabled=Perhatikan bahwa banyak fitur / modul dinonaktifkan dalam demonstrasi ini.
+YourUserFile=Your user file
 Name=Nama
 NameSlashCompany=Nama / Perusahaan
 Person=Orang
@@ -897,6 +898,9 @@ MassFilesArea=Area untuk file yang dibangun oleh aksi massal
 ShowTempMassFilesArea=Tampilkan area file yang dibangun oleh aksi massal
 ConfirmMassDeletion=Konfirmasi Penghapusan Massal
 ConfirmMassDeletionQuestion=Anda yakin ingin menghapus catatan terpilih %s?
+ConfirmMassClone=Bulk clone confirmation
+ConfirmMassCloneQuestion=Select project to clone to
+ConfirmMassCloneToOneProject=Clone to project %s
 RelatedObjects=Objek Terkait
 ClassifyBilled=Klasifikasi ditagih
 ClassifyUnbilled=Klasifikasi tidak ditagih
@@ -912,8 +916,8 @@ ExportFilteredList=Ekspor daftar yang difilter
 ExportList=Daftar ekspor
 ExportOptions=Opsi Ekspor
 IncludeDocsAlreadyExported=Sertakan dokumen yang sudah diekspor
-ExportOfPiecesAlreadyExportedIsEnable=Ekspor potongan yang sudah diekspor dimungkinkan
-ExportOfPiecesAlreadyExportedIsDisable=Ekspor potongan yang sudah diekspor dinonaktifkan
+ExportOfPiecesAlreadyExportedIsEnable=Documents already exported are visible and will be exported
+ExportOfPiecesAlreadyExportedIsDisable=Documents already exported are hidden and won't be exported
 AllExportedMovementsWereRecordedAsExported=Semua pergerakan yang diekspor dicatat sebagai yang diekspor
 NotAllExportedMovementsCouldBeRecordedAsExported=Tidak semua pergerakan yang diekspor dapat dicatat sebagai yang diekspor
 Miscellaneous=Lain-lain
@@ -1128,6 +1132,7 @@ DeleteFileText=Anda yakin ingin menghapus file ini?
 ShowOtherLanguages=Tampilkan bahasa lain
 SwitchInEditModeToAddTranslation=Alihkan dalam mode edit untuk menambahkan terjemahan untuk bahasa ini
 NotUsedForThisCustomer=Tidak digunakan untuk pelanggan ini
+NotUsedForThisVendor=Not used for this vendor
 AmountMustBePositive=Jumlahnya harus positif
 ByStatus=Menurut status
 InformationMessage=Informasi
@@ -1148,14 +1153,14 @@ EventReminder=Pengingat Acara
 UpdateForAllLines=Perbarui untuk semua lini
 OnHold=Tertahan
 Civility=Kesopanan
-AffectTag=Assign Tag
-AffectUser=Assign User
-SetSupervisor=Set Supervisor
+AffectTag=Assign a Tag
+AffectUser=Assign a User
+SetSupervisor=Set the supervisor
 CreateExternalUser=Buat pengguna eksternal
 ConfirmAffectTag=Bulk Tag Assignement
 ConfirmAffectUser=Bulk User Assignement
-ProjectRole=Role assigned on each project
-TasksRole=Role assigned on each task of each project
+ProjectRole=Role assigned on each project/opportunity
+TasksRole=Role assigned on each task (if used)
 ConfirmSetSupervisor=Bulk Supervisor Set
 ConfirmUpdatePrice=Choose a increase/decrease price rate
 ConfirmAffectTagQuestion=Are you sure you want to assign tags to the %s selected record(s)?
@@ -1210,3 +1215,10 @@ CreatedByPublicPortal=Created from Public portal
 UserAgent=User Agent
 InternalUser=Pengguna internal
 ExternalUser=Pengguna eksternal
+NoSpecificContactAddress=No specific contact or address
+NoSpecificContactAddressBis=This tab is dedicated to force specific contacts or addresses for the current object. Use it only if you want to define one or several specific contacts or addresses for the object when the information on the thirdparty is not enough or not accurate.
+HideOnVCard=Hide %s
+AddToContacts=Add address to my contacts
+LastAccess=Last access
+UploadAnImageToSeeAPhotoHere=Upload an image from the tab %s to see a photo here
+LastPasswordChangeDate=Last password change date
diff --git a/htdocs/langs/id_ID/stripe.lang b/htdocs/langs/id_ID/stripe.lang
index 6719ab69746..7bd6a28bd8e 100644
--- a/htdocs/langs/id_ID/stripe.lang
+++ b/htdocs/langs/id_ID/stripe.lang
@@ -41,7 +41,8 @@ STRIPE_LIVE_WEBHOOK_KEY=Kata kunci webhook live
 ONLINE_PAYMENT_WAREHOUSE=Stok yang akan digunakan untuk penurunan stok ketika pembayaran online dilakukan <br> (TODO Kapan opsi untuk mengurangi stok dilakukan atas tindakan faktur dan pembayaran online menghasilkan sendiri faktur itu?)
 StripeLiveEnabled=Stripe langsung diaktifkan (jika tidak, uji / mode kotak pasir)
 StripeImportPayment=Impor pembayaran Stripe
-ExampleOfTestCreditCard=Contoh kartu kredit untuk pengujian: %s => valid, %s => error CVC, %s => kedaluwarsa, %s => tagihan gagal
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+ExampleOfTestBankAcountForSEPA=Example of bank account BAN for direct debit test: %s
 StripeGateways=Gerbang gateway Stripe
 OAUTH_STRIPE_TEST_ID=Stripe Connect ID Klien (ca_...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect ID Klien (ca _...)
@@ -61,6 +62,7 @@ DeleteACard=Hapus Kartu
 ConfirmDeleteCard=Anda yakin ingin menghapus kartu Kredit atau Debit ini?
 CreateCustomerOnStripe=Buat pelanggan di Stripe
 CreateCardOnStripe=Buat kartu di Stripe
+CreateBANOnStripe=Create bank on Stripe
 ShowInStripe=Tunjukkan di Stripe
 StripeUserAccountForActions=Akun pengguna yang akan digunakan untuk pemberitahuan email tentang beberapa acara Stripe (pembayaran Stripe)
 StripePayoutList=Daftar pembayaran Stripe
@@ -69,3 +71,8 @@ ToOfferALinkForLiveWebhook=Tautan ke setup Stripe WebHook untuk memanggil IPN (l
 PaymentWillBeRecordedForNextPeriod=Pembayaran akan dicatat untuk periode berikutnya.
 ClickHereToTryAgain= <a href="%s"> Klik di sini untuk mencoba lagi ... </a>
 CreationOfPaymentModeMustBeDoneFromStripeInterface=Karena aturan Otentikasi Pelanggan yang Kuat, pembuatan kartu harus dilakukan dari Stripe backoffice. Anda dapat mengklik di sini untuk mengaktifkan catatan pelanggan Stripe: %s
+STRIPE_CARD_PRESENT=Card Present for Stripe Terminals
+TERMINAL_LOCATION=Location (address) for Stripe Terminals
+RequestDirectDebitWithStripe=Request Direct Debit with Stripe
+STRIPE_SEPA_DIRECT_DEBIT=Enable the Direct Debit payments through Stripe
+
diff --git a/htdocs/langs/id_ID/users.lang b/htdocs/langs/id_ID/users.lang
index c46642b185f..6f688ab7e1b 100644
--- a/htdocs/langs/id_ID/users.lang
+++ b/htdocs/langs/id_ID/users.lang
@@ -66,7 +66,8 @@ LinkedToDolibarrUser=Tautan ke pengguna
 LinkedToDolibarrThirdParty=Tautan ke pihak ketiga
 CreateDolibarrLogin=Buat pengguna
 CreateDolibarrThirdParty=Buat pihak ketiga
-LoginAccountDisableInDolibarr=Akun dinonaktifkan di Dolibarr.
+LoginAccountDisableInDolibarr=Account disabled in Dolibarr
+PASSWORDInDolibarr=Password modified in Dolibarr
 UsePersonalValue=Gunakan nilai pribadi
 ExportDataset_user_1=Pengguna dan propertinya
 DomainUser=Pengguna domain %s
@@ -129,3 +130,6 @@ IPLastLogin=IP last login
 IPPreviousLogin=IP previous login
 ShowAllPerms=Show all permission rows
 HideAllPerms=Hide all permission rows
+UserPublicPageDesc=You can enable a virtual card for this user. An url with the user profile and a barcode will be available to allow anybody with a smartphone to scan it and add your contact to its address book.
+EnablePublicVirtualCard=Enable the public virtual user card
+PublicVirtualCardUrl=Public virtual user card
diff --git a/htdocs/langs/is_IS/users.lang b/htdocs/langs/is_IS/users.lang
index 7501d233740..3f02257d267 100644
--- a/htdocs/langs/is_IS/users.lang
+++ b/htdocs/langs/is_IS/users.lang
@@ -66,7 +66,8 @@ LinkedToDolibarrUser=Link to user
 LinkedToDolibarrThirdParty=Link to third party
 CreateDolibarrLogin=Búa til notanda
 CreateDolibarrThirdParty=Búa til þriðja aðila
-LoginAccountDisableInDolibarr=Reikningur óvirkur í Dolibarr.
+LoginAccountDisableInDolibarr=Account disabled in Dolibarr
+PASSWORDInDolibarr=Password modified in Dolibarr
 UsePersonalValue=Nota persónulega gildi
 ExportDataset_user_1=Users and their properties
 DomainUser=Lén notanda %s
@@ -129,3 +130,6 @@ IPLastLogin=IP last login
 IPPreviousLogin=IP previous login
 ShowAllPerms=Show all permission rows
 HideAllPerms=Hide all permission rows
+UserPublicPageDesc=You can enable a virtual card for this user. An url with the user profile and a barcode will be available to allow anybody with a smartphone to scan it and add your contact to its address book.
+EnablePublicVirtualCard=Enable the public virtual user card
+PublicVirtualCardUrl=Public virtual user card
diff --git a/htdocs/langs/it_IT/accountancy.lang b/htdocs/langs/it_IT/accountancy.lang
index dcb26040ba9..6426a252743 100644
--- a/htdocs/langs/it_IT/accountancy.lang
+++ b/htdocs/langs/it_IT/accountancy.lang
@@ -14,8 +14,8 @@ ACCOUNTING_EXPORT_ENDLINE=Seleziona il tipo di ritorno a capo
 ACCOUNTING_EXPORT_PREFIX_SPEC=Specificare il prefisso per il nome del file
 ThisService=Questo servizio
 ThisProduct=Questo prodotto
-DefaultForService=Predefinito per servizio
-DefaultForProduct=Predefinito per prodotto
+DefaultForService=Default for services
+DefaultForProduct=Default for products
 ProductForThisThirdparty=Prodotto per questa terza parte
 ServiceForThisThirdparty=Servizi per questo soggetto terzo
 CantSuggest=Non posso suggerire
@@ -101,7 +101,8 @@ ShowAccountingAccount=Mostra conti di contabilità
 ShowAccountingJournal=Mostra giornale
 ShowAccountingAccountInLedger=Mostra conto contabile nel libro mastro
 ShowAccountingAccountInJournals=Mostra conto contabile nei giornali di registrazione
-AccountAccountingSuggest=Conto suggerito per contabilità
+DataUsedToSuggestAccount=Data used to suggest account
+AccountAccountingSuggest=Account suggested
 MenuDefaultAccounts=Conti predefiniti
 MenuBankAccounts=Conti bancari
 MenuVatAccounts=Conti IVA
@@ -126,6 +127,7 @@ WriteBookKeeping=Registra i movimenti in contabilità
 Bookkeeping=Libro contabile
 BookkeepingSubAccount=Conto secondario
 AccountBalance=Saldo
+AccountBalanceSubAccount=Sub-accounts balance
 ObjectsRef=Sorgente oggetto in riferimento
 CAHTF=Totale acquisto al lordo delle imposte
 TotalExpenseReport=Rapporto spese totale
@@ -189,6 +191,7 @@ ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Account (from the Chart Of Account) to be us
 UseAuxiliaryAccountOnCustomerDeposit=Memorizzare il conto cliente come conto individuale nel libro mastro sussidiario per le righe di acconto (se disabilitato, il conto individuale per le righe di acconto rimarrà vuoto)
 ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Account (from the Chart Of Account) to be used as the default
 UseAuxiliaryAccountOnSupplierDeposit=Memorizzare il conto fornitore come conto individuale nel libro mastro sussidiario per le righe di acconto (se disabilitato, il conto individuale per le righe di acconto rimarrà vuoto)
+ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY=Accounting account by default to register customer retained warranty
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased within same country (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased from EEC to another EEC country (used if not defined in the product sheet)
@@ -218,6 +221,7 @@ JournalLabel=Etichetta del giornale
 NumPiece=Numero del pezzo
 TransactionNumShort=Num. movimento
 AccountingCategory=Custom group of accounts
+AccountingCategories=Custom groups of accounts
 GroupByAccountAccounting=Raggruppa per conto di contabilità generale
 GroupBySubAccountAccounting=Raggruppa per conto secondario
 AccountingAccountGroupsDesc=Qui puoi definire alcuni gruppi di conti contabili. Saranno utilizzati per rapporti contabili personalizzati.
@@ -265,6 +269,7 @@ ShowSubtotalByGroup=Mostra il totale parziale per livello
 
 Pcgtype=Gruppo di conto
 PcgtypeDesc=Il gruppo di conti viene utilizzato come criterio 'filtro' e 'raggruppamento' predefiniti per alcuni report contabili. Ad esempio, "RICAVO" o "COSTO" sono utilizzati come gruppi per la contabilità dei prodotti per creare il rapporto costi / ricavi.
+AccountingCategoriesDesc=Custom group of accounts can be used to group accounting accounts into one name to ease filter use or building of custom reports.
 
 Reconcilable=riconciliabile
 
@@ -294,6 +299,7 @@ DescValidateMovements=Qualsiasi modifica o cancellazione di scrittura, lettura e
 
 ValidateHistory=Collega automaticamente
 AutomaticBindingDone=Associazioni automatiche eseguite (%s) - Associazioni automatiche non possibili per alcuni record (%s)
+DoManualBindingForFailedRecord=You have to do a manual link for the %s row(s) not linked automatically.
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot remove or disable this account of chart of account because it is used
 MvtNotCorrectlyBalanced=Movimento non correttamente bilanciato. Debito = %s e credito = %s
@@ -337,11 +343,13 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=Disabilita vincolante e trasferimento in con
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disabilita vincolante e trasferimento in contabilità sugli acquisti (le fatture fornitore non verranno prese in considerazione in contabilità)
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disabilita binding e trasferimento in contabilità sulle note spese (le note spese non verranno prese in considerazione in contabilità)
 ACCOUNTING_ENABLE_LETTERING=Enable the lettering function in the accounting
+ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
 
 ## Export
 NotExportLettering=Do not export the lettering when generating the file
 NotifiedExportDate=Contrassegna le righe esportate come Esportate <span class="warning"> (per modificare una riga è necessario eliminare l'intera transazione e ritrasferirla in contabilità) </span>
 NotifiedValidationDate=Convalida e Blocca le voci esportate <span class="warning"> (stesso effetto della funzione "%s", la modifica e la cancellazione delle righe NON sarà SICURAMENTE possibile) </span>
+NotifiedExportFull=Export documents ?
 DateValidationAndLock=Convalida e blocco della data
 ConfirmExportFile=Conferma della generazione del file di esportazione contabile?
 ExportDraftJournal=Esporta giornale in bozza
@@ -398,7 +406,7 @@ SaleLocal=Local sale
 SaleExport=Export sale
 SaleEEC=Vendite intracomunitarie (CEE)
 SaleEECWithVAT=Vendita in CEE con IVA non nulla, quindi supponiamo che questa NON sia una vendita intracomunitaria e l'account suggerito sia l'account standard del prodotto.
-SaleEECWithoutVATNumber=La vendita nella CEE senza IVA ma la partita IVA di terzi non è definita. Eseguiamo il fallback sull'account del prodotto per le vendite standard. È possibile correggere l'ID IVA di terze parti o l'account del prodotto, se necessario.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the thirdparty, or change the product account suggested for binding if needed.
 ForbiddenTransactionAlreadyExported=Vietato: la transazione è stata convalidata e/o esportata.
 ForbiddenTransactionAlreadyValidated=Vietato: il movimento è stato convalidato.
 ## Dictionary
@@ -442,6 +450,7 @@ AccountancyErrorMismatchLetterCode=Mancata corrispondenza nel codice di riconcil
 AccountancyErrorMismatchBalanceAmount=Il saldo (%s) non è uguale a 0
 AccountancyErrorLetteringBookkeeping=Si sono verificati errori relativi alle transazioni: %s
 ErrorAccountNumberAlreadyExists=Il numero contabile %s esiste già
+ErrorArchiveAddFile=Can't put "%s" file in archive
 
 ## Import
 ImportAccountingEntries=Accounting entries
@@ -468,5 +477,7 @@ FECFormatMulticurrencyCode=Codice multivaluta (Idevise)
 DateExport=Data esportazione
 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.
 ExpenseReportJournal=Giornale note spese
+DocsAlreadyExportedAreExcluded=Docs already exported are excluded
+ClickToHideAlreadyExportedLines=Click to hide already exported lines
 
 NAccounts=%s account
diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang
index c787126d4c5..f877e9ef1c2 100644
--- a/htdocs/langs/it_IT/admin.lang
+++ b/htdocs/langs/it_IT/admin.lang
@@ -292,7 +292,7 @@ MAIN_MAIL_SMTP_SERVER=Host SMTP / SMTPS (predefinito in php.ini: <b>%s</b> )
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Porta SMTP / SMTPS (non definita in PHP su sistemi Unix-like)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Host SMTP / SMTPS (non definito in PHP su sistemi Unix-like)
 MAIN_MAIL_EMAIL_FROM=Indirizzo mittente per le email automatiche (predefinito in php.ini: <b>%s</b> )
-EMailHelpMsgSPFDKIM=To prevent Dolibarr emails to be classified as spam, make sure that the server is authorized to send e-mails from this address by SPF and DKIM configuration
+EMailHelpMsgSPFDKIM=Per evitare che le email di Dolibarr vengano classificate come spam, assicurati che il server sia autorizzato a inviare e-mail da questo indirizzo tramite configurazione SPF e DKIM
 MAIN_MAIL_ERRORS_TO=Indirizzo a cui inviare eventuali errori (campi 'Errors-To' nelle email inviate)
 MAIN_MAIL_AUTOCOPY_TO= Indirizzo a cui inviare in copia Ccn tutte le mail in uscita
 MAIN_DISABLE_ALL_MAILS=Disabilita l'invio delle email (a scopo di test o demo)
@@ -502,8 +502,8 @@ WarningPHPMail=ATTENZIONE: la configurazione per inviare e-mail dall'applicazion
 WarningPHPMailA=- L'utilizzo del server del provider di servizi di posta elettronica aumenta l'affidabilità della tua e-mail, quindi aumenta la consegna senza essere contrassegnato come SPAM
 WarningPHPMailB=- Alcuni provider di servizi di posta elettronica (come Yahoo) non consentono di inviare un'e-mail da un server diverso dal proprio server. La tua configurazione attuale utilizza il server dell'applicazione per inviare e-mail e non il server del tuo provider di posta elettronica, quindi alcuni destinatari (quello compatibile con il protocollo restrittivo DMARC), chiederanno al tuo provider di posta elettronica se possono accettare la tua posta e alcuni provider di posta elettronica (come Yahoo) potrebbe rispondere "no" perché il server non è il loro, quindi alcune delle tue email inviate potrebbero non essere accettate per la consegna (attenzione anche alla quota di invio del tuo provider di posta elettronica).
 WarningPHPMailC=- Anche l'utilizzo del server SMTP del tuo provider di servizi di posta elettronica per inviare e-mail è interessante, quindi tutte le e-mail inviate dall'applicazione verranno salvate anche nella directory "Inviati" della tua casella di posta.
-WarningPHPMailD=It is therefore recommended to change the sending method of e-mails to the value "SMTP".
-WarningPHPMailDbis=If you really want to keep the default "PHP" method to send emails, just ignore this warning, or remove it by %sclicking here%s.
+WarningPHPMailD=Si consiglia pertanto di modificare il metodo di invio delle email al valore "SMTP".
+WarningPHPMailDbis=Se vuoi davvero mantenere il metodo "PHP" predefinito per inviare e-mail, ignora questo avviso o rimuovilo con %s cliccando qui %s.
 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=Se il nome a dominio dell'indirizzo email del tuo mittente è protetto da un record SPF (chiedi al tuo registar del nome a dominio), devi aggiungere i seguenti IP nel record SPF del DNS del tuo dominio: <strong> %s </strong> .
 ActualMailSPFRecordFound=Trovato record SPF effettivo (per e-mail %s): %s
@@ -645,6 +645,8 @@ Module2300Name=Processi pianificati
 Module2300Desc=Gestione delle operazioni pianificate
 Module2400Name=Eventi/Agenda
 Module2400Desc=Gestione eventi/compiti e ordine del giorno. Registra manualmente eventi nell'agenda o consenti all'applicazione di registrare eventi automaticamente a scopo di monitoraggio. Questo è il modulo principale per una buona gestione delle relazioni con clienti e fornitori. 
+Module2430Name=Calendario Prenotazioni
+Module2430Desc=Fornisce un calendario online per la prenotazione di riunioni in base a fasce predefinite o disponibilità.
 Module2500Name=DMS / ECM
 Module2500Desc=Sistema di gestione documentale / Gestione elettronica dei contenuti. Organizzazione automatica dei documenti generati o archiviati. Condivisione con chi ne ha bisogno.
 Module2600Name=API / Web services (server SOAP)
@@ -660,6 +662,8 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=Localizzazione degli accessi tramite GeoIP Maxmind
 Module3200Name=Archivi inalterabili
 Module3200Desc=Abilita un registro inalterabile degli eventi aziendali. Gli eventi sono archiviati in tempo reale. Il registro è una tabella di sola lettura degli eventi concatenati che possono essere esportati. Questo modulo potrebbe essere obbligatorio per alcuni paesi.
+Module3300Name=Costruttore di moduli
+Module3200Desc=Abilita un registro inalterabile degli eventi aziendali. Gli eventi sono archiviati in tempo reale. Il registro è una tabella di sola lettura degli eventi concatenati che possono essere esportati. Questo modulo potrebbe essere obbligatorio per alcuni paesi.
 Module3400Name=Social Networks
 Module3400Desc=Abilita i campi Social Network in terze parti e indirizzi (skype, twitter, facebook, ...).
 Module4000Name=Risorse umane
@@ -974,14 +978,14 @@ Permission3301=Genera nuovi moduli
 Permission4001=Leggi abilità/lavoro/posizione
 Permission4002=Crea/modifica abilità/lavoro/posizione
 Permission4003=Elimina abilità/lavoro/posizione
-Permission4021=Read evaluations (yours and your subordinates)
-Permission4022=Create/modify evaluations
-Permission4023=Validate evaluation
-Permission4025=Delete evaluation
-Permission4028=See comparison menu
+Permission4021=Leggere le valutazioni (tue e dei tuoi subordinati)
+Permission4022=Crea/modifica valutazioni
+Permission4023=Convalida la valutazione
+Permission4025=Elimina valutazione
+Permission4028=Guarda il menu di confronto
 Permission4031=Leggi le informazioni personali
 Permission4032=Scrivi informazioni personali
-Permission4033=Read all evaluations (even those of user not subordinates)
+Permission4033=Leggi tutte le valutazioni (anche quelle di utenti non subordinati)
 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.
@@ -1252,7 +1256,7 @@ AreaForAdminOnly=I parametri di setup possono essere definiti solo da utenti di
 SystemInfoDesc=Le informazioni di sistema sono dati tecnici visibili in sola lettura e solo dagli amministratori.
 SystemAreaForAdminOnly=Questa area è disponibile solo per gli utenti amministratori. Le autorizzazioni utente Dolibarr non possono modificare questa limitazione.
 CompanyFundationDesc=Modifica le informazioni dell'azienda / fondazione. Fai clic sul pulsante "%s" nella parte inferiore della pagina.
-MoreNetworksAvailableWithModule=More social networks may be available by enabling the module "Social networks".
+MoreNetworksAvailableWithModule=Ulteriori social network potrebbero essere disponibili abilitando il modulo "Social network".
 AccountantDesc=Se hai un contabile / contabile esterno, puoi modificare qui le sue informazioni.
 AccountantFileNumber=Accountant code
 DisplayDesc=I parametri che influenzano l'aspetto e la presentazione dell'applicazione possono essere modificati qui.
@@ -1270,6 +1274,7 @@ TriggerActiveAsModuleActive=I trigger in questo file sono attivi se il modulo <b
 GeneratedPasswordDesc=Choose the method to be used for auto-generated passwords.
 DictionaryDesc=Inserire tutti i dati di riferimento. È possibile aggiungere i propri valori a quelli di default.
 ConstDesc=Questa pagina consente di modificare (sovrascrivere) i parametri non disponibili in altre pagine. Questi sono parametri principalmente riservati agli sviluppatori o per la risoluzione avanzata dei problemi.
+MiscellaneousOptions=Opzioni varie
 MiscellaneousDesc=Definire qui tutti gli altri parametri relativi alla sicurezza.
 LimitsSetup=Limiti/impostazioni di precisione
 LimitsDesc=Da qui è possibile definire i limiti e la precisione utilizzati da Dolibarr.
@@ -1303,8 +1308,8 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=È necessario eseguire questo c
 YourPHPDoesNotHaveSSLSupport=Il PHP del server non supporta SSL
 DownloadMoreSkins=Scarica altre skin
 SimpleNumRefModelDesc=Restituisce il numero di riferimento nel formato %syymm-nnnn dove yy è l'anno, mm è il mese e nnnn è un numero sequenziale a incremento automatico senza reimpostazione
-SimpleRefNumRefModelDesc=Returns the reference number in the format n where n is a sequential auto-incrementing number with no reset
-AdvancedNumRefModelDesc=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
+SimpleRefNumRefModelDesc=Restituisce il numero di riferimento nel formato n dove n è un numero sequenziale a incremento automatico senza ripristino
+AdvancedNumRefModelDesc=Restituisce il numero di riferimento nel formato %s yymm-nnnn dove yy è l'anno, mm è il mese e nnnn è un numero sequenziale ad incremento automatico senza ripristino
 SimpleNumRefNoDateModelDesc=Restituisce il numero di riferimento nel formato %s-nnnn dove nnnn è un numero sequenziale a incremento automatico senza reimpostazione
 ShowProfIdInAddress=Mostra l'ID professionale con gli indirizzi
 ShowVATIntaInAddress=Nascondi partita IVA intracomunitaria
@@ -1391,7 +1396,7 @@ GetBarCode=Ottieni codice a barre
 NumberingModules=Modelli di numerazione
 DocumentModules=Modelli di documenti
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters.
+PasswordGenerationStandard=Restituisce una password generata secondo l'algoritmo interno di Dolibarr: %s caratteri contenenti numeri e caratteri condivisi.
 PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
 PasswordGenerationPerso=Return a password according to your personally defined configuration.
 SetupPerso=Secondo la tua configurazione
@@ -1445,10 +1450,10 @@ SuppliersPayment=Pagamenti fornitori
 SupplierPaymentSetup=Impostazioni pagamenti fornitori
 InvoiceCheckPosteriorDate=Controllare la data di fabbricazione prima della convalida
 InvoiceCheckPosteriorDateHelp=La convalida di una fattura sarà vietata se la sua data è anteriore alla data dell'ultima fattura dello stesso tipo.
-InvoiceOptionCategoryOfOperations=Display the mention "category of operations" on the invoice.
-InvoiceOptionCategoryOfOperationsHelp=Depending on the situation, the mention will appear in the form:<br>- Category of operations: Delivery of goods<br>- Category of operations: Provision of services<br>- Category of operations: Mixed - Delivery of goods & provision of services
-InvoiceOptionCategoryOfOperationsYes1=Yes, below the address block
-InvoiceOptionCategoryOfOperationsYes2=Yes, in the lower left-hand corner
+InvoiceOptionCategoryOfOperations=Visualizzare la citazione "categoria di operazioni" sulla fattura.
+InvoiceOptionCategoryOfOperationsHelp=A seconda della situazione, la citazione apparirà nella forma: <br>- Categoria di operazioni: Consegna di merci<br>- Categoria di operazioni: Prestazione di servizi<br>- Categoria di operazioni: Miste - Consegna di beni e prestazione di servizi
+InvoiceOptionCategoryOfOperationsYes1=Sì, sotto il blocco indirizzo
+InvoiceOptionCategoryOfOperationsYes2=Sì, nell'angolo in basso a sinistra
 ##### Proposals #####
 PropalSetup=Impostazioni proposte commerciali
 ProposalsNumberingModules=Modelli di numerazione della proposta commerciale
@@ -1491,12 +1496,12 @@ WatermarkOnDraftContractCards=Bozze dei contratti filigranate (nessuna filigrana
 ##### Members #####
 MembersSetup=Impostazioni modulo membri
 MemberMainOptions=Opzioni principali
-MemberCodeChecker=Options for automatic generation of member codes
+MemberCodeChecker=Opzioni per la generazione automatica dei codici membro
 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=Crea un login utente esterno per ogni nuovo abbonamento membro convalidato
-VisitorCanChooseItsPaymentMode=Visitor can choose from any available payment modes
+VisitorCanChooseItsPaymentMode=Il visitatore può scegliere tra qualsiasi modalità di pagamento disponibile
 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=Modelli di documento per i documenti generati dal record del membro
 ##### LDAP setup #####
@@ -1758,8 +1763,8 @@ ActivateFCKeditor=Attiva editor avanzato per:
 FCKeditorForNotePublic=WYSIWIG creazione/edizione del campo "note pubbliche" di elementi
 FCKeditorForNotePrivate=WYSIWIG creazione/edizione del campo "note private" degli elementi
 FCKeditorForCompany=WYSIWIG creazione/modifica del campo descrizione degli elementi (esclusi prodotti/servizi)
-FCKeditorForProductDetails=WYSIWIG creation/edition of products description or lines for objects (lines of proposals, orders, invoices, etc...).
-FCKeditorForProductDetails2=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.
+FCKeditorForProductDetails=WYSIWIG creazione/modifica di descrizioni prodotti o linee per oggetti (linee di proposte, ordini, fatture, ecc...).
+FCKeditorForProductDetails2=Attenzione: l'utilizzo di questa opzione per questo caso è seriamente sconsigliato in quanto può creare problemi con i caratteri speciali e la formattazione della pagina durante la creazione di file PDF.
 FCKeditorForMailing= Editor WYSIWIG per le email
 FCKeditorForUserSignature=WYSIWIG creazione/modifica della firma utente
 FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
@@ -1826,6 +1831,9 @@ AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries ->
 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_EVENT_PAST_COLOR=Colore dell'evento passato
+AGENDA_EVENT_CURRENT_COLOR=Colore dell'evento corrente
+AGENDA_EVENT_FUTURE_COLOR=Colore dell'evento futuro
 AGENDA_DEFAULT_VIEW=Quale vista si desidera aprire per impostazione predefinita quando si seleziona il menu Agenda
 AGENDA_REMINDER_BROWSER=Abilita promemoria eventi <b> sul browser dell'utente </b> (Quando viene raggiunta la data del promemoria, il browser mostra un popup. Ogni utente può disabilitare tali notifiche dalla configurazione delle notifiche del browser).
 AGENDA_REMINDER_BROWSER_SOUND=Attiva i suoni per le notifiche
@@ -1853,7 +1861,7 @@ StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatib
 CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sale from Point of Sale. Hence a warehouse is required.
 CashDeskForceDecreaseStockLabel=La riduzione delle scorte per i prodotti batch è stata forzata.
 CashDeskForceDecreaseStockDesc=Diminuisci prima secondo le date più antiche di Eatby e Sellby.
-CashDeskReaderKeyCodeForEnter=Key ASCII code for "Enter" defined in barcode reader (Example: 13)
+CashDeskReaderKeyCodeForEnter=Chiave Codice ASCII per "Invio" definito nel lettore di codici a barre (Esempio: 13)
 ##### Bookmark #####
 BookmarkSetup=Impostazioni modulo segnalibri
 BookmarkDesc=Questo modulo consente di gestire i segnalibri web. È possibile aggiungere collegamenti a pagine Dolibarr o a qualsiasi altro sito web esterno al menu di sinistra.
@@ -1891,7 +1899,7 @@ SuppliersInvoiceNumberingModel=Modello per la numerazione delle fatture fornitor
 IfSetToYesDontForgetPermission=Se impostato su un valore non nullo, non dimenticare di fornire autorizzazioni a gruppi o utenti autorizzati per la seconda approvazione
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=Impostazioni modulo GeoIP Maxmind
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation
+PathToGeoIPMaxmindCountryDataFile=Percorso del file contenente l'ip Maxmind nella traduzione del paese
 NoteOnPathLocation=Nota bene: il file deve trovarsi in una directory leggibile da PHP.
 YouCanDownloadFreeDatFileTo=È disponibile una <b>versione demo gratuita</b> del 'Maxmind GeoIP country file' su %s.
 YouCanDownloadAdvancedDatFileTo=Altrimenti è disponibile <b>una versione completa, con aggiornamenti</b> al seguente indirizzo: %s
@@ -1942,7 +1950,7 @@ BackupDumpWizard=Procedura guidata per creare file di backup del database (dump)
 BackupZipWizard=Procedura guidata per creare l'archivio della directory dei documenti
 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.
-InstallModuleFromWebHasBeenDisabledContactUs=Install or development of external modules or dynamic websites, from the application, is currently locked for security purpose. Please contact us if you need to enable this feature.
+InstallModuleFromWebHasBeenDisabledContactUs=L'installazione o lo sviluppo di moduli esterni o siti Web dinamici, dall'applicazione, è attualmente bloccato per motivi di sicurezza. Contattaci se hai bisogno di abilitare questa funzione.
 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.
 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
@@ -2070,8 +2078,8 @@ RemoveSpecialChars=Rimuovi caratteri speciali
 COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
 COMPANY_DIGITARIA_CLEAN_REGEX=Regex filter su clean value (COMPANY_DIGITARIA_CLEAN_REGEX)
 COMPANY_DIGITARIA_UNIQUE_CODE=Duplicazione non consentita
-RemoveSpecialWords=Clean certain words when generating sub-accounts for customers or suppliers
-RemoveSpecialWordsHelp=Specify the words to be cleaned before calculating the customer or supplier account. Use a ";" between each word
+RemoveSpecialWords=Pulisci alcune parole durante la generazione di sottoconti per clienti o fornitori
+RemoveSpecialWordsHelp=Specificare le parole da pulire prima di calcolare il conto cliente o fornitore. Usare un ";" tra ogni parola
 GDPRContact=DPO (Data Protection Officer) o in italiano RPD (Responsabile della Protezione dei Dati)
 GDPRContactDesc=Se memorizzi dati personali nel tuo Sistema Informativo, puoi nominare qui il contatto responsabile del Regolamento generale sulla protezione dei dati
 HelpOnTooltip=Testo di aiuto da mostrare come tooltip
@@ -2129,6 +2137,7 @@ CodeLastResult=Ultimo codice risultato
 NbOfEmailsInInbox=Numero di e-mail nella directory di origine
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
+LoadContactFromEmailOrCreate=Carica la ricerca dei contatti su %s (creare se non trovato)
 AttachJoinedDocumentsToObject=Salva i file allegati nei documenti oggetto se viene trovato un riferimento di un oggetto nell'argomento e-mail.
 WithDolTrackingID=Messaggio da una conversazione iniziata da una prima email inviata da Dolibarr
 WithoutDolTrackingID=Messaggio da una conversazione iniziata da una prima email NON inviata da Dolibarr
@@ -2189,7 +2198,7 @@ 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
+AtLeastOneDefaultBankAccountMandatory=Almeno 1 conto bancario di default deve essere definito
 RESTRICT_ON_IP=Consenti l'accesso API solo a determinati IP client (carattere jolly non consentito, usa lo spazio tra i valori). Vuoto significa che tutti i client possono accedere.
 IPListExample=127.0.0.1 192.168.0.2 [::1]
 BaseOnSabeDavVersion=Based on the library SabreDAV version
@@ -2203,7 +2212,7 @@ ShowProjectLabel=Etichetta del progetto
 PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME=Includi alias nel nome di terze parti
 THIRDPARTY_ALIAS=Nome terza parte - Alias terza parte
 ALIAS_THIRDPARTY=Alias terza parte - Nome terza parte
-PDFIn2Languages=Show labels into PDF in 2 different languages
+PDFIn2Languages=Mostra le etichette in PDF in 2 lingue diverse
 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.
 PDF_USE_A=Genera documenti PDF in formato PDF/A anziché in formato PDF predefinito
 FafaIconSocialNetworksDesc=Inserisci qui il codice di un'icona FontAwesome. Se non sai cos'è FontAwesome, puoi utilizzare il valore generico fa-address-book.
@@ -2232,12 +2241,12 @@ MailToPartnership=Collaborazione
 AGENDA_EVENT_DEFAULT_STATUS=Stato dell'evento predefinito durante la creazione di un evento dal modulo
 YouShouldDisablePHPFunctions=Dovresti disabilitare le funzioni PHP
 IfCLINotRequiredYouShouldDisablePHPFunctions=Tranne se è necessario eseguire i comandi di sistema nel codice personalizzato, è necessario disabilitare le funzioni PHP
-PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an antivirus program), you must keep PHP functions
+PHPFunctionsRequiredForCLI=Per scopi di shell (come il backup pianificato del lavoro o l'esecuzione di un programma antivirus), è necessario mantenere le funzioni PHP
 NoWritableFilesFoundIntoRootDir=Nessun file scrivibile o directory dei programmi comuni è stato trovato nella directory principale (buono)
 RecommendedValueIs=Consigliato: %s
 Recommended=Raccomandata
 NotRecommended=Non consigliato
-ARestrictedPath=Some restricted path for data files
+ARestrictedPath=Un percorso limitato per i file di dati
 CheckForModuleUpdate=Controlla gli aggiornamenti dei moduli esterni
 CheckForModuleUpdateHelp=Questa azione si collegherà agli editor di moduli esterni per verificare se è disponibile una nuova versione.
 ModuleUpdateAvailable=Un aggiornamento è disponibile
@@ -2285,7 +2294,7 @@ LateWarningAfter=Avviso di "ritardo" dopo
 TemplateforBusinessCards=Modello per biglietto da visita di diverse dimensioni
 InventorySetup= Inventory Setup
 ExportUseLowMemoryMode=Utilizzare una modalità di memoria insufficiente
-ExportUseLowMemoryModeHelp=Use the low memory mode to generate the dump file (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that the file is complete and error message can't be reported if it fails. Use it if you experience not enough memory errors.
+ExportUseLowMemoryModeHelp=Utilizzare la modalità di memoria minima per generare il file di dump (la compressione viene eseguita tramite una pipe anziché nella memoria PHP). Questo metodo non consente di verificare che il file sia completo e il messaggio di errore non può essere segnalato se fallisce. Usalo se riscontri errori di memoria insufficienti.
 
 ModuleWebhookName = Webhook
 ModuleWebhookDesc = Interfaccia per catturare i trigger di dolibarr e inviarlo a un URL
@@ -2309,8 +2318,8 @@ IconOnly=Solo icona: solo testo nella descrizione comando
 INVOICE_ADD_ZATCA_QR_CODE=Mostra il codice QR ZATCA sulle fatture
 INVOICE_ADD_ZATCA_QR_CODEMore=Alcuni paesi arabi necessitano di questo codice QR sulle loro fatture
 INVOICE_ADD_SWISS_QR_CODE=Mostra il codice QR-Bill svizzero sulle fatture
-INVOICE_SHOW_SHIPPING_ADDRESS=Show shipping address
-INVOICE_SHOW_SHIPPING_ADDRESSMore=Compulsory mention for France
+INVOICE_SHOW_SHIPPING_ADDRESS=Mostra l'indirizzo di spedizione
+INVOICE_SHOW_SHIPPING_ADDRESSMore=Citazione obbligatoria per la Francia
 UrlSocialNetworksDesc=Link URL del social network. Utilizza {socialid} per la parte variabile che contiene l'ID del social network.
 IfThisCategoryIsChildOfAnother=Se questa categoria è figlia di un'altra
 DarkThemeMode=Modalità tema scuro
@@ -2330,7 +2339,7 @@ UsePassword=Usa una password
 UseOauth=Usa un token OAUTH
 Images=Immagini
 MaxNumberOfImagesInGetPost=Numero massimo di immagini consentite in un campo HTML inviato in un modulo
-MaxNumberOfPostOnPublicPagesByIP=Max number of posts on public pages with the same IP address in a month
+MaxNumberOfPostOnPublicPagesByIP=Numero massimo di articoli su pagine pubbliche con lo stesso indirizzo IP in un mese
 CIDLookupURL=Il modulo porta un URL che può essere utilizzato da uno strumento esterno per ottenere il nome di una terza parte o un contatto dal suo numero di telefono. L'URL da utilizzare è:
 ScriptIsEmpty=Lo script è vuoto
 ShowHideTheNRequests=Mostra/nascondi le richieste SQL %s
@@ -2346,12 +2355,14 @@ HelpCssOnViewDesc=Il Css utilizzato durante la visualizzazione del campo.
 HelpCssOnListDesc=Il Css utilizzato quando il campo si trova all'interno di una tabella elenco. <br> Esempio: "tdoverflowmax200"
 RECEPTION_PDF_HIDE_ORDERED=Nascondi la quantità ordinata sui documenti generati per i ricevimenti
 MAIN_PDF_RECEPTION_DISPLAY_AMOUNT_HT=Mostra il prezzo sui documenti generati per i ricevimenti
-WarningDisabled=Warning disabled
-LimitsAndMitigation=Access limits and mitigation
-DesktopsOnly=Desktops only
-DesktopsAndSmartphones=Desktops et smartphones
+WarningDisabled=Avviso disattivato
+LimitsAndMitigation=Limiti di accesso e mitigazione
+DesktopsOnly=Solo desktop
+DesktopsAndSmartphones=Desktop e smartphone
 AllowOnlineSign=Consenti firma online
-AllowExternalDownload=Allow external download (without login, using a shared link)
-DeadlineDayVATSubmission=Deadline day for vat submission on the next month
-MaxNumberOfAttachementOnForms=Max number of joinded files in a form
-IfDefinedUseAValueBeetween=If defined, use a value between %s and %s
+AllowExternalDownload=Consenti download esterno (senza accesso, utilizzando un collegamento condiviso)
+DeadlineDayVATSubmission=Giorno di scadenza per la presentazione dell'IVA nel mese successivo
+MaxNumberOfAttachementOnForms=Numero massimo di file uniti in un modulo
+IfDefinedUseAValueBeetween=Se definito, utilizzare un valore compreso tra %s e %s
+Reload=Ricaricare
+ConfirmReload=Conferma il ricaricamento del modulo
diff --git a/htdocs/langs/it_IT/companies.lang b/htdocs/langs/it_IT/companies.lang
index 86f02c34c0c..a6ecd145e1c 100644
--- a/htdocs/langs/it_IT/companies.lang
+++ b/htdocs/langs/it_IT/companies.lang
@@ -312,12 +312,12 @@ CustomerRelativeDiscountShort=Sconto relativo
 CustomerAbsoluteDiscountShort=Sconto assoluto
 CompanyHasRelativeDiscount=Il cliente ha uno sconto del <b> %s%% </b>
 CompanyHasNoRelativeDiscount=Il cliente non ha alcuno sconto relativo impostato
-HasRelativeDiscountFromSupplier=Hai uno sconto predefinito di <b>%s%%</b> da questo fornitore
-HasNoRelativeDiscountFromSupplier=Non esistono sconti relativi predefiniti per questo fornitore\n
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> with this vendor
+HasNoRelativeDiscountFromSupplier=No default relative discount with this vendor
 CompanyHasAbsoluteDiscount=Questo cliente ha degli sconti disponibili (note di credito o anticipi) per un totale di <b>%s</b>%s
 CompanyHasDownPaymentOrCommercialDiscount=Questo cliente ha uno sconto disponibile (commerciale, anticipi) per <b>%s</b>%s
 CompanyHasCreditNote=Il cliente ha ancora note di credito per <b> %s %s </b>
-HasNoAbsoluteDiscountFromSupplier=Il fornitore non ha disponibile alcuno sconto assoluto per credito
+HasNoAbsoluteDiscountFromSupplier=Nessuno sconto/credito disponibile da questo fornitore
 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
@@ -345,7 +345,7 @@ ContactByDefaultFor=Contatto / indirizzo predefinito per
 AddThirdParty=Crea soggetto terzo
 DeleteACompany=Elimina una società
 PersonalInformations=Dati personali
-AccountancyCode=Account di contabilità
+AccountancyCode=Conto di contabilità
 CustomerCode=Codice cliente
 SupplierCode=Codice fornitore
 CustomerCodeShort=Codice cliente
@@ -444,7 +444,7 @@ AddAddress=Aggiungi un indirizzo
 SupplierCategory=Categoria fornitore
 JuridicalStatus200=Indipendente
 DeleteFile=Cancella il file
-ConfirmDeleteFile=Are you sure you want to delete this file?
+ConfirmDeleteFile=Sei sicuro di voler eliminare questo file <b> %s </b> ?
 AllocateCommercial=Assegna un commerciale
 Organization=Organizzazione
 FiscalYearInformation=Anno fiscale
@@ -498,3 +498,8 @@ RestOfEurope=Resto d'Europa (CEE)
 OutOfEurope=Fuori dall'Europa (CEE)
 CurrentOutstandingBillLate=Fatture scadute in ritardo
 BecarefullChangeThirdpartyBeforeAddProductToInvoice=Fai attenzione, a seconda delle impostazioni del prezzo del prodotto, dovresti cambiare terze parti prima di aggiungere il prodotto al POS.
+EmailAlreadyExistsPleaseRewriteYourCompanyName=l'email esiste già, controlla il nome della tua azienda
+TwoRecordsOfCompanyName=more than one record exists for this company, please contact us to complete your partnership request
+CompanySection=Company section
+ShowSocialNetworks=Show social networks
+HideSocialNetworks=Hide social networks
diff --git a/htdocs/langs/it_IT/main.lang b/htdocs/langs/it_IT/main.lang
index e3b5134df8a..817423e1bfa 100644
--- a/htdocs/langs/it_IT/main.lang
+++ b/htdocs/langs/it_IT/main.lang
@@ -226,6 +226,7 @@ NoUserGroupDefined=Gruppo non definito
 Password=Password
 PasswordRetype=Ripeti la tua password
 NoteSomeFeaturesAreDisabled=Nota bene: In questo demo alcune funzionalità e alcuni moduli sono disabilitati.
+YourUserFile=Your user file
 Name=Nome
 NameSlashCompany=Nome / Società
 Person=Persona
@@ -897,6 +898,9 @@ MassFilesArea=File creati da azioni di massa
 ShowTempMassFilesArea=Mostra i file creati da azioni di massa
 ConfirmMassDeletion=Conferma eliminazione massiva
 ConfirmMassDeletionQuestion=Vuoi davvero eliminare %s record selezionati?
+ConfirmMassClone=Bulk clone confirmation
+ConfirmMassCloneQuestion=Select project to clone to
+ConfirmMassCloneToOneProject=Clone to project %s
 RelatedObjects=Oggetti correlati
 ClassifyBilled=Classificare  fatturata
 ClassifyUnbilled=Classifica non pagata
@@ -912,8 +916,8 @@ ExportFilteredList=Esporta lista filtrata
 ExportList=Esporta lista
 ExportOptions=Opzioni di esportazione
 IncludeDocsAlreadyExported=Includi documenti già esportati
-ExportOfPiecesAlreadyExportedIsEnable=Includi documenti già esportati abilitato
-ExportOfPiecesAlreadyExportedIsDisable=Includi documenti già esportati disabilitato
+ExportOfPiecesAlreadyExportedIsEnable=Documents already exported are visible and will be exported
+ExportOfPiecesAlreadyExportedIsDisable=Documents already exported are hidden and won't be exported
 AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
 NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
 Miscellaneous=Varie
@@ -1128,6 +1132,7 @@ DeleteFileText=Vuoi davvero eliminare questo file?
 ShowOtherLanguages=Mostra altre lingue
 SwitchInEditModeToAddTranslation=Passa alla modalità di modifica per aggiungere traduzioni per questa lingua
 NotUsedForThisCustomer=Non utilizzato per questo cliente
+NotUsedForThisVendor=Not used for this vendor
 AmountMustBePositive=L'importo deve essere positivo
 ByStatus=Per stato
 InformationMessage=Informazioni
@@ -1148,14 +1153,14 @@ EventReminder=Promemoria evento
 UpdateForAllLines=Aggiornamento per tutte le linee
 OnHold=In attesa
 Civility=Civiltà
-AffectTag=Assign Tag
-AffectUser=Assign User
-SetSupervisor=Imposta supervisore
+AffectTag=Assign a Tag
+AffectUser=Assign a User
+SetSupervisor=Set the supervisor
 CreateExternalUser=Crea utente esterno
 ConfirmAffectTag=Bulk Tag Assignement
 ConfirmAffectUser=Bulk User Assignement
-ProjectRole=Role assigned on each project
-TasksRole=Role assigned on each task of each project
+ProjectRole=Role assigned on each project/opportunity
+TasksRole=Role assigned on each task (if used)
 ConfirmSetSupervisor=Set supervisore in maniera massiva
 ConfirmUpdatePrice=Choose a increase/decrease price rate
 ConfirmAffectTagQuestion=Are you sure you want to assign tags to the %s selected record(s)?
@@ -1210,3 +1215,10 @@ CreatedByPublicPortal=Creato dal portale pubblico
 UserAgent=User Agent
 InternalUser=Utente interno
 ExternalUser=Utente esterno
+NoSpecificContactAddress=No specific contact or address
+NoSpecificContactAddressBis=This tab is dedicated to force specific contacts or addresses for the current object. Use it only if you want to define one or several specific contacts or addresses for the object when the information on the thirdparty is not enough or not accurate.
+HideOnVCard=Hide %s
+AddToContacts=Add address to my contacts
+LastAccess=Last access
+UploadAnImageToSeeAPhotoHere=Upload an image from the tab %s to see a photo here
+LastPasswordChangeDate=Last password change date
diff --git a/htdocs/langs/it_IT/members.lang b/htdocs/langs/it_IT/members.lang
index 7dd9b89ab53..7efb31bc8ac 100644
--- a/htdocs/langs/it_IT/members.lang
+++ b/htdocs/langs/it_IT/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Un altro membro (nome: <b>%s</b>, log
 ErrorUserPermissionAllowsToLinksToItselfOnly=Per motivi di sicurezza, è necessario possedere permessi di modifica di tutti gli utenti per poter modificare un membro diverso da sé stessi.
 SetLinkToUser=Link a un utente Dolibarr
 SetLinkToThirdParty=Link ad un soggetto terzo
-MemberCountersArePublic=Counters of valid members are public
+MemberCountersArePublic=I contatori dei membri validi sono pubblici
 MembersCards=Generazione di tessere per i membri
 MembersList=Elenco dei membri
 MembersListToValid=Elenco dei membri del progetto (da convalidare)
@@ -23,7 +23,7 @@ MembersListValid=Elenco dei membri validi
 MembersListUpToDate=Elenco dei membri validi con contributo aggiornato
 MembersListNotUpToDate=Elenco dei membri validi con contributo scaduto
 MembersListExcluded=Elenco dei membri esclusi
-MembersListResiliated=List of terminated members
+MembersListResiliated=Elenco dei membri cessati
 MembersListQualified=Elenco dei membri qualificati
 MenuMembersToValidate=Membri da convalidare
 MenuMembersValidated=Membri convalidati
@@ -35,15 +35,15 @@ DateSubscription=Data di adesione
 DateEndSubscription=Data di fine adesione
 EndSubscription=Fine adesione
 SubscriptionId=ID contributo
-WithoutSubscription=Without membership
-WaitingSubscription=Membership pending
+WithoutSubscription=Senza iscrizione
+WaitingSubscription=Iscrizione in sospeso
 MemberId=ID membro
-MemberRef=Membro Rif
+MemberRef=Rif Membro
 NewMember=Nuovo membro
 MemberType=Tipo membro
 MemberTypeId=Id membro
 MemberTypeLabel=Etichetta tipo membro
-MembersTypes=Tipi di membro
+MembersTypes=Tipi di membri
 MemberStatusDraft=Bozza (deve essere convalidata)
 MemberStatusDraftShort=Bozza
 MemberStatusActive=Convalidato (in attesa di contributo)
@@ -54,41 +54,41 @@ MemberStatusPaid=Adesione aggiornata
 MemberStatusPaidShort=Aggiornata
 MemberStatusExcluded=Membro escluso
 MemberStatusExcludedShort=Escluso
-MemberStatusResiliated=Terminated member
-MemberStatusResiliatedShort=Terminated
+MemberStatusResiliated=Membro cessato
+MemberStatusResiliatedShort=Cessato
 MembersStatusToValid=Membri da convalidare
 MembersStatusExcluded=Membri esclusi
-MembersStatusResiliated=Terminated members
+MembersStatusResiliated=Membri cessati
 MemberStatusNoSubscription=Convalidato (nessun contributo richiesto)
-MemberStatusNoSubscriptionShort=convalidato
+MemberStatusNoSubscriptionShort=Convalidato
 SubscriptionNotNeeded=Nessun contributo richiesto
 NewCotisation=Nuovo contributo
 PaymentSubscription=Nuovo contributo di pagamento
 SubscriptionEndDate=Termine ultimo per l'adesione
 MembersTypeSetup=Impostazioni tipi di membri
-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=Tipo membro modificato
+DeleteAMemberType=Cancella un tipo di membro
+ConfirmDeleteMemberType=Sei sicuro di voler cancellare questo tipo di membro?
+MemberTypeDeleted=Tipo membro cancellato
+MemberTypeCanNotBeDeleted=Il tipo di membro non può essere cancellato
 NewSubscription=Nuovo contributo
-NewSubscriptionDesc=Questo modulo consente di registrare l'adesione di un nuovo membro alla fondazione. Per rinnovare l'adesione (se già iscritto), si prega di contattare la fondazione per email.
+NewSubscriptionDesc=Questo modulo consente di registrare l'adesione di un nuovo membro alla fondazione. Per rinnovare l'adesione (se già iscritto), si prega di contattare la fondazione per email %s.
 Subscription=Contributo
-AnyAmountWithAdvisedAmount=Any amount of your choice, recommended %s
-AnyAmountWithoutAdvisedAmount=Any amount of your choice
-CanEditAmountShort=Any amount
-CanEditAmountShortForValues=recommended, any amount
+AnyAmountWithAdvisedAmount=Qualsiasi importo a tua scelta, consigliato %s
+AnyAmountWithoutAdvisedAmount=Qualsiasi importo a tua scelta
+CanEditAmountShort=Qualsiasi importo
+CanEditAmountShortForValues=consigliato, qualsiasi importo
 MembershipDuration=Durata
-GetMembershipButtonLabel=Join
+GetMembershipButtonLabel=Partecipa
 Subscriptions=Contributi
 SubscriptionLate=Ritardi
 SubscriptionNotReceived=Contributo mai ricevuto
 ListOfSubscriptions=Elenco dei contributi
-SendCardByMail=Send card by email
+SendCardByMail=Invia tessera per email
 AddMember=Crea membro
-NoTypeDefinedGoToSetup=Nessun tipo di membro definito. Vai su impostazioni - Tipi di membro
+NoTypeDefinedGoToSetup=Nessun tipo di membro definito. Vai su menu "Tipi di membri"
 NewMemberType=Nuovo tipo di membro
-WelcomeEMail=Welcome email
+WelcomeEMail=Email di benvenuto
 SubscriptionRequired=Contributo richiesto
 DeleteType=Elimina
 VoteAllowed=E' permesso il voto
@@ -99,25 +99,25 @@ Reenable=Riabilitare
 ExcludeMember=Escludi un membro
 Exclude=Escludere
 ConfirmExcludeMember=Sei sicuro di voler escludere questo membro?
-ResiliateMember=Terminate a member
-ConfirmResiliateMember=Are you sure you want to terminate this member?
+ResiliateMember=Cancella un membro
+ConfirmResiliateMember=Sei sicuro di voler cancellare questo membro?
 DeleteMember=Elimina membro
 ConfirmDeleteMember=Sei sicuro di voler eliminare questo membro (l'eliminazione di un membro eliminerà tutti i suoi contributi)?
 DeleteSubscription=Cancella adesione
 ConfirmDeleteSubscription=Sei sicuro di voler eliminare questo contributo?
 Filehtpasswd=File htpasswd
 ValidateMember=Convalida un membro
-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=Sei sicuro di voler convalidare questo membro?
+FollowingLinksArePublic=I seguenti collegamenti sono pagine aperte non protette da alcuna autorizzazione di Dolibarr. Non sono pagine formattate, fornite come esempio per mostrare come elencare il database dei membri.
 PublicMemberList=Elenco pubblico dei membri
 BlankSubscriptionForm=Modulo di autoregistrazione pubblica
-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.
+BlankSubscriptionFormDesc=Dolibarr può fornirti un URL/sito web pubblico per consentire ai visitatori esterni di chiedere di iscriversi alla fondazione. Se è abilitato un modulo di pagamento online, può essere fornito automaticamente anche un modulo di pagamento.
 EnablePublicSubscriptionForm=Abilita sito web pubblico con modulo di adesione
-ForceMemberType=Force the member type
+ForceMemberType=Forza il tipo di membro
 ExportDataset_member_1=Soci e contributi
 ImportDataset_member_1=Membri
-LastMembersModified=ultimi %s membri modificati
-LastSubscriptionsModified=Ultimi contributi %s modificati
+LastMembersModified=Ultimi %s membri modificati
+LastSubscriptionsModified=Ultimi %s contributi modificati
 String=Stringa
 Text=Testo
 Int=Intero
@@ -127,35 +127,35 @@ SubscriptionNotRecorded=Contributo non registrato
 AddSubscription=Crea contributo
 ShowSubscription=Mostra contributo
 # Label of email templates
-SendingAnEMailToMember=Sending information email to member
-SendingEmailOnAutoSubscription=Sending email on auto registration
-SendingEmailOnMemberValidation=Sending email on new member validation
-SendingEmailOnNewSubscription=Invio email sul nuovo contributo
+SendingAnEMailToMember=Invio di email informativa al membro
+SendingEmailOnAutoSubscription=Invio email per la registrazione automatica
+SendingEmailOnMemberValidation=Invio di email per la convalida del nuovo membro
+SendingEmailOnNewSubscription=Invio email per il nuovo contributo
 SendingReminderForExpiredSubscription=Invio sollecito contributi scaduti
-SendingEmailOnCancelation=Sending email on cancelation
+SendingEmailOnCancelation=Invio email in caso di disdetta
 SendingReminderActionComm=Invio promemoria per evento in agenda
 # Topic of email templates
-YourMembershipRequestWasReceived=Your membership was received.
-YourMembershipWasValidated=Your membership was validated
+YourMembershipRequestWasReceived=La tua iscrizione è stata ricevuta.
+YourMembershipWasValidated=La tua iscrizione è stata convalidata
 YourSubscriptionWasRecorded=Il tuo nuovo contributo è stato registrato
 SubscriptionReminderEmail=promemoria del contributo
-YourMembershipWasCanceled=Your membership was canceled
+YourMembershipWasCanceled=La tua iscrizione è stata cancellata
 CardContent=Contenuto della scheda membro
 # 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. Please find your invoice here enclosed.<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
+ThisIsContentOfYourMembershipRequestWasReceived=Desideriamo informarti che la tua richiesta di adesione è stata ricevuta.<br><br>
+ThisIsContentOfYourMembershipWasValidated=Desideriamo informarti che la tua iscrizione è stata convalidata con le seguenti informazioni:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=Desideriamo informarti che il tuo nuovo abbonamento è stato registrato. Trovi la fattura qui in allegato. <br><br>
+ThisIsContentOfSubscriptionReminderEmail=Desideriamo informarti che il tuo abbonamento sta per scadere o è già scaduto (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). Speriamo che lo rinnoverai.<br><br>
+ThisIsContentOfYourCard=Questo è un riepilogo delle informazioni che abbiamo su di te. Vi preghiamo di contattarci se qualcosa non è corretto.<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Oggetto dell' email di notifica ricevuta in caso di autoiscrizione di un ospite
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Contenuto dell' email di notifica ricevuta in caso di autoiscrizione di un ospite
 DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Modello e-mail da utilizzare per inviare e-mail a un membro durante la registrazione automatica dei membri
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Modello e-mail da utilizzare per inviare e-mail a un membro sulla nuova registrazione del contributo
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Modello e-mail da utilizzare per inviare promemoria via e-mail quando il contributo sta per scadere
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
-DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Modello e-mail da utilizzare per inviare e-mail a un membro sull'esclusione dei membri
-DescADHERENT_MAIL_FROM=Sender Email for automatic emails
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Modello email da utilizzare per inviare email ad un membro al momento della convalida del membro
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Modello email da utilizzare per inviare e-mail a un membro sulla nuova registrazione del contributo
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Modello email da utilizzare per inviare promemoria via e-mail quando il contributo sta per scadere
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Modello email da utilizzare per inviare email a un membro in caso di cancellazione del membro
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Modello email da utilizzare per inviare e-mail a un membro sull'esclusione dei membri
+DescADHERENT_MAIL_FROM=Email mittente per email automatiche
 DescADHERENT_ETIQUETTE_TYPE=Formato etichette
 DescADHERENT_ETIQUETTE_TEXT=Testo da stampare nel campo indirizzo di un membro
 DescADHERENT_CARD_TYPE=Tipo di formato della scheda membro
@@ -163,20 +163,20 @@ DescADHERENT_CARD_HEADER_TEXT=Testo dell'intestazione della scheda membro
 DescADHERENT_CARD_TEXT=Testo della scheda membro
 DescADHERENT_CARD_TEXT_RIGHT=Testo della scheda membro (allineato a destra)
 DescADHERENT_CARD_FOOTER_TEXT=Testo del footer fondo della scheda membro
-ShowTypeCard=Visualizza la scheda dei tipi
-HTPasswordExport=Esporta htpassword
+ShowTypeCard=Tipo di spettacolo '%s'
+HTPasswordExport=Generazione file htpassword
 NoThirdPartyAssociatedToMember=Nessuna terza parte associata a questo membro
 MembersAndSubscriptions=Membri e contributi
 MoreActions=Azioni complementari alla registrazione
 MoreActionsOnSubscription=Azione complementare suggerita di default in sede di registrazione di un contributo, effettuata anche in automatico al momento del pagamento online di un contributo
-MoreActionBankDirect=Create a direct entry on bank account
-MoreActionBankViaInvoice=Create an invoice, and a payment on bank account
+MoreActionBankDirect=Crea una registrazione diretta sul conto corrente bancario
+MoreActionBankViaInvoice=Crea una fattura ed un pagamento sul conto bancario
 MoreActionInvoiceOnly=Creare una fattura senza pagamento
 LinkToGeneratedPages=Generazione di biglietti da visita o fogli di indirizzi
 LinkToGeneratedPagesDesc=Questa schermata permette di generare file PDF contenenti i biglietti da visita di tutti i membri o di un determinato membro.
-DocForAllMembersCards=Genera schede per tutti i membri (formato di output impostato: <b>%s</b>)
-DocForOneMemberCards=Genera scheda per un membro (formato di output impostato: <b>%s</b>)
-DocForLabels=Genera etichette con indirizzi (formato di output impostato: <b>%s</b>)
+DocForAllMembersCards=Genera biglietti da visita per tutti i membri
+DocForOneMemberCards=Genera biglietti da visita per un particolare membro
+DocForLabels=Genera etichette con indirizzo
 SubscriptionPayment=Pagamento del contributo
 LastSubscriptionDate=Data dell'ultimo versamento del contributo
 LastSubscriptionAmount=Importo dell'ultimo contributo
@@ -207,28 +207,28 @@ NbOfSubscriptions=Numero di contributi
 AmountOfSubscriptions=Importo raccolto dai contributi
 TurnoverOrBudget=Giro d'affari (aziende) o Budget (fondazione)
 DefaultAmount=Importo predefinito del contributo
-CanEditAmount=Subscription amount is free
-CanEditAmountDetail=Visitor can choose/edit amount of its contribution regardless of the member type
-AmountIsLowerToMinimumNotice=sur un dû total de %s
-MEMBER_NEWFORM_PAYONLINE=After the online registration, switch automatically on the online payment page
-ByProperties=By nature
-MembersStatisticsByProperties=Members statistics by nature
+CanEditAmount=L'importo dell'abbonamento è gratuito
+CanEditAmountDetail=Il visitatore può scegliere/modificare l'importo del suo contributo indipendentemente dal tipo di membro
+AmountIsLowerToMinimumNotice=su un totale dovuto di %s
+MEMBER_NEWFORM_PAYONLINE=Dopo la registrazione online, passa automaticamente alla pagina di pagamento online
+ByProperties=Per natura
+MembersStatisticsByProperties=Statistiche dei membri per natura
 VATToUseForSubscriptions=Aliquota IVA da utilizzare per i contributi
 NoVatOnSubscription=Nessuna IVA per i contributi
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Prodotto utilizzato per riga contributi in fattura: %s
-NameOrCompany=Name or company
+NameOrCompany=Nome o Società
 SubscriptionRecorded=Contributo registrato
-NoEmailSentToMember=No email sent to member
-EmailSentToMember=Email sent to member at %s
+NoEmailSentToMember=Nessuna email inviata al membro
+EmailSentToMember=Email inviata al membro a %s
 SendReminderForExpiredSubscriptionTitle=Invia promemoria via e-mail per i contributi scaduti
 SendReminderForExpiredSubscription=Invia promemoria via e-mail ai membri quando il contributo sta per scadere (il parametro è il numero di giorni prima della fine dell'iscrizione per inviare il promemoria. Può essere un elenco di giorni separati da un punto e virgola, ad esempio '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 utenti esterni creati
+YouMayFindYourInvoiceInThisEmail=Potresti trovare la tua fattura allegata a questa email
+XMembersClosed=%s membro(i) chiusi
+XExternalUserCreated=%s utente(i) esterni creati
 ForceMemberNature=Natura del membro forzato (individuo o società)
 CreateDolibarrLoginDesc=La creazione di un login utente per i membri consente loro di connettersi all'applicazione. A seconda delle autorizzazioni concesse, potranno, ad esempio, consultare o modificare autonomamente il proprio fascicolo.
 CreateDolibarrThirdPartyDesc=Una terza parte è la persona giuridica che verrà utilizzata nella fattura se si decide di generare la fattura per ogni contributo. Potrai crearlo in seguito durante il processo di registrazione del contributo.
 MemberFirstname=Nome del membro
 MemberLastname=Cognome membro
-MemberCodeDesc=Member Code, unique for all members
+MemberCodeDesc=Codice Socio, unico per tutti i soci
diff --git a/htdocs/langs/it_IT/productbatch.lang b/htdocs/langs/it_IT/productbatch.lang
index 89144d3a587..cf56cc12698 100644
--- a/htdocs/langs/it_IT/productbatch.lang
+++ b/htdocs/langs/it_IT/productbatch.lang
@@ -17,8 +17,9 @@ printBatch=Lotto/numero di serie: %s
 printEatby=Consumare entro: %s
 printSellby=Da vendere entro: %s
 printQty=Quantità: %d
+printPlannedWarehouse=Magazzino: %s
 AddDispatchBatchLine=Aggiungi una riga per la durata a scaffale
-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.
+WhenProductBatchModuleOnOptionAreForced=Quando il modulo Lotti di prodotto è attivo, la modalità di diminuzione delle scorte è forzata al valore "Diminuire le scorte fisiche/reali alla convalida della spedizione" e la modalità di incremento delle scorte è automaticamente forzata al valore "Aumentare le scorte reali alla ricezione manuale nel magazzino, dopo la ricezione della merce dall'ordine fornitore". Tali valori non possono essere modificati. Le altre opzioni possono essere definite come preferisci.
 ProductDoesNotUseBatchSerial=Questo prodotto non usa lotto/numero di serie
 ProductLotSetup=Configurazione del modulo lotto/numero di serie
 ShowCurrentStockOfLot=Mostra la scorta disponibile per la coppia prodotto/lotto
diff --git a/htdocs/langs/it_IT/receptions.lang b/htdocs/langs/it_IT/receptions.lang
index 8549d23a51e..e7c43fed2d1 100644
--- a/htdocs/langs/it_IT/receptions.lang
+++ b/htdocs/langs/it_IT/receptions.lang
@@ -1,54 +1,54 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionDescription=Gestione accoglienza fornitori (Crea documenti di accoglienza)
-ReceptionsSetup=Configurazione della reception del fornitore
-RefReception=Ref. reception
-Reception=In ricezione
-Receptions=Receptions
-AllReceptions=All Receptions
-Reception=In ricezione
-Receptions=Receptions
-ShowReception=Show Receptions
-ReceptionsArea=Receptions area
-ListOfReceptions=List of receptions
-ReceptionMethod=Reception method
+ReceptionDescription=Gestione ricezione prodotti (Crea documenti di ricezione)
+ReceptionsSetup=Configurazione ricezione prodotti
+RefReception=Rif. ricezione
+Reception=Ricezione
+Receptions=Ricezioni
+AllReceptions=Tutte le ricezioni
+Reception=Ricezione
+Receptions=Ricezioni
+ShowReception=Mostra Ricezioni
+ReceptionsArea=Area ricezioni
+ListOfReceptions=Lista ricezioni
+ReceptionMethod=Modalità ricezione
 LastReceptions=Ultime %s ricezioni
-StatisticsOfReceptions=Statistics for receptions
+StatisticsOfReceptions=Statitiche ricezioni
 NbOfReceptions=Numero di ricezioni
 NumberOfReceptionsByMonth=Numero di ricezioni per mese
-ReceptionCard=Reception card
-NewReception=New reception
-CreateReception=Create reception
-QtyInOtherReceptions=Qty in other receptions
-OtherReceptionsForSameOrder=Other receptions for this order
+ReceptionCard=Ricezione prodotti
+NewReception=Nuova ricezione
+CreateReception=Crea ricezione
+QtyInOtherReceptions=Qtà altre ricezioni
+OtherReceptionsForSameOrder=Altre ricezioni per questo ordine
 ReceptionsAndReceivingForSameOrder=Ricezioni per questo ordine
-ReceptionsToValidate=Receptions to validate
+ReceptionsToValidate=Ricezioni da validare
 StatusReceptionCanceled=Annullata
 StatusReceptionDraft=Bozza
 StatusReceptionValidated=Convalidato (prodotti da ricevere o già ricevuti)
 StatusReceptionValidatedToReceive=Convalidato (prodotti da ricevere)
 StatusReceptionValidatedReceived=Convalidato (prodotti ricevuti)
-StatusReceptionProcessed=Processato
+StatusReceptionProcessed=Elaborato
 StatusReceptionDraftShort=Bozza
 StatusReceptionValidatedShort=Convalidato
-StatusReceptionProcessedShort=Processato
-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
+StatusReceptionProcessedShort=Elaborato
+ReceptionSheet=Foglio ricezione
+ValidateReception=Convalida ricezione
+ConfirmDeleteReception=Confermi elminazione ricezione?
+ConfirmValidateReception=Confermi validazione ricezione  <b> %s </b> ?
+ConfirmCancelReception=Confermi annullamento ricezione?
+StatsOnReceptionsOnlyValidated=Statitiche solo per ricezioni validate. La data utilizzata è la data di convalida della ricezione (la data di consegna pianificata non è sempre nota).
+SendReceptionByEMail=Invia ricezione via e-mail
+SendReceptionRef=Invio della ricezione %s
+ActionsOnReception=Azioni sulla ricezione
 ReceptionCreationIsDoneFromOrder=Per il momento, la creazione di una nuova ricezione avviene dall'Ordine di Acquisto.
-ReceptionLine=Reception line
+ReceptionLine=Riga ricezione
 ProductQtyInReceptionAlreadySent=Quantità del prodotto dall'ordine cliente aperto già inviato
 ProductQtyInSuppliersReceptionAlreadyRecevied=Quantità prodotto dall'ordine fornitore aperto già ricevuto
-ValidateOrderFirstBeforeReception=You must first validate the order before being able to make receptions.
-ReceptionsNumberingModules=Numbering module for receptions
-ReceptionsReceiptModel=Document templates for receptions
+ValidateOrderFirstBeforeReception=E' necessario validare l'ordine prima di poter creare ricezioni.
+ReceptionsNumberingModules=Modulo per la generazione codici ricezione
+ReceptionsReceiptModel=Modelli generazione documenti
 NoMorePredefinedProductToDispatch=Non ci sono più prodotti predefiniti da spedire
-ReceptionExist=Esiste un ricevimento
-ByingPrice=Prezzo di vendita
-ReceptionBackToDraftInDolibarr=Ricevimento %s torna alla bozza
-ReceptionClassifyClosedInDolibarr=Ricevimento %s classificato Chiuso
-ReceptionUnClassifyCloseddInDolibarr=Ricevimento %s ri-aperto
+ReceptionExist=Esiste una ricezione
+ReceptionBackToDraftInDolibarr=Ricezione %s ritornato a bozza
+ReceptionClassifyClosedInDolibarr=Ricezione %s classificato Chiusa
+ReceptionUnClassifyCloseddInDolibarr=Ricezione %s ri-aperta
diff --git a/htdocs/langs/it_IT/stocks.lang b/htdocs/langs/it_IT/stocks.lang
index 5d1fa64bef9..b887f5a223e 100644
--- a/htdocs/langs/it_IT/stocks.lang
+++ b/htdocs/langs/it_IT/stocks.lang
@@ -74,17 +74,17 @@ QtyDispatched=Quantità ricevuta
 QtyDispatchedShort=Q.ta ricevuta
 QtyToDispatchShort=Q.ta da ricevere
 OrderDispatch=Ricezione prodotti
-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)
+RuleForStockManagementDecrease=Seleziona la regola per la diminuzione automatica delle scorte (la diminuzione manuale è sempre possibile, anche se la diminuzione automatica è attivata).
+RuleForStockManagementIncrease=Seleziona la regola per l'incremento automatico delle scorte (l'incremento manuale è sempre possibile, anche se l'incremento automatico è attivato).
 DeStockOnBill=Diminuire le scorte fisiche/reali alla convalida della fattura attiva / nota di credito
 DeStockOnValidateOrder=Diminuire le scorte fisiche/reali alla convalida degli ordini cliente
 DeStockOnShipment=Diminuire le scorte fisiche/reali alla convalida della spedizione
 DeStockOnShipmentOnClosing=Diminuire le scorte fisiche/reali quando la spedizione viene chiusa.
-ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
+ReStockOnBill=Aumentare le scorte reali alla convalida delle fatture/note di credito fornitore
 ReStockOnValidateOrder=Aumenta scorte effettive all'approvazione dell'ordine fornitore
 ReStockOnDispatchOrder=Aumentare le scorte reali durante la ricezione manuale in magazzino, dopo il ricevimento della merce dell'ordine fornitore
-StockOnReception=Increase real stocks on validation of reception
-StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
+StockOnReception=Aumentare le scorte reali alla convalida della ricezione
+StockOnReceptionOnClosing=Aumentare le scorte reali quando la ricezione viene chiusa
 OrderStatusNotReadyToDispatch=Lo stato dell'ordine non ne consente la spedizione dei prodotti a magazzino.
 StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
 NoPredefinedProductToDispatch=Per l'oggetto non ci sono prodotti predefiniti. Quindi non è necessario alterare le scorte.
@@ -153,9 +153,9 @@ RecordMovements=Record stock movements
 ReceivingForSameOrder=Ricezioni per questo ordine
 StockMovementRecorded=Movimentazione di scorte registrata
 RuleForStockAvailability=Regole sulla fornitura delle scorte
-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)
+StockMustBeEnoughForInvoice=Il livello delle scorte deve essere sufficiente per aggiungere prodotti/servizi alla fattura (il controllo viene eseguito sulle scorte reali correnti quando si aggiunge una riga alla fattura, qualunque sia la regola per il cambio automatico delle scorte)
+StockMustBeEnoughForOrder=Il livello delle scorte deve essere sufficiente per aggiungere prodotti/servizi all'ordine (il controllo viene eseguito sulle scorte reali correnti quando si aggiunge una riga all'ordine, qualunque sia la regola per il cambio automatico delle scorte)
+StockMustBeEnoughForShipment= Il livello delle scorte deve essere sufficiente per aggiungere prodotti/servizi alla spedizione (il controllo viene eseguito sulle scorte reali correnti quando si aggiunge una riga alla spedizione, qualunque sia la regola per il cambio automatico delle scorte)
 MovementLabel=Etichetta per lo spostamento di magazzino
 TypeMovement=Direzione del movimento
 DateMovement=Date of movement
diff --git a/htdocs/langs/it_IT/stripe.lang b/htdocs/langs/it_IT/stripe.lang
index 39246086656..ca8d10a6cc2 100644
--- a/htdocs/langs/it_IT/stripe.lang
+++ b/htdocs/langs/it_IT/stripe.lang
@@ -41,7 +41,8 @@ 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=Importa pagamenti Stripe
-ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+ExampleOfTestBankAcountForSEPA=Example of bank account BAN for direct debit test: %s
 StripeGateways=Stripe gateways
 OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
@@ -70,5 +71,8 @@ ToOfferALinkForLiveWebhook=Link to setup Stripe WebHook to call the IPN (live mo
 PaymentWillBeRecordedForNextPeriod=Payment will be recorded for the next period.
 ClickHereToTryAgain=<a href="%s">Clicca qui per riprovare...</a>
 CreationOfPaymentModeMustBeDoneFromStripeInterface=A causa delle forti regole di autenticazione del cliente, la creazione di una carta deve essere effettuata dal backoffice di Stripe. È possibile fare clic qui per attivare il record cliente Stripe: %s
-TERMINAL_LOCATION=Location (address) for terminals
+STRIPE_CARD_PRESENT=Card Present for Stripe Terminals
+TERMINAL_LOCATION=Location (address) for Stripe Terminals
 RequestDirectDebitWithStripe=Request Direct Debit with Stripe
+STRIPE_SEPA_DIRECT_DEBIT=Enable the Direct Debit payments through Stripe
+
diff --git a/htdocs/langs/it_IT/users.lang b/htdocs/langs/it_IT/users.lang
index bc2975754e9..0862cfc82c8 100644
--- a/htdocs/langs/it_IT/users.lang
+++ b/htdocs/langs/it_IT/users.lang
@@ -47,7 +47,7 @@ RemoveFromGroup=Rimuovi dal gruppo
 PasswordChangedAndSentTo=Password cambiata ed inviata a <b>%s</b>
 PasswordChangeRequest=Richiesta di modifica della password per <b>%s</b>
 PasswordChangeRequestSent=Richiesta di cambio password per <b>%s</b> da inviare a <b>%s</b>.
-IfLoginExistPasswordRequestSent=Se questo accesso è un account valido, è stata inviata un'e-mail per reimpostare la password.
+IfLoginExistPasswordRequestSent=If this login is a valid account (with a valid email), an email to reset password has been sent.
 IfEmailExistPasswordRequestSent=Se questa e-mail è un account valido, è stata inviata un'e-mail per reimpostare la password.
 ConfirmPasswordReset=Conferma la reimpostazione della password
 MenuUsersAndGroups=Utenti e gruppi
@@ -66,9 +66,9 @@ LinkedToDolibarrUser=Collegamento all'utente
 LinkedToDolibarrThirdParty=Collegamento a terze parti
 CreateDolibarrLogin=Crea accesso a Dolibarr
 CreateDolibarrThirdParty=Crea soggetto terzo
-LoginAccountDisableInDolibarr=Account disattivato in Dolibarr
+LoginAccountDisableInDolibarr=Account disabled in Dolibarr
+PASSWORDInDolibarr=Password modified in Dolibarr
 UsePersonalValue=Usa valore personalizzato
-InternalUser=Utente interno
 ExportDataset_user_1=Utenti e dettagli
 DomainUser=Utente di dominio %s
 Reactivate=Riattiva
@@ -128,3 +128,8 @@ DateLastLogin=Data ultimo accesso
 DatePreviousLogin=Data di accesso precedente
 IPLastLogin=IP ultimo accesso
 IPPreviousLogin=IP di accesso precedente
+ShowAllPerms=Show all permission rows
+HideAllPerms=Hide all permission rows
+UserPublicPageDesc=You can enable a virtual card for this user. An url with the user profile and a barcode will be available to allow anybody with a smartphone to scan it and add your contact to its address book.
+EnablePublicVirtualCard=Enable the public virtual user card
+PublicVirtualCardUrl=Public virtual user card
diff --git a/htdocs/langs/ja_JP/accountancy.lang b/htdocs/langs/ja_JP/accountancy.lang
index 8642dc56164..58b090cb9a0 100644
--- a/htdocs/langs/ja_JP/accountancy.lang
+++ b/htdocs/langs/ja_JP/accountancy.lang
@@ -101,7 +101,8 @@ ShowAccountingAccount=勘定科目を表示
 ShowAccountingJournal=仕訳日記帳を表示
 ShowAccountingAccountInLedger=元帳で勘定科目を表示
 ShowAccountingAccountInJournals=日記帳で勘定科目を表示
-AccountAccountingSuggest=示唆された勘定科目
+DataUsedToSuggestAccount=アカウントの提案に使用されるデータ
+AccountAccountingSuggest=アカウントが提案された
 MenuDefaultAccounts=規定の科目
 MenuBankAccounts=銀行口座
 MenuVatAccounts=消費税科目
@@ -126,6 +127,7 @@ WriteBookKeeping=会計での取引の記録
 Bookkeeping=元帳
 BookkeepingSubAccount=補助元帳
 AccountBalance=勘定残高
+AccountBalanceSubAccount=サブアカウントの残高
 ObjectsRef=ソースオブジェクト参照
 CAHTF=税引前の合計購入ベンダー
 TotalExpenseReport=総経費報告書
@@ -160,8 +162,8 @@ ACCOUNTING_LENGTH_GACCOUNT=一般勘定科目の長さ(ここで値を6に設定
 ACCOUNTING_LENGTH_AACCOUNT=取引先の勘定科目の長さ(ここで値を6に設定すると、科目「401」は画面に「401000」のように表示される)
 ACCOUNTING_MANAGE_ZERO=勘定科目の最後に異なる数のゼロを管理できるようにする。一部の国(スイスなど)で必要。オフ(デフォルト)に設定すると、次の2つのパラメーターを設定して、アプリケーションに仮想ゼロを追加するように要求できる。
 BANK_DISABLE_DIRECT_INPUT=銀行口座での取引の直接記録を無効にする
-ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=仕訳帳で下書きエクスポートを有効にする
-ACCOUNTANCY_COMBO_FOR_AUX=子会社アカウントのコンボリストを有効にする (取引先が多数あると遅くなるだろうし、値の一部検索機能は壊れる)
+ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=仕訳帳で下書きエクスポートを有効化
+ACCOUNTANCY_COMBO_FOR_AUX=子会社アカウントのコンボリストを有効化 (取引先が多数あると遅くなるだろうし、値の一部検索機能は壊れる)
 ACCOUNTING_DATE_START_BINDING=会計で結合と転記を開始する日付を定義する。この日付を下回ると、取引は会計に転記されない。
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=会計転送では、デフォルトで選択される期間は何か
 
@@ -189,6 +191,7 @@ ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=顧客預金を登録するためのデフ
 UseAuxiliaryAccountOnCustomerDeposit=顧客アカウントを頭金ラインの補助元帳に個人アカウントとして保存する（無効にした場合、頭金ラインの個人アカウントは空のままになる）
 ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=デフォルトとして使用される勘定科目 (勘定科目表から)
 UseAuxiliaryAccountOnSupplierDeposit=仕入先勘定を、前払明細の補助元帳に個別勘定として保管する (無効にすると、前払明細の個別勘定は空のままになる)。
+ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY=顧客保有保証を登録するためのデフォルトのアカウンティング アカウント
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=同じ国内で購入された製品のデフォルト アカウントとして使用されるアカウント (アカウント チャートから) (製品シートで定義されていない場合に使用)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=EEC から別の EEC 国に購入された製品のデフォルト アカウントとして使用されるアカウント (アカウント チャートから) (製品シートで定義されていない場合に使用)
@@ -218,6 +221,7 @@ JournalLabel=仕訳帳ラベル
 NumPiece=個数番号
 TransactionNumShort=数トランザクション
 AccountingCategory=アカウントのカスタム グループ
+AccountingCategories=アカウントのカスタム グループ
 GroupByAccountAccounting=総勘定元帳勘定によるグループ化
 GroupBySubAccountAccounting=補助元帳アカウントでグループ化
 AccountingAccountGroupsDesc=ここで、勘定科目のいくつかのグループを定義できる。それらは、パーソナライズされた会計報告書sに使用される。
@@ -265,6 +269,7 @@ ShowSubtotalByGroup=レベルごとに小計を表示
 
 Pcgtype=勘定科目のグループ
 PcgtypeDesc=科目のグループは、一部の会計報告書sの事前定義された「フィルタ」および「グループ化」基準として使用される。たとえば、「INCOME」または「EXPENSE」は、費用/収入報告書sを作成するための製品の勘定科目のグループとして使用される。
+AccountingCategoriesDesc=アカウントのカスタム グループを使用して、会計アカウントを 1 つの名前にグループ化し、フィルターの使用やカスタム レポートの作成を容易にすることができる。
 
 Reconcilable=調整可能
 
@@ -294,6 +299,7 @@ DescValidateMovements=書き込み、レタリング、削除の変更または
 
 ValidateHistory=自動的に結合
 AutomaticBindingDone=自動結合が実行された（%s）-一部のレコードでは自動結合不可（%s）
+DoManualBindingForFailedRecord=自動的にリンクされない %s 行(s)を手動でリンクする必要がある。
 
 ErrorAccountancyCodeIsAlreadyUse=エラー、この勘定科目表は使用されているため、削除または無効化できない
 MvtNotCorrectlyBalanced=動きのバランスが正しくない。借方=%s＆貸方= %s
@@ -336,12 +342,14 @@ NumberOfAccountancyMovements=楽章の数
 ACCOUNTING_DISABLE_BINDING_ON_SALES=販売の会計における結合と転記を無効にする(顧客の請求書は会計に考慮されない)
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=購入時の会計における結合と転記を無効にする(ベンダーの請求書は会計で考慮されない)
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=経費報告書sの会計における結合と転記を無効にする(経費報告書sは会計で考慮されない)
-ACCOUNTING_ENABLE_LETTERING=会計でレタリング機能を有効にする
+ACCOUNTING_ENABLE_LETTERING=会計でレタリング機能を有効化
+ACCOUNTING_ENABLE_AUTOLETTERING=会計への転送時に自動レタリングを有効化
 
 ## Export
 NotExportLettering=ファイルの生成時にレタリングをエクスポートしない
 NotifiedExportDate=エクスポートされた行にエクスポート済みのフラグを付ける<span class="warning">（行を変更するには、トランザクション全体を削除して、会計に再転送する必要がある）</span>
 NotifiedValidationDate=エクスポートされたエントリ<span class="warning">を検証してロックする（「%s」機能と同じ効果、行の変更と削除は絶対に不可）</span>
+NotifiedExportFull=ドキュメントをエクスポートするか?
 DateValidationAndLock=日付の検証とロック
 ConfirmExportFile=会計エクスポートファイルの生成を確定するか？
 ExportDraftJournal=下書き仕訳帳のエクスポート
@@ -398,7 +406,7 @@ SaleLocal=ローカルセール
 SaleExport=エクスポート販売
 SaleEEC=EECでの販売
 SaleEECWithVAT=VATがnullではないEECでの販売。したがって、これは域内販売ではなく、提案された科目は標準の製品科目であると想定する。
-SaleEECWithoutVATNumber=VATなしのEECでの販売 が、取引先のVATIDは定義されていない。標準販売の製品科目にフォールバックする。必要に応じて、取引先または製品科目のVATIDを修正できる。
+SaleEECWithoutVATNumber=VAT なしの EEC での販売ですが、サードパーティの VAT ID は定義されていない。標準販売のアカウントにフォールバックする。必要に応じて、サードパーティの VAT ID を修正するか、バインディング用に提案された製品アカウントを変更できる。
 ForbiddenTransactionAlreadyExported=禁止：トランザクションは検証済 かつ/または エクスポート済。
 ForbiddenTransactionAlreadyValidated=禁止：トランザクションは検証済。
 ## Dictionary
@@ -442,6 +450,7 @@ AccountancyErrorMismatchLetterCode=調整コードの不一致
 AccountancyErrorMismatchBalanceAmount=残高（%s）が0に等しくない
 AccountancyErrorLetteringBookkeeping=トランザクションに関してエラーが発生しました：%s
 ErrorAccountNumberAlreadyExists=会計番号%sはすでに存在する
+ErrorArchiveAddFile=「%s」ファイルをアーカイブに入れることができない
 
 ## Import
 ImportAccountingEntries=会計仕訳
@@ -468,5 +477,7 @@ FECFormatMulticurrencyCode=他通貨 コード (Idevise)
 DateExport=日付のエクスポート
 WarningReportNotReliable=警告、この報告書は元帳に基づいていないため、元帳で手動で変更されたトランザクションは含まれていない。仕訳帳化が最新の場合、簿記ビューはより正確。
 ExpenseReportJournal=経費報告仕訳帳
+DocsAlreadyExportedAreExcluded=すでにエクスポートされたドキュメントは除外される
+ClickToHideAlreadyExportedLines=クリックして、すでにエクスポートされた行を非表示にする
 
 NAccounts=%sアカウント
diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang
index 58b770f7e93..aa27c33f9fc 100644
--- a/htdocs/langs/ja_JP/admin.lang
+++ b/htdocs/langs/ja_JP/admin.lang
@@ -48,8 +48,8 @@ DBSortingCharset=データソート用のデータベース·キャラセット
 HostCharset=ホストのキャラセット
 ClientCharset=クライアントのキャラセット
 ClientSortingCharset=クライアントの文字照合則
-WarningModuleNotActive=モジュール<b>%s</b>を有効にする必要がある
-WarningOnlyPermissionOfActivatedModules=ここには、有効化されたモジュールに関連する権限のみが表示される。ホーム->設定->モジュール ページで他のモジュールを有効化できる。
+WarningModuleNotActive=モジュール<b>%s</b>を有効化する必要がある
+WarningOnlyPermissionOfActivatedModules=ここには、活性化済モジュールに関連する権限のみが表示される。ホーム->設定->モジュール ページで他のモジュールを活性化できる。
 DolibarrSetup=Dolibarrインストールまたはアップグレード
 InternalUsers=内部ユーザ
 ExternalUsers=外部ユーザ
@@ -58,7 +58,7 @@ GUISetup=表示
 SetupArea=設定
 UploadNewTemplate=新規テンプレート(s)をアップロード
 FormToTestFileUploadForm=ファイルのアップロードをテストするために形成する ( 設定に応じて ) 
-ModuleMustBeEnabled=モジュール/アプリケーション<b>%s</b>を有効にする必要がある
+ModuleMustBeEnabled=モジュール/アプリケーション<b>%s</b>を有効化する必要がある
 ModuleIsEnabled=モジュール/アプリケーション<b>%s</b>が有効になった
 IfModuleEnabled=注：【はい】が利用可能なのは、モジュール<b>%s</b>の有効時のみ 
 RemoveLock=ファイル<b>%s </b>が存在する場合、それを削除/改名することで、更新/インストール のツールが使用可能になる。
@@ -235,9 +235,9 @@ DevelopYourModuleDesc=独自のモジュールを開発するためのいくつ
 URL=URL
 RelativeURL=相対URL
 BoxesAvailable=利用可能ウィジェット
-BoxesActivated=有効化済ウィジェット
-ActivateOn=で有効化
-ActiveOn=で有効化済
+BoxesActivated=活性化済ウィジェット
+ActivateOn=で活性化
+ActiveOn=で活性化済
 ActivatableOn=でアクティブ化可能
 SourceFile=ソースファイル
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=JavaScriptが無効になっていない場合にのみ使用可能
@@ -245,8 +245,8 @@ Required=必須
 UsedOnlyWithTypeOption=一部の議題オプションでのみ使用
 Security=セキュリティー
 Passwords=パスワード
-DoNotStoreClearPassword=データベースに保存されているパスワードを暗号化する ( プレーンテキストとしてではない ) 。このオプションを有効化することを強くお勧めする。
-MainDbPasswordFileConfEncrypted=conf.phpに保存されているデータベースパスワードを暗号化する。このオプションを有効化することを強くお勧めする。
+DoNotStoreClearPassword=データベースに保存されているパスワードを暗号化する ( プレーンテキストとしてではない ) 。このオプションを活性化することを強くお勧めする。
+MainDbPasswordFileConfEncrypted=conf.phpに保存されているデータベースパスワードを暗号化する。このオプションを活性化することを強くお勧めする。
 InstrucToEncodePass=パスワードを<b>conf.php </b>ファイルにエンコードするには、行<br> <b> $ dolibarr_main_db_pass = "..."を置き換える。 </b> <br> by <br> <b> $ dolibarr_main_db_pass = "crypted：%s"; </b>
 InstrucToClearPass=パスワードを<b>conf.php </b>ファイルにデコード ( クリア ) するには、行<br> <b> $ dolibarr_main_db_pass = "crypted：...";を置き換える。 </b> <br> by <br> <b> $ dolibarr_main_db_pass = "%s"; </b>
 ProtectAndEncryptPdfFiles=生成されたPDFファイルを保護する。大量のPDF生成が中断されるため、これはお勧めしない。
@@ -400,7 +400,7 @@ ThemeDir=スキンディレクトリ
 ConnectionTimeout=接続タイムアウト
 ResponseTimeout=応答タイムアウト
 SmsTestMessage=_人のPHONEFROM__から__までのテストメッセージPHONETO__
-ModuleMustBeEnabledFirst=この機能が必要な場合は、モジュール<b> %s</b>を最初に有効にする必要がある。
+ModuleMustBeEnabledFirst=この機能が必要な場合は、モジュール<b> %s</b>を最初に有効化する必要がある。
 SecurityToken=セキュリティで保護されたURLへの鍵
 NoSmsEngine=利用可能なSMS送信者マネージャーはない。 SMS送信者マネージャーは、外部仕入先に依存しているため、デフォルトのディストリビューションではインストールされないが、%sで見つけることができる。
 PDF=PDF
@@ -483,7 +483,7 @@ EraseAllCurrentBarCode=現在のバーコード値をすべて消去する
 ConfirmEraseAllCurrentBarCode=現在のバーコード値をすべて消去してもよいか？
 AllBarcodeReset=全バーコード値が削除された
 NoBarcodeNumberingTemplateDefined=バーコードモジュールの設定で採番バーコードテンプレートが有効でない。
-EnableFileCache=ファイルキャッシュを有効にする
+EnableFileCache=ファイルキャッシュを有効化
 ShowDetailsInPDFPageFoot=法人の住所やマネージャーの名前 ( 職業分類IDに加えて、法人の資本金、VAT番号 ) などの詳細をフッターに追加する。
 NoDetails=フッターに追加の詳細はない
 DisplayCompanyInfo=法人の住所を表示する
@@ -515,7 +515,7 @@ PageUrlForDefaultValues=ページURLの相対パスを入力する必要があ
 PageUrlForDefaultValuesCreate= <br>例：<br>新規取引先を作成するフォームの場合、<strong> %s</strong>。 <br>カスタムディレクトリにインストールされた外部モジュールのURLには、「custom /」を含めないため、custom/mymodule/mypage.phpではなく、<strong> mymodule/mypage.php</strong>のようなパスを使用する。 <br> URLに何らかのパラメータがある場合にのみデフォルト値が必要な場合は、<strong> %s</strong>を使用できる。
 PageUrlForDefaultValuesList= <br>例：<br>取引先を一覧表示するページの場合、<strong> %s</strong>。 <br>カスタムディレクトリにインストールされた外部モジュールのURLには、「custom /」を含めないため、custom/mymodule/mypagelist.phpではなく<strong>mymodule/mypagelist.php</strong>のようなパスを使用する。 <br> URLに何らかのパラメータがある場合にのみデフォルト値が必要な場合は、<strong> %s</strong>を使用できる。
 AlsoDefaultValuesAreEffectiveForActionCreate=また、フォーム作成のデフォルト値の上書きは、正しく設計されたページに対してのみ機能することに注意すること ( したがって、パラメーターaction = createまたはpresend ...を使用 ) 。
-EnableDefaultValues=デフォルト値のカスタマイズを有効にする
+EnableDefaultValues=デフォルト値のカスタマイズを有効化
 EnableOverwriteTranslation=翻訳のカスタマイズを許可する
 GoIntoTranslationMenuToChangeThis=このコードのキーの翻訳が見つかりました。この値を変更するには、Home-Setup-translationから編集する必要がある。
 WarningSettingSortOrder=警告、デフォルトのソート順を設定すると、フィールドが不明なフィールドの場合、リストページに移動するときに技術エラーが発生する可能性がある。このようなエラーが発生した場合は、このページに戻ってデフォルトの並べ替え順序を削除し、デフォルトの動作を復元すること。
@@ -531,11 +531,11 @@ FilesAttachedToEmail=ファイルを添付する
 SendEmailsReminders=メールで議題のリマインダーを送信する
 davDescription=WebDAVサーバーを設定する
 DAVSetup=モジュールDAVの設定
-DAV_ALLOW_PRIVATE_DIR=汎用非公開ディレクトリを有効にする ( 「private」という名前のWebDAV専用ディレクトリ-ログインが必要  ) 
+DAV_ALLOW_PRIVATE_DIR=汎用非公開ディレクトリを有効化 ( 「private」という名前のWebDAV専用ディレクトリ-ログインが必要  ) 
 DAV_ALLOW_PRIVATE_DIRTooltip=汎用非公開ディレクトリは、アプリケーションのログイン/パスを使用して誰でもアクセスできるWebDAVディレクトリ。
-DAV_ALLOW_PUBLIC_DIR=汎用公開ディレクトリを有効にする ( 「public」という名前のWebDAV専用ディレクトリ-ログインは不要 ) 
+DAV_ALLOW_PUBLIC_DIR=汎用公開ディレクトリを有効化 ( 「public」という名前のWebDAV専用ディレクトリ-ログインは不要 ) 
 DAV_ALLOW_PUBLIC_DIRTooltip=汎用公開ディレクトリは、誰でも ( 読取りおよび書き込みモードで ) アクセスできるWebDAVディレクトリであり、認証は必要ない ( ログイン/パスワードアカウント ) 。
-DAV_ALLOW_ECM_DIR=DMS / ECM非公開ディレクトリを有効にする ( DMS / ECMモジュールのルートディレクトリ-ログインが必要  ) 
+DAV_ALLOW_ECM_DIR=DMS / ECM非公開ディレクトリを有効化 ( DMS / ECMモジュールのルートディレクトリ-ログインが必要  ) 
 DAV_ALLOW_ECM_DIRTooltip=DMS / ECMモジュールの使用時に全ファイルが手動でアップロードされるルートディレクトリ。同様に、Webインターフェイスからのアクセスと同様に、アクセスするには、適切な権限を持つ有効なログイン/パスワードが必要。
 # Modules
 Module0Name=ユーザとグループ
@@ -645,21 +645,25 @@ Module2300Name=スケジュールされたジョブ
 Module2300Desc=スケジュールされたジョブ管理 ( 別名cronまたはクロノテーブル ) 
 Module2400Name=イベント/議題
 Module2400Desc=トラック競技。追跡目的で自動イベントをログに記録するか、手動のイベントまたは会議を記録する。これは、優れた顧客または仕入先関係管理の主要なモジュール。
+Module2430Name=予約カレンダーシステム
+Module2430Desc=事前に定義された範囲または空き状況に応じて、誰でもランデブーを予約できるオンライン カレンダーを提供する。
 Module2500Name=DMS / ECM
 Module2500Desc=ドキュメント管理システム/電子コンテンツ管理。生成または保存されたドキュメントの自動編成。必要なときに共有すること。
 Module2600Name=API・Webサービス（SOAPサーバー）
-Module2600Desc=APIサービスを提供するDolibarrSOAPサーバーを有効にする
+Module2600Desc=APIサービスを提供するDolibarrSOAPサーバーを有効化
 Module2610Name=API / Web サービス (REST サーバー)
-Module2610Desc=APIサービスを提供するDolibarrRESTサーバーを有効にする
+Module2610Desc=APIサービスを提供するDolibarrRESTサーバーを有効化
 Module2660Name=Webサービスの呼び出し ( SOAPクライアント ) 
-Module2660Desc=Dolibarr Webサービスクライアントを有効にする ( データ/要求を外部サーバーにプッシュするために使用できる。現在サポートされているのは購買発注のみ  ) 。
+Module2660Desc=Dolibarr Webサービスクライアントを有効化 ( データ/要求を外部サーバーにプッシュするために使用できる。現在サポートされているのは購買発注のみ  ) 。
 Module2700Name=グラバター
 Module2700Desc=オンラインのGravatarサービス (www.gravatar.com) を使用して、ユーザ/構成員の写真を表示する ( メールに記載されている ) 。インターネットアクセスが必要
 Module2800Desc=FTPクライアント
 Module2900Name=GeoIPMaxmind
 Module2900Desc=のGeoIP Maxmindの変換機能
 Module3200Name=変更不可能なアーカイブ
-Module3200Desc=ビジネスイベントの変更不可能なログを有効にする。イベントはリアルタイムでアーカイブされる。ログは、エクスポート可能な連鎖イベントの読取り専用テーブル。このモジュールは、国によっては必須の場合がある。
+Module3200Desc=ビジネスイベントの変更不可能なログを有効化。イベントはリアルタイムでアーカイブされる。ログは、エクスポート可能な連鎖イベントの読取り専用テーブル。このモジュールは、国によっては必須の場合がある。
+Module3300Name=モジュールビルダー
+Module3200Desc=ビジネスイベントの変更不可能なログを有効化。イベントはリアルタイムでアーカイブされる。ログは、エクスポート可能な連鎖イベントの読取り専用テーブル。このモジュールは、国によっては必須の場合がある。
 Module3400Name=ソーシャルネットワーク
 Module3400Desc=ソーシャルネットワークフィールドを取引先とアドレス（skype、twitter、facebookなど）に対して有効化する。
 Module4000Name=HRM
@@ -783,7 +787,7 @@ Permission153=口座振替の支払注文の送信/送信
 Permission154=口座振替の支払注文のクレジット/拒否を記録する
 Permission161=契約/サブスクリプションを読込む
 Permission162=契約/サブスクリプションを作成/変更する
-Permission163=契約のサービス/サブスクリプションを有効化する
+Permission163=契約のサービス/サブスクリプションを活性化する
 Permission164=契約のサービス/サブスクリプションを無効にする
 Permission165=契約/サブスクリプションを削除する
 Permission167=契約をエクスポート
@@ -811,7 +815,7 @@ Permission205=接続を管理する
 Permission206=接続を読込む
 Permission211=テレフォニーを読込む
 Permission212=注文明細行
-Permission213=ラインを有効化する
+Permission213=ラインを活性化する
 Permission214=設定テレフォニー
 Permission215=設定·プロバイダー
 Permission221=emailingsを読込む
@@ -1182,7 +1186,7 @@ LoginPage=ログインページ
 BackgroundImageLogin=背景画像
 PermanentLeftSearchForm=左側のメニューの恒久的な検索フォーム
 DefaultLanguage=既定の言語
-EnableMultilangInterface=顧客または仕入先との関係に対する多言語サポートを有効にする
+EnableMultilangInterface=顧客または仕入先との関係に対する多言語サポートを有効化
 EnableShowLogo=メニューに法人のロゴを表示する
 CompanyInfo=法人/組織
 CompanyIds=法人/組織のアイデンティティ
@@ -1214,7 +1218,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=有効化するサービス
+Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=活性化するサービス
 Delays_MAIN_DELAY_RUNNING_SERVICES=期限切れのサービス
 Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=未払いの仕入先の請求書
 Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=未払いの顧客請求書
@@ -1247,29 +1251,30 @@ BrowserOS=ブラウザOS
 ListOfSecurityEvents=Dolibarrセキュリティイベントのリスト
 SecurityEventsPurged=セキュリティイベントのパージ
 TrackableSecurityEvents=追跡可能なセキュリティ イベント
-LogEventDesc=特定のセキュリティイベントのログを有効にする。管理者はメニュー<b>%s-%s</b>を介してログを記録する。警告、この機能はデータベースに大量のデータを生成する可能性がある。
+LogEventDesc=特定のセキュリティイベントのログを有効化。管理者はメニュー<b>%s-%s</b>を介してログを記録する。警告、この機能はデータベースに大量のデータを生成する可能性がある。
 AreaForAdminOnly=設定パラメータは、<b>管理者ユーザ</b>のみが設定できる。
 SystemInfoDesc=システム情報では、読取り専用モードでのみ管理者の目に見える得るその他の技術情報。
 SystemAreaForAdminOnly=この領域は、管理者ユーザのみが使用できる。 Dolibarrのユーザ権限は、この制限を変更できない。
 CompanyFundationDesc=あなたの法人/組織の情報を編集する。完了したら、ページの下部にある「%s」ボタンをクリックする。
-MoreNetworksAvailableWithModule=「ソーシャル ネットワーク」モジュールを有効にすると、より多くのソーシャル ネットワークを利用できる場合がある。
+MoreNetworksAvailableWithModule=「ソーシャル ネットワーク」モジュールを有効化と、より多くのソーシャル ネットワークを利用できる場合がある。
 AccountantDesc=外部の会計士/簿記係がいる場合は、ここでその情報を編集できる。
 AccountantFileNumber=会計士コード
 DisplayDesc=アプリケーションの外観と表示に影響を与えるパラメータは、ここで変更できる。
 AvailableModules=利用可能なアプリ/モジュール
-ToActivateModule=モジュールを有効化するには、設定エリア ( ホーム - &gt;設定 - &gt;モジュール ) に行く。
+ToActivateModule=モジュールを活性化するには、設定エリア ( ホーム - &gt;設定 - &gt;モジュール ) に行く。
 SessionTimeOut=セッションのタイムアウト
 SessionExplanation=この数値は、セッションクリーナーが内部PHPセッションクリーナーによって実行された場合 ( および他に何も実行されない場合 ) 、この遅延の前にセッションが期限切れにならないことを保証する。内部PHPセッションクリーナーは、この遅延後にセッションが期限切れになることを保証しない。この遅延の後、セッションクリーナーが実行されると期限切れになるので、全<b> %s / %s </b>アクセス、他のセッションによるアクセス中のみ  ( 値が0なら、セッションのクリアは外部処理によってのみ行われることを意味する ) 。 <br>注：外部セッションクリーニングメカニズム ( debianのcron、ubuntu ... ) を備えた一部のサーバーでは、ここに入力した値に関係なく、外部設定で定義された期間が経過するとセッションが破棄される可能性がある。
 SessionsPurgedByExternalSystem=このサーバー上のセッションは、外部メカニズム ( debianの下のcron、ubuntu ... ) 、おそらく<b> %s </b>秒 ( =パラメーター<b>セッションの値changeing the value so.gc_maxlifetime a09a4b739f17f8 ) によってクリーンアップされているもよう。サーバー管理者にセッション遅延の変更を依頼する必要がある。
 TriggersAvailable=使用可能なトリガ
-TriggersDesc=トリガーは、ディレクトリ<b> htdocs / core / triggers</b>にコピーされるとDolibarrワークフローの動作を変更するファイル。それらは、Dolibarrイベントで有効化された新規アクション ( 新規法人の作成、請求書の検証など ) を実現する。
+TriggersDesc=トリガーは、ディレクトリ<b> htdocs / core / triggers</b>にコピーされるとDolibarrワークフローの動作を変更するファイル。それらは、新規アクション、Dolibarrイベントで活性化済 ( 新規法人の作成、請求書の検証など ) を実現する。
 TriggerDisabledByName=このファイル内のトリガはその名前に<b>-NORUN</b>サフィックスは無効になっている。
 TriggerDisabledAsModuleDisabled=モジュール<b>%sが</b>無効<b>になっ</b>ているとして、このファイル内のトリガーが無効になっている。
-TriggerAlwaysActive=このファイル内のトリガーは常に有効、有効化済Dolibarrモジュールであれば何でも。
+TriggerAlwaysActive=このファイル内のトリガーは常に有効、活性化済Dolibarrモジュールであれば何でも。
 TriggerActiveAsModuleActive=モジュール<b>%sが</b>有効<b>になっ</b>ているとして、このファイル内のトリガーがアクティブになる。
 GeneratedPasswordDesc=自動生成されたパスワードに使用する方法を選択する。
 DictionaryDesc=全参照データを挿入する。デフォルトに値を追加できる。
 ConstDesc=このページでは、他のページでは使用できないパラメーターを編集 ( オーバーライド ) できる。これらは主に、開発者/高度なトラブルシューティング専用の予約済パラメーター。
+MiscellaneousOptions=その他のオプション
 MiscellaneousDesc=他の全セキュリティ関連パラメータはここで定義される。
 LimitsSetup=制限/精密設定
 LimitsDesc=Dolibarrが使用する制限、精度、最適化をここで定義できる
@@ -1293,7 +1298,7 @@ RestoreDesc=Dolibarrバックアップを復元するには、2つの手順が
 RestoreDesc2=「documents」ディレクトリのバックアップファイル ( zipファイルなど ) を新規Dolibarrインストールまたはこの現在のdocumentsディレクトリ ( <b> %s </b> ) に復元する。
 RestoreDesc3=データベース構造とデータをバックアップダンプファイルから、新規Dolibarrインストールのデータベースまたはこの現在のインストールのデータベース ( <b> %s </b> ) に復元する。警告、復元が完了したら、バックアップ時間/インストールから存在したログイン/パスワードを使用して再度接続する必要がある。 <br>バックアップデータベースをこの現在のインストールに復元するには、このアシスタントに従うことができる。
 RestoreMySQL=MySQLのインポート
-ForcedToByAModule=このルールが有効化済モジュールによって<b>%s</b>に強制される。
+ForcedToByAModule=このルールが活性化済モジュールによって<b>%s</b>に強制される。
 ValueIsForcedBySystem=この値はシステムによって強制される。変更することはできない。
 PreviousDumpFiles=既存のバックアップファイル
 PreviousArchiveFiles=既存のアーカイブファイル
@@ -1358,10 +1363,10 @@ WarningAtLeastKeyOrTranslationRequired=少なくともキーまたは翻訳文
 NewTranslationStringToShow=表示する新規翻訳文字列
 OriginalValueWas=元の翻訳は上書きされる。元の値は次のとおり。<br><br>%s
 TransKeyWithoutOriginalValue=どの言語ファイルにも存在しない翻訳キー '<strong> %s</strong>'の新規翻訳を強制した
-TitleNumberOfActivatedModules=有効化されたモジュール
-TotalNumberOfActivatedModules=有効化済モジュール：<b> %s </b> / <b> %s </b>
-YouMustEnableOneModule=少なくとも1つのモジュールを有効にする必要がある
-YouMustEnableTranslationOverwriteBefore=翻訳を置き換えることができるようにするには、最初に翻訳の上書きを有効にする必要がある
+TitleNumberOfActivatedModules=活性化済モジュール
+TotalNumberOfActivatedModules=活性化済モジュール：<b> %s </b> / <b> %s </b>
+YouMustEnableOneModule=少なくとも1つのモジュールを有効化する必要がある
+YouMustEnableTranslationOverwriteBefore=翻訳を置き換えることができるようにするには、最初に翻訳の上書きを有効化する必要がある
 ClassNotFoundIntoPathWarning=クラス%sがPHPパスに見つからない
 YesInSummer=はい夏に
 OnlyFollowingModulesAreOpenedToExternalUsers=次のモジュールのみが ( そのようなユーザのアクセス許可に関係なく ) 外部ユーザが使用でき、アクセス許可が付与されている場合にのみ使用できることに注意すること：<br>
@@ -1417,7 +1422,7 @@ NotificationsDescGlobal=*または、モジュールの設定ページでグロ
 ModelModules=ドキュメントテンプレート
 DocumentModelOdt=OpenDocumentテンプレートからドキュメントを生成する ( LibreOffice、OpenOffice、KOffice、TextEditなどの.ODT / .ODSファイル ) 
 WatermarkOnDraft=下書き文書に透かし
-JSOnPaimentBill=支払フォームの支払明細を自動入力する機能を有効化する
+JSOnPaimentBill=支払フォームの支払明細を自動入力する機能を活性化する
 CompanyIdProfChecker=職業分類IDのルール
 MustBeUnique=ユニークでなければならないか？
 MustBeMandatory=取引先の作成が必須 ( VAT番号または法人の種類が定義されている場合 ) ？
@@ -1497,7 +1502,7 @@ AdherentMailRequired=新規構成員を作成するにはメールが必要
 MemberSendInformationByMailByDefault=構成員 ( 検証や新規サブスクリプション ) にメールの確定を送信するチェックボックスはデフォルトでオンになっている
 MemberCreateAnExternalUserForSubscriptionValidated=検証済新規構成員サブスクリプションごとに外部ユーザログインを作成する
 VisitorCanChooseItsPaymentMode=訪問者は、利用可能な支払いモードから選択できる
-MEMBER_REMINDER_EMAIL=期限切れのサブスクリプションの電子メール</b>によって自動リマインダー<b>を有効にする。注：モジュール<strong> %s </strong>を有効にして、リマインダーを送信するように正しく設定する必要がある。
+MEMBER_REMINDER_EMAIL=期限切れのサブスクリプションの電子メール</b>によって自動リマインダー<b>を有効化。注：モジュール<strong> %s </strong>を有効にして、リマインダーを送信するように正しく設定する必要がある。
 MembersDocModules=構成員レコードから生成されたドキュメント用のドキュメントテンプレート
 ##### LDAP setup #####
 LDAPSetup=LDAPの設定
@@ -1537,11 +1542,11 @@ LDAPServerDnExample=完全なDN ( 例：DC =会社、dc = comなど )
 LDAPDnSynchroActive=ユーザとグループの同期
 LDAPDnSynchroActiveExample=LDAP同期にDolibarrまたはDolibarrへのLDAP
 LDAPDnContactActive=連絡先の同期
-LDAPDnContactActiveExample=有効化/無効化の同期
+LDAPDnContactActiveExample=活性化済/不活化済の同期
 LDAPDnMemberActive=構成員の同期
-LDAPDnMemberActiveExample=有効化/無効化の同期
+LDAPDnMemberActiveExample=活性化済/不活化済の同期
 LDAPDnMemberTypeActive=構成員種別の同期
-LDAPDnMemberTypeActiveExample=有効化/不活性の同期
+LDAPDnMemberTypeActiveExample=活性化済/不活化済の同期
 LDAPContactDn=Dolibarrの連絡先のDN
 LDAPContactDnExample=完全なDN ( 例：OU =連絡先、DC =社会、dc = comなど ) 
 LDAPMemberDn=Dolibarr構成員のDN
@@ -1678,7 +1683,7 @@ OnProductSelectAddProductDesc=ドキュメントの行として製品追加す
 AutoFillFormFieldBeforeSubmit=説明入力フィールドに製品説明を自動入力する
 DoNotAutofillButAutoConcat=入力フィールドに製品説明を自動入力しない。製品説明は、入力された説明に自動的に連結される。
 DoNotUseDescriptionOfProdut=製品説明が文書の行の説明に含まれることはない
-MergePropalProductCard=製品/サービスが提案に含まれている場合、製品/サービスの【添付ファイル】タブで、製品のPDFドキュメントを提案のPDF azurにマージするオプションを有効化する
+MergePropalProductCard=製品/サービスが提案に含まれている場合、製品/サービスの【添付ファイル】タブで、製品のPDFドキュメントを提案のPDF azurにマージするオプションを活性化する
 ViewProductDescInThirdpartyLanguageAbility=フォームでは製品説明を取引先の言語(それ以外の場合はユーザの言語)で表示
 UseSearchToSelectProductTooltip=また、製品の数が多い ( > 100 000 ) 場合は、【設定】-> 【その他】で定数PRODUCT_DONOTSEARCH_ANYWHEREを1に設定することで速度を上げることができる。その後、検索は文字列の先頭に限定される。
 UseSearchToSelectProduct=キーを押すまで待ってから、製品コンボリストのコンテンツをロードすること ( これにより、製品の数が多い場合にパフォーマンスが向上する可能性があるが、あまり便利ではない ) 
@@ -1745,7 +1750,7 @@ SendingsSetup=出荷モジュールの設定
 SendingsReceiptModel=領収書のモデルを送信する
 SendingsNumberingModules=発信採番モジュール
 SendingsAbility=顧客への配送用の出荷シートをサポートする
-NoNeedForDeliveryReceipts=ほとんどの場合、出荷用シートは、顧客への配送用のシート ( 送信する製品のリスト ) と、顧客が受け取って署名するシートの両方として使用される。したがって、製品入庫受領書は重複した機能であり、有効化されることはめったにない。
+NoNeedForDeliveryReceipts=ほとんどの場合、出荷用シートは、顧客への配送用のシート ( 送信する製品のリスト ) と、顧客が受け取って署名するシートの両方として使用される。したがって、製品入庫受領書は重複した機能であり、活性化されることはめったにない。
 FreeLegalTextOnShippings=出荷に関するフリーテキスト
 ##### Deliveries #####
 DeliveryOrderNumberingModules=製品発送受領採番モジュール
@@ -1754,7 +1759,7 @@ DeliveriesOrderAbility=サポート製品の納入の領収書
 FreeLegalTextOnDeliveryReceipts=配達のレシートにフリーテキスト
 ##### FCKeditor #####
 AdvancedEditor=高度なエディタ
-ActivateFCKeditor=高度なエディタを有効化:
+ActivateFCKeditor=高度なエディタを活性化:
 FCKeditorForNotePublic=要素の「パブリックノート」フィールドのWYSIWIG作成/編集
 FCKeditorForNotePrivate=要素の「プライベートノート」フィールドのWYSIWIG作成/編集
 FCKeditorForCompany=要素のフィールド記述のWYSIWIG作成/エディション（製品/サービスを除く）
@@ -1826,10 +1831,13 @@ AGENDA_USE_EVENT_TYPE=イベント種別を使用する ( メニューの【設
 AGENDA_USE_EVENT_TYPE_DEFAULT=イベント作成フォームでイベントの種別にこのデフォルト値を自動的に設定する
 AGENDA_DEFAULT_FILTER_TYPE=アジェンダビューの検索フィルタでこの種別のイベントを自動的に設定する
 AGENDA_DEFAULT_FILTER_STATUS=アジェンダビューの検索フィルタでイベントのこの状態を自動的に設定する
+AGENDA_EVENT_PAST_COLOR=過去のイベントカラー
+AGENDA_EVENT_CURRENT_COLOR=現在のイベントの色
+AGENDA_EVENT_FUTURE_COLOR=今後のイベントカラー
 AGENDA_DEFAULT_VIEW=メニューの議題を選択するときに、デフォルトでどのビューを開くか
-AGENDA_REMINDER_BROWSER=ユーザのブラウザ</b>でイベントリマインダー<b>を有効にする(リマインダーの日付に達すると、ブラウザにポップアップが表示される。各ユーザは、ブラウザの通知設定からそのような通知を無効にできる)。
-AGENDA_REMINDER_BROWSER_SOUND=音声通知を有効にする
-AGENDA_REMINDER_EMAIL=電子メール</b>でイベントリマインダー<b>を有効にする(リマインダーオプション/遅延は各イベントで定義できる)。
+AGENDA_REMINDER_BROWSER=ユーザのブラウザ</b>でイベントリマインダー<b>を有効化(リマインダーの日付に達すると、ブラウザにポップアップが表示される。各ユーザは、ブラウザの通知設定からそのような通知を無効にできる)。
+AGENDA_REMINDER_BROWSER_SOUND=音声通知を有効化
+AGENDA_REMINDER_EMAIL=電子メール</b>でイベントリマインダー<b>を有効化(リマインダーオプション/遅延は各イベントで定義できる)。
 AGENDA_REMINDER_EMAIL_NOTE=注：スケジュールされたジョブ%sの頻度は、リマインダーが正しいタイミングで送信されることを確認するのに十分であること。
 AGENDA_SHOW_LINKED_OBJECT=リンクされたオブジェクトを議題ビューに表示する
 ##### Clicktodial #####
@@ -1860,17 +1868,17 @@ BookmarkDesc=このモジュールを使用すると、ブックマークを管
 NbOfBoomarkToShow=左側のメニューに表示するブックマークの最大数
 ##### WebServices #####
 WebServicesSetup=ウェブサービスモジュールの設定
-WebServicesDesc=このモジュールを有効にすることによって、Dolibarrでは、その他のウェブサービスを提供するWebサービスのサーバーになる。
+WebServicesDesc=このモジュールの有効化によって、Dolibarrでは、その他のウェブサービスを提供するWebサービスのサーバーになる。
 WSDLCanBeDownloadedHere=提供されるサービスのWSDL記述子ファイルはここからダウンロードできる。
 EndPointIs=SOAPクライアントは、URLで入手可能なDolibarrエンドポイントに要求を送信する必要がある
 ##### API ####
 ApiSetup=APIモジュールの設定
-ApiDesc=このモジュールを有効にすることで、DolibarrはさまざまなWebサービスを提供するRESTサーバーになる。
-ApiProductionMode=本番モードを有効化する ( これにより、サービス管理のためのキャッシュの使用が有効化する ) 
+ApiDesc=このモジュールを有効化することで、DolibarrはさまざまなWebサービスを提供するRESTサーバーになる。
+ApiProductionMode=本番モードを活性化する ( これにより、サービス管理のためのキャッシュの使用が活性化する ) 
 ApiExporerIs=URLでAPIを調べてテストできる
 OnlyActiveElementsAreExposed=有効なモジュールの要素のみが公開される
 ApiKey=APIのキー
-WarningAPIExplorerDisabled=APIエクスプローラーが無効になっている。 APIサービスを提供するためにAPIエクスプローラーは必要ない。これは、開発者がRESTAPIを検索/テストするためのツール。このツールが必要な場合は、モジュールAPIRESTの設定に移動して有効化する。
+WarningAPIExplorerDisabled=APIエクスプローラーが無効になっている。 APIサービスを提供するためにAPIエクスプローラーは必要ない。これは、開発者がRESTAPIを検索/テストするためのツール。このツールが必要な場合は、モジュールAPIRESTの設定に移動して活性化する。
 ##### Bank #####
 BankSetupModule=銀行のモジュールの設定
 FreeLegalTextOnChequeReceipts=小切手領収書のフリーテキスト
@@ -1929,7 +1937,7 @@ ExpenseReportsSetup=モジュール経費報告書sの設定
 TemplatePDFExpenseReports=経費報告書ドキュメントを生成するためのドキュメントテンプレート
 ExpenseReportsRulesSetup=モジュール経費報告書sの設定-ルール
 ExpenseReportNumberingModules=経費報告書s採番モジュール
-NoModueToManageStockIncrease=自動在庫増加を管理できるモジュールは有効化されていない。在庫増加は手動入力のみで行われる。
+NoModueToManageStockIncrease=自動在庫増加を管理できるモジュールは活性化されていない。在庫増加は手動入力のみで行われる。
 YouMayFindNotificationsFeaturesIntoModuleNotification=モジュール「通知」を有効にして構成することにより、電子メール通知のオプションを見つけることができる。
 TemplatesForNotifications=通知用のテンプレート
 ListOfNotificationsPerUser=ユーザごとの自動通知のリスト*
@@ -1942,7 +1950,7 @@ BackupDumpWizard=データベースダンプファイルを作成するウィザ
 BackupZipWizard=ドキュメントディレクトリのアーカイブを構築するウィザード
 SomethingMakeInstallFromWebNotPossible=次の理由により、Webインターフェイスから外部モジュールをインストールすることはできない。
 SomethingMakeInstallFromWebNotPossible2=このため、ここで説明するアップグレードプロセスは、特権ユーザのみが実行できる手動プロセス。
-InstallModuleFromWebHasBeenDisabledContactUs=アプリケーションからの外部モジュールまたは動的 Web サイトのインストールまたは開発は、現在、セキュリティ上の目的でロックされています。この機能を有効にする必要がある場合は、お問い合わせください。
+InstallModuleFromWebHasBeenDisabledContactUs=アプリケーションからの外部モジュールまたは動的 Web サイトのインストールまたは開発は、現在、セキュリティ上の目的でロックされています。この機能を有効化する必要がある場合は、お問い合わせください。
 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=マウスの動きが通過したときにテーブルの行を強調表示する
@@ -1953,7 +1961,7 @@ BtnActionColor=アクションボタンの色
 TextBtnActionColor=アクションボタンのテキストの色
 TextTitleColor=ページタイトルのテキストの色
 LinkColor=リンクの色
-PressF5AfterChangingThis=キーボードのCTRL + F5を押すか、この値を変更して有効にするためにブラウザのキャッシュをクリアする
+PressF5AfterChangingThis=キーボードのCTRL + F5を押すか、この値を変更して有効化するためにブラウザのキャッシュをクリアする
 NotSupportedByAllThemes=コアテーマで動作するが、外部テーマではサポートされていない可能性がある
 BackgroundColor=背景色
 TopMenuBackgroundColor=トップメニューの背景色
@@ -2040,12 +2048,12 @@ activateModuleDependNotSatisfied=モジュール「%s」はモジュール「%s
 CommandIsNotInsideAllowedCommands=実行しようとしているコマンドは、<strong> conf.php</strong>ファイルのパラメーター<strong> $ dolibarr_main_restrict_os_commands</strong>で定義されている許可されたコマンドのリストにない。
 LandingPage=ランディングページ
 SamePriceAlsoForSharedCompanies=複数の法人のモジュールを使用し、「単一価格」を選択した場合、製品が環境間で共有されていれば、価格も全法人で同じになる
-ModuleEnabledAdminMustCheckRights=モジュールが有効化された。有効化されたモジュール(s)のアクセス許可は、管理者ユーザにのみ付与された。必要に応じて、他のユーザまたはグループに手動でアクセス許可を付与する必要がある場合がある。
+ModuleEnabledAdminMustCheckRights=モジュールが活性化済。活性化済モジュール(s)のアクセス許可は、管理者ユーザにのみ付与された。必要に応じて、他のユーザまたはグループに手動でアクセス許可を付与する必要がある場合がある。
 UserHasNoPermissions=このユーザには権限が定義されていない
 TypeCdr=支払期間の日付が請求書の日付に日数のデルタを加えたものである場合は「なし」を使用する ( デルタはフィールド「%s」 ) <br>デルタの後、日付を増やして終了する必要がある場合は、「月末」を使用する月の ( +オプションの「%s」 ( 日数 )  ) <br>「現在/次」を使用して、支払期間の日付をデルタの後の月の最初のN番目にする ( デルタはフィールド「%s」、Nはフィールド「%s」に格納される ) 
 BaseCurrency=法人の参照通貨 ( これを変更するには、法人の設定に入る )
 WarningNoteModuleInvoiceForFrenchLaw=このモジュール%sは、フランスの法律 ( Loi Finance 2016 ) に準拠している。
-WarningNoteModulePOSForFrenchLaw=このモジュール%sは、モジュールNon Reversible Logsが自動的に有効化されるため、フランスの法律 ( Loi Finance 2016 ) に準拠している。
+WarningNoteModulePOSForFrenchLaw=このモジュール%sは、モジュールNon Reversible Logsが自動的に活性化されるため、フランスの法律 ( Loi Finance 2016 ) に準拠している。
 WarningInstallationMayBecomeNotCompliantWithLaw=外部モジュールであるモジュール%sをインストールしようとしている。外部モジュールをアクティブ化すると、そのモジュールの発行元を信頼し、このモジュールがアプリケーションの動作に悪影響を与えず、国の法律 ( %s ) に準拠していることを確認できる。モジュールが違法な機能を導入した場合、違法なソフトウェアの使用について責任を負うことになる。
 MAIN_PDF_MARGIN_LEFT=PDFの左マージン
 MAIN_PDF_MARGIN_RIGHT=PDFの右マージン
@@ -2079,7 +2087,7 @@ HelpOnTooltipDesc=このフィールドがフォームに表示されたとき
 YouCanDeleteFileOnServerWith=次のコマンドラインを使用して、サーバー上のこのファイルを削除できる：<br> %s
 ChartLoaded=ロードされた勘定科目表
 SocialNetworkSetup=モジュールソーシャルネットワークの設定
-EnableFeatureFor=<strong> %s</strong>の機能を有効にする
+EnableFeatureFor=<strong> %s</strong>の機能を有効化
 VATIsUsedIsOff=注：消費税またはVATを使用するオプションは、メニュー%s-%sで<strong> Off </strong>に設定されているため、消費税または使用される付加価値税は常に0になる。
 SwapSenderAndRecipientOnPDF=PDFドキュメントの送信者と受信者のアドレス位置を入れ替える
 FeatureSupportedOnTextFieldsOnly=警告、機能性はテキストフィールドとコンボリストでのみサポートされる。また、この機能性を引き出すには、URLパラメータ action=create または action=edit を設定するか、ページ名が 'new.php' で終わる必要がある。
@@ -2106,18 +2114,18 @@ DateLastCollectResult=最新の取得試行の日付
 DateLastcollectResultOk=最新の取得成功の日付
 LastResult=最新の結果
 EmailCollectorHideMailHeaders=収集された電子メールの保存されたコンテンツに電子メールヘッダーのコンテンツを含めないこと
-EmailCollectorHideMailHeadersHelp=有効にすると、アジェンダイベントとして保存される電子メールコンテンツの最後に電子メールヘッダーは追加されない。
+EmailCollectorHideMailHeadersHelp=有効化と、アジェンダイベントとして保存される電子メールコンテンツの最後に電子メールヘッダーは追加されない。
 EmailCollectorConfirmCollectTitle=メール収集確定
 EmailCollectorConfirmCollect=このコレクタを今すぐ実行するか？
-EmailCollectorExampleToCollectTicketRequestsDesc=いくつかのルールに一致する電子メールを収集し、電子メール情報を含むチケットを自動的に作成する（モジュールチケットを有効化する必要がある）。電子メールでサポートを提供する場合は、このコレクタを使用できるため、チケット要求が自動的に生成される。 Collect_Responsesも有効化して、チケットビューで直接クライアントの回答を収集する（Dolibarrから返信する必要がある）。
+EmailCollectorExampleToCollectTicketRequestsDesc=いくつかのルールに一致する電子メールを収集し、電子メール情報を含むチケットを自動的に作成する（モジュールチケットを活性化する必要がある）。電子メールでサポートを提供する場合は、このコレクタを使用できるため、チケット要求が自動的に生成される。 Collect_Responsesも活性化して、チケットビューで直接クライアントの回答を収集する（Dolibarrから返信する必要がある）。
 EmailCollectorExampleToCollectTicketRequests=チケット要求の収集例（最初のメッセージのみ）
 EmailCollectorExampleToCollectAnswersFromExternalEmailSoftwareDesc=メールボックスの「送信済み」ディレクトリをスキャンして、Dolibarrからではなく、電子メールソフトウェアから直接別の電子メールの応答として送信された電子メールを見つけます。そのような電子メールが見つかった場合、回答のイベントはDolibarrに記録される
 EmailCollectorExampleToCollectAnswersFromExternalEmailSoftware=外部の電子メールソフトウェアから送信された電子メールの回答を収集する例
-EmailCollectorExampleToCollectDolibarrAnswersDesc=アプリケーションから送信された電子メールの回答であるすべての電子メールを収集する。電子メール応答を含むイベント（モジュールアジェンダを有効にする必要があ）は、適切な場所に記録される。たとえば、アプリケーションから電子メールでチケットの商取引提案、注文、請求書、またはメッセージを送信し、受信者が電子メールに応答すると、システムは自動的に応答をキャッチしてERPに追加する。
+EmailCollectorExampleToCollectDolibarrAnswersDesc=アプリケーションから送信された電子メールの回答であるすべての電子メールを収集する。電子メール応答を含むイベント（モジュールアジェンダを有効化する必要があ）は、適切な場所に記録される。たとえば、アプリケーションから電子メールでチケットの商取引提案、注文、請求書、またはメッセージを送信し、受信者が電子メールに応答すると、システムは自動的に応答をキャッチしてERPに追加する。
 EmailCollectorExampleToCollectDolibarrAnswers=Dolibarrから送信されたメッセージへの回答である全受信メッセージを収集する例
-EmailCollectorExampleToCollectLeadsDesc=いくつかのルールに一致する電子メールを収集し、電子メール情報を使用してリードを自動的に作成する（モジュールプロジェクトを有効にする必要がある）。モジュールプロジェクト（1リード= 1プロジェクト）を使用してリードをフォローする場合は、このコレクタを使用できる。これにより、リードが自動的に生成される。コレクタのCollect_Responsesも有効になっている場合、リード、プロポーザル、またはその他のオブジェクトから電子メールを送信すると、アプリケーションに直接顧客またはパートナーの回答が表示される場合がある。 <br>注：この最初の例では、リードのタイトルが電子メールを含めて生成される。サードパーティがデータベース（新規顧客）で見つからない場合、リードはID1のサードパーティに接続される。
+EmailCollectorExampleToCollectLeadsDesc=いくつかのルールに一致する電子メールを収集し、電子メール情報を使用してリードを自動的に作成する（モジュールプロジェクトを有効化する必要がある）。モジュールプロジェクト（1リード= 1プロジェクト）を使用してリードをフォローする場合は、このコレクタを使用できる。これにより、リードが自動的に生成される。コレクタのCollect_Responsesも有効になっている場合、リード、プロポーザル、またはその他のオブジェクトから電子メールを送信すると、アプリケーションに直接顧客またはパートナーの回答が表示される場合がある。 <br>注：この最初の例では、リードのタイトルが電子メールを含めて生成される。サードパーティがデータベース（新規顧客）で見つからない場合、リードはID1のサードパーティに接続される。
 EmailCollectorExampleToCollectLeads=リードの収集例
-EmailCollectorExampleToCollectJobCandidaturesDesc=求人に応募するメールを収集する（モジュール採用を有効にする必要がある）。ジョブ要求の候補を自動的に作成する場合は、このコレクタを完成させることができる。注：この最初の例では、候補者のタイトルが電子メールを含めて生成される。
+EmailCollectorExampleToCollectJobCandidaturesDesc=求人に応募するメールを収集する（モジュール採用を有効化する必要がある）。ジョブ要求の候補を自動的に作成する場合は、このコレクタを完成させることができる。注：この最初の例では、候補者のタイトルが電子メールを含めて生成される。
 EmailCollectorExampleToCollectJobCandidatures=電子メールで受け取った求職者の収集例
 NoNewEmailToProcess=処理する新規電子メール ( 一致するフィルタ ) はない
 NothingProcessed=何もしていない
@@ -2129,6 +2137,7 @@ CodeLastResult=最新の結果コード
 NbOfEmailsInInbox=ソースディレクトリ内の電子メールの数
 LoadThirdPartyFromName=%sで検索している取引先をロードする ( ロードのみ ) 
 LoadThirdPartyFromNameOrCreate=%sで検索している取引先をロードする ( 見つからない場合は作成する ) 
+LoadContactFromEmailOrCreate=%s で連絡先検索をロードする (見つからない場合は作成する)
 AttachJoinedDocumentsToObject=メールトピックにオブジェクトの参照が見つかった場合は、添付ファイルをオブジェクトドキュメントに保存する。
 WithDolTrackingID=Dolibarrから送信された最初の電子メールによって開始された会話からのメッセージ
 WithoutDolTrackingID=Dolibarrから送信されていない最初の電子メールによって開始された会話からのメッセージ
@@ -2150,9 +2159,9 @@ ConfirmUnactivation=モジュールのリセットを確定する
 OnMobileOnly=小画面 ( スマートフォン ) のみ
 DisableProspectCustomerType=「見込み客+顧客」の取引先種別を無効にする ( したがって、取引先は「見込み客」または「顧客」である必要があるが、両方にすることはできない ) 
 MAIN_OPTIMIZEFORTEXTBROWSER=目の不自由な人のためのインターフェースを簡素化する
-MAIN_OPTIMIZEFORTEXTBROWSERDesc=目の不自由な方、またはLynxやLinksなどのテキストブラウザからアプリケーションを使用する場合は、このオプションを有効にすること。
+MAIN_OPTIMIZEFORTEXTBROWSERDesc=目の不自由な方、またはLynxやLinksなどのテキストブラウザからアプリケーションを使用する場合は、このオプションを有効化すること。
 MAIN_OPTIMIZEFORCOLORBLIND=色覚異常の人のインターフェースの色を変更する
-MAIN_OPTIMIZEFORCOLORBLINDDesc=色覚異常の人の場合は、このオプションを有効にする。場合によっては、インターフェイスによって色の設定が変更され、コントラストが向上する。
+MAIN_OPTIMIZEFORCOLORBLINDDesc=色覚異常の人の場合は、このオプションを有効化。場合によっては、インターフェイスによって色の設定が変更され、コントラストが向上する。
 Protanopia=1型2色覚赤色盲
 Deuteranopes=2型2色覚緑色盲
 Tritanopes=3型2色覚青色盲
@@ -2169,9 +2178,9 @@ LogsLinesNumber=【ログ】タブに表示する行数
 UseDebugBar=デバッグバーを使用する
 DEBUGBAR_LOGS_LINES_NUMBER=コンソールに保持する最後のログ行の数
 WarningValueHigherSlowsDramaticalyOutput=警告、値を大きくすると出力が劇的に遅くなる
-ModuleActivated=モジュール%sが有効化され、インターフェイスの速度が低下する
-ModuleActivatedWithTooHighLogLevel=モジュール%sが高すぎるロギングレベルで有効化されている（パフォーマンスとセキュリティを向上させるために、より低いレベルを使用してみること）
-ModuleSyslogActivatedButLevelNotTooVerbose=モジュール%sが有効化され、ログレベル（%s）が正しい（冗長すぎない）
+ModuleActivated=モジュール%sが活性化され、インターフェイスの速度が低下する
+ModuleActivatedWithTooHighLogLevel=モジュール%sが高すぎるロギングレベルで活性化されている（パフォーマンスとセキュリティを向上させるために、より低いレベルを使用してみること）
+ModuleSyslogActivatedButLevelNotTooVerbose=モジュール%sが活性化され、ログレベル（%s）が正しい（冗長すぎない）
 IfYouAreOnAProductionSetThis=実稼働環境を使用している場合は、このプロパティを%sに設定する必要がある。
 AntivirusEnabledOnUpload=アップロードされたファイルでウイルス対策が有効になっている
 SomeFilesOrDirInRootAreWritable=一部のファイルやディレクトリが読取り専用モードになっていない
@@ -2207,7 +2216,7 @@ PDFIn2Languages=ラベルを 2 つの異なる言語で PDF に表示
 PDF_USE_ALSO_LANGUAGE_CODE=PDF内の一部のテキストを同じ生成PDFで2つの異なる言語で複製する場合は、ここでこの2番目の言語を設定して、生成されたPDFに同じページに2つの異なる言語が含まれるようにする必要がある。1つはPDFの生成時に選択され、もう1つは ( これをサポートしているPDFテンプレートはごくわずか  ) 。 PDFごとに1つの言語を空のままにする。
 PDF_USE_A=デフォルト形式のPDFではなくPDF / A形式のPDFドキュメントを生成する
 FafaIconSocialNetworksDesc=FontAwesomeアイコンのコードをここに入力する。 FontAwesomeとは何かわからない場合は、一般的な値fa-address-bookを使用できる。
-RssNote=注：各RSSフィード定義は、ダッシュボードで使用できるようにするために有効にする必要があるウィジェットを提供する
+RssNote=注：各RSSフィード定義は、ダッシュボードで使用できるようにするために有効化の必要があるウィジェットを提供する
 JumpToBoxes=【設定】-> 【ウィジェット】にジャンプする
 MeasuringUnitTypeDesc=ここでは、「サイズ」、「表面」、「体積」、「重量」、「時間」などの値を使用する
 MeasuringScaleDesc=スケールは、デフォルトの参照単位に一致するように小数部を移動する必要がある場所の数。 「時間」単位種別の場合、秒数。 80〜99の値は予約値。
@@ -2266,13 +2275,13 @@ DashboardDisableBlockBank=銀行のサムネを無効にする
 DashboardDisableBlockAdherent=成員資格のサムネを無効にする
 DashboardDisableBlockExpenseReport=経費報告書sのサムネを無効にする
 DashboardDisableBlockHoliday=葉のサムネを無効にする
-EnabledCondition=フィールドを有効にする条件（有効にしない場合、可視性は常にオフになる）
-IfYouUseASecondTaxYouMustSetYouUseTheMainTax=2番目の税金を使用する場合は、最初の消費税も有効にする必要がある
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=3番目の税金を使用する場合は、最初の消費税も有効にする必要がある
+EnabledCondition=フィールドの有効化条件（有効にしない場合、可視性は常にオフになる）
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=2番目の税金を使用する場合は、最初の消費税も有効化の必要がある
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=3番目の税金を使用する場合は、最初の消費税も有効化の必要がある
 LanguageAndPresentation=言語とプレゼンテーション
 SkinAndColors=肌と色
-IfYouUseASecondTaxYouMustSetYouUseTheMainTax=2番目の税金を使用する場合は、最初の消費税も有効にする必要がある
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=3番目の税金を使用する場合は、最初の消費税も有効にする必要がある
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=2番目の税金を使用する場合は、最初の消費税も有効化の必要がある
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=3番目の税金を使用する場合は、最初の消費税も有効化の必要がある
 PDF_USE_1A=PDF / A-1b形式でPDFを生成する
 MissingTranslationForConfKey = %sの翻訳がない
 NativeModules=ネイティブモジュール
@@ -2355,3 +2364,5 @@ AllowExternalDownload=外部ダウンロードを許可する (ログインな
 DeadlineDayVATSubmission=翌月のVAT提出締切日
 MaxNumberOfAttachementOnForms=フォーム内の結合ファイルの最大数
 IfDefinedUseAValueBeetween=定義されている場合は、%s と %s の間の値を使用する
+Reload=リロード
+ConfirmReload=モジュールのリロードを確定
diff --git a/htdocs/langs/ja_JP/boxes.lang b/htdocs/langs/ja_JP/boxes.lang
index debf3f7b177..096c0447144 100644
--- a/htdocs/langs/ja_JP/boxes.lang
+++ b/htdocs/langs/ja_JP/boxes.lang
@@ -24,6 +24,7 @@ BoxFicheInter=最新の介入
 BoxCurrentAccounts=口座残高
 BoxTitleMemberNextBirthdays=今月の誕生日(構成員)
 BoxTitleMembersByType=タイプと状態別の構成員
+BoxTitleMembersByTags=タグとステータス別のメンバー
 BoxTitleMembersSubscriptionsByYear=年ごとの構成員サブスクリプション
 BoxTitleLastRssInfos=%sからの最新の%sニュース
 BoxTitleLastProducts=製品/サービス：最後に変更された%s
diff --git a/htdocs/langs/ja_JP/companies.lang b/htdocs/langs/ja_JP/companies.lang
index d6f1e81f0d8..6802aa4b416 100644
--- a/htdocs/langs/ja_JP/companies.lang
+++ b/htdocs/langs/ja_JP/companies.lang
@@ -312,12 +312,12 @@ CustomerRelativeDiscountShort=相対的割引
 CustomerAbsoluteDiscountShort=絶対的割引
 CompanyHasRelativeDiscount=この顧客のデフォルトでの割引は<b>%sの%%</b>
 CompanyHasNoRelativeDiscount=この顧客は、デフォルトでの相対割引は無し
-HasRelativeDiscountFromSupplier=この仕入先からのデフォルトでの割引は <b>%s%%</b>
-HasNoRelativeDiscountFromSupplier=この仕入先からのデフォルトでの相対割引は無し
+HasRelativeDiscountFromSupplier=この仕入先のデフォルト割引は <b> %s%% </b> 
+HasNoRelativeDiscountFromSupplier=この仕入先のデフォルトの相対割引はなし
 CompanyHasAbsoluteDiscount=この顧客への割引可能額(返金確認 または 頭金充当)は <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=この顧客への割引可能額(値引取引 または 頭金充当)は <b>%s</b> %s
 CompanyHasCreditNote=この顧客はまだ<b>%s %s</b>のために貸方票を持っている
-HasNoAbsoluteDiscountFromSupplier=この仕入先から利用できる割引割戻は無し
+HasNoAbsoluteDiscountFromSupplier=この仕入先からの割引/クレジットは不可
 HasAbsoluteDiscountFromSupplier=この仕入先から、<b>%s</b> %s 相当の割引が可能 (返金確約または頭金充当)
 HasDownPaymentOrCommercialDiscountFromSupplier=この仕入先から、 <b>%s</b> %s 相当の割引が可能 (現金値引、頭金充当)
 HasCreditNoteFromSupplier=この仕入先から、<b>%s </b>%s相当の返金確約があり
@@ -444,7 +444,7 @@ AddAddress=アドレスを追加する。
 SupplierCategory=仕入先範疇
 JuridicalStatus200=独立系
 DeleteFile=ファイルを削除
-ConfirmDeleteFile=このファイルを削除してもよいか？
+ConfirmDeleteFile=このファイル <b> %s </b> を削除してもよいか?
 AllocateCommercial=販売担当者に任命
 Organization=組織
 FiscalYearInformation=会計年度
@@ -498,3 +498,8 @@ RestOfEurope=その他欧州 (EEC)
 OutOfEurope=欧州域外 (EEC)
 CurrentOutstandingBillLate=現在の遅延中未払い勘定
 BecarefullChangeThirdpartyBeforeAddProductToInvoice=製品の価格設定によっては、POSに製品を追加する前に取引先を変更する必要があることに注意。
+EmailAlreadyExistsPleaseRewriteYourCompanyName=電子メールは既に存在する 法人名を書き直すこと
+TwoRecordsOfCompanyName=この法人には複数のレコードが存在する。パートナーシップリクエストを完了するため問い合わせを願う
+CompanySection=法人セクション
+ShowSocialNetworks=ソーシャルネットワークを表示
+HideSocialNetworks=ソーシャル ネットワークを非表示にする
diff --git a/htdocs/langs/ja_JP/errors.lang b/htdocs/langs/ja_JP/errors.lang
index d1385a11b4e..d9297d36b88 100644
--- a/htdocs/langs/ja_JP/errors.lang
+++ b/htdocs/langs/ja_JP/errors.lang
@@ -57,7 +57,7 @@ ErrorSubjectIsRequired=メールの件名が必要
 ErrorFailedToCreateDir=ディレクトリの作成に失敗した。そのWebサーバのユーザがDolibarrのドキュメントディレクトリに書き込む権限を持って確認すること。パラメータ の<b>safe_modeが</b>このPHPが有効になっている場合、Dolibarr PHPファイルは、Webサーバーのユーザ(またはグループ)に所有していることを確認すること。
 ErrorNoMailDefinedForThisUser=このユーザに定義されたメールはない
 ErrorSetupOfEmailsNotComplete=メールの設定が完了していない
-ErrorFeatureNeedJavascript=この機能が動作するように有効化するjavascriptをする必要がある。設定でこれを変更 - 表示される。
+ErrorFeatureNeedJavascript=この機能は javascript が動作するよう活性化させる必要がある。設定でこれを変更 - 表示。
 ErrorTopMenuMustHaveAParentWithId0=タイプは 'top'のメニューが親メニューを持つことはできない。親メニューに0を置くか、または型 &quot;左&quot;のメニューを選択する。
 ErrorLeftMenuMustHaveAParentId=タイプ &quot;左&quot;のメニューは、親IDを持つ必要がある。
 ErrorFileNotFound=ファイル<b>%s</b>が見つからない (不良パス、不正権限、アクセス拒否など、PHP openbasedir または セーフモードパラメータ による)
@@ -80,7 +80,7 @@ ErrorBadFormatValueList=リスト値に複数のコンマを含めることは
 ErrorFieldCanNotContainSpecialCharacters=フィールド<b>%s</b>に特殊文字を含めることはできない。
 ErrorFieldCanNotContainSpecialNorUpperCharacters=フィールド <b> %s </b> には、特殊文字や大文字を含めてはならず、アルファベット文字 (a ～ z) で開始する必要がある。
 ErrorFieldMustHaveXChar=フィールド<b>%s </b>には、少なくとも%s文字が必要だ。
-ErrorNoAccountancyModuleLoaded=有効化済会計モジュールなし
+ErrorNoAccountancyModuleLoaded=活性化済会計モジュールなし
 ErrorExportDuplicateProfil=このプロファイル名は、このエクスポートセットに既に存在する。
 ErrorLDAPSetupNotComplete=Dolibarr-LDAPのマッチングは完全ではない。
 ErrorLDAPMakeManualTest=.ldifファイルは、ディレクトリ%sで生成された。エラーの詳細情報を持つようにコマンドラインから手動でそれをロードしようとする。
@@ -100,7 +100,7 @@ ErrorFieldRefNotIn=フィールド<b>%s </b>： '<b> %s</b>' は存在する <b>
 ErrorMultipleRecordFoundFromRef=ref <b> %s </b> から検索すると、いくつかのレコードが見つかった。使用する ID を知る方法はない。
 ErrorsOnXLines=%sエラーが見つかった
 ErrorFileIsInfectedWithAVirus=ウイルス対策プログラムがファイルを検証ことができなかった(ファイルがウイルスに感染されるかもしれない)
-ErrorNumRefModel=参照は、データベース(%s)に存在し、この発番規則と互換性がない。このモジュールを有効化するため、レコードを削除するか、参照を変更すること。
+ErrorNumRefModel=参照は、データベース(%s)に存在し、この発番規則と互換性がない。このモジュールを活性化するため、レコードを削除するか、参照を変更すること。
 ErrorQtyTooLowForThisSupplier=このベンダーの数量が少なすぎるか、このベンダーのこの製品に価格が定義されていない
 ErrorOrdersNotCreatedQtyTooLow=数量が少なすぎるため、一部の注文が作成されていない
 ErrorModuleSetupNotComplete=モジュール%sの設定が完了していないようだ。ホーム-設定-モジュールに移動して完了する。
@@ -136,7 +136,7 @@ ErrorLinesCantBeNegativeForOneVATRate=行の合計(税控除後)は、特定のn
 ErrorLinesCantBeNegativeOnDeposits=入金でラインがマイナスになることはない。あなたがそうするならば、あなたが最終的な請求書で入金を消費する必要があるとき、あなたは問題に直面するだろう。
 ErrorQtyForCustomerInvoiceCantBeNegative=顧客の請求書への明細の数量をマイナスにすることはできない
 ErrorWebServerUserHasNotPermission=Webサーバを実行するユーザアカウントを使用<b>%s</b>そのための権限を持っていない
-ErrorNoActivatedBarcode=有効化済バーコード·タイプがない
+ErrorNoActivatedBarcode=活性化済バーコード·タイプなし
 ErrUnzipFails=ZipArchiveで%sを解凍できなかった
 ErrNoZipEngine=このPHPで%sファイルをzip / unzipするエンジンはない
 ErrorFileMustBeADolibarrPackage=ファイル%sはDolibarrzipパッケージである必要がある
@@ -241,7 +241,7 @@ ErrorNewRefIsAlreadyUsed=エラー、新規参照は既に使用されている
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=エラー、クローズされた請求書にリンクされた支払を削除することはできない。
 ErrorSearchCriteriaTooSmall=検索条件が小さすぎる。
 ErrorObjectMustHaveStatusActiveToBeDisabled=無効にするには、オブジェクトの状態が "アクティブ" である必要がある
-ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=オブジェクトを有効にするには、状態が "下書き" または "無効" である必要がある
+ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=オブジェクトを有効化には、状態が "下書き" または "無効" である必要がある
 ErrorNoFieldWithAttributeShowoncombobox=オブジェクト '%s'の定義にプロパティ 'showoncombobox'を持つフィールドはない。コンボリストを表示する方法はない。
 ErrorFieldRequiredForProduct=製品%sには、フィールド '%s'が必要だ。
 AlreadyTooMuchPostOnThisIPAdress=あなたはすでにこの IP アドレスに過剰な投稿をしている。
@@ -303,21 +303,22 @@ ErrorValueForTooLow=<b> %s </b> の値が低すぎる
 ErrorValueCantBeNull=<b> %s </b> の値は null 不可
 ErrorDateOfMovementLowerThanDateOfFileTransmission=銀行取引の日付は、ファイル送信の日付より前にすることはできない
 ErrorTooMuchFileInForm=フォーム内のファイルが多すぎる。最大数は %s ファイル (s)
+ErrorSessionInvalidatedAfterPasswordChange=パスワード、ステータス、または有効期限が変更されたため、セッションが無効になった。再ログインすること。
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=PHPパラメータ upload_max_filesize(%s)は、PHPパラメータ post_max_size(%s)よりも大きくなっている。これは一貫した設定ではない。
 WarningPasswordSetWithNoAccount=この構成員にパスワードが設定された。ただし、ユーザアカウントは作成されなかった。したがって、このパスワードは保存されるが、Dolibarrへのログインには使用できない。外部モジュール/インターフェースで使用できるが、構成員のログインやパスワードを定義する必要がない場合は、構成員モジュールの設定から "各構成員のログインを管理する" オプションを無効にすることができる。ログインを管理する必要があるがパスワードは必要ない場合は、このフィールドを空のままにして、この警告を回避できる。注：構成員がユーザにリンクされている場合は、電子メールをログインとして使用することもできる。
 WarningMandatorySetupNotComplete=主なパラメータの設定はこちら
-WarningEnableYourModulesApplications=モジュールとアプリケーションを有効にするには、ここをクリックすること
+WarningEnableYourModulesApplications=モジュールとアプリケーションの有効化には、ここをクリックすること
 WarningSafeModeOnCheckExecDir=警告、PHPのオプション<b>セーフモードは、PHP</b>のパラメータ <b>safe_mode_exec_dirの</b>宣言されたディレクトリ内に格納する必要があるので、コマンドにある。
 WarningBookmarkAlreadyExists=この職種またはこのターゲットを使用して、ブックマーク(URL)が既に存在している。
 WarningPassIsEmpty=警告は、データベースのパスワードは空だ。これはセキュリティホールだ。あなたのデータベースにパスワードを追加し、これを反映するようにconf.phpファイルを変更する必要がある。
 WarningConfFileMustBeReadOnly=警告、設定ファイル (<b>htdocs/conf/conf.php</b>) はWebサーバーによって上書きされうる。これは重大なセキュリティホールだ。 Webサーバーで使用されるオペレーティング·システム·ユーザのために読取り専用モードになるようにファイルのパーミッションを変更すること。あなたのディスクにWindowsとFATフォーマットを使用すると、このファイルシステムはファイルのパーミッションを追加することはできず、完全な安全を得られないことを知っている必要がある。
 WarningsOnXLines=<b>%s</b>ソース行に関する警告
-WarningNoDocumentModelActivated=ドキュメント生成用のモデルは有効化されていない。モジュールの設定を確認するまで、デフォルトでモデルが選択される。
+WarningNoDocumentModelActivated=ドキュメント生成用のモデルは活性化されていない。モジュールの設定を確認するまで、デフォルトでモデルが選択される。
 WarningLockFileDoesNotExists=警告、設定が完了したら、ファイル<b> install.lock</b>をディレクトリ<b>%s </b>に追加して、インストール/移行ツールを無効にする必要がある。このファイルの作成を省略すると、重大なセキュリティリスクが発生する。
 WarningUntilDirRemoved=このセキュリティ警告は、脆弱性が存在する限りアクティブなまま 。
-WarningCloseAlways=警告、ソース要素とターゲット要素の間で量が異なっていても、クローズは行われる。この機能は注意して有効にすること。
+WarningCloseAlways=警告、ソース要素とターゲット要素の間で量が異なっていても、クローズは行われる。この機能は注意して有効化すること。
 WarningUsingThisBoxSlowDown=警告、このボックスを使用すると、ボックスを表示している全ページの速度が大幅に低下する。
 WarningClickToDialUserSetupNotComplete=ユーザのClickToDial情報の設定が完了していない(ユーザカードのClickToDialタブを参照)。
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=表示設定が視覚障害者またはテキストブラウザ用に最適化されている場合、機能は無効になる。
@@ -325,6 +326,7 @@ WarningPaymentDateLowerThanInvoiceDate=請求書%sの支払日(%s)が請求日(%
 WarningTooManyDataPleaseUseMoreFilters=データが多すぎる(%s行を超えている)。より多くのフィルタを使用するか、定数%sをより高い制限に設定すること。
 WarningSomeLinesWithNullHourlyRate=時間料金が定義されていないときに、一部のユーザによって記録された時間もある。 1時間あたり0%sの値が使用されたが、これにより、費やされた時間の誤った評価が発生する可能性がある。
 WarningYourLoginWasModifiedPleaseLogin=ログインが変更された。セキュリティ上の理由から、次のアクションの前に新規ログインでログインする必要がある。
+WarningYourPasswordWasModifiedPleaseLogin=パスワードが変更された。セキュリティ上の理由から、新しいパスワードで今すぐログインする必要がある。
 WarningAnEntryAlreadyExistForTransKey=この言語の翻訳キーのエントリは既に存在する
 WarningNumberOfRecipientIsRestrictedInMassAction=警告、リストで一括アクションを使用する場合、異なる受信者の数は<b> %s</b>に制限される
 WarningDateOfLineMustBeInExpenseReportRange=警告、行の日付が経費報告書の範囲内にない
diff --git a/htdocs/langs/ja_JP/eventorganization.lang b/htdocs/langs/ja_JP/eventorganization.lang
index 7784a727c7f..737fd0e5663 100644
--- a/htdocs/langs/ja_JP/eventorganization.lang
+++ b/htdocs/langs/ja_JP/eventorganization.lang
@@ -172,3 +172,5 @@ ErrorSeveralCompaniesWithEmailContactUs=このメールを使用している会
 ErrorSeveralCompaniesWithNameContactUs=この名前の会社がいくつか見つかったため、登録を自動的に検証ことはできない。手動検証については、%sまで問い合わせること。
 NoPublicActionsAllowedForThisEvent=このイベントの公開アクションは公開されていない
 MaxNbOfAttendees=参加者の最大数
+DateStartEvent=イベント開始日
+DateEndEvent=イベント終了日
diff --git a/htdocs/langs/ja_JP/main.lang b/htdocs/langs/ja_JP/main.lang
index fae378255eb..027ed62262d 100644
--- a/htdocs/langs/ja_JP/main.lang
+++ b/htdocs/langs/ja_JP/main.lang
@@ -151,8 +151,8 @@ Period=期間
 PeriodEndDate=期間の終了日
 SelectedPeriod=選択した期間
 PreviousPeriod=前回の期間
-Activate=有効化
-Activated=有効化済
+Activate=活性化
+Activated=活性化済
 Closed=閉じた
 Closed2=閉じた
 NotClosed=未閉鎖
@@ -226,6 +226,7 @@ NoUserGroupDefined=ユーザグループが定義されていない
 Password=パスワード
 PasswordRetype=パスワードを繰り返す
 NoteSomeFeaturesAreDisabled=機能/モジュールの多くは、このデモで無効になっていることに注意すること。
+YourUserFile=ユーザーファイル
 Name=名
 NameSlashCompany=名前/法人
 Person=人
@@ -897,6 +898,9 @@ MassFilesArea=大量アクションによって作成されたファイルの領
 ShowTempMassFilesArea=大量アクションによって作成されたファイルの領域を表示する
 ConfirmMassDeletion=一括削除確定
 ConfirmMassDeletionQuestion=選択した%sレコード(s)を削除してもよいか？
+ConfirmMassClone=バルククローンの確認
+ConfirmMassCloneQuestion=クローン先のプロジェクトを選択
+ConfirmMassCloneToOneProject=プロジェクト %s へのクローン
 RelatedObjects=関連オブジェクト
 ClassifyBilled=請求分類
 ClassifyUnbilled=未請求を分類する
@@ -912,8 +916,8 @@ ExportFilteredList=フィルタリングされたリストをエクスポート
 ExportList=エクスポートリスト
 ExportOptions=エクスポートオプション
 IncludeDocsAlreadyExported=既にエクスポートされたドキュメントを含める
-ExportOfPiecesAlreadyExportedIsEnable=既にエクスポートされたピースのエクスポートが有効になる
-ExportOfPiecesAlreadyExportedIsDisable=既にエクスポートされたピースのエクスポートは無効になっている
+ExportOfPiecesAlreadyExportedIsEnable=すでにエクスポートされたドキュメントが表示され、エクスポートされる
+ExportOfPiecesAlreadyExportedIsDisable=すでにエクスポートされたドキュメントは非表示になり、エクスポートされない
 AllExportedMovementsWereRecordedAsExported=エクスポートされた全動きは、エクスポートされたものとして記録された
 NotAllExportedMovementsCouldBeRecordedAsExported=エクスポートされた全動きをエクスポート済として記録できるわけではない
 Miscellaneous=その他
@@ -1128,6 +1132,7 @@ DeleteFileText=本当にこのファイルを削除するか？
 ShowOtherLanguages=他の言語を表示する
 SwitchInEditModeToAddTranslation=この言語の翻訳を追加するには、編集モードに切り替える
 NotUsedForThisCustomer=この顧客には使用されていない
+NotUsedForThisVendor=この仕入先には不使用
 AmountMustBePositive=金額は正でなければならない
 ByStatus=状態別
 InformationMessage=情報
@@ -1148,14 +1153,14 @@ EventReminder=イベントリマインダー
 UpdateForAllLines=全行を更新
 OnHold=保留
 Civility=敬称
-AffectTag=タグの割り当て
-AffectUser=ユーザの割り当て
-SetSupervisor=スーパーバイザを設定
+AffectTag=タグを割り当てる
+AffectUser=ユーザーを割り当てる
+SetSupervisor=スーパーバイザを設定する
 CreateExternalUser=外部ユーザを作成する
 ConfirmAffectTag=タグの一括割り当て
 ConfirmAffectUser=一括ユーザ割り当て
-ProjectRole=各プロジェクトに割り当てられた役割
-TasksRole=各プロジェクトの各タスクに割り当てられた役割
+ProjectRole=各プロジェクト/機会に割り当てられた役割
+TasksRole=各タスクに割り当てられた役割 (使用されてれば)
 ConfirmSetSupervisor=バルク スーパーバイザ 設定
 ConfirmUpdatePrice=値上げ/値下げ率を選択
 ConfirmAffectTagQuestion=選択したレコード(s) %s にタグを割り当ててもよいか?
@@ -1174,7 +1179,7 @@ SetToStatus=ステータス %s に設定
 SetToEnabled=有効に設定
 SetToDisabled=無効に設定
 ConfirmMassEnabling=一括有効化の確定
-ConfirmMassEnablingQuestion=選択した%sレコード(s)を有効にするか？
+ConfirmMassEnablingQuestion=選択した%sレコード(s)を有効化するか？
 ConfirmMassDisabling=一括無効化の確定
 ConfirmMassDisablingQuestion=選択した%sレコード(s)を無効にしてもよいか？
 RecordsEnabled=%sレコード(s)が有効
@@ -1210,3 +1215,10 @@ CreatedByPublicPortal=公開ポータルから作成
 UserAgent=ユーザエージェント
 InternalUser=内部ユーザ
 ExternalUser=外部ユーザ
+NoSpecificContactAddress=特定の連絡先や住所なし
+NoSpecificContactAddressBis=このタブは、現在のオブジェクトの特定の連絡先またはアドレスを強制するためのもの。サードパーティに関する情報が十分でないか正確でない場合に、オブジェクトに対して 1 つまたは複数の特定の連絡先またはアドレスを定義する場合にのみ使用すること。
+HideOnVCard=%s を隠す
+AddToContacts=連絡先にアドレスを追加
+LastAccess=最終アクセス
+UploadAnImageToSeeAPhotoHere=タブ %s から画像をアップロードし、ここに写真を表示する
+LastPasswordChangeDate=パスワードの最終変更日
diff --git a/htdocs/langs/ja_JP/mrp.lang b/htdocs/langs/ja_JP/mrp.lang
index 62c5695ccfd..c27c4161eb4 100644
--- a/htdocs/langs/ja_JP/mrp.lang
+++ b/htdocs/langs/ja_JP/mrp.lang
@@ -83,7 +83,7 @@ ProductsToProduce=生産する製品
 UnitCost=単価
 TotalCost=総費用
 BOMTotalCost=消費する各数量と製品のコストに基づいてこのBOMを生成するためのコスト(定義されている場合は原価、定義されている場合は平均加重価格、それ以外の場合は最良の購入価格を使用)
-BOMTotalCostService=「ワークステーション」モジュールがアクティブ化され、ワークステーションがデフォルトでライン上に定義されている場合、計算は「数量 (時間に変換) x ワークステーション ahr」、それ以外の場合は「数量 (時間に変換) x サービスの原価」。
+BOMTotalCostService=「ワークステーション」モジュールが活性化され、ワークステーションがデフォルトでライン上に定義されている場合、計算は「数量 (時間に変換) x ワークステーション ahr」、それ以外の場合は「数量 (時間に変換) x サービスの原価」。
 GoOnTabProductionToProduceFirst=製造指図を閉じるには、最初に製造を開始しておく必要がある(タブ '%s'を参照)。ただし、キャンセルすることはできる。
 ErrorAVirtualProductCantBeUsedIntoABomOrMo=キットをBOMまたはMOに使用することはできない
 Workstation=ワークステーション
@@ -93,8 +93,8 @@ WorkstationSetup = ワークステーションの設定
 WorkstationSetupPage = ワークステーションの設定ページ
 WorkstationList=ワークステーションリスト
 WorkstationCreate=新しいワークステーションを追加する
-ConfirmEnableWorkstation=ワークステーション<b>%s </b>を有効にするか？
-EnableAWorkstation=ワークステーションを有効にする
+ConfirmEnableWorkstation=ワークステーション<b>%s </b>を有効化するか？
+EnableAWorkstation=ワークステーションを有効化
 ConfirmDisableWorkstation=ワークステーション<b>%s </b>を無効にしてもよいか？
 DisableAWorkstation=ワークステーションを無効にする
 DeleteWorkstation=削除
@@ -102,6 +102,7 @@ NbOperatorsRequired=必要なオペレーターの数
 THMOperatorEstimated=推定オペレーターTHM
 THMMachineEstimated=推定マシンTHM
 WorkstationType=ワークステーションタイプ
+DefaultWorkstation=デフォルトのワークステーション
 Human=人間
 Machine=機械
 HumanMachine=人間/機械
diff --git a/htdocs/langs/ja_JP/orders.lang b/htdocs/langs/ja_JP/orders.lang
index 79d1c47c9d9..ecd36add00e 100644
--- a/htdocs/langs/ja_JP/orders.lang
+++ b/htdocs/langs/ja_JP/orders.lang
@@ -96,6 +96,10 @@ OrdersStatisticsSuppliers=購買発注の統計
 NumberOfOrdersByMonth=月別受注数
 AmountOfOrdersByMonthHT=月別のご注文金額(税込)
 ListOfOrders=注文の一覧
+ListOrderLigne=注文明細
+productobuy=購買のみの製品
+productonly=製品のみ
+disablelinefree=無料回線なし
 CloseOrder=密集隊形
 ConfirmCloseOrder=この注文を配信済に設定してもよいか？注文が配信されると、請求に設定できる。
 ConfirmDeleteOrder=この注文を削除してもよいか？
@@ -131,6 +135,7 @@ SupplierOrderClassifiedBilled=購買発注%sセットの請求
 OtherOrders=他の注文
 SupplierOrderValidatedAndApproved=サプライヤーの注文は検証済および承認されている：%s
 SupplierOrderValidated=サプライヤーの注文が検証済される：%s
+OrderShowDetail=注文の詳細を表示
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=代表的なフォローアップ受注
 TypeContact_commande_internal_SHIPPING=代表的なフォローアップ出荷
@@ -199,3 +204,5 @@ StatusSupplierOrderApproved=承認された
 StatusSupplierOrderRefused=拒否
 StatusSupplierOrderReceivedPartially=部分的に受け
 StatusSupplierOrderReceivedAll=受け取った全製品
+NeedAtLeastOneInvoice = 少なくとも 1 つの請求書が必要
+LineAlreadyDispatched = 受注明細はすでに受領されている。
diff --git a/htdocs/langs/ja_JP/stripe.lang b/htdocs/langs/ja_JP/stripe.lang
index 68a15282dee..12186cdef71 100644
--- a/htdocs/langs/ja_JP/stripe.lang
+++ b/htdocs/langs/ja_JP/stripe.lang
@@ -41,7 +41,8 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhookライブキー
 ONLINE_PAYMENT_WAREHOUSE=オンライン支払が行われるときに在庫減少に使用する在庫<br>(TODO請求書のアクションで在庫を減らすオプションが実行され、オンライン支払がそれ自体で請求書を生成する場合？)
 StripeLiveEnabled=Stripe ライブが有効(それ以外の場合はテスト/サンドボックスモード)
 StripeImportPayment=Stripe 支払のインポート
-ExampleOfTestCreditCard=テスト用のクレジットカードの例：%s =>有効、%s =>エラーCVC、%s =>期限切れ、%s =>充電に失敗
+ExampleOfTestCreditCard=SEPA テストのクレジット カードの例: %s => 有効、%s => エラー CVC、%s => 有効期限切れ、%s => 請求失敗
+ExampleOfTestBankAcountForSEPA=口座振替テストの銀行口座 BAN の例: %s
 StripeGateways=Stripe ゲートウェイ
 OAUTH_STRIPE_TEST_ID=Stripe ConnectクライアントID(ca _...)
 OAUTH_STRIPE_LIVE_ID=Stripe ConnectクライアントID(ca _...)
@@ -61,6 +62,7 @@ DeleteACard=カードを削除
 ConfirmDeleteCard=このクレジットカードまたはデビットカードを削除してもよいか？
 CreateCustomerOnStripe=Stripeで顧客を作成する
 CreateCardOnStripe=Stripeでカードを作成する
+CreateBANOnStripe=Stripe で銀行を作成する
 ShowInStripe=Stripe で表示
 StripeUserAccountForActions=一部のStripeイベントの電子メール通知に使用するユーザアカウント(Stripeペイアウト)
 StripePayoutList=Stripe ペイアウトのリスト
@@ -69,4 +71,8 @@ ToOfferALinkForLiveWebhook=IPNを呼び出すためのStripeWebHookの設定へ
 PaymentWillBeRecordedForNextPeriod=支払は次の期間に記録される。
 ClickHereToTryAgain= <a href="%s">ここをクリックして再試行すること... </a>
 CreationOfPaymentModeMustBeDoneFromStripeInterface=強力な顧客認証ルールにより、カードの作成はStripeバックオフィスから行う必要がある。 Stripeの顧客レコードをオンにするには、ここをクリックすること：%s
-TERMINAL_LOCATION=端末の場所（住所）
+STRIPE_CARD_PRESENT=ストライプ端末のカードプレゼント
+TERMINAL_LOCATION=Stripe 端末の場所 (アドレス)
+RequestDirectDebitWithStripe=Stripe で口座振替をリクエストする
+STRIPE_SEPA_DIRECT_DEBIT=Stripe による口座振替の支払いを有効にする
+
diff --git a/htdocs/langs/ja_JP/ticket.lang b/htdocs/langs/ja_JP/ticket.lang
index 12e00a0866b..e7ae49dac9f 100644
--- a/htdocs/langs/ja_JP/ticket.lang
+++ b/htdocs/langs/ja_JP/ticket.lang
@@ -26,6 +26,7 @@ Permission56002=チケットを変更する
 Permission56003=チケットを削除する
 Permission56004=チケットを管理する
 Permission56005=全取引先のチケットを参照すること(外部ユーザには有効ではなく、常に依存している取引先に限定される)
+Permission56006=チケットのエクスポート
 
 Tickets=切符売場
 TicketDictType=チケット-タイプ
@@ -61,6 +62,8 @@ TypeContact_ticket_external_CONTRIBUTOR=外部寄稿者
 OriginEmail=レポーターのメール
 Notify_TICKET_SENTBYMAIL=メールでチケットメッセージを送信する
 
+ExportDataset_ticket_1=切符売場
+
 # Status
 Read=読む
 Assigned=割り当て済
@@ -113,21 +116,21 @@ TicketPublicInterfaceTopicHelp=このテキストは、公開インターフェ
 TicketPublicInterfaceTextHelpMessageLabelAdmin=メッセージエントリへのヘルプテキスト
 TicketPublicInterfaceTextHelpMessageHelpAdmin=このテキストは、ユーザのメッセージ入力領域の上に表示される。
 ExtraFieldsTicket=追加の属性
-TicketCkEditorEmailNotActivated=HTMLエディタが有効化されていない。 FCKEDITOR_ENABLE_MAILのコンテンツを1に設定して取得すること。
+TicketCkEditorEmailNotActivated=HTMLエディタが活性化されていない。 FCKEDITOR_ENABLE_MAILのコンテンツを1に設定して取得すること。
 TicketsDisableEmail=チケットの作成やメッセージの記録のためにメールを送信しないこと
-TicketsDisableEmailHelp=デフォルトでは、新規チケットまたはメッセージが作成されたときに電子メールが送信される。このオプションを有効にすると、*全*電子メール通知が無効になる
-TicketsLogEnableEmail=メールでログを有効にする
+TicketsDisableEmailHelp=デフォルトでは、新規チケットまたはメッセージが作成されたときに電子メールが送信される。このオプションを有効化すると、*全*電子メール通知が無効になる
+TicketsLogEnableEmail=メールでログを有効化
 TicketsLogEnableEmailHelp=変更のたびに、チケットに関連付けられた**各連絡先**にメールが送信される。
 TicketParams=パラメータ
 TicketsShowModuleLogo=公開インターフェイスにモジュールのロゴを表示する
-TicketsShowModuleLogoHelp=このオプションを有効にすると、公開インターフェイスのページでロゴモジュールが非表示になる
+TicketsShowModuleLogoHelp=このオプションを有効化と、公開インターフェイスのページでロゴモジュールが非表示になる
 TicketsShowCompanyLogo=公開インターフェイスに法人のロゴを表示する
-TicketsShowCompanyLogoHelp=このオプションを有効にすると、公開インターフェイスのページで主要法人のロゴが非表示になる。
+TicketsShowCompanyLogoHelp=このオプションを有効化すると、公開インターフェイスのページで主法人のロゴが非表示になる。
 TicketsEmailAlsoSendToMainAddress=また、メインの電子メールアドレスに通知を送信する
-TicketsEmailAlsoSendToMainAddressHelp=このオプションを有効にすると、設定「%s」で定義されたアドレスにも電子メールが送信される（タブ「%s」を参照）。
+TicketsEmailAlsoSendToMainAddressHelp=このオプションを有効化と、設定「%s」で定義されたアドレスにも電子メールが送信される（タブ「%s」を参照）。
 TicketsLimitViewAssignedOnly=現在のユーザに割り当てられたチケットに表示を制限する(外部ユーザには無効で、常に依存している取引先に制限される)
 TicketsLimitViewAssignedOnlyHelp=現在のユーザに割り当てられているチケットのみが表示される。チケット管理権を持つユーザには適用されない。
-TicketsActivatePublicInterface=公開インターフェイスを有効化する
+TicketsActivatePublicInterface=公開インターフェイスを活性化する
 TicketsActivatePublicInterfaceHelp=公開インターフェイスにより、全訪問者がチケットを作成できる。
 TicketsAutoAssignTicket=チケットを作成したユーザを自動的に割り当てる
 TicketsAutoAssignTicketHelp=チケットを作成するときに、ユーザを自動的にチケットに割り当てることができる。
diff --git a/htdocs/langs/ja_JP/users.lang b/htdocs/langs/ja_JP/users.lang
index addeadd1116..70a62efac33 100644
--- a/htdocs/langs/ja_JP/users.lang
+++ b/htdocs/langs/ja_JP/users.lang
@@ -18,13 +18,13 @@ DisableUser=無効にする
 DisableAUser=ユーザを無効にする
 DeleteUser=削除
 DeleteAUser=ユーザを削除する
-EnableAUser=ユーザを有効にする。
+EnableAUser=ユーザを有効化。
 DeleteGroup=削除する
 DeleteAGroup=グループを削除する
 ConfirmDisableUser=ユーザ<b>%s </b>を無効にしてもよいか？
 ConfirmDeleteUser=ユーザ<b>%s </b>を削除してもよいか？
 ConfirmDeleteGroup=グループ<b>%s </b>を削除してもよいか？
-ConfirmEnableUser=ユーザ<b>%s </b>を有効にするか？
+ConfirmEnableUser=ユーザ<b>%s </b>を有効化するか？
 ConfirmReinitPassword=ユーザ<b>%s </b>の新規パスワードを生成してもよいか？
 ConfirmSendNewPassword=ユーザ<b>%s </b>の新規パスワードを生成して送信してもよいか？
 NewUser=新規ユーザ
@@ -66,11 +66,12 @@ LinkedToDolibarrUser=ユーザへのリンク
 LinkedToDolibarrThirdParty=取引先へのリンク
 CreateDolibarrLogin=ユーザを作成する
 CreateDolibarrThirdParty=取引先を作成する。
-LoginAccountDisableInDolibarr=Dolibarrでアカウントを無効にする。
+LoginAccountDisableInDolibarr=Dolibarr で無効になっているアカウント
+PASSWORDInDolibarr=Dolibarr で変更されたパスワード
 UsePersonalValue=個人的な値を使用
 ExportDataset_user_1=ユーザとそのプロパティ
 DomainUser=ドメインユーザ%s
-Reactivate=再有効化
+Reactivate=再活性化
 CreateInternalUserDesc=このフォームを使用すると、法人/組織に内部ユーザを作成できる。外部ユーザ(顧客、仕入先など)を作成するには、その取引先の連絡先カードから Dolibarrユーザの作成 ボタンを使用する。
 InternalExternalDesc=<b>内部</b>ユーザは、法人/組織の一部であるユーザ、または法人に関連するデータよりも多くのデータを表示する必要がある組織外のパートナーユーザ（許可システムは、彼が見るまたは実行することの可・不可を定義）。 <br> <b>外部</b>ユーザは、自分に関連するデータのみを表示する必要がある顧客、仕入先、またはその他のユーザ（取引先の外部ユーザの作成は、取引先の連絡先レコードから実行できる）。 <br> <br>どちらの場合も、ユーザが必要とする機能に対するアクセス許可を付与する必要がある。
 PermissionInheritedFromAGroup=ユーザのグループのいずれかから継承されたので、許可が付与される。
@@ -84,7 +85,7 @@ NewUserPassword=%s用パスワードの変更
 NewPasswordValidated=新規パスワードは検証済であり、ログインするには今すぐ使用する必要がある。
 EventUserModified=ユーザの%sは変更
 UserDisabled=ユーザの%sが無効になって
-UserEnabled=ユーザ%sは、有効化済
+UserEnabled=ユーザ%sは、活性化済
 UserDeleted=ユーザ%sは削除され
 NewGroupCreated=グループ%sが作成
 GroupModified=グループ%sが変更された
@@ -129,3 +130,6 @@ IPLastLogin=IP最終ログイン
 IPPreviousLogin=IP前回ログイン
 ShowAllPerms=すべての権限行を表示
 HideAllPerms=すべての許可行を非表示
+UserPublicPageDesc=このユーザーの仮想カードを有効化可能。ユーザー プロファイルとバーコードを含む URL が利用可能になり、スマートフォンを持っている人なら誰でもそれをスキャンしてアドレス帳に連絡先を追加できる。
+EnablePublicVirtualCard=パブリック仮想ユーザー カードを有効化
+PublicVirtualCardUrl=パブリック仮想ユーザー カード
diff --git a/htdocs/langs/kk_KZ/accountancy.lang b/htdocs/langs/kk_KZ/accountancy.lang
index 4c8e26da44d..23a349ad40c 100644
--- a/htdocs/langs/kk_KZ/accountancy.lang
+++ b/htdocs/langs/kk_KZ/accountancy.lang
@@ -14,8 +14,8 @@ ACCOUNTING_EXPORT_ENDLINE=Артқа қайту түрін таңдаңыз
 ACCOUNTING_EXPORT_PREFIX_SPEC=Файл атауының префиксін көрсетіңіз
 ThisService=Бұл қызмет
 ThisProduct=Бұл өнім
-DefaultForService=Қызметтің әдепкі мәні
-DefaultForProduct=Өнімнің әдепкі мәні
+DefaultForService=Default for services
+DefaultForProduct=Default for products
 ProductForThisThirdparty=Бұл үшінші тарапқа арналған өнім
 ServiceForThisThirdparty=Бұл үшінші тарапқа қызмет көрсету
 CantSuggest=Ұсыну мүмкін емес
@@ -101,7 +101,8 @@ ShowAccountingAccount=Бухгалтерлік есепті көрсету
 ShowAccountingJournal=Бухгалтерлік журналды көрсету
 ShowAccountingAccountInLedger=Бухгалтерлік есепті бухгалтерлік есепте көрсету
 ShowAccountingAccountInJournals=Журналдарда бухгалтерлік есепті көрсетіңіз
-AccountAccountingSuggest=Бухгалтерлік есеп ұсынылды
+DataUsedToSuggestAccount=Data used to suggest account
+AccountAccountingSuggest=Account suggested
 MenuDefaultAccounts=Әдепкі есептік жазбалар
 MenuBankAccounts=Банктік шоттар
 MenuVatAccounts=ҚҚС шоттары
@@ -126,6 +127,7 @@ WriteBookKeeping=Record transactions in accounting
 Bookkeeping=Кітап
 BookkeepingSubAccount=Қосалқы кітап
 AccountBalance=Шоттың қалдығы
+AccountBalanceSubAccount=Sub-accounts balance
 ObjectsRef=Бастапқы объект реф
 CAHTF=Сатып алушылардың жалпы сомасы салыққа дейін
 TotalExpenseReport=Жалпы шығындар есебі
@@ -189,6 +191,7 @@ ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Account (from the Chart Of Account) to be us
 UseAuxiliaryAccountOnCustomerDeposit=Store customer account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
 ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Account (from the Chart Of Account) to be used as the default
 UseAuxiliaryAccountOnSupplierDeposit=Store supplier account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
+ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY=Accounting account by default to register customer retained warranty
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased within same country (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased from EEC to another EEC country (used if not defined in the product sheet)
@@ -218,6 +221,7 @@ JournalLabel=Журнал белгісі
 NumPiece=Бөлшектің нөмірі
 TransactionNumShort=Сан транзакция
 AccountingCategory=Custom group of accounts
+AccountingCategories=Custom groups of accounts
 GroupByAccountAccounting=Бас бухгалтерлік есеп бойынша топтастыру
 GroupBySubAccountAccounting=Қосалқы шот бойынша топтастыру
 AccountingAccountGroupsDesc=Мұнда сіз бухгалтерлік есептің кейбір топтарын анықтай аласыз. Олар дербестендірілген бухгалтерлік есептер үшін пайдаланылады.
@@ -265,6 +269,7 @@ ShowSubtotalByGroup=Деңгей бойынша қосалқы жиынтығы
 
 Pcgtype=Есеп тобы
 PcgtypeDesc=Есептер тобы кейбір бухгалтерлік есептер үшін алдын ала анықталған «сүзгі» және «топтастыру» критерийлері ретінде қолданылады. Мысалы, «КІРІС» немесе «ШЫҒЫНДАР» шығыстар/кірістер туралы есепті құру үшін өнімнің бухгалтерлік есеп шоттары үшін топ ретінде қолданылады.
+AccountingCategoriesDesc=Custom group of accounts can be used to group accounting accounts into one name to ease filter use or building of custom reports.
 
 Reconcilable=Келісімді
 
@@ -294,6 +299,7 @@ DescValidateMovements=Жазуды, жазуды және жоюды кез ке
 
 ValidateHistory=Автоматты түрде байлау
 AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
+DoManualBindingForFailedRecord=You have to do a manual link for the %s row(s) not linked automatically.
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot remove or disable this account of chart of account because it is used
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s & Credit = %s
@@ -337,11 +343,13 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=Сату кезінде бухгалтерл
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Сатып алу кезінде бухгалтерлік есепте байланыстыруды және аударуды өшіру (жеткізушілердің шот -фактуралары бухгалтерлік есепке алынбайды)
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Бухгалтерлік есепте міндеттемелер мен аударымдарды өшіру (шығындар туралы есептер бухгалтерлік есепке алынбайды)
 ACCOUNTING_ENABLE_LETTERING=Enable the lettering function in the accounting
+ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
 
 ## Export
 NotExportLettering=Do not export the lettering when generating the file
 NotifiedExportDate=Flag exported lines as Exported <span class="warning">(to modify a line, you will need to delete the whole transaction and re-transfert it into accounting)</span>
 NotifiedValidationDate=Validate and Lock the exported entries <span class="warning">(same effect than the "%s" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+NotifiedExportFull=Export documents ?
 DateValidationAndLock=Date validation and lock
 ConfirmExportFile=Бухгалтерлік экспорттық файлдың генерациясын растау?
 ExportDraftJournal=Журналдың жобасын экспорттау
@@ -398,7 +406,7 @@ SaleLocal=Жергілікті сату
 SaleExport=Экспорттық сату
 SaleEEC=ЕЭК -те сату
 SaleEECWithVAT=ЕЭК -те ҚҚС -мен сату нөлге тең емес, сондықтан біздің ойымызша бұл сатылымнан тыс сату емес және ұсынылған шот - бұл өнімнің стандартты шоты.
-SaleEECWithoutVATNumber=ЕЭК -те ҚҚС жоқ сату, бірақ үшінші тараптың ҚҚС идентификаторы анықталмаған. Біз стандартты сату бойынша өнім шотынан бас тартамыз. Қажет болса, үшінші тараптың ҚҚС идентификаторын немесе өнім шотын түзетуге болады.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the thirdparty, or change the product account suggested for binding if needed.
 ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
 ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
 ## Dictionary
@@ -442,6 +450,7 @@ AccountancyErrorMismatchLetterCode=Mismatch in reconcile code
 AccountancyErrorMismatchBalanceAmount=The balance (%s) is not equal to 0
 AccountancyErrorLetteringBookkeeping=Errors have occurred concerning the transactions: %s
 ErrorAccountNumberAlreadyExists=The accounting number %s already exists
+ErrorArchiveAddFile=Can't put "%s" file in archive
 
 ## Import
 ImportAccountingEntries=Бухгалтерлік жазбалар
@@ -468,5 +477,7 @@ FECFormatMulticurrencyCode=Көп валюталық код (Idevise)
 DateExport=Күнді экспорттау
 WarningReportNotReliable=Ескерту, бұл есеп кітапқа негізделмеген, сондықтан кітапта қолмен өзгертілген транзакцияны қамтымайды. Егер сіздің журналистика жаңартылған болса, онда бухгалтерлік есеп дәлірек болады.
 ExpenseReportJournal=Шығындар туралы есеп журналы
+DocsAlreadyExportedAreExcluded=Docs already exported are excluded
+ClickToHideAlreadyExportedLines=Click to hide already exported lines
 
 NAccounts=%s есептік жазбалары
diff --git a/htdocs/langs/kk_KZ/main.lang b/htdocs/langs/kk_KZ/main.lang
index d1aed3017b1..c8c71ea1157 100644
--- a/htdocs/langs/kk_KZ/main.lang
+++ b/htdocs/langs/kk_KZ/main.lang
@@ -226,6 +226,7 @@ NoUserGroupDefined=Пайдаланушылар тобы анықталмаға
 Password=Құпия сөз
 PasswordRetype=Repeat your password
 NoteSomeFeaturesAreDisabled=Бұл демонстрацияда көптеген мүмкіндіктер/модульдер өшірілгенін ескеріңіз.
+YourUserFile=Your user file
 Name=Аты
 NameSlashCompany=Аты / Компания
 Person=Адам
@@ -897,6 +898,9 @@ MassFilesArea=Жаппай әрекеттермен салынған файлд
 ShowTempMassFilesArea=Жаппай әрекеттермен салынған файлдар аймағын көрсету
 ConfirmMassDeletion=Жаппай жоюды растау
 ConfirmMassDeletionQuestion=%s таңдалған жазбаларды жойғыңыз келетініне сенімдісіз бе?
+ConfirmMassClone=Bulk clone confirmation
+ConfirmMassCloneQuestion=Select project to clone to
+ConfirmMassCloneToOneProject=Clone to project %s
 RelatedObjects=Қатысты объектілер
 ClassifyBilled=Есепшотты жіктеу
 ClassifyUnbilled=Есепсіз жіктеу
@@ -912,8 +916,8 @@ ExportFilteredList=Сүзілген тізімді экспорттау
 ExportList=Экспорттау тізімі
 ExportOptions=Экспорттау параметрлері
 IncludeDocsAlreadyExported=Қазірдің өзінде экспортталған құжаттарды қосыңыз
-ExportOfPiecesAlreadyExportedIsEnable=Экспортталған бөлшектерді экспорттау мүмкіндігі қосылған
-ExportOfPiecesAlreadyExportedIsDisable=Экспортталған бөлшектерді экспорттау өшірілген
+ExportOfPiecesAlreadyExportedIsEnable=Documents already exported are visible and will be exported
+ExportOfPiecesAlreadyExportedIsDisable=Documents already exported are hidden and won't be exported
 AllExportedMovementsWereRecordedAsExported=Барлық экспортталған қозғалыстар экспорттық ретінде тіркелді
 NotAllExportedMovementsCouldBeRecordedAsExported=Экспортталған қозғалыстардың барлығын экспорт ретінде жазу мүмкін емес
 Miscellaneous=Әр түрлі
@@ -1128,6 +1132,7 @@ DeleteFileText=Бұл файлды шынымен жойғыңыз келе ме
 ShowOtherLanguages=Басқа тілдерді көрсету
 SwitchInEditModeToAddTranslation=Бұл тілге аударма қосу үшін өңдеу режиміне ауысыңыз
 NotUsedForThisCustomer=Бұл тұтынушы үшін қолданылмайды
+NotUsedForThisVendor=Not used for this vendor
 AmountMustBePositive=Саны оң болуы керек
 ByStatus=Мәртебесі бойынша
 InformationMessage=ақпарат
@@ -1148,14 +1153,14 @@ EventReminder=Оқиғаны еске салғыш
 UpdateForAllLines=Барлық жолдар үшін жаңарту
 OnHold=Күтуде
 Civility=Азаматтық
-AffectTag=Assign Tag
-AffectUser=Assign User
-SetSupervisor=Set Supervisor
+AffectTag=Assign a Tag
+AffectUser=Assign a User
+SetSupervisor=Set the supervisor
 CreateExternalUser=Сыртқы пайдаланушыны құру
 ConfirmAffectTag=Bulk Tag Assignement
 ConfirmAffectUser=Bulk User Assignement
-ProjectRole=Role assigned on each project
-TasksRole=Role assigned on each task of each project
+ProjectRole=Role assigned on each project/opportunity
+TasksRole=Role assigned on each task (if used)
 ConfirmSetSupervisor=Bulk Supervisor Set
 ConfirmUpdatePrice=Choose a increase/decrease price rate
 ConfirmAffectTagQuestion=Are you sure you want to assign tags to the %s selected record(s)?
@@ -1210,3 +1215,10 @@ CreatedByPublicPortal=Created from Public portal
 UserAgent=User Agent
 InternalUser=Internal user
 ExternalUser=External user
+NoSpecificContactAddress=No specific contact or address
+NoSpecificContactAddressBis=This tab is dedicated to force specific contacts or addresses for the current object. Use it only if you want to define one or several specific contacts or addresses for the object when the information on the thirdparty is not enough or not accurate.
+HideOnVCard=Hide %s
+AddToContacts=Add address to my contacts
+LastAccess=Last access
+UploadAnImageToSeeAPhotoHere=Upload an image from the tab %s to see a photo here
+LastPasswordChangeDate=Last password change date
diff --git a/htdocs/langs/kk_KZ/stripe.lang b/htdocs/langs/kk_KZ/stripe.lang
index 26444a93d5a..d4e578af492 100644
--- a/htdocs/langs/kk_KZ/stripe.lang
+++ b/htdocs/langs/kk_KZ/stripe.lang
@@ -41,7 +41,8 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook тірі кілті
 ONLINE_PAYMENT_WAREHOUSE=<br> (TODO) Акцияны төмендету опциясы шот -фактура бойынша жасалса және онлайн төлем өзі шот -фактураны шығаратын болса, акцияның төмендеуі үшін пайдаланылатын акция.
 StripeLiveEnabled=Stripe live қосылған (әйтпесе тест/құм жәшігі режимі)
 StripeImportPayment=Stripe төлемдерін импорттау
-ExampleOfTestCreditCard=Сынақ үшін несие картасының мысалы: %s => жарамды, %s => CVC қатесі, %s => мерзімі өтіп кетті, %s => заряд сәтсіз
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+ExampleOfTestBankAcountForSEPA=Example of bank account BAN for direct debit test: %s
 StripeGateways=Жолақты шлюздер
 OAUTH_STRIPE_TEST_ID=Stripe Connect клиент идентификаторы (шамамен _...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect клиент идентификаторы (шамамен _...)
@@ -61,6 +62,7 @@ DeleteACard=Картаны жою
 ConfirmDeleteCard=Бұл несиелік немесе дебеттік картаны шынымен жойғыңыз келе ме?
 CreateCustomerOnStripe=Stripe -де тұтынушы жасаңыз
 CreateCardOnStripe=Stripe картасын жасаңыз
+CreateBANOnStripe=Create bank on Stripe
 ShowInStripe=Stripe -те көрсету
 StripeUserAccountForActions=Кейбір Stripe оқиғалары туралы электрондық пошта арқылы хабарландыру үшін қолданылатын пайдаланушы тіркелгісі (Stripe төлемдері)
 StripePayoutList=Stripe төлемдерінің тізімі
@@ -69,3 +71,8 @@ ToOfferALinkForLiveWebhook=IPN -ге қоңырау шалу үшін Stripe Web
 PaymentWillBeRecordedForNextPeriod=Төлем келесі кезеңге жазылады.
 ClickHereToTryAgain= <a href="%s"> Қайталап көру үшін мына жерді басыңыз ... </a>
 CreationOfPaymentModeMustBeDoneFromStripeInterface=Клиенттердің аутентификациясының күшті ережелеріне байланысты картаны Stripe backoffice -тен жасау керек. Stripe тұтынушылар жазбасын қосу үшін мына жерді басуға болады: %s
+STRIPE_CARD_PRESENT=Card Present for Stripe Terminals
+TERMINAL_LOCATION=Location (address) for Stripe Terminals
+RequestDirectDebitWithStripe=Request Direct Debit with Stripe
+STRIPE_SEPA_DIRECT_DEBIT=Enable the Direct Debit payments through Stripe
+
diff --git a/htdocs/langs/kk_KZ/users.lang b/htdocs/langs/kk_KZ/users.lang
index a6510d87401..6d39793595f 100644
--- a/htdocs/langs/kk_KZ/users.lang
+++ b/htdocs/langs/kk_KZ/users.lang
@@ -66,7 +66,8 @@ LinkedToDolibarrUser=Link to user
 LinkedToDolibarrThirdParty=Link to third party
 CreateDolibarrLogin=Пайдаланушы жасаңыз
 CreateDolibarrThirdParty=Үшінші тарап құру
-LoginAccountDisableInDolibarr=Dolibarr есептік жазбасы өшірілген.
+LoginAccountDisableInDolibarr=Account disabled in Dolibarr
+PASSWORDInDolibarr=Password modified in Dolibarr
 UsePersonalValue=Жеке құндылықты қолданыңыз
 ExportDataset_user_1=Қолданушылар және олардың қасиеттері
 DomainUser=%s домен қолданушысы
@@ -129,3 +130,6 @@ IPLastLogin=IP last login
 IPPreviousLogin=IP previous login
 ShowAllPerms=Show all permission rows
 HideAllPerms=Hide all permission rows
+UserPublicPageDesc=You can enable a virtual card for this user. An url with the user profile and a barcode will be available to allow anybody with a smartphone to scan it and add your contact to its address book.
+EnablePublicVirtualCard=Enable the public virtual user card
+PublicVirtualCardUrl=Public virtual user card
diff --git a/htdocs/langs/lo_LA/accountancy.lang b/htdocs/langs/lo_LA/accountancy.lang
index 9fcd2de4073..ae76b7d205e 100644
--- a/htdocs/langs/lo_LA/accountancy.lang
+++ b/htdocs/langs/lo_LA/accountancy.lang
@@ -14,8 +14,8 @@ ACCOUNTING_EXPORT_ENDLINE=ເລືອກປະເພດການຂົນສົ
 ACCOUNTING_EXPORT_PREFIX_SPEC=Specify the prefix for the file name
 ThisService=ການບໍລິການນີ້
 ThisProduct=ຜະລິດຕະພັນນີ້
-DefaultForService=ຄ່າເລີ່ມຕົ້ນ ສຳ ລັບການບໍລິການ
-DefaultForProduct=ຄ່າເລີ່ມຕົ້ນ ສຳ ລັບຜະລິດຕະພັນ
+DefaultForService=Default for services
+DefaultForProduct=Default for products
 ProductForThisThirdparty=ຜະລິດຕະພັນສໍາລັບພາກສ່ວນທີສາມນີ້
 ServiceForThisThirdparty=ບໍລິການ ສຳ ລັບພາກສ່ວນທີສາມນີ້
 CantSuggest=ບໍ່ສາມາດແນະ ນຳ ໄດ້
@@ -101,7 +101,8 @@ ShowAccountingAccount=ສະແດງບັນຊີບັນຊີ
 ShowAccountingJournal=ສະແດງວາລະສານບັນຊີ
 ShowAccountingAccountInLedger=ສະແດງບັນຊີການບັນຊີຢູ່ໃນບັນຊີແຍກປະເພດ
 ShowAccountingAccountInJournals=ສະແດງບັນຊີບັນຊີຢູ່ໃນວາລະສານ
-AccountAccountingSuggest=ບັນຊີບັນຊີແນະນໍາ
+DataUsedToSuggestAccount=Data used to suggest account
+AccountAccountingSuggest=Account suggested
 MenuDefaultAccounts=ບັນຊີເລີ່ມຕົ້ນ
 MenuBankAccounts=ບັນຊີທະນາຄານ
 MenuVatAccounts=ບັນຊີອາກອນ
@@ -126,6 +127,7 @@ WriteBookKeeping=Record transactions in accounting
 Bookkeeping=ປື້ມບັນຊີ
 BookkeepingSubAccount=Subledger
 AccountBalance=ຍອດເງິນໃນບັນຊີ
+AccountBalanceSubAccount=Sub-accounts balance
 ObjectsRef=ແຫຼ່ງຂໍ້ມູນອ້າງອີງ
 CAHTF=ຜູ້ຂາຍທັງpurchaseົດທີ່ຊື້ກ່ອນອາກອນ
 TotalExpenseReport=ລາຍງານລາຍຈ່າຍທັງົດ
@@ -189,6 +191,7 @@ ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Account (from the Chart Of Account) to be us
 UseAuxiliaryAccountOnCustomerDeposit=Store customer account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
 ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Account (from the Chart Of Account) to be used as the default
 UseAuxiliaryAccountOnSupplierDeposit=Store supplier account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
+ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY=Accounting account by default to register customer retained warranty
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased within same country (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased from EEC to another EEC country (used if not defined in the product sheet)
@@ -218,6 +221,7 @@ JournalLabel=ປ້າຍວາລະສານ
 NumPiece=ຈໍານວນສິ້ນ
 TransactionNumShort=ຕົວເລກ. ທຸລະກໍາ
 AccountingCategory=Custom group of accounts
+AccountingCategories=Custom groups of accounts
 GroupByAccountAccounting=ຈັດກຸ່ມຕາມບັນຊີແຍກປະເພດທົ່ວໄປ
 GroupBySubAccountAccounting=ຈັດກຸ່ມຕາມບັນຊີ subledger
 AccountingAccountGroupsDesc=ເຈົ້າສາມາດ ກຳ ນົດທີ່ນີ້ບາງກຸ່ມບັນຊີບັນຊີ. ພວກມັນຈະຖືກນໍາໃຊ້ສໍາລັບບົດລາຍງານການບັນຊີສ່ວນບຸກຄົນ.
@@ -265,6 +269,7 @@ ShowSubtotalByGroup=ສະແດງຜົນຮວມຍ່ອຍຕາມລະ
 
 Pcgtype=ກຸ່ມບັນຊີ
 PcgtypeDesc=ກຸ່ມບັນຊີໄດ້ຖືກນໍາໃຊ້ເປັນເກນທີ່ໄດ້ກໍານົດໄວ້ລ່ວງ ໜ້າ 'ຕົວກັ່ນຕອງ' ແລະ 'ການຈັດກຸ່ມ' ສໍາລັບບົດລາຍງານການບັນຊີບາງອັນ. ຕົວຢ່າງ, 'ລາຍຮັບ' ຫຼື 'ລາຍຈ່າຍ' ຖືກໃຊ້ເປັນກຸ່ມສໍາລັບບັນຊີບັນຊີຂອງຜະລິດຕະພັນເພື່ອສ້າງລາຍງານລາຍຈ່າຍ/ລາຍຮັບ.
+AccountingCategoriesDesc=Custom group of accounts can be used to group accounting accounts into one name to ease filter use or building of custom reports.
 
 Reconcilable=ເຂົ້າກັນໄດ້
 
@@ -294,6 +299,7 @@ DescValidateMovements=ການດັດແກ້ຫຼືການລຶບລ
 
 ValidateHistory=ຜູກມັດອັດຕະໂນມັດ
 AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
+DoManualBindingForFailedRecord=You have to do a manual link for the %s row(s) not linked automatically.
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot remove or disable this account of chart of account because it is used
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s & Credit = %s
@@ -337,11 +343,13 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=ປິດໃຊ້ງານການຜູ
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=ປິດໃຊ້ງານການຜູກມັດແລະການໂອນບັນຊີຢູ່ໃນການຊື້ (ໃບເກັບເງິນຂອງຜູ້ຂາຍຈະບໍ່ຖືກເອົາເຂົ້າໃນບັນຊີ)
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=ປິດໃຊ້ງານການຜູກມັດແລະການໂອນບັນຊີຢູ່ໃນລາຍງານລາຍຈ່າຍ (ບົດລາຍງານຄ່າໃຊ້ຈ່າຍຈະບໍ່ຖືກເອົາເຂົ້າໃນບັນຊີ)
 ACCOUNTING_ENABLE_LETTERING=Enable the lettering function in the accounting
+ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
 
 ## Export
 NotExportLettering=Do not export the lettering when generating the file
 NotifiedExportDate=Flag exported lines as Exported <span class="warning">(to modify a line, you will need to delete the whole transaction and re-transfert it into accounting)</span>
 NotifiedValidationDate=Validate and Lock the exported entries <span class="warning">(same effect than the "%s" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+NotifiedExportFull=Export documents ?
 DateValidationAndLock=Date validation and lock
 ConfirmExportFile=ການຢືນຢັນການສ້າງເອກະສານການສົ່ງອອກບັນຊີບໍ?
 ExportDraftJournal=ສົ່ງອອກວາລະສານຮ່າງ
@@ -398,7 +406,7 @@ SaleLocal=ການຂາຍໃນທ້ອງຖິ່ນ
 SaleExport=ຂາຍສົ່ງອອກ
 SaleEEC=ຂາຍໃນ EEC
 SaleEECWithVAT=ການຂາຍໃນ EEC ດ້ວຍອາກອນມູນຄ່າເພີ່ມບໍ່ແມ່ນ null, ດັ່ງນັ້ນພວກເຮົາຄິດວ່າອັນນີ້ບໍ່ແມ່ນການຂາຍພາຍໃນລະບົບສື່ສານແລະບັນຊີທີ່ແນະນໍາແມ່ນບັນຊີຜະລິດຕະພັນມາດຕະຖານ.
-SaleEECWithoutVATNumber=ຂາຍໃນ EEC ໂດຍບໍ່ມີ VAT ແຕ່ ID VAT ຂອງພາກສ່ວນທີສາມບໍ່ໄດ້ລະບຸ. ພວກເຮົາຕົກຢູ່ໃນບັນຊີຜະລິດຕະພັນສໍາລັບການຂາຍມາດຕະຖານ. ເຈົ້າສາມາດແກ້ໄຂ VAT ID ຂອງພາກສ່ວນທີສາມຫຼືບັນຊີຜະລິດຕະພັນຖ້າຈໍາເປັນ.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the thirdparty, or change the product account suggested for binding if needed.
 ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
 ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
 ## Dictionary
@@ -442,6 +450,7 @@ AccountancyErrorMismatchLetterCode=Mismatch in reconcile code
 AccountancyErrorMismatchBalanceAmount=The balance (%s) is not equal to 0
 AccountancyErrorLetteringBookkeeping=Errors have occurred concerning the transactions: %s
 ErrorAccountNumberAlreadyExists=The accounting number %s already exists
+ErrorArchiveAddFile=Can't put "%s" file in archive
 
 ## Import
 ImportAccountingEntries=ລາຍການບັນຊີ
@@ -468,5 +477,7 @@ FECFormatMulticurrencyCode=ລະຫັດຫຼາຍສະກຸນເງິ
 DateExport=ວັນທີສົ່ງອອກ
 WarningReportNotReliable=ຄຳ ເຕືອນ, ບົດລາຍງານນີ້ບໍ່ໄດ້ອີງໃສ່ປຶ້ມບັນຊີ, ສະນັ້ນບໍ່ມີການເຮັດທຸລະ ກຳ ທີ່ດັດແກ້ດ້ວຍຕົນເອງຢູ່ໃນປຶ້ມບັນຊີ. ຖ້າວາລະສານຂອງເຈົ້າໃis່ຫຼ້າສຸດ, ມຸມມອງການເຮັດບັນຊີແມ່ນຖືກຕ້ອງກວ່າ.
 ExpenseReportJournal=ວາລະສານລາຍງານລາຍຈ່າຍ
+DocsAlreadyExportedAreExcluded=Docs already exported are excluded
+ClickToHideAlreadyExportedLines=Click to hide already exported lines
 
 NAccounts=%s ບັນຊີ
diff --git a/htdocs/langs/lo_LA/main.lang b/htdocs/langs/lo_LA/main.lang
index 04c00c0ec87..ed0fdea00e4 100644
--- a/htdocs/langs/lo_LA/main.lang
+++ b/htdocs/langs/lo_LA/main.lang
@@ -226,6 +226,7 @@ NoUserGroupDefined=ບໍ່ໄດ້ ກຳ ນົດກຸ່ມຜູ້ໃ
 Password=ລະຫັດຜ່ານ
 PasswordRetype=Repeat your password
 NoteSomeFeaturesAreDisabled=ໃຫ້ສັງເກດວ່າຫຼາຍລັກສະນະ/ໂມດູນຖືກປິດໃຊ້ງານຢູ່ໃນການສາທິດນີ້.
+YourUserFile=Your user file
 Name=ຊື່
 NameSlashCompany=ຊື່ / ບໍລິສັດ
 Person=ບຸກຄົນ
@@ -897,6 +898,9 @@ MassFilesArea=ພື້ນທີ່ສໍາລັບໄຟລ built ທີ່
 ShowTempMassFilesArea=ສະແດງພື້ນທີ່ຂອງໄຟລ built ທີ່ສ້າງຂຶ້ນໂດຍການກະ ທຳ ຂອງມວນຊົນ
 ConfirmMassDeletion=ການຢືນຢັນການລຶບ ຈຳ ນວນຫຼາຍ
 ConfirmMassDeletionQuestion=ເຈົ້າແນ່ໃຈບໍ່ວ່າເຈົ້າຕ້ອງການລຶບບັນທຶກທີ່ເລືອກ %s?
+ConfirmMassClone=Bulk clone confirmation
+ConfirmMassCloneQuestion=Select project to clone to
+ConfirmMassCloneToOneProject=Clone to project %s
 RelatedObjects=ຈຸດປະສົງທີ່ກ່ຽວຂ້ອງ
 ClassifyBilled=ຈັດປະເພດໃບບິນ
 ClassifyUnbilled=ຈັດປະເພດບໍ່ໄດ້ຮຽກເກັບເງິນ
@@ -912,8 +916,8 @@ ExportFilteredList=ສົ່ງອອກລາຍການທີ່ກັ່ນ
 ExportList=ລາຍການສົ່ງອອກ
 ExportOptions=ຕົວເລືອກການສົ່ງອອກ
 IncludeDocsAlreadyExported=ຮວມເອົາເອກະສານທີ່ສົ່ງອອກແລ້ວ
-ExportOfPiecesAlreadyExportedIsEnable=ເປີດໃຊ້ການສົ່ງອອກຊິ້ນສ່ວນທີ່ໄດ້ສົ່ງອອກໄປແລ້ວ
-ExportOfPiecesAlreadyExportedIsDisable=ການສົ່ງອອກຊິ້ນສ່ວນທີ່ສົ່ງອອກໄປແລ້ວແມ່ນຖືກປິດການ ນຳ ໃຊ້
+ExportOfPiecesAlreadyExportedIsEnable=Documents already exported are visible and will be exported
+ExportOfPiecesAlreadyExportedIsDisable=Documents already exported are hidden and won't be exported
 AllExportedMovementsWereRecordedAsExported=ການເຄື່ອນໄຫວສົ່ງອອກທັງwereົດຖືກບັນທຶກເປັນການສົ່ງອອກ
 NotAllExportedMovementsCouldBeRecordedAsExported=ບໍ່ແມ່ນທຸກການເຄື່ອນໄຫວສົ່ງອອກສາມາດຖືກບັນທຶກເປັນການສົ່ງອອກໄດ້
 Miscellaneous=ອື່ນisc
@@ -1128,6 +1132,7 @@ DeleteFileText=ເຈົ້າຕ້ອງການລຶບໄຟລນີ້
 ShowOtherLanguages=ສະແດງພາສາອື່ນ
 SwitchInEditModeToAddTranslation=ສະຫຼັບໃນໂeditດແກ້ໄຂເພື່ອເພີ່ມການແປພາສານີ້
 NotUsedForThisCustomer=ບໍ່ໄດ້ໃຊ້ສໍາລັບລູກຄ້ານີ້
+NotUsedForThisVendor=Not used for this vendor
 AmountMustBePositive=ຈຳ ນວນຕ້ອງເປັນຄ່າບວກ
 ByStatus=ໂດຍສະຖານະພາບ
 InformationMessage=ຂໍ້ມູນຂ່າວສານ
@@ -1148,14 +1153,14 @@ EventReminder=ການເຕືອນເຫດການ
 UpdateForAllLines=ອັບເດດທຸກສາຍ
 OnHold=ພັກໄວ້
 Civility=ຄວາມສຸພາບ
-AffectTag=Assign Tag
-AffectUser=Assign User
-SetSupervisor=Set Supervisor
+AffectTag=Assign a Tag
+AffectUser=Assign a User
+SetSupervisor=Set the supervisor
 CreateExternalUser=ສ້າງຜູ້ໃຊ້ພາຍນອກ
 ConfirmAffectTag=Bulk Tag Assignement
 ConfirmAffectUser=Bulk User Assignement
-ProjectRole=Role assigned on each project
-TasksRole=Role assigned on each task of each project
+ProjectRole=Role assigned on each project/opportunity
+TasksRole=Role assigned on each task (if used)
 ConfirmSetSupervisor=Bulk Supervisor Set
 ConfirmUpdatePrice=Choose a increase/decrease price rate
 ConfirmAffectTagQuestion=Are you sure you want to assign tags to the %s selected record(s)?
@@ -1210,3 +1215,10 @@ CreatedByPublicPortal=Created from Public portal
 UserAgent=User Agent
 InternalUser=Internal user
 ExternalUser=External user
+NoSpecificContactAddress=No specific contact or address
+NoSpecificContactAddressBis=This tab is dedicated to force specific contacts or addresses for the current object. Use it only if you want to define one or several specific contacts or addresses for the object when the information on the thirdparty is not enough or not accurate.
+HideOnVCard=Hide %s
+AddToContacts=Add address to my contacts
+LastAccess=Last access
+UploadAnImageToSeeAPhotoHere=Upload an image from the tab %s to see a photo here
+LastPasswordChangeDate=Last password change date
diff --git a/htdocs/langs/lo_LA/stripe.lang b/htdocs/langs/lo_LA/stripe.lang
index 7db1270b5f0..f873d7ff8c7 100644
--- a/htdocs/langs/lo_LA/stripe.lang
+++ b/htdocs/langs/lo_LA/stripe.lang
@@ -41,7 +41,8 @@ STRIPE_LIVE_WEBHOOK_KEY=ກະແຈສົດຂອງ Webhook
 ONLINE_PAYMENT_WAREHOUSE=ຫຼັກຊັບທີ່ຈະນໍາໃຊ້ສໍາລັບການຫຼຸດລົງຫຼັກຊັບໃນເວລາທີ່ການຊໍາລະເງິນອອນໄລນ done ໄດ້ຖືກເຮັດໄດ້ <br> (TODO ໃນເວລາທີ່ທາງເລືອກທີ່ຈະຫຼຸດລົງຫຼັກຊັບແມ່ນເຮັດໄດ້ໃນການດໍາເນີນການກ່ຽວກັບໃບເກັບເງິນແລະການຊໍາລະອອນໄລນ generate ສ້າງຕົວມັນເອງໃບແຈ້ງຫນີ້?
 StripeLiveEnabled=ເປີດໃຊ້ງານ Stripe live (ບໍ່ດັ່ງນັ້ນທົດສອບ/ໂsandດ sandbox)
 StripeImportPayment=ນຳ ເຂົ້າການຈ່າຍເງິນ Stripe
-ExampleOfTestCreditCard=ຕົວຢ່າງຂອງບັດເຄຣດິດສໍາລັບການທົດສອບ: %s => ຖືກຕ້ອງ, %s => ຜິດພາດ CVC, %s => iredົດອາຍຸ, %s => ເກັບເງິນບໍ່ສໍາເລັດ
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+ExampleOfTestBankAcountForSEPA=Example of bank account BAN for direct debit test: %s
 StripeGateways=ປະຕູເສັ້ນດ່າງ
 OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca _... )
 OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca _... )
@@ -61,6 +62,7 @@ DeleteACard=ລຶບບັດ
 ConfirmDeleteCard=ເຈົ້າແນ່ໃຈບໍວ່າເຈົ້າຕ້ອງການລຶບບັດເຄຣດິດຫຼືເດບິດນີ້?
 CreateCustomerOnStripe=ສ້າງລູກຄ້າໃນ Stripe
 CreateCardOnStripe=ສ້າງບັດໃນ Stripe
+CreateBANOnStripe=Create bank on Stripe
 ShowInStripe=ສະແດງໃນ Stripe
 StripeUserAccountForActions=ບັນຊີຜູ້ໃຊ້ເພື່ອໃຊ້ສໍາລັບການແຈ້ງເຕືອນທາງອີເມລ events ຂອງບາງເຫດການ Stripe (ການຈ່າຍເງິນ Stripe)
 StripePayoutList=ລາຍຊື່ການຈ່າຍເງິນ Stripe
@@ -69,3 +71,8 @@ ToOfferALinkForLiveWebhook=ເຊື່ອມຕໍ່ກັບການຕິ
 PaymentWillBeRecordedForNextPeriod=ການຊໍາລະຈະຖືກບັນທຶກໄວ້ໃນງວດຕໍ່ໄປ.
 ClickHereToTryAgain= <a href="%s"> ຄລິກທີ່ນີ້ເພື່ອລອງອີກຄັ້ງ ... </a>
 CreationOfPaymentModeMustBeDoneFromStripeInterface=ເນື່ອງຈາກກົດລະບຽບການກວດສອບຄວາມຖືກຕ້ອງຂອງລູກຄ້າເຂັ້ມແຂງ, ການສ້າງບັດຕ້ອງເຮັດຈາກສະຖາບັນ Stripe backoffice. ເຈົ້າສາມາດຄລິກທີ່ນີ້ເພື່ອສະຫຼັບກັບບັນທຶກລູກຄ້າ Stripe: %s
+STRIPE_CARD_PRESENT=Card Present for Stripe Terminals
+TERMINAL_LOCATION=Location (address) for Stripe Terminals
+RequestDirectDebitWithStripe=Request Direct Debit with Stripe
+STRIPE_SEPA_DIRECT_DEBIT=Enable the Direct Debit payments through Stripe
+
diff --git a/htdocs/langs/lo_LA/users.lang b/htdocs/langs/lo_LA/users.lang
index e4f54f932b1..c6689817162 100644
--- a/htdocs/langs/lo_LA/users.lang
+++ b/htdocs/langs/lo_LA/users.lang
@@ -66,7 +66,8 @@ LinkedToDolibarrUser=Link to user
 LinkedToDolibarrThirdParty=Link to third party
 CreateDolibarrLogin=ສ້າງຜູ້ໃຊ້
 CreateDolibarrThirdParty=ສ້າງພາກສ່ວນທີສາມ
-LoginAccountDisableInDolibarr=ບັນຊີຖືກປິດການ ນຳ ໃຊ້ໃນ Dolibarr.
+LoginAccountDisableInDolibarr=Account disabled in Dolibarr
+PASSWORDInDolibarr=Password modified in Dolibarr
 UsePersonalValue=ໃຊ້ຄຸນຄ່າສ່ວນຕົວ
 ExportDataset_user_1=ຜູ້ໃຊ້ແລະຄຸນສົມບັດຂອງເຂົາເຈົ້າ
 DomainUser=ຜູ້ໃຊ້ໂດເມນ %s
@@ -129,3 +130,6 @@ IPLastLogin=IP last login
 IPPreviousLogin=IP previous login
 ShowAllPerms=Show all permission rows
 HideAllPerms=Hide all permission rows
+UserPublicPageDesc=You can enable a virtual card for this user. An url with the user profile and a barcode will be available to allow anybody with a smartphone to scan it and add your contact to its address book.
+EnablePublicVirtualCard=Enable the public virtual user card
+PublicVirtualCardUrl=Public virtual user card
diff --git a/htdocs/langs/lt_LT/accountancy.lang b/htdocs/langs/lt_LT/accountancy.lang
index ca41006a026..27d0053cefc 100644
--- a/htdocs/langs/lt_LT/accountancy.lang
+++ b/htdocs/langs/lt_LT/accountancy.lang
@@ -14,8 +14,8 @@ ACCOUNTING_EXPORT_ENDLINE=Pasirinkite vežimėlio grąžinimo tipą
 ACCOUNTING_EXPORT_PREFIX_SPEC=Specify the prefix for the file name
 ThisService=Ši paslauga
 ThisProduct=Ši prekė
-DefaultForService=Numatyta paslauga
-DefaultForProduct=Numatyta prekė
+DefaultForService=Default for services
+DefaultForProduct=Default for products
 ProductForThisThirdparty=Product for this thirdparty
 ServiceForThisThirdparty=Service for this thirdparty
 CantSuggest=Pasiūlyti negalima
@@ -101,7 +101,8 @@ ShowAccountingAccount=Rodyti apskaitos sąskaitą
 ShowAccountingJournal=Rodyti apskaitos žurnalą
 ShowAccountingAccountInLedger=Show accounting account in ledger
 ShowAccountingAccountInJournals=Show accounting account in journals
-AccountAccountingSuggest=Siūloma apskaitos sąskaita
+DataUsedToSuggestAccount=Data used to suggest account
+AccountAccountingSuggest=Account suggested
 MenuDefaultAccounts=Numatytosios sąskaitos
 MenuBankAccounts=Banko sąskaitos
 MenuVatAccounts=PVM sąskaitos
@@ -126,6 +127,7 @@ WriteBookKeeping=Record transactions in accounting
 Bookkeeping=Didžioji knyga
 BookkeepingSubAccount=Subledger
 AccountBalance=Sąskaitos balansas
+AccountBalanceSubAccount=Sub-accounts balance
 ObjectsRef=Šaltinio objekto nuoroda
 CAHTF=Total purchase vendor before tax
 TotalExpenseReport=Bendra išlaidų ataskaita
@@ -189,6 +191,7 @@ ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Account (from the Chart Of Account) to be us
 UseAuxiliaryAccountOnCustomerDeposit=Store customer account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
 ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Account (from the Chart Of Account) to be used as the default
 UseAuxiliaryAccountOnSupplierDeposit=Store supplier account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
+ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY=Accounting account by default to register customer retained warranty
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased within same country (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased from EEC to another EEC country (used if not defined in the product sheet)
@@ -218,6 +221,7 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Custom group of accounts
+AccountingCategories=Custom groups of accounts
 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.
@@ -265,6 +269,7 @@ ShowSubtotalByGroup=Show subtotal by level
 
 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.
+AccountingCategoriesDesc=Custom group of accounts can be used to group accounting accounts into one name to ease filter use or building of custom reports.
 
 Reconcilable=Reconcilable
 
@@ -294,6 +299,7 @@ DescValidateMovements=Any modification or deletion of writing, lettering and del
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
+DoManualBindingForFailedRecord=You have to do a manual link for the %s row(s) not linked automatically.
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot remove or disable this account of chart of account because it is used
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s & Credit = %s
@@ -337,11 +343,13 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on
 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_ENABLE_LETTERING=Enable the lettering function in the accounting
+ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
 
 ## Export
 NotExportLettering=Do not export the lettering when generating the file
 NotifiedExportDate=Flag exported lines as Exported <span class="warning">(to modify a line, you will need to delete the whole transaction and re-transfert it into accounting)</span>
 NotifiedValidationDate=Validate and Lock the exported entries <span class="warning">(same effect than the "%s" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+NotifiedExportFull=Export documents ?
 DateValidationAndLock=Date validation and lock
 ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Eksportuoti žurnalo projektą
@@ -398,7 +406,7 @@ 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.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the thirdparty, or change the product account suggested for binding if needed.
 ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
 ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
 ## Dictionary
@@ -442,6 +450,7 @@ AccountancyErrorMismatchLetterCode=Mismatch in reconcile code
 AccountancyErrorMismatchBalanceAmount=The balance (%s) is not equal to 0
 AccountancyErrorLetteringBookkeeping=Errors have occurred concerning the transactions: %s
 ErrorAccountNumberAlreadyExists=The accounting number %s already exists
+ErrorArchiveAddFile=Can't put "%s" file in archive
 
 ## Import
 ImportAccountingEntries=Accounting entries
@@ -468,5 +477,7 @@ 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.
 ExpenseReportJournal=Išlaidų ataskaitos žurnalas
+DocsAlreadyExportedAreExcluded=Docs already exported are excluded
+ClickToHideAlreadyExportedLines=Click to hide already exported lines
 
 NAccounts=%s accounts
diff --git a/htdocs/langs/lt_LT/users.lang b/htdocs/langs/lt_LT/users.lang
index 3ad915e79bb..ab3f9017c47 100644
--- a/htdocs/langs/lt_LT/users.lang
+++ b/htdocs/langs/lt_LT/users.lang
@@ -66,7 +66,8 @@ LinkedToDolibarrUser=Link to user
 LinkedToDolibarrThirdParty=Link to third party
 CreateDolibarrLogin=Sukurti vartotoją
 CreateDolibarrThirdParty=Sukurti trečiąją šalį
-LoginAccountDisableInDolibarr=Sąskaita Dolibarr išjungta
+LoginAccountDisableInDolibarr=Account disabled in Dolibarr
+PASSWORDInDolibarr=Password modified in Dolibarr
 UsePersonalValue=Naudoti asmeninę reikšmę
 ExportDataset_user_1=Users and their properties
 DomainUser=Domeno Vartotojas %s
@@ -129,3 +130,6 @@ IPLastLogin=IP last login
 IPPreviousLogin=IP previous login
 ShowAllPerms=Show all permission rows
 HideAllPerms=Hide all permission rows
+UserPublicPageDesc=You can enable a virtual card for this user. An url with the user profile and a barcode will be available to allow anybody with a smartphone to scan it and add your contact to its address book.
+EnablePublicVirtualCard=Enable the public virtual user card
+PublicVirtualCardUrl=Public virtual user card
diff --git a/htdocs/langs/lv_LV/accountancy.lang b/htdocs/langs/lv_LV/accountancy.lang
index 5b3d88ad48a..cdc2fef581a 100644
--- a/htdocs/langs/lv_LV/accountancy.lang
+++ b/htdocs/langs/lv_LV/accountancy.lang
@@ -14,8 +14,8 @@ ACCOUNTING_EXPORT_ENDLINE=Izvēlieties vagonu atgriešanas veidu
 ACCOUNTING_EXPORT_PREFIX_SPEC=Norādiet faila nosaukuma prefiksu
 ThisService=Šis pakalpojums
 ThisProduct=Šis produkts
-DefaultForService=Noklusējums pakalpojumam
-DefaultForProduct=Noklusējums produktam
+DefaultForService=Noklusējums pakalpojumiem
+DefaultForProduct=Noklusējums produktiem
 ProductForThisThirdparty=Produkts šai trešajai pusei
 ServiceForThisThirdparty=Pakalpojums šai trešajai pusei
 CantSuggest=Nevar ieteikt
@@ -101,7 +101,8 @@ ShowAccountingAccount=Rādīt grāmatvedības kontu
 ShowAccountingJournal=Rādīt grāmatvedības žurnālu
 ShowAccountingAccountInLedger=Rādīt grāmatvedības kontu virsgrāmatā
 ShowAccountingAccountInJournals=Parādīt grāmatvedības kontu žurnālos
-AccountAccountingSuggest=Ieteicamais grāmatvedības konts
+DataUsedToSuggestAccount=Dati, kas izmantoti, lai ieteiktu kontu
+AccountAccountingSuggest=Ieteikts konts
 MenuDefaultAccounts=Noklusētie konti
 MenuBankAccounts=Bankas konti
 MenuVatAccounts=PVN konti
@@ -126,6 +127,7 @@ WriteBookKeeping=Ierakstīt darījumus grāmatvedībā
 Bookkeeping=Grāmatvedis
 BookkeepingSubAccount=Zemesgrāmata
 AccountBalance=Konta bilance
+AccountBalanceSubAccount=Apakškontu atlikums
 ObjectsRef=Avota objekta ref
 CAHTF=Kopējais pirkuma pārdevējs pirms nodokļu nomaksas
 TotalExpenseReport=Kopējais izdevumu pārskats
@@ -178,31 +180,32 @@ ACCOUNTING_RESULT_PROFIT=Rezultātu uzskaites konts (peļņa)
 ACCOUNTING_RESULT_LOSS=Rezultātu uzskaites konts (zaudējumi)
 ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Noslēguma žurnāls
 
-ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account (from the Chart Of Account) to be used as the account for transitional bank transfers
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Konts (no konta plāna), kas jāizmanto kā pārejas bankas pārvedumu konts
 TransitionalAccount=Pārejas bankas konta pārejas konts
 
-ACCOUNTING_ACCOUNT_SUSPENSE=Account (from the Chart Of Account) to be used as the account for unallocated funds either received or paid i.e. funds in "wait[ing]"
-DONATION_ACCOUNTINGACCOUNT=Account (from the Chart Of Account) to be used to register donations (Donation module)
-ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Account (from the Chart Of Account) to be used to register memberships subscriptions (Membership module - if membership recorded without invoice)
+ACCOUNTING_ACCOUNT_SUSPENSE=Konts (no konta plāna), kas jāizmanto kā konts nesadalītajiem līdzekļiem, kas saņemti vai izmaksāti, t.i., līdzekļiem, kas atrodas gaidīšanas režīmā.
+DONATION_ACCOUNTINGACCOUNT=Konts (no konta plāna), kas jāizmanto ziedojumu reģistrēšanai (Ziedojumu modulis)
+ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Konts (no konta plāna), kas jāizmanto, lai reģistrētu dalības abonementus (Dalības modulis - ja dalība reģistrēta bez rēķina)
 
-ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Account (from the Chart Of Account) to be used as the default account to register customer deposit
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Konts (no konta plāna), kas jāizmanto kā noklusējuma konts klienta depozīta reģistrēšanai
 UseAuxiliaryAccountOnCustomerDeposit=Saglabājiet klienta kontu kā individuālu kontu meitas virsgrāmatā pirmo iemaksu rindām (ja tas ir atspējots, individuālais konts pirmās iemaksas rindām paliks tukšs)
-ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Account (from the Chart Of Account) to be used as the default
+ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Konts (no konta plāna), kas jāizmanto kā noklusējuma konts
 UseAuxiliaryAccountOnSupplierDeposit=Saglabājiet piegādātāja kontu kā individuālo kontu meitas virsgrāmatā pirmās iemaksas rindām (ja tas ir atspējots, individuālais konts pirmās iemaksas rindām paliks tukšs)
+ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY=Grāmatvedības konts pēc noklusējuma, lai reģistrētu klienta saglabāto garantiju
 
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased within same country (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased from EEC to another EEC country (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased and imported from any other foreign country (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the sold products (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products sold from EEC to another EEC country (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products sold and exported to any other foreign country (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Konts (no konta plāna), kas jāizmanto kā noklusējuma konts produktiem, kas iegādāti tajā pašā valstī (izmanto, ja tas nav definēts produkta lapā)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Konts (no konta plāna), kas jāizmanto kā noklusējuma konts produktiem, kas iegādāti no EEK citā EEK valstī (izmanto, ja tas nav definēts produkta lapā)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Konts (no konta plāna), kas jāizmanto kā noklusējuma konts produktiem, kas iegādāti un importēti no jebkuras citas ārvalsts (izmanto, ja nav norādīts produkta lapā)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Konts (no konta plāna), kas jāizmanto kā noklusējuma konts pārdotajām precēm (izmanto, ja tas nav definēts produkta lapā)
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Konts (no konta plāna), kas jāizmanto kā noklusējuma konts produktiem, kas tiek pārdoti no EEK uz citu EEK valsti (izmanto, ja tas nav definēts produkta lapā)
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Konts (no konta plāna), kas jāizmanto kā noklusējuma konts produktiem, kas tiek pārdoti un eksportēti uz jebkuru citu valsti (izmanto, ja tas nav definēts produkta lapā)
 
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the services purchased within same country (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the services purchased from EEC to another EEC country (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the services purchased and imported from other foreign country (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the sold services (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the services sold from EEC to another EEC country (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the services sold and exported to any other foreign country (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Konts (no konta plāna), kas jāizmanto kā noklusējuma konts tajā pašā valstī iegādātajiem pakalpojumiem (izmanto, ja tas nav definēts pakalpojuma lapā)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Konts (no konta plāna), kas jāizmanto kā noklusējuma konts pakalpojumiem, kas iegādāti no EEK uz citu EEK valsti (izmanto, ja pakalpojumu lapā nav definēts)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Konts (no konta plāna), kas jāizmanto kā noklusējuma konts pakalpojumiem, kas iegādāti un importēti no citas ārvalsts (izmanto, ja pakalpojumu lapā nav noteikts)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Konts (no konta plāna), kas jāizmanto kā noklusējuma konts pārdotajiem pakalpojumiem (izmanto, ja tas nav definēts pakalpojumu lapā)
+ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Konts (no konta plāna), kas jāizmanto kā noklusējuma konts pakalpojumiem, kas tiek pārdoti no EEK uz citu EEK valsti (izmanto, ja pakalpojumu lapā nav definēts)
+ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Konts (no konta plāna), kas jāizmanto kā noklusējuma konts pakalpojumiem, kas pārdoti un eksportēti uz jebkuru citu valsti (izmanto, ja pakalpojumu lapā nav definēts)
 
 Doctype=Dokumenta veids
 Docdate=Datums
@@ -217,7 +220,8 @@ Codejournal=Žurnāls
 JournalLabel=Žurnāla etiķete
 NumPiece=Gabala numurs
 TransactionNumShort=Num. darījums
-AccountingCategory=Custom group of accounts
+AccountingCategory=Pielāgota kontu grupa
+AccountingCategories=Pielāgotas kontu grupas
 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.
@@ -265,19 +269,20 @@ ShowSubtotalByGroup=Rādīt starpsummu pēc līmeņa
 
 Pcgtype=Kontu grupa
 PcgtypeDesc=Kontu grupa tiek izmantota kā iepriekš definēti “filtra” un “grupēšanas” kritēriji dažiem grāmatvedības pārskatiem. Piemēram, “IENĀKUMS” vai “IZDEVUMI” tiek izmantoti kā produktu uzskaites kontu grupas, lai izveidotu izdevumu / ienākumu pārskatu.
+AccountingCategoriesDesc=Pielāgotu kontu grupu var izmantot, lai grupētu grāmatvedības kontus vienā nosaukumā, lai atvieglotu filtra lietošanu vai pielāgotu pārskatu veidošanu.
 
 Reconcilable=Samierināms
 
 TotalVente=Kopējais apgrozījums pirms nodokļu nomaksas
 TotalMarge=Kopējā pārdošanas starpība
 
-DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product account from chart of account
-DescVentilMore=In most cases, if you use predefined products or services and you set the account (from chart of account) 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 account from chart of account
-DescVentilTodoCustomer=Bind invoice lines not already bound with a product account from chart of account
-ChangeAccount=Change the product/service account (from chart of account) for the selected lines with the following account:
+DescVentilCustomer=Skatiet šeit to klientu rēķinu rindu sarakstu, kas ir piesaistītas (vai nav) ar produkta kontu no konta plāna
+DescVentilMore=Vairumā gadījumu, ja izmantojat iepriekš definētus produktus vai pakalpojumus un iestatāt kontu (no konta plāna) produkta/pakalpojuma kartē, lietojumprogramma varēs veikt visas saistības starp jūsu rēķina rindām un jūsu diagrammas grāmatvedības kontu. kontu, ar vienu klikšķi ar pogu <strong> "%s" </strong> . Ja konts nav iestatīts produktu/pakalpojumu kartēs vai ja jums joprojām ir dažas rindas, kas nav saistītas ar kontu, jums būs jāveic manuāla saistīšana no izvēlnes " <strong> %s </strong> ".
+DescVentilDoneCustomer=Šeit skatiet klientu rēķinu rindu sarakstu un viņu produktu kontu no kontu plāna
+DescVentilTodoCustomer=Saistīt rēķina rindas, kas vēl nav saistītas ar produkta kontu, no kontu plāna
+ChangeAccount=Mainiet produkta/pakalpojuma kontu (no konta plāna) atlasītajām rindām ar šādu kontu:
 Vide=-
-DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product account from chart of account (only record not already transfered in accountancy are visible)
+DescVentilSupplier=Skatiet šeit to piegādātāja rēķinu rindu sarakstu, kas ir piesaistītas vai vēl nav saistītas ar produkta kontu no konta plāna (ir redzami tikai ieraksti, kas vēl nav pārsūtīti grāmatvedībā)
 DescVentilDoneSupplier=Šeit skatiet piegādātāju rēķinu un to grāmatvedības kontu sarakstu
 DescVentilTodoExpenseReport=Bind expense report lines, kas jau nav saistītas ar maksu grāmatvedības kontu
 DescVentilExpenseReport=Konsultējieties šeit ar izdevumu pārskatu rindiņu sarakstu, kas ir saistoši (vai nē) ar maksu grāmatvedības kontu
@@ -294,15 +299,16 @@ DescValidateMovements=Jebkādas rakstīšanas, burtu un izdzēsto tekstu izmaiņ
 
 ValidateHistory=Piesaistiet automātiski
 AutomaticBindingDone=Automātiskā saistīšana ir pabeigta (%s) — dažiem ierakstiem automātiskā saistīšana nav iespējama (%s)
+DoManualBindingForFailedRecord=Jums ir jāizveido manuāla saite rindai %s, kas nav saistīta automātiski.
 
-ErrorAccountancyCodeIsAlreadyUse=Error, you cannot remove or disable this account of chart of account because it is used
+ErrorAccountancyCodeIsAlreadyUse=Kļūda. Šo kontu plāna kontu nevar noņemt vai atspējot, jo tas tiek izmantots
 MvtNotCorrectlyBalanced=Kustības nav pareizi līdzsvarotas. Debets = %s & kredīts = %s
 Balancing=Līdzsvarošana
 FicheVentilation=Iesiešanas kartiņa
 GeneralLedgerIsWritten=Darījumi ir rakstīti grāmatvedībā
 GeneralLedgerSomeRecordWasNotRecorded=Daži darījumi nevarēja tikt publicēti žurnālā. Ja nav citas kļūdas ziņojuma, iespējams, ka tie jau tika publicēti.
 NoNewRecordSaved=Vairs nav pārsūtāmu ierakstu
-ListOfProductsWithoutAccountingAccount=List of products not bound to any account of chart of account
+ListOfProductsWithoutAccountingAccount=Produktu saraksts, kas nav piesaistīti nevienam konta plāna kontam
 ChangeBinding=Mainiet saites
 Accounted=Uzskaitīts virsgrāmatā
 NotYetAccounted=Vēl nav pārnests uz grāmatvedību
@@ -337,11 +343,13 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=Atspējot saistīšanu un pārskaitīšanu p
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Atspējot saistīšanu un pārsūtīšanu pirkumu grāmatvedībā (pārdevēja rēķini netiks ņemti vērā grāmatvedībā)
 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)
 ACCOUNTING_ENABLE_LETTERING=Grāmatvedībā iespējot burtu funkciju
+ACCOUNTING_ENABLE_AUTOLETTERING=Iespējot automātisko burtu rakstīšanu, pārejot uz grāmatvedību
 
 ## Export
 NotExportLettering=Veidojot failu, neeksportējiet burtus
 NotifiedExportDate=Atzīmējiet eksportētās rindas kā Eksportētas <span class="warning"> (lai mainītu rindu, jums būs jāizdzēš viss darījums un atkārtoti jāpārsūta uz grāmatvedību) </span>
 NotifiedValidationDate=Apstipriniet un bloķējiet eksportētos ierakstus <span class="warning"> (tāds pats efekts kā funkcijai "%s", rindu modifikācija un dzēšana NOTEIKTI nebūs iespējama) </span>
+NotifiedExportFull=Eksportēt dokumentus?
 DateValidationAndLock=Datuma apstiprināšana un bloķēšana
 ConfirmExportFile=Apstiprinājums par grāmatvedības eksporta faila ģenerēšanu?
 ExportDraftJournal=Eksporta žurnāla projekts
@@ -398,7 +406,7 @@ SaleLocal=Vietējā pārdošana
 SaleExport=Eksporta pārdošana
 SaleEEC=Pārdošana EEK
 SaleEECWithVAT=Pārdošana EEK ar PVN nav spēkā, tāpēc domājams, ka tā NAV iekšējā tirdzniecība, un ieteiktais konts ir standarta produkta konts.
-SaleEECWithoutVATNumber=Pārdošana EEK bez PVN, bet trešās puses PVN ID nav definēts. Mēs atteicamies no standarta produkta standarta konta. Ja nepieciešams, varat salabot trešās personas PVN ID vai produkta kontu.
+SaleEECWithoutVATNumber=Pārdošana EEK bez PVN, bet nav noteikts trešās puses PVN ID. Mēs atgriežamies pie standarta pārdošanas konta. Varat labot trešās puses PVN ID vai mainīt produkta kontu, kas ieteikts saistīšanai, ja nepieciešams.
 ForbiddenTransactionAlreadyExported=Aizliegts: darījums ir apstiprināts un/vai eksportēts.
 ForbiddenTransactionAlreadyValidated=Aizliegts: darījums ir apstiprināts.
 ## Dictionary
@@ -442,6 +450,7 @@ AccountancyErrorMismatchLetterCode=Saskaņošanas koda neatbilstība
 AccountancyErrorMismatchBalanceAmount=Atlikums (%s) nav vienāds ar 0
 AccountancyErrorLetteringBookkeeping=Ir radušās kļūdas saistībā ar darījumiem: %s
 ErrorAccountNumberAlreadyExists=Grāmatvedības numurs %s jau pastāv
+ErrorArchiveAddFile=Arhīvā nevar ievietot failu "%s".
 
 ## Import
 ImportAccountingEntries=Grāmatvedības ieraksti
@@ -468,5 +477,7 @@ 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
+DocsAlreadyExportedAreExcluded=Jau eksportētie dokumenti tiek izslēgti
+ClickToHideAlreadyExportedLines=Noklikšķiniet, lai paslēptu jau eksportētās līnijas
 
 NAccounts=%s konti
diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang
index 08ec9f2dfc2..54f557e18ed 100644
--- a/htdocs/langs/lv_LV/admin.lang
+++ b/htdocs/langs/lv_LV/admin.lang
@@ -406,7 +406,7 @@ NoSmsEngine=Nav pieejams neviens SMS sūtītāja pārvaldnieks. SMS sūtītāja
 PDF=PDF
 PDFDesc=Globālās iespējas PDF ģenerēšanai
 PDFOtherDesc=PDF opcija, kas raksturīga dažiem moduļiem
-PDFAddressForging=Noteikumi par adreses sadaļu
+PDFAddressForging=Noteikumi adreses sadaļai
 HideAnyVATInformationOnPDF=Slēpt visu informāciju, kas saistīta ar pārdošanas nodokli / PVN
 PDFRulesForSalesTax=Pārdošanas nodokļa / PVN noteikumi
 PDFLocaltax=Noteikumi par %s
@@ -645,6 +645,8 @@ Module2300Name=Plānotie darbi
 Module2300Desc=Plānotais darbavietu vadība (alias cron vai chrono galds)
 Module2400Name=Pasākumi / darba kārtība
 Module2400Desc=Sekojiet notikumiem. Reģistrējiet automātiskos notikumus izsekošanas nolūkos vai ierakstiet manuālos notikumus vai sanāksmes. Tas ir galvenais modulis labam klientu vai pārdevēju attiecību pārvaldībai.
+Module2430Name=Rezervācijas kalendāra sistēma
+Module2430Desc=Nodrošiniet tiešsaistes kalendāru, lai ikviens varētu rezervēt tikšanās vietas atbilstoši iepriekš noteiktam diapazonam vai pieejamībai.
 Module2500Name=DMS / ECM
 Module2500Desc=Dokumentu vadības sistēma / elektroniskā satura vadība. Jūsu radīto vai saglabāto dokumentu automātiska organizēšana. Kopīgojiet tos pēc vajadzības.
 Module2600Name=API/tīmekļa pakalpojumi (SOAP serveris)
@@ -660,6 +662,8 @@ Module2900Name=GeoIPMaxmind
 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.
+Module3300Name=Moduļu veidotājs
+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=Iespējojiet sociālo tīklu laukus trešajām pusēm un adresēm (skype, twitter, facebook, ...).
 Module4000Name=HRM
@@ -700,7 +704,7 @@ Module62000Name=Inkoterms
 Module62000Desc=Pievienojiet funkcijas, lai pārvaldītu Incoterms
 Module63000Name=Resursi
 Module63000Desc=Pārvaldiet resursus (printerus, automašīnas, telpas, ...), lai piešķirtu notikumiem
-Module94160Name=Receptions
+Module94160Name=Pieņemšanas
 Permission11=Lasīt klientu rēķinus
 Permission12=Izveidot / mainīt klientu rēķinus
 Permission13=Nederīgi klientu rēķini
@@ -974,14 +978,14 @@ Permission3301=Ģenerējiet jaunus moduļus
 Permission4001=Izlasiet prasmes/darbu/amatu
 Permission4002=Izveidot/mainīt prasmes/darbu/amatu
 Permission4003=Dzēst prasmi/darbu/amatu
-Permission4021=Read evaluations (yours and your subordinates)
-Permission4022=Create/modify evaluations
-Permission4023=Validate evaluation
-Permission4025=Delete evaluation
-Permission4028=See comparison menu
+Permission4021=Lasīt vērtējumus (jūsu un jūsu padoto)
+Permission4022=Izveidot/mainīt novērtējumus
+Permission4023=Apstipriniet novērtējumu
+Permission4025=Dzēst novērtējumu
+Permission4028=Skatiet salīdzināšanas izvēlni
 Permission4031=Izlasiet personisko informāciju
 Permission4032=Uzrakstiet personisko informāciju
-Permission4033=Read all evaluations (even those of user not subordinates)
+Permission4033=Lasīt visus vērtējumus (arī tos, kas attiecas uz lietotāju, nevis padotajiem)
 Permission10001=Lasīt tīmekļa vietnes saturu
 Permission10002=Izveidot / mainīt vietnes saturu (html un javascript saturu)
 Permission10003=Izveidojiet / modificējiet vietnes saturu (dinamisko php kodu). Bīstami, tie ir jārezervē ierobežotiem izstrādātājiem.
@@ -1270,6 +1274,7 @@ TriggerActiveAsModuleActive=Trigeri Šajā failā ir aktīvs kā modulis <b>%s</
 GeneratedPasswordDesc=Izvēlieties metodi, kas izmantojama automātiski ģenerētām parolēm.
 DictionaryDesc=Ievietojiet visus atsauces datus. Varat pievienot savas vērtības noklusējuma vērtībai.
 ConstDesc=Šī lapa ļauj rediģēt (ignorēt) parametrus, kas nav pieejami citās lapās. Tie lielākoties ir rezervēti tikai izstrādātājiem / uzlabotas problēmu novēršanas parametri.
+MiscellaneousOptions=Dažādas iespējas
 MiscellaneousDesc=Šeit ir definēti visi citi ar drošību saistītie parametri.
 LimitsSetup=Limiti/Precizitātes iestatīšana
 LimitsDesc=Šeit jūs varat noteikt ierobežojumus, precizitātes un optimizāciju, ko Dolibarr izmanto
@@ -1303,8 +1308,8 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=Jums ir palaist šo komandu no
 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
-SimpleRefNumRefModelDesc=Returns the reference number in the format n where n is a sequential auto-incrementing number with no reset
-AdvancedNumRefModelDesc=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
+SimpleRefNumRefModelDesc=Atgriež atsauces numuru formātā n, kur n ir secīgi automātiski augošs skaitlis bez atiestatīšanas
+AdvancedNumRefModelDesc=Atgriež atsauces numuru formātā %syymm-nnnn, kur yy ir gads, mm ir mēnesis un nnnn ir secīgi automātiski augošs 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=Parādīt profesionālo ID ar adresēm
 ShowVATIntaInAddress=Paslēpt Kopienas iekšējo PVN numuru
@@ -1391,7 +1396,7 @@ GetBarCode=Iegūt svītrukodu
 NumberingModules=Numerācijas modeļi
 DocumentModules=Dokumentu modeļi
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters.
+PasswordGenerationStandard=Atgrieziet paroli, kas ģenerēta saskaņā ar iekšējo Dolibarr algoritmu: %s rakstzīmes, kas satur kopīgus ciparus un rakstzīmes.
 PasswordGenerationNone=Neiesakām ģenerētu paroli. Parole jāieraksta manuāli.
 PasswordGenerationPerso=Return a password according to your personally defined configuration.
 SetupPerso=Saskaņā ar jūsu konfigurāciju
@@ -1445,10 +1450,10 @@ SuppliersPayment=Pārdevēja maksājumi
 SupplierPaymentSetup=Pārdevēja maksājumu iestatīšana
 InvoiceCheckPosteriorDate=Pirms apstiprināšanas pārbaudiet ražošanas datumu
 InvoiceCheckPosteriorDateHelp=Rēķina apstiprināšana būs aizliegta, ja tā datums ir agrāks par pēdējā tāda paša veida rēķina datumu.
-InvoiceOptionCategoryOfOperations=Display the mention "category of operations" on the invoice.
-InvoiceOptionCategoryOfOperationsHelp=Depending on the situation, the mention will appear in the form:<br>- Category of operations: Delivery of goods<br>- Category of operations: Provision of services<br>- Category of operations: Mixed - Delivery of goods & provision of services
-InvoiceOptionCategoryOfOperationsYes1=Yes, below the address block
-InvoiceOptionCategoryOfOperationsYes2=Yes, in the lower left-hand corner
+InvoiceOptionCategoryOfOperations=Rēķinā parādiet norādi "operāciju kategorija".
+InvoiceOptionCategoryOfOperationsHelp=Atkarībā no situācijas minējums tiks parādīts šādā formā: <br> - Darbību kategorija: Preču piegāde <br> - Darbību kategorija: Pakalpojumu sniegšana <br> - Darbību kategorija: Jaukts - Preču piegāde un pakalpojumi
+InvoiceOptionCategoryOfOperationsYes1=Jā, zem adreses bloka
+InvoiceOptionCategoryOfOperationsYes2=Jā, apakšējā kreisajā stūrī
 ##### Proposals #####
 PropalSetup=Commercial priekšlikumi modulis uzstādīšana
 ProposalsNumberingModules=Komerciālie priekšlikumu numerācijas modeļi
@@ -1491,7 +1496,7 @@ WatermarkOnDraftContractCards=Ūdenszīme uz līgumu projektiem (nav, ja  tukšs
 ##### Members #####
 MembersSetup=Dalībnieku moduļa uzstādīšana
 MemberMainOptions=Galvenās iespējas
-MemberCodeChecker=Options for automatic generation of member codes
+MemberCodeChecker=Iespējas automātiskai dalībnieku kodu ģenerēšanai
 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
@@ -1826,6 +1831,9 @@ AGENDA_USE_EVENT_TYPE=Izmantojiet notikumu tipus (tiek pārvaldīti izvēlnē Ie
 AGENDA_USE_EVENT_TYPE_DEFAULT=Veidojot notikuma veidlapu, automātiski iestatiet šo noklusējuma vērtību
 AGENDA_DEFAULT_FILTER_TYPE=Šādu pasākumu automātiski iestatīt darba kārtības skatā meklēšanas filtūrā
 AGENDA_DEFAULT_FILTER_STATUS=Automātiski iestatīt šo statusu notikumu skatīšanai darba filtru meklēšanas filtūrā
+AGENDA_EVENT_PAST_COLOR=Pagājušā pasākuma krāsa
+AGENDA_EVENT_CURRENT_COLOR=Pašreizējā pasākuma krāsa
+AGENDA_EVENT_FUTURE_COLOR=Nākotnes pasākuma krāsa
 AGENDA_DEFAULT_VIEW=Kuru skatu vēlaties atvērt pēc noklusējuma, izvēloties izvēlni Agenda
 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
@@ -2129,6 +2137,7 @@ CodeLastResult=Jaunākais rezultātu kods
 NbOfEmailsInInbox=E-pasta ziņojumu skaits avota direktorijā
 LoadThirdPartyFromName=Ielādējiet trešo personu meklēšanu pakalpojumā %s (tikai ielāde)
 LoadThirdPartyFromNameOrCreate=Ielādējiet trešo personu meklēšanu pakalpojumā %s (izveidojiet, ja nav atrasts)
+LoadContactFromEmailOrCreate=Ielādēt kontaktpersonu meklēšanu vietnē %s (izveidot, ja nav atrasts)
 AttachJoinedDocumentsToObject=Saglabājiet pievienotos failus objektu dokumentos, ja e-pasta tēmā tiek atrasta objekta atsauce.
 WithDolTrackingID=Ziņojums no sarunas, kuru aizsāka pirmais e-pasts, kas nosūtīts no Dolibarr
 WithoutDolTrackingID=Ziņojums no sarunas, kuru aizsāka pirmais e-pasts, kuru NAV nosūtīts no Dolibarr
@@ -2232,12 +2241,12 @@ MailToPartnership=Partnerība
 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=For shell purpose (like scheduled job backup or running an antivirus program), you must keep PHP functions
+PHPFunctionsRequiredForCLI=Apvalka vajadzībām (piemēram, ieplānota darba dublēšana vai pretvīrusu 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
 Recommended=Ieteicams
 NotRecommended=Nav ieteicams
-ARestrictedPath=Some restricted path for data files
+ARestrictedPath=Datu failiem ir 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
@@ -2353,5 +2362,7 @@ DesktopsAndSmartphones=Galddatori un viedtālruņi
 AllowOnlineSign=Atļaut tiešsaistes parakstīšanu
 AllowExternalDownload=Atļaut ārēju lejupielādi (bez pieteikšanās, izmantojot koplietotu saiti)
 DeadlineDayVATSubmission=PVN iesniegšanas termiņš nākamajā mēnesī
-MaxNumberOfAttachementOnForms=Max number of joinded files in a form
-IfDefinedUseAValueBeetween=If defined, use a value between %s and %s
+MaxNumberOfAttachementOnForms=Maksimālais savienoto failu skaits veidlapā
+IfDefinedUseAValueBeetween=Ja definēts, izmantojiet vērtību no %s līdz %s
+Reload=Pārlādēt
+ConfirmReload=Apstipriniet moduļa atkārtotu ielādi
diff --git a/htdocs/langs/lv_LV/agenda.lang b/htdocs/langs/lv_LV/agenda.lang
index 3ab5820a015..3935082a9e3 100644
--- a/htdocs/langs/lv_LV/agenda.lang
+++ b/htdocs/langs/lv_LV/agenda.lang
@@ -68,7 +68,7 @@ ShipmentBackToDraftInDolibarr=Sūtījums %s dodas atpakaļ uz melnraksta statusu
 ShipmentDeletedInDolibarr=Sūtījums %s dzēsts
 ShipmentCanceledInDolibarr=Sūtījums %s atcelts
 ReceptionValidatedInDolibarr=Reģistrācija %s validēta
-ReceptionDeletedInDolibarr=Reception %s deleted
+ReceptionDeletedInDolibarr=Reģistratūra %s izdzēsta
 ReceptionClassifyClosedInDolibarr=Reģistratūra %s klasificēta kā slēgta
 OrderCreatedInDolibarr=Pasūtījums %s izveidots
 OrderValidatedInDolibarr=Pasūtījums %s pārbaudīts
diff --git a/htdocs/langs/lv_LV/bills.lang b/htdocs/langs/lv_LV/bills.lang
index 08766f5db6d..5784a1c2b0f 100644
--- a/htdocs/langs/lv_LV/bills.lang
+++ b/htdocs/langs/lv_LV/bills.lang
@@ -627,7 +627,7 @@ SendEmailsRemindersOnInvoiceDueDate=Nosūtiet atgādinājumu pa e-pastu par neap
 MakePaymentAndClassifyPayed=Ierakstiet maksājumu
 BulkPaymentNotPossibleForInvoice=Lielapjoma maksājums nav iespējams par rēķinu %s (slikts veids vai statuss)
 MentionVATDebitOptionIsOn=Iespēja maksāt nodokli, pamatojoties uz debetu
-MentionCategoryOfOperations=Category of operations
-MentionCategoryOfOperations0=Delivery of goods
-MentionCategoryOfOperations1=Provision of services
-MentionCategoryOfOperations2=Mixed - Delivery of goods & provision of services
+MentionCategoryOfOperations=Operāciju kategorija
+MentionCategoryOfOperations0=Preču piegāde
+MentionCategoryOfOperations1=Pakalpojumu sniegšana
+MentionCategoryOfOperations2=Jaukts - Preču piegāde un pakalpojumu sniegšana
diff --git a/htdocs/langs/lv_LV/boxes.lang b/htdocs/langs/lv_LV/boxes.lang
index 2fdb12864c5..dce2438c4c0 100644
--- a/htdocs/langs/lv_LV/boxes.lang
+++ b/htdocs/langs/lv_LV/boxes.lang
@@ -24,6 +24,7 @@ BoxFicheInter=Jaunākās intervences
 BoxCurrentAccounts=Atvērto kontu atlikums
 BoxTitleMemberNextBirthdays=Šī mēneša dzimšanas dienas (dalībnieki)
 BoxTitleMembersByType=Dalībnieki pēc veida un statusa
+BoxTitleMembersByTags=Dalībnieki pēc tagiem un statusa
 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
@@ -44,10 +45,10 @@ BoxTitleSupplierOrdersAwaitingReception=Piegādātāju pasūtījumi, kas gaida s
 BoxTitleLastModifiedContacts=Kontakti/adreses: pēdējie %s labotie
 BoxMyLastBookmarks=Grāmatzīmes: jaunākās %s
 BoxOldestExpiredServices=Vecākais aktīvais beidzies pakalpojums
-BoxOldestActions=Oldest events to do
+BoxOldestActions=Vecākie notikumi
 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
-BoxTitleOldestActionsToDo=Oldest %s events to do, not completed
+BoxTitleOldestActionsToDo=Vecākie veicamie %s notikumi, kas nav pabeigti
 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
diff --git a/htdocs/langs/lv_LV/companies.lang b/htdocs/langs/lv_LV/companies.lang
index 97e724b6359..cf2c435216c 100644
--- a/htdocs/langs/lv_LV/companies.lang
+++ b/htdocs/langs/lv_LV/companies.lang
@@ -312,8 +312,8 @@ CustomerRelativeDiscountShort=Relatīvā atlaide
 CustomerAbsoluteDiscountShort=Absolūtā atlaide
 CompanyHasRelativeDiscount=Šim klientam ir pastāvīgā atlaide <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Šim klientam nav relatīvā atlaide pēc noklusējuma
-HasRelativeDiscountFromSupplier=Šī pārdevēja noklusējuma atlaide ir <b>%s%%</b>
-HasNoRelativeDiscountFromSupplier=No šī pārdevēja nav noklusējuma relatīvās atlaides
+HasRelativeDiscountFromSupplier=Pie šī pārdevēja jums ir noklusējuma atlaide <b> %s%% </b>
+HasNoRelativeDiscountFromSupplier=Šim pārdevējam nav noklusējuma relatīvās atlaides
 CompanyHasAbsoluteDiscount=Šim klientam ir pieejamas atlaides (kredītpiezīmes vai maksājumi) par <b>%s</b>%s
 CompanyHasDownPaymentOrCommercialDiscount=Šim klientam ir pieejamas atlaides (komerciālie, iemaksātie maksājumi) par <b>%s</b> %s
 CompanyHasCreditNote=Šim klientam joprojām ir kredīta piezīmes <b>%s</b> %s
@@ -499,4 +499,7 @@ OutOfEurope=Ārpus Eiropas (EEK)
 CurrentOutstandingBillLate=Pašreizējais nesamaksātais rēķins ir nokavēts
 BecarefullChangeThirdpartyBeforeAddProductToInvoice=Esiet piesardzīgs, atkarībā no produkta cenas iestatījumiem, pirms produkta pievienošanas POS, jums jāmaina trešā puse.
 EmailAlreadyExistsPleaseRewriteYourCompanyName=e-pasts jau pastāv, lūdzu, pārrakstiet sava uzņēmuma nosaukumu
-TwoRecordsOfCompanyName=šim uzņēmumam ir vairāk nekā viens ieraksts, lūdzu, sazinieties ar mums, lai pabeigtu savu partnerības pieprasījumu"
+TwoRecordsOfCompanyName=šim uzņēmumam ir vairāk nekā viens ieraksts, lūdzu, sazinieties ar mums, lai pabeigtu savu partnerības pieprasījumu
+CompanySection=Uzņēmuma sadaļa
+ShowSocialNetworks=Rādīt sociālos tīklus
+HideSocialNetworks=Slēpt sociālos tīklus
diff --git a/htdocs/langs/lv_LV/compta.lang b/htdocs/langs/lv_LV/compta.lang
index 6f949a3985f..fe0d86b625d 100644
--- a/htdocs/langs/lv_LV/compta.lang
+++ b/htdocs/langs/lv_LV/compta.lang
@@ -246,12 +246,12 @@ TurnoverPerProductInCommitmentAccountingNotRelevant=Apgrozījuma pārskats, kas
 TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=Apgrozījuma pārskats, kas iegūts no pārdošanas nodokļa likmes, nav pieejams. Šis pārskats ir pieejams tikai apgrozījumam rēķinā.
 CalculationMode=Aprēķinu režīms
 AccountancyJournal=Grāmatvedības kodu žurnāls
-ACCOUNTING_VAT_SOLD_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for VAT on purchases (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_PAY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Account (from the Chart Of Account) used for "customer" third parties
+ACCOUNTING_VAT_SOLD_ACCOUNT=Konts (no konta plāna), kas jāizmanto kā noklusējuma konts pārdošanas PVN aplikšanai (izmanto, ja tas nav definēts PVN vārdnīcas iestatījumos)
+ACCOUNTING_VAT_BUY_ACCOUNT=Konts (no konta plāna), kas jāizmanto kā noklusējuma konts PVN par pirkumiem (izmanto, ja tas nav definēts PVN vārdnīcas iestatījumos)
+ACCOUNTING_VAT_PAY_ACCOUNT=Konts (no konta plāna), kas jāizmanto kā noklusējuma konts PVN maksāšanai
+ACCOUNTING_ACCOUNT_CUSTOMER=Konts (no konta plāna), ko izmanto "klientu" trešajām pusēm
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Īpašais grāmatvedības konts, kas noteikts trešās personas kartē, tiks izmantots tikai pakārtotajam grāmatvedim. Šis tiek izmantots General Ledger un noklusējuma vērtība Subledged grāmatvedībai, ja trešās personas īpašais klientu grāmatvedības konts nav definēts.
-ACCOUNTING_ACCOUNT_SUPPLIER=Account (from the Chart of Account) used for the "vendor" third parties
+ACCOUNTING_ACCOUNT_SUPPLIER=Konts (no kontu plāna), ko izmanto "pārdevēja" trešajām pusēm
 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=Apstipriniet PVN deklarācijas klonu
diff --git a/htdocs/langs/lv_LV/errors.lang b/htdocs/langs/lv_LV/errors.lang
index 789b4521b87..c261b3fe71b 100644
--- a/htdocs/langs/lv_LV/errors.lang
+++ b/htdocs/langs/lv_LV/errors.lang
@@ -303,6 +303,7 @@ ErrorValueForTooLow=<b> %s </b> vērtība ir pārāk zema
 ErrorValueCantBeNull=<b> %s </b> vērtība nevar būt nulle
 ErrorDateOfMovementLowerThanDateOfFileTransmission=Bankas darījuma datums nedrīkst būt mazāks par faila pārsūtīšanas datumu
 ErrorTooMuchFileInForm=Pārāk daudz failu formā, maksimālais skaits ir %s fails(-i)
+ErrorSessionInvalidatedAfterPasswordChange=Sesija tika anulēta pēc paroles, statusa vai derīguma datuma maiņas. Lūdzu, piesakieties atkārtoti.
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Jūsu PHP parametrs upload_max_filesize (%s) ir augstāks nekā PHP parametrs post_max_size (%s). Šī nav konsekventa iestatīšana.
@@ -325,6 +326,7 @@ WarningPaymentDateLowerThanInvoiceDate=Apmaksas datums (%s) ir agrāks par rēķ
 WarningTooManyDataPleaseUseMoreFilters=Too many data (more than %s lines). Please use more filters or set the constant %s to a higher limit.
 WarningSomeLinesWithNullHourlyRate=Daži lietotāji dažreiz ierakstīja, bet viņu stundas likme netika definēta. Tika izmantota vērtība 0 %s stundā, taču tas var novest pie nepareiza pavadītā laika vērtējuma.
 WarningYourLoginWasModifiedPleaseLogin=Jūsu pieteikšanās tika mainīta. Drošības nolūkos pirms nākamās darbības jums būs jāpiesakās ar jauno pieteikumvārdu.
+WarningYourPasswordWasModifiedPleaseLogin=Jūsu parole tika mainīta. Drošības nolūkos jums tagad būs jāpiesakās ar savu jauno paroli.
 WarningAnEntryAlreadyExistForTransKey=Šīs valodas tulkošanas taustiņam jau ir ieraksts
 WarningNumberOfRecipientIsRestrictedInMassAction=Brīdinājums, ja izmantojat masveida darbību sarakstos, saņēmēju skaits ir ierobežots <b>%s</b>
 WarningDateOfLineMustBeInExpenseReportRange=Brīdinājums, rindas datums nav izdevumu pārskata diapazonā
diff --git a/htdocs/langs/lv_LV/eventorganization.lang b/htdocs/langs/lv_LV/eventorganization.lang
index d37ec669631..6545b566da2 100644
--- a/htdocs/langs/lv_LV/eventorganization.lang
+++ b/htdocs/langs/lv_LV/eventorganization.lang
@@ -54,7 +54,7 @@ EVENTORGANIZATION_FILTERATTENDEES_TYPE = Dalībnieka izveides/pievienošanas vei
 # Object
 #
 EventOrganizationConfOrBooth= Konference vai stends
-EventOrganizationConfOrBoothes=Conferences or Boothes
+EventOrganizationConfOrBoothes=Konferences vai stendi
 ManageOrganizeEvent = Pārvaldiet pasākuma organizēšanu
 ConferenceOrBooth = Konference vai stends
 ConferenceOrBoothTab = Konference vai stends
@@ -115,8 +115,8 @@ EvntOrgRegistrationHelpMessage = Šeit varat balsot par konferenci vai ieteikt j
 EvntOrgRegistrationConfHelpMessage = Šeit varat ieteikt jaunu konferenci, ko animēt pasākuma laikā.
 EvntOrgRegistrationBoothHelpMessage = Šeit jūs varat pieteikties stendam pasākuma laikā.
 ListOfSuggestedConferences = Ieteicamo konferenču saraksts
-ListOfSuggestedBooths=Suggested booths
-ListOfConferencesOrBooths=Conferences or booths of event project
+ListOfSuggestedBooths=Ieteiktās kabīnes
+ListOfConferencesOrBooths=Konferenču vai pasākumu projektu kabīnes
 SuggestConference = Ieteikt jaunu konferenci
 SuggestBooth = Ieteikt stendu
 ViewAndVote = Skatiet ierosinātos pasākumus un balsojiet par tiem
@@ -172,3 +172,5 @@ ErrorSeveralCompaniesWithEmailContactUs=Ir atrasti vairāki uzņēmumi ar šo e
 ErrorSeveralCompaniesWithNameContactUs=Ir atrasti vairāki uzņēmumi ar šo nosaukumu, tāpēc mēs nevaram automātiski apstiprināt jūsu reģistrāciju. Lūdzu, sazinieties ar mums pa e -pastu %s, lai manuāli apstiprinātu
 NoPublicActionsAllowedForThisEvent=Šajā pasākumā neviena publiska darbība nav pieejama sabiedrībai
 MaxNbOfAttendees=Maksimālais dalībnieku skaits
+DateStartEvent=Pasākuma sākuma datums
+DateEndEvent=Pasākuma beigu datums
diff --git a/htdocs/langs/lv_LV/holiday.lang b/htdocs/langs/lv_LV/holiday.lang
index 480d77f4526..913d38f8cd3 100644
--- a/htdocs/langs/lv_LV/holiday.lang
+++ b/htdocs/langs/lv_LV/holiday.lang
@@ -143,16 +143,16 @@ TemplatePDFHolidays=PDF veidne atvaļinājumu pieprasīšanai
 FreeLegalTextOnHolidays=Brīvs teksts PDF
 WatermarkOnDraftHolidayCards=Ūdenszīmes uz atvaļinājuma pieprasījumiem
 HolidaysToApprove=Brīvdienas, kas jāapstiprina
-NobodyHasPermissionToValidateHolidays=Nevienam nav atļaujas apstiprināt brīvdienas
-HolidayBalanceMonthlyUpdate=Ikmēneša brīvdienu bilances atjauninājums
+NobodyHasPermissionToValidateHolidays=Nevienam nav atļaujas apstiprināt atvaļinājuma pieprasījumus
+HolidayBalanceMonthlyUpdate=Ikmēneša atvaļinājuma atlikuma atjauninājums
 XIsAUsualNonWorkingDay=%s parasti ir NAV darba diena
 BlockHolidayIfNegative=Bloķēt, ja atlikums ir negatīvs
 LeaveRequestCreationBlockedBecauseBalanceIsNegative=Šī atvaļinājuma pieprasījuma izveide ir bloķēta, jo jūsu bilance ir negatīva
 ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=Atstāšanas pieprasījumam %s jābūt melnrakstam, tas ir jāatceļ vai jāatsakās dzēst
-IncreaseHolidays=Palieliniet brīvdienas
-HolidayRecordsIncreased= %s svētku ieraksti palielinājās
-HolidayRecordIncreased=Pieaudzis svētku rekords
-ConfirmMassIncreaseHoliday=Lielapjoma brīvdienu palielināšana
+IncreaseHolidays=Palieliniet atvaļinājuma atlikumu
+HolidayRecordsIncreased= %s atvaļinājumu atlikumi palielinājās
+HolidayRecordIncreased=Palielināts atvaļinājumu atlikums
+ConfirmMassIncreaseHoliday=Lielapjoma atvaļinājuma atlikuma palielināšana
 NumberDayAddMass=Dienu skaits, kas jāpievieno atlasei
 ConfirmMassIncreaseHolidayQuestion=Vai tiešām vēlaties palielināt %s atlasītā(-u) ieraksta(-u) brīvdienu?
 HolidayQtyNotModified=Atlikušo dienu atlikums %s nav mainīts
diff --git a/htdocs/langs/lv_LV/hrm.lang b/htdocs/langs/lv_LV/hrm.lang
index 4c121d33c98..0829659809c 100644
--- a/htdocs/langs/lv_LV/hrm.lang
+++ b/htdocs/langs/lv_LV/hrm.lang
@@ -86,7 +86,7 @@ SaveAddSkill = Pievienotas prasmes
 SaveLevelSkill = Prasmju līmenis ir saglabāts
 DeleteSkill = Prasme noņemta
 SkillsExtraFields=Attributs supplémentaires (kompetences)
-JobsExtraFields=Attributs supplémentaires (Emplois)
+JobsExtraFields=Attributs supplémentaires (darba profils)
 EvaluationsExtraFields=Atribūti supplémentaires (novērtējumi)
 NeedBusinessTravels=Nepieciešami biznesa ceļojumi
 NoDescription=Nav apraksta
diff --git a/htdocs/langs/lv_LV/interventions.lang b/htdocs/langs/lv_LV/interventions.lang
index c1526af527d..ce6de8b0c78 100644
--- a/htdocs/langs/lv_LV/interventions.lang
+++ b/htdocs/langs/lv_LV/interventions.lang
@@ -69,4 +69,4 @@ GenerateInter=Ģenerēt iejaukšanos
 FichinterNoContractLinked=Intervence %s ir izveidota bez saistīta līguma.
 ErrorFicheinterCompanyDoesNotExist=Uzņēmums neeksistē. Intervence nav izveidota.
 NextDateToIntervention=Nākamās intervences paaudzes datums
-NoIntervention=No intervention
+NoIntervention=Bez iejaukšanās
diff --git a/htdocs/langs/lv_LV/loan.lang b/htdocs/langs/lv_LV/loan.lang
index b32d48f8413..120b093bf4b 100644
--- a/htdocs/langs/lv_LV/loan.lang
+++ b/htdocs/langs/lv_LV/loan.lang
@@ -28,7 +28,7 @@ CantUseScheduleWithLoanStartedToPaid = Nevar ģenerēt laika grafiku aizdevumam
 CantModifyInterestIfScheduleIsUsed = Jūs nevarat mainīt interesi, ja izmantojat grafiku
 # Admin
 ConfigLoan=Configuration of the module loan
-LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Account (from the Chart Of Account) to be used by default for capital (Loan module)
-LOAN_ACCOUNTING_ACCOUNT_INTEREST=Account (from the Chart Of Account) to be used by default for interest (Loan module)
-LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Account (from the Chart Of Account) to be used by default for insurance (Loan module)
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Konts (no konta plāna), kas pēc noklusējuma jāizmanto kapitālam (aizdevuma modulis)
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Konts (no konta plāna), kas pēc noklusējuma jāizmanto procentiem (aizdevuma modulis)
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Konts (no konta plāna), kas pēc noklusējuma jāizmanto apdrošināšanai (aizdevuma modulis)
 CreateCalcSchedule=Rediģēt finansiālās saistības
diff --git a/htdocs/langs/lv_LV/main.lang b/htdocs/langs/lv_LV/main.lang
index 932a87c1285..665d3da303d 100644
--- a/htdocs/langs/lv_LV/main.lang
+++ b/htdocs/langs/lv_LV/main.lang
@@ -226,6 +226,7 @@ NoUserGroupDefined=Nav definēta neviena lietotāju grupa
 Password=Parole
 PasswordRetype=Atkārtojiet savu paroli
 NoteSomeFeaturesAreDisabled=Ņemiet vērā, ka funkcijas / modules daudz ir invalīdi šajā demonstrācijā.
+YourUserFile=Jūsu lietotāja fails
 Name=Nosaukums
 NameSlashCompany=Nosaukums/uzņēmums
 Person=Persona
@@ -897,6 +898,9 @@ MassFilesArea=Platība failiem, kurus izveido masveida darbības
 ShowTempMassFilesArea=Show area of files built by mass actions
 ConfirmMassDeletion=Bulk Delete apstiprinājums
 ConfirmMassDeletionQuestion=Vai tiešām vēlaties dzēst atlasīto(-s) ierakstu(-s) %s?
+ConfirmMassClone=Lielapjoma klona apstiprināšana
+ConfirmMassCloneQuestion=Atlasiet projektu, uz kuru vēlaties klonēt
+ConfirmMassCloneToOneProject=Klonēt uz projektu %s
 RelatedObjects=Saistītie objekti
 ClassifyBilled=Klasificēt apmaksāts
 ClassifyUnbilled=Klasificēt neapmaksāts
@@ -912,8 +916,8 @@ ExportFilteredList=Eksportēt atlasīto sarakstu
 ExportList=Eksporta saraksts
 ExportOptions=Eksportēšanas iespējas
 IncludeDocsAlreadyExported=Iekļaut jau eksportētos dokumentus
-ExportOfPiecesAlreadyExportedIsEnable=Eksportēt jau eksportētos gabalus
-ExportOfPiecesAlreadyExportedIsDisable=Eksportēto gabalu eksports ir atspējots
+ExportOfPiecesAlreadyExportedIsEnable=Jau eksportētie dokumenti ir redzami un tiks eksportēti
+ExportOfPiecesAlreadyExportedIsDisable=Jau eksportētie dokumenti ir paslēpti un netiks eksportēti
 AllExportedMovementsWereRecordedAsExported=Visas eksportētās kustības tika reģistrētas kā eksportētas
 NotAllExportedMovementsCouldBeRecordedAsExported=Ne visas eksportētās kustības var ierakstīt kā eksportētas
 Miscellaneous=Dažādi
@@ -1128,6 +1132,7 @@ DeleteFileText=Vai tiešām vēlaties izdzēst šo failu?
 ShowOtherLanguages=Rādīt citas valodas
 SwitchInEditModeToAddTranslation=Pārslēdzieties rediģēšanas režīmā, lai šai valodai pievienotu tulkojumus
 NotUsedForThisCustomer=Nav izmantots šim klientam
+NotUsedForThisVendor=Nav izmantots šim pārdevējam
 AmountMustBePositive=Summai jābūt pozitīvai
 ByStatus=Pēc statusa
 InformationMessage=Informācija
@@ -1148,18 +1153,18 @@ EventReminder=Atgādinājums par notikumu
 UpdateForAllLines=Atjauninājums visām līnijām
 OnHold=On hold
 Civility=Laipnība
-AffectTag=Assign Tag
-AffectUser=Assign User
-SetSupervisor=Iestatīt Supervisor
+AffectTag=Piešķiriet tagu
+AffectUser=Piešķirt lietotāju
+SetSupervisor=Iestatiet vadītāju
 CreateExternalUser=Izveidot ārēju lietotāju
-ConfirmAffectTag=Bulk Tag Assignement
-ConfirmAffectUser=Bulk User Assignement
-ProjectRole=Katram projektam piešķirta loma
-TasksRole=Katra projekta uzdevumam piešķirta loma
+ConfirmAffectTag=Lielapjoma tagu piešķiršana
+ConfirmAffectUser=Lielapjoma lietotāju piešķiršana
+ProjectRole=Katram projektam/iespējai piešķirta loma
+TasksRole=Katram uzdevumam piešķirtā loma (ja tiek izmantota)
 ConfirmSetSupervisor=Lielapjoma uzrauga komplekts
 ConfirmUpdatePrice=Izvēlieties cenas palielināšanas/samazināšanās likmi
-ConfirmAffectTagQuestion=Are you sure you want to assign tags to the %s selected record(s)?
-ConfirmAffectUserQuestion=Are you sure you want to assign users to the %s selected record(s)?
+ConfirmAffectTagQuestion=Vai tiešām vēlaties piešķirt atzīmes %s atlasītajam(-iem) ierakstam(-iem)?
+ConfirmAffectUserQuestion=Vai tiešām vēlaties piešķirt lietotājus %s atlasītajam(-iem) ierakstam(-iem)?
 ConfirmSetSupervisorQuestion=Vai tiešām vēlaties iestatīt uzraugu %s atlasītajam(-iem) ierakstam(-iem)?
 ConfirmUpdatePriceQuestion=Vai tiešām vēlaties atjaunināt %s atlasītā(-u) ieraksta(-u) cenu?
 CategTypeNotFound=Ierakstu veidam nav atrasts neviens tagu tips
@@ -1170,7 +1175,7 @@ InformationOnLinkToContract=Šī summa ir tikai visu līguma rindu kopsumma. Lai
 ConfirmCancel=Vai tiešām vēlaties atcelt
 EmailMsgID=Nosūtīt e-pastu MsgID
 EmailDate=E-pasta datums
-SetToStatus=Set to status %s
+SetToStatus=Iestatīt statusu %s
 SetToEnabled=Iestatīt kā iespējotu
 SetToDisabled=Iestatīts kā atspējots
 ConfirmMassEnabling=masu, kas ļauj apstiprināt
@@ -1199,8 +1204,8 @@ Terminated=Izbeigta
 AddLineOnPosition=Pievienot rindiņu pozīcijai (beigās, ja tukša)
 ConfirmAllocateCommercial=Piešķiriet tirdzniecības pārstāvja apstiprinājumu
 ConfirmAllocateCommercialQuestion=Vai tiešām vēlaties piešķirt %s atlasītos ierakstus?
-CommercialsAffected=Sales representatives assigned
-CommercialAffected=Sales representative assigned
+CommercialsAffected=Norīkoti tirdzniecības pārstāvji
+CommercialAffected=Norīkots tirdzniecības pārstāvis
 YourMessage=Tava ziņa
 YourMessageHasBeenReceived=Jūsu ziņojums ir saņemts. Mēs atbildēsim vai sazināsimies ar jums pēc iespējas ātrāk.
 UrlToCheck=Pārbaudāmais URL
@@ -1210,3 +1215,10 @@ CreatedByPublicPortal=Izveidots no publiskā portāla
 UserAgent=Lietotāja aģents
 InternalUser=Iekšējais lietotājs
 ExternalUser=Ārējais lietotājs
+NoSpecificContactAddress=Nav konkrētas kontaktpersonas vai adreses
+NoSpecificContactAddressBis=Šī cilne ir paredzēta konkrētu kontaktpersonu vai adrešu piespiedu noteikšanai pašreizējam objektam. Izmantojiet to tikai tad, ja vēlaties objektam definēt vienu vai vairākas konkrētas kontaktpersonas vai adreses, kad trešās puses informācija nav pietiekama vai nav precīza.
+HideOnVCard=Slēpt %s
+AddToContacts=Pievienot adresi maniem kontaktiem
+LastAccess=Pēdējā piekļuve
+UploadAnImageToSeeAPhotoHere=Augšupielādējiet attēlu no cilnes %s, lai skatītu fotoattēlu šeit
+LastPasswordChangeDate=Pēdējās paroles maiņas datums
diff --git a/htdocs/langs/lv_LV/members.lang b/htdocs/langs/lv_LV/members.lang
index c7f2fccb790..7fceb4fdd04 100644
--- a/htdocs/langs/lv_LV/members.lang
+++ b/htdocs/langs/lv_LV/members.lang
@@ -231,4 +231,4 @@ CreateDolibarrLoginDesc=Izveidojot lietotājvārdu dalībniekiem, viņi var izve
 CreateDolibarrThirdPartyDesc=Trešā puse ir juridiska persona, kas tiks izmantota rēķinā, ja jūs nolemjat ģenerēt rēķinu par katru ieguldījumu. To varēsit izveidot vēlāk, ieguldījuma ierakstīšanas procesa laikā.
 MemberFirstname=Dalībnieka vārds
 MemberLastname=Dalībnieka uzvārds
-MemberCodeDesc=Member Code, unique for all members
+MemberCodeDesc=Dalībnieka kods, unikāls visiem dalībniekiem
diff --git a/htdocs/langs/lv_LV/mrp.lang b/htdocs/langs/lv_LV/mrp.lang
index d5d88fc8fd2..664d85fa17d 100644
--- a/htdocs/langs/lv_LV/mrp.lang
+++ b/htdocs/langs/lv_LV/mrp.lang
@@ -11,7 +11,7 @@ Bom=Materiālu rēķini
 BillOfMaterials=Materiālu rēķins
 BillOfMaterialsLines=Materiālu rēķina līnijas
 BOMsSetup=Moduļa BOM iestatīšana
-ListOfBOMs=Bills of material - BOM
+ListOfBOMs=Materiālu pavadzīmes - BOM
 ListOfManufacturingOrders=Ražošanas pasūtījumi
 NewBOM=Jauns materiālu saraksts
 ProductBOMHelp=Produkts, kuru izveidot (vai izjaukt) ar šo BOM. <br> Piezīme: Produkti ar īpašību 'Produkta veids' = 'Izejvielas' šajā sarakstā nav redzami.
@@ -102,6 +102,7 @@ NbOperatorsRequired=Nepieciešamo operatoru skaits
 THMOperatorEstimated=Paredzamais operators THM
 THMMachineEstimated=Paredzētā mašīna THM
 WorkstationType=Darbstacijas tips
+DefaultWorkstation=Noklusējuma darbstacija
 Human=Cilvēks
 Machine=Mašīna
 HumanMachine=Cilvēks / Mašīna
@@ -116,5 +117,5 @@ ParentMo=MO Vecāks
 MOChild=MO bērns
 BomCantAddChildBom=Nomenklatūra %s jau atrodas kokā, kas ved uz nomenklatūru %s
 BOMNetNeeds = BOM neto vajadzības
-BOMProductsList=BOM's products
-BOMServicesList=BOM's services
+BOMProductsList=BOM produkti
+BOMServicesList=BOM pakalpojumi
diff --git a/htdocs/langs/lv_LV/orders.lang b/htdocs/langs/lv_LV/orders.lang
index 6f8c400775c..6698b6faed2 100644
--- a/htdocs/langs/lv_LV/orders.lang
+++ b/htdocs/langs/lv_LV/orders.lang
@@ -96,6 +96,10 @@ OrdersStatisticsSuppliers=Pirkuma pasūtījumu statistika
 NumberOfOrdersByMonth=Pasūtījumu skaits pa mēnešiem
 AmountOfOrdersByMonthHT=Pasūtījumu apjoms mēnesī (bez nodokļiem)
 ListOfOrders=Pasūtījumu saraksts
+ListOrderLigne=Pasūtījumu rindas
+productobuy=Produkti, kas jāiegādājas tikai
+productonly=Tikai produkti
+disablelinefree=Nav brīvu rindu
 CloseOrder=Aizvērt kārtība
 ConfirmCloseOrder=Vai tiešām vēlaties iestatīt šo pasūtījumu kā piegādātu? Kad pasūtījums ir piegādāts, to var iestatīt kā rēķinu.
 ConfirmDeleteOrder=Vai tiešām vēlaties dzēst šo pasūtījumu?
@@ -131,6 +135,7 @@ SupplierOrderClassifiedBilled=Pirkuma pasūtījums %s, kas ir iekasēts
 OtherOrders=Citi pasūtījumi
 SupplierOrderValidatedAndApproved=Piegādātāja pasūtījums ir apstiprināts un apstiprināts: %s
 SupplierOrderValidated=Piegādātāja pasūtījums ir apstiprināts: %s
+OrderShowDetail=Rādīt detalizētu informāciju par pasūtījumu
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Pārstāvju pārdošanas pasūtījuma pārstāvis
 TypeContact_commande_internal_SHIPPING=Pārstāvis turpinot darboties kuģniecības
@@ -199,3 +204,5 @@ StatusSupplierOrderApproved=Apstiprināts
 StatusSupplierOrderRefused=Atteikts
 StatusSupplierOrderReceivedPartially=Daļēji saņemts
 StatusSupplierOrderReceivedAll=Visi produkti saņemti
+NeedAtLeastOneInvoice = Ir jābūt vismaz vienam rēķinam
+LineAlreadyDispatched = Pasūtījuma rinda jau ir saņemta.
diff --git a/htdocs/langs/lv_LV/other.lang b/htdocs/langs/lv_LV/other.lang
index c671d722390..e232ed1b840 100644
--- a/htdocs/langs/lv_LV/other.lang
+++ b/htdocs/langs/lv_LV/other.lang
@@ -46,9 +46,9 @@ Notify_ORDER_SUPPLIER_APPROVE=Pirkuma pasūtījums apstiprināts
 Notify_ORDER_SUPPLIER_REFUSE=Pirkuma pasūtījums noraidīts
 Notify_PROPAL_VALIDATE=Klientu priekšlikums apstiprināts
 Notify_PROPAL_CLOSE_SIGNED=Klienta piedāvājums ir noslēgts parakstīts
-Notify_PROPAL_CLOSE_SIGNED_WEB=Customer proposal closed signed on portal page
+Notify_PROPAL_CLOSE_SIGNED_WEB=Klienta piedāvājums aizvērts, parakstīts portāla lapā
 Notify_PROPAL_CLOSE_REFUSED=Klienta iesniegtais piedāvājums ir noraidīts
-Notify_PROPAL_CLOSE_REFUSED_WEB=Customer proposal closed refused on portal page
+Notify_PROPAL_CLOSE_REFUSED_WEB=Klienta piedāvājums slēgts portāla lapā noraidīts
 Notify_PROPAL_SENTBYMAIL=Commercial priekšlikums nosūtīts pa pastu
 Notify_WITHDRAW_TRANSMIT=Pārraides atsaukšana
 Notify_WITHDRAW_CREDIT=Kredīta izņemšana
@@ -213,9 +213,9 @@ EMailTextInvoiceValidated=Rēķins %s ir apstiprināts.
 EMailTextInvoicePayed=Rēķins %s ir samaksāts.
 EMailTextProposalValidated=Priekšlikums %s ir apstiprināts.
 EMailTextProposalClosedSigned=Priekšlikums %s ir slēgts.
-EMailTextProposalClosedSignedWeb=Proposal %s has been closed signed on portal page.
-EMailTextProposalClosedRefused=Proposal %s has been closed refused.
-EMailTextProposalClosedRefusedWeb=Proposal %s has been closed refuse on portal page.
+EMailTextProposalClosedSignedWeb=Priekšlikums %s ir slēgts, parakstīts portāla lapā.
+EMailTextProposalClosedRefused=Priekšlikums %s ir slēgts, noraidīts.
+EMailTextProposalClosedRefusedWeb=Priekšlikums %s ir slēgts, noraidīt portāla lapā.
 EMailTextOrderValidated=Pasūtījums %s ir apstiprināts.
 EMailTextOrderApproved=Pasūtījums %s ir apstiprināts.
 EMailTextOrderValidatedBy=Pasūtījums %s ir reģistrēts ar %s.
diff --git a/htdocs/langs/lv_LV/projects.lang b/htdocs/langs/lv_LV/projects.lang
index dafe30d0ea7..b49871842ac 100644
--- a/htdocs/langs/lv_LV/projects.lang
+++ b/htdocs/langs/lv_LV/projects.lang
@@ -125,8 +125,8 @@ ValidateProject=Apstiprināt projektu
 ConfirmValidateProject=Vai jūs tiešām vēlaties apstiprināt šo projektu?
 CloseAProject=Aizvērt projektu
 ConfirmCloseAProject=Vai tiešām vēlaties aizvērt šo projektu?
-AlsoCloseAProject=Also close project
-AlsoCloseAProjectTooltip=Keep it open if you still need to follow production tasks on it
+AlsoCloseAProject=Arī slēgt projektu
+AlsoCloseAProjectTooltip=Saglabājiet to atvērtu, ja jums joprojām ir jāseko tajā esošajiem ražošanas uzdevumiem
 ReOpenAProject=Atvērt projektu
 ConfirmReOpenAProject=Vai tiešām vēlaties atvērt šo projektu vēlreiz?
 ProjectContact=Projekta kontakti
@@ -169,7 +169,7 @@ OpportunityProbability=Svina varbūtība
 OpportunityProbabilityShort=Svina probabs.
 OpportunityAmount=Svina daudzums
 OpportunityAmountShort=Svina summa
-OpportunityWeightedAmount=Amount of opportunity, weighted by probability
+OpportunityWeightedAmount=Iespējas apjoms, svērts ar varbūtību
 OpportunityWeightedAmountShort=Opp. svērtā summa
 OpportunityAmountAverageShort=Vidējā svina summa
 OpportunityAmountWeigthedShort=Svērtā svina summa
@@ -259,6 +259,7 @@ RecordsClosed=%s projekts (-i) slēgts
 SendProjectRef=Informācijas projekts %s
 ModuleSalaryToDefineHourlyRateMustBeEnabled=Modulam „Algas” ir jābūt iespējai noteikt darbinieku stundas likmi, lai varētu izmantot laiku
 NewTaskRefSuggested=Jau izmantotais uzdevums ir nepieciešams jauns uzdevums
+NumberOfTasksCloned=%s uzdevums(-i) ir klonēti
 TimeSpentInvoiced=Norēķinātais laiks
 TimeSpentForIntervention=Laiks, kas patērēts
 TimeSpentForInvoice=Laiks, kas patērēts
diff --git a/htdocs/langs/lv_LV/salaries.lang b/htdocs/langs/lv_LV/salaries.lang
index 85a3291dcfb..fc725cf2cbb 100644
--- a/htdocs/langs/lv_LV/salaries.lang
+++ b/htdocs/langs/lv_LV/salaries.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - salaries
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Account (from the Chart of Account) used by default for "user" third parties
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated 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=Konts (no kontu plāna), ko pēc noklusējuma izmanto "lietotāja" trešajām pusēm
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=Lietotāja kartē norādītais speciālais konts tiks izmantots tikai Apakšgrāmatas uzskaitei. Šis tiks izmantots Virsgrāmatai un kā apakšvirsgrāmatas uzskaites noklusējuma vērtība, ja lietotājam nav definēts īpašs lietotāja uzskaites konts.
 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
diff --git a/htdocs/langs/lv_LV/stripe.lang b/htdocs/langs/lv_LV/stripe.lang
index 3cb4db99268..d272c1902ed 100644
--- a/htdocs/langs/lv_LV/stripe.lang
+++ b/htdocs/langs/lv_LV/stripe.lang
@@ -41,7 +41,8 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhokas tiešraides atslēga
 ONLINE_PAYMENT_WAREHOUSE=Krājums, ko izmanto, lai krājumu samazinātu, kad tiek veikts tiešsaistes maksājums <br> (TODO Kad iespēja samazināt akciju tiek veikta, veicot darbību rēķinā, un tiešsaistes maksājums pats par sevi sagatavo rēķinu?)
 StripeLiveEnabled=Ieslēgta josla dzīvot (citādi tests / smilškastē režīms)
 StripeImportPayment=Importēšanas joslas maksājumi
-ExampleOfTestCreditCard=Kredītkartes paraugs testam: %s =&gt; derīgs, %s =&gt; kļūda CVC, %s =&gt; beidzies, %s =&gt; maksa neizdodas
+ExampleOfTestCreditCard=Kredītkartes piemērs SEPA pārbaudei: %s => derīga, %s => kļūda CVC, %s => beidzies derīguma termiņš, %s => maksājums neizdodas
+ExampleOfTestBankAcountForSEPA=Bankas konta BAN piemērs tiešā debeta pārbaudei: %s
 StripeGateways=Joslas vārti
 OAUTH_STRIPE_TEST_ID=Stripe Connect klienta ID (ca _...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect klienta ID (ca _...)
@@ -70,5 +71,8 @@ ToOfferALinkForLiveWebhook=Saite uz iestatījumu Stripe WebHook, lai izsauktu IP
 PaymentWillBeRecordedForNextPeriod=Maksājums tiks reģistrēts par nākamo periodu.
 ClickHereToTryAgain=<a href="%s">Noklikšķiniet šeit, lai mēģinātu vēlreiz ...</a>
 CreationOfPaymentModeMustBeDoneFromStripeInterface=Stingro klientu autentifikācijas noteikumu dēļ karte jāizveido no Stripe biroja. Jūs varat noklikšķināt šeit, lai ieslēgtu Stripe klientu ierakstu: %s
-TERMINAL_LOCATION=Termināļu atrašanās vieta (adrese).
+STRIPE_CARD_PRESENT=Stripe termināļiem paredzēta karte
+TERMINAL_LOCATION=Stripe Terminals atrašanās vieta (adrese).
 RequestDirectDebitWithStripe=Pieprasiet tiešo debetu, izmantojot Stripe
+STRIPE_SEPA_DIRECT_DEBIT=Iespējojiet tiešā debeta maksājumus, izmantojot Stripe
+
diff --git a/htdocs/langs/lv_LV/ticket.lang b/htdocs/langs/lv_LV/ticket.lang
index 73bf0ff7ab4..a6e66acef68 100644
--- a/htdocs/langs/lv_LV/ticket.lang
+++ b/htdocs/langs/lv_LV/ticket.lang
@@ -26,6 +26,7 @@ Permission56002=Labot pieteikumus
 Permission56003=Dzēst pieteikumus
 Permission56004=Pieteikumu pārvaldīšana
 Permission56005=Skatīt visu trešo pušu biļetes (nav efektīvas ārējiem lietotājiem, vienmēr aprobežojas ar trešajām personām, no kurām tie ir atkarīgi)
+Permission56006=Eksporta biļetes
 
 Tickets=Pieteikumi
 TicketDictType=Pieteikumu veids
@@ -61,6 +62,8 @@ TypeContact_ticket_external_CONTRIBUTOR=Ārējais ieguldītājs
 OriginEmail=Reportiera e-pasts
 Notify_TICKET_SENTBYMAIL=Sūtīt biļeti pa e-pastu
 
+ExportDataset_ticket_1=Pieteikumi
+
 # Status
 Read=Lasīt
 Assigned=Piešķirts
diff --git a/htdocs/langs/lv_LV/users.lang b/htdocs/langs/lv_LV/users.lang
index 91892cf79ba..8bf8a4dccc5 100644
--- a/htdocs/langs/lv_LV/users.lang
+++ b/htdocs/langs/lv_LV/users.lang
@@ -66,7 +66,8 @@ LinkedToDolibarrUser=Saite uz lietotāju
 LinkedToDolibarrThirdParty=Saite uz trešo pusi
 CreateDolibarrLogin=Izveidot lietotāju
 CreateDolibarrThirdParty=Izveidot trešo pusi
-LoginAccountDisableInDolibarr=Konts bloķēts Dolibarr.
+LoginAccountDisableInDolibarr=Konts ir atspējots Dolibarr
+PASSWORDInDolibarr=Parole mainīta programmā Dolibarr
 UsePersonalValue=Izmantot personisko vērtību
 ExportDataset_user_1=Lietotāji un to īpašības
 DomainUser=Domēna lietotājs %s
@@ -129,3 +130,6 @@ IPLastLogin=IP pēdējā pieteikšanās
 IPPreviousLogin=IP iepriekšējā pieteikšanās
 ShowAllPerms=Rādīt visas atļauju rindas
 HideAllPerms=Slēpt visas atļauju rindas
+UserPublicPageDesc=Šim lietotājam varat iespējot virtuālo karti. Būs pieejams URL ar lietotāja profilu un svītrkodu, lai ikviens, kam ir viedtālrunis, varētu to skenēt un pievienot jūsu kontaktpersonu savai adrešu grāmatai.
+EnablePublicVirtualCard=Iespējot publisko virtuālo lietotāja karti
+PublicVirtualCardUrl=Publiskā virtuālā lietotāja karte
diff --git a/htdocs/langs/lv_LV/website.lang b/htdocs/langs/lv_LV/website.lang
index 5f8211db2d1..1311dd77ad3 100644
--- a/htdocs/langs/lv_LV/website.lang
+++ b/htdocs/langs/lv_LV/website.lang
@@ -155,3 +155,5 @@ WebpageMustBeDisabled=Tīmekļa lapai ir jābūt statusam "%s"
 SetWebsiteOnlineBefore=Kad vietne ir bezsaistē, visas lapas ir bezsaistē. Vispirms mainiet vietnes statusu.
 Booking=Rezervēšana
 Reservation=Rezervācija
+PagesViewedPreviousMonth=Skatītās lapas (iepriekšējā mēnesī)
+PagesViewedTotal=Apskatītās lapas (kopā)
diff --git a/htdocs/langs/lv_LV/withdrawals.lang b/htdocs/langs/lv_LV/withdrawals.lang
index 7b15cbab87b..0ac7f442968 100644
--- a/htdocs/langs/lv_LV/withdrawals.lang
+++ b/htdocs/langs/lv_LV/withdrawals.lang
@@ -33,7 +33,7 @@ InvoiceWaitingPaymentByBankTransfer=Rēķins gaida pārskaitījumu
 AmountToWithdraw=Summa atsaukt
 AmountToTransfer=Pārskaitāmā summa
 NoInvoiceToWithdraw=Par “%s” nav atvērts rēķins. Dodieties uz rēķina kartes cilni '%s', lai iesniegtu pieprasījumu.
-NoSupplierInvoiceToWithdraw=No supplier invoice with open '%s' is waiting. Go on tab '%s' on invoice card to make a request.
+NoSupplierInvoiceToWithdraw=Negaida neviens piegādātāja rēķins ar atvērtu “%s”. Rēķina kartē atveriet cilni “%s”, lai iesniegtu pieprasījumu.
 ResponsibleUser=Lietotājs ir atbildīgs
 WithdrawalsSetup=Tiešā debeta maksājuma iestatīšana
 CreditTransferSetup=Kredīta pārveduma iestatīšana
diff --git a/htdocs/langs/mk_MK/accountancy.lang b/htdocs/langs/mk_MK/accountancy.lang
index 28796600183..99c230dcd11 100644
--- a/htdocs/langs/mk_MK/accountancy.lang
+++ b/htdocs/langs/mk_MK/accountancy.lang
@@ -14,8 +14,8 @@ ACCOUNTING_EXPORT_ENDLINE=Изберете го типот на кодот за
 ACCOUNTING_EXPORT_PREFIX_SPEC=Наведете го префиксот за името на датотеката
 ThisService=Оваа услуга
 ThisProduct=Овој производ
-DefaultForService=Стандардно за услугата
-DefaultForProduct=Стандардно за производот
+DefaultForService=Default for services
+DefaultForProduct=Default for products
 ProductForThisThirdparty=Product for this thirdparty
 ServiceForThisThirdparty=Service for this thirdparty
 CantSuggest=Без предлози
@@ -101,7 +101,8 @@ ShowAccountingAccount=Show accounting account
 ShowAccountingJournal=Show accounting journal
 ShowAccountingAccountInLedger=Show accounting account in ledger
 ShowAccountingAccountInJournals=Show accounting account in journals
-AccountAccountingSuggest=Accounting account suggested
+DataUsedToSuggestAccount=Data used to suggest account
+AccountAccountingSuggest=Account suggested
 MenuDefaultAccounts=Default accounts
 MenuBankAccounts=Bank accounts
 MenuVatAccounts=Vat accounts
@@ -126,6 +127,7 @@ WriteBookKeeping=Record transactions in accounting
 Bookkeeping=Ledger
 BookkeepingSubAccount=Subledger
 AccountBalance=Account balance
+AccountBalanceSubAccount=Sub-accounts balance
 ObjectsRef=Source object ref
 CAHTF=Total purchase vendor before tax
 TotalExpenseReport=Total expense report
@@ -189,6 +191,7 @@ ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Account (from the Chart Of Account) to be us
 UseAuxiliaryAccountOnCustomerDeposit=Store customer account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
 ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Account (from the Chart Of Account) to be used as the default
 UseAuxiliaryAccountOnSupplierDeposit=Store supplier account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
+ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY=Accounting account by default to register customer retained warranty
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased within same country (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased from EEC to another EEC country (used if not defined in the product sheet)
@@ -218,6 +221,7 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Custom group of accounts
+AccountingCategories=Custom groups of accounts
 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.
@@ -265,6 +269,7 @@ ShowSubtotalByGroup=Show subtotal by level
 
 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.
+AccountingCategoriesDesc=Custom group of accounts can be used to group accounting accounts into one name to ease filter use or building of custom reports.
 
 Reconcilable=Reconcilable
 
@@ -294,6 +299,7 @@ DescValidateMovements=Any modification or deletion of writing, lettering and del
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
+DoManualBindingForFailedRecord=You have to do a manual link for the %s row(s) not linked automatically.
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot remove or disable this account of chart of account because it is used
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s & Credit = %s
@@ -337,11 +343,13 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on
 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_ENABLE_LETTERING=Enable the lettering function in the accounting
+ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
 
 ## Export
 NotExportLettering=Do not export the lettering when generating the file
 NotifiedExportDate=Flag exported lines as Exported <span class="warning">(to modify a line, you will need to delete the whole transaction and re-transfert it into accounting)</span>
 NotifiedValidationDate=Validate and Lock the exported entries <span class="warning">(same effect than the "%s" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+NotifiedExportFull=Export documents ?
 DateValidationAndLock=Date validation and lock
 ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Export draft journal
@@ -398,7 +406,7 @@ 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.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the thirdparty, or change the product account suggested for binding if needed.
 ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
 ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
 ## Dictionary
@@ -442,6 +450,7 @@ AccountancyErrorMismatchLetterCode=Mismatch in reconcile code
 AccountancyErrorMismatchBalanceAmount=The balance (%s) is not equal to 0
 AccountancyErrorLetteringBookkeeping=Errors have occurred concerning the transactions: %s
 ErrorAccountNumberAlreadyExists=The accounting number %s already exists
+ErrorArchiveAddFile=Can't put "%s" file in archive
 
 ## Import
 ImportAccountingEntries=Accounting entries
@@ -468,5 +477,7 @@ 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.
 ExpenseReportJournal=Expense Report Journal
+DocsAlreadyExportedAreExcluded=Docs already exported are excluded
+ClickToHideAlreadyExportedLines=Click to hide already exported lines
 
 NAccounts=%s accounts
diff --git a/htdocs/langs/nb_NO/accountancy.lang b/htdocs/langs/nb_NO/accountancy.lang
index c023b1bfdd9..7afcf08cde8 100644
--- a/htdocs/langs/nb_NO/accountancy.lang
+++ b/htdocs/langs/nb_NO/accountancy.lang
@@ -14,8 +14,8 @@ ACCOUNTING_EXPORT_ENDLINE=Velg vognreturtypen
 ACCOUNTING_EXPORT_PREFIX_SPEC=Velg prefiks for filnavnet
 ThisService=Denne tjenesten
 ThisProduct=Denne varen
-DefaultForService=Standard for tjeneste
-DefaultForProduct=Standard for vare
+DefaultForService=Standard for tjenester
+DefaultForProduct=Standard for varer
 ProductForThisThirdparty=Vare for denne tredjeparten
 ServiceForThisThirdparty=Tjeneste for denne tredjeparten
 CantSuggest=Kan ikke foreslå
@@ -101,7 +101,8 @@ ShowAccountingAccount=Vis regnskapskonto
 ShowAccountingJournal=Vis regnskapsjournal
 ShowAccountingAccountInLedger=Vis regnskapskonto i hovedbok
 ShowAccountingAccountInJournals=Vis regnskapskonto i journaler
-AccountAccountingSuggest=Foreslått regnskapskonto
+DataUsedToSuggestAccount=Data brukt til å foreslå konto
+AccountAccountingSuggest=Foreslått konto 
 MenuDefaultAccounts=Standard kontoer
 MenuBankAccounts=Bankkonti
 MenuVatAccounts=MVA-kontoer
@@ -126,6 +127,7 @@ WriteBookKeeping=Registrere transaksjoner i regnskapet
 Bookkeeping=Hovedbok
 BookkeepingSubAccount=Sub-Hovedbok
 AccountBalance=Kontobalanse
+AccountBalanceSubAccount=Underkonto-saldo
 ObjectsRef=Kildeobjekt ref
 CAHTF=Samlet leverandørkjøp før skatt
 TotalExpenseReport=Total utgiftsrapport
@@ -178,31 +180,32 @@ ACCOUNTING_RESULT_PROFIT=Resultatregnskapskonto (fortjeneste)
 ACCOUNTING_RESULT_LOSS=Resultatregnskapskonto (tap)
 ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Avslutningsjournal
 
-ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account (from the Chart Of Account) to be used as the account for transitional bank transfers
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Konto (fra kontoplanen) som skal brukes som konto for overgangs-bankoverføringer
 TransitionalAccount=Overgangsbasert bankoverføringskonto
 
-ACCOUNTING_ACCOUNT_SUSPENSE=Account (from the Chart Of Account) to be used as the account for unallocated funds either received or paid i.e. funds in "wait[ing]"
-DONATION_ACCOUNTINGACCOUNT=Account (from the Chart Of Account) to be used to register donations (Donation module)
-ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Account (from the Chart Of Account) to be used to register memberships subscriptions (Membership module - if membership recorded without invoice)
+ACCOUNTING_ACCOUNT_SUSPENSE=Konto (fra kontoplanen) som skal brukes som konto for ikke-allokerte midler enten mottatt eller betalt, dvs. midler i "venter"
+DONATION_ACCOUNTINGACCOUNT=Konto (fra kontoplanen) som skal brukes til å registrere donasjoner (donasjonsmodul)
+ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Konto (fra kontoplanen) som skal brukes til å registrere medlemskapsabonnementer (Medlemsmodul - hvis medlemskap er registrert uten faktura)
 
-ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Account (from the Chart Of Account) to be used as the default account to register customer deposit
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Konto (fra kontoplanen) som skal brukes som standardkonto for å registrere kundeinnskudd
 UseAuxiliaryAccountOnCustomerDeposit=Lagre kundekonto som individuell konto i hovedbok for linjer med forskuddsbetalinger (hvis den er deaktivert, vil individuell konto for forskuddsbetalingslinjer forbli tom)
-ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Account (from the Chart Of Account) to be used as the default
+ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Konto (fra kontoplanen) som skal brukes som standard
 UseAuxiliaryAccountOnSupplierDeposit=Lagre leverandørkonto som individuell konto i hovedbok for linjer med forskuddsbetalinger (hvis den er deaktivert, vil individuell konto for forskuddslinjer forbli tom)
+ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY=Regnskapskonto som standard for å registrere garantibeløp
 
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased within same country (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased from EEC to another EEC country (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased and imported from any other foreign country (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the sold products (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products sold from EEC to another EEC country (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products sold and exported to any other foreign country (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Konto (fra kontoplanen) som skal brukes som standardkonto for varer kjøpt i samme land (brukes hvis det ikke er definert i varearket)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Konto (fra kontoplanen) som skal brukes som standardkonto for varer kjøpt fra EEC til et annet EEC-land (brukes hvis det ikke er definert i varearket)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Konto (fra kontoplanen) som skal brukes som standardkonto for varer som er kjøpt og importert fra andre land (brukes hvis det ikke er definert i produktarket)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Konto (fra kontoplanen) som skal brukes som standardkonto for de solgte produktene (brukes hvis det ikke er definert i varearket)
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Konto (fra kontoplanen) som skal brukes som standardkonto for varer som selges fra EEC til et annet EEC-land (brukes hvis det ikke er definert i varearket)
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Konto (fra kontoplanen) som skal brukes som standardkonto for varer som selges og eksporteres til et hvilket som helst annet land (brukes hvis det ikke er definert i produktarket)
 
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the services purchased within same country (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the services purchased from EEC to another EEC country (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the services purchased and imported from other foreign country (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the sold services (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the services sold from EEC to another EEC country (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the services sold and exported to any other foreign country (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Konto (fra kontoplanen) som skal brukes som standardkonto for tjenester kjøpt i samme land (brukes hvis det ikke er definert i tjenestearket)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Konto (fra kontoplanen) som skal brukes som standardkonto for tjenestene kjøpt fra EEC til et annet EEC-land (brukes hvis det ikke er definert i tjenestearket)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Konto (fra kontoplanen) som skal brukes som standardkonto for tjenestene kjøpt og importert fra andre land (brukes hvis det ikke er definert i tjenestearket)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Konto (fra kontoplanen) som skal brukes som standardkonto for de solgte tjenestene (brukes hvis det ikke er definert i servicearket)
+ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Konto (fra kontoplanen) som skal brukes som standardkonto for tjenestene som selges fra EEC til et annet EEC-land (brukes hvis det ikke er definert i tjenestearket)
+ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Konto (fra kontoplanen) som skal brukes som standardkonto for tjenestene som selges og eksporteres til et hvilket som helst annet land (brukes hvis det ikke er definert i tjenestearket)
 
 Doctype=Dokumenttype
 Docdate=Dato
@@ -217,7 +220,8 @@ Codejournal=Journal
 JournalLabel=Journaletikett
 NumPiece=Del nummer
 TransactionNumShort=Transaksjonsnummer
-AccountingCategory=Custom group of accounts
+AccountingCategory=Egendefinert gruppe med kontoer
+AccountingCategories=Egendefinerte grupper av kontoer
 GroupByAccountAccounting=Gruppere etter hovedbokskonto
 GroupBySubAccountAccounting=Gruppere etter sub-hovedbokskonto
 AccountingAccountGroupsDesc=Her kan du definere noen grupper regnskapskonti. De vil bli brukt til personlige regnskapsrapporter.
@@ -265,19 +269,20 @@ ShowSubtotalByGroup=Vis subtotal etter nivå
 
 Pcgtype=Kontogruppe
 PcgtypeDesc=Kontogruppe brukes som forhåndsdefinerte 'filter' og 'gruppering' kriterier for noen regnskapsrapporter. For eksempel blir 'INNTEKT' eller 'UTGIFT' brukt som grupper for regnskapsføring av varer for å lage utgifts-/inntektsrapporten.
+AccountingCategoriesDesc=Egendefinert gruppe med kontoer kan brukes til å gruppere regnskapskontoer i ett navn for å lette filterbruk eller bygging av tilpassede rapporter.
 
 Reconcilable=Kan avstemmes
 
 TotalVente=Total omsetning før skatt
 TotalMarge=Total salgsmargin
 
-DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product account from chart of account
-DescVentilMore=In most cases, if you use predefined products or services and you set the account (from chart of account) 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 account from chart of account
-DescVentilTodoCustomer=Bind invoice lines not already bound with a product account from chart of account
-ChangeAccount=Change the product/service account (from chart of account) for the selected lines with the following account:
+DescVentilCustomer=Liste over kundefakturalinjer bundet (eller ikke) til en produktkonto fra kontoplan
+DescVentilMore=I de fleste tilfeller, hvis du bruker forhåndsdefinerte produkter eller tjenester og du setter kontoen (fra kontoplan) på produkt-/tjenestekortet, vil applikasjonen kunne gjøre all bindingen mellom dine fakturalinjer og regnskapskontoen til dine kontoer, bare med ett klikk med knappen <strong> "%s" </strong> . Hvis konto ikke ble satt på vare-/tjenestekort eller hvis du fortsatt har noen linjer som ikke er bundet til en konto, må du gjøre en manuell binding fra menyen " <strong> %s </strong> ".
+DescVentilDoneCustomer=Liste over linjene med fakturakunder og deres produktkonto fra kontoplan
+DescVentilTodoCustomer=Bind fakturalinjer som ikke allerede er bundet til en varekonto fra kontoplan
+ChangeAccount=Endre vare-/tjenestekontoen (fra kontoplanen) for de valgte linjene med følgende konto:
 Vide=-
-DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product account from chart of account (only record not already transfered in accountancy are visible)
+DescVentilSupplier=Liste over leverandørfakturalinjer som er bundet eller ennå ikke bundet til en produktkonto fra kontoplan (bare post som ikke allerede er overført i regnskap er synlig)
 DescVentilDoneSupplier=Liste over linjene med leverandørfakturaer og deres regnskapskonto
 DescVentilTodoExpenseReport=Bind utgiftsrapport-linjer til en gebyr-regnskapskonto
 DescVentilExpenseReport=Liste over utgiftsrapport-linjer bundet (eller ikke) til en gebyr-regnskapskonto
@@ -294,15 +299,16 @@ DescValidateMovements=Enhver modifisering eller fjerning av skriving, bokstaver
 
 ValidateHistory=Bind automatisk
 AutomaticBindingDone=Automatiske bindinger utført (%s) - Automatisk binding er ikke mulig for enkelte poster (%s)
+DoManualBindingForFailedRecord=Du må gjøre en manuell kobling for %s rad(er) som ikke kobles automatisk.
 
-ErrorAccountancyCodeIsAlreadyUse=Error, you cannot remove or disable this account of chart of account because it is used
+ErrorAccountancyCodeIsAlreadyUse=Feil, du kan ikke fjerne eller deaktivere denne kontoplanen fordi den er i bruk
 MvtNotCorrectlyBalanced=Bevegelsen er ikke riktig balansert. Debet = %s & kreditt = %s
 Balancing=Balansering
 FicheVentilation=Binding-kort
 GeneralLedgerIsWritten=Transaksjoner blir skrevet inn i hovedboken
 GeneralLedgerSomeRecordWasNotRecorded=Noen av transaksjonene kunne ikke journalføres. Hvis det ikke er noen annen feilmelding, er dette trolig fordi de allerede var journalført.
 NoNewRecordSaved=Ingen flere poster å overføre
-ListOfProductsWithoutAccountingAccount=List of products not bound to any account of chart of account
+ListOfProductsWithoutAccountingAccount=Liste over varer som ikke er bundet til noen konto eller kontoplan
 ChangeBinding=Endre bindingen
 Accounted=Regnskapsført i hovedbok
 NotYetAccounted=Foreløpig ikke overført til regnskap
@@ -337,11 +343,13 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=Deaktiver binding og overføring til regnska
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Deaktiver binding og overføring til regnskap ved kjøp (leverandørfakturaer blir ikke tatt med i regnskapet)
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Deaktiver binding og overføring til regnskap på utgiftsrapporter (utgiftsrapporter blir ikke tatt med i regnskapet)
 ACCOUNTING_ENABLE_LETTERING=Aktiver bokstavfunksjonen i regnskapet
+ACCOUNTING_ENABLE_AUTOLETTERING=Aktiver automatisk skriving ved overføring til regnskap
 
 ## Export
 NotExportLettering=Ikke eksporter bokstaver når du genererer filen
 NotifiedExportDate=Flagg eksporterte linjer som eksportert <span class="warning"> (for å endre en linje, må du slette hele transaksjonen og overføre den til regnskapet på nytt) </span>
 NotifiedValidationDate=Valider og lås de eksporterte oppføringene <span class="warning"> (samme effekt som "%s"-funksjonen, modifikasjon og sletting av linjene vil DEFINITIVT ikke være mulig) </span>
+NotifiedExportFull=Eksportere dokumenter?
 DateValidationAndLock=Datovalidering og lås
 ConfirmExportFile=Bekreftelse på generering av regnskapseksportfilen ?
 ExportDraftJournal=Eksporter utkastjournal
@@ -398,7 +406,7 @@ SaleLocal=Lokalt salg
 SaleExport=Eksportsalg
 SaleEEC=Salg i EU
 SaleEECWithVAT=Salg i EU med mva som ikke er null, så vi antar at dette IKKE er et intra-EU salg og den foreslåtte kontoen er standard produktkonto.
-SaleEECWithoutVATNumber=Salg i EU uten mva, men mva-ID for tredjepart er ikke definert. Vi faller tilbake på produktkontoen for standard salg. Du kan fikse mva-ID for tredjepart eller produktkonto om nødvendig.
+SaleEECWithoutVATNumber=Salg i EEC uten MVA, men MVA-ID-en til tredjepart er ikke definert. Vi faller tilbake på kontoen for standardsalg. Du kan fikse MVA-ID-en til tredjeparten, eller endre produktkontoen som foreslås for binding om nødvendig.
 ForbiddenTransactionAlreadyExported=Ikke tillatt: Transaksjonen er validert og/eller eksportert.
 ForbiddenTransactionAlreadyValidated=Ikke tillatt: Transaksjonen er validert.
 ## Dictionary
@@ -442,6 +450,7 @@ AccountancyErrorMismatchLetterCode=Uoverensstemmelse i avstemmingskode
 AccountancyErrorMismatchBalanceAmount=Saldoen (%s) er ikke lik 0
 AccountancyErrorLetteringBookkeeping=Det har oppstått feil angående transaksjonene: %s
 ErrorAccountNumberAlreadyExists=Kontonummeret %s eksisterer allerede
+ErrorArchiveAddFile=Kan ikke legge "%s"-filen i arkivet
 
 ## Import
 ImportAccountingEntries=Regnskapsposter
@@ -468,5 +477,7 @@ FECFormatMulticurrencyCode=Flervalutakode (Idevise)
 DateExport=Dato eksport
 WarningReportNotReliable=Advarsel, denne rapporten er ikke basert på hovedboken, så den inneholder ikke transaksjoner endret manuelt i hovedboken. Hvis journaliseringen din er oppdatert, er bokføringsvisningen mer nøyaktig.
 ExpenseReportJournal=Utgiftsrapport-journal
+DocsAlreadyExportedAreExcluded=Dokumenter som allerede er eksportert, er ekskludert
+ClickToHideAlreadyExportedLines=Klikk for å skjule allerede eksporterte linjer
 
 NAccounts=%s kontoer
diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang
index 629a1110623..cd5f19e37ed 100644
--- a/htdocs/langs/nb_NO/admin.lang
+++ b/htdocs/langs/nb_NO/admin.lang
@@ -645,6 +645,8 @@ Module2300Name=Planlagte jobber
 Module2300Desc=Planlagt jobbadministrasjon (alias cron- eller chronotabell)
 Module2400Name=Hendelser/Agenda
 Module2400Desc=Spor hendelser. Logg automatisk hendelser for sporingsformål eller registrer manuelle hendelser eller møter. Dette er hovedmodulen for håndtering av gode kunde- eller leverandørforhold.
+Module2430Name=Bestilling kalendersystem
+Module2430Desc=Gi en online-kalender slik at alle kan bestille treff, i henhold til forhåndsdefinerte områder eller tilgjengeligheter.
 Module2500Name=DMS / ECM
 Module2500Desc=Dokumenthåndteringssystem / Elektronisk innholdshåndtering. Automatisk organisering av dine genererte eller lagrede dokumenter. Del dem når du trenger det.
 Module2600Name=API / webtjenester (SOAP-server)
@@ -660,6 +662,8 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind konverteringsegenskaper
 Module3200Name=Uforanderlige arkiver
 Module3200Desc=Aktiver en uforanderlig logg over forretningshendelser. Hendelser arkiveres i sanntid. Loggen er en skrivebeskyttet tabell med kjedede hendelser som kan eksporteres. Denne modulen kan være obligatorisk for enkelte land.
+Module3300Name=Modulbygger
+Module3200Desc=Aktiver en uforanderlig logg over forretningshendelser. Hendelser arkiveres i sanntid. Loggen er en skrivebeskyttet tabell med kjedede hendelser som kan eksporteres. Denne modulen kan være obligatorisk for enkelte land.
 Module3400Name=Sosiale nettverk
 Module3400Desc=Aktiver felt for sosiale nettverk i tredjeparter og adresser (skype, twitter, facebook, ...).
 Module4000Name=HRM
@@ -974,14 +978,14 @@ Permission3301=Generer nye moduler
 Permission4001=Les ferdighet/jobb/stilling
 Permission4002=Opprett/endre ferdigheter/jobb/stilling
 Permission4003=Slett ferdighet/jobb/stilling
-Permission4021=Read evaluations (yours and your subordinates)
-Permission4022=Create/modify evaluations
+Permission4021=Les evalueringer (dine og dine underordnede)
+Permission4022=Opprette/endre evalueringer
 Permission4023=Valider evaluering
 Permission4025=Slett evaluering
 Permission4028=Se sammenligningsmeny
 Permission4031=Les personlig informasjon
 Permission4032=Skriv personlig informasjon
-Permission4033=Read all evaluations (even those of user not subordinates)
+Permission4033=Les alle evalueringer (selv de av brukere som ikke er underordnede)
 Permission10001=Les nettstedsinnhold
 Permission10002=Opprett/endre innhold på nettstedet (html og javascript innhold)
 Permission10003=Opprett/endre nettstedsinnhold (dynamisk PHP-kode). Farlig, må reserveres for erfarne utviklere.
@@ -1270,6 +1274,7 @@ TriggerActiveAsModuleActive=Utløserne i denne filen er slått på ettersom modu
 GeneratedPasswordDesc=Velg metoden som skal brukes til automatisk genererte passord.
 DictionaryDesc=Sett alle referansedata. Du kan legge til dine verdier som standard.
 ConstDesc=Denne siden lar deg redigere (overstyre) parametere som ikke er tilgjengelige på andre sider. Dette er for det meste reserverte parametere for utviklere/avansert feilsøking.
+MiscellaneousOptions=Diverse alternativer
 MiscellaneousDesc=Alle andre sikkerhetsrelaterte parametre er definert her.
 LimitsSetup=Grenser/presisjon
 LimitsDesc=Her angir du grenser og presisjon som skal brukes i programmet
@@ -1303,7 +1308,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=Du må kjøre denne kommandoen
 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
-SimpleRefNumRefModelDesc=Returns the reference number in the format n where n is a sequential auto-incrementing number with no reset
+SimpleRefNumRefModelDesc=Returnerer referansenummeret i formatet n der n er et sekvensielt automatisk økende tall uten tilbakestilling
 AdvancedNumRefModelDesc=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=Returnerer referansenummeret i formatet %s-nnnn der nnnn er et sekvensielt automatisk økende tall uten tilbakestilling
 ShowProfIdInAddress=Vis profesjonell ID med adresser
@@ -1391,7 +1396,7 @@ GetBarCode=Hent strekkode
 NumberingModules=Nummereringsmodeller
 DocumentModules=Dokumentmodeller
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters.
+PasswordGenerationStandard=Returner et passord generert i henhold til intern Dolibarr-algoritme: %s tegn som inneholder både tall og tegn.
 PasswordGenerationNone=Ikke foreslå å generere passord. Passord må legges inn manuelt.
 PasswordGenerationPerso=Returner et passord i følge din personlige konfigurasjon
 SetupPerso=I følge din konfigurasjon
@@ -1445,10 +1450,10 @@ SuppliersPayment=Leverandørbetalinger
 SupplierPaymentSetup=Oppsett av leverandørbetaling 
 InvoiceCheckPosteriorDate=Sjekk fakturadato før validering
 InvoiceCheckPosteriorDateHelp=Validering av en faktura vil være forbudt hvis datoen er foran datoen for siste faktura av samme type.
-InvoiceOptionCategoryOfOperations=Display the mention "category of operations" on the invoice.
-InvoiceOptionCategoryOfOperationsHelp=Depending on the situation, the mention will appear in the form:<br>- Category of operations: Delivery of goods<br>- Category of operations: Provision of services<br>- Category of operations: Mixed - Delivery of goods & provision of services
-InvoiceOptionCategoryOfOperationsYes1=Yes, below the address block
-InvoiceOptionCategoryOfOperationsYes2=Yes, in the lower left-hand corner
+InvoiceOptionCategoryOfOperations=Vis omtale "kategori av operasjoner" på fakturaen.
+InvoiceOptionCategoryOfOperationsHelp=Avhengig av situasjonen vil omtalen vises i formen: <br> - Driftskategori: Varelevering <br> - Driftskategori: Tjenester <br> - Driftskategori: Blandet og levering av tjenester
+InvoiceOptionCategoryOfOperationsYes1=Ja, under adresseblokken
+InvoiceOptionCategoryOfOperationsYes2=Ja, i nedre venstre hjørne
 ##### Proposals #####
 PropalSetup=Oppsett av modulen Tilbud
 ProposalsNumberingModules=Nummereringsmodul for tilbud
@@ -1491,12 +1496,12 @@ WatermarkOnDraftContractCards=Vannmerke på kontraktkladder (ingen hvis tom)
 ##### Members #####
 MembersSetup=Oppsett av medlemsmodul
 MemberMainOptions=Hovedinnstillinger
-MemberCodeChecker=Options for automatic generation of member codes
+MemberCodeChecker=Alternativer for automatisk generering av medlemskoder
 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=Opprett en ekstern brukerpålogging for hvert nytt medlemsabonnement som valideres
-VisitorCanChooseItsPaymentMode=Visitor can choose from any available payment modes
+VisitorCanChooseItsPaymentMode=Besøkende kan velge mellom alle 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
 ##### LDAP setup #####
@@ -1826,6 +1831,9 @@ AGENDA_USE_EVENT_TYPE=Bruk hendelsestyper (administrert i menyoppsett -> Ordbøk
 AGENDA_USE_EVENT_TYPE_DEFAULT=Angi denne standardverdien automatisk for type hendelse i skjema for hendelsesoppretting
 AGENDA_DEFAULT_FILTER_TYPE=Still inn denne typen hendelse automatisk i søkefilter i agendavisning
 AGENDA_DEFAULT_FILTER_STATUS=Angi denne status automatisk for hendelser i søkefilter i agendavisning
+AGENDA_EVENT_PAST_COLOR=Farge på tidligere hendelser
+AGENDA_EVENT_CURRENT_COLOR=Gjeldende hendelsesfarge
+AGENDA_EVENT_FUTURE_COLOR=Farge på fremtiden
 AGENDA_DEFAULT_VIEW=Hvilken visning vil du åpne som standard når du velger menyen Agenda
 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
@@ -2129,6 +2137,7 @@ CodeLastResult=Siste resultatkode
 NbOfEmailsInInbox=Antall e-poster i kildemappen
 LoadThirdPartyFromName=Legg inn tredjepartsøk på %s (bare innlasting)
 LoadThirdPartyFromNameOrCreate=Legg inn tredjepartsøk på %s (opprett hvis ikke funnet)
+LoadContactFromEmailOrCreate=Last inn kontaktsøk på %s (opprett hvis ikke funnet)
 AttachJoinedDocumentsToObject=Lagre vedlagte filer i objektdokumenter hvis en ref for et objekt blir funnet i e-postemne.
 WithDolTrackingID=Melding fra en samtale initiert av en første e-post sendt fra Dolibarr
 WithoutDolTrackingID=Melding fra en samtale initiert av en første e-post IKKE sendt fra Dolibarr
@@ -2232,12 +2241,12 @@ MailToPartnership=Partnerskap
 AGENDA_EVENT_DEFAULT_STATUS=Standard hendelsesstatus når du oppretter en hendelse fra skjemaet
 YouShouldDisablePHPFunctions=Du bør deaktivere PHP-funksjoner
 IfCLINotRequiredYouShouldDisablePHPFunctions=Bortsett fra hvis du trenger å kjøre systemkommandoer i tilpasset kode, bør du deaktivere PHP-funksjoner
-PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an antivirus program), you must keep PHP functions
+PHPFunctionsRequiredForCLI=For skallformål (som planlagt jobbsikkerhetskopiering eller å kjøre et antivirusprogram), må du beholde PHP-funksjoner
 NoWritableFilesFoundIntoRootDir=Ingen skrivbare filer eller kataloger for de vanlige programmene ble funnet i rotkatalogen din (Bra)
 RecommendedValueIs=Anbefalt: %s
 Recommended=Anbefalt
 NotRecommended=Ikke anbefalt
-ARestrictedPath=Some restricted path for data files
+ARestrictedPath=Noen begrenset bane for datafiler
 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
@@ -2353,5 +2362,7 @@ DesktopsAndSmartphones=Stasjonære datamaskiner og smarttelefoner
 AllowOnlineSign=Tillat nettsignering
 AllowExternalDownload=Tillat ekstern nedlasting (uten pålogging, ved hjelp av en delt lenke)
 DeadlineDayVATSubmission=Frist for innbetaling av MVA neste måned
-MaxNumberOfAttachementOnForms=Max number of joinded files in a form
-IfDefinedUseAValueBeetween=If defined, use a value between %s and %s
+MaxNumberOfAttachementOnForms=Maks antall sammenføyde filer i et skjema
+IfDefinedUseAValueBeetween=Hvis definert, bruk en verdi mellom %s og %s
+Reload=Last inn på nytt
+ConfirmReload=Bekreft modulinnlasting
diff --git a/htdocs/langs/nb_NO/agenda.lang b/htdocs/langs/nb_NO/agenda.lang
index 50a33ea54ae..be3715279f4 100644
--- a/htdocs/langs/nb_NO/agenda.lang
+++ b/htdocs/langs/nb_NO/agenda.lang
@@ -68,7 +68,7 @@ ShipmentBackToDraftInDolibarr=Sett levering %s tilbake til utkaststatus
 ShipmentDeletedInDolibarr=Leveranse %s slettet
 ShipmentCanceledInDolibarr=Forsendelse %s kansellert
 ReceptionValidatedInDolibarr=Mottak %s validert
-ReceptionDeletedInDolibarr=Reception %s deleted
+ReceptionDeletedInDolibarr=Mottak %s slettet
 ReceptionClassifyClosedInDolibarr=Mottaket %s klassifisert stengt
 OrderCreatedInDolibarr=Ordre %s opprettet
 OrderValidatedInDolibarr=Ordre %s validert
diff --git a/htdocs/langs/nb_NO/bills.lang b/htdocs/langs/nb_NO/bills.lang
index d6f6fc1dfde..174b0f5b1fd 100644
--- a/htdocs/langs/nb_NO/bills.lang
+++ b/htdocs/langs/nb_NO/bills.lang
@@ -627,7 +627,7 @@ SendEmailsRemindersOnInvoiceDueDate=Send påminnelse på epost for ubetalte fakt
 MakePaymentAndClassifyPayed=Registrer betaling
 BulkPaymentNotPossibleForInvoice=Massebetaling er ikke mulig for faktura %s (feil type eller status)
 MentionVATDebitOptionIsOn=Mulighet for å betale skatt basert på debet
-MentionCategoryOfOperations=Category of operations
-MentionCategoryOfOperations0=Delivery of goods
-MentionCategoryOfOperations1=Provision of services
-MentionCategoryOfOperations2=Mixed - Delivery of goods & provision of services
+MentionCategoryOfOperations=Kategori av operasjoner
+MentionCategoryOfOperations0=Varelevering
+MentionCategoryOfOperations1=Levering av tjenester
+MentionCategoryOfOperations2=Blandet - Levering av varer og levering av tjenester
diff --git a/htdocs/langs/nb_NO/boxes.lang b/htdocs/langs/nb_NO/boxes.lang
index 43a1dccd065..bc746e7a8be 100644
--- a/htdocs/langs/nb_NO/boxes.lang
+++ b/htdocs/langs/nb_NO/boxes.lang
@@ -24,6 +24,7 @@ BoxFicheInter=Siste intervensjoner
 BoxCurrentAccounts=Åpne kontobalanse
 BoxTitleMemberNextBirthdays=Fødselsdager denne måneden (medlemmer)
 BoxTitleMembersByType=Medlemmer etter type og status
+BoxTitleMembersByTags=Medlemmer etter merker og status
 BoxTitleMembersSubscriptionsByYear=Medlemsabonnement etter år
 BoxTitleLastRssInfos=Siste %s nyheter fra %s
 BoxTitleLastProducts=Varer/Tjenester: siste %s endret
@@ -44,10 +45,10 @@ BoxTitleSupplierOrdersAwaitingReception=Leverandørordre avventer mottak
 BoxTitleLastModifiedContacts=Kontakter/Adresser: Siste %s endret
 BoxMyLastBookmarks=Bokmerker: siste %s
 BoxOldestExpiredServices=Eldste aktive utløpte tjenester
-BoxOldestActions=Oldest events to do
+BoxOldestActions=Eldste arrangementer å utføre
 BoxLastExpiredServices=Siste %s eldste kontakter med aktive, utgåtte tjenseter
 BoxTitleLastActionsToDo=Siste %s handlinger å utføre
-BoxTitleOldestActionsToDo=Oldest %s events to do, not completed
+BoxTitleOldestActionsToDo=Eldste %s hendelser å utføre, ikke fullført
 BoxTitleLastContracts=Siste %s kontrakter som ble endret
 BoxTitleLastModifiedDonations=Siste %s donasjoner som ble endret
 BoxTitleLastModifiedExpenses=Siste %s utgiftsrapporter som ble endret
diff --git a/htdocs/langs/nb_NO/companies.lang b/htdocs/langs/nb_NO/companies.lang
index 6e92a231b3f..52a29d445af 100644
--- a/htdocs/langs/nb_NO/companies.lang
+++ b/htdocs/langs/nb_NO/companies.lang
@@ -47,33 +47,33 @@ Subsidiaries=Datterselskaper
 ReportByMonth=Rapport per måned
 ReportByCustomers=Rapport per kunde
 ReportByThirdparties=Rapporter per tredjepart
-ReportByQuarter=Report per rate
+ReportByQuarter=Rapport per takst
 CivilityCode=Civility code (ikke i Norge)
 RegisteredOffice=Registered office (ikke i Norge)
 Lastname=Etternavn
 Firstname=Fornavn
 RefEmployee=Ansatt referanse
-NationalRegistrationNumber=National registration number
+NationalRegistrationNumber=Nasjonalt registreringsnummer
 PostOrFunction=Stilling
 UserTitle=Tittel
 NatureOfThirdParty=Tredjeparts art
 NatureOfContact=Kontaktens art
 Address=Adresse
 State=Fylke(delstat)
-StateId=State ID
+StateId=Stats-ID
 StateCode=Stat-/provinskode
 StateShort=Stat
 Region=Region
 Region-State=Region - Stat
 Country=Land
 CountryCode=Landskode
-CountryId=Country ID
+CountryId=Land-ID
 Phone=Telefon
 PhoneShort=Telefon
 Skype=Skype
 Call=Ring
 Chat=Chat
-PhonePro=Bus. phone
+PhonePro=Firmatelefon
 PhonePerso=Tlf. privat
 PhoneMobile=Tlf. mobil
 No_Email=Avvis masse-e-post
@@ -162,16 +162,16 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
-ProfId1CM=Id. prof. 1 (Trade Register)
-ProfId2CM=Id. prof. 2 (Taxpayer No.)
-ProfId3CM=Id. prof. 3 (No. of creation decree)
-ProfId4CM=Id. prof. 4 (Deposit certificate No.)
-ProfId5CM=Id. prof. 5 (Others)
+ProfId1CM=ID. prof. 1 (handelsregister)
+ProfId2CM=ID. prof. 2 (skattyter nr.)
+ProfId3CM=ID. prof. 3 (Nr. opprettelsesdekret)
+ProfId4CM=ID. prof. 4 (Innskuddsbevis nr.)
+ProfId5CM=ID. prof. 5 (Annet)
 ProfId6CM=-
 ProfId1ShortCM=Handelsregister
-ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=No. of creation decree
-ProfId4ShortCM=Deposit certificate No.
+ProfId2ShortCM=Skattebetaler nr.
+ProfId3ShortCM=Ant. opprettelsesdekret
+ProfId4ShortCM=Innskuddsbevis nr.
 ProfId5ShortCM=Andre
 ProfId6ShortCM=-
 ProfId1CO=Prof ID 1 (RUT)
@@ -291,7 +291,7 @@ ProfId6RU=-
 ProfId1UA=Prof Id 1 (EDRPOU)
 ProfId2UA=Prof Id 2 (DRFO)
 ProfId3UA=Prof Id 3 (INN)
-ProfId4UA=Prof Id 4 (Certificate)
+ProfId4UA=Prof Id 4 (sertifikat)
 ProfId5UA=Prof Id 5 (RNOKPP)
 ProfId6UA=Prof Id 6 (TRDPAU)
 ProfId1DZ=RC
@@ -312,12 +312,12 @@ CustomerRelativeDiscountShort=Relativ rabatt
 CustomerAbsoluteDiscountShort=Absolutt rabatt
 CompanyHasRelativeDiscount=Denne kunden har en rabatt på <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Denne kunden har ingen relative rabatter angitt
-HasRelativeDiscountFromSupplier=Du har en standardrabatt på <b> %s%% </b> fra denne leverandøren
-HasNoRelativeDiscountFromSupplier=Du har ingen standard relativ rabatt fra denne leverandøren
+HasRelativeDiscountFromSupplier=Du har en standardrabatt på <b> %s%% </b> hos denne leverandøren
+HasNoRelativeDiscountFromSupplier=Ingen standard relativ rabatt hos denne leverandøren
 CompanyHasAbsoluteDiscount=Denne kunden har rabatter tilgjengelig (kreditnotaer eller nedbetalinger) for <b> %s </b> %s
 CompanyHasDownPaymentOrCommercialDiscount=Denne kunden har rabatt tilgjengelig (tilbud, nedbetalinger) for <b>%s</b>%s
 CompanyHasCreditNote=Denne kunden har fortsatt kreditnotaer for <b>%s %s</b>
-HasNoAbsoluteDiscountFromSupplier=Du har ingen rabatt tilgjengelig fra denne leverandøren
+HasNoAbsoluteDiscountFromSupplier=Ingen rabatt/kreditt tilgjengelig fra denne leverandøren
 HasAbsoluteDiscountFromSupplier=Du har rabatter tilgjengelig (kreditnotaer eller nedbetalinger) for <b> %s </b> %s fra denne leverandøren
 HasDownPaymentOrCommercialDiscountFromSupplier=Du har rabatter tilgjengelig (kommersielle, nedbetalinger) for <b> %s </b> %s fra denne leverandøren
 HasCreditNoteFromSupplier=Du har kreditnotater for <b> %s </b> %s fra denne leverandøren
@@ -444,7 +444,7 @@ AddAddress=Legg til adresse
 SupplierCategory=Leverandør kategori
 JuridicalStatus200=Uavhengig
 DeleteFile=Slett fil
-ConfirmDeleteFile=Er du sikker på at du vil slette denne filen?
+ConfirmDeleteFile=Er du sikker på at du vil slette denne filen <b> %s </b>?
 AllocateCommercial=Tildelt salgsrepresentant
 Organization=Organisasjon
 FiscalYearInformation=Regnskapsår
@@ -498,3 +498,8 @@ RestOfEurope=Resten av Europa (EU)
 OutOfEurope=Ut av Europa (EU)
 CurrentOutstandingBillLate=Nåværende utestående regning sen
 BecarefullChangeThirdpartyBeforeAddProductToInvoice=Vær forsiktig, avhengig av varepris-innstillingene dine, bør du endre tredjepart før du legger produktet til POS.
+EmailAlreadyExistsPleaseRewriteYourCompanyName=epost eksisterer allerede, skriv om firmanavnet ditt
+TwoRecordsOfCompanyName=Det finnes mer enn én post for dette selskapet, vennligst kontakt oss for å fullføre partnerskapsforespørselen din
+CompanySection=Selskapsseksjon
+ShowSocialNetworks=Vis sosiale nettverk
+HideSocialNetworks=Skjul sosiale nettverk
diff --git a/htdocs/langs/nb_NO/compta.lang b/htdocs/langs/nb_NO/compta.lang
index a1bcfe315fe..a3bb0f6e765 100644
--- a/htdocs/langs/nb_NO/compta.lang
+++ b/htdocs/langs/nb_NO/compta.lang
@@ -246,12 +246,12 @@ TurnoverPerProductInCommitmentAccountingNotRelevant=Rapporten om omsetning samle
 TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=Rapporten om omsetning samlet per MVA-sats er ikke tilgjengelig. Denne rapporten er kun tilgjengelig for omsetning fakturert.
 CalculationMode=Kalkuleringsmodus
 AccountancyJournal=Regnskapskode journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for VAT on purchases (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_PAY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Account (from the Chart Of Account) used for "customer" third parties
+ACCOUNTING_VAT_SOLD_ACCOUNT=Konto (fra kontoplanen) som skal brukes som standardkonto for MVA på salg (brukes hvis det ikke er definert i MVA-ordbokoppsettet)
+ACCOUNTING_VAT_BUY_ACCOUNT=Konto (fra kontoplanen) som skal brukes som standardkonto for MVA på kjøp (brukes hvis det ikke er definert i MVA-ordbokoppsettet)
+ACCOUNTING_VAT_PAY_ACCOUNT=Konto (fra kontoplanen) som skal brukes som standardkonto for betaling av MVA
+ACCOUNTING_ACCOUNT_CUSTOMER=Konto (fra kontoplanen) brukt for "kunde" tredjeparter
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Den dedikerte regnskapskontoen som er definert på tredjepartskort, vil kun bli brukt til subledger. Denne vil bli brukt til hovedboken og som standardverdi av Subledger-regnskap hvis dedikert kundekonto på tredjepart ikke er definert.
-ACCOUNTING_ACCOUNT_SUPPLIER=Account (from the Chart of Account) used for the "vendor" third parties
+ACCOUNTING_ACCOUNT_SUPPLIER=Konto (fra kontoplanen) brukt for "leverandørens" tredjeparter
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Den dedikerte regnskapskonto som er definert på tredjepartskort, vil kun bli brukt til subledger. Denne vil bli brukt til hovedboken og som standardverdi for Subledger-regnskap hvis dedikert leverandørkonto på tredjepart ikke er definert.
 ConfirmCloneTax=Bekreft kloning av skatt/avgiftsbetaling
 ConfirmCloneVAT=Bekreft kloning av MVA-deklarasjon
diff --git a/htdocs/langs/nb_NO/errors.lang b/htdocs/langs/nb_NO/errors.lang
index 660ade0e83c..42d4270db4a 100644
--- a/htdocs/langs/nb_NO/errors.lang
+++ b/htdocs/langs/nb_NO/errors.lang
@@ -303,6 +303,7 @@ ErrorValueForTooLow=Verdien for <b> %s </b> er for lav
 ErrorValueCantBeNull=Verdien for <b> %s </b> kan ikke være null
 ErrorDateOfMovementLowerThanDateOfFileTransmission=Datoen for banktransaksjonen kan ikke være lavere enn datoen for filoverføringen
 ErrorTooMuchFileInForm=For mange filer i skjemaet, maksimalt antall er %s fil(er)
+ErrorSessionInvalidatedAfterPasswordChange=Økten ble ugyldig etter endring av passord, status eller gyldighetsdato. Logg på på nytt.
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=PHP-parameteren upload_max_filesize (%s) er høyere enn PHP-parameteren post_max_size (%s). Dette er ikke et konsistent oppsett.
@@ -325,6 +326,7 @@ WarningPaymentDateLowerThanInvoiceDate=Betalingsdato (%s) er tidligere enn faktu
 WarningTooManyDataPleaseUseMoreFilters=For mange data (mer enn %s linjer). Bruk flere filtre eller sett konstanten %s til en høyere grense.
 WarningSomeLinesWithNullHourlyRate=Noen tider ble registrert av noen brukere mens deres timepris ikke var definert. En verdi på 0 %s pr. time ble brukt, men dette kan føre til feil verdivurdering av tidsbruk.
 WarningYourLoginWasModifiedPleaseLogin=Din innlogging er blitt endret. Av sikkerhetsgrunner må du logge inn på nytt før du kan gjøre noe.
+WarningYourPasswordWasModifiedPleaseLogin=Passordet ditt ble endret. Av sikkerhetshensyn må du logge på nå med ditt nye passord.
 WarningAnEntryAlreadyExistForTransKey=En oppføring eksisterer allerede for oversettelsesnøkkel for dette språket
 WarningNumberOfRecipientIsRestrictedInMassAction=Advarsel, antall forskjellige mottakere er begrenset til <b> %s </b> ved bruk av massehandlinger på lister
 WarningDateOfLineMustBeInExpenseReportRange=Advarsel, datoen for linjen ligger utenfor tiden til utgiftsrapporten
diff --git a/htdocs/langs/nb_NO/eventorganization.lang b/htdocs/langs/nb_NO/eventorganization.lang
index e7a0c21eca0..c0eb25d529c 100644
--- a/htdocs/langs/nb_NO/eventorganization.lang
+++ b/htdocs/langs/nb_NO/eventorganization.lang
@@ -54,7 +54,7 @@ EVENTORGANIZATION_FILTERATTENDEES_TYPE = I skjemaet for å opprette/legge til en
 # Object
 #
 EventOrganizationConfOrBooth= Konferanse eller messe
-EventOrganizationConfOrBoothes=Conferences or Boothes
+EventOrganizationConfOrBoothes=Konferanser eller stander
 ManageOrganizeEvent = Administrer organiseringen av et arrangement
 ConferenceOrBooth = Konferanse eller messe
 ConferenceOrBoothTab = Konferanse eller messe
@@ -115,8 +115,8 @@ EvntOrgRegistrationHelpMessage = Her kan du stemme på en konferanse eller fores
 EvntOrgRegistrationConfHelpMessage = Her kan du foreslå en ny konferanse under arrangementet.
 EvntOrgRegistrationBoothHelpMessage = Her kan du søke om å få stand under arrangementet.
 ListOfSuggestedConferences = Liste over foreslåtte konferanser
-ListOfSuggestedBooths=Suggested booths
-ListOfConferencesOrBooths=Conferences or booths of event project
+ListOfSuggestedBooths=Foreslåtte boder
+ListOfConferencesOrBooths=Konferanser eller stander av arrangementsprosjektet
 SuggestConference = Foreslå en ny konferanse
 SuggestBooth = Foreslå en stand
 ViewAndVote = Se og stem på foreslåtte arrangementer
@@ -172,3 +172,5 @@ ErrorSeveralCompaniesWithEmailContactUs=Flere selskaper med denne epostadressen
 ErrorSeveralCompaniesWithNameContactUs=Flere selskaper med dette navnet er funnet, så vi kan ikke automatisk validere registreringen din. Vennligst kontakt oss på %s for en manuell validering
 NoPublicActionsAllowedForThisEvent=Ingen offentlige handlinger er åpne for offentligheten for dette arrangementet
 MaxNbOfAttendees=Maks antall deltakere
+DateStartEvent=Startdato for arrangementet
+DateEndEvent=Sluttdato for arrangementet
diff --git a/htdocs/langs/nb_NO/holiday.lang b/htdocs/langs/nb_NO/holiday.lang
index b4ac01e4d7f..aef204eb218 100644
--- a/htdocs/langs/nb_NO/holiday.lang
+++ b/htdocs/langs/nb_NO/holiday.lang
@@ -143,16 +143,16 @@ TemplatePDFHolidays=PDF-mal for permisjonsforespørsler
 FreeLegalTextOnHolidays=Fritekst på PDF
 WatermarkOnDraftHolidayCards=Vannmerke på permisjonsutkast 
 HolidaysToApprove=Ferier til godkjenning
-NobodyHasPermissionToValidateHolidays=Ingen har tillatelse til å validere ferier
-HolidayBalanceMonthlyUpdate=Månedlig oppdatering av feriesaldo
+NobodyHasPermissionToValidateHolidays=Ingen har tillatelse til å validere permisjonsforespørsler
+HolidayBalanceMonthlyUpdate=Månedlig oppdatering av permisjonsaldo
 XIsAUsualNonWorkingDay=%s er vanligvis en IKKE-arbeidsdag
 BlockHolidayIfNegative=Blokker hvis saldoen er negativ
 LeaveRequestCreationBlockedBecauseBalanceIsNegative=Opprettelsen av denne permisjonsforespørselen er blokkert fordi saldoen din er negativ
 ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=Permisjonsforespørsel %s må være utkast, kansellert eller nektet å bli slettet
-IncreaseHolidays=Øk ferie
-HolidayRecordsIncreased= %s feriereposter økt
-HolidayRecordIncreased=Ferierekorden øket
-ConfirmMassIncreaseHoliday=Masse ferieøkning
+IncreaseHolidays=Øk permisjonsbalansen
+HolidayRecordsIncreased= %s permisjonsaldoer økte
+HolidayRecordIncreased=Permisjonsbalansen økt
+ConfirmMassIncreaseHoliday=Masseøkning av permisjonsbalanse
 NumberDayAddMass=Antall dager å legge til utvalget
 ConfirmMassIncreaseHolidayQuestion=Er du sikker på at du vil øke ferien for den(e) %s valgte posten(e)?
 HolidayQtyNotModified=Saldo av gjenværende dager for %s er ikke endret
diff --git a/htdocs/langs/nb_NO/hrm.lang b/htdocs/langs/nb_NO/hrm.lang
index 2d214e6d142..5e045842afb 100644
--- a/htdocs/langs/nb_NO/hrm.lang
+++ b/htdocs/langs/nb_NO/hrm.lang
@@ -12,7 +12,7 @@ OpenEtablishment=Åpne firma
 CloseEtablishment=Lukk firma
 # Dictionary
 DictionaryPublicHolidays=Permisjon - helligdager
-DictionaryDepartment=HRM - Organizational Unit
+DictionaryDepartment=HRM - Organisasjonsenhet
 DictionaryFunction=HRM - Jobbstillinger
 # Module
 Employees=Ansatte
@@ -26,8 +26,8 @@ HRM_DEFAULT_SKILL_DESCRIPTION=Standard beskrivelse av rangeringer når ferdighet
 deplacement=Skift
 DateEval=Evalueringsdato
 JobCard=Jobbkort
-JobPosition=Jobb
-JobsPosition=Jobber
+JobPosition=Jobbprofil
+JobsPosition=Jobbprofiler
 NewSkill=Ny ferdighet
 SkillType=Ferdighetstype
 Skilldets=Liste over rangeringer for denne ferdigheten
@@ -55,14 +55,14 @@ group1ToCompare=Brukergruppe å analysere
 group2ToCompare=Andre brukergruppe for sammenligning
 OrJobToCompare=Sammenlign med krav til jobbkompetanse
 difference=Forskjell
-CompetenceAcquiredByOneOrMore=Competence acquired by one or more users but not requested by the second comparator
+CompetenceAcquiredByOneOrMore=Kompetanse ervervet av en eller flere brukere, men ikke etterspurt av den andre komparatoren
 MaxlevelGreaterThan=Maksnivå høyere enn det forespurte
 MaxLevelEqualTo=Maks nivå er lik kravet
 MaxLevelLowerThan=Maksnivå lavere enn dette kravet
-MaxlevelGreaterThanShort=Employee level greater than the one requested
-MaxLevelEqualToShort=Employee level equals to that demand
-MaxLevelLowerThanShort=Employee level lower than that demand
-SkillNotAcquired=Skill not acquired by all users and requested by the second comparator
+MaxlevelGreaterThanShort=Ansattnivå høyere enn det forespurte
+MaxLevelEqualToShort=Ansattnivå tilsvarer denne etterspørselen
+MaxLevelLowerThanShort=Ansattnivå lavere enn etterspørselen
+SkillNotAcquired=Ferdigheter ikke ervervet av alle brukere og etterspurt av den andre komparatoren
 legend=Historikk
 TypeSkill=Ferdighetstype
 AddSkill=Legg ferdigheter til jobben
@@ -71,21 +71,22 @@ UserRank=Brukerrangering
 SkillList=Ferdighetsliste
 SaveRank=Lagre rangering
 TypeKnowHow=Know how
-TypeHowToBe=How to be
+TypeHowToBe=Hvordan være
 TypeKnowledge=Kunnskap
-AbandonmentComment=Abandonment comment
-DateLastEval=Date last evaluation
+AbandonmentComment=Forlatelseskommentar
+DateLastEval=Dato for siste evaluering
 NoEval=Ingen evaluering gjort for denne ansatte
-HowManyUserWithThisMaxNote=Number of users with this rank
+HowManyUserWithThisMaxNote=Antall brukere med denne rangeringen
 HighestRank=Høyeste rangering
-SkillComparison=Skill comparison
-ActionsOnJob=Events on this job
-VacantPosition=job vacancy
-VacantCheckboxHelper=Checking this option will show unfilled positions (job vacancy)
-SaveAddSkill = Skill(s) added
-SaveLevelSkill = Skill(s) level saved
-DeleteSkill = Skill removed
-SkillsExtraFields=Attributs supplémentaires (Compétences)
-JobsExtraFields=Attributs supplémentaires (Emplois)
-EvaluationsExtraFields=Attributs supplémentaires (Evaluations)
-NeedBusinessTravels=Need business travels
+SkillComparison=Sammenligning av ferdigheter
+ActionsOnJob=Hendelser på denne jobben
+VacantPosition=ledig stilling
+VacantCheckboxHelper=Hvis du merker av for dette alternativet, vises ubesatte stillinger (ledig stilling)
+SaveAddSkill = Ferdighet(er) lagt til
+SaveLevelSkill = Ferdighetsnivået er lagret
+DeleteSkill = Ferdighet fjernet
+SkillsExtraFields=Tilleggsattributter (kompetanser)
+JobsExtraFields=Tilleggsattributter (Jobbprofil)
+EvaluationsExtraFields=Tilleggsattributter (evalueringer)
+NeedBusinessTravels=Trenger forretningsreiser
+NoDescription=ingen beskrivelse
diff --git a/htdocs/langs/nb_NO/interventions.lang b/htdocs/langs/nb_NO/interventions.lang
index 55b66b4de9f..0f53c6533d8 100644
--- a/htdocs/langs/nb_NO/interventions.lang
+++ b/htdocs/langs/nb_NO/interventions.lang
@@ -69,4 +69,4 @@ GenerateInter=Generer intervensjon
 FichinterNoContractLinked=Intervensjon %s er opprettet uten en tilknyttet kontrakt.
 ErrorFicheinterCompanyDoesNotExist=Selskapet eksisterer ikke. Intervensjon er ikke opprettet.
 NextDateToIntervention=Dato for neste generering av intervensjoner
-NoIntervention=No intervention
+NoIntervention=Ingen intervensjon
diff --git a/htdocs/langs/nb_NO/loan.lang b/htdocs/langs/nb_NO/loan.lang
index e189b92952a..a64c0427cb0 100644
--- a/htdocs/langs/nb_NO/loan.lang
+++ b/htdocs/langs/nb_NO/loan.lang
@@ -28,7 +28,7 @@ CantUseScheduleWithLoanStartedToPaid = Kan ikke generere en tidslinje for et lå
 CantModifyInterestIfScheduleIsUsed = Du kan ikke endre rente hvis du bruker tidsplan
 # Admin
 ConfigLoan=Oppset av lån-modulen
-LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Account (from the Chart Of Account) to be used by default for capital (Loan module)
-LOAN_ACCOUNTING_ACCOUNT_INTEREST=Account (from the Chart Of Account) to be used by default for interest (Loan module)
-LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Account (from the Chart Of Account) to be used by default for insurance (Loan module)
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Konto (fra kontoplanen) som skal brukes som standard for kapital (Lånmodul)
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Konto (fra kontoplanen) som skal brukes som standard for renter (Lånmodul)
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Konto (fra kontoplanen) brukes som standard for forsikring (Lånmodul)
 CreateCalcSchedule=Rediger økonomisk forpliktelse
diff --git a/htdocs/langs/nb_NO/main.lang b/htdocs/langs/nb_NO/main.lang
index 587be153543..e6b80ec284c 100644
--- a/htdocs/langs/nb_NO/main.lang
+++ b/htdocs/langs/nb_NO/main.lang
@@ -226,6 +226,7 @@ NoUserGroupDefined=Ingen brukergrupper er definert
 Password=Passord
 PasswordRetype=Gjenta passordet ditt
 NoteSomeFeaturesAreDisabled=Mange av egenskapene/modulene er deaktivert i denne demonstrasjonen.
+YourUserFile=Din brukerfil
 Name=Navn
 NameSlashCompany=Navn/Firma
 Person=Person
@@ -897,6 +898,9 @@ MassFilesArea= Filområde bygget av massehandlinger
 ShowTempMassFilesArea=Vis filområde bygget av massehandlinger
 ConfirmMassDeletion=Bekreft massesletting
 ConfirmMassDeletionQuestion=Er du sikker på at du vil slette de %s valgte postene?
+ConfirmMassClone=Bekreftelse av bulk-kloning
+ConfirmMassCloneQuestion=Velg prosjektet du vil klone til
+ConfirmMassCloneToOneProject=Klon til prosjekt %s
 RelatedObjects=Relaterte objekter
 ClassifyBilled=Klassifisert fakturert
 ClassifyUnbilled=Klassifiser ufakturert
@@ -912,8 +916,8 @@ ExportFilteredList=Eksporter filtrert liste
 ExportList=Eksportliste
 ExportOptions=Eksportinnstillinger
 IncludeDocsAlreadyExported=Inkluder dokumenter som allerede er eksportert
-ExportOfPiecesAlreadyExportedIsEnable=Eksport av deler som allerede er eksportert, er aktivert
-ExportOfPiecesAlreadyExportedIsDisable=Eksport av deler som allerede er eksportert, er deaktivert
+ExportOfPiecesAlreadyExportedIsEnable=Dokumenter som allerede er eksportert er synlige og vil bli eksportert
+ExportOfPiecesAlreadyExportedIsDisable=Dokumenter som allerede er eksportert er skjult og vil ikke bli eksportert
 AllExportedMovementsWereRecordedAsExported=Alle eksporterte bevegelser ble registrert som eksportert
 NotAllExportedMovementsCouldBeRecordedAsExported=Ikke alle eksporterte bevegelser kunne registreres som eksportert
 Miscellaneous=Diverse
@@ -1128,6 +1132,7 @@ DeleteFileText=Vil du slette denne filen?
 ShowOtherLanguages=Vis andre språk
 SwitchInEditModeToAddTranslation=Bytt i redigeringsmodus for å legge til oversettelser for dette språket
 NotUsedForThisCustomer=Ikke brukt for denne kunden
+NotUsedForThisVendor=Ikke brukt for denne leverandøren
 AmountMustBePositive=Beløpet må være positivt
 ByStatus=Etter status
 InformationMessage=Informasjon
@@ -1148,18 +1153,18 @@ EventReminder=Påminnelse om hendelse
 UpdateForAllLines=Oppdatering for alle linjer
 OnHold=Venter
 Civility=Tiltale
-AffectTag=Assign Tag
-AffectUser=Assign User
-SetSupervisor=Sett supervisor
+AffectTag=Tilordne et merke
+AffectUser=Tilordne en bruker
+SetSupervisor=Velg supervisor
 CreateExternalUser=Opprett ekstern bruker
-ConfirmAffectTag=Bulk Tag Assignement
-ConfirmAffectUser=Bulk User Assignement
-ProjectRole=Rolle tildelt på hvert prosjekt
-TasksRole=Rolle tildelt hver oppgave i hvert prosjekt
+ConfirmAffectTag=Masse Merke-tilordning
+ConfirmAffectUser=Masse brukertilordning
+ProjectRole=Rolle tildelt på hvert prosjekt/mulighet
+TasksRole=Rolle tildelt hver oppgave (hvis brukt)
 ConfirmSetSupervisor=Sett Bulk Supervisor 
 ConfirmUpdatePrice=Velg en øknings-/reduksjonssats
-ConfirmAffectTagQuestion=Are you sure you want to assign tags to the %s selected record(s)?
-ConfirmAffectUserQuestion=Are you sure you want to assign users to the %s selected record(s)?
+ConfirmAffectTagQuestion=Er du sikker på at du vil tilordne merker til %s valgte post(er)?
+ConfirmAffectUserQuestion=Er du sikker på at du vil tilordne brukere til %s valgte post(er)?
 ConfirmSetSupervisorQuestion=Er du sikker på at du vil sette supervisor til %s valgte post(er)?
 ConfirmUpdatePriceQuestion=Er du sikker på at du vil oppdatere prisen på %s valgte post(er)?
 CategTypeNotFound=Ingen merketype funnet for denne post-typen
@@ -1170,7 +1175,7 @@ InformationOnLinkToContract=Dette beløpet er bare summen av alle linjene i kont
 ConfirmCancel=Er du sikker på at du vil avbryte
 EmailMsgID=E-post MsgID
 EmailDate=E-post dato
-SetToStatus=Set to status %s
+SetToStatus=Sett til status %s
 SetToEnabled=Sett til aktivert
 SetToDisabled=Sett til deaktivert
 ConfirmMassEnabling=bekreftelse av masseaktivering
@@ -1199,8 +1204,8 @@ Terminated=Terminert
 AddLineOnPosition=Legg til linje på posisjon (på slutten hvis tom)
 ConfirmAllocateCommercial=Tildel salgsrepresentant bekreftelse
 ConfirmAllocateCommercialQuestion=Er du sikker på at du vil tilordne %s valgte post(er)?
-CommercialsAffected=Sales representatives assigned
-CommercialAffected=Sales representative assigned
+CommercialsAffected=Tildelt salgsrepresentanter 
+CommercialAffected=Tildelt salgsrepresentant
 YourMessage=Din beskjed
 YourMessageHasBeenReceived=Meldingen din er mottatt. Vi vil svare eller kontakte deg så snart som mulig.
 UrlToCheck=URL for å sjekke
@@ -1210,3 +1215,10 @@ CreatedByPublicPortal=Laget fra offentlig portal
 UserAgent=Brukeragent
 InternalUser=Intern bruker
 ExternalUser=Ekstern bruker
+NoSpecificContactAddress=Ingen spesifikk kontakt eller adresse
+NoSpecificContactAddressBis=Denne kategorien er dedikert til å tvinge frem spesifikke kontakter eller adresser for gjeldende objekt. Bruk den bare hvis du ønsker å definere en eller flere spesifikke kontakter eller adresser for objektet når informasjonen om tredjeparten ikke er nok eller ikke nøyaktig.
+HideOnVCard=Skjul %s
+AddToContacts=Legg til adresse i kontaktene mine
+LastAccess=Siste tilgang
+UploadAnImageToSeeAPhotoHere=Last opp et bilde fra fanen %s for å se et bilde her
+LastPasswordChangeDate=Dato for siste endring av passord
diff --git a/htdocs/langs/nb_NO/members.lang b/htdocs/langs/nb_NO/members.lang
index 92a0d669a39..07da6648c7b 100644
--- a/htdocs/langs/nb_NO/members.lang
+++ b/htdocs/langs/nb_NO/members.lang
@@ -74,12 +74,12 @@ MemberTypeCanNotBeDeleted=Medlemstype kan ikke slettes
 NewSubscription=Nytt bidrag
 NewSubscriptionDesc=Med dette skjemaet kan du ta opp abonnement som nytt medlem av organisasjonen. Hvis du ønsker å fornye abonnementet (hvis du allerede er medlem), vennligst kontakt organisasjonsstyret i stedet ved e-post %s.
 Subscription=Bidrag
-AnyAmountWithAdvisedAmount=Any amount of your choice, recommended %s
-AnyAmountWithoutAdvisedAmount=Any amount of your choice
+AnyAmountWithAdvisedAmount=Enhver mengde du ønsker, anbefalt %s
+AnyAmountWithoutAdvisedAmount=Valgfritt beløp
 CanEditAmountShort=Hvilket som helst beløp
 CanEditAmountShortForValues=anbefales, uansett beløp
 MembershipDuration=Varighet
-GetMembershipButtonLabel=Join
+GetMembershipButtonLabel=Bli med
 Subscriptions=Bidrag
 SubscriptionLate=Forsinket
 SubscriptionNotReceived=Bidrag aldri mottatt
@@ -207,10 +207,10 @@ NbOfSubscriptions=Antall bidrag
 AmountOfSubscriptions=Beløp samlet inn fra bidrag
 TurnoverOrBudget=Omsetning (for et selskap) eller Budsjett (for en organisasjon)
 DefaultAmount=Standard bidragsbeløp
-CanEditAmount=Subscription amount is free
+CanEditAmount=Abonnementsbeløpet er gratis
 CanEditAmountDetail=Besøkende kan velge/redigere beløpet for sitt bidrag uavhengig av medlemstype
 AmountIsLowerToMinimumNotice=Totalt forfall på %s
-MEMBER_NEWFORM_PAYONLINE=After the online registration, switch automatically on the online payment page
+MEMBER_NEWFORM_PAYONLINE=Etter den elektroniske registreringen bytter du automatisk til betalingssiden på nett
 ByProperties=Etter egenskap
 MembersStatisticsByProperties=Medlemsstatistikk etter egenskap
 VATToUseForSubscriptions=MVA-sats til bruk for bidrag
@@ -231,4 +231,4 @@ CreateDolibarrLoginDesc=Opprettelsen av en brukerpålogging for medlemmer lar de
 CreateDolibarrThirdPartyDesc=En tredjepart er den juridiske enheten som vil bli brukt på fakturaen hvis du bestemmer deg for å generere faktura for hvert bidrag. Du vil kunne opprette den senere under prosessen med å registrere bidraget.
 MemberFirstname=Medlemmets fornavn
 MemberLastname=Medlemmets etternavn
-MemberCodeDesc=Member Code, unique for all members
+MemberCodeDesc=Medlemskode, unik for alle medlemmer
diff --git a/htdocs/langs/nb_NO/mrp.lang b/htdocs/langs/nb_NO/mrp.lang
index c3948610887..2bf5efc0b96 100644
--- a/htdocs/langs/nb_NO/mrp.lang
+++ b/htdocs/langs/nb_NO/mrp.lang
@@ -11,7 +11,7 @@ Bom=Materialkostnader (BOM)
 BillOfMaterials=Materialkostnader (BOM)
 BillOfMaterialsLines=Stykkliste-linjer
 BOMsSetup=Oppsett av BOM-modulen 
-ListOfBOMs=Bills of material - BOM
+ListOfBOMs=Stykklister - BOM
 ListOfManufacturingOrders=Produksjonsordrer
 NewBOM=Ny BOM
 ProductBOMHelp=Vare å produsere (eller demontere) med denne stykklisten. <br> Merk: Produkter med egenskapen 'Varensart' = 'Råvarer' er ikke synlige i denne listen.
@@ -27,7 +27,7 @@ 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
-Consumption=Consumption
+Consumption=Forbruk
 ValueOfMeansLoss=Verdi på 0,95 betyr et gjennomsnitt på 5%% tap under produksjonen eller demonteringen
 ValueOfMeansLossForProductProduced=Verdi på 0,95 betyr et gjennomsnitt på 5%% tap av produsert produkt
 DeleteBillOfMaterials=Slett BOM
@@ -102,6 +102,7 @@ NbOperatorsRequired=Antall operatører som kreves
 THMOperatorEstimated=Anslått operatør THM
 THMMachineEstimated=Anslått maskin THM
 WorkstationType=Arbeidsstasjonstype
+DefaultWorkstation=Standard arbeidsstasjon
 Human=Menneskelig
 Machine=Maskin
 HumanMachine=Menneske/maskin
@@ -116,5 +117,5 @@ ParentMo=Overordnet MO
 MOChild=Underordnet MO 
 BomCantAddChildBom=Nomenklaturen %s er allerede til stede i treet som fører til nomenklaturen %s
 BOMNetNeeds = BOM Netto behov
-BOMProductsList=BOM's products
-BOMServicesList=BOM's services
+BOMProductsList=BOM's varer 
+BOMServicesList=BOM's tjenester
diff --git a/htdocs/langs/nb_NO/orders.lang b/htdocs/langs/nb_NO/orders.lang
index 1d15cb60c15..55fbf0afff6 100644
--- a/htdocs/langs/nb_NO/orders.lang
+++ b/htdocs/langs/nb_NO/orders.lang
@@ -96,6 +96,10 @@ OrdersStatisticsSuppliers=Innkjøpsordrestatistikk
 NumberOfOrdersByMonth=Antall ordre pr måned
 AmountOfOrdersByMonthHT=Beløp på ordrer etter måned (ekskl. MVA)
 ListOfOrders=Ordreliste
+ListOrderLigne=Ordrelinjer
+productobuy=Varer kun for kjøp
+productonly=Kun varer
+disablelinefree=Ingen linjer ledig
 CloseOrder=Lukk ordre
 ConfirmCloseOrder=Er du sikker på at du vil sette denne ordren som levert? Når en ordre er levert, kan den settes til "betalt"
 ConfirmDeleteOrder=Er du sikker på at du vil slette denne ordren?
@@ -131,6 +135,7 @@ SupplierOrderClassifiedBilled=Innkjøpsordre %s satt til fakturert
 OtherOrders=Andre ordre
 SupplierOrderValidatedAndApproved=Leverandørbestilling er validert og godkjent: %s
 SupplierOrderValidated=Leverandørbestilling er validert: %s
+OrderShowDetail=Vis ordredetaljer
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Representant for oppfølging av salgsordre
 TypeContact_commande_internal_SHIPPING=Representant for oppfølging av levering
@@ -199,3 +204,5 @@ StatusSupplierOrderApproved=Godkjent
 StatusSupplierOrderRefused=Avvist
 StatusSupplierOrderReceivedPartially=Delvis mottatt
 StatusSupplierOrderReceivedAll=Alle varer mottatt
+NeedAtLeastOneInvoice = Det må være minst én faktura
+LineAlreadyDispatched = Ordrelinjen er allerede mottatt.
diff --git a/htdocs/langs/nb_NO/other.lang b/htdocs/langs/nb_NO/other.lang
index c797e66b27f..0c3e6805c81 100644
--- a/htdocs/langs/nb_NO/other.lang
+++ b/htdocs/langs/nb_NO/other.lang
@@ -35,9 +35,9 @@ OnlyOneFieldForXAxisIsPossible=Bare ett felt er for øyeblikket mulig som X-Akse
 AtLeastOneMeasureIsRequired=Det kreves minst ett felt for mål
 AtLeastOneXAxisIsRequired=Minst ett felt for X-akse er påkrevd
 LatestBlogPosts=Siste blogginnlegg
-notiftouser=To users
-notiftofixedemail=To fixed mail
-notiftouserandtofixedemail=To user and fixed mail
+notiftouser=Til brukere
+notiftofixedemail=Til fast post
+notiftouserandtofixedemail=Til bruker og fast post
 Notify_ORDER_VALIDATE=Salgsordre validert
 Notify_ORDER_SENTBYMAIL=Salgsordre sendt via epost
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Innkjøpsordre sendt via e-post
@@ -46,7 +46,9 @@ Notify_ORDER_SUPPLIER_APPROVE=Innkjøpsordre godkjent
 Notify_ORDER_SUPPLIER_REFUSE=Innkjøpsordre avvist
 Notify_PROPAL_VALIDATE=Kundetilbud validert
 Notify_PROPAL_CLOSE_SIGNED=Kundetilbud lukket signert
+Notify_PROPAL_CLOSE_SIGNED_WEB=Kundetilbud lukket signert på portalside
 Notify_PROPAL_CLOSE_REFUSED=Kundetilbud lukket avvist
+Notify_PROPAL_CLOSE_REFUSED_WEB=Kundetilbud stengt avvist på portalsiden
 Notify_PROPAL_SENTBYMAIL=Tilbud sendt med post
 Notify_WITHDRAW_TRANSMIT=Overføring avbrudt
 Notify_WITHDRAW_CREDIT=Kreditt tilbaketrekning
@@ -110,7 +112,7 @@ ChooseYourDemoProfilMore=... eller bygg din egen profil<br>(manuell utvelgelse a
 DemoFundation=Håndtere medlemmer i en organisasjon
 DemoFundation2=Håndtere medlemmer og bankkonti i en organisasjon
 DemoCompanyServiceOnly=Firma som kun selger tjenester
-DemoCompanyShopWithCashDesk=Manage a shop with a cash box
+DemoCompanyShopWithCashDesk=Administrer en butikk med en pengekasse
 DemoCompanyProductAndStocks=Handle varer med Point Of Sales
 DemoCompanyManufacturing=Selskapets varer
 DemoCompanyAll=Firma med mange aktiviteter (alle hovedmoduler)
@@ -181,13 +183,14 @@ SizeUnitfoot=fot
 SizeUnitpoint=punkt
 BugTracker=Feilsporing (bugtracker)
 SendNewPasswordDesc=Dette skjemaet lar deg be om et nytt passord. Det vil bli sendt til din e-postadresse. <br> Endring skjer når du klikker på bekreftelseslinken i e-posten. <br> Sjekk innboksen din.
+EnterNewPasswordHere=Skriv inn ditt nye passord her
 BackToLoginPage=Tilbake til innloggingssiden
 AuthenticationDoesNotAllowSendNewPassword=Autensitering er satt til <b>%s</b>.<br>Det betyr at Dolibarr ikke kan vite eller endre passordet ditt.<br>Kontakt systemadministrator hvis du vil endre passordet ditt.
 EnableGDLibraryDesc=Installer eller aktiver GD-bibliotek i din PHP-installasjon for å bruke denne opsjonen.
 ProfIdShortDesc=<b>Prof-ID %s</b> er avhengig av tredjepartens land.<br>For eksempel er det for <b>%s</b>, koden <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
 StatsByNumberOfUnits=Statistikk over summen av produkter/tjenester
-StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
+StatsByNumberOfEntities=Statistikk for antall henvisende enheter (antall fakturaer, eller bestillinger...)
 NumberOfProposals=Antall tilbud
 NumberOfCustomerOrders=Antall salgsordre
 NumberOfCustomerInvoices=Antall kundefakturaer
@@ -210,6 +213,9 @@ EMailTextInvoiceValidated=Faktura %s er validert.
 EMailTextInvoicePayed=Faktura %s er betalt.
 EMailTextProposalValidated=Tilbud %s er validert.
 EMailTextProposalClosedSigned=Tilbud %s er lukket, signert.
+EMailTextProposalClosedSignedWeb=Tilbud %s er stengt signert på portalside.
+EMailTextProposalClosedRefused=Tilbud %s er lukket avvist.
+EMailTextProposalClosedRefusedWeb=Tilbud %s har blitt stengt avvist på portalside.
 EMailTextOrderValidated=Ordre %s er validert.
 EMailTextOrderApproved=Ordre %s er godkjent.
 EMailTextOrderValidatedBy=Ordre %s har blitt registrert av %s.
@@ -258,10 +264,10 @@ PassEncoding=Passordkoding
 PermissionsAdd=Tillatelser lagt til
 PermissionsDelete=Tillatelser fjernet
 YourPasswordMustHaveAtLeastXChars=Passordet ditt må ha minst <strong> %s </strong> tegn
-PasswordNeedAtLeastXUpperCaseChars=The password need at least <strong>%s</strong> upper case chars
-PasswordNeedAtLeastXDigitChars=The password need at least <strong>%s</strong> numeric chars
-PasswordNeedAtLeastXSpecialChars=The password need at least <strong>%s</strong> special chars
-PasswordNeedNoXConsecutiveChars=The password must not have <strong>%s</strong> consecutive similar chars
+PasswordNeedAtLeastXUpperCaseChars=Passordet trenger minst <strong> %s </strong> store bokstaver
+PasswordNeedAtLeastXDigitChars=Passordet trenger minst <strong> %s </strong> numeriske tegn
+PasswordNeedAtLeastXSpecialChars=Passordet trenger minst <strong> %s </strong> spesialtegn
+PasswordNeedNoXConsecutiveChars=Passordet må ikke ha <strong> %s </strong> påfølgende tegn
 YourPasswordHasBeenReset=Ditt passord er tilbakestilt
 ApplicantIpAddress=IP-adresse til søkeren
 SMSSentTo=SMS sendt til %s
@@ -272,7 +278,7 @@ ProjectCreatedByEmailCollector=Prosjekt opprettet av e-post samler fra e-post MS
 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
 SuffixSessionName=Suffiks for øktnavn
-LoginWith=Login with %s
+LoginWith=Logg på med %s
 
 ##### Export #####
 ExportsArea=Eksportområde
@@ -298,12 +304,12 @@ PopuProp=Varer/tjenester etter popularitet i tilbud
 PopuCom=Varer/tjenester etter popularitet i ordre
 ProductStatistics=Varer/Tjenestestatistikk
 NbOfQtyInOrders=Antall i ordre
-SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
+SelectTheTypeOfObjectToAnalyze=Velg et objekt for å se dets statistikk...
 
-ConfirmBtnCommonContent = Are you sure you want to "%s" ?
-ConfirmBtnCommonTitle = Confirm your action
+ConfirmBtnCommonContent = Er du sikker på at du vil "%s"?
+ConfirmBtnCommonTitle = Bekreft handlingen din
 CloseDialog = Lukk
-Autofill = Autofill
+Autofill = Autofyll
 
 # externalsite
 ExternalSiteSetup=Oppsett av lenke til ekstern nettside
@@ -311,10 +317,10 @@ ExternalSiteURL=URL for eksternt nettsted for HTML iframe-innhold
 ExternalSiteModuleNotComplete=Modulen Ekstern Side ble ikke riktig konfigurert.
 ExampleMyMenuEntry=Meny overskrift
 
-# FTP
+# ftp
 FTPClientSetup=Modul for oppsett av FTP- eller SFTP-klient 
-NewFTPClient=Nytt FTP / FTPS-tilkoblingsoppsett
-FTPArea=FTP/FTPS-område
+NewFTPClient=Nytt oppsett av FTP/SFTP-tilkobling
+FTPArea=FTP/SFTP-område
 FTPAreaDesc=Dette skjermbildet viser en FTP et SFTP-server.
 SetupOfFTPClientModuleNotComplete=Installasjonen av FTP- eller SFTP-klientmodulen ser ut til å være ufullstendig
 FTPFeatureNotSupportedByYourPHP=Din PHP støtter ikke FTP- eller SFTP-funksjoner
@@ -325,3 +331,9 @@ FTPFailedToRemoveDir=Kunne ikke fjerne katalogen <b> %s </b>: Kontroller tillate
 FTPPassiveMode=Passiv modus
 ChooseAFTPEntryIntoMenu=Velg et FTP/SFTP-nettsted fra menyen ...
 FailedToGetFile=Kunne ikke hente filene %s
+ErrorFTPNodisconnect=Feil ved frakobling av FTP/SFTP-server
+FileWasUpload=Fil <b> %s </b> ble lastet opp
+FTPFailedToUploadFile=Kunne ikke laste opp filen <b> %s </b> .
+AddFolder=Lag mappe
+FileWasCreateFolder=Mappe <b> %s </b> er opprettet
+FTPFailedToCreateFolder=Kunne ikke opprette mappen <b> %s </b> .
diff --git a/htdocs/langs/nb_NO/projects.lang b/htdocs/langs/nb_NO/projects.lang
index 4c8575492ff..b5c099b9ed4 100644
--- a/htdocs/langs/nb_NO/projects.lang
+++ b/htdocs/langs/nb_NO/projects.lang
@@ -23,7 +23,7 @@ TasksPublicDesc=Denne visningen presenterer alle prosjekter og oppgaver du har l
 TasksDesc=Denne visningen presenterer alle prosjekter og oppgaver (dine brukertillatelser gir deg tillatelse til å vise alt).
 AllTaskVisibleButEditIfYouAreAssigned=Alle oppgaver for kvalifiserte prosjekter er synlige, men du kan bare angi tid for oppgave som er tildelt til valgt bruker. Tilordne oppgave hvis du trenger å skrive inn tid på den.
 OnlyYourTaskAreVisible=Bare oppgaver som er tildelt deg er synlige. Hvis du trenger å legge inn tid på en oppgave og oppgaven ikke er synlig her, må du tilordne oppgaven til deg selv.
-ImportDatasetProjects=Projects or opportunities
+ImportDatasetProjects=Prosjekter eller muligheter
 ImportDatasetTasks=Oppgaver fra prosjekter
 ProjectCategories=Prosjekt etiketter/kategorier
 NewProject=Nytt prosjekt
@@ -125,8 +125,8 @@ ValidateProject=Valider prosjekt
 ConfirmValidateProject=Er du sikker på at du vil validere dette prosjektet?
 CloseAProject=Lukk prosjektet
 ConfirmCloseAProject=Er du sikker på at du vil lukke dette prosjektet?
-AlsoCloseAProject=Also close project
-AlsoCloseAProjectTooltip=Keep it open if you still need to follow production tasks on it
+AlsoCloseAProject=Lukk prosjekt også 
+AlsoCloseAProjectTooltip=Hold den åpen hvis du fortsatt trenger å følge produksjonsoppgaver på den
 ReOpenAProject=Åpne prosjekt
 ConfirmReOpenAProject=Er du sikker på at du vil gjenåpne dette prosjektet?
 ProjectContact=Kontaktpersoner for prosjektet
@@ -169,7 +169,7 @@ OpportunityProbability=Lead sannsynlighet
 OpportunityProbabilityShort=Lead sansyn.
 OpportunityAmount=Lead beløp
 OpportunityAmountShort=Lead beløp
-OpportunityWeightedAmount=Amount of opportunity, weighted by probability
+OpportunityWeightedAmount=Beløp på mulighet, vektet etter sannsynlighet
 OpportunityWeightedAmountShort=Muligh. vektet beløp
 OpportunityAmountAverageShort=Gjennomsnittlig lead beløp
 OpportunityAmountWeigthedShort=Vektet lead beløp
@@ -259,6 +259,7 @@ RecordsClosed=%s prosjekt(er) lukket
 SendProjectRef=Informasjon prosjekt %s
 ModuleSalaryToDefineHourlyRateMustBeEnabled=Modul 'Lønn' må være aktivert for å definere ansattes timepris for å få tidsbruk verdsatt
 NewTaskRefSuggested=Oppgavereferanse allerede brukt, en ny oppgavereferanse er nødvendig
+NumberOfTasksCloned=%s oppgave(r) klonet
 TimeSpentInvoiced=Tidsbruk fakturert
 TimeSpentForIntervention=Tid brukt
 TimeSpentForInvoice=Tid brukt
diff --git a/htdocs/langs/nb_NO/salaries.lang b/htdocs/langs/nb_NO/salaries.lang
index bb698ea40d8..b7ea89c743d 100644
--- a/htdocs/langs/nb_NO/salaries.lang
+++ b/htdocs/langs/nb_NO/salaries.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - salaries
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Account (from the Chart of Account) used by default for "user" third parties
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated 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=Konto (fra kontoplanen) brukes som standard for "bruker" tredjeparter
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=Den dedikerte kontoen som er definert på brukerkortet, vil kun brukes til underreskontro. Denne vil bli brukt for hovedbok og som standardverdi for underreskontro hvis dedikert brukerkonto for bruker ikke er definert.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Regnskapskonto som standard for lønnsutbetalinger
 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
diff --git a/htdocs/langs/nb_NO/stripe.lang b/htdocs/langs/nb_NO/stripe.lang
index 8094f39ad1f..48eefed34c5 100644
--- a/htdocs/langs/nb_NO/stripe.lang
+++ b/htdocs/langs/nb_NO/stripe.lang
@@ -41,7 +41,8 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook-nøkkel
 ONLINE_PAYMENT_WAREHOUSE=Lager som skal brukes for lagernedskrivning når nettbasert betaling er utført<br> (TODO Når alternativet for å redusere lagerbeholdningen gjøres på en faktura handling, og online betaling genererer fakturaen?)
 StripeLiveEnabled=Stripe live aktivert (ellers test/sandbox modus)
 StripeImportPayment=Importer Stripe-betalinger
-ExampleOfTestCreditCard=Eksempel på kredittkort for test: %s => gyldig, %s => feil CVC, %s => utløpt, %s => belastning mislykket
+ExampleOfTestCreditCard=Eksempel på kredittkort for SEPA-test: %s => gyldig, %s => feil CVC, %s => utløpt, %s => belastning mislykkes
+ExampleOfTestBankAcountForSEPA=Eksempel på bankkonto BAN for test av direkte belastning: %s
 StripeGateways=Stripe gateways
 OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca. _...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca. _...)
@@ -70,5 +71,8 @@ ToOfferALinkForLiveWebhook=Link til oppsett av Stripe WebHook for oppkall av IPN
 PaymentWillBeRecordedForNextPeriod=Betalingen blir registrert for neste periode.
 ClickHereToTryAgain=<a href="%s">Klikk her for å prøve igjen ...</a>
 CreationOfPaymentModeMustBeDoneFromStripeInterface=På grunn av sterke regler for godkjenning av kunder, må opprettelse av et kort gjøres fra Stripe backoffice. Du kan klikke her for å slå på Stripe kundeoppføring: %s
-TERMINAL_LOCATION=Plassering (adresse) for terminaler
+STRIPE_CARD_PRESENT=Kort til stede for Stripe-terminaler
+TERMINAL_LOCATION=Plassering (adresse) for Stripe Terminaler
 RequestDirectDebitWithStripe=Be om direktedebet med Stripe
+STRIPE_SEPA_DIRECT_DEBIT=Aktiver direktedebet gjennom Stripe
+
diff --git a/htdocs/langs/nb_NO/ticket.lang b/htdocs/langs/nb_NO/ticket.lang
index f3aefbb6a07..47d71678984 100644
--- a/htdocs/langs/nb_NO/ticket.lang
+++ b/htdocs/langs/nb_NO/ticket.lang
@@ -26,6 +26,7 @@ Permission56002=Endre supportsedler
 Permission56003=Slett supportsedler
 Permission56004=Administrer supportsedler
 Permission56005=Se billetter til alle tredjeparter (ikke effektive for eksterne brukere, alltid begrenset til tredjepart de er avhengige av)
+Permission56006=Eksporter billetter
 
 Tickets=Supportsedler
 TicketDictType=Billett - Typer
@@ -61,6 +62,8 @@ TypeContact_ticket_external_CONTRIBUTOR=Ekstern bidragsyter
 OriginEmail=Rapport-epost
 Notify_TICKET_SENTBYMAIL=Send billettmelding via e-post
 
+ExportDataset_ticket_1=Supportsedler
+
 # Status
 Read=Les
 Assigned=Tildelt
diff --git a/htdocs/langs/nb_NO/users.lang b/htdocs/langs/nb_NO/users.lang
index b78cbc27184..a81039928db 100644
--- a/htdocs/langs/nb_NO/users.lang
+++ b/htdocs/langs/nb_NO/users.lang
@@ -66,7 +66,8 @@ LinkedToDolibarrUser=Link til bruker
 LinkedToDolibarrThirdParty=Link til tredjepart
 CreateDolibarrLogin=Lag Dolibarrkonto
 CreateDolibarrThirdParty=Lag en tredjepart
-LoginAccountDisableInDolibarr=Kontoen er deaktivert i Dolibarr.
+LoginAccountDisableInDolibarr=Konto deaktivert i Dolibarr
+PASSWORDInDolibarr=Passord endret i Dolibarr
 UsePersonalValue=Bruk personlig verdi
 ExportDataset_user_1=Brukere og deres egenskaper
 DomainUser=Domenebruker %s
@@ -129,3 +130,6 @@ IPLastLogin=IP siste pålogging
 IPPreviousLogin=IP forrige pålogging
 ShowAllPerms=Vis alle tillatelsesrader
 HideAllPerms=Skjul alle tillatelsesrader
+UserPublicPageDesc=Du kan aktivere et virtuelt kort for denne brukeren. En url med brukerprofilen og en strekkode vil være tilgjengelig slik at alle med en smarttelefon kan skanne den og legge til kontakten din i adresseboken.
+EnablePublicVirtualCard=Aktiver det offentlige virtuelle brukerkortet
+PublicVirtualCardUrl=Offentlig virtuelt brukerkort
diff --git a/htdocs/langs/nb_NO/website.lang b/htdocs/langs/nb_NO/website.lang
index 608da77e606..c1f69b5a7dc 100644
--- a/htdocs/langs/nb_NO/website.lang
+++ b/htdocs/langs/nb_NO/website.lang
@@ -155,3 +155,5 @@ WebpageMustBeDisabled=Nettsiden må ha statusen "%s"
 SetWebsiteOnlineBefore=Når nettstedet er frakoblet, er alle sidene offline. Endre status på nettstedet først.
 Booking=Bestilling
 Reservation=Reservasjon
+PagesViewedPreviousMonth=Sider vist (forrige måned)
+PagesViewedTotal=Viste sider (totalt)
diff --git a/htdocs/langs/nb_NO/withdrawals.lang b/htdocs/langs/nb_NO/withdrawals.lang
index 0a206ba4e9e..d2d34607bf1 100644
--- a/htdocs/langs/nb_NO/withdrawals.lang
+++ b/htdocs/langs/nb_NO/withdrawals.lang
@@ -33,7 +33,7 @@ InvoiceWaitingPaymentByBankTransfer=Faktura venter på kreditoverføring
 AmountToWithdraw=Beløp å tilbakekalle
 AmountToTransfer=Beløp som skal overføres
 NoInvoiceToWithdraw=Ingen faktura åpen for '%s' venter. Gå til fanen '%s' på fakturakortet for å gjøre en forespørsel.
-NoSupplierInvoiceToWithdraw=No supplier invoice with open '%s' is waiting. Go on tab '%s' on invoice card to make a request.
+NoSupplierInvoiceToWithdraw=Ingen leverandørfaktura med åpen '%s' venter. Gå til fanen '%s' på fakturakortet for å gjøre en forespørsel.
 ResponsibleUser=Brukeransvarlig
 WithdrawalsSetup=Oppsett av direktedebetsbetalinger
 CreditTransferSetup=Oppsett av kredittoverføring
diff --git a/htdocs/langs/nl_BE/accountancy.lang b/htdocs/langs/nl_BE/accountancy.lang
index 3a8fd558aca..bf0668f6ad0 100644
--- a/htdocs/langs/nl_BE/accountancy.lang
+++ b/htdocs/langs/nl_BE/accountancy.lang
@@ -12,7 +12,6 @@ Selectchartofaccounts=Selecteer actieve grafieken van accounts
 Addanaccount=Voeg een boekhoudkundige rekening toe
 AccountAccounting=Boekhoudkundige rekening
 AccountAccountingShort=Rekening
-AccountAccountingSuggest=Voorgesteld boekhoudkundige rekening
 CreateMvts=Nieuwe transactie maken
 UpdateMvts=Wijzigen van een transactie
 Processing=Verwerken
diff --git a/htdocs/langs/nl_NL/accountancy.lang b/htdocs/langs/nl_NL/accountancy.lang
index 6afef8eca53..a7da8ab21a4 100644
--- a/htdocs/langs/nl_NL/accountancy.lang
+++ b/htdocs/langs/nl_NL/accountancy.lang
@@ -14,8 +14,8 @@ ACCOUNTING_EXPORT_ENDLINE=Selecteer het nieuwe regel type
 ACCOUNTING_EXPORT_PREFIX_SPEC=Specificeer de prefix voor de bestandsnaam
 ThisService=Deze dienst
 ThisProduct=Dit product
-DefaultForService=Standaard bij dienst
-DefaultForProduct=Standaard bij product
+DefaultForService=Default for services
+DefaultForProduct=Default for products
 ProductForThisThirdparty=Product voor deze relatie
 ServiceForThisThirdparty=Service voor deze relatie
 CantSuggest=Geen suggestie
@@ -101,7 +101,8 @@ ShowAccountingAccount=Toon grootboekrekening
 ShowAccountingJournal=Toon dagboek
 ShowAccountingAccountInLedger=Grootboekrekening in grootboek
 ShowAccountingAccountInJournals=Laat grootboekrekening zien in journaals
-AccountAccountingSuggest=Voorgestelde rekening
+DataUsedToSuggestAccount=Data used to suggest account
+AccountAccountingSuggest=Account suggested
 MenuDefaultAccounts=Standaard GB-rekeningen
 MenuBankAccounts=Bankrekeningen
 MenuVatAccounts=BTW rekeningen
@@ -126,6 +127,7 @@ WriteBookKeeping=Boek transacties in de boekhouding
 Bookkeeping=Grootboek
 BookkeepingSubAccount=Sub-grootboek
 AccountBalance=Balans
+AccountBalanceSubAccount=Sub-accounts balance
 ObjectsRef=Ref. bron-object 
 CAHTF=Totaal inkoop leverancier excl. BTW
 TotalExpenseReport=Totaal resultaatrekening kosten
@@ -189,6 +191,7 @@ ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Account (from the Chart Of Account) to be us
 UseAuxiliaryAccountOnCustomerDeposit=Klantrekening opslaan als individuele rekening in subgrootboek voor vooruitbetalingsregels (indien uitgeschakeld, blijft individuele rekening voor vooruitbetalingsregels leeg)
 ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Account (from the Chart Of Account) to be used as the default
 UseAuxiliaryAccountOnSupplierDeposit=Leveranciersrekening opslaan als individuele rekening in subgrootboek voor vooruitbetalingsregels (indien uitgeschakeld, blijft individuele rekening voor vooruitbetalingsregels leeg)
+ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY=Accounting account by default to register customer retained warranty
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased within same country (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased from EEC to another EEC country (used if not defined in the product sheet)
@@ -218,6 +221,7 @@ JournalLabel=Journaal label
 NumPiece=Boekingstuk
 TransactionNumShort=Transactienummer
 AccountingCategory=Custom group of accounts
+AccountingCategories=Custom groups of accounts
 GroupByAccountAccounting=Groeperen op grootboekrekening
 GroupBySubAccountAccounting=Groepeer op subgrootboekrekening
 AccountingAccountGroupsDesc=Hier kunt u enkele grootboekrekening-groepen definiëren. Deze worden gebruikt voor gepersonaliseerde boekhoudrapporten.
@@ -265,6 +269,7 @@ ShowSubtotalByGroup=Toon subtotaal op niveau
 
 Pcgtype=Rekening hoofdgroep
 PcgtypeDesc=Cluster grootboekrekeningen welke gebruikt worden als vooraf gedefinieerde 'filter'- en' groepeer'-criteria voor sommige boekhoudrapporten. 'INKOMEN' of 'UITGAVEN' worden bijvoorbeeld gebruikt als groepen voor boekhoudrekeningen van producten om het kosten- / inkomstenrapport samen te stellen.
+AccountingCategoriesDesc=Custom group of accounts can be used to group accounting accounts into one name to ease filter use or building of custom reports.
 
 Reconcilable=Samentrekken
 
@@ -294,6 +299,7 @@ DescValidateMovements=Elke wijziging of verwijdering van inboeken, afletteren en
 
 ValidateHistory=Automatisch afstemmen
 AutomaticBindingDone=Automatische bindings uitgevoerd (%s) - Automatische binding was niet mogelijk voor record (%s)
+DoManualBindingForFailedRecord=You have to do a manual link for the %s row(s) not linked automatically.
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot remove or disable this account of chart of account because it is used
 MvtNotCorrectlyBalanced=Beweging niet correct gebalanceerd. Debet = %s & Credit = %s
@@ -337,11 +343,13 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=Schakel het koppelen en doorboeken naar de b
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Schakel het koppelen en doorboeken naar de  boekhouding van inkopen uit (facturen van leveranciers worden niet doorgeboekt in de boekhouding)
 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)
 ACCOUNTING_ENABLE_LETTERING=Schakel de afletteren functie in de boekhouding in
+ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
 
 ## Export
 NotExportLettering=Exporteer het afletteren niet bij het genereren van het bestand
 NotifiedExportDate=Geëxporteerde regels markeren als geëxporteerd <span class="warning">(om een regel te wijzigen, moet u de hele transactie verwijderen en opnieuw in de boekhouding opnemen)</span>
 NotifiedValidationDate=Valideer en vergrendel de geëxporteerde items <span class="warning"> (hetzelfde effect als de functie "%s", wijziging en verwijdering van de regels is ZEKER niet mogelijk) </span>
+NotifiedExportFull=Export documents ?
 DateValidationAndLock=Datum validatie en vergrendelen
 ConfirmExportFile=Bevestiging van het genereren van het boekhoudkundige exportbestand ?
 ExportDraftJournal=Journaal exporteren
@@ -398,7 +406,7 @@ SaleLocal=Lokale verkoop
 SaleExport=Verkoop buitenland
 SaleEEC=Verkoop binnen de EU
 SaleEECWithVAT=Verkoop binnen de EU met een btw die niet nul is, dus we veronderstellen dat dit GEEN intracommunautaire verkoop is en de voorgestelde grootboekrekening het standaardproductaccount is.
-SaleEECWithoutVATNumber=Verkoop binnen de EU zonder btw, maar het btw-nummer van een derde partij is niet gedefinieerd. Voor standaardverkoop vallen we terug op het product-grootboekrekening. U kunt indien nodig het btw-nummer van een derde partij of het productaccount aanpassen.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the thirdparty, or change the product account suggested for binding if needed.
 ForbiddenTransactionAlreadyExported=Niet toegestaan: De transactie is gevalideerd en/of geëxporteerd.
 ForbiddenTransactionAlreadyValidated=Niet toegestaan: De transactie is gevalideerd.
 ## Dictionary
@@ -434,14 +442,15 @@ ErrorInvoiceContainsLinesNotYetBoundedShort=Sommige regels op de factuur zijn ni
 ExportNotSupported=Het ingestelde exportformaat wordt niet ondersteund op deze pagina
 BookeppingLineAlreayExists=Reeds doorgeboekte regels
 NoJournalDefined=Geen dagboek ingesteld
-Binded=Geboekte regels
-ToBind=Te boeken regels
-UseMenuToSetBindindManualy=Regels die nog niet zijn gebonden, gebruik het menu <a href="%s"> %s </a> om de binding handmatig te maken
+Binded=Gekoppelde regels
+ToBind=Te koppelen regels
+UseMenuToSetBindindManualy=Regels die nog niet zijn gekoppeld, gebruik het menu <a href="%s"> %s </a> om de koppeling handmatig te maken
 SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Sorry, deze module is niet compatibel met de experimentele functie van situatiefacturen
 AccountancyErrorMismatchLetterCode=Mismatch in afstemmingscode
 AccountancyErrorMismatchBalanceAmount=Het saldo (%s) is niet gelijk aan 0
 AccountancyErrorLetteringBookkeeping=Er zijn fouten opgetreden met betrekking tot de transacties: %s
 ErrorAccountNumberAlreadyExists=Het boekhoudnummer %s bestaat al
+ErrorArchiveAddFile=Can't put "%s" file in archive
 
 ## Import
 ImportAccountingEntries=Boekingen
@@ -468,5 +477,7 @@ 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.
 ExpenseReportJournal=Kostenoverzicht
+DocsAlreadyExportedAreExcluded=Docs already exported are excluded
+ClickToHideAlreadyExportedLines=Click to hide already exported lines
 
 NAccounts=%s accounts
diff --git a/htdocs/langs/nl_NL/main.lang b/htdocs/langs/nl_NL/main.lang
index 86decb8d6fb..870b6d040b6 100644
--- a/htdocs/langs/nl_NL/main.lang
+++ b/htdocs/langs/nl_NL/main.lang
@@ -226,6 +226,7 @@ NoUserGroupDefined=Geen gebruikersgroep gedefinieerd
 Password=Wachtwoord
 PasswordRetype=Repeat your password
 NoteSomeFeaturesAreDisabled=Let op, veel functionaliteiten / modules zijn uitgeschakeld in deze demonstratie.
+YourUserFile=Your user file
 Name=Naam
 NameSlashCompany=Naam / Bedrijf
 Person=Persoon
@@ -897,6 +898,9 @@ MassFilesArea=Omgeving voor bestanden die zijn gebouwd met massa-acties
 ShowTempMassFilesArea=Toon gebied van bestanden gebouwd door massale acties
 ConfirmMassDeletion=Bevestiging bulk verwijdering
 ConfirmMassDeletionQuestion=Weet u zeker dat u de  %s geselecteerde record (s) wilt verwijderen?
+ConfirmMassClone=Bulk clone confirmation
+ConfirmMassCloneQuestion=Select project to clone to
+ConfirmMassCloneToOneProject=Clone to project %s
 RelatedObjects=Gerelateerde objecten
 ClassifyBilled=Classificeer als gefactureerd
 ClassifyUnbilled=Classificeer ongevuld
@@ -912,8 +916,8 @@ ExportFilteredList=Exporteren gefilterde lijst
 ExportList=Exporteer lijst
 ExportOptions=Exporteeropties
 IncludeDocsAlreadyExported=Inclusief reeds geëxporteerde documenten
-ExportOfPiecesAlreadyExportedIsEnable=Export van reeds geëxporteerde stukken is mogelijk
-ExportOfPiecesAlreadyExportedIsDisable=Export van reeds geëxporteerde stukken is uitgeschakeld
+ExportOfPiecesAlreadyExportedIsEnable=Documents already exported are visible and will be exported
+ExportOfPiecesAlreadyExportedIsDisable=Documents already exported are hidden and won't be exported
 AllExportedMovementsWereRecordedAsExported=Alle geëxporteerde bewegingen werden geregistreerd als geëxporteerd
 NotAllExportedMovementsCouldBeRecordedAsExported=Niet alle geëxporteerde bewerkingen kunnen worden geregistreerd als geëxporteerd
 Miscellaneous=Diversen
@@ -1128,6 +1132,7 @@ DeleteFileText=Weet u zeker dat u dit bestand wilt verwijderen?
 ShowOtherLanguages=Toon andere talen
 SwitchInEditModeToAddTranslation=Schakel in de bewerkingsmodus om vertalingen voor deze taal toe te voegen
 NotUsedForThisCustomer=Niet gebruikt voor deze klant
+NotUsedForThisVendor=Not used for this vendor
 AmountMustBePositive=Bedrag moet positief zijn
 ByStatus=Op status
 InformationMessage=Informatie
@@ -1148,14 +1153,14 @@ EventReminder=Herinnering voor evenement
 UpdateForAllLines=Update voor alle lijnen
 OnHold=In de wacht
 Civility=Beleefdheid
-AffectTag=Assign Tag
-AffectUser=Assign User
-SetSupervisor=Set Supervisor
+AffectTag=Assign a Tag
+AffectUser=Assign a User
+SetSupervisor=Set the supervisor
 CreateExternalUser=Externe gebruiker aanmaken
 ConfirmAffectTag=Bulk Tag Assignement
 ConfirmAffectUser=Bulk User Assignement
-ProjectRole=Role assigned on each project
-TasksRole=Role assigned on each task of each project
+ProjectRole=Role assigned on each project/opportunity
+TasksRole=Role assigned on each task (if used)
 ConfirmSetSupervisor=Bulk Supervisor Set
 ConfirmUpdatePrice=Choose a increase/decrease price rate
 ConfirmAffectTagQuestion=Are you sure you want to assign tags to the %s selected record(s)?
@@ -1210,3 +1215,10 @@ CreatedByPublicPortal=Created from Public portal
 UserAgent=User Agent
 InternalUser=Interne gebruiker
 ExternalUser=Externe gebruiker
+NoSpecificContactAddress=No specific contact or address
+NoSpecificContactAddressBis=This tab is dedicated to force specific contacts or addresses for the current object. Use it only if you want to define one or several specific contacts or addresses for the object when the information on the thirdparty is not enough or not accurate.
+HideOnVCard=Hide %s
+AddToContacts=Add address to my contacts
+LastAccess=Last access
+UploadAnImageToSeeAPhotoHere=Upload an image from the tab %s to see a photo here
+LastPasswordChangeDate=Last password change date
diff --git a/htdocs/langs/nl_NL/stripe.lang b/htdocs/langs/nl_NL/stripe.lang
index 907a444c058..ed0186b5d82 100644
--- a/htdocs/langs/nl_NL/stripe.lang
+++ b/htdocs/langs/nl_NL/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe-module instellen
-StripeDesc=Offer your customers an online payment page for payments with credit/debit cards via <a href="https://www.stripe.com" target="_blank" rel="noopener noreferrer external">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, ...)
+StripeDesc=Bied uw klanten een online betaalpagina voor betalingen met creditcards/betaalkaarten via <a href="https://www.stripe.com" target="_blank" rel="noopener noreferrer external"> Stripe </a> . Dit kan worden gebruikt om uw klanten ad-hoc betalingen te laten doen of voor betalingen met betrekking tot een bepaald Dolibarr-object (factuur, bestelling, ...)
 StripeOrCBDoPayment=Betaal met creditcard of Stripe
 FollowingUrlAreAvailableToMakePayments=De volgende URL's zijn beschikbaar om een pagina te bieden aan afnemers voor het doen van een betaling van Dolibarr objecten
 PaymentForm=Betalingsformulier
@@ -41,7 +41,8 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook live sleutel
 ONLINE_PAYMENT_WAREHOUSE=Voorraad voor voorraadafname wanneer online betaling is voltooid <br> (TODO Wanneer optie om voorraad te verminderen wordt gedaan op een actie op factuur en de online betaling zelf de factuur genereert?)
 StripeLiveEnabled=Stripe live ingeschakeld (anders test / sandbox-modus)
 StripeImportPayment=Streepbetalingen importeren
-ExampleOfTestCreditCard=Voorbeeld van creditcard voor test: %s => geldig, %s => error CVC, %s => verlopen, %s => belasten mislukt
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+ExampleOfTestBankAcountForSEPA=Example of bank account BAN for direct debit test: %s
 StripeGateways=Stripe gateways
 OAUTH_STRIPE_TEST_ID=Stripe Connect-client-ID (ca _...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect-client-ID (ca _...)
@@ -61,6 +62,7 @@ DeleteACard=Kaart verwijderen
 ConfirmDeleteCard=Weet u zeker dat u deze creditcard of betaalpas wilt verwijderen?
 CreateCustomerOnStripe=Creëer klant op Stripe
 CreateCardOnStripe=Maak een kaart op Stripe
+CreateBANOnStripe=Create bank on Stripe
 ShowInStripe=Toon in streep
 StripeUserAccountForActions=Gebruikersaccount om te gebruiken voor e-mailmeldingen van sommige Stripe-evenementen (Stripe-uitbetalingen)
 StripePayoutList=Lijst met Stripe uitbetalingen
@@ -69,3 +71,8 @@ ToOfferALinkForLiveWebhook=Link om Stripe WebHook in te stellen om de IPN te bel
 PaymentWillBeRecordedForNextPeriod=De betaling wordt geregistreerd voor de volgende periode.
 ClickHereToTryAgain=<a href="%s">Klik hier om het opnieuw te proberen ...</a>
 CreationOfPaymentModeMustBeDoneFromStripeInterface=Vanwege de strenge regels voor klantauthenticatie moet het aanmaken van een kaart worden gedaan vanuit Stripe backoffice. U kunt hier klikken om Stripe-klantrecord in te schakelen: %s
+STRIPE_CARD_PRESENT=Card Present for Stripe Terminals
+TERMINAL_LOCATION=Location (address) for Stripe Terminals
+RequestDirectDebitWithStripe=Request Direct Debit with Stripe
+STRIPE_SEPA_DIRECT_DEBIT=Enable the Direct Debit payments through Stripe
+
diff --git a/htdocs/langs/nl_NL/ticket.lang b/htdocs/langs/nl_NL/ticket.lang
index 644874336a5..8dbed0b7a00 100644
--- a/htdocs/langs/nl_NL/ticket.lang
+++ b/htdocs/langs/nl_NL/ticket.lang
@@ -26,6 +26,7 @@ Permission56002=Aanpassen tickets
 Permission56003=Verwijder tickets
 Permission56004=Beheer tickets
 Permission56005=Bekijk tickets van alle derde partijen (niet van toepassing voor externe gebruikers, altijd beperkt tot de derde partij waarvan ze afhankelijk zijn)
+Permission56006=Export tickets
 
 Tickets=Tickets
 TicketDictType=Ticket - Types
@@ -61,6 +62,8 @@ TypeContact_ticket_external_CONTRIBUTOR=Externe bijdrager
 OriginEmail=E-mail van de melder
 Notify_TICKET_SENTBYMAIL=Verzend ticketbericht per e-mail
 
+ExportDataset_ticket_1=Tickets
+
 # Status
 Read=Gelezen
 Assigned=Toegekend
diff --git a/htdocs/langs/nl_NL/users.lang b/htdocs/langs/nl_NL/users.lang
index d49b9b1dfa4..6f4b2c626f0 100644
--- a/htdocs/langs/nl_NL/users.lang
+++ b/htdocs/langs/nl_NL/users.lang
@@ -66,7 +66,8 @@ LinkedToDolibarrUser=Link naar gebruiker
 LinkedToDolibarrThirdParty=Link naar relatie
 CreateDolibarrLogin=Maak Dolibarr account
 CreateDolibarrThirdParty=Creëer nieuwe klant
-LoginAccountDisableInDolibarr=Account uitgeschakeld in Dolibarr.
+LoginAccountDisableInDolibarr=Account disabled in Dolibarr
+PASSWORDInDolibarr=Password modified in Dolibarr
 UsePersonalValue=Gebruik persoonlijke waarde
 ExportDataset_user_1=Gebruikers en hun eigenschappen
 DomainUser=Domeingebruikersaccount %s
@@ -129,3 +130,6 @@ IPLastLogin=IP laatste login
 IPPreviousLogin=IP vorige login
 ShowAllPerms=Show all permission rows
 HideAllPerms=Hide all permission rows
+UserPublicPageDesc=You can enable a virtual card for this user. An url with the user profile and a barcode will be available to allow anybody with a smartphone to scan it and add your contact to its address book.
+EnablePublicVirtualCard=Enable the public virtual user card
+PublicVirtualCardUrl=Public virtual user card
diff --git a/htdocs/langs/pl_PL/accountancy.lang b/htdocs/langs/pl_PL/accountancy.lang
index 0ef6acabde7..6937e9f5584 100644
--- a/htdocs/langs/pl_PL/accountancy.lang
+++ b/htdocs/langs/pl_PL/accountancy.lang
@@ -14,8 +14,8 @@ ACCOUNTING_EXPORT_ENDLINE=Wybierz typ powrotu karetki
 ACCOUNTING_EXPORT_PREFIX_SPEC=Przedrostek w nazwie pliku
 ThisService=Ta usługa
 ThisProduct=Ten produkt
-DefaultForService=Domyślny dla usługi
-DefaultForProduct=Domyślny dla produktu
+DefaultForService=Default for services
+DefaultForProduct=Default for products
 ProductForThisThirdparty=Produkt dla tego kontrahenta
 ServiceForThisThirdparty=Usługa dla tego kontrahenta
 CantSuggest=Nie mogę zasugerować
@@ -101,7 +101,8 @@ ShowAccountingAccount=Wyświetl konta księgowe
 ShowAccountingJournal=Wyświetl dziennik konta księgowego
 ShowAccountingAccountInLedger=Pokaż konto księgowe w księdze
 ShowAccountingAccountInJournals=Pokaż konto księgowe w dziennikach
-AccountAccountingSuggest=Zalecane konto rachunkowe
+DataUsedToSuggestAccount=Data used to suggest account
+AccountAccountingSuggest=Account suggested
 MenuDefaultAccounts=Domyślne konta
 MenuBankAccounts=Konta bankowe
 MenuVatAccounts=Konta VAT
@@ -126,6 +127,7 @@ WriteBookKeeping=Record transactions in accounting
 Bookkeeping=Księga główna
 BookkeepingSubAccount=Subledger
 AccountBalance=Bilans konta
+AccountBalanceSubAccount=Sub-accounts balance
 ObjectsRef=Obiekt źródłowy ref
 CAHTF=Łącznie sprzedawca przed opodatkowaniem
 TotalExpenseReport=Raport z całkowitych wydatków
@@ -189,6 +191,7 @@ ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Account (from the Chart Of Account) to be us
 UseAuxiliaryAccountOnCustomerDeposit=Store customer account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
 ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Account (from the Chart Of Account) to be used as the default
 UseAuxiliaryAccountOnSupplierDeposit=Store supplier account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
+ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY=Accounting account by default to register customer retained warranty
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased within same country (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased from EEC to another EEC country (used if not defined in the product sheet)
@@ -218,6 +221,7 @@ JournalLabel=Etykieta czasopisma
 NumPiece=ilość sztuk
 TransactionNumShort=Numer transakcji
 AccountingCategory=Custom group of accounts
+AccountingCategories=Custom groups of accounts
 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.
@@ -265,6 +269,7 @@ ShowSubtotalByGroup=Pokaż sumę częściową według poziomu
 
 Pcgtype=Grupa konta
 PcgtypeDesc=Grupa kont jest używana jako predefiniowane kryteria „filtru” i „grupowania” w niektórych raportach księgowych. Na przykład „DOCHÓD” lub „WYDATEK” są używane jako grupy dla kont księgowych produktów w celu utworzenia raportu kosztów / dochodów.
+AccountingCategoriesDesc=Custom group of accounts can be used to group accounting accounts into one name to ease filter use or building of custom reports.
 
 Reconcilable=Do pogodzenia
 
@@ -294,6 +299,7 @@ DescValidateMovements=Jakakolwiek modyfikacja lub usunięcie pisma, napisów i u
 
 ValidateHistory=Dowiąż automatycznie
 AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
+DoManualBindingForFailedRecord=You have to do a manual link for the %s row(s) not linked automatically.
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot remove or disable this account of chart of account because it is used
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s & Credit = %s
@@ -337,11 +343,13 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=Wyłącz powiązanie i przeniesienie w księ
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Wyłącz powiązanie i przeniesienie w księgowości zakupów (faktury dostawcy nie będą brane pod uwagę w księgowości)
 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)
 ACCOUNTING_ENABLE_LETTERING=Enable the lettering function in the accounting
+ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
 
 ## Export
 NotExportLettering=Do not export the lettering when generating the file
 NotifiedExportDate=Flag exported lines as Exported <span class="warning">(to modify a line, you will need to delete the whole transaction and re-transfert it into accounting)</span>
 NotifiedValidationDate=Validate and Lock the exported entries <span class="warning">(same effect than the "%s" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+NotifiedExportFull=Export documents ?
 DateValidationAndLock=Date validation and lock
 ConfirmExportFile=Potwierdzenie wygenerowania pliku eksportu księgowości ?
 ExportDraftJournal=Export dziennika projektu
@@ -398,7 +406,7 @@ SaleLocal=Sprzedaż lokalna
 SaleExport=Sprzedaż eksportowa
 SaleEEC=Sprzedaż w EWG
 SaleEECWithVAT=Sprzedaż w EWG z podatkiem VAT niezerowym, więc przypuszczamy, że NIE jest to sprzedaż wewnątrzwspólnotowa, a sugerowane konto to standardowe konto produktu.
-SaleEECWithoutVATNumber=Sprzedaż w EWG bez podatku VAT, ale identyfikator VAT strony trzeciej nie jest zdefiniowany. Wracamy na konto produktu dla sprzedaży standardowej. W razie potrzeby możesz poprawić identyfikator VAT strony trzeciej lub konto produktu.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the thirdparty, or change the product account suggested for binding if needed.
 ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
 ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
 ## Dictionary
@@ -442,6 +450,7 @@ AccountancyErrorMismatchLetterCode=Mismatch in reconcile code
 AccountancyErrorMismatchBalanceAmount=The balance (%s) is not equal to 0
 AccountancyErrorLetteringBookkeeping=Errors have occurred concerning the transactions: %s
 ErrorAccountNumberAlreadyExists=The accounting number %s already exists
+ErrorArchiveAddFile=Can't put "%s" file in archive
 
 ## Import
 ImportAccountingEntries=Zapisy księgowe
@@ -468,5 +477,7 @@ FECFormatMulticurrencyCode=Kod wielowalutowy (Idevise)
 DateExport=Eksport daty
 WarningReportNotReliable=Ostrzeżenie, ten raport nie jest oparty na księdze, więc nie zawiera transakcji zmodyfikowanych ręcznie w księdze. Jeśli dziennikarstwo jest aktualne, widok księgowości jest dokładniejszy.
 ExpenseReportJournal=Dziennik wydatków
+DocsAlreadyExportedAreExcluded=Docs already exported are excluded
+ClickToHideAlreadyExportedLines=Click to hide already exported lines
 
 NAccounts=%s kont
diff --git a/htdocs/langs/pl_PL/main.lang b/htdocs/langs/pl_PL/main.lang
index 5599bd29939..a2d532e708f 100644
--- a/htdocs/langs/pl_PL/main.lang
+++ b/htdocs/langs/pl_PL/main.lang
@@ -226,6 +226,7 @@ NoUserGroupDefined=Niezdefiniowano grup użytkowników
 Password=Hasło
 PasswordRetype=Repeat your password
 NoteSomeFeaturesAreDisabled=Należy pamiętać, że wiele funkcji/modułów jest wyłączonych w tej demonstracji.
+YourUserFile=Your user file
 Name=Nazwa
 NameSlashCompany=Nazwa / Firma
 Person=Osoba
@@ -897,6 +898,9 @@ MassFilesArea=Obszar plików zbudowanych masowo
 ShowTempMassFilesArea=Wyświetl obszar plików zbudowanych masowo
 ConfirmMassDeletion=Potwierdzenie usuwania zbiorczego
 ConfirmMassDeletionQuestion=Czy na pewno chcesz usunąć wybrane rekordy %s?
+ConfirmMassClone=Bulk clone confirmation
+ConfirmMassCloneQuestion=Select project to clone to
+ConfirmMassCloneToOneProject=Clone to project %s
 RelatedObjects=Powiązane obiekty
 ClassifyBilled=Oznacz jako zafakturowana
 ClassifyUnbilled=Klasyfikuj niezafakturowane
@@ -912,8 +916,8 @@ ExportFilteredList=Eksportuj przefiltrowaną listę
 ExportList=Eksportuj listę
 ExportOptions=Opcje eksportu
 IncludeDocsAlreadyExported=Uwzględnij dokumenty już wyeksportowane
-ExportOfPiecesAlreadyExportedIsEnable=Eksport już wyeksportowanych elementów jest włączony
-ExportOfPiecesAlreadyExportedIsDisable=Eksport już wyeksportowanych elementów jest wyłączony
+ExportOfPiecesAlreadyExportedIsEnable=Documents already exported are visible and will be exported
+ExportOfPiecesAlreadyExportedIsDisable=Documents already exported are hidden and won't be exported
 AllExportedMovementsWereRecordedAsExported=Wszystkie eksportowane przemieszczenia były rejestrowane jako eksportowane
 NotAllExportedMovementsCouldBeRecordedAsExported=Nie wszystkie wyeksportowane przepływy można było zarejestrować jako wyeksportowane
 Miscellaneous=Różne
@@ -1128,6 +1132,7 @@ DeleteFileText=Czy na pewno chcesz usunąć ten plik?
 ShowOtherLanguages=Pokaż inne języki
 SwitchInEditModeToAddTranslation=Przełącz się w tryb edycji, aby dodać tłumaczenia dla tego języka
 NotUsedForThisCustomer=Nieużywany dla tego klienta
+NotUsedForThisVendor=Not used for this vendor
 AmountMustBePositive=Kwota musi być dodatnia
 ByStatus=Według statusu
 InformationMessage=Informacja
@@ -1148,14 +1153,14 @@ EventReminder=Przypomnienie o wydarzeniu
 UpdateForAllLines=Aktualizacja dla wszystkich linii
 OnHold=Wstrzymany
 Civility=Grzeczność
-AffectTag=Assign Tag
-AffectUser=Assign User
-SetSupervisor=Set Supervisor
+AffectTag=Assign a Tag
+AffectUser=Assign a User
+SetSupervisor=Set the supervisor
 CreateExternalUser=Utwórz użytkownika zewnętrznego
 ConfirmAffectTag=Bulk Tag Assignement
 ConfirmAffectUser=Bulk User Assignement
-ProjectRole=Role assigned on each project
-TasksRole=Role assigned on each task of each project
+ProjectRole=Role assigned on each project/opportunity
+TasksRole=Role assigned on each task (if used)
 ConfirmSetSupervisor=Bulk Supervisor Set
 ConfirmUpdatePrice=Choose a increase/decrease price rate
 ConfirmAffectTagQuestion=Are you sure you want to assign tags to the %s selected record(s)?
@@ -1210,3 +1215,10 @@ CreatedByPublicPortal=Created from Public portal
 UserAgent=User Agent
 InternalUser=Wewnętrzny użytkownik
 ExternalUser=Zewnętrzny użytkownik
+NoSpecificContactAddress=No specific contact or address
+NoSpecificContactAddressBis=This tab is dedicated to force specific contacts or addresses for the current object. Use it only if you want to define one or several specific contacts or addresses for the object when the information on the thirdparty is not enough or not accurate.
+HideOnVCard=Hide %s
+AddToContacts=Add address to my contacts
+LastAccess=Last access
+UploadAnImageToSeeAPhotoHere=Upload an image from the tab %s to see a photo here
+LastPasswordChangeDate=Last password change date
diff --git a/htdocs/langs/pl_PL/stripe.lang b/htdocs/langs/pl_PL/stripe.lang
index b0de9e9fa15..c57eb260635 100644
--- a/htdocs/langs/pl_PL/stripe.lang
+++ b/htdocs/langs/pl_PL/stripe.lang
@@ -41,7 +41,8 @@ STRIPE_LIVE_WEBHOOK_KEY=Aktywny klucz webhooka
 ONLINE_PAYMENT_WAREHOUSE=Zapasy do wykorzystania w celu zmniejszenia zapasów po dokonaniu płatności online <br> (DO ZROBIENIA Kiedy opcja zmniejszenia zapasów jest realizowana na podstawie faktury i płatność online generuje fakturę?)
 StripeLiveEnabled=Stripe na żywo włączony (w przeciwnym razie tryb testowy / piaskownicy)
 StripeImportPayment=Importuj płatności Stripe
-ExampleOfTestCreditCard=Przykład karty kredytowej do testu: %s => ważna, %s => błąd CVC, %s => wygasła, %s => opłata nie powiodła się
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+ExampleOfTestBankAcountForSEPA=Example of bank account BAN for direct debit test: %s
 StripeGateways=Bramy Stripe
 OAUTH_STRIPE_TEST_ID=Identyfikator klienta Stripe Connect (ca _...)
 OAUTH_STRIPE_LIVE_ID=Identyfikator klienta Stripe Connect (ca _...)
@@ -61,6 +62,7 @@ DeleteACard=Usuń kartę
 ConfirmDeleteCard=Czy na pewno chcesz usunąć tę kartę kredytową lub debetową?
 CreateCustomerOnStripe=Utwórz klienta w Stripe
 CreateCardOnStripe=Utwórz kartę w Stripe
+CreateBANOnStripe=Create bank on Stripe
 ShowInStripe=Pokaż w Stripe
 StripeUserAccountForActions=Konto użytkownika używane do powiadamiania e-mailem o niektórych wydarzeniach Stripe (wypłaty Stripe)
 StripePayoutList=Lista wypłat Stripe
@@ -69,3 +71,8 @@ ToOfferALinkForLiveWebhook=Łącze do konfiguracji Stripe WebHook w celu wywoła
 PaymentWillBeRecordedForNextPeriod=Płatność zostanie zarejestrowana za następny okres.
 ClickHereToTryAgain= <a href="%s"> Kliknij tutaj, aby spróbować ponownie ... </a>
 CreationOfPaymentModeMustBeDoneFromStripeInterface=Ze względu na zasady silnego uwierzytelniania klienta, karta musi zostać utworzona z backoffice Stripe. Możesz kliknąć tutaj, aby włączyć rekord klienta Stripe: %s
+STRIPE_CARD_PRESENT=Card Present for Stripe Terminals
+TERMINAL_LOCATION=Location (address) for Stripe Terminals
+RequestDirectDebitWithStripe=Request Direct Debit with Stripe
+STRIPE_SEPA_DIRECT_DEBIT=Enable the Direct Debit payments through Stripe
+
diff --git a/htdocs/langs/pl_PL/ticket.lang b/htdocs/langs/pl_PL/ticket.lang
index 7adef728a31..8cdbeb6c627 100644
--- a/htdocs/langs/pl_PL/ticket.lang
+++ b/htdocs/langs/pl_PL/ticket.lang
@@ -26,6 +26,7 @@ Permission56002=Modyfikuj bilety
 Permission56003=Usuwaj bilety
 Permission56004=Zarządzaj biletami
 Permission56005=Zobacz bilety wszystkich stron trzecich (nie dotyczy użytkowników zewnętrznych, zawsze ograniczaj się do strony trzeciej, od której są zależni)
+Permission56006=Export tickets
 
 Tickets=Bilety
 TicketDictType=Bilet - Typ
@@ -61,6 +62,8 @@ TypeContact_ticket_external_CONTRIBUTOR=Współpracownik zewnętrzny
 OriginEmail=E-mail reportera
 Notify_TICKET_SENTBYMAIL=Wyślij wiadomość e-mail z biletem
 
+ExportDataset_ticket_1=Bilety
+
 # Status
 Read=Czytać
 Assigned=Przydzielony
diff --git a/htdocs/langs/pl_PL/users.lang b/htdocs/langs/pl_PL/users.lang
index ca34b92052d..ec003f63610 100644
--- a/htdocs/langs/pl_PL/users.lang
+++ b/htdocs/langs/pl_PL/users.lang
@@ -66,7 +66,8 @@ LinkedToDolibarrUser=Link to user
 LinkedToDolibarrThirdParty=Link to third party
 CreateDolibarrLogin=Utwórz użytkownika
 CreateDolibarrThirdParty=Utwórz kontrahenta
-LoginAccountDisableInDolibarr=Konto wyłączone w Dolibarr.
+LoginAccountDisableInDolibarr=Account disabled in Dolibarr
+PASSWORDInDolibarr=Password modified in Dolibarr
 UsePersonalValue=Użyj wartości osobowych
 ExportDataset_user_1=Użytkownicy i ich właściwości
 DomainUser=Domena użytkownika %s
@@ -129,3 +130,6 @@ IPLastLogin=IP last login
 IPPreviousLogin=IP previous login
 ShowAllPerms=Show all permission rows
 HideAllPerms=Hide all permission rows
+UserPublicPageDesc=You can enable a virtual card for this user. An url with the user profile and a barcode will be available to allow anybody with a smartphone to scan it and add your contact to its address book.
+EnablePublicVirtualCard=Enable the public virtual user card
+PublicVirtualCardUrl=Public virtual user card
diff --git a/htdocs/langs/pt_AO/companies.lang b/htdocs/langs/pt_AO/companies.lang
new file mode 100644
index 00000000000..68a71bb368e
--- /dev/null
+++ b/htdocs/langs/pt_AO/companies.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - companies
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> with this vendor
+HasNoRelativeDiscountFromSupplier=No default relative discount with this vendor
diff --git a/htdocs/langs/pt_AO/stripe.lang b/htdocs/langs/pt_AO/stripe.lang
new file mode 100644
index 00000000000..14335fc610b
--- /dev/null
+++ b/htdocs/langs/pt_AO/stripe.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - stripe
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
diff --git a/htdocs/langs/pt_BR/accountancy.lang b/htdocs/langs/pt_BR/accountancy.lang
index d07989be671..e310bf86af9 100644
--- a/htdocs/langs/pt_BR/accountancy.lang
+++ b/htdocs/langs/pt_BR/accountancy.lang
@@ -10,7 +10,6 @@ Selectformat=Selecione o formato do arquivo
 ACCOUNTING_EXPORT_FORMAT=Selecione o formato do arquivo
 ACCOUNTING_EXPORT_ENDLINE=Selecione o tipo de retorno do frete
 ACCOUNTING_EXPORT_PREFIX_SPEC=Especifique o prefixo do nome do arquivo
-DefaultForService=Padrão para serviço
 ProductForThisThirdparty=Produto para este terceiro
 ServiceForThisThirdparty=Serviço para este terceiro
 CantSuggest=Não posso sugerir
@@ -56,7 +55,6 @@ SubledgerAccount=Conta Subledger
 SubledgerAccountLabel=Rótulo da conta de subconta
 ShowAccountingAccount=Mostrar conta contábil
 ShowAccountingJournal=Mostrar contabilidade
-AccountAccountingSuggest=Sugerir Conta de Contabilidade
 MenuBankAccounts=Contas bancárias
 MenuVatAccounts=Contas de Impostos sobre valor agregado
 MenuLoanAccounts=Contas de empréstimos
@@ -196,7 +194,6 @@ SaleLocal=Venda local
 SaleExport=Venda de exportação
 SaleEEC=Venda na CEE
 SaleEECWithVAT=A venda na CEE com um IVA não nulo; portanto, supomos que essa NÃO seja uma venda intracomunitária e a conta sugerida é a conta padrão do produto.
-SaleEECWithoutVATNumber=Venda na CEE sem IVA, mas o ID do IVA de terceiros não está definido. Recorremos à conta do produto para vendas padrão. Você pode corrigir o ID do IVA de terceiros ou a conta do produto, se necessário.
 Range=Faixa da conta da Contabilidade
 ConfirmMassDeleteBookkeepingWriting=Confirmação exclusão em massa
 SomeMandatoryStepsOfSetupWereNotDone=Algumas etapas obrigatórias de configuração não foram feitas, preencha-as
diff --git a/htdocs/langs/pt_BR/main.lang b/htdocs/langs/pt_BR/main.lang
index 3f2e6fa8a94..d38b4871ea8 100644
--- a/htdocs/langs/pt_BR/main.lang
+++ b/htdocs/langs/pt_BR/main.lang
@@ -477,8 +477,6 @@ BackOffice=Fundo do escritório
 View=Visão
 Exports=Exportações
 IncludeDocsAlreadyExported=Incluir documentos já exportados
-ExportOfPiecesAlreadyExportedIsEnable=A exportação de peças já exportadas está habilitada
-ExportOfPiecesAlreadyExportedIsDisable=A exportação de peças já exportadas está desabilitada
 AllExportedMovementsWereRecordedAsExported=Todos as movimentações exportadas foram salvos como exportadas
 NotAllExportedMovementsCouldBeRecordedAsExported=Nem todos as movimentações exportadas puderam ser salvas como exportadas
 Miscellaneous=Variados
diff --git a/htdocs/langs/pt_BR/stripe.lang b/htdocs/langs/pt_BR/stripe.lang
index 84661452168..6a94248de2b 100644
--- a/htdocs/langs/pt_BR/stripe.lang
+++ b/htdocs/langs/pt_BR/stripe.lang
@@ -22,7 +22,7 @@ STRIPE_LIVE_SECRET_KEY=Chave ao vivo secreta
 STRIPE_LIVE_PUBLISHABLE_KEY=Chave editável
 StripeLiveEnabled=Boleto ativado (caso contrário teste / modo cx)
 StripeImportPayment=Importação de pagamentos de franquia
-ExampleOfTestCreditCard=Exemplo de cartão de crédito para teste: %s => válido, %s => error CVC, %s => expired, %s => charge fails
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
 StripeAccount=Conta Stripe
 StripeTransactionList=Lista de transações Stripe
 LocalID=ID local
diff --git a/htdocs/langs/pt_BR/users.lang b/htdocs/langs/pt_BR/users.lang
index 4c47e51f0bd..1bbf7404fed 100644
--- a/htdocs/langs/pt_BR/users.lang
+++ b/htdocs/langs/pt_BR/users.lang
@@ -39,7 +39,6 @@ CreateGroup=Criar grupo
 PasswordChangedAndSentTo=Senha alterada e enviada a <b>%s</b>.
 PasswordChangeRequest=Pedido para alterar a senha para <b> %s </b>
 PasswordChangeRequestSent=Solicitação para alterar a senha para <b>%s</b> enviada a <b>%s</b>.
-IfLoginExistPasswordRequestSent=Se este login for uma conta válida, um e-mail para redefinir a senha foi enviado.
 IfEmailExistPasswordRequestSent=Se este e-mail for uma conta válida, um e-mail para redefinir a senha foi enviado.
 ConfirmPasswordReset=Confirmar restauração da senha
 MenuUsersAndGroups=Usuários e Grupos
@@ -58,7 +57,6 @@ LinkedToDolibarrUser=Link para o usuário
 LinkedToDolibarrThirdParty=Link para terceiro
 CreateDolibarrLogin=Criar uma usuário
 CreateDolibarrThirdParty=Criar um fornecedor
-LoginAccountDisableInDolibarr=A conta está desativada no Dolibarr
 ExportDataset_user_1=Usuários e suas propriedades
 DomainUser=Usuário de Domínio
 CreateInternalUserDesc=Este formulário permite que você crie um usuário interno em sua empresa / organização. Para criar um usuário externo (cliente, fornecedor, etc.), use o botão 'Criar usuário Dolibarr' do cartão de contato de terceiros.
@@ -96,6 +94,7 @@ UserAccountancyCode=Código de contabilidade do usuário
 UserLogoff=Usuário desconetado
 UserLogged=Usuário Conectado
 DateOfEmployment=Data de emprego
+DateEmploymentStart=Data de Início do Emprego
 DateEmploymentEnd=Data de término do emprego
 CantDisableYourself=Você não pode desativar seu próprio registro de usuário
 ForceUserExpenseValidator=Forçar validação do relatório de despesas
@@ -104,3 +103,4 @@ ValidatorIsSupervisorByDefault=Por padrão, a validação é feita pelo supervis
 UserPersonalEmail=E-mail pessoal
 UserPersonalMobile=Celular pessoal
 WarningNotLangOfInterface=Atenção, este é o idioma principal do usuário, não o idioma da interface que ele escolheu ver. Para alterar o idioma da interface visível por este usuário, vá na guia %s
+DateLastLogin=Data do último acesso
diff --git a/htdocs/langs/pt_MZ/accountancy.lang b/htdocs/langs/pt_MZ/accountancy.lang
index 3aee8edcbad..56cefc50397 100644
--- a/htdocs/langs/pt_MZ/accountancy.lang
+++ b/htdocs/langs/pt_MZ/accountancy.lang
@@ -10,7 +10,6 @@ Selectformat=Selecione o formato do arquivo
 ACCOUNTING_EXPORT_FORMAT=Selecione o formato do arquivo
 ACCOUNTING_EXPORT_ENDLINE=Selecione o tipo de retorno do frete
 ACCOUNTING_EXPORT_PREFIX_SPEC=Especifique o prefixo do nome do arquivo
-DefaultForService=Padrão para serviço
 ProductForThisThirdparty=Produto para este terceiro
 ServiceForThisThirdparty=Serviço para este terceiro
 CantSuggest=Não posso sugerir
@@ -56,7 +55,6 @@ SubledgerAccount=Conta Subledger
 SubledgerAccountLabel=Rótulo da conta de subconta
 ShowAccountingAccount=Mostrar conta contábil
 ShowAccountingJournal=Mostrar contabilidade
-AccountAccountingSuggest=Sugerir Conta de Contabilidade
 MenuBankAccounts=Contas bancárias
 MenuVatAccounts=Contas de Impostos sobre valor agregado
 MenuLoanAccounts=Contas de empréstimos
@@ -197,7 +195,6 @@ SaleLocal=Venda local
 SaleExport=Venda de exportação
 SaleEEC=Venda na CEE
 SaleEECWithVAT=A venda na CEE com um IVA não nulo; portanto, supomos que essa NÃO seja uma venda intracomunitária e a conta sugerida é a conta padrão do produto.
-SaleEECWithoutVATNumber=Venda na CEE sem IVA, mas o ID do IVA de terceiros não está definido. Recorremos à conta do produto para vendas padrão. Você pode corrigir o ID do IVA de terceiros ou a conta do produto, se necessário.
 Range=Faixa da conta da Contabilidade
 ConfirmMassDeleteBookkeepingWriting=Confirmação exclusão em massa
 SomeMandatoryStepsOfSetupWereNotDone=Algumas etapas obrigatórias de configuração não foram feitas, preencha-as
diff --git a/htdocs/langs/pt_MZ/main.lang b/htdocs/langs/pt_MZ/main.lang
index 60e6ab46245..13b20a305eb 100644
--- a/htdocs/langs/pt_MZ/main.lang
+++ b/htdocs/langs/pt_MZ/main.lang
@@ -134,7 +134,6 @@ Recenter=Recolocar no centro
 User=Usuário
 Users=Usuário
 NoUserGroupDefined=Nenhum grupo definido pelo usuário
-PasswordRetype=Repetir Senha
 NoteSomeFeaturesAreDisabled=Antenção, só poucos módulos/funcionalidade foram ativados nesta demo
 NameSlashCompany=Nome / Companhia
 PersonalValue=Valor Personalizado
@@ -471,8 +470,6 @@ BackOffice=Fundo do escritório
 View=Visão
 Exports=Exportações
 IncludeDocsAlreadyExported=Incluir documentos já exportados
-ExportOfPiecesAlreadyExportedIsEnable=A exportação de peças já exportadas está habilitada
-ExportOfPiecesAlreadyExportedIsDisable=A exportação de peças já exportadas está desabilitada
 AllExportedMovementsWereRecordedAsExported=Todos as movimentações exportadas foram salvos como exportadas
 NotAllExportedMovementsCouldBeRecordedAsExported=Nem todos as movimentações exportadas puderam ser salvas como exportadas
 Miscellaneous=Variados
@@ -575,3 +572,5 @@ DateOfBirth=Data de nascimento
 OnHold=Em espera
 ClientTZ=Fuso Horário do cliente (usuário)
 Terminate=Concluir
+InternalUser=Usuário Interno
+ExternalUser=Usuário Externo
diff --git a/htdocs/langs/pt_MZ/stripe.lang b/htdocs/langs/pt_MZ/stripe.lang
new file mode 100644
index 00000000000..14335fc610b
--- /dev/null
+++ b/htdocs/langs/pt_MZ/stripe.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - stripe
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
diff --git a/htdocs/langs/pt_PT/accountancy.lang b/htdocs/langs/pt_PT/accountancy.lang
index b66888e673e..c8e0c0f4c72 100644
--- a/htdocs/langs/pt_PT/accountancy.lang
+++ b/htdocs/langs/pt_PT/accountancy.lang
@@ -14,8 +14,8 @@ ACCOUNTING_EXPORT_ENDLINE=Selecione o tipo de retorno de carro
 ACCOUNTING_EXPORT_PREFIX_SPEC=Especifique o prefixo para o nome de ficheiro
 ThisService=Este serviço
 ThisProduct=Este produto
-DefaultForService=Padrão para o serviço
-DefaultForProduct=Padrão para o produto
+DefaultForService=Default for services
+DefaultForProduct=Default for products
 ProductForThisThirdparty=Product for this thirdparty
 ServiceForThisThirdparty=Service for this thirdparty
 CantSuggest=Não pode sugerir
@@ -101,7 +101,8 @@ ShowAccountingAccount=Mostrar conta contabilística
 ShowAccountingJournal=Mostrar diário contabilistico
 ShowAccountingAccountInLedger=Show accounting account in ledger
 ShowAccountingAccountInJournals=Show accounting account in journals
-AccountAccountingSuggest=Conta contabilística sugerida
+DataUsedToSuggestAccount=Data used to suggest account
+AccountAccountingSuggest=Account suggested
 MenuDefaultAccounts=Contas padrão
 MenuBankAccounts=Contas Bancárias
 MenuVatAccounts=Contas de IVA
@@ -126,6 +127,7 @@ WriteBookKeeping=Record transactions in accounting
 Bookkeeping=Livro Razão
 BookkeepingSubAccount=Subledger
 AccountBalance=Saldo da conta
+AccountBalanceSubAccount=Sub-accounts balance
 ObjectsRef=Ref de objeto de origem
 CAHTF=Total purchase vendor before tax
 TotalExpenseReport=Relatório da despesa total
@@ -189,6 +191,7 @@ ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Account (from the Chart Of Account) to be us
 UseAuxiliaryAccountOnCustomerDeposit=Store customer account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
 ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Account (from the Chart Of Account) to be used as the default
 UseAuxiliaryAccountOnSupplierDeposit=Store supplier account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
+ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY=Accounting account by default to register customer retained warranty
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased within same country (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased from EEC to another EEC country (used if not defined in the product sheet)
@@ -218,6 +221,7 @@ JournalLabel=Journal label
 NumPiece=Número da peça
 TransactionNumShort=Núm. de transação
 AccountingCategory=Custom group of accounts
+AccountingCategories=Custom groups of accounts
 GroupByAccountAccounting=Group by general ledger account
 GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=Você pode definir aqui alguns grupos de conta contábil. Eles serão usados ​​para relatórios contábeis personalizados.
@@ -265,6 +269,7 @@ ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Grupo de conta
 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.
+AccountingCategoriesDesc=Custom group of accounts can be used to group accounting accounts into one name to ease filter use or building of custom reports.
 
 Reconcilable=Reconcilable
 
@@ -294,6 +299,7 @@ DescValidateMovements=Any modification or deletion of writing, lettering and del
 
 ValidateHistory=Vincular automaticamente
 AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
+DoManualBindingForFailedRecord=You have to do a manual link for the %s row(s) not linked automatically.
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot remove or disable this account of chart of account because it is used
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s & Credit = %s
@@ -337,11 +343,13 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on
 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_ENABLE_LETTERING=Enable the lettering function in the accounting
+ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
 
 ## Export
 NotExportLettering=Do not export the lettering when generating the file
 NotifiedExportDate=Flag exported lines as Exported <span class="warning">(to modify a line, you will need to delete the whole transaction and re-transfert it into accounting)</span>
 NotifiedValidationDate=Validate and Lock the exported entries <span class="warning">(same effect than the "%s" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+NotifiedExportFull=Export documents ?
 DateValidationAndLock=Date validation and lock
 ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Exportar o diário rascunho
@@ -398,7 +406,7 @@ 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.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the thirdparty, or change the product account suggested for binding if needed.
 ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
 ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
 ## Dictionary
@@ -442,6 +450,7 @@ AccountancyErrorMismatchLetterCode=Mismatch in reconcile code
 AccountancyErrorMismatchBalanceAmount=The balance (%s) is not equal to 0
 AccountancyErrorLetteringBookkeeping=Errors have occurred concerning the transactions: %s
 ErrorAccountNumberAlreadyExists=The accounting number %s already exists
+ErrorArchiveAddFile=Can't put "%s" file in archive
 
 ## Import
 ImportAccountingEntries=Entradas contábeis
@@ -468,5 +477,7 @@ FECFormatMulticurrencyCode=Multicurrency code (Idevise)
 DateExport=Date export
 WarningReportNotReliable=Atenção, este relatório não é baseado no Ledger, portanto, não contém transações modificadas manualmente no Ledger. Se a sua periodização estiver atualizada, a visão da contabilidade será mais precisa.
 ExpenseReportJournal=Diário de relatórios de despesas
+DocsAlreadyExportedAreExcluded=Docs already exported are excluded
+ClickToHideAlreadyExportedLines=Click to hide already exported lines
 
 NAccounts=%s accounts
diff --git a/htdocs/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang
index cf05de9fc7e..36f1e6a4894 100644
--- a/htdocs/langs/pt_PT/main.lang
+++ b/htdocs/langs/pt_PT/main.lang
@@ -226,6 +226,7 @@ NoUserGroupDefined=Nenhum grupo de utilizador definido
 Password=Senha
 PasswordRetype=Repeat your password
 NoteSomeFeaturesAreDisabled=Note que estão desativados muitos módulos/funções nesta demonstração.
+YourUserFile=Your user file
 Name=Nome
 NameSlashCompany=Nome / Empresa
 Person=Pessoa
@@ -897,6 +898,9 @@ MassFilesArea=Área para os ficheiros criados através de ações em massa
 ShowTempMassFilesArea=Mostrar área para os ficheiros criados através de ações em massa
 ConfirmMassDeletion=Confirmação de Múltiplas Eliminações
 ConfirmMassDeletionQuestion=Tem a certeza de que quer apagar os %s registo(s) seleccionado(s)?
+ConfirmMassClone=Bulk clone confirmation
+ConfirmMassCloneQuestion=Select project to clone to
+ConfirmMassCloneToOneProject=Clone to project %s
 RelatedObjects=Objetos relacionados
 ClassifyBilled=Classificar como faturado
 ClassifyUnbilled=Classificar como não faturado
@@ -912,8 +916,8 @@ ExportFilteredList=Exportar lista filtrada
 ExportList=Exportar lista
 ExportOptions=Opções de exportação
 IncludeDocsAlreadyExported=Os documentos incluídos já foram exportados
-ExportOfPiecesAlreadyExportedIsEnable=A exportação de pedaços já exportados está activada
-ExportOfPiecesAlreadyExportedIsDisable=A exportação de pedaços já exportados está desactivada.
+ExportOfPiecesAlreadyExportedIsEnable=Documents already exported are visible and will be exported
+ExportOfPiecesAlreadyExportedIsDisable=Documents already exported are hidden and won't be exported
 AllExportedMovementsWereRecordedAsExported=Todos os movimentos exportados foram marcados como exportados
 NotAllExportedMovementsCouldBeRecordedAsExported=Nem todos os movimentos exportados foram marcados como exportados
 Miscellaneous=Diversos
@@ -1128,6 +1132,7 @@ DeleteFileText=Tem a certeza de que quer eliminar este ficheiro?
 ShowOtherLanguages=Mostrar outros idiomas
 SwitchInEditModeToAddTranslation=Mude para o modo de edição para adicionar traduções para este idioma
 NotUsedForThisCustomer=Não utilizado para este cliente
+NotUsedForThisVendor=Not used for this vendor
 AmountMustBePositive=Total deve ser positivo
 ByStatus=Por estado
 InformationMessage=Informação
@@ -1148,14 +1153,14 @@ EventReminder=Lembrete de evento
 UpdateForAllLines=Update for all lines
 OnHold=On hold
 Civility=Civility
-AffectTag=Assign Tag
-AffectUser=Assign User
-SetSupervisor=Set Supervisor
+AffectTag=Assign a Tag
+AffectUser=Assign a User
+SetSupervisor=Set the supervisor
 CreateExternalUser=Create external user
 ConfirmAffectTag=Bulk Tag Assignement
 ConfirmAffectUser=Bulk User Assignement
-ProjectRole=Role assigned on each project
-TasksRole=Role assigned on each task of each project
+ProjectRole=Role assigned on each project/opportunity
+TasksRole=Role assigned on each task (if used)
 ConfirmSetSupervisor=Bulk Supervisor Set
 ConfirmUpdatePrice=Choose a increase/decrease price rate
 ConfirmAffectTagQuestion=Are you sure you want to assign tags to the %s selected record(s)?
@@ -1210,3 +1215,10 @@ CreatedByPublicPortal=Created from Public portal
 UserAgent=User Agent
 InternalUser=Utilizador interno
 ExternalUser=Utilizador externo
+NoSpecificContactAddress=No specific contact or address
+NoSpecificContactAddressBis=This tab is dedicated to force specific contacts or addresses for the current object. Use it only if you want to define one or several specific contacts or addresses for the object when the information on the thirdparty is not enough or not accurate.
+HideOnVCard=Hide %s
+AddToContacts=Add address to my contacts
+LastAccess=Last access
+UploadAnImageToSeeAPhotoHere=Upload an image from the tab %s to see a photo here
+LastPasswordChangeDate=Last password change date
diff --git a/htdocs/langs/pt_PT/ticket.lang b/htdocs/langs/pt_PT/ticket.lang
index 64492af80b7..fa2991bdc0f 100644
--- a/htdocs/langs/pt_PT/ticket.lang
+++ b/htdocs/langs/pt_PT/ticket.lang
@@ -26,6 +26,7 @@ Permission56002=Modificar tickets
 Permission56003=Eliminar tickets
 Permission56004=Gerir tickets
 Permission56005=See tickets of all third parties (not effective for external users, always be limited to the third party they depend on)
+Permission56006=Export tickets
 
 Tickets=Tickets
 TicketDictType=Ticket - Types
@@ -61,6 +62,8 @@ TypeContact_ticket_external_CONTRIBUTOR=Colaborador externo
 OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
+ExportDataset_ticket_1=Tickets
+
 # Status
 Read=Ler
 Assigned=Atribuído
diff --git a/htdocs/langs/pt_PT/users.lang b/htdocs/langs/pt_PT/users.lang
index f09f2d94239..da670f226f7 100644
--- a/htdocs/langs/pt_PT/users.lang
+++ b/htdocs/langs/pt_PT/users.lang
@@ -66,7 +66,8 @@ LinkedToDolibarrUser=Link to user
 LinkedToDolibarrThirdParty=Link to third party
 CreateDolibarrLogin=Criar um Utilizador
 CreateDolibarrThirdParty=Criar um Terceiro
-LoginAccountDisableInDolibarr=A conta está desativada no Dolibarr.
+LoginAccountDisableInDolibarr=Account disabled in Dolibarr
+PASSWORDInDolibarr=Password modified in Dolibarr
 UsePersonalValue=Utilizar valores personalizados
 ExportDataset_user_1=Users and their properties
 DomainUser=Utilizador de Domínio %s
@@ -129,3 +130,6 @@ IPLastLogin=IP last login
 IPPreviousLogin=IP previous login
 ShowAllPerms=Show all permission rows
 HideAllPerms=Hide all permission rows
+UserPublicPageDesc=You can enable a virtual card for this user. An url with the user profile and a barcode will be available to allow anybody with a smartphone to scan it and add your contact to its address book.
+EnablePublicVirtualCard=Enable the public virtual user card
+PublicVirtualCardUrl=Public virtual user card
diff --git a/htdocs/langs/ro_RO/accountancy.lang b/htdocs/langs/ro_RO/accountancy.lang
index 90cb7896f1f..cb7df2b80e1 100644
--- a/htdocs/langs/ro_RO/accountancy.lang
+++ b/htdocs/langs/ro_RO/accountancy.lang
@@ -14,8 +14,8 @@ ACCOUNTING_EXPORT_ENDLINE=Selectați tipul de linie nouă
 ACCOUNTING_EXPORT_PREFIX_SPEC=Specificati prefixul pentru numele fisierului
 ThisService=Acest serviciu
 ThisProduct=Acest produs
-DefaultForService=Implicit pentru serviciu
-DefaultForProduct=Implicit pentru produs
+DefaultForService=Implicit pentru servicii
+DefaultForProduct=Implicit pentru produse
 ProductForThisThirdparty=Produs pentru acest terţ
 ServiceForThisThirdparty=Serviciu pentru acest terţ
 CantSuggest=Nu pot sugera
@@ -101,7 +101,8 @@ ShowAccountingAccount=Afișați contul contabil
 ShowAccountingJournal=Afişare jurnal contabil
 ShowAccountingAccountInLedger=Afişare cont contabil în registrul jurnal
 ShowAccountingAccountInJournals=Afişează conturile contabile în jurnale
-AccountAccountingSuggest=Conturi contabile sugerate
+DataUsedToSuggestAccount=Date utilizate pentru sugerarea unui cont
+AccountAccountingSuggest=Cont sugerat
 MenuDefaultAccounts=Conturi implicite
 MenuBankAccounts=Conturi bancare
 MenuVatAccounts=Conturi de TVA
@@ -126,6 +127,7 @@ WriteBookKeeping=Înregistrează tranzacţiile în contabilitate
 Bookkeeping=Registru jurnal
 BookkeepingSubAccount=Registru jurnal secundar
 AccountBalance=Sold cont
+AccountBalanceSubAccount=Balanță conturi analitice
 ObjectsRef=Referinţă obiect sursă
 CAHTF=Total achiziţii de la furnizor înainte de taxare
 TotalExpenseReport=Total deconturi de cheltuieli
@@ -189,6 +191,7 @@ ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Contul contabil (din Planul de Conturi) va f
 UseAuxiliaryAccountOnCustomerDeposit=Stochează contul de client ca și cont contabil individual în registrul subsidiar pentru liniile de avans (dacă este dezactivat, contul individual pentru liniile de avans va rămâne gol)
 ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Contul contabil (din Planul de Conturi) care va fi folosit în mod implicit
 UseAuxiliaryAccountOnSupplierDeposit=Stocare cont furnizor ca și cont individual în registrul subsidiar pentru liniile de avans (dacă este dezactivat, contul individual pentru liniile de avans va rămâne gol) 
+ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY=Cont contabil implicit pentru înregistrarea garanției reținute de la client
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Cont contabil (din Planul de Conturi) care va fi utilizat ca și cont implicit pentru produsele achiziționate din aceeași țară (utilizat dacă nu este definit în fișa de produs)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Cont contabil (din Planul de Conturi) care va fi utilizat ca și cont implicit pentru produsele achiziționate din CEE către o altă țară CEE (utilizat dacă nu este definit în fișa de produs)
@@ -218,6 +221,7 @@ JournalLabel=Eticheta jurnalului
 NumPiece=Număr notă contabilă
 TransactionNumShort=Nr. tranzacţie
 AccountingCategory=Grupă personalizată de conturi
+AccountingCategories=Grupă personalizată de conturi
 GroupByAccountAccounting=Grupare după cont din registrul jurnal
 GroupBySubAccountAccounting=Grupare după cont de jurnal secundar
 AccountingAccountGroupsDesc=Puteți defini aici câteva grupe de conturi contabile. Acestea vor fi utilizate pentru rapoarte contabile personalizate.
@@ -265,6 +269,7 @@ ShowSubtotalByGroup=Afișează subtotalul după nivel
 
 Pcgtype=Grupă de conturi
 PcgtypeDesc=Grupele de conturi sunt utilizate ca criterii predefinite de 'filtrare' și 'grupare' pentru unele rapoarte contabile. De exemplu, 'VENITURI' sau 'CHELTUIELI' sunt utilizate ca grupe pentru conturile contabile ale produselor pentru a construi raportul de cheltuieli/venituri.
+AccountingCategoriesDesc=Grupa personalizată de conturi poate fi utilizată pentru a grupa conturile contabile sub un singur nume, pentru a ușura utilizarea filtrului sau crearea de rapoarte personalizate.
 
 Reconcilable=Compensabil
 
@@ -294,6 +299,7 @@ DescValidateMovements= Orice modificare sau ștergere a înregistrărilor va fi
 
 ValidateHistory=Asociază automat
 AutomaticBindingDone=Asicierea automată a fost efectuată (%s) - Asocierea automată nu este posibilă pentru unele înregistrări (%s)
+DoManualBindingForFailedRecord=Trebuie să faci o asociere manuală pentru lin(iile) %s care nu sunt legate automat.
 
 ErrorAccountancyCodeIsAlreadyUse=Eroare, nu poți elimina sau dezactiva acest cont contabil pentru că este utilizat
 MvtNotCorrectlyBalanced=Mișcarea nu este echilibrată corect. Debit = %s & Credit = %s
@@ -337,11 +343,13 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=Dezactivați legarea și transferul în cont
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Dezactivați legarea și transferul în contabilitate pentru achiziții (facturile furnizor nu vor fi luate în considerare în contabilitate) 
 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)
 ACCOUNTING_ENABLE_LETTERING=Activare funcție de numerotare în contabilitate
+ACCOUNTING_ENABLE_AUTOLETTERING=Activare numerotare automată la transferul în contabilitate
 
 ## Export
 NotExportLettering=Nu exporta numerotările atunci când se generează fișierul
 NotifiedExportDate=Marcare linii exportate ca Exportate <span class="warning">(pentru a modifica o linie, va trebui să ștergi întreaga tranzacție și să o retransferi în contabilitate)</span>
 NotifiedValidationDate=Validare și blocare intrări exportate <span class="warning">(același efect ca și caracteristica "%s", modificarea și ștergerea liniilor NU vor mai fi posibile)</span>
+NotifiedExportFull=Export documente ?
 DateValidationAndLock=Dată de validare şi blocare
 ConfirmExportFile=Confirmare generare fișier de export contabil?
 ExportDraftJournal=Export jurnal schiţă
@@ -398,7 +406,7 @@ SaleLocal=Vânzare locală
 SaleExport=Vânzare la export
 SaleEEC=Vânzări în CEE
 SaleEECWithVAT=Vânzarea în CEE cu cota TVA diferită de zero, deci presupunem că aceasta NU este o vânzare intracomunitară, iar contul contabil este cel standard al produsului. 
-SaleEECWithoutVATNumber=Vânzare în CEE fără TVA, dar codul TVA al terțului nu este definit. Se va utiliza contul contabil de produs pentru vânzările standard. Completaţi codul de TVA al terțului sau contul contabil aferent produsului.
+SaleEECWithoutVATNumber=Vânzare în CEE fără TVA, dar codul de TVA al terților nu este definit. Revenim la contul vânzărilor standard. Poți remedia codul de TVA al terțului sau poți modifica contul de produs sugerat pentru asociere, dacă este necesar.
 ForbiddenTransactionAlreadyExported=Interzis: Tranzacţia a fost validată şi/sau exportată.
 ForbiddenTransactionAlreadyValidated=Interzis: Tranzacţia a fost validată.
 ## Dictionary
@@ -442,6 +450,7 @@ AccountancyErrorMismatchLetterCode=Nepotrivire cod de reconciliere
 AccountancyErrorMismatchBalanceAmount=Soldul (%s) nu este egal cu 0
 AccountancyErrorLetteringBookkeeping=Au apărut erori cu privire la tranzacții: %s
 ErrorAccountNumberAlreadyExists=Numărul de cont contabil %s există deja
+ErrorArchiveAddFile=Nu se poate adăuga fișierul  "%s" în arhivă
 
 ## Import
 ImportAccountingEntries=Intrări contabile
@@ -468,5 +477,7 @@ FECFormatMulticurrencyCode=Cod multi-monedă (Idevise)
 DateExport=Dată export
 WarningReportNotReliable=Atenție, acest raport nu se bazează pe registrul jurnal contabil, deci nu conține o tranzacție modificată manual în registrul contabil. Dacă jurnalele sunt actualizate, vizualizarea contabilă este mai precisă.
 ExpenseReportJournal=Jurnalul raportului de cheltuieli
+DocsAlreadyExportedAreExcluded=Documentele deja exportate sunt excluse
+ClickToHideAlreadyExportedLines=Clic pentru a ascunde liniile deja exportate
 
 NAccounts=%s conturi
diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang
index 176a71551dd..4d36c0d27c3 100644
--- a/htdocs/langs/ro_RO/admin.lang
+++ b/htdocs/langs/ro_RO/admin.lang
@@ -645,6 +645,8 @@ Module2300Name=Joburi de sistem programate
 Module2300Desc=Gestionarea planificată a joburilor de sistem (alias cron sau chrono)
 Module2400Name=Evenimente/Agendă
 Module2400Desc=Urmăriți evenimentele. Înregistrați evenimente automate sau manual pentru a nota activităţi sau întâlniri. Acesta este modulul principal pentru o bună gestionare a relațiilor cu clienții sau furnizorii.
+Module2430Name=Sistem calendar de rezervări
+Module2430Desc=Furnizează un calendar online pentru a permite oricui să rezerve întâlniri, conform intervalelor sau disponibilităților predefinite.
 Module2500Name=DMS / ECM
 Module2500Desc=Sistemul de management al documentelor / Gestiunea conținutului electronic. Organizarea automată a documentelor tale generate sau stocate. Le poţi partaja dacă este necesar.
 Module2600Name=API / Servicii web (Server SOAP)
@@ -660,6 +662,8 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=Capabilităţi de conversie GeoIP Maxmind
 Module3200Name=Jurnale Nealterabile
 Module3200Desc=Activează un jurnal inalterabil al evenimentelor de afaceri. Evenimentele sunt arhivate în timp real. Jurnalul este o tabelă cu functie doar de citire a evenimentelor în lanț care pot fi exportate. Acest modul poate fi obligatoriu pentru unele țări.
+Module3300Name=Dezvoltator de module
+Module3200Desc=Activează un jurnal inalterabil al evenimentelor de afaceri. Evenimentele sunt arhivate în timp real. Jurnalul este o tabelă cu functie doar de citire a evenimentelor în lanț care pot fi exportate. Acest modul poate fi obligatoriu pentru unele țări.
 Module3400Name=Reţele sociale
 Module3400Desc=Activați câmpurile Rețele sociale la terți și adrese (skype, twitter, facebook, ...).
 Module4000Name=HRM
@@ -1270,6 +1274,7 @@ TriggerActiveAsModuleActive=Trigger-ele din acest fişier sunt active pe măsur
 GeneratedPasswordDesc=Alegeți metoda care va fi utilizată pentru parolele auto-generate.
 DictionaryDesc=Introduceți toate datele de referință. Poţii adăuga valorile tale la valorile implicite.
 ConstDesc=Această pagină vă permite să editați (să suprascrieţi) parametrii care nu sunt disponibili în alte pagini. Aceștia sunt în mare parte parametri rezervați doar pentru dezvoltatori/soluționare avansată a problemelor.
+MiscellaneousOptions=Opțiuni diverse
 MiscellaneousDesc=Toți ceilalți parametri legați de securitate sunt definiți aici.
 LimitsSetup=Limite/Precizii
 LimitsDesc=Puteți defini limite, precizii şi optimizări utilizate de sistem aici
@@ -1826,6 +1831,9 @@ AGENDA_USE_EVENT_TYPE=Utilizați tipuri de evenimente (gestionate în menu Setă
 AGENDA_USE_EVENT_TYPE_DEFAULT=Setează automat această valoare implicită pentru tipul de eveniment în formularul de creare a evenimentului
 AGENDA_DEFAULT_FILTER_TYPE=Puneți automat acest tip de eveniment în filtrul de căutare al vizualizării agendei
 AGENDA_DEFAULT_FILTER_STATUS=Puneți automat această stare pentru evenimentele din filtrul de căutare din vizualizarea agendei
+AGENDA_EVENT_PAST_COLOR=Culoarea evenimentului trecut
+AGENDA_EVENT_CURRENT_COLOR=Culoarea evenimentului curent
+AGENDA_EVENT_FUTURE_COLOR=Culoarea evenimentului viitor
 AGENDA_DEFAULT_VIEW=Ce vizualizare doriți să deschideți implicit atunci când selectați meniul Agenda
 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ă
@@ -2129,6 +2137,7 @@ CodeLastResult=Ultimul cod rezultat
 NbOfEmailsInInbox=Numărul de email-uri în directorul sursă
 LoadThirdPartyFromName=Încărcați un terţ căutând în %s (doar încărcare)
 LoadThirdPartyFromNameOrCreate=Încărcați un terţ căutând în %s (creare dacă nu este găsit)
+LoadContactFromEmailOrCreate=Încărcare contact căutând în %s (creare dacă nu este găsit)
 AttachJoinedDocumentsToObject=Salvare fișiere atașate în documente obiect dacă o referință a unui obiect este găsită în subiectul email-ului.
 WithDolTrackingID=Mesaj dintr-o conversație inițiată de un prim e-mail trimis de la sistem
 WithoutDolTrackingID=Mesaj dintr-o conversație inițiată de un prim e-mail NU trimis din sistem
@@ -2355,3 +2364,5 @@ AllowExternalDownload=Permite descărcarea externă (fără autentificare, folos
 DeadlineDayVATSubmission=Ziua limită pentru depunerea TVA în luna următoare
 MaxNumberOfAttachementOnForms=Numărul maxim de fișiere unite într-un formular
 IfDefinedUseAValueBeetween=Dacă este definită, utilizează o valoare între %s și %s
+Reload=Reîncărcare
+ConfirmReload=Confirmare reîncărcare modul
diff --git a/htdocs/langs/ro_RO/boxes.lang b/htdocs/langs/ro_RO/boxes.lang
index efcbad031b6..2a0166e3f9a 100644
--- a/htdocs/langs/ro_RO/boxes.lang
+++ b/htdocs/langs/ro_RO/boxes.lang
@@ -24,6 +24,7 @@ BoxFicheInter=Ultimele intervenţii
 BoxCurrentAccounts=Sold conturi deschise
 BoxTitleMemberNextBirthdays=Aniversări în această lună (membri)
 BoxTitleMembersByType=Membri după tip şi status
+BoxTitleMembersByTags=Membri după tag-uri și status
 BoxTitleMembersSubscriptionsByYear=Adeziuni membri după an
 BoxTitleLastRssInfos=Ultimele %s noutăţi de la %s 
 BoxTitleLastProducts=Produse/Servicii: ultimele %s modificate
diff --git a/htdocs/langs/ro_RO/companies.lang b/htdocs/langs/ro_RO/companies.lang
index 765ee3631d5..0bf5f8b932d 100644
--- a/htdocs/langs/ro_RO/companies.lang
+++ b/htdocs/langs/ro_RO/companies.lang
@@ -312,12 +312,12 @@ CustomerRelativeDiscountShort=Discount relativ
 CustomerAbsoluteDiscountShort=Discount absolut
 CompanyHasRelativeDiscount=Acest client are un discount de <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Acest client nu are nici un discount relativ implicit
-HasRelativeDiscountFromSupplier=Aveți un discount implicit de <b> %s%% </b> de la acest furnizor
-HasNoRelativeDiscountFromSupplier=Nu aveți nici un discount relativ implicit de la acest furnizor
+HasRelativeDiscountFromSupplier=Aveți o reducere implicită de <b>%s%%</b> de la acest furnizor
+HasNoRelativeDiscountFromSupplier=Niciun discount relativ implicit la acest furnizor 
 CompanyHasAbsoluteDiscount=Acest client are discount-uri disponibile (note de credit sau plăți în avans) pentru <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=Acest client are discount-uri disponibile (comerciale, plăți în avans) pentru <b>%s</b> %s
 CompanyHasCreditNote=Acest client are încă note de credit pentru <b>%s</b> %s
-HasNoAbsoluteDiscountFromSupplier=Nu aveți credit disponibil de discount de la acest furnizor
+HasNoAbsoluteDiscountFromSupplier=Nu există reduceri/credite disponibile de la acest furnizor
 HasAbsoluteDiscountFromSupplier=Aveți discount-uri disponibile (note de credit sau plăți în avans) pentru <b>%s</b> %s de la acest furnizor
 HasDownPaymentOrCommercialDiscountFromSupplier=Aveți discount-uri disponibile (comerciale, plăți în avans) pentru <b>%s</b> %s de la acest furnizor
 HasCreditNoteFromSupplier=Aveți note de credit pentru <b>%s</b> %s de la acest furnizor
@@ -444,7 +444,7 @@ AddAddress=Adaugă adresă
 SupplierCategory=Categorie furnizor
 JuridicalStatus200=Freelancer
 DeleteFile=Şterge fişier
-ConfirmDeleteFile=Sigur doriţi să ştergeţi acest fişier?
+ConfirmDeleteFile=Sigur vrei să ștergi acest fișier <b>%s</b>?
 AllocateCommercial=Asociat la reprezentant vânzări
 Organization=Organizaţie
 FiscalYearInformation=An fiscal
@@ -498,3 +498,8 @@ RestOfEurope=Restul Europei (CEE)
 OutOfEurope=În afara Europei (CEE)
 CurrentOutstandingBillLate=Factura curentă restantă este întârziată
 BecarefullChangeThirdpartyBeforeAddProductToInvoice=Aveți grijă, în funcție de setările de preț ale produsului, ar trebui să schimbați terțul înainte de a adăuga produsul la POS.
+EmailAlreadyExistsPleaseRewriteYourCompanyName=e-mailul există deja, vă rugăm să rescrieți numele companiei dvs
+TwoRecordsOfCompanyName=există mai mult de o înregistrare pentru această companie, contactați-ne pentru a finaliza solicitarea ta de parteneriat
+CompanySection=Secțiune companie
+ShowSocialNetworks=Afișează rețele sociale
+HideSocialNetworks=Ascunde rețele sociale
diff --git a/htdocs/langs/ro_RO/errors.lang b/htdocs/langs/ro_RO/errors.lang
index 48ed91acc81..3ffcfd9637d 100644
--- a/htdocs/langs/ro_RO/errors.lang
+++ b/htdocs/langs/ro_RO/errors.lang
@@ -303,6 +303,7 @@ ErrorValueForTooLow=Valoarea pentru <b>%s</b> este prea mică
 ErrorValueCantBeNull=Valoarea pentru <b>%s</b> nu poate fi nulă
 ErrorDateOfMovementLowerThanDateOfFileTransmission=Data tranzacției bancare nu poate fi anterioară datei de transmitere a fișierului
 ErrorTooMuchFileInForm=Prea multe fișiere în formular, numărul maxim de fișier(e) este %s
+ErrorSessionInvalidatedAfterPasswordChange=Sesiunea a fost invalidată în urma unei modificări a parolei, a stării sau a datelor de valabilitate. Reconectează-te.
 
 # 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ă.
@@ -325,6 +326,7 @@ WarningPaymentDateLowerThanInvoiceDate=Data plăţii(%s) este anterioară datei
 WarningTooManyDataPleaseUseMoreFilters= Prea multe date (mai mult de %s linii). Folosiți mai multe filtre sau setați constanta %s la o limită superioară. 
 WarningSomeLinesWithNullHourlyRate=Unele perioade de timp consumat au fost înregistrate de unii utilizatori care nu aveau tariful orar definit. A fost utilizată valoarea 0 %s pe oră, dar acest lucru poate duce la o evaluare financiară greșită a timpului consumat.
 WarningYourLoginWasModifiedPleaseLogin=Utilizatorul-ul a fost modificat. Din motive de securitate, va trebui să vă conectați cu noul dvs. utilizator înainte de următoarea acțiune.
+WarningYourPasswordWasModifiedPleaseLogin=Parola ta a fost modificată. Din motive de securitate, va trebui să te autentifici acum cu noua parolă.
 WarningAnEntryAlreadyExistForTransKey=Există deja o intrare pe cheia de traducere pentru această limbă
 WarningNumberOfRecipientIsRestrictedInMassAction=Avertisment, numărul de destinatari diferiţi este limitat la <b> %s </b> când se utilizează acțiunile de masă din liste
 WarningDateOfLineMustBeInExpenseReportRange=Atenţie, data liniei nu este în intervalul raportului de cheltuieli
diff --git a/htdocs/langs/ro_RO/eventorganization.lang b/htdocs/langs/ro_RO/eventorganization.lang
index 652129e1eed..f97feca5b70 100644
--- a/htdocs/langs/ro_RO/eventorganization.lang
+++ b/htdocs/langs/ro_RO/eventorganization.lang
@@ -172,3 +172,5 @@ ErrorSeveralCompaniesWithEmailContactUs=Au fost găsite mai multe companii cu ac
 ErrorSeveralCompaniesWithNameContactUs=Au fost găsite mai multe companii cu acest nume, nu putem valida automat înregistrarea dumneavoastră. Vă rugăm să ne contactați la %s pentru o validare manuală
 NoPublicActionsAllowedForThisEvent=Nu sunt acțiuni publice deschise pentru acest eveniment
 MaxNbOfAttendees=Număr maxim de participanți
+DateStartEvent=Dată start eveniment
+DateEndEvent=Dată sfârșit eveniment
diff --git a/htdocs/langs/ro_RO/main.lang b/htdocs/langs/ro_RO/main.lang
index bb39633e547..cb697ae5b02 100644
--- a/htdocs/langs/ro_RO/main.lang
+++ b/htdocs/langs/ro_RO/main.lang
@@ -226,6 +226,7 @@ NoUserGroupDefined=Niciun grup de utilizatori definit
 Password=Parola
 PasswordRetype=Repetare parolă
 NoteSomeFeaturesAreDisabled=Atenţie, o mulţime de funcţionalităţi/module sunt dezactivate în această instanţă demonstrativă.
+YourUserFile=Fișierul tău de utilizator
 Name=Nume
 NameSlashCompany=Nume/Companie
 Person=Persoană
@@ -897,6 +898,9 @@ MassFilesArea=Zona pentru fişiere generate prin acţiuni în masă
 ShowTempMassFilesArea=Afişează zona pentru fişiere generate prin acţiuni în masă
 ConfirmMassDeletion=Confirmare ştergere în bloc
 ConfirmMassDeletionQuestion=Sigur doriți să ștergeți %s înregistrările(înregistrarea) selectate?
+ConfirmMassClone=Confirmare clonare în masă
+ConfirmMassCloneQuestion=Selectează proiectul în care să clonezi
+ConfirmMassCloneToOneProject=Clonare la proiectul %s
 RelatedObjects=Obiecte asociate
 ClassifyBilled=Clasează facturată
 ClassifyUnbilled=Clasează nefacturată
@@ -912,8 +916,8 @@ ExportFilteredList=Export listă filtrată
 ExportList=Export listă
 ExportOptions=Opţiuni export
 IncludeDocsAlreadyExported=Include documentele deja exportate
-ExportOfPiecesAlreadyExportedIsEnable=Exportul elementelor deja exportate este activat
-ExportOfPiecesAlreadyExportedIsDisable=Exportul elementelor deja exportate este dezactivat
+ExportOfPiecesAlreadyExportedIsEnable=Documentele deja exportate sunt vizibile și vor fi exportate
+ExportOfPiecesAlreadyExportedIsDisable=Documentele deja exportate sunt ascunse și nu vor fi exportate
 AllExportedMovementsWereRecordedAsExported=Toate mişcările exportate au fost înegistrate ca exportate
 NotAllExportedMovementsCouldBeRecordedAsExported=Nu toate mişcările exportate au putut fi înregistrate ca exportate
 Miscellaneous=Diverse
@@ -1128,6 +1132,7 @@ DeleteFileText=Eşti sigur că vrei să ştergi acest fişier?
 ShowOtherLanguages=Afişare alte limbi
 SwitchInEditModeToAddTranslation=Comută în modul editare pentru a adăuga traduceri pentru această limbă
 NotUsedForThisCustomer=Neutilizat pentru acest client
+NotUsedForThisVendor=Nu este folosit pentru acest furnizor
 AmountMustBePositive=Suma trebuie să fie pozitivă
 ByStatus=După status
 InformationMessage=Informaţie
@@ -1148,14 +1153,14 @@ EventReminder=Memento eveniment
 UpdateForAllLines=Actualizare pentru toate liniile
 OnHold=În aşteptare
 Civility=Formulă de adresare
-AffectTag=Asignare Tag
-AffectUser=Asignare utilizator
+AffectTag=Asignare tag
+AffectUser=Atribuie un utilizator
 SetSupervisor=Setare supervizor
 CreateExternalUser=Creare utilizator extern
 ConfirmAffectTag=Atribuire Tag în masă
 ConfirmAffectUser=Asignare utilizator în masă
-ProjectRole=Rol atribuit pe fiecare proiect
-TasksRole=Rol atribuit pentru fiecare task al fiecărui proiect
+ProjectRole=Rol atribuit pentru fiecare proiect/oportunitate
+TasksRole= Rol atribuit fiecărui task (dacă este utilizat)
 ConfirmSetSupervisor=Setare supervizor în masă
 ConfirmUpdatePrice=Alege un procent de creștere/scădere a prețului
 ConfirmAffectTagQuestion=Sigur vrei să atribui tag-urile înregistrăr(ilor) selectate %s ?
@@ -1210,3 +1215,10 @@ CreatedByPublicPortal=Creat din Portalul public
 UserAgent=User Agent
 InternalUser=Utilizator intern
 ExternalUser=Utilizator extern
+NoSpecificContactAddress=Fără contact sau adresă specificată
+NoSpecificContactAddressBis=Această filă este dedicată pentru a forța anumite contacte sau adrese pentru obiectul curent. Utilizează numai dacă dorești să definești unul sau mai multe contacte sau adrese specifice pentru obiect atunci când informațiile despre terț nu sunt suficiente sau nu sunt exacte.
+HideOnVCard=Ascunde %s
+AddToContacts=Adaugă adresă la contactele mele
+LastAccess=Ultima accesare
+UploadAnImageToSeeAPhotoHere=Încarcă o imagine din fila %s pentru a vedea o fotografie aici
+LastPasswordChangeDate= Data ultimei modificări a parolei
diff --git a/htdocs/langs/ro_RO/mrp.lang b/htdocs/langs/ro_RO/mrp.lang
index e188236cbcc..e268c9f7540 100644
--- a/htdocs/langs/ro_RO/mrp.lang
+++ b/htdocs/langs/ro_RO/mrp.lang
@@ -102,6 +102,7 @@ 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
+DefaultWorkstation=Stație de lucru implicită
 Human=Personal uman
 Machine=Maşină
 HumanMachine=Personal / Maşină
diff --git a/htdocs/langs/ro_RO/orders.lang b/htdocs/langs/ro_RO/orders.lang
index 3931bfaec96..d9dfbd0559c 100644
--- a/htdocs/langs/ro_RO/orders.lang
+++ b/htdocs/langs/ro_RO/orders.lang
@@ -96,6 +96,10 @@ OrdersStatisticsSuppliers=Statistici privind comenzile de achiziție
 NumberOfOrdersByMonth=Număr comenzi pe luni
 AmountOfOrdersByMonthHT=Suma comenzilor pe lună (fără taxe)
 ListOfOrders=Listă comenzi
+ListOrderLigne=Linii de comadă
+productobuy=Doar produse de vânzare
+productonly=Doar produse
+disablelinefree=Fără linii cu text liber
 CloseOrder=Închidere comandă
 ConfirmCloseOrder=Sigur doriți să setați această comandă pentru a fi livrată? Odată ce o comandă este livrată, ea poate fi setată ca facturabilă.
 ConfirmDeleteOrder=Sigur doriți să ștergeți această comandă?
@@ -131,6 +135,7 @@ SupplierOrderClassifiedBilled=Comanda de achiziţie %s a fost setată ca factura
 OtherOrders=Alte comenzi
 SupplierOrderValidatedAndApproved=Comanda de achiziţie este validată şi aprobată : %s
 SupplierOrderValidated=Comanda de achiziţie este validată : %s
+OrderShowDetail=Afișare detalii comandă
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Reprezentant urmărire comandă de vânzări 
 TypeContact_commande_internal_SHIPPING=Responsabil urmărire livrare comandă client
@@ -199,3 +204,5 @@ StatusSupplierOrderApproved=Aprobat
 StatusSupplierOrderRefused=Refuzat
 StatusSupplierOrderReceivedPartially=Parţial recepţionată
 StatusSupplierOrderReceivedAll=Toate produsele primite
+NeedAtLeastOneInvoice = Trebuie să existe cel puțin o factură
+LineAlreadyDispatched = Linia de comandă este deja primită.
diff --git a/htdocs/langs/ro_RO/stripe.lang b/htdocs/langs/ro_RO/stripe.lang
index 6c4bca336c9..2132a4768cf 100644
--- a/htdocs/langs/ro_RO/stripe.lang
+++ b/htdocs/langs/ro_RO/stripe.lang
@@ -41,7 +41,8 @@ STRIPE_LIVE_WEBHOOK_KEY=Cheie live Webhook
 ONLINE_PAYMENT_WAREHOUSE=Stoc de utilizat pentru scădere atunci când se efectuează plata online <br> (TODO Când opțiunea de a reduce stocul se face printr-o acțiune pe factură, iar plata online generează factura?)
 StripeLiveEnabled=Stripe live activat (altfel test/modul sandbox)
 StripeImportPayment=Import plată Stripe
-ExampleOfTestCreditCard=Exemplu de card de credit pentru test: %s=> valid,%s => eroare CVC, %s=> expirat, %s=> retragere eşuată
+ExampleOfTestCreditCard=Exemplu de card de credit pentru testul SEPA: %s => valid, %s => eroare CVC, %s => expirat, %s => taxare eșuată
+ExampleOfTestBankAcountForSEPA=Exemplu de cont bancar BAN pentru testul de debit direct: %s
 StripeGateways=Gateway-uri Stripe
 OAUTH_STRIPE_TEST_ID=ID-ul de conectare Stripe a clientului (ca _...)
 OAUTH_STRIPE_LIVE_ID=ID-ul de conectare Stripe a clientului (ca _...)
@@ -61,6 +62,7 @@ DeleteACard=Șterge cardul
 ConfirmDeleteCard=Sigur doriți să ștergeți acest card de credit sau de debit?
 CreateCustomerOnStripe=Creați un client pe Stripe
 CreateCardOnStripe=Creați un card pe Stripe
+CreateBANOnStripe=Creare cont bancar în Stripe
 ShowInStripe=Arată în Stripe
 StripeUserAccountForActions=Cont utilizator pe care să îl utilizați pentru notificarea prin email a anumitor evenimente Stripe (plăți Stripe)
 StripePayoutList=Listă de plăți Stripe
@@ -69,4 +71,8 @@ ToOfferALinkForLiveWebhook=Link de configurare Stripe WebHook pentru a apel IPN
 PaymentWillBeRecordedForNextPeriod=Plata va fi înregistrată pentru perioada următoare.
 ClickHereToTryAgain=<a href="%s">Clic aici pentru a încerca din nou...</a>
 CreationOfPaymentModeMustBeDoneFromStripeInterface=Datorită regulilor de autentificare securizată a clienților, crearea unui card trebuie făcută din backoffice-ul Stripe. Puteți face clic aici pentru a activa înregistrarea clienților Stripe: %s 
-TERMINAL_LOCATION=Locație (adresă) pentru terminale
+STRIPE_CARD_PRESENT=Card prezent pentru terminalele Stripe
+TERMINAL_LOCATION=Locația (adresa) pentru Stripe Terminals
+RequestDirectDebitWithStripe=Ordin de debitare directă cu Stripe
+STRIPE_SEPA_DIRECT_DEBIT=Activare plăți prin debit direct prin Stripe
+
diff --git a/htdocs/langs/ro_RO/ticket.lang b/htdocs/langs/ro_RO/ticket.lang
index 47c8377219d..0acad8b4e16 100644
--- a/htdocs/langs/ro_RO/ticket.lang
+++ b/htdocs/langs/ro_RO/ticket.lang
@@ -26,6 +26,7 @@ Permission56002=Modifică tichete
 Permission56003=Șterge tichete
 Permission56004=Gestionați tichetele
 Permission56005=Vedeți tichetele tuturor terților (nu este efectiv pentru utilizatorii externi, întotdeauna se limitează la terțul de care depind)
+Permission56006=Export tichete
 
 Tickets=Tichete de suport
 TicketDictType=Tipuri de tichete
@@ -61,6 +62,8 @@ TypeContact_ticket_external_CONTRIBUTOR=Contributor extern
 OriginEmail=Email raportor
 Notify_TICKET_SENTBYMAIL=Trimite mesaj tichet pe email
 
+ExportDataset_ticket_1=Tichete de suport
+
 # Status
 Read=Citit
 Assigned=Atribuit
diff --git a/htdocs/langs/ro_RO/users.lang b/htdocs/langs/ro_RO/users.lang
index 32422bcf97c..e6334179bfd 100644
--- a/htdocs/langs/ro_RO/users.lang
+++ b/htdocs/langs/ro_RO/users.lang
@@ -66,7 +66,8 @@ LinkedToDolibarrUser=Asociere la utilizator
 LinkedToDolibarrThirdParty=Asociere la terţ
 CreateDolibarrLogin=Creare utilizator
 CreateDolibarrThirdParty=Creare terţ
-LoginAccountDisableInDolibarr=Cont dezactivat în sistem.
+LoginAccountDisableInDolibarr=Cont dezactivat în Dolibarr
+PASSWORDInDolibarr=Parolă modificată în Dolibarr
 UsePersonalValue=Utilizare setări personalizate
 ExportDataset_user_1=Utilizatori și proprietățile acestora
 DomainUser=Utilizator de domeniu %s
@@ -129,3 +130,6 @@ IPLastLogin=IP ultima autentificare
 IPPreviousLogin=IP autentificare anterioară
 ShowAllPerms=Afișează toate rândurile de permisiuni
 HideAllPerms=Ascunde toate rândurile de permisiuni
+UserPublicPageDesc=Poți activa un card virtual pentru acest utilizator. O adresă URL cu profilul utilizatorului și un cod de bare vor fi disponibile pentru a permite oricui are un smartphone să îl scaneze și să adauge persoana de contact în agenda sa.
+EnablePublicVirtualCard=Activare publică card virtual de utilizator
+PublicVirtualCardUrl=Card virtual public de utilizator
diff --git a/htdocs/langs/ru_RU/accountancy.lang b/htdocs/langs/ru_RU/accountancy.lang
index 8de02a36f59..4bc65b27e17 100644
--- a/htdocs/langs/ru_RU/accountancy.lang
+++ b/htdocs/langs/ru_RU/accountancy.lang
@@ -14,8 +14,8 @@ ACCOUNTING_EXPORT_ENDLINE=Выберите тип возврата каретк
 ACCOUNTING_EXPORT_PREFIX_SPEC=Укажите префикс для имени файла
 ThisService=Эта услуга
 ThisProduct=Этот продукт
-DefaultForService=По умолчанию для услуги
-DefaultForProduct=По умолчанию для товара
+DefaultForService=Default for services
+DefaultForProduct=Default for products
 ProductForThisThirdparty=Продукт для этой третьей стороны
 ServiceForThisThirdparty=Сервис для этой третьей стороны
 CantSuggest=Не могу предложить
@@ -101,7 +101,8 @@ ShowAccountingAccount=Показать учетную запись
 ShowAccountingJournal=Показать бухгалтерский журнал
 ShowAccountingAccountInLedger=Показать счет в бухгалтерской книге
 ShowAccountingAccountInJournals=Показать учетную запись в журналах
-AccountAccountingSuggest=Учетный счет
+DataUsedToSuggestAccount=Data used to suggest account
+AccountAccountingSuggest=Account suggested
 MenuDefaultAccounts=Учетные записи по умолчанию
 MenuBankAccounts=Банковские счета
 MenuVatAccounts=Счета НДС
@@ -126,6 +127,7 @@ WriteBookKeeping=Зафиксировать операции в бухгалте
 Bookkeeping=Бухгалтерская книга
 BookkeepingSubAccount=Вспомогательная книга
 AccountBalance=Баланс
+AccountBalanceSubAccount=Sub-accounts balance
 ObjectsRef=Ссылка на исходный объект
 CAHTF=Итого закупка продавца до налогообложения
 TotalExpenseReport=Отчет об общих расходах
@@ -189,6 +191,7 @@ ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Account (from the Chart Of Account) to be us
 UseAuxiliaryAccountOnCustomerDeposit=Store customer account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
 ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Account (from the Chart Of Account) to be used as the default
 UseAuxiliaryAccountOnSupplierDeposit=Store supplier account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
+ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY=Accounting account by default to register customer retained warranty
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased within same country (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased from EEC to another EEC country (used if not defined in the product sheet)
@@ -218,6 +221,7 @@ JournalLabel=Этикетка журнала
 NumPiece=Количество штук
 TransactionNumShort=№ проводки
 AccountingCategory=Custom group of accounts
+AccountingCategories=Custom groups of accounts
 GroupByAccountAccounting=Группировать по счету главной книги
 GroupBySubAccountAccounting=Группировка по счету вспомогательной книги
 AccountingAccountGroupsDesc=Здесь вы можете определить несколько групп бухгалтерского учета. Они будут использоваться для персонализированной бухгалтерской отчетности.
@@ -265,6 +269,7 @@ ShowSubtotalByGroup=Показать промежуточный итог по у
 
 Pcgtype=Группа счетов
 PcgtypeDesc=Группа счетов используется в качестве предопределенных критериев «фильтра» и «группировки» для некоторых бухгалтерских отчетов. Например, «ДОХОД» или «РАСХОДЫ» используются в качестве групп для бухгалтерских счетов продуктов для построения отчета о расходах/доходах.
+AccountingCategoriesDesc=Custom group of accounts can be used to group accounting accounts into one name to ease filter use or building of custom reports.
 
 Reconcilable=Примиримый
 
@@ -294,6 +299,7 @@ DescValidateMovements=Любое изменение или удаление на
 
 ValidateHistory=Связывать автоматически
 AutomaticBindingDone=Выполнено автоматическое связывание (%s) — автоматическое связывание невозможно для некоторых записей (%s)
+DoManualBindingForFailedRecord=You have to do a manual link for the %s row(s) not linked automatically.
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot remove or disable this account of chart of account because it is used
 MvtNotCorrectlyBalanced=Движение неправильно сбалансировано. Дебет = %s и кредит = %s
@@ -337,11 +343,13 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=Отключить привязку и пе
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Отключить привязку и перенос в бухгалтерии по закупкам (счета поставщика не будут учитываться в бухгалтерии)
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Отключить привязку и перенос в бухгалтерском учете в отчетах о расходах (отчеты о расходах не будут учитываться в бухгалтерском учете)
 ACCOUNTING_ENABLE_LETTERING=Enable the lettering function in the accounting
+ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
 
 ## Export
 NotExportLettering=Do not export the lettering when generating the file
 NotifiedExportDate=Отметить экспортированные строки как Экспортированные <span class="warning"> (чтобы изменить строку, вам нужно будет удалить всю транзакцию и заново перенести ее в учет) </span>
 NotifiedValidationDate=Validate and Lock the exported entries <span class="warning">(same effect than the "%s" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+NotifiedExportFull=Export documents ?
 DateValidationAndLock=Проверка даты и блокировка
 ConfirmExportFile=Подтверждение генерации файла экспорта бухгалтерского учета?
 ExportDraftJournal=Экспорт черновика журнала
@@ -398,7 +406,7 @@ SaleLocal=Местная продажа
 SaleExport=Продажа на экспорт
 SaleEEC=Продажа в ЕЭС
 SaleEECWithVAT=Продажа в ЕЭС с ненулевым НДС, поэтому мы предполагаем, что это НЕ внутриобщинная продажа, а предлагаемая учетная запись является стандартной учетной записью продукта.
-SaleEECWithoutVATNumber=Продажа в ЕЭС без НДС, но идентификатор плательщика НДС третьей стороны не определен. Мы возвращаемся к учетной записи продукта для стандартных продаж. При необходимости вы можете исправить идентификатор плательщика НДС третьей стороны или учетную запись продукта.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the thirdparty, or change the product account suggested for binding if needed.
 ForbiddenTransactionAlreadyExported=Запрещено: транзакция проверена и/или экспортирована.
 ForbiddenTransactionAlreadyValidated=Запрещено: Транзакция подтверждена.
 ## Dictionary
@@ -442,6 +450,7 @@ AccountancyErrorMismatchLetterCode=Несоответствие в коде со
 AccountancyErrorMismatchBalanceAmount=Баланс (%s) не равен 0
 AccountancyErrorLetteringBookkeeping=Произошли ошибки, связанные с транзакциями: %s
 ErrorAccountNumberAlreadyExists=The accounting number %s already exists
+ErrorArchiveAddFile=Can't put "%s" file in archive
 
 ## Import
 ImportAccountingEntries=Бухгалтерские записи
@@ -468,5 +477,7 @@ FECFormatMulticurrencyCode=Мультивалютный код (Idevise)
 DateExport=Дата экспорта
 WarningReportNotReliable=Предупреждение, этот отчет не основан на главной книге, поэтому не содержит проводки, измененных вручную в главной книге. Если ваша журнализация актуальна, бухгалтерский учет будет более точным.
 ExpenseReportJournal=Журнал отчетов о затратах
+DocsAlreadyExportedAreExcluded=Docs already exported are excluded
+ClickToHideAlreadyExportedLines=Click to hide already exported lines
 
 NAccounts=%s счета
diff --git a/htdocs/langs/ru_RU/main.lang b/htdocs/langs/ru_RU/main.lang
index 07f6556f3d8..38fa6c53ff8 100644
--- a/htdocs/langs/ru_RU/main.lang
+++ b/htdocs/langs/ru_RU/main.lang
@@ -226,6 +226,7 @@ NoUserGroupDefined=Не задана группа для пользовател
 Password=Пароль
 PasswordRetype=Repeat your password
 NoteSomeFeaturesAreDisabled=Обратите внимание, что многие функции/модули отключены в этой демонстрации.
+YourUserFile=Your user file
 Name=Имя
 NameSlashCompany=Имя / Компания
 Person=Персона
@@ -897,6 +898,9 @@ MassFilesArea=Пространство для пакетных действий
 ShowTempMassFilesArea=Показать область для пакетных действий с файлами
 ConfirmMassDeletion=Подтверждение пакетного удаления
 ConfirmMassDeletionQuestion=Вы уверены, что хотите удалить %s выбранных записей?
+ConfirmMassClone=Bulk clone confirmation
+ConfirmMassCloneQuestion=Select project to clone to
+ConfirmMassCloneToOneProject=Clone to project %s
 RelatedObjects=Связанные объекты
 ClassifyBilled=Классифицировать выставленные счета
 ClassifyUnbilled=Классифицировать невыполненные счета
@@ -912,8 +916,8 @@ ExportFilteredList=Экспорт отфильтрованного списка
 ExportList=Экспорт списка
 ExportOptions=Настройки экспорта
 IncludeDocsAlreadyExported=Включенные документы уже экспортированы
-ExportOfPiecesAlreadyExportedIsEnable=Экспорт уже экспортированных частей включен
-ExportOfPiecesAlreadyExportedIsDisable=Экспорт уже экспортированных частей отключен
+ExportOfPiecesAlreadyExportedIsEnable=Documents already exported are visible and will be exported
+ExportOfPiecesAlreadyExportedIsDisable=Documents already exported are hidden and won't be exported
 AllExportedMovementsWereRecordedAsExported=Все экспортированные движения были зарегистрированы как экспортировано
 NotAllExportedMovementsCouldBeRecordedAsExported=Не все экспортированные движения могут быть зарегистрированы как экспортировано
 Miscellaneous=Разное
@@ -1128,6 +1132,7 @@ DeleteFileText=Вы действительно хотите удалить эт
 ShowOtherLanguages=Показать другие языки
 SwitchInEditModeToAddTranslation=Переключитесь в режим редактирования, чтобы добавить переводы для этого языка
 NotUsedForThisCustomer=Не используется для этого клиента
+NotUsedForThisVendor=Not used for this vendor
 AmountMustBePositive=Сумма должна быть положительной
 ByStatus=По статусу
 InformationMessage=Информация
@@ -1148,14 +1153,14 @@ EventReminder=Напоминание о мероприятии
 UpdateForAllLines=Обновление для всех линий
 OnHold=На удерживании
 Civility=Вежливость
-AffectTag=Assign Tag
-AffectUser=Assign User
-SetSupervisor=Set Supervisor
+AffectTag=Assign a Tag
+AffectUser=Assign a User
+SetSupervisor=Set the supervisor
 CreateExternalUser=Создать внешнего пользователя
 ConfirmAffectTag=Bulk Tag Assignement
 ConfirmAffectUser=Bulk User Assignement
-ProjectRole=Role assigned on each project
-TasksRole=Role assigned on each task of each project
+ProjectRole=Role assigned on each project/opportunity
+TasksRole=Role assigned on each task (if used)
 ConfirmSetSupervisor=Bulk Supervisor Set
 ConfirmUpdatePrice=Choose a increase/decrease price rate
 ConfirmAffectTagQuestion=Are you sure you want to assign tags to the %s selected record(s)?
@@ -1210,3 +1215,10 @@ CreatedByPublicPortal=Created from Public portal
 UserAgent=User Agent
 InternalUser=Внутренний пользователь
 ExternalUser=Внешний пользователь
+NoSpecificContactAddress=No specific contact or address
+NoSpecificContactAddressBis=This tab is dedicated to force specific contacts or addresses for the current object. Use it only if you want to define one or several specific contacts or addresses for the object when the information on the thirdparty is not enough or not accurate.
+HideOnVCard=Hide %s
+AddToContacts=Add address to my contacts
+LastAccess=Last access
+UploadAnImageToSeeAPhotoHere=Upload an image from the tab %s to see a photo here
+LastPasswordChangeDate=Last password change date
diff --git a/htdocs/langs/ru_RU/stripe.lang b/htdocs/langs/ru_RU/stripe.lang
index 25db139165e..2b40f0c165e 100644
--- a/htdocs/langs/ru_RU/stripe.lang
+++ b/htdocs/langs/ru_RU/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Настройка модуля Stripe
-StripeDesc=Offer your customers an online payment page for payments with credit/debit cards via <a href="https://www.stripe.com" target="_blank" rel="noopener noreferrer external">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, ...)
+StripeDesc=Предложите своим клиентам страницу онлайн-платежей для платежей кредитными/дебетовыми картами через <a href="https://www.stripe.com" target="_blank" rel="noopener noreferrer external"> Stripe </a> . Это можно использовать, чтобы позволить вашим клиентам совершать разовые платежи или платежи, связанные с конкретным объектом Dolibarr (счет, заказ, ...)
 StripeOrCBDoPayment=Оплата кредитной картой или Stripe
 FollowingUrlAreAvailableToMakePayments=После URL, можно предложить страницу к клиенту сделать платеж по Dolibarr объектов
 PaymentForm=Форма оплаты
@@ -41,7 +41,8 @@ STRIPE_LIVE_WEBHOOK_KEY=Живой ключ Webhook
 ONLINE_PAYMENT_WAREHOUSE=Запасы, используемые для уменьшения запасов при онлайн-оплате <br> (TODO Когда опция уменьшения запасов выполняется для действия со счетом-фактурой, и онлайн-платеж генерирует счет-фактуру самостоятельно?)
 StripeLiveEnabled=Полоса в реальном времени включена (в противном случае тестовый режим / режим песочницы)
 StripeImportPayment=Платежи Import Stripe
-ExampleOfTestCreditCard=Пример кредитной карты для тестирования: %s => действителен, %s => ошибка CVC, %s => истек срок действия, %s => заряд не производится
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+ExampleOfTestBankAcountForSEPA=Example of bank account BAN for direct debit test: %s
 StripeGateways=Stripe-шлюзы
 OAUTH_STRIPE_TEST_ID=Идентификатор клиента Stripe Connect (ca _...)
 OAUTH_STRIPE_LIVE_ID=Идентификатор клиента Stripe Connect (ca _...)
@@ -61,6 +62,7 @@ DeleteACard=Удалить карту
 ConfirmDeleteCard=Вы действительно хотите удалить эту кредитную или дебетовую карту?
 CreateCustomerOnStripe=Создать клиента на Stripe
 CreateCardOnStripe=Создать карту на Stripe
+CreateBANOnStripe=Create bank on Stripe
 ShowInStripe=Показать в полосе
 StripeUserAccountForActions=Учетная запись пользователя, используемая для уведомления по электронной почте о некоторых событиях Stripe (выплаты Stripe)
 StripePayoutList=Список выплат Stripe
@@ -69,3 +71,8 @@ ToOfferALinkForLiveWebhook=Ссылка на настройку Stripe WebHook 
 PaymentWillBeRecordedForNextPeriod=Выплата будет записана за следующий период.
 ClickHereToTryAgain=<a href="%s"> Нажмите здесь, чтобы попробовать еще раз ... </a>
 CreationOfPaymentModeMustBeDoneFromStripeInterface=Из-за правил строгой аутентификации клиентов создание карты должно производиться из бэк-офиса Stripe. Вы можете щелкнуть здесь, чтобы включить запись клиента Stripe: %s
+STRIPE_CARD_PRESENT=Card Present for Stripe Terminals
+TERMINAL_LOCATION=Location (address) for Stripe Terminals
+RequestDirectDebitWithStripe=Request Direct Debit with Stripe
+STRIPE_SEPA_DIRECT_DEBIT=Enable the Direct Debit payments through Stripe
+
diff --git a/htdocs/langs/ru_RU/ticket.lang b/htdocs/langs/ru_RU/ticket.lang
index 2f50e52ba40..6cc771a9a6f 100644
--- a/htdocs/langs/ru_RU/ticket.lang
+++ b/htdocs/langs/ru_RU/ticket.lang
@@ -26,6 +26,7 @@ Permission56002=Изменить тикеты
 Permission56003=Удалить тикеты
 Permission56004=Управлять тикетами
 Permission56005=Просмотр тикетов всех третьих лиц (не действует для внешних пользователей, всегда ограничивается третьей стороной, от которой они зависят)
+Permission56006=Export tickets
 
 Tickets=Тикеты
 TicketDictType=Тикет - Типы
@@ -61,6 +62,8 @@ TypeContact_ticket_external_CONTRIBUTOR=Внешний участник
 OriginEmail=Электронная почта репортера
 Notify_TICKET_SENTBYMAIL=Отправить сообщение тикета по электронной почте
 
+ExportDataset_ticket_1=Тикеты
+
 # Status
 Read=Читать
 Assigned=Ответственный
diff --git a/htdocs/langs/ru_RU/users.lang b/htdocs/langs/ru_RU/users.lang
index 9e824aa31b2..964f1b2f05f 100644
--- a/htdocs/langs/ru_RU/users.lang
+++ b/htdocs/langs/ru_RU/users.lang
@@ -66,7 +66,8 @@ LinkedToDolibarrUser=Ссылка на пользователя
 LinkedToDolibarrThirdParty=Ссылка на третью сторону
 CreateDolibarrLogin=Создать аккаунт Dolibarr
 CreateDolibarrThirdParty=Создание третьей стороной
-LoginAccountDisableInDolibarr=Счет-инвалидов в Dolibarr.
+LoginAccountDisableInDolibarr=Account disabled in Dolibarr
+PASSWORDInDolibarr=Password modified in Dolibarr
 UsePersonalValue=Использовать личные предпочтения
 ExportDataset_user_1=Пользователи и их свойства
 DomainUser=Домен пользователя %s
@@ -129,3 +130,6 @@ IPLastLogin=IP последний логин
 IPPreviousLogin=IP предыдущий логин
 ShowAllPerms=Show all permission rows
 HideAllPerms=Hide all permission rows
+UserPublicPageDesc=You can enable a virtual card for this user. An url with the user profile and a barcode will be available to allow anybody with a smartphone to scan it and add your contact to its address book.
+EnablePublicVirtualCard=Enable the public virtual user card
+PublicVirtualCardUrl=Public virtual user card
diff --git a/htdocs/langs/sk_SK/accountancy.lang b/htdocs/langs/sk_SK/accountancy.lang
index 82c7e55e81d..0a075099ae0 100644
--- a/htdocs/langs/sk_SK/accountancy.lang
+++ b/htdocs/langs/sk_SK/accountancy.lang
@@ -14,8 +14,8 @@ ACCOUNTING_EXPORT_ENDLINE=Select the carriage return type
 ACCOUNTING_EXPORT_PREFIX_SPEC=Zadajte predponu pre názov súboru
 ThisService=This service
 ThisProduct=This product
-DefaultForService=Default for service
-DefaultForProduct=Default for product
+DefaultForService=Default for services
+DefaultForProduct=Default for products
 ProductForThisThirdparty=Product for this thirdparty
 ServiceForThisThirdparty=Service for this thirdparty
 CantSuggest=Can't suggest
@@ -101,7 +101,8 @@ ShowAccountingAccount=Show accounting account
 ShowAccountingJournal=Show accounting journal
 ShowAccountingAccountInLedger=Show accounting account in ledger
 ShowAccountingAccountInJournals=Show accounting account in journals
-AccountAccountingSuggest=Účtovný účet bol navrhnutý
+DataUsedToSuggestAccount=Data used to suggest account
+AccountAccountingSuggest=Account suggested
 MenuDefaultAccounts=Predvolené účty
 MenuBankAccounts=Bankové účty
 MenuVatAccounts=Vat accounts
@@ -126,6 +127,7 @@ WriteBookKeeping=Record transactions in accounting
 Bookkeeping=Hlavná kniha
 BookkeepingSubAccount=Subledger
 AccountBalance=Stav účtu
+AccountBalanceSubAccount=Sub-accounts balance
 ObjectsRef=Source object ref
 CAHTF=Total purchase vendor before tax
 TotalExpenseReport=Total expense report
@@ -189,6 +191,7 @@ ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Account (from the Chart Of Account) to be us
 UseAuxiliaryAccountOnCustomerDeposit=Store customer account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
 ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Account (from the Chart Of Account) to be used as the default
 UseAuxiliaryAccountOnSupplierDeposit=Store supplier account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
+ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY=Accounting account by default to register customer retained warranty
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased within same country (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased from EEC to another EEC country (used if not defined in the product sheet)
@@ -218,6 +221,7 @@ JournalLabel=Journal label
 NumPiece=Číslo kusu
 TransactionNumShort=Num. transakcie
 AccountingCategory=Custom group of accounts
+AccountingCategories=Custom groups of accounts
 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.
@@ -265,6 +269,7 @@ ShowSubtotalByGroup=Show subtotal by level
 
 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.
+AccountingCategoriesDesc=Custom group of accounts can be used to group accounting accounts into one name to ease filter use or building of custom reports.
 
 Reconcilable=Reconcilable
 
@@ -294,6 +299,7 @@ DescValidateMovements=Any modification or deletion of writing, lettering and del
 
 ValidateHistory=Priradzovať automaticky
 AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
+DoManualBindingForFailedRecord=You have to do a manual link for the %s row(s) not linked automatically.
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot remove or disable this account of chart of account because it is used
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s & Credit = %s
@@ -337,11 +343,13 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on
 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_ENABLE_LETTERING=Enable the lettering function in the accounting
+ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
 
 ## Export
 NotExportLettering=Do not export the lettering when generating the file
 NotifiedExportDate=Flag exported lines as Exported <span class="warning">(to modify a line, you will need to delete the whole transaction and re-transfert it into accounting)</span>
 NotifiedValidationDate=Validate and Lock the exported entries <span class="warning">(same effect than the "%s" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+NotifiedExportFull=Export documents ?
 DateValidationAndLock=Date validation and lock
 ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Export draft journal
@@ -398,7 +406,7 @@ 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.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the thirdparty, or change the product account suggested for binding if needed.
 ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
 ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
 ## Dictionary
@@ -442,6 +450,7 @@ AccountancyErrorMismatchLetterCode=Mismatch in reconcile code
 AccountancyErrorMismatchBalanceAmount=The balance (%s) is not equal to 0
 AccountancyErrorLetteringBookkeeping=Errors have occurred concerning the transactions: %s
 ErrorAccountNumberAlreadyExists=The accounting number %s already exists
+ErrorArchiveAddFile=Can't put "%s" file in archive
 
 ## Import
 ImportAccountingEntries=Accounting entries
@@ -468,5 +477,7 @@ 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.
 ExpenseReportJournal=Expense Report Journal
+DocsAlreadyExportedAreExcluded=Docs already exported are excluded
+ClickToHideAlreadyExportedLines=Click to hide already exported lines
 
 NAccounts=%s accounts
diff --git a/htdocs/langs/sk_SK/users.lang b/htdocs/langs/sk_SK/users.lang
index 6b89df8d1de..4cef7513e36 100644
--- a/htdocs/langs/sk_SK/users.lang
+++ b/htdocs/langs/sk_SK/users.lang
@@ -66,7 +66,8 @@ LinkedToDolibarrUser=Link to user
 LinkedToDolibarrThirdParty=Link to third party
 CreateDolibarrLogin=Vytvoriť používateľa
 CreateDolibarrThirdParty=Vytvorte tretiu stranu
-LoginAccountDisableInDolibarr=Účet bol zakázaný v Dolibarr.
+LoginAccountDisableInDolibarr=Account disabled in Dolibarr
+PASSWORDInDolibarr=Password modified in Dolibarr
 UsePersonalValue=Používajte osobnú hodnotu
 ExportDataset_user_1=Users and their properties
 DomainUser=Užívateľ domény %s
@@ -129,3 +130,6 @@ IPLastLogin=IP last login
 IPPreviousLogin=IP previous login
 ShowAllPerms=Show all permission rows
 HideAllPerms=Hide all permission rows
+UserPublicPageDesc=You can enable a virtual card for this user. An url with the user profile and a barcode will be available to allow anybody with a smartphone to scan it and add your contact to its address book.
+EnablePublicVirtualCard=Enable the public virtual user card
+PublicVirtualCardUrl=Public virtual user card
diff --git a/htdocs/langs/sl_SI/accountancy.lang b/htdocs/langs/sl_SI/accountancy.lang
index b49f317d976..ad90ac9c932 100644
--- a/htdocs/langs/sl_SI/accountancy.lang
+++ b/htdocs/langs/sl_SI/accountancy.lang
@@ -14,8 +14,8 @@ ACCOUNTING_EXPORT_ENDLINE=Izberite vrsto vrnitve v začetek
 ACCOUNTING_EXPORT_PREFIX_SPEC=Specify the prefix for the file name
 ThisService=Ta storitev
 ThisProduct=Ta izdelek
-DefaultForService=Privzeto za storitev
-DefaultForProduct=Privzeto za izdelek
+DefaultForService=Default for services
+DefaultForProduct=Default for products
 ProductForThisThirdparty=Izdelek za tega partnerja
 ServiceForThisThirdparty=Storitev za tega partnerja
 CantSuggest=Ne morem predlagati
@@ -101,7 +101,8 @@ ShowAccountingAccount=Pokaži računovodski račun
 ShowAccountingJournal=Prikaži knjigovodski dnevnik
 ShowAccountingAccountInLedger=Pokaži računovodski račun v knjigi
 ShowAccountingAccountInJournals=Pokaži računovodski račun v dnevnikih
-AccountAccountingSuggest=Priporočen računovodski račun
+DataUsedToSuggestAccount=Data used to suggest account
+AccountAccountingSuggest=Account suggested
 MenuDefaultAccounts=Privzeti računi
 MenuBankAccounts=Bančni računi
 MenuVatAccounts=DDV računi
@@ -126,6 +127,7 @@ WriteBookKeeping=Evidentirajte transakcije v računovodstvu
 Bookkeeping=Ledger
 BookkeepingSubAccount=Podknjiga
 AccountBalance=Stanje na računu
+AccountBalanceSubAccount=Sub-accounts balance
 ObjectsRef=Izvorni objekt ref
 CAHTF=Skupni nakup pred obdavčitvijo
 TotalExpenseReport=Poročilo o skupnih stroških
@@ -189,6 +191,7 @@ ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Account (from the Chart Of Account) to be us
 UseAuxiliaryAccountOnCustomerDeposit=Shranjevanje računa stranke kot posameznega računa v pomožni knjigi za vrstice predplačil (če je onemogočeno, bo posamezni račun za vrstice predplačil ostal prazen)
 ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Account (from the Chart Of Account) to be used as the default
 UseAuxiliaryAccountOnSupplierDeposit=Shranite račun dobavitelja kot posamezni račun v pomožni knjigi za vrstice predplačil (če je onemogočeno, bo posamezni račun za vrstice predplačil ostal prazen)
+ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY=Accounting account by default to register customer retained warranty
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased within same country (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased from EEC to another EEC country (used if not defined in the product sheet)
@@ -218,6 +221,7 @@ JournalLabel=Oznaka dnevnika
 NumPiece=Številka kosa
 TransactionNumShort=št. transakcija
 AccountingCategory=Custom group of accounts
+AccountingCategories=Custom groups of accounts
 GroupByAccountAccounting=Združi po kontu glavne knjige
 GroupBySubAccountAccounting=Združi po kontu podknjižbe
 AccountingAccountGroupsDesc=Tu lahko določite nekaj skupin računovodskih kontov. Uporabljali se bodo za personalizirana računovodska poročila.
@@ -265,6 +269,7 @@ ShowSubtotalByGroup=Prikaži vmesni seštevek po stopnjah
 
 Pcgtype=Skupina računov
 PcgtypeDesc=Skupine kontov se uporabljajo kot vnaprej določena merila 'filtra' in 'združevanja' za nekatera računovodska poročila. Na primer, 'PRIHODEK' ali 'STROŠEK' se uporabljata kot skupini za računovodske račune izdelkov za izdelavo poročila o stroških/prihodkih.
+AccountingCategoriesDesc=Custom group of accounts can be used to group accounting accounts into one name to ease filter use or building of custom reports.
 
 Reconcilable=Spravljivo
 
@@ -294,6 +299,7 @@ DescValidateMovements=Prepovedano je kakršno koli spreminjanje ali brisanje zap
 
 ValidateHistory=Samodejno vezanje
 AutomaticBindingDone=Samodejne vezave opravljene (%s) - Samodejna vezava ni mogoča za nekatere zapise (%s)
+DoManualBindingForFailedRecord=You have to do a manual link for the %s row(s) not linked automatically.
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot remove or disable this account of chart of account because it is used
 MvtNotCorrectlyBalanced=Gibanje ni pravilno uravnoteženo. Debet = %s & kredit = %s
@@ -337,11 +343,13 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=Onemogočanje vezave in prenosa v računovod
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Onemogočanje vezave in prenosa v računovodstvu pri nakupih (računi dobaviteljev se ne bodo upoštevali v računovodstvu)
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Onemogoči vezavo in prenos v računovodstvu na poročilih o stroških (poročila o stroških ne bodo upoštevana v računovodstvu)
 ACCOUNTING_ENABLE_LETTERING=Enable the lettering function in the accounting
+ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
 
 ## Export
 NotExportLettering=Do not export the lettering when generating the file
 NotifiedExportDate=Označi izvožene vrstice kot izvožene <span class="warning"> (če želite spremeniti vrstico, boste morali izbrisati celotno transakcijo in jo znova prenesti v računovodstvo) </span>
 NotifiedValidationDate=Potrdi in zakleni izvožene vnose <span class="warning"> (isti učinek kot funkcija "%s", spreminjanje in brisanje vrstic DEFINITIVNO ne bo mogoče) </span>
+NotifiedExportFull=Export documents ?
 DateValidationAndLock=Preverjanje datuma in zaklepanje
 ConfirmExportFile=Potrditev generiranja računovodske izvozne datoteke?
 ExportDraftJournal=Izvozi osnutek dnevnika
@@ -398,7 +406,7 @@ SaleLocal=Lokalna prodaja
 SaleExport=Izvozna prodaja
 SaleEEC=Prodaja v EGS
 SaleEECWithVAT=Prodaja v EGS z DDV ni ničelna, zato predpostavljamo, da to NI prodaja znotraj skupnosti in da je predlagani račun standardni račun izdelka.
-SaleEECWithoutVATNumber=Prodaja v EGS brez DDV, vendar ID za DDV partnerja ni opredeljen. Za standardno prodajo uporabljamo nadomestni račun izdelka. Po potrebi lahko popravite ID za DDV partnerja ali račun izdelka.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the thirdparty, or change the product account suggested for binding if needed.
 ForbiddenTransactionAlreadyExported=Prepovedano: transakcija je bila potrjena in/ali izvožena.
 ForbiddenTransactionAlreadyValidated=Prepovedano: transakcija je bila potrjena.
 ## Dictionary
@@ -442,6 +450,7 @@ AccountancyErrorMismatchLetterCode=Neujemanje v kodi za usklajevanje
 AccountancyErrorMismatchBalanceAmount=Stanje (%s) ni enako 0
 AccountancyErrorLetteringBookkeeping=Prišlo je do napak v zvezi s transakcijami: %s
 ErrorAccountNumberAlreadyExists=Knjigovodska številka %s že obstaja
+ErrorArchiveAddFile=Can't put "%s" file in archive
 
 ## Import
 ImportAccountingEntries=Računovodske knjižbe
@@ -468,5 +477,7 @@ FECFormatMulticurrencyCode=Koda za več valut (Idevise)
 DateExport=Izvoz datuma
 WarningReportNotReliable=Opozorilo, to poročilo ne temelji na knjigi, zato ne vsebuje transakcij, ki so bile ročno spremenjene v knjigi. Če je vaša dnevnika ažurna, je knjigovodski pogled natančnejši.
 ExpenseReportJournal=Dnevnik poročil o stroških
+DocsAlreadyExportedAreExcluded=Docs already exported are excluded
+ClickToHideAlreadyExportedLines=Click to hide already exported lines
 
 NAccounts=računi %s
diff --git a/htdocs/langs/sl_SI/companies.lang b/htdocs/langs/sl_SI/companies.lang
index f3f446280b3..2f09375b50f 100644
--- a/htdocs/langs/sl_SI/companies.lang
+++ b/htdocs/langs/sl_SI/companies.lang
@@ -1,112 +1,112 @@
 # Dolibarr language file - Source file is en_US - companies
-ErrorCompanyNameAlreadyExists=Ime podjetja %s že obstaja. Izberite drugačno ime.
+ErrorCompanyNameAlreadyExists=Naziv podjetja %s že obstaja. Izberite drug naziv.
 ErrorSetACountryFirst=Najprej izberite državo
 SelectThirdParty=Izberite partnerja
-ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
-DeleteContact=Izbrišite kontakt
-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=Nov posameznik
-NewCompany=New company (prospect, customer, vendor)
-NewThirdParty=New Third Party (prospect, customer, vendor)
-CreateDolibarrThirdPartySupplier=Create a third party (vendor)
+ConfirmDeleteCompany=Ali ste prepričani, da želite izbrisati podjetje in vse povezane informacije?
+DeleteContact=Izbrišite stik
+ConfirmDeleteContact=Ali ste prepričani, da želite izbrisati stik in vse povezane informacije?
+MenuNewThirdParty=Nov partner
+MenuNewCustomer=Nov kupec
+MenuNewProspect=Nov potencialni kupec
+MenuNewSupplier=Nov dobavitelj
+MenuNewPrivateIndividual=Nova fizična oseba
+NewCompany=Novo podjetje (potencialni kupec, kupec, dobavitelj)
+NewThirdParty=Nov partner (potencialni kupec, kupec, dobavitelj)
+CreateDolibarrThirdPartySupplier=Ustvari partnerja (dobavitelj)
 CreateThirdPartyOnly=Ustvari partnerja
-CreateThirdPartyAndContact=Create a third party + a child contact
-ProspectionArea=Področje možnih strank
-IdThirdParty=ID partnerja
-IdCompany=ID podjetja
-IdContact=ID kontakta
-ThirdPartyAddress=Third-party address
-ThirdPartyContacts=Third-party contacts
-ThirdPartyContact=Third-party contact/address
+CreateThirdPartyAndContact=Ustvarite partnerja + pripadajoč stik
+ProspectionArea=Potencialni kupci
+IdThirdParty=Partner ID
+IdCompany=Podjetje ID
+IdContact=Stik ID
+ThirdPartyAddress=Naslov partnerja
+ThirdPartyContacts=Stiki
+ThirdPartyContact=Stik
 Company=Podjetje
-CompanyName=Ime podjetja
-AliasNames=Drugo ime (komercialno, blagovna znamka, ...)
-AliasNameShort=Alias Name
+CompanyName=Naziv podjetja
+AliasNames=Vzdevek (skrajšan naziv, blagovna znamka, ...)
+AliasNameShort=Vzdevek naziv
 Companies=Podjetja
-CountryIsInEEC=Country is inside the European Economic Community
-PriceFormatInCurrentLanguage=Price display format in the current language and currency
-ThirdPartyName=Third-party name
-ThirdPartyEmail=Third-party email
-ThirdParty=Third-party
-ThirdParties=Third-parties
-ThirdPartyProspects=Možne stranke
-ThirdPartyProspectsStats=Možne stranke
+CountryIsInEEC=Država je znotraj Evropske gospodarske skupnosti
+PriceFormatInCurrentLanguage=Prikazana  cene v trenutnem jeziku in valuti
+ThirdPartyName=Naziv
+ThirdPartyEmail=E-pošta
+ThirdParty=Partner
+ThirdParties=Partnerji
+ThirdPartyProspects=Potencialni kupci
+ThirdPartyProspectsStats=Potencialni kupci
 ThirdPartyCustomers=Kupci
 ThirdPartyCustomersStats=Kupci
 ThirdPartyCustomersWithIdProf12=Kupci z %s ali %s
-ThirdPartySuppliers=Vendors
-ThirdPartyType=Third-party type
-Individual=Posameznik
-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=Lastniško podjetje
+ThirdPartySuppliers=Dobavitelji
+ThirdPartyType=Vrsta partnerja
+Individual=Fizična oseba
+ToCreateContactWithSameName=Samodejno bo ustvaril stik/naslov z enakimi informacijami kot nadrejeni partner. V večini primerov, tudi če je partner fizična oseba, zadostuje samo ustvarjanje partnerja.
+ParentCompany=Nadrejeno podjetje
 Subsidiaries=Podružnice
-ReportByMonth=Report per month
-ReportByCustomers=Report per customer
-ReportByThirdparties=Report per thirdparty
-ReportByQuarter=Report per rate
+ReportByMonth=Poročilo - mesec
+ReportByCustomers=Poročilo - kupci
+ReportByThirdparties=Poročilo - partnerji
+ReportByQuarter=Poročilo - tečajnica
 CivilityCode=Vljudnostni naziv
 RegisteredOffice=Registrirana poslovalnica
 Lastname=Priimek
 Firstname=Ime
-RefEmployee=Employee reference
-NationalRegistrationNumber=National registration number
-PostOrFunction=Job position
+RefEmployee=Referenca zaposlenega
+NationalRegistrationNumber=Državna registrska številka
+PostOrFunction=Delovno mesto
 UserTitle=Naziv
-NatureOfThirdParty=Nature of Third party
-NatureOfContact=Nature of Contact
+NatureOfThirdParty=Narava partnerja
+NatureOfContact=Narava stika
 Address=Naslov
 State=Dežela/Provinca
-StateId=State ID
-StateCode=State/Province code
+StateId=Osebna izkaznica
+StateCode=Koda države
 StateShort=Država
 Region=Regija
-Region-State=Region - State
+Region-State=Regija - Država
 Country=Država
 CountryCode=Koda države
-CountryId=Country ID
+CountryId=Država ID
 Phone=Telefon
 PhoneShort=Telefon
 Skype=Skype
 Call=Kliči
 Chat=Klepetaj
-PhonePro=Bus. phone
+PhonePro=Poslovni telefon
 PhonePerso=Osebni telefon
 PhoneMobile=Mobilni telefon
-No_Email=Refuse bulk emailings
+No_Email=Zavrnite množično pošiljanje e-pošte
 Fax=Faks
 Zip=Poštna številka
 Town=Mesto
 Web=Spletna stran
 Poste= Položaj
-DefaultLang=Default language
-VATIsUsed=Sales tax used
-VATIsUsedWhenSelling=This defines if this third party includes a sales 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
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor vendor, discounts are not available
-PaymentBankAccount=Payment bank account
+DefaultLang=Privzeti jezik
+VATIsUsed=Davčni zavezanec
+VATIsUsedWhenSelling=Davčni zavezanec na računu
+VATIsNotUsed=Ni davčni zavezanec
+CopyAddressFromSoc=Kopiraj naslov iz podatkov partnerja
+ThirdpartyNotCustomerNotSupplierSoNoRef=Partner ni opredeljen kot kupec ali dobavitelj, ni razpoložljivih informacij
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Partner ni opredeljen kot kupec ali dobavitelj, popusti niso na voljo
+PaymentBankAccount=Plačilni bančni račun
 OverAllProposals=Ponudbe
 OverAllOrders=Naročila
 OverAllInvoices=Računi
-OverAllSupplierProposals=Price requests
+OverAllSupplierProposals=Zahteve po ceni
 ##### Local Taxes #####
-LocalTax1IsUsed=Uporabi drugi davek
+LocalTax1IsUsed=Znižana davčna stopnja
 LocalTax1IsUsedES= RE je uporabljen
 LocalTax1IsNotUsedES= RE ni uporabljen
-LocalTax2IsUsed=Uporabi tretji davek
+LocalTax2IsUsed=Alternativni davek
 LocalTax2IsUsedES= IRPF je uporabljen
 LocalTax2IsNotUsedES= IRPF ni uporabljen
-WrongCustomerCode=Napačna koda kupca
-WrongSupplierCode=Vendor code invalid
+WrongCustomerCode=Neveljavna koda kupca
+WrongSupplierCode=Neveljavna koda dobavitelja
 CustomerCodeModel=Model kode kupca
-SupplierCodeModel=Vendor code model
+SupplierCodeModel=Model kode dobavitelja
 Gencod=Črtna koda
-GencodBuyPrice=Barcode of price ref
+GencodBuyPrice=Črtna koda za referenčne cene
 ##### Professional ID #####
 ProfId1Short=Mat. št.
 ProfId2Short=Reg. sodišče
@@ -130,7 +130,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-Nr)
 ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=EORI number
+ProfId5AT=številko EORI
 ProfId6AT=-
 ProfId1AU=Prof Id 1 (ABN)
 ProfId2AU=-
@@ -142,19 +142,19 @@ ProfId1BE=Prof Id 1 (Professional number)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=EORI number
+ProfId5BE=Številka EORI
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE()
-ProfId3BR=IM()
+ProfId3BR=OB(Občina)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=UID-Nummer
+ProfId1CH=UID-Številka
 ProfId2CH=-
 ProfId3CH=Prof Id 1 (Federal number)
 ProfId4CH=Prof Id 2 (Commercial Record number)
-ProfId5CH=EORI number
+ProfId5CH=Številka EORI
 ProfId6CH=-
 ProfId1CL==
 ProfId2CL==
@@ -162,16 +162,16 @@ ProfId3CL==
 ProfId4CL==
 ProfId5CL==
 ProfId6CL=-
-ProfId1CM=Id. prof. 1 (Trade Register)
-ProfId2CM=Id. prof. 2 (Taxpayer No.)
-ProfId3CM=Id. prof. 3 (No. of creation decree)
-ProfId4CM=Id. prof. 4 (Deposit certificate No.)
-ProfId5CM=Id. prof. 5 (Others)
+ProfId1CM=Id. prof. 1 (poslovni register)
+ProfId2CM=Id. prof. 2 (Št. zavezanca)
+ProfId3CM=Id. prof. 3 (št. odloka o ustanovitvi)
+ProfId4CM=Id. prof. 4 (potrdilo o vlogi št.)
+ProfId5CM=Id. prof. 5 (drugo)
 ProfId6CM=-
-ProfId1ShortCM=Trade Register
-ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=No. of creation decree
-ProfId4ShortCM=Deposit certificate No.
+ProfId1ShortCM=Trgovski register
+ProfId2ShortCM=ID za DDV
+ProfId3ShortCM=Št. odloka o ustanovitvi
+ProfId4ShortCM=Potrdilo o depozitu št.
 ProfId5ShortCM=Ostali
 ProfId6ShortCM=-
 ProfId1CO==
@@ -184,21 +184,21 @@ ProfId1DE=Prof Id 1 (USt.-IdNr)
 ProfId2DE=Prof Id 2 (USt.-Nr)
 ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=EORI number
+ProfId5DE=številko EORI
 ProfId6DE=-
 ProfId1ES=(CNAE)
 ProfId2ES=(Social security number)
 ProfId3ES=(IAE)
 ProfId4ES=(Collegiate number)
-ProfId5ES=Prof Id 5 (EORI number)
+ProfId5ES=Prof Id 5 (številka EORI)
 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)
+ProfId5FR=Prof Id 5 (številka EORI)
 ProfId6FR=-
-ProfId1ShortFR=SIREN
+ProfId1ShortFR=SIRENA
 ProfId2ShortFR=SIRET
 ProfId3ShortFR=NAF
 ProfId4ShortFR=RCS
@@ -226,13 +226,13 @@ ProfId1IT=-
 ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
-ProfId5IT=EORI number
+ProfId5IT=številko EORI
 ProfId6IT=-
 ProfId1LU=Id. prof. 1 (R.C.S. Luxemburg)
 ProfId2LU=Id. prof. 2 (Dovoljenje za poslovanje)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=EORI number
+ProfId5LU=številko EORI
 ProfId6LU=-
 ProfId1MA==
 ProfId2MA==
@@ -250,13 +250,13 @@ ProfId1NL=KVK nummer
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=-
-ProfId5NL=EORI number
+ProfId5NL=številko EORI
 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)
+ProfId5PT=Prof Id 5 (številka EORI)
 ProfId6PT=-
 ProfId1SN==
 ProfId2SN==
@@ -270,17 +270,17 @@ ProfId3TN=Prof Id 3 (Douane code)
 ProfId4TN=Prof Id 4 (BAN)
 ProfId5TN==
 ProfId6TN=-
-ProfId1US=Prof Id (FEIN)
+ProfId1US=Id prof. (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
 ProfId5US=-
 ProfId6US=-
-ProfId1RO=Prof Id 1 (CUI)
+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 (številka EORI)
 ProfId6RO=-
 ProfId1RU=Prof ID 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -291,120 +291,120 @@ ProfId6RU=-
 ProfId1UA=Prof Id 1 (EDRPOU)
 ProfId2UA=Prof Id 2 (DRFO)
 ProfId3UA=Prof Id 3 (INN)
-ProfId4UA=Prof Id 4 (Certificate)
+ProfId4UA=Prof Id 4 (Certifikat)
 ProfId5UA=Prof Id 5 (RNOKPP)
 ProfId6UA=Prof Id 6 (TRDPAU)
 ProfId1DZ==
-ProfId2DZ=Art.
+ProfId2DZ=Umetnost.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=VAT ID
-VATIntraShort=VAT ID
+VATIntra=ID za DDV
+VATIntraShort=ID za DDV
 VATIntraSyntaxIsValid=Ime zavezanca veljavno
-VATReturn=VAT return
+VATReturn=obračun DDV
 ProspectCustomer=Možna stranka / kupec
 Prospect=Možna stranka
 CustomerCard=Kartica kupca
 Customer=Kupec
-CustomerRelativeDiscount=Relativni popust za kupca
-SupplierRelativeDiscount=Relative vendor discount
+CustomerRelativeDiscount=Popust za kupca
+SupplierRelativeDiscount=Popust pri dobavitelju
 CustomerRelativeDiscountShort=Relativni popust
 CustomerAbsoluteDiscountShort=Absolutni popust
 CompanyHasRelativeDiscount=Temu kupcu pripada popust v višini <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Ta kupec nima odobrenega relativnega popusta
-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
-CompanyHasDownPaymentOrCommercialDiscount=This customer has discounts available (commercial, down payments) for <b>%s</b> %s
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> with this vendor
+HasNoRelativeDiscountFromSupplier=No default relative discount with this vendor
+CompanyHasAbsoluteDiscount=Ta stranka ima na voljo popuste (dobropise ali predplačila) za <b> %s </b> %s
+CompanyHasDownPaymentOrCommercialDiscount=Ta stranka ima na voljo popuste (komercialne, predplačila) za <b> %s </b> %s
 CompanyHasCreditNote=Ta kupec ima dobropis ali depozit v višini <b>%s %s</b>
-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=Pri dobavitelju ni popusta/kredita
+HasAbsoluteDiscountFromSupplier=Na voljo imate popuste (dobropise ali predplačila) za <b> %s </b> %s pri tem dobavitelju
+HasDownPaymentOrCommercialDiscountFromSupplier=Na voljo imate popuste (komercialne, predplačila) za <b> %s </b> %s pri tem dobavitelju
+HasCreditNoteFromSupplier=Imate dobropise za <b> %s </b> %s tega dobavitelja
 CompanyHasNoAbsoluteDiscount=Ta kupec nima diskontnega kredita
-CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
-CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
-SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
-SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
+CustomerAbsoluteDiscountAllUsers=Absolutni popusti za kupce (ki jih odobrijo vsi uporabniki)
+CustomerAbsoluteDiscountMy=Absolutni popusti za stranke (dodelite jih sami)
+SupplierAbsoluteDiscountAllUsers=Absolutni popusti dobavitelja (vnesejo vsi uporabniki)
+SupplierAbsoluteDiscountMy=Absolutni popusti dobavitelja (vnesete sami)
 DiscountNone=Brez popusta
-Vendor=Vendor
-Supplier=Vendor
-AddContact=Ustvari kntakt
+Vendor=Dobavitelj
+Supplier=Dobavitelj
+AddContact=Ustvari stik
 AddContactAddress=Ustvari naslov
-EditContact=Uredi osebo / naslov
-EditContactAddress=Uredi kontakt/naslov
-Contact=Contact/Address
-Contacts=Kontakti
-ContactId=Contact id
-ContactsAddresses=Kontakti/naslovi
-FromContactName=Name:
-NoContactDefinedForThirdParty=Pri tem partnerju ni definiranega kontakta
-NoContactDefined=Pri tem partnerju ni definiranega kontakta
-DefaultContact=Privzeti kontakt
-ContactByDefaultFor=Default contact/address for
+EditContact=Uredi stik
+EditContactAddress=Uredi stik/naslov
+Contact=Stik/Naslov
+Contacts=Stik/Naslovi
+ContactId=ID stika
+ContactsAddresses=Stik/Naslovi
+FromContactName=Ime:
+NoContactDefinedForThirdParty=Pri tem partnerju ni definiranega stika
+NoContactDefined=Stik ni določen
+DefaultContact=Privzeti stik
+ContactByDefaultFor=Privzeti stik/naslov za
 AddThirdParty=Ustvari partnerja
 DeleteACompany=Izbriši podjetje
 PersonalInformations=Osebni podatki
-AccountancyCode=Računovodstvo račun
-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=Obvezno, če je partner kupec ali možna stranka
-RequiredIfSupplier=Required if third party is a vendor
-ValidityControledByModule=Validity controlled by the module
-ThisIsModuleRules=Rules for this module
-ProspectToContact=Možna stranka v kontakt
-CompanyDeleted=Podjetje "%s" izbrisano iz baze.
-ListOfContacts=Seznam kontaktov
-ListOfContactsAddresses=Seznam kontaktov
-ListOfThirdParties=List of Third Parties
-ShowCompany=Third Party
-ShowContact=Contact-Address
+AccountancyCode=Računovodski račun
+CustomerCode=Koda kupca
+SupplierCode=Koda dobavitelja
+CustomerCodeShort=Koda partnerja
+SupplierCodeShort=Koda dobavitelja
+CustomerCodeDesc=Enolična koda za vse partnerje
+SupplierCodeDesc=Enolična koda za vse dobavitelje
+RequiredIfCustomer=Obvezno, če je partner kupec ali potencialni kupec
+RequiredIfSupplier=Zahtevano za dobavitelje
+ValidityControledByModule=Veljavnost nadzira modul
+ThisIsModuleRules=Pravila za ta modul
+ProspectToContact=Potencialni kupec v stiku
+CompanyDeleted=Podjetje "%s" izbrisano iz podatkovnega skladišča.
+ListOfContacts=Seznam stikov/naslovov
+ListOfContactsAddresses=Seznam stikov/naslovov
+ListOfThirdParties=Seznam partnerjev
+ShowCompany=Partner
+ShowContact=Stik-Naslov
 ContactsAllShort=Vsi (brez filtra)
-ContactType=Contact role
-ContactForOrders=Kontakt za naročilo
-ContactForOrdersOrShipments=Kontakt za naročilo ali pošiljanje
-ContactForProposals=Kontakt za ponudbo
-ContactForContracts=Kontakt za pogodbo
-ContactForInvoices=Kontakt za račun
-NoContactForAnyOrder=Ta kontakt ni pravi za naročila
-NoContactForAnyOrderOrShipments=Ta kontakt ni pravi za naročilo ali pošiljanje
+ContactType=Vloga stika
+ContactForOrders=Stikova naročila
+ContactForOrdersOrShipments=Stik za pošiljanje naročil
+ContactForProposals=Stik za ponudbe
+ContactForContracts=Stik za pogodbe
+ContactForInvoices=Stik za račune
+NoContactForAnyOrder=Za naročila stik ni pravilen
+NoContactForAnyOrderOrShipments=Za pošiljanje naročil stik ni pravilen
 NoContactForAnyProposal=Ta kontakt ni pravi za komercialne ponudbe
 NoContactForAnyContract=Ta kontakt ni pravi za pogodbe
 NoContactForAnyInvoice=Ta kontakt ni pravi za račune
-NewContact=Nov kontakt
-NewContactAddress=New Contact/Address
-MyContacts=Moji kontakti
+NewContact=Nov stik
+NewContactAddress=Nov Stik/Naslov
+MyContacts=Moji stiki
 Capital=Kapital
 CapitalOf=Kapital %s
 EditCompany=Uredi podjetje
-ThisUserIsNot=This user is not a prospect, customer or vendor
+ThisUserIsNot=Ta uporabnik ni potencialni kupec, kupec ali dobavitelj
 VATIntraCheck=Kontrola
-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.
+VATIntraCheckDesc=ID za DDV mora vsebovati predpono države. Povezava <b> %s </b> uporablja evropsko storitev preverjanja DDV (VIES), ki zahteva dostop do interneta s strežnika Dolibarr.
 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" rel="noopener noreferrer">%s</a>
+VATIntraCheckableOnEUSite=Preverite ID za DDV znotraj Skupnosti na spletni strani Evropske komisije
+VATIntraManualCheck=Preverite lahko tudi ročno na spletni strani Evropske komisije <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a>
 ErrorVATCheckMS_UNAVAILABLE=Kontrola ni možna. Država članica ne zagotavlja storitve poizvedbe (%s).
-NorProspectNorCustomer=Not prospect, nor customer
-JuridicalStatus=Business entity type
-Workforce=Workforce
-Staff=Employees
+NorProspectNorCustomer=Ni potencialni kupec ali kupec
+JuridicalStatus=Vrsta poslovnega subjekta
+Workforce=Delovna sila
+Staff=Zaposleni
 ProspectLevelShort=Potencial
-ProspectLevel=Potencial možne stranke
+ProspectLevel=Potencial kupca
 ContactPrivate=Zasebni
 ContactPublic=V skupni rabi
-ContactVisibility=Vidljivost
+ContactVisibility=Viden
 ContactOthers=Ostalo
 OthersNotLinkedToThirdParty=Ostali, brez povezave s partnerjem
-ProspectStatus=Status možne stranke
-PL_NONE=Ni potenciala
+ProspectStatus=Status potencialnega kupca
+PL_NONE=brez
 PL_UNKNOWN=Neznan
-PL_LOW=Majhen potencial
-PL_MEDIUM=Srednji potencial
-PL_HIGH=Visok potencial
+PL_LOW=Nizka
+PL_MEDIUM=Srednja
+PL_HIGH=Visoka
 TE_UNKNOWN=-
 TE_STARTUP=Novo podjetje
 TE_GROUP=Veliko podjetje
@@ -412,89 +412,94 @@ TE_MEDIUM=Srednje podjetje
 TE_ADMIN=Državno podjetje
 TE_SMALL=Majhno podjetje
 TE_RETAIL=Maloprodaja
-TE_WHOLE=Wholesaler
+TE_WHOLE=Veletrgovec
 TE_PRIVATE=Samostojni podjetnik
 TE_OTHER=Ostalo
 StatusProspect-1=Ne kontaktirati
 StatusProspect0=Še ni bil kontaktiran
-StatusProspect1=To be contacted
+StatusProspect1=Za stik
 StatusProspect2=Kontaktiranje v teku
 StatusProspect3=Kontakt izveden
 ChangeDoNotContact=Spremeni status v 'Ne kontaktirati'
 ChangeNeverContacted=Spremeni status v 'Še ni bil kontaktiran'
-ChangeToContact=Change status to 'To be contacted'
+ChangeToContact=Spremenite status v »V stik«
 ChangeContactInProcess=Spremeni status v 'Kontaktiranje v teku'
 ChangeContactDone=Spremeni status v 'Kontakt izveden'
 ProspectsByStatus=Možne stranke po statusu
 NoParentCompany=Brez
 ExportCardToFormat=Izvoz podatkov v formatu
 ContactNotLinkedToCompany=Kontakt ni povezan z nobenim partnerjem
-DolibarrLogin=Uporabniško ime za Dolibarr
-NoDolibarrAccess=Nima dostopa v Dolibarr
-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
-PriceLevelLabels=Price Level Labels
+DolibarrLogin=Uporabniško ime
+NoDolibarrAccess=Nima dostopa
+ExportDataset_company_1=Partnerji (podjetja/fundacije/fizične osebe) in njihova lastnina
+ExportDataset_company_2=Stiki in njihove lastnosti
+ImportDataset_company_1=Partnerji in njihove lastnosti
+ImportDataset_company_2=Dodatni stiki/naslovi in atributi partnerjev
+ImportDataset_company_3=Bančni računi partnerjev
+ImportDataset_company_4=Prodajni zastopniki partnerjev (dodelite prodajne zastopnike/uporabnike podjetjem)
+PriceLevel=Raven cene
+PriceLevelLabels=Oznake ravni cen
 DeliveryAddress=Naslov za dostavo
 AddAddress=Dodaj naslov
-SupplierCategory=Vendor category
-JuridicalStatus200=Independent
+SupplierCategory=Skupina dobavitelja
+JuridicalStatus200=Neodvisen
 DeleteFile=Izbriši datoteko
-ConfirmDeleteFile=Ali zares želite izbrisati to datoteko?
-AllocateCommercial=Assigned to sales representative
+ConfirmDeleteFile=Ali ste prepričani, da želite izbrisati to datoteko <b> %s </b>?
+AllocateCommercial=Dodeljen prodajnemu zastopniku
 Organization=Organizacija
-FiscalYearInformation=Fiscal Year
+FiscalYearInformation=Poslovno leto
 FiscalMonthStart=Začetni mesec fiskalnega leta
-SocialNetworksInformation=Social networks
+SocialNetworksInformation=Socialna omrežja
 SocialNetworksFacebookURL=Facebook URL
 SocialNetworksTwitterURL=Twitter URL
 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
+YouMustAssignUserMailFirst=Preden lahko dodate e-poštno obvestilo, morate za tega uporabnika ustvariti e-poštno sporočilo.
+YouMustCreateContactFirst=Če želite dodati e-poštna obvestila, morate najprej določiti stike z veljavnimi e-poštnimi naslovi partnerja
+ListSuppliersShort=Seznam dobaviteljev
+ListProspectsShort=Seznam potencialnih kupcev
+ListCustomersShort=Seznam strank
+ThirdPartiesArea=Partnerji/stiki
+LastModifiedThirdParties=Zadnjih %s spremenjenih partnerjev
+UniqueThirdParties=Skupno število partnerjev
 InActivity=Odprt
 ActivityCeased=Neaktiven
-ThirdPartyIsClosed=Third party is closed
-ProductsIntoElements=List of products/services mapped to %s
+ThirdPartyIsClosed=Partner je zaprt
+ProductsIntoElements=Seznam izdelkov/storitev, preslikanih v %s
 CurrentOutstandingBill=Trenutni neplačan račun
 OutstandingBill=Max. za neplačan račun
-OutstandingBillReached=Max. for outstanding bill reached
-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.
+OutstandingBillReached=Maks. za dosežen neporavnani račun
+OrderMinAmount=Minimalni znesek za naročilo
+MonkeyNumRefModelDesc=Vrni številko v obliki %sllmm-nnnn za kodo kupca  in %sllmm-nnnn za kodo dobavitelja, kjer je ll leto, mm je mesec in nnnn je zaporedno samodejno naraščajoče število brez prekinitve in vrnitve na 0.
 LeopardNumRefModelDesc=Koda kupca / dobavitelja po želji. Lahko jo kadarkoli spremenite.
 ManagingDirectors=Ime direktorja(ev) (CEO, direktor, predsednik...)
 MergeOriginThirdparty=Podvojen partner (partner, ki ga želite zbrisati)
 MergeThirdparties=Združi partnerje
-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
-KeepEmptyIfGenericAddress=Keep this field empty if this address is a generic address
+ConfirmMergeThirdparties=Ali ste prepričani, da želite združiti izbranega partnerja s trenutno? Vsi povezani objekti (računi, naročila, ...) bodo prestavljeni na trenutnega partnerja, nato pa bo izbrana partner izbrisan.
+ThirdpartiesMergeSuccess=Partnerji so bili združeni
+SaleRepresentativeLogin=Prijava prodajnega predstavnika
+SaleRepresentativeFirstname=Ime prodajnega predstavnika
+SaleRepresentativeLastname=Priimek prodajnega predstavnika
+ErrorThirdpartiesMerge=Pri brisanju partnerjev je prišlo do napake. Preverite dnevnik. Spremembe so bile razveljavljene.
+NewCustomerSupplierCodeProposed=Koda kupca ali dobavitelja je že uporabljena, predlaga se nova koda
+KeepEmptyIfGenericAddress=Če je ta naslov splošni naslov, naj bo to polje prazno
 #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
+PaymentTypeCustomer=Vrsta plačila - Kupec
+PaymentTermsCustomer=Plačilni pogoji - Kupec
+PaymentTypeSupplier=Vrsta plačila - dobavitelj
+PaymentTermsSupplier=Plačilni rok - dobavitelj
+PaymentTypeBoth=Vrsta plačila - Dobavitelj in Kupec
+MulticurrencyUsed=Uporabite več valut
 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=Evropa (EGS)
+RestOfEurope=Preostala Evropa (EGS)
+OutOfEurope=Izven Evrope (EGS)
+CurrentOutstandingBillLate=Trenutni neplačani račun zamuja
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Bodite previdni, odvisno od nastavitev cene izdelka morate zamenjati partnerja, preden izdelek dodate na POS.
+EmailAlreadyExistsPleaseRewriteYourCompanyName=e-pošta že obstaja, prosimo, prepišite ime vašega podjetja
+TwoRecordsOfCompanyName=more than one record exists for this company, please contact us to complete your partnership request
+CompanySection=Company section
+ShowSocialNetworks=Show social networks
+HideSocialNetworks=Hide social networks
diff --git a/htdocs/langs/sl_SI/main.lang b/htdocs/langs/sl_SI/main.lang
index 604cbcc3f12..417b4eaf22c 100644
--- a/htdocs/langs/sl_SI/main.lang
+++ b/htdocs/langs/sl_SI/main.lang
@@ -226,6 +226,7 @@ NoUserGroupDefined=Nobena skupina uporabnikov ni definirana
 Password=Geslo
 PasswordRetype=Ponovite svoje geslo
 NoteSomeFeaturesAreDisabled=Upoštevajte, da je veliko funkcij/modulov v tej demonstraciji onemogočenih.
+YourUserFile=Your user file
 Name=Priimek
 NameSlashCompany=Ime / Podjetje
 Person=Oseba
@@ -897,6 +898,9 @@ MassFilesArea=Območje za datoteke, zgrajene z množičnimi akcijami
 ShowTempMassFilesArea=Pokaži območje datotek, ustvarjenih z množičnimi dejanji
 ConfirmMassDeletion=Potrditev množičnega brisanja
 ConfirmMassDeletionQuestion=Ali ste prepričani, da želite izbrisati izbrane zapise %s?
+ConfirmMassClone=Bulk clone confirmation
+ConfirmMassCloneQuestion=Select project to clone to
+ConfirmMassCloneToOneProject=Clone to project %s
 RelatedObjects=Sorodni predmeti
 ClassifyBilled=Klasificiraj kot fakturirano
 ClassifyUnbilled=Razvrsti neobračunano
@@ -912,8 +916,8 @@ ExportFilteredList=Izvoz filtriranega seznama
 ExportList=Izvozni seznam
 ExportOptions=Izvozne opcije
 IncludeDocsAlreadyExported=Vključi že izvožene dokumente
-ExportOfPiecesAlreadyExportedIsEnable=Omogočen je izvoz že izvoženih kosov
-ExportOfPiecesAlreadyExportedIsDisable=Izvoz že izvoženih kosov je onemogočen
+ExportOfPiecesAlreadyExportedIsEnable=Documents already exported are visible and will be exported
+ExportOfPiecesAlreadyExportedIsDisable=Documents already exported are hidden and won't be exported
 AllExportedMovementsWereRecordedAsExported=Vsi izvoženi premiki so bili zabeleženi kot izvoženi
 NotAllExportedMovementsCouldBeRecordedAsExported=Vseh izvoženih gibanj ni bilo mogoče zabeležiti kot izvožene
 Miscellaneous=Razno
@@ -1128,6 +1132,7 @@ DeleteFileText=Ali res želite izbrisati to datoteko?
 ShowOtherLanguages=Pokaži druge jezike
 SwitchInEditModeToAddTranslation=Preklopite v način urejanja, da dodate prevode za ta jezik
 NotUsedForThisCustomer=Ni uporabljeno za to stranko
+NotUsedForThisVendor=Not used for this vendor
 AmountMustBePositive=Znesek mora biti pozitiven
 ByStatus=Po statusu
 InformationMessage=Informacija
@@ -1148,14 +1153,14 @@ EventReminder=Opomnik dogodka
 UpdateForAllLines=Posodobitev za vse linije
 OnHold=Ustavljeno
 Civility=Vljudnost
-AffectTag=Assign Tag
-AffectUser=Assign User
-SetSupervisor=Nastavi nadzornika
+AffectTag=Assign a Tag
+AffectUser=Assign a User
+SetSupervisor=Set the supervisor
 CreateExternalUser=Ustvari zunanjega uporabnika
 ConfirmAffectTag=Bulk Tag Assignement
 ConfirmAffectUser=Bulk User Assignement
-ProjectRole=Role assigned on each project
-TasksRole=Role assigned on each task of each project
+ProjectRole=Role assigned on each project/opportunity
+TasksRole=Role assigned on each task (if used)
 ConfirmSetSupervisor=Paketna nastavitev nadzornika
 ConfirmUpdatePrice=Choose a increase/decrease price rate
 ConfirmAffectTagQuestion=Are you sure you want to assign tags to the %s selected record(s)?
@@ -1210,3 +1215,10 @@ CreatedByPublicPortal=Ustvarjeno iz javnega portala
 UserAgent=Uporabniški agent
 InternalUser=Interni uporabnik
 ExternalUser=Zunanji uporabnik
+NoSpecificContactAddress=No specific contact or address
+NoSpecificContactAddressBis=This tab is dedicated to force specific contacts or addresses for the current object. Use it only if you want to define one or several specific contacts or addresses for the object when the information on the thirdparty is not enough or not accurate.
+HideOnVCard=Hide %s
+AddToContacts=Add address to my contacts
+LastAccess=Last access
+UploadAnImageToSeeAPhotoHere=Upload an image from the tab %s to see a photo here
+LastPasswordChangeDate=Last password change date
diff --git a/htdocs/langs/sl_SI/stripe.lang b/htdocs/langs/sl_SI/stripe.lang
index a234f59f96c..a466078985c 100644
--- a/htdocs/langs/sl_SI/stripe.lang
+++ b/htdocs/langs/sl_SI/stripe.lang
@@ -41,7 +41,8 @@ STRIPE_LIVE_WEBHOOK_KEY=Ključ v živo Webhook
 ONLINE_PAYMENT_WAREHOUSE=Zaloga, ki se uporabi za zmanjšanje zaloge, ko je opravljeno spletno plačilo <br> (TODO Ko se izvede možnost zmanjšanja zaloge za dejanje na računu in spletno plačilo samo ustvari račun?)
 StripeLiveEnabled=Stripe v živo omogočen (sicer preskusni/peskovniški način)
 StripeImportPayment=Uvozite plačila Stripe
-ExampleOfTestCreditCard=Primer kreditne kartice za preizkus: %s => veljavna, %s => napaka CVC, %s => potekla, %s => bremenitev ni uspela
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+ExampleOfTestBankAcountForSEPA=Example of bank account BAN for direct debit test: %s
 StripeGateways=Stripe prehodi
 OAUTH_STRIPE_TEST_ID=ID odjemalca Stripe Connect (ca_...)
 OAUTH_STRIPE_LIVE_ID=ID odjemalca Stripe Connect (ca_...)
@@ -70,5 +71,8 @@ ToOfferALinkForLiveWebhook=Povezava za nastavitev Stripe WebHook za klic IPN (na
 PaymentWillBeRecordedForNextPeriod=Plačilo bo evidentirano za naslednje obdobje.
 ClickHereToTryAgain= <a href="%s"> Kliknite tukaj, če želite poskusiti znova ... </a>
 CreationOfPaymentModeMustBeDoneFromStripeInterface=Zaradi pravil stroge avtentikacije strank je treba kartico ustvariti v zaledni pisarni Stripe. Tukaj lahko kliknete, da vklopite evidenco strank Stripe: %s
-TERMINAL_LOCATION=Lokacija (naslov) za terminale
+STRIPE_CARD_PRESENT=Card Present for Stripe Terminals
+TERMINAL_LOCATION=Location (address) for Stripe Terminals
 RequestDirectDebitWithStripe=Zahtevajte direktno bremenitev s Stripe
+STRIPE_SEPA_DIRECT_DEBIT=Enable the Direct Debit payments through Stripe
+
diff --git a/htdocs/langs/sl_SI/ticket.lang b/htdocs/langs/sl_SI/ticket.lang
index 5c24e13f2d0..90ecd5b1ec8 100644
--- a/htdocs/langs/sl_SI/ticket.lang
+++ b/htdocs/langs/sl_SI/ticket.lang
@@ -26,6 +26,7 @@ Permission56002=Sprememba zahtevkov
 Permission56003=Izbriši zahtevke
 Permission56004=Upravljanje zahtevkov
 Permission56005=Pogled zahtevkov vseh partnerjev (ne velja za zunanje uporabnike, vedno bodite pozorni na pomebne partnerje)
+Permission56006=Export tickets
 
 Tickets=Vstopnice
 TicketDictType=Zahtevki - vrste
@@ -61,6 +62,8 @@ TypeContact_ticket_external_CONTRIBUTOR=Zunanji sodelavec
 OriginEmail=Poročavalec e-pošta
 Notify_TICKET_SENTBYMAIL=Pošljite sporočilo po e-pošti
 
+ExportDataset_ticket_1=Vstopnice
+
 # Status
 Read=Preberite
 Assigned=Dodeljeno
diff --git a/htdocs/langs/sl_SI/users.lang b/htdocs/langs/sl_SI/users.lang
index 8d72c453249..734ae34fdd5 100644
--- a/htdocs/langs/sl_SI/users.lang
+++ b/htdocs/langs/sl_SI/users.lang
@@ -66,7 +66,8 @@ LinkedToDolibarrUser=Povezava do uporabnika
 LinkedToDolibarrThirdParty=Povezava do partnerja
 CreateDolibarrLogin=Kreiraj Dolibarr uporabnika
 CreateDolibarrThirdParty=Kreiraj partnerja
-LoginAccountDisableInDolibarr=Račun v Dolibarrju onemogočen.
+LoginAccountDisableInDolibarr=Account disabled in Dolibarr
+PASSWORDInDolibarr=Password modified in Dolibarr
 UsePersonalValue=Uporabi osebne podatke
 ExportDataset_user_1=Uporabniki in njihove lastnosti
 DomainUser=Uporabnik domene %s
@@ -129,3 +130,6 @@ IPLastLogin=IP zadnja prijava
 IPPreviousLogin=IP prejšnja prijava
 ShowAllPerms=Show all permission rows
 HideAllPerms=Hide all permission rows
+UserPublicPageDesc=You can enable a virtual card for this user. An url with the user profile and a barcode will be available to allow anybody with a smartphone to scan it and add your contact to its address book.
+EnablePublicVirtualCard=Enable the public virtual user card
+PublicVirtualCardUrl=Public virtual user card
diff --git a/htdocs/langs/sr_RS/users.lang b/htdocs/langs/sr_RS/users.lang
index f41e2ad1fb1..9c7d0e37565 100644
--- a/htdocs/langs/sr_RS/users.lang
+++ b/htdocs/langs/sr_RS/users.lang
@@ -66,7 +66,8 @@ LinkedToDolibarrUser=Link to user
 LinkedToDolibarrThirdParty=Link to third party
 CreateDolibarrLogin=Kreiraj korisnika
 CreateDolibarrThirdParty=Kreiraj subjekat
-LoginAccountDisableInDolibarr=Nalog je deaktiviran u Dolibarr-u
+LoginAccountDisableInDolibarr=Account disabled in Dolibarr
+PASSWORDInDolibarr=Password modified in Dolibarr
 UsePersonalValue=Upotrebi lićnu vrednost
 ExportDataset_user_1=Users and their properties
 DomainUser=Korisnik domena %s
@@ -129,3 +130,6 @@ IPLastLogin=IP last login
 IPPreviousLogin=IP previous login
 ShowAllPerms=Show all permission rows
 HideAllPerms=Hide all permission rows
+UserPublicPageDesc=You can enable a virtual card for this user. An url with the user profile and a barcode will be available to allow anybody with a smartphone to scan it and add your contact to its address book.
+EnablePublicVirtualCard=Enable the public virtual user card
+PublicVirtualCardUrl=Public virtual user card
diff --git a/htdocs/langs/sv_SE/accountancy.lang b/htdocs/langs/sv_SE/accountancy.lang
index 02599ca892e..cdc97249343 100644
--- a/htdocs/langs/sv_SE/accountancy.lang
+++ b/htdocs/langs/sv_SE/accountancy.lang
@@ -14,8 +14,8 @@ ACCOUNTING_EXPORT_ENDLINE=Välj vagnens returtyp
 ACCOUNTING_EXPORT_PREFIX_SPEC=Ange prefix för filnamnet
 ThisService=Denna tjänst
 ThisProduct=Denna produkt
-DefaultForService=Standard för tjänst
-DefaultForProduct=Standard för produkt
+DefaultForService=Standard för tjänster
+DefaultForProduct=Standard för produkter
 ProductForThisThirdparty=Produkt för denna tredjepart
 ServiceForThisThirdparty=Tjänst för denna tredjepart
 CantSuggest=Kan inte föreslå
@@ -101,7 +101,8 @@ ShowAccountingAccount=Visa bokföringskonto
 ShowAccountingJournal=Visa loggböcker
 ShowAccountingAccountInLedger=Visa redovisningskonto i huvudbok
 ShowAccountingAccountInJournals=Visa redovisningskonto i tidskrifter
-AccountAccountingSuggest=Redovisningskonto föreslås
+DataUsedToSuggestAccount=Data som används för att föreslå konto
+AccountAccountingSuggest=Konto föreslaget
 MenuDefaultAccounts=Standardkonton
 MenuBankAccounts=Bankkonton
 MenuVatAccounts=Vat konton
@@ -126,6 +127,7 @@ WriteBookKeeping=Registrera transaktioner i bokföringen
 Bookkeeping=Huvudbok
 BookkeepingSubAccount=Underledger
 AccountBalance=Kontobalans
+AccountBalanceSubAccount=Saldo på underkonton
 ObjectsRef=Källobjekt ref
 CAHTF=Totalt köpleverantör före skatt
 TotalExpenseReport=Totalkostnadsrapport
@@ -189,6 +191,7 @@ ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Konto (från kontoplanen) som ska användas
 UseAuxiliaryAccountOnCustomerDeposit=Lagra kundkonto som individuellt konto i huvudboken för rader med förskottsbetalningar (om det är inaktiverat förblir individuellt konto för förskottsrader tomt)
 ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Konto (från kontoplanen) som ska användas som standard
 UseAuxiliaryAccountOnSupplierDeposit=Lagra leverantörskonto som individuellt konto i huvudboken för rader med förskottsbetalningar (om det är inaktiverat förblir individuellt konto för förskottsrader tomt)
+ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY=Bokföringskonto som standard för att registrera kundbehållen garanti
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Konto (från kontoplanen) som ska användas som standardkonto för produkter köpta inom samma land (används om det inte definieras i produktbladet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Konto (från kontoplanen) som ska användas som standardkonto för de produkter som köpts från EEC till ett annat EEC-land (används om det inte anges i produktbladet)
@@ -218,6 +221,7 @@ JournalLabel=Loggboksetikett
 NumPiece=Stycke nummer
 TransactionNumShort=Num. transaktion
 AccountingCategory=Anpassad grupp av konton
+AccountingCategories=Anpassade grupper av konton
 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.
@@ -265,6 +269,7 @@ ShowSubtotalByGroup=Visa delsumma efter nivå
 
 Pcgtype=Grupp av konto
 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.
+AccountingCategoriesDesc=Anpassad grupp av konton kan användas för att gruppera redovisningskonton i ett namn för att underlätta filteranvändning eller skapa anpassade rapporter.
 
 Reconcilable=Förenlig
 
@@ -294,6 +299,7 @@ DescValidateMovements=Alla ändringar eller raderingar av skrift, bokstäver och
 
 ValidateHistory=Förbind automatiskt
 AutomaticBindingDone=Automatiska bindningar gjorda (%s) - Automatisk bindning är inte möjlig för vissa poster (%s)
+DoManualBindingForFailedRecord=Du måste göra en manuell länk för %s rad(er) som inte länkas automatiskt.
 
 ErrorAccountancyCodeIsAlreadyUse=Fel, du kan inte ta bort eller inaktivera det här kontoplanen eftersom det används
 MvtNotCorrectlyBalanced=Rörelse inte korrekt balanserad. Debet = %s & kredit = %s
@@ -337,11 +343,13 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=Inaktivera bindning och överföring av bokf
 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)
 ACCOUNTING_ENABLE_LETTERING=Aktivera bokstäverfunktionen i bokföringen
+ACCOUNTING_ENABLE_AUTOLETTERING=Aktivera den automatiska bokstäverna vid överföring till bokföring
 
 ## Export
 NotExportLettering=Exportera inte bokstäverna när filen genereras
 NotifiedExportDate=Flagga exporterade rader som exporterade <span class="warning"> (för att ändra en rad måste du radera hela transaktionen och överföra den till bokföringen igen) </span>
 NotifiedValidationDate=Validera och lås de exporterade posterna <span class="warning"> (samma effekt som "%s"-funktionen, modifiering och radering av raderna kommer DEFINITIVT inte att vara möjligt) </span>
+NotifiedExportFull=Exportera dokument?
 DateValidationAndLock=Datumvalidering och lås
 ConfirmExportFile=Bekräftelse på generering av bokföringsexportfilen?
 ExportDraftJournal=Exportera utkast till loggbok
@@ -398,7 +406,7 @@ 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.
+SaleEECWithoutVATNumber=Försäljning i EEC utan moms men tredje parts momsregistreringsnummer är inte definierat. Vi faller tillbaka på kontot för standardförsäljning. Du kan fixa tredje parts momsregistreringsnummer eller ändra produktkontot som föreslås för bindning om det behövs.
 ForbiddenTransactionAlreadyExported=Förbjudet: Transaktionen har validerats och/eller exporterats.
 ForbiddenTransactionAlreadyValidated=Förbjudet: Transaktionen har validerats.
 ## Dictionary
@@ -442,6 +450,7 @@ AccountancyErrorMismatchLetterCode=Missmatch i avstämningskod
 AccountancyErrorMismatchBalanceAmount=Saldot (%s) är inte lika med 0
 AccountancyErrorLetteringBookkeeping=Fel har uppstått angående transaktionerna: %s
 ErrorAccountNumberAlreadyExists=Kontonumret %s finns redan
+ErrorArchiveAddFile=Kan inte lägga "%s"-filen i arkivet
 
 ## Import
 ImportAccountingEntries=Redovisningsposter
@@ -468,5 +477,7 @@ FECFormatMulticurrencyCode=Flervalskod (Idevise)
 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
+DocsAlreadyExportedAreExcluded=Dokument som redan har exporterats exkluderas
+ClickToHideAlreadyExportedLines=Klicka för att dölja redan exporterade rader
 
 NAccounts=%s-konton
diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang
index aab53f3f92e..d4f9ce90625 100644
--- a/htdocs/langs/sv_SE/admin.lang
+++ b/htdocs/langs/sv_SE/admin.lang
@@ -645,6 +645,8 @@ Module2300Name=Schemalagda jobb
 Module2300Desc=Hantering av schemalagda jobb (cron eller chrono-tabell)
 Module2400Name=Händelser/dagordning
 Module2400Desc=Registrera händelser. Logga automatiska händelser för spårningsändamål eller registrera händelser eller möten manuellt. Detta är huvudmodulen för bra kund- eller leverantörsrelation!
+Module2430Name=Bokningskalendersystem
+Module2430Desc=Tillhandahåll en onlinekalender så att vem som helst kan boka möten, enligt fördefinierade intervall eller tillgänglighet.
 Module2500Name=DMS/ECM
 Module2500Desc=Dokumenthanteringssystem/elektronisk innehållshantering. Automatisk organisering av dina skapade eller lagrade dokument. Dela dem när du behöver.
 Module2600Name=API/webbtjänster (SOAP-server)
@@ -660,6 +662,8 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind konverteringskapacitet
 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 händelser som kan exporteras. Denna modul kan vara obligatorisk i vissa länder.
+Module3300Name=Modulbyggare
+Module3200Desc=Aktivera en oföränderlig logg över affärshändelser. Händelser arkiveras i realtid. Loggen är en skrivskyddad tabell med händelser som kan exporteras. Denna modul kan vara obligatorisk i vissa länder.
 Module3400Name=Sociala nätverk
 Module3400Desc=Aktivera fält för sociala nätverks i tredjeparter och adresser (Skype, Twitter, Facebook, ...).
 Module4000Name=HRM
@@ -1270,6 +1274,7 @@ TriggerActiveAsModuleActive=Utlösare i denna fil är aktiva då modulen <b>%s</
 GeneratedPasswordDesc=Välj den metod som ska användas för automatiskt genererade lösenord.
 DictionaryDesc=Ange all referensdata. Du kan lägga till dina värden i standardvärdet.
 ConstDesc=Denna sida låter dig redigera (åsidosätta) inställningar som inte är tillgängliga på andra sidor. Dessa är oftast reserverade för utvecklare/avancerad felsökning.
+MiscellaneousOptions=Diverse alternativ
 MiscellaneousDesc=Alla andra säkerhetsrelaterade inställningar anges här.
 LimitsSetup=Begränsningar/precisionsinställningar
 LimitsDesc=Du kan ange begränsningar, precisioner och optimeringar som används av Dolibarr här
@@ -1826,6 +1831,9 @@ AGENDA_USE_EVENT_TYPE=Använd händelsetyper (hanteras i menyn Inställningar ->
 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_EVENT_PAST_COLOR=Tidigare händelsefärg
+AGENDA_EVENT_CURRENT_COLOR=Aktuell händelsefärg
+AGENDA_EVENT_FUTURE_COLOR=Framtida händelsefärg
 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
@@ -2129,6 +2137,7 @@ 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)
+LoadContactFromEmailOrCreate=Ladda kontaktsökning på %s (skapa om den inte hittas)
 AttachJoinedDocumentsToObject=Spara bifogade filer i objektdokument om en ref för ett objekt hittas i e-postämnet.
 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
@@ -2355,3 +2364,5 @@ AllowExternalDownload=Tillåt extern nedladdning (utan inloggning, med en delad
 DeadlineDayVATSubmission=Sista dag för momsinlämning nästa månad
 MaxNumberOfAttachementOnForms=Max antal sammanfogade filer i ett formulär
 IfDefinedUseAValueBeetween=Om angiven, använd ett värde mellan %soch %s
+Reload=Ladda om
+ConfirmReload=Bekräfta omladdning av modulen
diff --git a/htdocs/langs/sv_SE/boxes.lang b/htdocs/langs/sv_SE/boxes.lang
index 3a114393c78..cca4fd1907f 100644
--- a/htdocs/langs/sv_SE/boxes.lang
+++ b/htdocs/langs/sv_SE/boxes.lang
@@ -24,6 +24,7 @@ BoxFicheInter=Senaste interventioner
 BoxCurrentAccounts=Öppna kontobalanser
 BoxTitleMemberNextBirthdays=Födelsedagar denna månad (medlemmar)
 BoxTitleMembersByType=Medlemmar efter typ och status
+BoxTitleMembersByTags=Medlemmar efter taggar och status
 BoxTitleMembersSubscriptionsByYear=Prenumerationer per år
 BoxTitleLastRssInfos=Senaste %s nyheter från %s
 BoxTitleLastProducts=Produkter/tjänster: senaste %s ändrade
diff --git a/htdocs/langs/sv_SE/companies.lang b/htdocs/langs/sv_SE/companies.lang
index ebee840f1ed..49cdcc48cc7 100644
--- a/htdocs/langs/sv_SE/companies.lang
+++ b/htdocs/langs/sv_SE/companies.lang
@@ -313,7 +313,7 @@ CustomerAbsoluteDiscountShort=Absolut rabatt
 CompanyHasRelativeDiscount=Denna kund har en standardrabatt på <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Denna kund har ingen standardrabatt
 HasRelativeDiscountFromSupplier=Du har en standardrabatt på <b> %s%% </b> hos denna leverantör
-HasNoRelativeDiscountFromSupplier=Ingen standard rabatt hos denna leverantör
+HasNoRelativeDiscountFromSupplier=Ingen standard relativ rabatt hos denna leverantör
 CompanyHasAbsoluteDiscount=Den här kunden har rabatter tillgängliga (krediter eller nedbetalningar) för <b> %s </b> %s
 CompanyHasDownPaymentOrCommercialDiscount=Denna kund har rabatter tillgängliga (kommersiella, förskott) på <b> %s </b> %s
 CompanyHasCreditNote=Denna kund har fortfarande kreditnotor på <b>%s %s</b>
@@ -499,4 +499,7 @@ OutOfEurope=Utanför Europa (EEG)
 CurrentOutstandingBillLate=Faktura försenad
 BecarefullChangeThirdpartyBeforeAddProductToInvoice=Beroende på dina inställningar för produktpris så bör du ändra tredjepart innan du lägger till produkten i kassan.
 EmailAlreadyExistsPleaseRewriteYourCompanyName=E-postadressen finns redan, vänligen skriv ditt företagsnamn
-TwoRecordsOfCompanyName=det finns mer än en post för detta företag, kontakta oss för att slutföra din partnerskapsförfrågan"
+TwoRecordsOfCompanyName=det finns mer än en post för detta företag, kontakta oss för att slutföra din partnerskapsförfrågan
+CompanySection=Företagssektionen
+ShowSocialNetworks=Visa sociala nätverk
+HideSocialNetworks=Dölj sociala nätverk
diff --git a/htdocs/langs/sv_SE/errors.lang b/htdocs/langs/sv_SE/errors.lang
index f64c8d9d52b..e49a78d4d53 100644
--- a/htdocs/langs/sv_SE/errors.lang
+++ b/htdocs/langs/sv_SE/errors.lang
@@ -303,6 +303,7 @@ ErrorValueForTooLow=Värdet för <b> %s </b> är för lågt
 ErrorValueCantBeNull=Värdet för <b> %s </b> kan inte vara null
 ErrorDateOfMovementLowerThanDateOfFileTransmission=Datumet för banktransaktionen får inte vara tidigare än datumet för filöverföringen
 ErrorTooMuchFileInForm=För många filer i formuläret, det maximala antalet är %s fil(er)
+ErrorSessionInvalidatedAfterPasswordChange=Sessionen ogiltigförklarades efter byte av lösenord, status eller giltighetsdatum. Vänligen logga in igen.
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Din PHP-parameter upload_max_filesize (%s) är högre än PHP-parameter post_max_size (%s). Detta är inte en konsekvent installation.
@@ -325,6 +326,7 @@ WarningPaymentDateLowerThanInvoiceDate=Betalningsdag (%s) är tidigare än faktu
 WarningTooManyDataPleaseUseMoreFilters=För många data (mer än %s linjer). Vänligen använd fler filter eller sätt konstanten %s till en högre gräns.
 WarningSomeLinesWithNullHourlyRate=En del gånger registrerades av vissa användare medan deras timpris inte definierades. Ett värde på 0 %s per timme användes men det kan leda till felaktig värdering av tiden.
 WarningYourLoginWasModifiedPleaseLogin=Din inloggning har ändrats. För säkerhetsändamål måste du logga in med din nya inloggning innan nästa åtgärd.
+WarningYourPasswordWasModifiedPleaseLogin=Ditt lösenord har ändrats. Av säkerhetsskäl måste du logga in nu med ditt nya lösenord.
 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
diff --git a/htdocs/langs/sv_SE/eventorganization.lang b/htdocs/langs/sv_SE/eventorganization.lang
index 5f8426b3080..ff8932926a6 100644
--- a/htdocs/langs/sv_SE/eventorganization.lang
+++ b/htdocs/langs/sv_SE/eventorganization.lang
@@ -172,3 +172,5 @@ ErrorSeveralCompaniesWithEmailContactUs=Flera företag med denna e-postadress ha
 ErrorSeveralCompaniesWithNameContactUs=Flera företag med detta namn har hittats så vi kan inte validera din registrering automatiskt. Kontakta oss på %s för en manuell validering
 NoPublicActionsAllowedForThisEvent=Det finns inga åtgärder som är öppna för allmänheten för detta evenemang
 MaxNbOfAttendees=Max antal deltagare
+DateStartEvent=Eventets startdatum
+DateEndEvent=Eventets slutdatum
diff --git a/htdocs/langs/sv_SE/main.lang b/htdocs/langs/sv_SE/main.lang
index 55d059c60ec..3df909136a6 100644
--- a/htdocs/langs/sv_SE/main.lang
+++ b/htdocs/langs/sv_SE/main.lang
@@ -226,6 +226,7 @@ NoUserGroupDefined=Ingen användargrupp är angiven
 Password=Lösenord
 PasswordRetype=Repetera lösenordet
 NoteSomeFeaturesAreDisabled=Observera att en hel del funktioner/moduler är inaktiverade i denna demonstration.
+YourUserFile=Din användarfil
 Name=Namn
 NameSlashCompany=Namn/företag
 Person=Person
@@ -897,6 +898,9 @@ MassFilesArea=Område för filer som skapats via bulkåtgärder
 ShowTempMassFilesArea=Visa område med filer som skapats via bulkåtgärder
 ConfirmMassDeletion=Bekräftelse för bulkradering
 ConfirmMassDeletionQuestion=Är du säker på att du vill ta bort %s markerade post(er)?
+ConfirmMassClone=Bekräftelse av bulkklon
+ConfirmMassCloneQuestion=Välj projekt att klona till
+ConfirmMassCloneToOneProject=Klona för att projektera %s
 RelatedObjects=Relaterade objekt
 ClassifyBilled=Märk fakturerad
 ClassifyUnbilled=Märk ofakturerad
@@ -912,8 +916,8 @@ ExportFilteredList=Exportera filtrerad lista
 ExportList=Exportera lista
 ExportOptions=Exportalternativ
 IncludeDocsAlreadyExported=Inkludera dokument som redan har exporterats
-ExportOfPiecesAlreadyExportedIsEnable=Export av redan exporterade bitar är aktiverad
-ExportOfPiecesAlreadyExportedIsDisable=Export av redan exporterade bitar är inaktiverad
+ExportOfPiecesAlreadyExportedIsEnable=Dokument som redan exporterats är synliga och kommer att exporteras
+ExportOfPiecesAlreadyExportedIsDisable=Dokument som redan exporterats är dolda och kommer inte att exporteras
 AllExportedMovementsWereRecordedAsExported=Alla exporterade förflyttningar har registrerats som exporterade
 NotAllExportedMovementsCouldBeRecordedAsExported=Inte alla exporterade förflyttningar kunde registreras som exporterade
 Miscellaneous=Diverse
@@ -1128,6 +1132,7 @@ 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
+NotUsedForThisVendor=Används inte för denna leverantör
 AmountMustBePositive=Beloppet måste vara positivt
 ByStatus=Efter status
 InformationMessage=Information
@@ -1148,14 +1153,14 @@ EventReminder=Händelsepåminnelse
 UpdateForAllLines=Uppdatering för alla rader
 OnHold=Pausad
 Civility=Tilltal
-AffectTag=Tilldela tagg
-AffectUser=Tilldela användare
-SetSupervisor=Ange överordnad
+AffectTag=Tilldela en tagg
+AffectUser=Tilldela en användare
+SetSupervisor=Ställ in handledaren
 CreateExternalUser=Skapa extern användare
 ConfirmAffectTag=Tilldela tagg i bulk
 ConfirmAffectUser=Tilldela användare i bulk
-ProjectRole=Roll tilldelad på varje projekt
-TasksRole=Roll tilldelad för varje uppgift i varje projekt
+ProjectRole=Roll tilldelad på varje projekt/tillfälle
+TasksRole=Roll tilldelad för varje uppgift (om sådan används)
 ConfirmSetSupervisor=Ange överordnad i bulk
 ConfirmUpdatePrice=Välj kurs för att öka/minska pris
 ConfirmAffectTagQuestion=Är du säker på att du vill tilldela taggen till %s valda poster?
@@ -1210,3 +1215,10 @@ CreatedByPublicPortal=Skapad i portalen
 UserAgent=Webbläsare
 InternalUser=Intern användare
 ExternalUser=Extern användare
+NoSpecificContactAddress=Ingen specifik kontakt eller adress
+NoSpecificContactAddressBis=Den här fliken är avsedd att tvinga fram specifika kontakter eller adresser för det aktuella objektet. Använd den endast om du vill definiera en eller flera specifika kontakter eller adresser för objektet när informationen om tredje part inte räcker till eller inte är korrekt.
+HideOnVCard=Dölj %s
+AddToContacts=Lägg till adress till mina kontakter
+LastAccess=Senaste åtkomst
+UploadAnImageToSeeAPhotoHere=Ladda upp en bild från fliken %s för att se ett foto här
+LastPasswordChangeDate=Datum för senaste lösenordsändring
diff --git a/htdocs/langs/sv_SE/mrp.lang b/htdocs/langs/sv_SE/mrp.lang
index aef6f852aa7..50130de7aea 100644
--- a/htdocs/langs/sv_SE/mrp.lang
+++ b/htdocs/langs/sv_SE/mrp.lang
@@ -102,6 +102,7 @@ NbOperatorsRequired=Antal operatörer som krävs
 THMOperatorEstimated=Uppskattad operatör THM
 THMMachineEstimated=Beräknad maskin THM
 WorkstationType=Arbetsstationstyp
+DefaultWorkstation=Standard arbetsstation
 Human=Mänsklig
 Machine=Maskin
 HumanMachine=Människa / maskin
diff --git a/htdocs/langs/sv_SE/orders.lang b/htdocs/langs/sv_SE/orders.lang
index 83e567e6154..756721294c5 100644
--- a/htdocs/langs/sv_SE/orders.lang
+++ b/htdocs/langs/sv_SE/orders.lang
@@ -96,6 +96,10 @@ OrdersStatisticsSuppliers=Inköpsorderstatistik
 NumberOfOrdersByMonth=Antal ordrar per månad
 AmountOfOrdersByMonthHT=Antal order per månad (exkl. Skatt)
 ListOfOrders=Lista över ordrar
+ListOrderLigne=Orderrader
+productobuy=Endast produkter att köpa
+productonly=Endast produkter
+disablelinefree=Inga linjer lediga
 CloseOrder=Stäng order
 ConfirmCloseOrder=Är du säker på att du vill ändra den här order till levererad? När en order har levererats kan den fakturas.
 ConfirmDeleteOrder=Är du säker på att du vill radera den här beställningen?
@@ -131,6 +135,7 @@ SupplierOrderClassifiedBilled=Beställningsorder %s set fakturerad
 OtherOrders=Övriga beställningar
 SupplierOrderValidatedAndApproved=Leverantörsorder är validerad och godkänd: %s
 SupplierOrderValidated=Leverantörsorder är validerad: %s
+OrderShowDetail=Visa beställningsdetaljer
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Representativ uppföljningsordern
 TypeContact_commande_internal_SHIPPING=Representanten uppföljning sjöfart
@@ -199,3 +204,5 @@ StatusSupplierOrderApproved=Godkänd
 StatusSupplierOrderRefused=Refused
 StatusSupplierOrderReceivedPartially=Delvis fått
 StatusSupplierOrderReceivedAll=Alla produkter mottagna
+NeedAtLeastOneInvoice = Det måste finnas minst en faktura
+LineAlreadyDispatched = Orderraden är redan mottagen.
diff --git a/htdocs/langs/sv_SE/products.lang b/htdocs/langs/sv_SE/products.lang
index 82884c9b5cd..84300b73c5e 100644
--- a/htdocs/langs/sv_SE/products.lang
+++ b/htdocs/langs/sv_SE/products.lang
@@ -414,8 +414,8 @@ MergeProducts=Slå ihop produkter
 ConfirmMergeProducts=Är du säker på att du vill slå samman den valda produkten med den nuvarande? Alla länkade objekt (fakturor, beställningar, ...) kommer att flyttas till den aktuella produkten, varefter den valda produkten raderas.
 ProductsMergeSuccess=Produkterna har slagits samman
 ErrorsProductsMerge=Fel vid produkt sammanslagning
-SwitchOnSaleStatus=Slå på försäljningsstatus
-SwitchOnPurchaseStatus=Slå på köpstatus
+SwitchOnSaleStatus=Ändra försäljningsstatus
+SwitchOnPurchaseStatus=Ändra köpstatus
 UpdatePrice=Öka/minska kundpriset
 StockMouvementExtraFields= Extra fält (lagerrörelse)
 InventoryExtraFields= Extra fält (inventering)
diff --git a/htdocs/langs/sv_SE/stripe.lang b/htdocs/langs/sv_SE/stripe.lang
index 35d559d99a1..58e6a840aba 100644
--- a/htdocs/langs/sv_SE/stripe.lang
+++ b/htdocs/langs/sv_SE/stripe.lang
@@ -41,7 +41,8 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook levande nyckel
 ONLINE_PAYMENT_WAREHOUSE=Lager som ska användas för lagerminskning när online betalning görs <br> (TODO När alternativet att minska lagret görs på en fakturahandling och online betalning genererar fakturaen?)
 StripeLiveEnabled=Stripe live enabled (annars test / sandbox-läge)
 StripeImportPayment=Importera Stripe betalningar
-ExampleOfTestCreditCard=Exempel på kreditkort för test: %s => valid, %s => error CVC, %s => expired, %s => debitering misslyckas
+ExampleOfTestCreditCard=Exempel på kreditkort för SEPA-test: %s => giltigt, %s => fel CVC, %s => löpt ut, %s => laddning misslyckas
+ExampleOfTestBankAcountForSEPA=Exempel på bankkonto BAN för autogirotest: %s
 StripeGateways=Stripe gateways
 OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca _...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca _...)
@@ -70,5 +71,8 @@ ToOfferALinkForLiveWebhook=Länk till installation Stripe WebHook för att ringa
 PaymentWillBeRecordedForNextPeriod=Betalning kommer att registreras för nästa period.
 ClickHereToTryAgain= <a href="%s"> Klicka här för att försöka igen ... </a>
 CreationOfPaymentModeMustBeDoneFromStripeInterface=På grund av starka regler för kundautentisering måste ett kort skapas från Stripe backoffice. Du kan klicka här för att slå på Stripes kundregister: %s
-TERMINAL_LOCATION=Plats (adress) för terminaler
+STRIPE_CARD_PRESENT=Presentkort för Stripe-terminaler
+TERMINAL_LOCATION=Plats (adress) för Stripe Terminals
 RequestDirectDebitWithStripe=Begär autogiro med Stripe
+STRIPE_SEPA_DIRECT_DEBIT=Aktivera autogirobetalningar genom Stripe
+
diff --git a/htdocs/langs/sv_SE/ticket.lang b/htdocs/langs/sv_SE/ticket.lang
index 81b60716c19..d8b99e4c8df 100644
--- a/htdocs/langs/sv_SE/ticket.lang
+++ b/htdocs/langs/sv_SE/ticket.lang
@@ -26,6 +26,7 @@ Permission56002=Ändra ärenden
 Permission56003=Radera ärenden
 Permission56004=Hantera ärenden
 Permission56005=Se ärenden till alla tredje parter (inte effektiva för externa användare, alltid begränsad till tredje part som de är beroende av)
+Permission56006=Exportera ärenden
 
 Tickets=Ärenden
 TicketDictType=Ärende - Typer
@@ -61,6 +62,8 @@ TypeContact_ticket_external_CONTRIBUTOR=Extern bidragsyter
 OriginEmail=Reporter E-post
 Notify_TICKET_SENTBYMAIL=Skicka ärrendemeddelande via e-post
 
+ExportDataset_ticket_1=Ärenden
+
 # Status
 Read=Läsa
 Assigned=Tilldelad
diff --git a/htdocs/langs/sv_SE/users.lang b/htdocs/langs/sv_SE/users.lang
index 1fa6d43de6f..87e8edc08f0 100644
--- a/htdocs/langs/sv_SE/users.lang
+++ b/htdocs/langs/sv_SE/users.lang
@@ -66,7 +66,8 @@ LinkedToDolibarrUser=Länk till användare
 LinkedToDolibarrThirdParty=Länk till tredjepart
 CreateDolibarrLogin=Skapa användare
 CreateDolibarrThirdParty=Skapa tredjepart
-LoginAccountDisableInDolibarr=Konto inaktiverat.
+LoginAccountDisableInDolibarr=Kontot inaktiverat i Dolibarr
+PASSWORDInDolibarr=Lösenordet ändrat i Dolibarr
 UsePersonalValue=Använd personligt värde
 ExportDataset_user_1=Användare och egenskaper
 DomainUser=Domänanvändare %s
@@ -129,3 +130,6 @@ IPLastLogin=IP senaste inloggning
 IPPreviousLogin=IP föregående inloggning
 ShowAllPerms=Visa alla rättighetsrader
 HideAllPerms=Dölj alla rättighetsrader
+UserPublicPageDesc=Du kan aktivera ett virtuellt kort för den här användaren. En url med användarprofilen och en streckkod kommer att finnas tillgänglig så att alla med en smartphone kan skanna den och lägga till din kontakt i adressboken.
+EnablePublicVirtualCard=Aktivera det offentliga virtuella användarkortet
+PublicVirtualCardUrl=Offentligt virtuellt användarkort
diff --git a/htdocs/langs/ta_IN/accountancy.lang b/htdocs/langs/ta_IN/accountancy.lang
index b6f96fe04bd..1e318d0aeab 100644
--- a/htdocs/langs/ta_IN/accountancy.lang
+++ b/htdocs/langs/ta_IN/accountancy.lang
@@ -14,8 +14,8 @@ ACCOUNTING_EXPORT_ENDLINE=வண்டி திரும்பும் வக
 ACCOUNTING_EXPORT_PREFIX_SPEC=கோப்பு பெயருக்கான முன்னொட்டைக் குறிப்பிடவும்
 ThisService=இந்த சேவை
 ThisProduct=இந்த தயாரிப்பு
-DefaultForService=சேவைக்கான இயல்புநிலை
-DefaultForProduct=தயாரிப்புக்கான இயல்புநிலை
+DefaultForService=Default for services
+DefaultForProduct=Default for products
 ProductForThisThirdparty=இந்த மூன்றாம் தரப்பினருக்கான தயாரிப்பு
 ServiceForThisThirdparty=இந்த மூன்றாம் தரப்பினருக்கான சேவை
 CantSuggest=பரிந்துரைக்க முடியாது
@@ -101,7 +101,8 @@ ShowAccountingAccount=கணக்கியல் கணக்கைக் க
 ShowAccountingJournal=கணக்கியல் பத்திரிகையைக் காட்டு
 ShowAccountingAccountInLedger=லெட்ஜரில் கணக்கியல் கணக்கைக் காட்டு
 ShowAccountingAccountInJournals=பத்திரிகைகளில் கணக்கியல் கணக்கைக் காட்டு
-AccountAccountingSuggest=கணக்கியல் கணக்கு பரிந்துரைக்கப்பட்டது
+DataUsedToSuggestAccount=Data used to suggest account
+AccountAccountingSuggest=Account suggested
 MenuDefaultAccounts=இயல்புநிலை கணக்குகள்
 MenuBankAccounts=வங்கி கணக்குகள்
 MenuVatAccounts=வாட் கணக்குகள்
@@ -126,6 +127,7 @@ WriteBookKeeping=Record transactions in accounting
 Bookkeeping=பேரேடு
 BookkeepingSubAccount=சப்லெட்ஜர்
 AccountBalance=கணக்கு இருப்பு
+AccountBalanceSubAccount=Sub-accounts balance
 ObjectsRef=மூல பொருள் குறிப்பு
 CAHTF=வரிக்கு முன் மொத்த கொள்முதல் விற்பனையாளர்
 TotalExpenseReport=மொத்த செலவு அறிக்கை
@@ -189,6 +191,7 @@ ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Account (from the Chart Of Account) to be us
 UseAuxiliaryAccountOnCustomerDeposit=Store customer account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
 ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Account (from the Chart Of Account) to be used as the default
 UseAuxiliaryAccountOnSupplierDeposit=Store supplier account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
+ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY=Accounting account by default to register customer retained warranty
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased within same country (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased from EEC to another EEC country (used if not defined in the product sheet)
@@ -218,6 +221,7 @@ JournalLabel=ஜர்னல் லேபிள்
 NumPiece=துண்டு எண்
 TransactionNumShort=எண் பரிவர்த்தனை
 AccountingCategory=Custom group of accounts
+AccountingCategories=Custom groups of accounts
 GroupByAccountAccounting=பொதுப் பேரேடு கணக்கின்படி குழுவாக்கவும்
 GroupBySubAccountAccounting=சப்லெட்ஜர் கணக்கு மூலம் குழு
 AccountingAccountGroupsDesc=கணக்கியல் கணக்கின் சில குழுக்களை நீங்கள் இங்கே வரையறுக்கலாம். தனிப்பயனாக்கப்பட்ட கணக்கியல் அறிக்கைகளுக்கு அவை பயன்படுத்தப்படும்.
@@ -265,6 +269,7 @@ ShowSubtotalByGroup=துணைத்தொகையை நிலை வார
 
 Pcgtype=கணக்கு குழு
 PcgtypeDesc=கணக்கின் குழு சில கணக்கியல் அறிக்கைகளுக்கு முன் வரையறுக்கப்பட்ட 'வடிகட்டி' மற்றும் 'குழுப்படுத்துதல்' அளவுகோல்களாகப் பயன்படுத்தப்படுகிறது. எடுத்துக்காட்டாக, 'வருமானம்' அல்லது 'செலவு' என்பது செலவு/வருமான அறிக்கையை உருவாக்க தயாரிப்புகளின் கணக்கு கணக்குகளுக்கு குழுக்களாகப் பயன்படுத்தப்படுகிறது.
+AccountingCategoriesDesc=Custom group of accounts can be used to group accounting accounts into one name to ease filter use or building of custom reports.
 
 Reconcilable=சமரசம் செய்யக்கூடியது
 
@@ -294,6 +299,7 @@ DescValidateMovements=எழுதுதல், எழுதுதல் மற
 
 ValidateHistory=தானாக பிணைக்கவும்
 AutomaticBindingDone=தானியங்கி பிணைப்புகள் செய்யப்பட்டன (%s) - சில பதிவுகளுக்கு தானியங்கு பிணைப்பு சாத்தியமில்லை (%s)
+DoManualBindingForFailedRecord=You have to do a manual link for the %s row(s) not linked automatically.
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot remove or disable this account of chart of account because it is used
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s & Credit = %s
@@ -337,11 +343,13 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=விற்பனையில் கணக
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=வாங்குதல்களில் கணக்கியலில் பிணைப்பு & பரிமாற்றத்தை முடக்கு (கணக்கில் விற்பனையாளர் இன்வாய்ஸ்கள் கணக்கில் எடுத்துக்கொள்ளப்படாது)
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=செலவு அறிக்கைகள் மீதான கணக்கியலில் பிணைப்பு மற்றும் பரிமாற்றத்தை முடக்கு (கணக்கில் செலவு அறிக்கைகள் கணக்கில் எடுத்துக்கொள்ளப்படாது)
 ACCOUNTING_ENABLE_LETTERING=Enable the lettering function in the accounting
+ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
 
 ## Export
 NotExportLettering=Do not export the lettering when generating the file
 NotifiedExportDate=Flag exported lines as Exported <span class="warning">(to modify a line, you will need to delete the whole transaction and re-transfert it into accounting)</span>
 NotifiedValidationDate=Validate and Lock the exported entries <span class="warning">(same effect than the "%s" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+NotifiedExportFull=Export documents ?
 DateValidationAndLock=Date validation and lock
 ConfirmExportFile=கணக்கியல் ஏற்றுமதி கோப்பின் தலைமுறையை உறுதிப்படுத்தவா?
 ExportDraftJournal=ஏற்றுமதி வரைவு இதழ்
@@ -398,7 +406,7 @@ SaleLocal=உள்ளூர் விற்பனை
 SaleExport=ஏற்றுமதி விற்பனை
 SaleEEC=EEC இல் விற்பனை
 SaleEECWithVAT=EEC இல் VAT இல் விற்பனையானது பூஜ்யமாக இல்லை, எனவே இது ஒரு உள்நாடு விற்பனை அல்ல, மேலும் பரிந்துரைக்கப்பட்ட கணக்கு நிலையான தயாரிப்புக் கணக்காகும்.
-SaleEECWithoutVATNumber=VAT இல்லா EEC இல் விற்பனை ஆனால் மூன்றாம் தரப்பினரின் VAT ஐடி வரையறுக்கப்படவில்லை. நிலையான விற்பனைக்கான தயாரிப்புக் கணக்கில் நாங்கள் திரும்புவோம். தேவைப்பட்டால் மூன்றாம் தரப்பினரின் VAT ஐடி அல்லது தயாரிப்பு கணக்கை நீங்கள் சரிசெய்யலாம்.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the thirdparty, or change the product account suggested for binding if needed.
 ForbiddenTransactionAlreadyExported=தடைசெய்யப்பட்டது: பரிவர்த்தனை சரிபார்க்கப்பட்டது மற்றும்/அல்லது ஏற்றுமதி செய்யப்பட்டது.
 ForbiddenTransactionAlreadyValidated=தடைசெய்யப்பட்டது: பரிவர்த்தனை சரிபார்க்கப்பட்டது.
 ## Dictionary
@@ -442,6 +450,7 @@ AccountancyErrorMismatchLetterCode=Mismatch in reconcile code
 AccountancyErrorMismatchBalanceAmount=The balance (%s) is not equal to 0
 AccountancyErrorLetteringBookkeeping=Errors have occurred concerning the transactions: %s
 ErrorAccountNumberAlreadyExists=The accounting number %s already exists
+ErrorArchiveAddFile=Can't put "%s" file in archive
 
 ## Import
 ImportAccountingEntries=கணக்கு பதிவுகள்
@@ -468,5 +477,7 @@ FECFormatMulticurrencyCode=மல்டிகரன்சி குறியீ
 DateExport=தேதி ஏற்றுமதி
 WarningReportNotReliable=எச்சரிக்கை, இந்த அறிக்கை லெட்ஜரை அடிப்படையாகக் கொண்டது அல்ல, எனவே லெட்ஜரில் கைமுறையாக மாற்றப்பட்ட பரிவர்த்தனை இல்லை. உங்கள் ஜர்னலைசேஷன் புதுப்பித்த நிலையில் இருந்தால், புத்தக பராமரிப்பு பார்வை மிகவும் துல்லியமாக இருக்கும்.
 ExpenseReportJournal=செலவு அறிக்கை இதழ்
+DocsAlreadyExportedAreExcluded=Docs already exported are excluded
+ClickToHideAlreadyExportedLines=Click to hide already exported lines
 
 NAccounts=%s கணக்குகள்
diff --git a/htdocs/langs/ta_IN/main.lang b/htdocs/langs/ta_IN/main.lang
index e83a90ca339..7611ca56db5 100644
--- a/htdocs/langs/ta_IN/main.lang
+++ b/htdocs/langs/ta_IN/main.lang
@@ -226,6 +226,7 @@ NoUserGroupDefined=பயனர் குழு வரையறுக்கப
 Password=கடவுச்சொல்
 PasswordRetype=Repeat your password
 NoteSomeFeaturesAreDisabled=இந்த ஆர்ப்பாட்டத்தில் நிறைய அம்சங்கள்/தொகுதிகள் முடக்கப்பட்டுள்ளன என்பதை நினைவில் கொள்ளவும்.
+YourUserFile=Your user file
 Name=பெயர்
 NameSlashCompany=பெயர் / நிறுவனம்
 Person=நபர்
@@ -897,6 +898,9 @@ MassFilesArea=வெகுஜன செயல்களால் உருவா
 ShowTempMassFilesArea=வெகுஜன செயல்களால் உருவாக்கப்பட்ட கோப்புகளின் பகுதியைக் காட்டு
 ConfirmMassDeletion=மொத்தமாக நீக்குதல் உறுதிப்படுத்தல்
 ConfirmMassDeletionQuestion=தேர்ந்தெடுத்த %s பதிவை(களை) நிச்சயமாக நீக்க விரும்புகிறீர்களா?
+ConfirmMassClone=Bulk clone confirmation
+ConfirmMassCloneQuestion=Select project to clone to
+ConfirmMassCloneToOneProject=Clone to project %s
 RelatedObjects=தொடர்புடைய பொருள்கள்
 ClassifyBilled=கட்டணத்தை வகைப்படுத்தவும்
 ClassifyUnbilled=பில் செய்யப்படாததை வகைப்படுத்தவும்
@@ -912,8 +916,8 @@ ExportFilteredList=வடிகட்டப்பட்ட பட்டியல
 ExportList=ஏற்றுமதி பட்டியல்
 ExportOptions=ஏற்றுமதி விருப்பங்கள்
 IncludeDocsAlreadyExported=ஏற்கனவே ஏற்றுமதி செய்யப்பட்ட ஆவணங்களைச் சேர்க்கவும்
-ExportOfPiecesAlreadyExportedIsEnable=ஏற்கனவே ஏற்றுமதி செய்யப்பட்ட துண்டுகளின் ஏற்றுமதி இயக்கப்பட்டது
-ExportOfPiecesAlreadyExportedIsDisable=ஏற்கனவே ஏற்றுமதி செய்யப்பட்ட துண்டுகளின் ஏற்றுமதி முடக்கப்பட்டுள்ளது
+ExportOfPiecesAlreadyExportedIsEnable=Documents already exported are visible and will be exported
+ExportOfPiecesAlreadyExportedIsDisable=Documents already exported are hidden and won't be exported
 AllExportedMovementsWereRecordedAsExported=ஏற்றுமதி செய்யப்பட்ட அனைத்து இயக்கங்களும் ஏற்றுமதி செய்யப்பட்டதாக பதிவு செய்யப்பட்டன
 NotAllExportedMovementsCouldBeRecordedAsExported=ஏற்றுமதி செய்யப்பட்ட அனைத்து இயக்கங்களும் ஏற்றுமதி செய்யப்பட்டதாக பதிவு செய்ய முடியாது
 Miscellaneous=இதர
@@ -1128,6 +1132,7 @@ DeleteFileText=இந்தக் கோப்பை உண்மையில்
 ShowOtherLanguages=பிற மொழிகளைக் காட்டு
 SwitchInEditModeToAddTranslation=இந்த மொழிக்கான மொழிபெயர்ப்புகளைச் சேர்க்க எடிட் பயன்முறையில் மாறவும்
 NotUsedForThisCustomer=இந்த வாடிக்கையாளருக்குப் பயன்படுத்தப்படவில்லை
+NotUsedForThisVendor=Not used for this vendor
 AmountMustBePositive=தொகை நேர்மறையாக இருக்க வேண்டும்
 ByStatus=நிலை மூலம்
 InformationMessage=தகவல்
@@ -1148,14 +1153,14 @@ EventReminder=நிகழ்வு நினைவூட்டல்
 UpdateForAllLines=அனைத்து வரிகளுக்கும் புதுப்பிக்கவும்
 OnHold=நிறுத்தி வைக்கப்பட்டுள்ளது
 Civility=நாகரீகம்
-AffectTag=Assign Tag
-AffectUser=Assign User
-SetSupervisor=Set Supervisor
+AffectTag=Assign a Tag
+AffectUser=Assign a User
+SetSupervisor=Set the supervisor
 CreateExternalUser=வெளிப்புற பயனரை உருவாக்கவும்
 ConfirmAffectTag=Bulk Tag Assignement
 ConfirmAffectUser=Bulk User Assignement
-ProjectRole=Role assigned on each project
-TasksRole=Role assigned on each task of each project
+ProjectRole=Role assigned on each project/opportunity
+TasksRole=Role assigned on each task (if used)
 ConfirmSetSupervisor=Bulk Supervisor Set
 ConfirmUpdatePrice=Choose a increase/decrease price rate
 ConfirmAffectTagQuestion=Are you sure you want to assign tags to the %s selected record(s)?
@@ -1210,3 +1215,10 @@ CreatedByPublicPortal=Created from Public portal
 UserAgent=User Agent
 InternalUser=Internal user
 ExternalUser=External user
+NoSpecificContactAddress=No specific contact or address
+NoSpecificContactAddressBis=This tab is dedicated to force specific contacts or addresses for the current object. Use it only if you want to define one or several specific contacts or addresses for the object when the information on the thirdparty is not enough or not accurate.
+HideOnVCard=Hide %s
+AddToContacts=Add address to my contacts
+LastAccess=Last access
+UploadAnImageToSeeAPhotoHere=Upload an image from the tab %s to see a photo here
+LastPasswordChangeDate=Last password change date
diff --git a/htdocs/langs/ta_IN/stripe.lang b/htdocs/langs/ta_IN/stripe.lang
index ad4e0943249..4b61ec6f46c 100644
--- a/htdocs/langs/ta_IN/stripe.lang
+++ b/htdocs/langs/ta_IN/stripe.lang
@@ -41,7 +41,8 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook நேரலை விசை
 ONLINE_PAYMENT_WAREHOUSE=ஆன்லைனில் பணம் செலுத்தும் போது பங்கு குறைவதற்குப் பயன்படுத்த வேண்டிய பங்கு <br> (TODO பங்குகளைக் குறைப்பதற்கான விருப்பம் விலைப்பட்டியல் மீது செய்யப்படும் மற்றும் ஆன்லைன் கட்டணம் தானே விலைப்பட்டியல் உருவாக்கப்படும்?)
 StripeLiveEnabled=ஸ்ட்ரைப் லைவ் இயக்கப்பட்டது (இல்லையெனில் சோதனை/சாண்ட்பாக்ஸ் பயன்முறை)
 StripeImportPayment=வரி செலுத்துதல்களை இறக்குமதி செய்யவும்
-ExampleOfTestCreditCard=சோதனைக்கான கிரெடிட் கார்டின் எடுத்துக்காட்டு: %s => செல்லுபடியாகும், %s => பிழை CVC, %s => காலாவதியானது, %s => கட்டணம் தோல்வி
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+ExampleOfTestBankAcountForSEPA=Example of bank account BAN for direct debit test: %s
 StripeGateways=கோடு நுழைவாயில்கள்
 OAUTH_STRIPE_TEST_ID=ஸ்ட்ரைப் கனெக்ட் கிளையண்ட் ஐடி (ca_...)
 OAUTH_STRIPE_LIVE_ID=ஸ்ட்ரைப் கனெக்ட் கிளையண்ட் ஐடி (ca_...)
@@ -61,6 +62,7 @@ DeleteACard=அட்டையை நீக்கு
 ConfirmDeleteCard=இந்த கிரெடிட் அல்லது டெபிட் கார்டை நிச்சயமாக நீக்க விரும்புகிறீர்களா?
 CreateCustomerOnStripe=ஸ்ட்ரைப்பில் வாடிக்கையாளரை உருவாக்கவும்
 CreateCardOnStripe=ஸ்ட்ரைப்பில் அட்டையை உருவாக்கவும்
+CreateBANOnStripe=Create bank on Stripe
 ShowInStripe=கோட்டில் காட்டு
 StripeUserAccountForActions=சில ஸ்ட்ரைப் நிகழ்வுகளின் மின்னஞ்சல் அறிவிப்புக்காகப் பயன்படுத்த வேண்டிய பயனர் கணக்கு (ஸ்ட்ரைப் பேஅவுட்கள்)
 StripePayoutList=ஸ்ட்ரைப் பேஅவுட்களின் பட்டியல்
@@ -69,3 +71,8 @@ ToOfferALinkForLiveWebhook=IPN (நேரடி பயன்முறை) ஐ 
 PaymentWillBeRecordedForNextPeriod=கட்டணம் அடுத்த காலத்திற்கு பதிவு செய்யப்படும்.
 ClickHereToTryAgain= <a href="%s"> மீண்டும் முயற்சிக்க இங்கே கிளிக் செய்யவும்... </a>
 CreationOfPaymentModeMustBeDoneFromStripeInterface=வலுவான வாடிக்கையாளர் அங்கீகார விதிகளின் காரணமாக, ஸ்ட்ரைப் பேக் ஆபீஸில் இருந்து கார்டை உருவாக்க வேண்டும். ஸ்ட்ரைப் வாடிக்கையாளர் பதிவை இயக்க நீங்கள் இங்கே கிளிக் செய்யலாம்: %s
+STRIPE_CARD_PRESENT=Card Present for Stripe Terminals
+TERMINAL_LOCATION=Location (address) for Stripe Terminals
+RequestDirectDebitWithStripe=Request Direct Debit with Stripe
+STRIPE_SEPA_DIRECT_DEBIT=Enable the Direct Debit payments through Stripe
+
diff --git a/htdocs/langs/ta_IN/users.lang b/htdocs/langs/ta_IN/users.lang
index edd2c6bde2b..62c5a941b79 100644
--- a/htdocs/langs/ta_IN/users.lang
+++ b/htdocs/langs/ta_IN/users.lang
@@ -66,7 +66,8 @@ LinkedToDolibarrUser=பயனருக்கான இணைப்பு
 LinkedToDolibarrThirdParty=மூன்றாம் தரப்பினருக்கான இணைப்பு
 CreateDolibarrLogin=ஒரு பயனரை உருவாக்கவும்
 CreateDolibarrThirdParty=மூன்றாம் தரப்பை உருவாக்கவும்
-LoginAccountDisableInDolibarr=Dolibarr இல் கணக்கு முடக்கப்பட்டது.
+LoginAccountDisableInDolibarr=Account disabled in Dolibarr
+PASSWORDInDolibarr=Password modified in Dolibarr
 UsePersonalValue=தனிப்பட்ட மதிப்பைப் பயன்படுத்தவும்
 ExportDataset_user_1=பயனர்கள் மற்றும் அவர்களின் பண்புகள்
 DomainUser=டொமைன் பயனர் %s
@@ -129,3 +130,6 @@ IPLastLogin=IP last login
 IPPreviousLogin=IP previous login
 ShowAllPerms=Show all permission rows
 HideAllPerms=Hide all permission rows
+UserPublicPageDesc=You can enable a virtual card for this user. An url with the user profile and a barcode will be available to allow anybody with a smartphone to scan it and add your contact to its address book.
+EnablePublicVirtualCard=Enable the public virtual user card
+PublicVirtualCardUrl=Public virtual user card
diff --git a/htdocs/langs/tg_TJ/accountancy.lang b/htdocs/langs/tg_TJ/accountancy.lang
index 4470fcfc624..11a93979849 100644
--- a/htdocs/langs/tg_TJ/accountancy.lang
+++ b/htdocs/langs/tg_TJ/accountancy.lang
@@ -14,8 +14,8 @@ ACCOUNTING_EXPORT_ENDLINE=Навъи бозгашти вагонро интих
 ACCOUNTING_EXPORT_PREFIX_SPEC=Префикси номи файлро муайян кунед
 ThisService=Ин хидмат
 ThisProduct=Ин маҳсулот
-DefaultForService=Пешфарз барои хидмат
-DefaultForProduct=Пешфарз барои маҳсулот
+DefaultForService=Default for services
+DefaultForProduct=Default for products
 ProductForThisThirdparty=Маҳсулот барои ин тарафи сеюм
 ServiceForThisThirdparty=Хидмат барои ин шахси сеюм
 CantSuggest=Тавсия дода наметавонад
@@ -101,7 +101,8 @@ ShowAccountingAccount=Нишон додани ҳисоби баҳисобгир
 ShowAccountingJournal=Нишон додани маҷаллаи баҳисобгирӣ
 ShowAccountingAccountInLedger=Ҳисобгирии муҳосибиро дар дафтар нишон диҳед
 ShowAccountingAccountInJournals=Нишон додани ҳисоби баҳисобгирӣ дар маҷаллаҳо
-AccountAccountingSuggest=Ҳисоби баҳисобгирӣ пешниҳод карда мешавад
+DataUsedToSuggestAccount=Data used to suggest account
+AccountAccountingSuggest=Account suggested
 MenuDefaultAccounts=Ҳисобҳои пешфарз
 MenuBankAccounts=Ҳисобҳои бонкӣ
 MenuVatAccounts=Ҳисобҳои андоз аз арзиши иловашуда
@@ -126,6 +127,7 @@ WriteBookKeeping=Record transactions in accounting
 Bookkeeping=Китоб
 BookkeepingSubAccount=Подшоҳ
 AccountBalance=Тавозуни суратҳисоб
+AccountBalanceSubAccount=Sub-accounts balance
 ObjectsRef=Манбаи объекти истинод
 CAHTF=Фурӯшандаи умумии харид пеш аз андоз
 TotalExpenseReport=Ҳисоботи умумии хароҷот
@@ -189,6 +191,7 @@ ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Account (from the Chart Of Account) to be us
 UseAuxiliaryAccountOnCustomerDeposit=Store customer account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
 ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Account (from the Chart Of Account) to be used as the default
 UseAuxiliaryAccountOnSupplierDeposit=Store supplier account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
+ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY=Accounting account by default to register customer retained warranty
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased within same country (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased from EEC to another EEC country (used if not defined in the product sheet)
@@ -218,6 +221,7 @@ JournalLabel=Нишони рӯзнома
 NumPiece=Рақами дона
 TransactionNumShort=Адад муомилот
 AccountingCategory=Custom group of accounts
+AccountingCategories=Custom groups of accounts
 GroupByAccountAccounting=Гурӯҳбандӣ аз рӯи ҳисоби китоби умумӣ
 GroupBySubAccountAccounting=Гурӯҳбандӣ аз рӯи ҳисоби зерпардохт
 AccountingAccountGroupsDesc=Шумо метавонед дар ин ҷо баъзе гурӯҳҳои баҳисобгирии муҳосибиро муайян кунед. Онҳо барои ҳисоботи шахсии баҳисобгирӣ истифода мешаванд.
@@ -265,6 +269,7 @@ ShowSubtotalByGroup=Нишон додани маҷмӯа аз рӯи сатҳ
 
 Pcgtype=Гурӯҳи ҳисоб
 PcgtypeDesc=Гурӯҳи ҳисобҳо ҳамчун меъёрҳои пешакӣ муайяншудаи 'филтр' ва 'гурӯҳбандӣ' барои баъзе ҳисоботҳои баҳисобгирӣ истифода мешаванд. Масалан, 'ДАРОМАД' ё 'ХАРОҶО' ҳамчун гурӯҳҳо барои ҳисобҳои баҳисобгирии маҳсулот барои таҳияи гузориши хароҷот/даромад истифода мешаванд.
+AccountingCategoriesDesc=Custom group of accounts can be used to group accounting accounts into one name to ease filter use or building of custom reports.
 
 Reconcilable=Оштӣ
 
@@ -294,6 +299,7 @@ DescValidateMovements=Ҳама гуна тағир ё нест кардани н
 
 ValidateHistory=Ба таври худкор пайваст кунед
 AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
+DoManualBindingForFailedRecord=You have to do a manual link for the %s row(s) not linked automatically.
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot remove or disable this account of chart of account because it is used
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s & Credit = %s
@@ -337,11 +343,13 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=Ҳатмӣ ва интиқол дар муҳ
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Ҳатмӣ ва интиқол дар муҳосибот ҳангоми харидро хомӯш кунед (фактураҳои фурӯшанда ҳангоми баҳисобгирӣ ба назар гирифта намешаванд)
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Ҳатмӣ ва интиқол дар муҳосибот дар ҳисоботи хароҷотро хомӯш кунед (ҳисоботи хароҷот ҳангоми баҳисобгирӣ ба назар гирифта намешаванд)
 ACCOUNTING_ENABLE_LETTERING=Enable the lettering function in the accounting
+ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
 
 ## Export
 NotExportLettering=Do not export the lettering when generating the file
 NotifiedExportDate=Flag exported lines as Exported <span class="warning">(to modify a line, you will need to delete the whole transaction and re-transfert it into accounting)</span>
 NotifiedValidationDate=Validate and Lock the exported entries <span class="warning">(same effect than the "%s" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+NotifiedExportFull=Export documents ?
 DateValidationAndLock=Date validation and lock
 ConfirmExportFile=Тасдиқи тавлиди файли содироти баҳисобгирӣ?
 ExportDraftJournal=Содироти маҷаллаи лоиҳа
@@ -398,7 +406,7 @@ SaleLocal=Фурӯши маҳаллӣ
 SaleExport=Фурӯши содирот
 SaleEEC=Фурӯш дар EEC
 SaleEECWithVAT=Фурӯш дар ИАА бо арзиши иловашуда бо арзиши иловашуда бекор нест, бинобар ин мо фикр мекунем, ки ин фурӯши дохилиидоравӣ нест ва ҳисоби пешниҳодшуда ҳисоби стандартии маҳсулот аст.
-SaleEECWithoutVATNumber=Фурӯш дар ЕЭК бидуни андоз аз арзиши иловашуда, аммо ID -и ААИ аз тарафи сеюм муайян карда нашудааст. Мо аз ҳисоби маҳсулот барои фурӯши стандартӣ бармегардем. Агар лозим бошад, шумо метавонед ID ААИ -и тарафи сеюм ё ҳисоби маҳсулотро ислоҳ кунед.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the thirdparty, or change the product account suggested for binding if needed.
 ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
 ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
 ## Dictionary
@@ -442,6 +450,7 @@ AccountancyErrorMismatchLetterCode=Mismatch in reconcile code
 AccountancyErrorMismatchBalanceAmount=The balance (%s) is not equal to 0
 AccountancyErrorLetteringBookkeeping=Errors have occurred concerning the transactions: %s
 ErrorAccountNumberAlreadyExists=The accounting number %s already exists
+ErrorArchiveAddFile=Can't put "%s" file in archive
 
 ## Import
 ImportAccountingEntries=Сабтҳои баҳисобгирӣ
@@ -468,5 +477,7 @@ FECFormatMulticurrencyCode=Рамзи бисёрҷониба (Idevise)
 DateExport=Содироти сана
 WarningReportNotReliable=Огоҳӣ, ин гузориш ба дафтарча асос наёфтааст, аз ин рӯ амалиётеро, ки дар дафтар ба таври дастӣ тағир дода шудааст, дар бар намегирад. Агар рӯзноманигории шумо нав бошад, назари ҳисобдорӣ дақиқтар аст.
 ExpenseReportJournal=Ҳисоботи хароҷоти рӯзнома
+DocsAlreadyExportedAreExcluded=Docs already exported are excluded
+ClickToHideAlreadyExportedLines=Click to hide already exported lines
 
 NAccounts=ҳисобҳои %s
diff --git a/htdocs/langs/tg_TJ/main.lang b/htdocs/langs/tg_TJ/main.lang
index fab00674f6b..c198cbf6600 100644
--- a/htdocs/langs/tg_TJ/main.lang
+++ b/htdocs/langs/tg_TJ/main.lang
@@ -226,6 +226,7 @@ NoUserGroupDefined=Ягон гурӯҳи корбарон муайян нашу
 Password=Рамз
 PasswordRetype=Repeat your password
 NoteSomeFeaturesAreDisabled=Дар хотир доред, ки дар ин намоиш бисёр хусусиятҳо/модулҳо хомӯш карда шудаанд.
+YourUserFile=Your user file
 Name=Ном
 NameSlashCompany=Ном / ширкат
 Person=Шахсе
@@ -897,6 +898,9 @@ MassFilesArea=Минтақаи файлҳое, ки бо амалҳои омма
 ShowTempMassFilesArea=Нишон додани майдони файлҳое, ки бо амалҳои оммавӣ сохта шудаанд
 ConfirmMassDeletion=Тасдиқи маҷмӯӣ Нест кардан
 ConfirmMassDeletionQuestion=Шумо мутмаин ҳастед, ки сабт (ҳо) -и интихобшударо %s нест кардан мехоҳед?
+ConfirmMassClone=Bulk clone confirmation
+ConfirmMassCloneQuestion=Select project to clone to
+ConfirmMassCloneToOneProject=Clone to project %s
 RelatedObjects=Объектҳои марбут
 ClassifyBilled=Таснифшуда ҳисоб карда мешавад
 ClassifyUnbilled=Тасниф карда нашудааст
@@ -912,8 +916,8 @@ ExportFilteredList=Рӯйхати филтршударо содир кунед
 ExportList=Рӯйхати содирот
 ExportOptions=Имконоти содирот
 IncludeDocsAlreadyExported=Ҳуҷҷатҳои аллакай содиршударо дохил кунед
-ExportOfPiecesAlreadyExportedIsEnable=Содироти қисмҳои аллакай содиршуда фаъол аст
-ExportOfPiecesAlreadyExportedIsDisable=Содироти қисмҳои аллакай содиршуда ғайрифаъол аст
+ExportOfPiecesAlreadyExportedIsEnable=Documents already exported are visible and will be exported
+ExportOfPiecesAlreadyExportedIsDisable=Documents already exported are hidden and won't be exported
 AllExportedMovementsWereRecordedAsExported=Ҳама ҳаракатҳои содиршуда ҳамчун содирот сабт карда шуданд
 NotAllExportedMovementsCouldBeRecordedAsExported=На ҳама ҳаракатҳои содиршударо метавон ҳамчун содирот сабт кард
 Miscellaneous=Гуногун
@@ -1128,6 +1132,7 @@ DeleteFileText=Оё шумо дар ҳақиқат мехоҳед ин файл
 ShowOtherLanguages=Забонҳои дигарро нишон диҳед
 SwitchInEditModeToAddTranslation=Барои илова кардани тарҷумаҳо ба ин забон ба ҳолати таҳрир гузаред
 NotUsedForThisCustomer=Барои ин муштарӣ истифода намешавад
+NotUsedForThisVendor=Not used for this vendor
 AmountMustBePositive=Маблағ бояд мусбат бошад
 ByStatus=Аз рӯи мақом
 InformationMessage=Маълумот
@@ -1148,14 +1153,14 @@ EventReminder=Ёддошти ҳодиса
 UpdateForAllLines=Навсозӣ барои ҳама сатрҳо
 OnHold=Барои нигоҳдорӣ
 Civility=Шаҳрвандӣ
-AffectTag=Assign Tag
-AffectUser=Assign User
-SetSupervisor=Set Supervisor
+AffectTag=Assign a Tag
+AffectUser=Assign a User
+SetSupervisor=Set the supervisor
 CreateExternalUser=Эҷоди корбари беруна
 ConfirmAffectTag=Bulk Tag Assignement
 ConfirmAffectUser=Bulk User Assignement
-ProjectRole=Role assigned on each project
-TasksRole=Role assigned on each task of each project
+ProjectRole=Role assigned on each project/opportunity
+TasksRole=Role assigned on each task (if used)
 ConfirmSetSupervisor=Bulk Supervisor Set
 ConfirmUpdatePrice=Choose a increase/decrease price rate
 ConfirmAffectTagQuestion=Are you sure you want to assign tags to the %s selected record(s)?
@@ -1210,3 +1215,10 @@ CreatedByPublicPortal=Created from Public portal
 UserAgent=User Agent
 InternalUser=Internal user
 ExternalUser=External user
+NoSpecificContactAddress=No specific contact or address
+NoSpecificContactAddressBis=This tab is dedicated to force specific contacts or addresses for the current object. Use it only if you want to define one or several specific contacts or addresses for the object when the information on the thirdparty is not enough or not accurate.
+HideOnVCard=Hide %s
+AddToContacts=Add address to my contacts
+LastAccess=Last access
+UploadAnImageToSeeAPhotoHere=Upload an image from the tab %s to see a photo here
+LastPasswordChangeDate=Last password change date
diff --git a/htdocs/langs/tg_TJ/stripe.lang b/htdocs/langs/tg_TJ/stripe.lang
index 603a5ec47c1..4bb52b86399 100644
--- a/htdocs/langs/tg_TJ/stripe.lang
+++ b/htdocs/langs/tg_TJ/stripe.lang
@@ -41,7 +41,8 @@ STRIPE_LIVE_WEBHOOK_KEY=Калиди зинда дар Webhook
 ONLINE_PAYMENT_WAREHOUSE=Ҳангоме ки пардохти онлайн анҷом дода мешавад, саҳмияҳо барои коҳиш додани саҳмия истифода мешаванд <br> (TODO Вақте ки имкони коҳиш додани саҳмия дар асоси амали суратҳисоб сурат мегирад ва пардохти онлайн ҳисобнома -фактураро тавлид мекунад?)
 StripeLiveEnabled=Stripe live фаъол аст (дар акси ҳол ҳолати санҷиш/қуттии қуттиҳо)
 StripeImportPayment=Пардохтҳои Stripe воридотӣ
-ExampleOfTestCreditCard=Намунаи корти кредитӣ барои санҷиш: %s => дуруст, %s => хатои CVC, %s => гузашт, %s => пардохт ноком шуд
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+ExampleOfTestBankAcountForSEPA=Example of bank account BAN for direct debit test: %s
 StripeGateways=Дарвозаҳои рахӣ
 OAUTH_STRIPE_TEST_ID=ID муштарии Stripe Connect (тақрибан _...)
 OAUTH_STRIPE_LIVE_ID=ID муштарии Stripe Connect (тақрибан _...)
@@ -61,6 +62,7 @@ DeleteACard=Кортро нест кунед
 ConfirmDeleteCard=Шумо мутмаин ҳастед, ки ин корти кредитӣ ё дебетиро нест кардан мехоҳед?
 CreateCustomerOnStripe=Дар Stripe муштарӣ эҷод кунед
 CreateCardOnStripe=Дар Stripe корт эҷод кунед
+CreateBANOnStripe=Create bank on Stripe
 ShowInStripe=Дар Stripe нишон диҳед
 StripeUserAccountForActions=Ҳисоби корбаре, ки барои почтаи электронӣ дар бораи баъзе чорабиниҳои Stripe истифода мешавад (пардохтҳои Stripe)
 StripePayoutList=Рӯйхати пардохтҳои Stripe
@@ -69,3 +71,8 @@ ToOfferALinkForLiveWebhook=Истинод барои насб кардани Str
 PaymentWillBeRecordedForNextPeriod=Пардохт барои давраи оянда сабт карда мешавад.
 ClickHereToTryAgain= <a href="%s"> Барои дубора кӯшиш кардан ин ҷо клик кунед ... </a>
 CreationOfPaymentModeMustBeDoneFromStripeInterface=Бо назардошти қоидаҳои қавии аутентификатсияи муштариён, сохтани корт бояд аз backoffice Stripe анҷом дода шавад. Шумо метавонед ин ҷо клик кунед, то сабти муштариёни Stripe -ро фаъол созед: %s
+STRIPE_CARD_PRESENT=Card Present for Stripe Terminals
+TERMINAL_LOCATION=Location (address) for Stripe Terminals
+RequestDirectDebitWithStripe=Request Direct Debit with Stripe
+STRIPE_SEPA_DIRECT_DEBIT=Enable the Direct Debit payments through Stripe
+
diff --git a/htdocs/langs/tg_TJ/users.lang b/htdocs/langs/tg_TJ/users.lang
index 1147a06d8cb..7df85aa9491 100644
--- a/htdocs/langs/tg_TJ/users.lang
+++ b/htdocs/langs/tg_TJ/users.lang
@@ -66,7 +66,8 @@ LinkedToDolibarrUser=Link to user
 LinkedToDolibarrThirdParty=Link to third party
 CreateDolibarrLogin=Истифодабаранда эҷод кунед
 CreateDolibarrThirdParty=Эҷоди як шахси сеюм
-LoginAccountDisableInDolibarr=Ҳисоб дар Dolibarr хомӯш карда шудааст.
+LoginAccountDisableInDolibarr=Account disabled in Dolibarr
+PASSWORDInDolibarr=Password modified in Dolibarr
 UsePersonalValue=Арзиши шахсиро истифода баред
 ExportDataset_user_1=Истифодабарандагон ва хосиятҳои онҳо
 DomainUser=Истифодабарандаи домен %s
@@ -129,3 +130,6 @@ IPLastLogin=IP last login
 IPPreviousLogin=IP previous login
 ShowAllPerms=Show all permission rows
 HideAllPerms=Hide all permission rows
+UserPublicPageDesc=You can enable a virtual card for this user. An url with the user profile and a barcode will be available to allow anybody with a smartphone to scan it and add your contact to its address book.
+EnablePublicVirtualCard=Enable the public virtual user card
+PublicVirtualCardUrl=Public virtual user card
diff --git a/htdocs/langs/th_TH/users.lang b/htdocs/langs/th_TH/users.lang
index 1655cd05555..12dd28d1d2a 100644
--- a/htdocs/langs/th_TH/users.lang
+++ b/htdocs/langs/th_TH/users.lang
@@ -66,7 +66,8 @@ LinkedToDolibarrUser=Link to user
 LinkedToDolibarrThirdParty=Link to third party
 CreateDolibarrLogin=สร้างผู้ใช้
 CreateDolibarrThirdParty=สร้างของบุคคลที่สาม
-LoginAccountDisableInDolibarr=บัญชีปิดใช้งานใน Dolibarr
+LoginAccountDisableInDolibarr=Account disabled in Dolibarr
+PASSWORDInDolibarr=Password modified in Dolibarr
 UsePersonalValue=ใช้ค่าส่วนบุคคล
 ExportDataset_user_1=Users and their properties
 DomainUser=โดเมนของผู้ใช้% s
@@ -129,3 +130,6 @@ IPLastLogin=IP last login
 IPPreviousLogin=IP previous login
 ShowAllPerms=Show all permission rows
 HideAllPerms=Hide all permission rows
+UserPublicPageDesc=You can enable a virtual card for this user. An url with the user profile and a barcode will be available to allow anybody with a smartphone to scan it and add your contact to its address book.
+EnablePublicVirtualCard=Enable the public virtual user card
+PublicVirtualCardUrl=Public virtual user card
diff --git a/htdocs/langs/tr_TR/accountancy.lang b/htdocs/langs/tr_TR/accountancy.lang
index 94fee86beb9..0584f7999b5 100644
--- a/htdocs/langs/tr_TR/accountancy.lang
+++ b/htdocs/langs/tr_TR/accountancy.lang
@@ -14,8 +14,8 @@ ACCOUNTING_EXPORT_ENDLINE=Taşıyıcı dönüş türünü seçin
 ACCOUNTING_EXPORT_PREFIX_SPEC=Dosya adı için öneki belirtin
 ThisService=Bu hizmet
 ThisProduct=Bu ürün
-DefaultForService=Hizmet için varsayılan
-DefaultForProduct=Ürün için varsayılan
+DefaultForService=Default for services
+DefaultForProduct=Default for products
 ProductForThisThirdparty=Product for this thirdparty
 ServiceForThisThirdparty=Service for this thirdparty
 CantSuggest=Öneri yok
@@ -101,7 +101,8 @@ ShowAccountingAccount=Muhasebe hesabını göster
 ShowAccountingJournal=Muhasebe günlüğünü göster
 ShowAccountingAccountInLedger=Show accounting account in ledger
 ShowAccountingAccountInJournals=Show accounting account in journals
-AccountAccountingSuggest=Önerilen muhasebe hesabı
+DataUsedToSuggestAccount=Data used to suggest account
+AccountAccountingSuggest=Account suggested
 MenuDefaultAccounts=Varsayılan hesaplar
 MenuBankAccounts=Banka hesapları
 MenuVatAccounts=KDV hesapları
@@ -126,6 +127,7 @@ WriteBookKeeping=Record transactions in accounting
 Bookkeeping=Büyük Defter
 BookkeepingSubAccount=Subledger
 AccountBalance=Hesap bakiyesi
+AccountBalanceSubAccount=Sub-accounts balance
 ObjectsRef=Source object ref
 CAHTF=Total purchase vendor before tax
 TotalExpenseReport=Toplam gider raporu
@@ -189,6 +191,7 @@ ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Account (from the Chart Of Account) to be us
 UseAuxiliaryAccountOnCustomerDeposit=Store customer account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
 ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Account (from the Chart Of Account) to be used as the default
 UseAuxiliaryAccountOnSupplierDeposit=Store supplier account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
+ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY=Accounting account by default to register customer retained warranty
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased within same country (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased from EEC to another EEC country (used if not defined in the product sheet)
@@ -218,6 +221,7 @@ JournalLabel=Journal label
 NumPiece=Parça sayısı
 TransactionNumShort=Num. transaction
 AccountingCategory=Custom group of accounts
+AccountingCategories=Custom groups of accounts
 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.
@@ -265,6 +269,7 @@ ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Hesap grubu
 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.
+AccountingCategoriesDesc=Custom group of accounts can be used to group accounting accounts into one name to ease filter use or building of custom reports.
 
 Reconcilable=Reconcilable
 
@@ -294,6 +299,7 @@ DescValidateMovements=Any modification or deletion of writing, lettering and del
 
 ValidateHistory=Otomatik Olarak Bağla
 AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
+DoManualBindingForFailedRecord=You have to do a manual link for the %s row(s) not linked automatically.
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot remove or disable this account of chart of account because it is used
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s & Credit = %s
@@ -337,11 +343,13 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on
 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_ENABLE_LETTERING=Enable the lettering function in the accounting
+ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
 
 ## Export
 NotExportLettering=Do not export the lettering when generating the file
 NotifiedExportDate=Flag exported lines as Exported <span class="warning">(to modify a line, you will need to delete the whole transaction and re-transfert it into accounting)</span>
 NotifiedValidationDate=Validate and Lock the exported entries <span class="warning">(same effect than the "%s" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+NotifiedExportFull=Export documents ?
 DateValidationAndLock=Date validation and lock
 ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Export draft journal
@@ -398,7 +406,7 @@ 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.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the thirdparty, or change the product account suggested for binding if needed.
 ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
 ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
 ## Dictionary
@@ -442,6 +450,7 @@ AccountancyErrorMismatchLetterCode=Mismatch in reconcile code
 AccountancyErrorMismatchBalanceAmount=The balance (%s) is not equal to 0
 AccountancyErrorLetteringBookkeeping=Errors have occurred concerning the transactions: %s
 ErrorAccountNumberAlreadyExists=The accounting number %s already exists
+ErrorArchiveAddFile=Can't put "%s" file in archive
 
 ## Import
 ImportAccountingEntries=Muhasebe girişleri
@@ -468,5 +477,7 @@ 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.
 ExpenseReportJournal=Expense Report Journal
+DocsAlreadyExportedAreExcluded=Docs already exported are excluded
+ClickToHideAlreadyExportedLines=Click to hide already exported lines
 
 NAccounts=%s accounts
diff --git a/htdocs/langs/tr_TR/ticket.lang b/htdocs/langs/tr_TR/ticket.lang
index 453a58dd926..590a0e90841 100644
--- a/htdocs/langs/tr_TR/ticket.lang
+++ b/htdocs/langs/tr_TR/ticket.lang
@@ -26,6 +26,7 @@ Permission56002=Destek bildirimini değiştir
 Permission56003=Destek bildirimlerini sil
 Permission56004=Destek bildirimlerini yönet
 Permission56005=See tickets of all third parties (not effective for external users, always be limited to the third party they depend on)
+Permission56006=Export tickets
 
 Tickets=Destek Bildirimleri
 TicketDictType=Destek Bildirimi - Türler
@@ -61,6 +62,8 @@ TypeContact_ticket_external_CONTRIBUTOR=Dış iştirakçi
 OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Destek bildirimini e-posta ile gönderil
 
+ExportDataset_ticket_1=Destek Bildirimleri
+
 # Status
 Read=Okundu
 Assigned=Atanan
diff --git a/htdocs/langs/tr_TR/users.lang b/htdocs/langs/tr_TR/users.lang
index d298ce917bb..fe0e40767ca 100644
--- a/htdocs/langs/tr_TR/users.lang
+++ b/htdocs/langs/tr_TR/users.lang
@@ -66,7 +66,8 @@ LinkedToDolibarrUser=Link to user
 LinkedToDolibarrThirdParty=Link to third party
 CreateDolibarrLogin=Bir kullanıcı oluştur
 CreateDolibarrThirdParty=Bir üçüncü parti oluştur
-LoginAccountDisableInDolibarr=Dolibarr’da hesap engelli.
+LoginAccountDisableInDolibarr=Account disabled in Dolibarr
+PASSWORDInDolibarr=Password modified in Dolibarr
 UsePersonalValue=Kişisel değer kullanın
 ExportDataset_user_1=Kullanıcılar ve özellikleri
 DomainUser=Etki alanı kullanıcısı %s
@@ -129,3 +130,6 @@ IPLastLogin=IP last login
 IPPreviousLogin=IP previous login
 ShowAllPerms=Show all permission rows
 HideAllPerms=Hide all permission rows
+UserPublicPageDesc=You can enable a virtual card for this user. An url with the user profile and a barcode will be available to allow anybody with a smartphone to scan it and add your contact to its address book.
+EnablePublicVirtualCard=Enable the public virtual user card
+PublicVirtualCardUrl=Public virtual user card
diff --git a/htdocs/langs/uk_UA/accountancy.lang b/htdocs/langs/uk_UA/accountancy.lang
index d5411f8801e..6a7705786ac 100644
--- a/htdocs/langs/uk_UA/accountancy.lang
+++ b/htdocs/langs/uk_UA/accountancy.lang
@@ -14,8 +14,8 @@ ACCOUNTING_EXPORT_ENDLINE=Виберіть тип перенесення ряд
 ACCOUNTING_EXPORT_PREFIX_SPEC=Задати префікс для назви файлу
 ThisService=Ця послуга
 ThisProduct=Цей товар
-DefaultForService=За замовчуванням для обслуговування
-DefaultForProduct=За замовчуванням для продукту
+DefaultForService=Default for services
+DefaultForProduct=Default for products
 ProductForThisThirdparty=Продукт для цієї третьої сторони
 ServiceForThisThirdparty=Сервіс для цієї третьої сторони
 CantSuggest=Не можу запропонувати
@@ -101,7 +101,8 @@ ShowAccountingAccount=Показати бухгалтерський рахуно
 ShowAccountingJournal=Показати бухгалтерський журнал
 ShowAccountingAccountInLedger=Показати бухгалтерський рахунок у книзі
 ShowAccountingAccountInJournals=Показати бухгалтерський облік у журналах
-AccountAccountingSuggest=Запропоновано бухгалтерський рахунок
+DataUsedToSuggestAccount=Data used to suggest account
+AccountAccountingSuggest=Account suggested
 MenuDefaultAccounts=Облікові записи за замовчуванням
 MenuBankAccounts=Банківські рахунки
 MenuVatAccounts=ПДВ рахунки
@@ -126,6 +127,7 @@ WriteBookKeeping=Записати операції в бухгалтерсько
 Bookkeeping=Головна книга
 BookkeepingSubAccount=Підкнига
 AccountBalance=Баланс
+AccountBalanceSubAccount=Sub-accounts balance
 ObjectsRef=Посилання на вихідний об'єкт
 CAHTF=Загальна сума закупівлі постачальника до оподаткування
 TotalExpenseReport=Звіт про загальні витрати
@@ -189,6 +191,7 @@ ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Account (from the Chart Of Account) to be us
 UseAuxiliaryAccountOnCustomerDeposit=Store customer account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
 ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Account (from the Chart Of Account) to be used as the default
 UseAuxiliaryAccountOnSupplierDeposit=Store supplier account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
+ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY=Accounting account by default to register customer retained warranty
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased within same country (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased from EEC to another EEC country (used if not defined in the product sheet)
@@ -218,6 +221,7 @@ JournalLabel=Етикетка журналу
 NumPiece=Номер штуки
 TransactionNumShort=Кількість транзакції
 AccountingCategory=Custom group of accounts
+AccountingCategories=Custom groups of accounts
 GroupByAccountAccounting=Групувати за рахунками Головної книги
 GroupBySubAccountAccounting=Групувати за рахунками підкниги
 AccountingAccountGroupsDesc=Тут можна визначити кілька груп облікових рахунків. Вони будуть використовуватися для персоніфікованих бухгалтерських звітів.
@@ -265,6 +269,7 @@ ShowSubtotalByGroup=Показати проміжний підсумок за р
 
 Pcgtype=Група рахунку
 PcgtypeDesc=Групи облікових записів використовуються як попередньо визначені критерії «фільтра» та «групування» для деяких бухгалтерських звітів. Наприклад, «ДОХОД» або «ВИТРАТ» використовуються як групи для обліку рахунків продуктів для побудови звіту про витрати/доходи.
+AccountingCategoriesDesc=Custom group of accounts can be used to group accounting accounts into one name to ease filter use or building of custom reports.
 
 Reconcilable=Примирений
 
@@ -294,6 +299,7 @@ DescValidateMovements=Будь-яка зміна чи видалення зап
 
 ValidateHistory=Прив’язувати автоматично
 AutomaticBindingDone=Автоматичне прив’язування виконано (%s) – Автоматичне прив’язування неможливе для деяких записів (%s)
+DoManualBindingForFailedRecord=You have to do a manual link for the %s row(s) not linked automatically.
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot remove or disable this account of chart of account because it is used
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s & Credit = %s
@@ -337,11 +343,13 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=Вимкнути прив'язку та пе
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Вимкнути прив'язку та переказ в обліку закупівель (рахунки постачальника не будуть враховуватися в обліку)
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Вимкнути прив'язку та перенесення в бухгалтерії у звітах про витрати (звіти про витрати не враховуватимуться в бухгалтерії)
 ACCOUNTING_ENABLE_LETTERING=Enable the lettering function in the accounting
+ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
 
 ## Export
 NotExportLettering=Do not export the lettering when generating the file
 NotifiedExportDate=Позначте експортовані рядки як експортовані <span class="warning"> (щоб змінити рядок, вам потрібно буде видалити всю транзакцію та повторно перенести її в облік) </span>
 NotifiedValidationDate=Validate and Lock the exported entries <span class="warning">(same effect than the "%s" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+NotifiedExportFull=Export documents ?
 DateValidationAndLock=Перевірка дати та блокування
 ConfirmExportFile=Підтвердження створення файлу експорту бухгалтерського обліку?
 ExportDraftJournal=Експортувати чернетку журналу
@@ -398,7 +406,7 @@ SaleLocal=Місцевий розпродаж
 SaleExport=Продаж на експорт
 SaleEEC=Продаж в ЄЕС
 SaleEECWithVAT=Продаж в ЄЕС з ПДВ не є нульовим, тому ми припускаємо, що це НЕ внутрішньокомунальний продаж, а запропонований обліковий запис є стандартним рахунком продукту.
-SaleEECWithoutVATNumber=Продаж в ЄЕС без ПДВ, але ідентифікаційний номер платника ПДВ третьої сторони не визначений. Ми повертаємось до облікового запису продукту для стандартних продажів. За потреби ви можете виправити ідентифікаційний номер платника ПДВ третьої сторони або обліковий запис продукту.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the thirdparty, or change the product account suggested for binding if needed.
 ForbiddenTransactionAlreadyExported=Заборонено: трансакцію підтверджено та/або експортовано.
 ForbiddenTransactionAlreadyValidated=Заборонено: трансакцію підтверджено.
 ## Dictionary
@@ -442,6 +450,7 @@ AccountancyErrorMismatchLetterCode=Невідповідність коду уз
 AccountancyErrorMismatchBalanceAmount=Залишок (%s) не дорівнює 0
 AccountancyErrorLetteringBookkeeping=Сталися помилки щодо транзакцій: %s
 ErrorAccountNumberAlreadyExists=The accounting number %s already exists
+ErrorArchiveAddFile=Can't put "%s" file in archive
 
 ## Import
 ImportAccountingEntries=Бухгалтерські проводки
@@ -468,5 +477,7 @@ FECFormatMulticurrencyCode=Мультивалютний код (Idevise)
 DateExport=Експорт дати
 WarningReportNotReliable=Попередження, цей звіт не базується на Книзі, тому не містить транзакції, змінені вручну в Книзі. Якщо ваша журнальність оновлена, бухгалтерський облік буде точнішим.
 ExpenseReportJournal=Журнал звітів про витрати
+DocsAlreadyExportedAreExcluded=Docs already exported are excluded
+ClickToHideAlreadyExportedLines=Click to hide already exported lines
 
 NAccounts=%s облікові записи
diff --git a/htdocs/langs/uk_UA/main.lang b/htdocs/langs/uk_UA/main.lang
index ba5adc74e53..8595f4c269b 100644
--- a/htdocs/langs/uk_UA/main.lang
+++ b/htdocs/langs/uk_UA/main.lang
@@ -226,6 +226,7 @@ NoUserGroupDefined=Група користувачів не визначена
 Password=Пароль
 PasswordRetype=Repeat your password
 NoteSomeFeaturesAreDisabled=Зауважте, що багато функцій/модулів вимкнено в цій демонстрації.
+YourUserFile=Your user file
 Name=Ім'я
 NameSlashCompany=Назва / Компанія
 Person=Особа
@@ -897,6 +898,9 @@ MassFilesArea=Область для файлів, створених за доп
 ShowTempMassFilesArea=Показати область файлів, створених масовими діями
 ConfirmMassDeletion=Підтвердження масового видалення
 ConfirmMassDeletionQuestion=Ви впевнені, що хочете видалити %s вибраний запис(и)?
+ConfirmMassClone=Bulk clone confirmation
+ConfirmMassCloneQuestion=Select project to clone to
+ConfirmMassCloneToOneProject=Clone to project %s
 RelatedObjects=Пов'язані об'єкти
 ClassifyBilled=Класифікувати виставлений рахунок
 ClassifyUnbilled=Класифікувати без рахунків
@@ -912,8 +916,8 @@ ExportFilteredList=Експортувати відфільтрований сп
 ExportList=Список експорту
 ExportOptions=Параметри експорту
 IncludeDocsAlreadyExported=Включити вже експортовані документи
-ExportOfPiecesAlreadyExportedIsEnable=Експорт уже експортованих елементів увімкнено
-ExportOfPiecesAlreadyExportedIsDisable=Експорт уже експортованих частин вимкнено
+ExportOfPiecesAlreadyExportedIsEnable=Documents already exported are visible and will be exported
+ExportOfPiecesAlreadyExportedIsDisable=Documents already exported are hidden and won't be exported
 AllExportedMovementsWereRecordedAsExported=Усі експортовані переміщення були записані як експортовані
 NotAllExportedMovementsCouldBeRecordedAsExported=Не всі експортовані переміщення можна записати як експортовані
 Miscellaneous=Різне
@@ -1128,6 +1132,7 @@ DeleteFileText=Ви дійсно хочете видалити цей файл?
 ShowOtherLanguages=Показати інші мови
 SwitchInEditModeToAddTranslation=Перейдіть у режим редагування, щоб додати переклади для цієї мови
 NotUsedForThisCustomer=Не використовується для цього клієнта
+NotUsedForThisVendor=Not used for this vendor
 AmountMustBePositive=Сума має бути додатною
 ByStatus=За статусом
 InformationMessage=Інформація
@@ -1148,14 +1153,14 @@ EventReminder=Нагадування про подію
 UpdateForAllLines=Оновлення для всіх ліній
 OnHold=На утриманні
 Civility=Цивілізованість
-AffectTag=Assign Tag
-AffectUser=Assign User
-SetSupervisor=Set Supervisor
+AffectTag=Assign a Tag
+AffectUser=Assign a User
+SetSupervisor=Set the supervisor
 CreateExternalUser=Створити зовнішнього користувача
 ConfirmAffectTag=Bulk Tag Assignement
 ConfirmAffectUser=Bulk User Assignement
-ProjectRole=Role assigned on each project
-TasksRole=Role assigned on each task of each project
+ProjectRole=Role assigned on each project/opportunity
+TasksRole=Role assigned on each task (if used)
 ConfirmSetSupervisor=Bulk Supervisor Set
 ConfirmUpdatePrice=Choose a increase/decrease price rate
 ConfirmAffectTagQuestion=Are you sure you want to assign tags to the %s selected record(s)?
@@ -1210,3 +1215,10 @@ CreatedByPublicPortal=Created from Public portal
 UserAgent=User Agent
 InternalUser=Внутрішній користувач
 ExternalUser=Зовнішній користувач
+NoSpecificContactAddress=No specific contact or address
+NoSpecificContactAddressBis=This tab is dedicated to force specific contacts or addresses for the current object. Use it only if you want to define one or several specific contacts or addresses for the object when the information on the thirdparty is not enough or not accurate.
+HideOnVCard=Hide %s
+AddToContacts=Add address to my contacts
+LastAccess=Last access
+UploadAnImageToSeeAPhotoHere=Upload an image from the tab %s to see a photo here
+LastPasswordChangeDate=Last password change date
diff --git a/htdocs/langs/uk_UA/stripe.lang b/htdocs/langs/uk_UA/stripe.lang
index a8f9176d83a..8d79eb35634 100644
--- a/htdocs/langs/uk_UA/stripe.lang
+++ b/htdocs/langs/uk_UA/stripe.lang
@@ -41,7 +41,8 @@ STRIPE_LIVE_WEBHOOK_KEY=Живий ключ Webhook
 ONLINE_PAYMENT_WAREHOUSE=Запас, який буде використовуватися для зменшення запасу, коли здійснюється онлайн-оплата <br> (TODO Коли опція зменшення запасу виконується за дією на рахунку-фактурі, а онлайн-платеж сам створює рахунок?)
 StripeLiveEnabled=Stripe live увімкнено (інакше тестовий режим/режим пісочниці)
 StripeImportPayment=Імпортні платежі Stripe
-ExampleOfTestCreditCard=Приклад кредитної картки для тесту: %s => дійсний, %s => помилка CVC, %s => термін дії закінчився, %s => платіж не виконується
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+ExampleOfTestBankAcountForSEPA=Example of bank account BAN for direct debit test: %s
 StripeGateways=Смугові шлюзи
 OAUTH_STRIPE_TEST_ID=Ідентифікатор клієнта Stripe Connect (ca_...)
 OAUTH_STRIPE_LIVE_ID=Ідентифікатор клієнта Stripe Connect (ca_...)
@@ -61,6 +62,7 @@ DeleteACard=Видалити картку
 ConfirmDeleteCard=Ви впевнені, що хочете видалити цю кредитну або дебетову картку?
 CreateCustomerOnStripe=Створіть клієнта на Stripe
 CreateCardOnStripe=Створіть картку на Stripe
+CreateBANOnStripe=Create bank on Stripe
 ShowInStripe=Показати в Stripe
 StripeUserAccountForActions=Обліковий запис користувача для сповіщень електронною поштою про деякі події Stripe (виплати Stripe)
 StripePayoutList=Список виплат Stripe
@@ -69,3 +71,8 @@ ToOfferALinkForLiveWebhook=Посилання на налаштування Stri
 PaymentWillBeRecordedForNextPeriod=Оплата буде зафіксована на наступний період.
 ClickHereToTryAgain= <a href="%s"> Натисніть тут, щоб спробувати ще раз... </a>
 CreationOfPaymentModeMustBeDoneFromStripeInterface=У зв’язку зі строгими правилами автентифікації клієнтів створення картки має здійснюватися з бек-офісу Stripe. Ви можете натиснути тут, щоб увімкнути запис клієнта Stripe: %s
+STRIPE_CARD_PRESENT=Card Present for Stripe Terminals
+TERMINAL_LOCATION=Location (address) for Stripe Terminals
+RequestDirectDebitWithStripe=Request Direct Debit with Stripe
+STRIPE_SEPA_DIRECT_DEBIT=Enable the Direct Debit payments through Stripe
+
diff --git a/htdocs/langs/uk_UA/ticket.lang b/htdocs/langs/uk_UA/ticket.lang
index d88d27762ff..d0fcbb730a1 100644
--- a/htdocs/langs/uk_UA/ticket.lang
+++ b/htdocs/langs/uk_UA/ticket.lang
@@ -26,6 +26,7 @@ Permission56002=Редагувати заявки
 Permission56003=Видалити заявки
 Permission56004=Управління заявками
 Permission56005=Перегляньте заявки всіх контрагентів (не діє для зовнішніх користувачів, завжди обмежуйтеся третьою стороною, від якої вони залежать)
+Permission56006=Export tickets
 
 Tickets=Заявки
 TicketDictType=Заявка - Типи
@@ -61,6 +62,8 @@ TypeContact_ticket_external_CONTRIBUTOR=Зовнішній учасник
 OriginEmail=Електронна пошта репортера
 Notify_TICKET_SENTBYMAIL=Надішліть повідомлення про квиток електронною поштою
 
+ExportDataset_ticket_1=Заявки
+
 # Status
 Read=Прочитані
 Assigned=Призначений
diff --git a/htdocs/langs/uk_UA/users.lang b/htdocs/langs/uk_UA/users.lang
index 1f58e8b8106..d5db35b5ae2 100644
--- a/htdocs/langs/uk_UA/users.lang
+++ b/htdocs/langs/uk_UA/users.lang
@@ -66,7 +66,8 @@ LinkedToDolibarrUser=Посилання на користувача
 LinkedToDolibarrThirdParty=Посилання на третю сторону
 CreateDolibarrLogin=Створити користувача
 CreateDolibarrThirdParty=Створіть третю сторону
-LoginAccountDisableInDolibarr=Обліковий запис вимкнено в Dolibarr.
+LoginAccountDisableInDolibarr=Account disabled in Dolibarr
+PASSWORDInDolibarr=Password modified in Dolibarr
 UsePersonalValue=Використовуйте особисту цінність
 ExportDataset_user_1=Користувачі та їх властивості
 DomainUser=Користувач домену %s
@@ -129,3 +130,6 @@ IPLastLogin=IP останній вхід
 IPPreviousLogin=IP попередній вхід
 ShowAllPerms=Show all permission rows
 HideAllPerms=Hide all permission rows
+UserPublicPageDesc=You can enable a virtual card for this user. An url with the user profile and a barcode will be available to allow anybody with a smartphone to scan it and add your contact to its address book.
+EnablePublicVirtualCard=Enable the public virtual user card
+PublicVirtualCardUrl=Public virtual user card
diff --git a/htdocs/langs/ur_PK/accountancy.lang b/htdocs/langs/ur_PK/accountancy.lang
index c6d3ff12bb5..69f1111e627 100644
--- a/htdocs/langs/ur_PK/accountancy.lang
+++ b/htdocs/langs/ur_PK/accountancy.lang
@@ -14,8 +14,8 @@ ACCOUNTING_EXPORT_ENDLINE=گاڑی کی واپسی کی قسم منتخب کری
 ACCOUNTING_EXPORT_PREFIX_SPEC=فائل کے نام کے لیے سابقہ کی وضاحت کریں۔
 ThisService=یہ سروس
 ThisProduct=یہ مصنوعات
-DefaultForService=سروس کے لیے ڈیفالٹ
-DefaultForProduct=پروڈکٹ کے لیے ڈیفالٹ
+DefaultForService=Default for services
+DefaultForProduct=Default for products
 ProductForThisThirdparty=اس تھرڈ پارٹی کے لیے پروڈکٹ
 ServiceForThisThirdparty=اس تھرڈ پارٹی کے لیے سروس
 CantSuggest=تجویز نہیں کر سکتے
@@ -101,7 +101,8 @@ ShowAccountingAccount=حساب کتاب دکھائیں۔
 ShowAccountingJournal=اکاؤنٹنگ جرنل دکھائیں۔
 ShowAccountingAccountInLedger=لیجر میں حساب کتاب دکھائیں۔
 ShowAccountingAccountInJournals=جرائد میں حساب کتاب دکھائیں۔
-AccountAccountingSuggest=اکاؤنٹنگ اکاؤنٹ تجویز کیا گیا۔
+DataUsedToSuggestAccount=Data used to suggest account
+AccountAccountingSuggest=Account suggested
 MenuDefaultAccounts=ڈیفالٹ اکاؤنٹس
 MenuBankAccounts=بینک اکاؤنٹ
 MenuVatAccounts=واٹ اکاؤنٹس
@@ -126,6 +127,7 @@ WriteBookKeeping=Record transactions in accounting
 Bookkeeping=لیجر
 BookkeepingSubAccount=ذیلی
 AccountBalance=اکاؤنٹ بیلنس
+AccountBalanceSubAccount=Sub-accounts balance
 ObjectsRef=ماخذ آبجیکٹ ریف
 CAHTF=ٹیکس سے پہلے کل خرید فروش
 TotalExpenseReport=کل اخراجات کی رپورٹ
@@ -189,6 +191,7 @@ ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Account (from the Chart Of Account) to be us
 UseAuxiliaryAccountOnCustomerDeposit=Store customer account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
 ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Account (from the Chart Of Account) to be used as the default
 UseAuxiliaryAccountOnSupplierDeposit=Store supplier account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
+ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY=Accounting account by default to register customer retained warranty
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased within same country (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased from EEC to another EEC country (used if not defined in the product sheet)
@@ -218,6 +221,7 @@ JournalLabel=جرنل لیبل
 NumPiece=ٹکڑا نمبر
 TransactionNumShort=نمبر لین دین
 AccountingCategory=Custom group of accounts
+AccountingCategories=Custom groups of accounts
 GroupByAccountAccounting=عام لیجر اکاؤنٹ کے لحاظ سے گروپ کریں۔
 GroupBySubAccountAccounting=سبلیجر اکاؤنٹ کے لحاظ سے گروپ کریں۔
 AccountingAccountGroupsDesc=آپ یہاں اکاؤنٹنگ اکاؤنٹ کے کچھ گروپس کی وضاحت کر سکتے ہیں۔ وہ ذاتی اکاؤنٹنگ رپورٹس کے لیے استعمال کیے جائیں گے۔
@@ -265,6 +269,7 @@ ShowSubtotalByGroup=سطح کے لحاظ سے ذیلی کل دکھائیں۔
 
 Pcgtype=اکاؤنٹ کا گروپ
 PcgtypeDesc=اکاؤنٹ کے گروپ کو کچھ اکاؤنٹنگ رپورٹس کے لیے پہلے سے طے شدہ 'فلٹر' اور 'گروپنگ' کے معیار کے طور پر استعمال کیا جاتا ہے۔ مثال کے طور پر، 'انکم' یا 'خرچ' کو اخراجات/آمدنی کی رپورٹ بنانے کے لیے مصنوعات کے اکاؤنٹنگ اکاؤنٹس کے لیے بطور گروپ استعمال کیا جاتا ہے۔
+AccountingCategoriesDesc=Custom group of accounts can be used to group accounting accounts into one name to ease filter use or building of custom reports.
 
 Reconcilable=قابلِ مصالحت
 
@@ -294,6 +299,7 @@ DescValidateMovements=تحریر، حروف اور حذف میں کسی قسم 
 
 ValidateHistory=خودکار طور پر باندھیں۔
 AutomaticBindingDone=خودکار بائنڈنگ ہو گئی (%s) - کچھ ریکارڈ کے لیے خودکار بائنڈنگ ممکن نہیں ہے (%s)
+DoManualBindingForFailedRecord=You have to do a manual link for the %s row(s) not linked automatically.
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot remove or disable this account of chart of account because it is used
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s & Credit = %s
@@ -337,11 +343,13 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=سیلز پر اکاؤنٹنسی میں با
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=خریداری پر اکاؤنٹنسی میں بائنڈنگ اور ٹرانسفر کو غیر فعال کریں (وینڈر انوائس کو اکاؤنٹنگ میں مدنظر نہیں رکھا جائے گا)
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=اخراجات کی رپورٹوں پر اکاؤنٹنسی میں بائنڈنگ اور ٹرانسفر کو غیر فعال کریں (اکاؤنٹنگ میں اخراجات کی رپورٹوں کو مدنظر نہیں رکھا جائے گا)
 ACCOUNTING_ENABLE_LETTERING=Enable the lettering function in the accounting
+ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
 
 ## Export
 NotExportLettering=Do not export the lettering when generating the file
 NotifiedExportDate=Flag exported lines as Exported <span class="warning">(to modify a line, you will need to delete the whole transaction and re-transfert it into accounting)</span>
 NotifiedValidationDate=Validate and Lock the exported entries <span class="warning">(same effect than the "%s" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+NotifiedExportFull=Export documents ?
 DateValidationAndLock=Date validation and lock
 ConfirmExportFile=اکاؤنٹنگ برآمد فائل کی نسل کی تصدیق؟
 ExportDraftJournal=ڈرافٹ جرنل برآمد کریں۔
@@ -398,7 +406,7 @@ SaleLocal=مقامی فروخت
 SaleExport=برآمد کی فروخت
 SaleEEC=ای ای سی میں فروخت
 SaleEECWithVAT=VAT کے ساتھ EEC میں فروخت کالعدم نہیں، لہذا ہم سمجھتے ہیں کہ یہ انٹرا کمیونٹری سیل نہیں ہے اور تجویز کردہ اکاؤنٹ معیاری پروڈکٹ اکاؤنٹ ہے۔
-SaleEECWithoutVATNumber=بغیر VAT کے EEC میں فروخت لیکن تیسرے فریق کی VAT ID کی وضاحت نہیں کی گئی ہے۔ ہم معیاری فروخت کے لیے پروڈکٹ اکاؤنٹ پر فال بیک کرتے ہیں۔ اگر ضرورت ہو تو آپ فریق ثالث کی VAT ID یا پروڈکٹ اکاؤنٹ کو ٹھیک کر سکتے ہیں۔
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the thirdparty, or change the product account suggested for binding if needed.
 ForbiddenTransactionAlreadyExported=ممنوع: لین دین کی توثیق اور/یا برآمد کی گئی ہے۔
 ForbiddenTransactionAlreadyValidated=ممنوع: لین دین کی توثیق کر دی گئی ہے۔
 ## Dictionary
@@ -442,6 +450,7 @@ AccountancyErrorMismatchLetterCode=Mismatch in reconcile code
 AccountancyErrorMismatchBalanceAmount=The balance (%s) is not equal to 0
 AccountancyErrorLetteringBookkeeping=Errors have occurred concerning the transactions: %s
 ErrorAccountNumberAlreadyExists=The accounting number %s already exists
+ErrorArchiveAddFile=Can't put "%s" file in archive
 
 ## Import
 ImportAccountingEntries=اکاؤنٹنگ اندراجات
@@ -468,5 +477,7 @@ FECFormatMulticurrencyCode=ملٹی کرنسی کوڈ (آئیڈیوائز)
 DateExport=تاریخ برآمد
 WarningReportNotReliable=انتباہ، یہ رپورٹ لیجر پر مبنی نہیں ہے، لہذا اس میں لیجر میں دستی طور پر ترمیم شدہ لین دین شامل نہیں ہے۔ اگر آپ کی جرنلائزیشن اپ ٹو ڈیٹ ہے، تو بک کیپنگ کا نظریہ زیادہ درست ہے۔
 ExpenseReportJournal=اخراجات کی رپورٹ جرنل
+DocsAlreadyExportedAreExcluded=Docs already exported are excluded
+ClickToHideAlreadyExportedLines=Click to hide already exported lines
 
 NAccounts=%s اکاؤنٹس
diff --git a/htdocs/langs/ur_PK/main.lang b/htdocs/langs/ur_PK/main.lang
index 4ab620c3cd0..6959eaf5a6a 100644
--- a/htdocs/langs/ur_PK/main.lang
+++ b/htdocs/langs/ur_PK/main.lang
@@ -226,6 +226,7 @@ NoUserGroupDefined=کسی صارف گروپ کی وضاحت نہیں کی گئی
 Password=پاس ورڈ
 PasswordRetype=Repeat your password
 NoteSomeFeaturesAreDisabled=نوٹ کریں کہ اس مظاہرے میں بہت ساری خصوصیات/ماڈیولز غیر فعال ہیں۔
+YourUserFile=Your user file
 Name=نام
 NameSlashCompany=نام / کمپنی
 Person=شخص
@@ -897,6 +898,9 @@ MassFilesArea=بڑے پیمانے پر کارروائیوں کے ذریعے بن
 ShowTempMassFilesArea=بڑے پیمانے پر کارروائیوں سے بنی فائلوں کا علاقہ دکھائیں۔
 ConfirmMassDeletion=بلک ڈیلیٹ کی تصدیق
 ConfirmMassDeletionQuestion=کیا آپ واقعی %s منتخب کردہ ریکارڈ (ریکارڈز) کو حذف کرنا چاہتے ہیں؟
+ConfirmMassClone=Bulk clone confirmation
+ConfirmMassCloneQuestion=Select project to clone to
+ConfirmMassCloneToOneProject=Clone to project %s
 RelatedObjects=متعلقہ اشیاء
 ClassifyBilled=بل کی درجہ بندی کریں۔
 ClassifyUnbilled=بغیر بل کی درجہ بندی کریں۔
@@ -912,8 +916,8 @@ ExportFilteredList=فلٹر شدہ فہرست برآمد کریں۔
 ExportList=برآمد کی فہرست
 ExportOptions=برآمد کے اختیارات
 IncludeDocsAlreadyExported=پہلے سے برآمد شدہ دستاویزات شامل کریں۔
-ExportOfPiecesAlreadyExportedIsEnable=پہلے سے برآمد شدہ ٹکڑوں کی برآمد قابل ہے۔
-ExportOfPiecesAlreadyExportedIsDisable=پہلے سے برآمد شدہ ٹکڑوں کی برآمد غیر فعال ہے۔
+ExportOfPiecesAlreadyExportedIsEnable=Documents already exported are visible and will be exported
+ExportOfPiecesAlreadyExportedIsDisable=Documents already exported are hidden and won't be exported
 AllExportedMovementsWereRecordedAsExported=تمام برآمد شدہ نقل و حرکت بطور برآمد ریکارڈ کی گئیں۔
 NotAllExportedMovementsCouldBeRecordedAsExported=تمام برآمد شدہ نقل و حرکت کو برآمد کے طور پر ریکارڈ نہیں کیا جا سکتا
 Miscellaneous=متفرق
@@ -1128,6 +1132,7 @@ DeleteFileText=کیا آپ واقعی اس فائل کو حذف کرنا چاہ
 ShowOtherLanguages=دوسری زبانیں دکھائیں۔
 SwitchInEditModeToAddTranslation=اس زبان کے لیے ترجمے شامل کرنے کے لیے ترمیم کے موڈ میں جائیں۔
 NotUsedForThisCustomer=اس گاہک کے لیے استعمال نہیں کیا گیا۔
+NotUsedForThisVendor=Not used for this vendor
 AmountMustBePositive=رقم مثبت ہونی چاہیے۔
 ByStatus=حیثیت سے
 InformationMessage=معلومات
@@ -1148,14 +1153,14 @@ EventReminder=واقعہ کی یاد دہانی
 UpdateForAllLines=تمام لائنوں کے لیے اپ ڈیٹ کریں۔
 OnHold=ہولڈ پر
 Civility=تہذیب
-AffectTag=Assign Tag
-AffectUser=Assign User
-SetSupervisor=Set Supervisor
+AffectTag=Assign a Tag
+AffectUser=Assign a User
+SetSupervisor=Set the supervisor
 CreateExternalUser=بیرونی صارف بنائیں
 ConfirmAffectTag=Bulk Tag Assignement
 ConfirmAffectUser=Bulk User Assignement
-ProjectRole=Role assigned on each project
-TasksRole=Role assigned on each task of each project
+ProjectRole=Role assigned on each project/opportunity
+TasksRole=Role assigned on each task (if used)
 ConfirmSetSupervisor=Bulk Supervisor Set
 ConfirmUpdatePrice=Choose a increase/decrease price rate
 ConfirmAffectTagQuestion=Are you sure you want to assign tags to the %s selected record(s)?
@@ -1210,3 +1215,10 @@ CreatedByPublicPortal=Created from Public portal
 UserAgent=User Agent
 InternalUser=Internal user
 ExternalUser=External user
+NoSpecificContactAddress=No specific contact or address
+NoSpecificContactAddressBis=This tab is dedicated to force specific contacts or addresses for the current object. Use it only if you want to define one or several specific contacts or addresses for the object when the information on the thirdparty is not enough or not accurate.
+HideOnVCard=Hide %s
+AddToContacts=Add address to my contacts
+LastAccess=Last access
+UploadAnImageToSeeAPhotoHere=Upload an image from the tab %s to see a photo here
+LastPasswordChangeDate=Last password change date
diff --git a/htdocs/langs/ur_PK/stripe.lang b/htdocs/langs/ur_PK/stripe.lang
index 0c93b87f81c..8c750d656f8 100644
--- a/htdocs/langs/ur_PK/stripe.lang
+++ b/htdocs/langs/ur_PK/stripe.lang
@@ -41,7 +41,8 @@ STRIPE_LIVE_WEBHOOK_KEY=ویب ہُک لائیو کلید
 ONLINE_PAYMENT_WAREHOUSE=جب آن لائن ادائیگی کی جاتی ہے تو اسٹاک کو کم کرنے کے لیے استعمال کیا جائے گا
 StripeLiveEnabled=اسٹرائپ لائیو فعال (بصورت دیگر ٹیسٹ/سینڈ باکس موڈ)
 StripeImportPayment=پٹی کی ادائیگی درآمد کریں۔
-ExampleOfTestCreditCard=ٹیسٹ کے لیے کریڈٹ کارڈ کی مثال: %s => درست، %s => غلطی CVC، %s => میعاد ختم، %s => چارج ناکام
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+ExampleOfTestBankAcountForSEPA=Example of bank account BAN for direct debit test: %s
 StripeGateways=پٹی والے دروازے
 OAUTH_STRIPE_TEST_ID=اسٹرائپ کنیکٹ کلائنٹ آئی ڈی (ca_...)
 OAUTH_STRIPE_LIVE_ID=اسٹرائپ کنیکٹ کلائنٹ آئی ڈی (ca_...)
@@ -61,6 +62,7 @@ DeleteACard=کارڈ حذف کریں۔
 ConfirmDeleteCard=کیا آپ واقعی اس کریڈٹ یا ڈیبٹ کارڈ کو حذف کرنا چاہتے ہیں؟
 CreateCustomerOnStripe=پٹی پر گاہک بنائیں
 CreateCardOnStripe=پٹی پر کارڈ بنائیں
+CreateBANOnStripe=Create bank on Stripe
 ShowInStripe=پٹی میں دکھائیں۔
 StripeUserAccountForActions=کچھ اسٹرائپ ایونٹس کی ای میل اطلاع کے لیے استعمال کرنے والا صارف اکاؤنٹ (سٹرائپ ادائیگی)
 StripePayoutList=پٹی کی ادائیگیوں کی فہرست
@@ -69,3 +71,8 @@ ToOfferALinkForLiveWebhook=IPN (لائیو موڈ) کو کال کرنے کے ل
 PaymentWillBeRecordedForNextPeriod=ادائیگی اگلی مدت کے لیے ریکارڈ کی جائے گی۔
 ClickHereToTryAgain= <a href="%s"> دوبارہ کوشش کرنے کے لیے یہاں کلک کریں... </a>
 CreationOfPaymentModeMustBeDoneFromStripeInterface=مضبوط کسٹمر تصدیقی اصولوں کی وجہ سے، کارڈ کی تخلیق اسٹرائپ بیک آفس سے ہونی چاہیے۔ آپ اسٹرائپ کسٹمر ریکارڈ پر سوئچ کرنے کے لیے یہاں کلک کر سکتے ہیں: %s
+STRIPE_CARD_PRESENT=Card Present for Stripe Terminals
+TERMINAL_LOCATION=Location (address) for Stripe Terminals
+RequestDirectDebitWithStripe=Request Direct Debit with Stripe
+STRIPE_SEPA_DIRECT_DEBIT=Enable the Direct Debit payments through Stripe
+
diff --git a/htdocs/langs/ur_PK/users.lang b/htdocs/langs/ur_PK/users.lang
index e14eaf1e067..31e30c51062 100644
--- a/htdocs/langs/ur_PK/users.lang
+++ b/htdocs/langs/ur_PK/users.lang
@@ -66,7 +66,8 @@ LinkedToDolibarrUser=صارف سے لنک کریں۔
 LinkedToDolibarrThirdParty=تیسرے فریق سے لنک کریں۔
 CreateDolibarrLogin=ایک صارف بنائیں
 CreateDolibarrThirdParty=تیسری پارٹی بنائیں
-LoginAccountDisableInDolibarr=Dolibarr میں اکاؤنٹ کو غیر فعال کر دیا گیا ہے۔
+LoginAccountDisableInDolibarr=Account disabled in Dolibarr
+PASSWORDInDolibarr=Password modified in Dolibarr
 UsePersonalValue=ذاتی قدر استعمال کریں۔
 ExportDataset_user_1=صارفین اور ان کی خصوصیات
 DomainUser=ڈومین صارف %s
@@ -129,3 +130,6 @@ IPLastLogin=IP last login
 IPPreviousLogin=IP previous login
 ShowAllPerms=Show all permission rows
 HideAllPerms=Hide all permission rows
+UserPublicPageDesc=You can enable a virtual card for this user. An url with the user profile and a barcode will be available to allow anybody with a smartphone to scan it and add your contact to its address book.
+EnablePublicVirtualCard=Enable the public virtual user card
+PublicVirtualCardUrl=Public virtual user card
diff --git a/htdocs/langs/uz_UZ/accountancy.lang b/htdocs/langs/uz_UZ/accountancy.lang
index d1e47ddef53..9f5abafab80 100644
--- a/htdocs/langs/uz_UZ/accountancy.lang
+++ b/htdocs/langs/uz_UZ/accountancy.lang
@@ -14,8 +14,8 @@ 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
+DefaultForService=Default for services
+DefaultForProduct=Default for products
 ProductForThisThirdparty=Ushbu uchinchi tomon uchun mahsulot
 ServiceForThisThirdparty=Ushbu uchinchi tomon uchun xizmat
 CantSuggest=Taklif qila olmayman
@@ -101,7 +101,8 @@ 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
+DataUsedToSuggestAccount=Data used to suggest account
+AccountAccountingSuggest=Account suggested
 MenuDefaultAccounts=Standart hisoblar
 MenuBankAccounts=Bank hisobvaraqlari
 MenuVatAccounts=QQS hisob-kitoblari
@@ -126,6 +127,7 @@ WriteBookKeeping=Buxgalteriya hisobida operatsiyalarni qayd etish
 Bookkeeping=Kitob
 BookkeepingSubAccount=Subledger
 AccountBalance=Hisob balansi
+AccountBalanceSubAccount=Sub-accounts balance
 ObjectsRef=Manba ob'ekti ref
 CAHTF=Soliqqa qadar jami sotib olish sotuvchisi
 TotalExpenseReport=Jami xarajatlar hisoboti
@@ -189,6 +191,7 @@ ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Account (from the Chart Of Account) to be us
 UseAuxiliaryAccountOnCustomerDeposit=Store customer account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
 ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Account (from the Chart Of Account) to be used as the default
 UseAuxiliaryAccountOnSupplierDeposit=Store supplier account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
+ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY=Accounting account by default to register customer retained warranty
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased within same country (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased from EEC to another EEC country (used if not defined in the product sheet)
@@ -218,6 +221,7 @@ JournalLabel=Jurnal yorlig'i
 NumPiece=Parcha raqami
 TransactionNumShort=Raqam bitim
 AccountingCategory=Custom group of accounts
+AccountingCategories=Custom groups of accounts
 GroupByAccountAccounting=Bosh kitob schyoti bo'yicha guruhlash
 GroupBySubAccountAccounting=Subledger schyoti bo'yicha guruhlash
 AccountingAccountGroupsDesc=Siz bu erda buxgalteriya hisobining ayrim guruhlarini belgilashingiz mumkin. Ular shaxsiylashtirilgan buxgalteriya hisobotlari uchun ishlatiladi.
@@ -265,6 +269,7 @@ ShowSubtotalByGroup=Subtotalni daraja bo'yicha ko'rsatish
 
 Pcgtype=Hisob guruhi
 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.
+AccountingCategoriesDesc=Custom group of accounts can be used to group accounting accounts into one name to ease filter use or building of custom reports.
 
 Reconcilable=Yarashtiriladigan
 
@@ -294,6 +299,7 @@ DescValidateMovements=Yozishni, xatlarni va o'chirishni har qanday o'zgartirish
 
 ValidateHistory=Avtomatik bog'lash
 AutomaticBindingDone=Avtomatik ulanishlar bajarildi (%s) - Ba'zi yozuvlar uchun avtomatik bog'lash mumkin emas (%s)
+DoManualBindingForFailedRecord=You have to do a manual link for the %s row(s) not linked automatically.
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot remove or disable this account of chart of account because it is used
 MvtNotCorrectlyBalanced=Harakat to'g'ri muvozanatlanmagan. Debet = %s & Kredit = %s
@@ -337,11 +343,13 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=Sotish bo'yicha buxgalteriyada majburiy va o
 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)
 ACCOUNTING_ENABLE_LETTERING=Enable the lettering function in the accounting
+ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
 
 ## Export
 NotExportLettering=Do not export the lettering when generating the file
 NotifiedExportDate=Eksport qilingan qatorlarni eksport qilingan deb belgilash <span class="warning"> (chiziqni o‘zgartirish uchun siz butun tranzaksiyani o‘chirib tashlashingiz va uni buxgalteriya hisobiga qayta o‘tkazishingiz kerak) </span>
 NotifiedValidationDate=Validate and Lock the exported entries <span class="warning">(same effect than the "%s" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+NotifiedExportFull=Export documents ?
 DateValidationAndLock=Sanani tekshirish va qulflash
 ConfirmExportFile=Buxgalteriya eksporti faylini yaratishni tasdiqlashmi?
 ExportDraftJournal=Jurnal jurnalini eksport qiling
@@ -398,7 +406,7 @@ 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.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the thirdparty, or change the product account suggested for binding if needed.
 ForbiddenTransactionAlreadyExported=Taqiqlangan: tranzaktsiya tasdiqlangan va/yoki eksport qilingan.
 ForbiddenTransactionAlreadyValidated=Taqiqlangan: tranzaksiya tasdiqlangan.
 ## Dictionary
@@ -442,6 +450,7 @@ AccountancyErrorMismatchLetterCode=Kelishuv kodidagi nomuvofiqlik
 AccountancyErrorMismatchBalanceAmount=Balans (%s) 0 ga teng emas
 AccountancyErrorLetteringBookkeeping=Tranzaktsiyalarda xatoliklar yuz berdi: %s
 ErrorAccountNumberAlreadyExists=The accounting number %s already exists
+ErrorArchiveAddFile=Can't put "%s" file in archive
 
 ## Import
 ImportAccountingEntries=Buxgalteriya yozuvlari
@@ -468,5 +477,7 @@ FECFormatMulticurrencyCode=Ko'p valyuta kodi (Idevise)
 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=Xarajatlar bo'yicha hisobot jurnali
+DocsAlreadyExportedAreExcluded=Docs already exported are excluded
+ClickToHideAlreadyExportedLines=Click to hide already exported lines
 
 NAccounts=%s hisob qaydnomalari
diff --git a/htdocs/langs/uz_UZ/main.lang b/htdocs/langs/uz_UZ/main.lang
index 88629c28785..91ca7aeebca 100644
--- a/htdocs/langs/uz_UZ/main.lang
+++ b/htdocs/langs/uz_UZ/main.lang
@@ -226,6 +226,7 @@ NoUserGroupDefined=Hech qanday foydalanuvchi guruhi aniqlanmagan
 Password=Parol
 PasswordRetype=Repeat your password
 NoteSomeFeaturesAreDisabled=Ushbu namoyishda ko'plab funktsiyalar / modullar o'chirilganligini unutmang.
+YourUserFile=Your user file
 Name=Ism
 NameSlashCompany=Ism / kompaniya
 Person=Shaxs
@@ -897,6 +898,9 @@ MassFilesArea=Ommaviy harakatlar bilan qurilgan fayllar maydoni
 ShowTempMassFilesArea=Ommaviy harakatlar bilan qurilgan fayllar maydonini ko'rsating
 ConfirmMassDeletion=Ommaviy o'chirishni tasdiqlash
 ConfirmMassDeletionQuestion=Siz tanlagan %s yozuvlarini o'chirishni xohlaysizmi?
+ConfirmMassClone=Bulk clone confirmation
+ConfirmMassCloneQuestion=Select project to clone to
+ConfirmMassCloneToOneProject=Clone to project %s
 RelatedObjects=Tegishli ob'ektlar
 ClassifyBilled=Hisob-kitoblarni tasniflang
 ClassifyUnbilled=Hisob-kitob qilinmaganlarni tasniflang
@@ -912,8 +916,8 @@ ExportFilteredList=Filtrlangan ro'yxatni eksport qilish
 ExportList=Eksport ro'yxati
 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
+ExportOfPiecesAlreadyExportedIsEnable=Documents already exported are visible and will be exported
+ExportOfPiecesAlreadyExportedIsDisable=Documents already exported are hidden and won't be exported
 AllExportedMovementsWereRecordedAsExported=Eksport qilingan barcha harakatlar eksport sifatida qayd etildi
 NotAllExportedMovementsCouldBeRecordedAsExported=Barcha eksport qilingan harakatlarni eksport sifatida qayd etish mumkin emas
 Miscellaneous=Turli xil
@@ -1128,6 +1132,7 @@ 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
+NotUsedForThisVendor=Not used for this vendor
 AmountMustBePositive=Miqdor ijobiy bo'lishi kerak
 ByStatus=Holati bo'yicha
 InformationMessage=Ma `lumot
@@ -1148,14 +1153,14 @@ EventReminder=Voqealar to'g'risida eslatma
 UpdateForAllLines=Barcha satrlar uchun yangilash
 OnHold=Ushlab qolingan
 Civility=Fuqarolik
-AffectTag=Assign Tag
-AffectUser=Assign User
-SetSupervisor=Set Supervisor
+AffectTag=Assign a Tag
+AffectUser=Assign a User
+SetSupervisor=Set the supervisor
 CreateExternalUser=Tashqi foydalanuvchini yarating
 ConfirmAffectTag=Bulk Tag Assignement
 ConfirmAffectUser=Bulk User Assignement
-ProjectRole=Role assigned on each project
-TasksRole=Role assigned on each task of each project
+ProjectRole=Role assigned on each project/opportunity
+TasksRole=Role assigned on each task (if used)
 ConfirmSetSupervisor=Bulk Supervisor Set
 ConfirmUpdatePrice=Choose a increase/decrease price rate
 ConfirmAffectTagQuestion=Are you sure you want to assign tags to the %s selected record(s)?
@@ -1210,3 +1215,10 @@ CreatedByPublicPortal=Created from Public portal
 UserAgent=User Agent
 InternalUser=Internal user
 ExternalUser=External user
+NoSpecificContactAddress=No specific contact or address
+NoSpecificContactAddressBis=This tab is dedicated to force specific contacts or addresses for the current object. Use it only if you want to define one or several specific contacts or addresses for the object when the information on the thirdparty is not enough or not accurate.
+HideOnVCard=Hide %s
+AddToContacts=Add address to my contacts
+LastAccess=Last access
+UploadAnImageToSeeAPhotoHere=Upload an image from the tab %s to see a photo here
+LastPasswordChangeDate=Last password change date
diff --git a/htdocs/langs/uz_UZ/stripe.lang b/htdocs/langs/uz_UZ/stripe.lang
index aef85d4fbb6..36795c6075c 100644
--- a/htdocs/langs/uz_UZ/stripe.lang
+++ b/htdocs/langs/uz_UZ/stripe.lang
@@ -41,7 +41,8 @@ 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
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+ExampleOfTestBankAcountForSEPA=Example of bank account BAN for direct debit test: %s
 StripeGateways=Stripe shlyuzlari
 OAUTH_STRIPE_TEST_ID=Stripe Connect mijoz identifikatori (taxminan _...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect mijoz identifikatori (taxminan _...)
@@ -61,6 +62,7 @@ DeleteACard=Kartani o'chirish
 ConfirmDeleteCard=Ushbu Kredit yoki Debet kartani o'chirishni xohlaysizmi?
 CreateCustomerOnStripe=Stripe-da mijoz yarating
 CreateCardOnStripe=Stripe-da karta yarating
+CreateBANOnStripe=Create bank on Stripe
 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
@@ -69,3 +71,8 @@ ToOfferALinkForLiveWebhook=IPH-ga qo'ng'iroq qilish uchun Stripe WebHook-ni sozl
 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
+STRIPE_CARD_PRESENT=Card Present for Stripe Terminals
+TERMINAL_LOCATION=Location (address) for Stripe Terminals
+RequestDirectDebitWithStripe=Request Direct Debit with Stripe
+STRIPE_SEPA_DIRECT_DEBIT=Enable the Direct Debit payments through Stripe
+
diff --git a/htdocs/langs/uz_UZ/users.lang b/htdocs/langs/uz_UZ/users.lang
index c4de2d64306..316a54bd16c 100644
--- a/htdocs/langs/uz_UZ/users.lang
+++ b/htdocs/langs/uz_UZ/users.lang
@@ -66,7 +66,8 @@ LinkedToDolibarrUser=Foydalanuvchiga havola
 LinkedToDolibarrThirdParty=Uchinchi tomonga havola
 CreateDolibarrLogin=Foydalanuvchini yarating
 CreateDolibarrThirdParty=Uchinchi tomonni yarating
-LoginAccountDisableInDolibarr=Dolibarr-da hisob o'chirilgan.
+LoginAccountDisableInDolibarr=Account disabled in Dolibarr
+PASSWORDInDolibarr=Password modified in Dolibarr
 UsePersonalValue=Shaxsiy qiymatdan foydalaning
 ExportDataset_user_1=Foydalanuvchilar va ularning xususiyatlari
 DomainUser=Domen foydalanuvchisi %s
@@ -129,3 +130,6 @@ IPLastLogin=IP oxirgi kirish
 IPPreviousLogin=IP oldingi kirish
 ShowAllPerms=Show all permission rows
 HideAllPerms=Hide all permission rows
+UserPublicPageDesc=You can enable a virtual card for this user. An url with the user profile and a barcode will be available to allow anybody with a smartphone to scan it and add your contact to its address book.
+EnablePublicVirtualCard=Enable the public virtual user card
+PublicVirtualCardUrl=Public virtual user card
diff --git a/htdocs/langs/vi_VN/accountancy.lang b/htdocs/langs/vi_VN/accountancy.lang
index 08fafdcd27f..eb1e8334fc9 100644
--- a/htdocs/langs/vi_VN/accountancy.lang
+++ b/htdocs/langs/vi_VN/accountancy.lang
@@ -14,8 +14,8 @@ ACCOUNTING_EXPORT_ENDLINE=Chọn kiểu trả về
 ACCOUNTING_EXPORT_PREFIX_SPEC=Chỉ định tiền tố cho tên tệp
 ThisService=Dịch vụ này
 ThisProduct=Sản phẩm này
-DefaultForService=Mặc định cho dịch vụ
-DefaultForProduct=Mặc định cho sản phẩm
+DefaultForService=Default for services
+DefaultForProduct=Default for products
 ProductForThisThirdparty=Product for this thirdparty
 ServiceForThisThirdparty=Service for this thirdparty
 CantSuggest=Không thể gợi ý
@@ -101,7 +101,8 @@ ShowAccountingAccount=Hiển thị tài khoản kế toán
 ShowAccountingJournal=Hiển thị nhật ký kế toán
 ShowAccountingAccountInLedger=Show accounting account in ledger
 ShowAccountingAccountInJournals=Show accounting account in journals
-AccountAccountingSuggest=Đề xuất tài khoản kế toán
+DataUsedToSuggestAccount=Data used to suggest account
+AccountAccountingSuggest=Account suggested
 MenuDefaultAccounts=Tài khoản mặc định
 MenuBankAccounts=Tài khoản ngân hàng
 MenuVatAccounts=Tài khoản VAT
@@ -126,6 +127,7 @@ WriteBookKeeping=Record transactions in accounting
 Bookkeeping=Sổ cái
 BookkeepingSubAccount=Subledger
 AccountBalance=Số dư tài khoản
+AccountBalanceSubAccount=Sub-accounts balance
 ObjectsRef=Tham chiếu đối tượng nguồn
 CAHTF=Tổng số mua từ nhà cung cấp trước thuế
 TotalExpenseReport=Tổng báo cáo chi phí
@@ -189,6 +191,7 @@ ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Account (from the Chart Of Account) to be us
 UseAuxiliaryAccountOnCustomerDeposit=Store customer account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
 ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Account (from the Chart Of Account) to be used as the default
 UseAuxiliaryAccountOnSupplierDeposit=Store supplier account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
+ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY=Accounting account by default to register customer retained warranty
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased within same country (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased from EEC to another EEC country (used if not defined in the product sheet)
@@ -218,6 +221,7 @@ JournalLabel=Mã nhật ký
 NumPiece=Số lượng cái
 TransactionNumShort=Số Giao dịch
 AccountingCategory=Custom group of accounts
+AccountingCategories=Custom groups of accounts
 GroupByAccountAccounting=Group by general ledger account
 GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=Bạn có thể định nghĩa ở đây một số nhóm tài khoản kế toán. Chúng sẽ được sử dụng cho các báo cáo kế toán đã cá nhân hóa.
@@ -265,6 +269,7 @@ ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Nhóm tài khoản
 PcgtypeDesc=Nhóm tài khoản được sử dụng làm tiêu chí 'bộ lọc' và 'nhóm' được xác định trước cho một số báo cáo kế toán. Ví dụ: 'THU NHẬP' hoặc 'CHI PHÍ' được sử dụng làm nhóm cho tài khoản kế toán của các sản phẩm để xây dựng báo cáo chi phí / thu nhập.
+AccountingCategoriesDesc=Custom group of accounts can be used to group accounting accounts into one name to ease filter use or building of custom reports.
 
 Reconcilable=Đối soát lại
 
@@ -294,6 +299,7 @@ DescValidateMovements=Bất kỳ sửa đổi hoặc xóa viết, chữ và xóa
 
 ValidateHistory=Tự động ràng buộc
 AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
+DoManualBindingForFailedRecord=You have to do a manual link for the %s row(s) not linked automatically.
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot remove or disable this account of chart of account because it is used
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s & Credit = %s
@@ -337,11 +343,13 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on
 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_ENABLE_LETTERING=Enable the lettering function in the accounting
+ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
 
 ## Export
 NotExportLettering=Do not export the lettering when generating the file
 NotifiedExportDate=Flag exported lines as Exported <span class="warning">(to modify a line, you will need to delete the whole transaction and re-transfert it into accounting)</span>
 NotifiedValidationDate=Validate and Lock the exported entries <span class="warning">(same effect than the "%s" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+NotifiedExportFull=Export documents ?
 DateValidationAndLock=Date validation and lock
 ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Xuất dữ liệu bản nháp nhật ký
@@ -398,7 +406,7 @@ SaleLocal=Bán địa phương
 SaleExport=Bán hàng xuất khẩu
 SaleEEC=Bán trong EEC
 SaleEECWithVAT=Bán trong EEC với VAT không phải là null, vì vậy chúng tôi cho rằng đây KHÔNG phải là bán hàng nội bộ và tài khoản được đề xuất là tài khoản sản phẩm tiêu chuẩn.
-SaleEECWithoutVATNumber=Bán trong EEC không có VAT nhưng ID VAT của bên thứ ba không được xác định. Chúng tôi dự phòng tài khoản sản phẩm để bán hàng tiêu chuẩn. Bạn có thể sửa ID VAT của bên thứ ba hoặc tài khoản sản phẩm nếu cần.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the thirdparty, or change the product account suggested for binding if needed.
 ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
 ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
 ## Dictionary
@@ -442,6 +450,7 @@ AccountancyErrorMismatchLetterCode=Mismatch in reconcile code
 AccountancyErrorMismatchBalanceAmount=The balance (%s) is not equal to 0
 AccountancyErrorLetteringBookkeeping=Errors have occurred concerning the transactions: %s
 ErrorAccountNumberAlreadyExists=The accounting number %s already exists
+ErrorArchiveAddFile=Can't put "%s" file in archive
 
 ## Import
 ImportAccountingEntries=Ghi sổ kế toán
@@ -468,5 +477,7 @@ FECFormatMulticurrencyCode=Multicurrency code (Idevise)
 DateExport=Ngày xuất
 WarningReportNotReliable=Cảnh báo, báo cáo này không dựa trên Sổ Cái, do đó không chứa giao dịch được sửa đổi thủ công trong Sổ Cái. Nếu nhật ký của bạn được cập nhật, chế độ xem sổ sách chính xác hơn.
 ExpenseReportJournal=Nhật ký báo cáo chi phí
+DocsAlreadyExportedAreExcluded=Docs already exported are excluded
+ClickToHideAlreadyExportedLines=Click to hide already exported lines
 
 NAccounts=%s accounts
diff --git a/htdocs/langs/vi_VN/main.lang b/htdocs/langs/vi_VN/main.lang
index 3f4045837d0..cdb05fbebf4 100644
--- a/htdocs/langs/vi_VN/main.lang
+++ b/htdocs/langs/vi_VN/main.lang
@@ -226,6 +226,7 @@ NoUserGroupDefined=Không có nhóm người dùng được xác định
 Password=Mật khẩu
 PasswordRetype=Repeat your password
 NoteSomeFeaturesAreDisabled=Lưu ý rằng rất nhiều tính năng/modules bị vô hiệu hóa trong trình diễn này.
+YourUserFile=Your user file
 Name=Tên
 NameSlashCompany=Tên / Công ty
 Person=Cá nhân
@@ -897,6 +898,9 @@ MassFilesArea=Khu vực tạo các tệp bằng hành động hàng loạt
 ShowTempMassFilesArea=Hiển thị khu vực tạo các tệp bằng hành động hàng loạt
 ConfirmMassDeletion=Xác nhận xóa hàng loạt
 ConfirmMassDeletionQuestion=Bạn có chắc chắn muốn xóa (các) bản ghi đã chọn %s không?
+ConfirmMassClone=Bulk clone confirmation
+ConfirmMassCloneQuestion=Select project to clone to
+ConfirmMassCloneToOneProject=Clone to project %s
 RelatedObjects=Đối tượng liên quan
 ClassifyBilled=Xác định đã ra hóa đơn
 ClassifyUnbilled=Phân loại không có hóa đơn
@@ -912,8 +916,8 @@ ExportFilteredList=Xuất danh sách đã lọc
 ExportList=Danh sách xuất
 ExportOptions=Tùy chọn xuất dữ liệu
 IncludeDocsAlreadyExported=Bao gồm các tài liệu đã được xuất
-ExportOfPiecesAlreadyExportedIsEnable=Xuất dữ liệu các phần đã được xuất sẽ kích hoạt
-ExportOfPiecesAlreadyExportedIsDisable=Xuất dữ liệu các phần đã được xuất sẽ vô hiệu
+ExportOfPiecesAlreadyExportedIsEnable=Documents already exported are visible and will be exported
+ExportOfPiecesAlreadyExportedIsDisable=Documents already exported are hidden and won't be exported
 AllExportedMovementsWereRecordedAsExported=Tất cả các dịch chuyển đã xuất đã được ghi là đã xuất
 NotAllExportedMovementsCouldBeRecordedAsExported=Không phải tất cả các dịch chuyển đã xuất có thể được ghi là đã xuất
 Miscellaneous=Linh tinh
@@ -1128,6 +1132,7 @@ DeleteFileText=Bạn có chắc muốn xoá file này?
 ShowOtherLanguages=Xem ngôn ngữ khác
 SwitchInEditModeToAddTranslation=Mở sang chế độ chỉnh sửa và thêm bản dịch khác cho ngôn ngữ này
 NotUsedForThisCustomer=Không sử dụng cho khách hàng này
+NotUsedForThisVendor=Not used for this vendor
 AmountMustBePositive=Amount must be positive
 ByStatus=By status
 InformationMessage=Thông tin
@@ -1148,14 +1153,14 @@ EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
 OnHold=On hold
 Civility=Civility
-AffectTag=Assign Tag
-AffectUser=Assign User
-SetSupervisor=Set Supervisor
+AffectTag=Assign a Tag
+AffectUser=Assign a User
+SetSupervisor=Set the supervisor
 CreateExternalUser=Create external user
 ConfirmAffectTag=Bulk Tag Assignement
 ConfirmAffectUser=Bulk User Assignement
-ProjectRole=Role assigned on each project
-TasksRole=Role assigned on each task of each project
+ProjectRole=Role assigned on each project/opportunity
+TasksRole=Role assigned on each task (if used)
 ConfirmSetSupervisor=Bulk Supervisor Set
 ConfirmUpdatePrice=Choose a increase/decrease price rate
 ConfirmAffectTagQuestion=Are you sure you want to assign tags to the %s selected record(s)?
@@ -1210,3 +1215,10 @@ CreatedByPublicPortal=Created from Public portal
 UserAgent=User Agent
 InternalUser=Người dùng bên trong
 ExternalUser=Người dùng bên ngoài
+NoSpecificContactAddress=No specific contact or address
+NoSpecificContactAddressBis=This tab is dedicated to force specific contacts or addresses for the current object. Use it only if you want to define one or several specific contacts or addresses for the object when the information on the thirdparty is not enough or not accurate.
+HideOnVCard=Hide %s
+AddToContacts=Add address to my contacts
+LastAccess=Last access
+UploadAnImageToSeeAPhotoHere=Upload an image from the tab %s to see a photo here
+LastPasswordChangeDate=Last password change date
diff --git a/htdocs/langs/vi_VN/stripe.lang b/htdocs/langs/vi_VN/stripe.lang
index 3996aa89a2a..11a6b7c8515 100644
--- a/htdocs/langs/vi_VN/stripe.lang
+++ b/htdocs/langs/vi_VN/stripe.lang
@@ -41,7 +41,8 @@ STRIPE_LIVE_WEBHOOK_KEY=Khóa trực tiếp trên web
 ONLINE_PAYMENT_WAREHOUSE=Tồn kho để sử dụng để giảm tồn kho khi thanh toán trực tuyến được thực hiện <br> (TODO Khi tùy chọn giảm tồn kho được thực hiện trên một hành động trên hóa đơn và thanh toán trực tuyến tự tạo hóa đơn?)
 StripeLiveEnabled=Stripe trực tiếp được kích hoạt (nếu không là chế độ kiểm tra / hộp cát)
 StripeImportPayment=Nhập dữ liệu thanh toán Stripe
-ExampleOfTestCreditCard=Ví dụ về thẻ tín dụng để kiểm tra: %s => hợp lệ, %s => lỗi CVC, %s => đã hết hạn, %s => thu phí không thành công
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+ExampleOfTestBankAcountForSEPA=Example of bank account BAN for direct debit test: %s
 StripeGateways=Cổng Stripe
 OAUTH_STRIPE_TEST_ID=ID khách hàng kết nối Stripe (ca _...)
 OAUTH_STRIPE_LIVE_ID=ID khách hàng kết nối Stripe (ca _...)
@@ -61,6 +62,7 @@ DeleteACard=Xóa thẻ
 ConfirmDeleteCard=Bạn có chắc chắn muốn xóa thẻ Tín dụng hoặc Thẻ ghi nợ này không?
 CreateCustomerOnStripe=Tạo khách hàng trên Stripe
 CreateCardOnStripe=Tạo thẻ trên Stripe
+CreateBANOnStripe=Create bank on Stripe
 ShowInStripe=Hiển thị trong Stripe
 StripeUserAccountForActions=Tài khoản người dùng sử dụng để thông báo qua email về một số sự kiện Stripe (Xuất chi Stripe)
 StripePayoutList=Danh sách các khoản xuất chi của Stripe
@@ -69,3 +71,8 @@ ToOfferALinkForLiveWebhook=Liên kết để thiết lập Stripe WebHook để
 PaymentWillBeRecordedForNextPeriod=Thanh toán sẽ được ghi lại cho giai đoạn tiếp theo.
 ClickHereToTryAgain=<a href="%s">Bấm vào đây để thử lại...</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
+STRIPE_CARD_PRESENT=Card Present for Stripe Terminals
+TERMINAL_LOCATION=Location (address) for Stripe Terminals
+RequestDirectDebitWithStripe=Request Direct Debit with Stripe
+STRIPE_SEPA_DIRECT_DEBIT=Enable the Direct Debit payments through Stripe
+
diff --git a/htdocs/langs/vi_VN/ticket.lang b/htdocs/langs/vi_VN/ticket.lang
index 14f78dccfb5..b60bcda3869 100644
--- a/htdocs/langs/vi_VN/ticket.lang
+++ b/htdocs/langs/vi_VN/ticket.lang
@@ -26,6 +26,7 @@ Permission56002=Sửa đổi vé
 Permission56003=Xóa vé
 Permission56004=Quản lý vé
 Permission56005=Xem vé của tất cả các bên thứ ba (không hiệu quả đối với người dùng bên ngoài, luôn bị giới hạn ở bên thứ ba mà họ phụ thuộc)
+Permission56006=Export tickets
 
 Tickets=Vé
 TicketDictType=Vé - Các loại
@@ -61,6 +62,8 @@ TypeContact_ticket_external_CONTRIBUTOR=Người cộng tác bên ngoài
 OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Gửi tin nhắn vé qua email
 
+ExportDataset_ticket_1=Vé
+
 # Status
 Read=Đọc
 Assigned=Phân công
diff --git a/htdocs/langs/vi_VN/users.lang b/htdocs/langs/vi_VN/users.lang
index 4e89c22d5b8..f5687a68f5f 100644
--- a/htdocs/langs/vi_VN/users.lang
+++ b/htdocs/langs/vi_VN/users.lang
@@ -66,7 +66,8 @@ LinkedToDolibarrUser=Link to user
 LinkedToDolibarrThirdParty=Link to third party
 CreateDolibarrLogin=Tạo một người dùng
 CreateDolibarrThirdParty=Tạo một bên thứ ba
-LoginAccountDisableInDolibarr=Tài khoản bị vô hiệu hóa trong Dolibarr.
+LoginAccountDisableInDolibarr=Account disabled in Dolibarr
+PASSWORDInDolibarr=Password modified in Dolibarr
 UsePersonalValue=Dùng giá trị cá nhân
 ExportDataset_user_1=Người dùng và các tính chất của họ
 DomainUser=Domain người dùng %s
@@ -129,3 +130,6 @@ IPLastLogin=IP last login
 IPPreviousLogin=IP previous login
 ShowAllPerms=Show all permission rows
 HideAllPerms=Hide all permission rows
+UserPublicPageDesc=You can enable a virtual card for this user. An url with the user profile and a barcode will be available to allow anybody with a smartphone to scan it and add your contact to its address book.
+EnablePublicVirtualCard=Enable the public virtual user card
+PublicVirtualCardUrl=Public virtual user card
diff --git a/htdocs/langs/zh_CN/accountancy.lang b/htdocs/langs/zh_CN/accountancy.lang
index 8510eefe75b..c9155162364 100644
--- a/htdocs/langs/zh_CN/accountancy.lang
+++ b/htdocs/langs/zh_CN/accountancy.lang
@@ -14,8 +14,8 @@ ACCOUNTING_EXPORT_ENDLINE=选择运费类型
 ACCOUNTING_EXPORT_PREFIX_SPEC=指定文件名前缀
 ThisService=这项服务
 ThisProduct=这个产品
-DefaultForService=默认服务
-DefaultForProduct=默认产品
+DefaultForService=Default for services
+DefaultForProduct=Default for products
 ProductForThisThirdparty=Product for this thirdparty
 ServiceForThisThirdparty=Service for this thirdparty
 CantSuggest=无法建议
@@ -101,7 +101,8 @@ ShowAccountingAccount=显示会计科目
 ShowAccountingJournal=显示会计日常报表
 ShowAccountingAccountInLedger=Show accounting account in ledger
 ShowAccountingAccountInJournals=Show accounting account in journals
-AccountAccountingSuggest=建议会计科目
+DataUsedToSuggestAccount=Data used to suggest account
+AccountAccountingSuggest=Account suggested
 MenuDefaultAccounts=默认帐户
 MenuBankAccounts=银行帐户
 MenuVatAccounts=增值税账户
@@ -126,6 +127,7 @@ WriteBookKeeping=Record transactions in accounting
 Bookkeeping=分类帐
 BookkeepingSubAccount=Subledger
 AccountBalance=账目平衡
+AccountBalanceSubAccount=Sub-accounts balance
 ObjectsRef=源对象引用
 CAHTF=Total purchase vendor before tax
 TotalExpenseReport=总费用报告
@@ -189,6 +191,7 @@ ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Account (from the Chart Of Account) to be us
 UseAuxiliaryAccountOnCustomerDeposit=Store customer account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
 ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Account (from the Chart Of Account) to be used as the default
 UseAuxiliaryAccountOnSupplierDeposit=Store supplier account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
+ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY=Accounting account by default to register customer retained warranty
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased within same country (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased from EEC to another EEC country (used if not defined in the product sheet)
@@ -218,6 +221,7 @@ JournalLabel=Journal label
 NumPiece=件数
 TransactionNumShort=Num. transaction
 AccountingCategory=Custom group of accounts
+AccountingCategories=Custom groups of accounts
 GroupByAccountAccounting=Group by general ledger account
 GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=您可以在此处定义一些会计科目组。它们将用于会计分类报告。
@@ -265,6 +269,7 @@ ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=帐户组
 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.
+AccountingCategoriesDesc=Custom group of accounts can be used to group accounting accounts into one name to ease filter use or building of custom reports.
 
 Reconcilable=Reconcilable
 
@@ -294,6 +299,7 @@ DescValidateMovements=Any modification or deletion of writing, lettering and del
 
 ValidateHistory=自动绑定
 AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
+DoManualBindingForFailedRecord=You have to do a manual link for the %s row(s) not linked automatically.
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot remove or disable this account of chart of account because it is used
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s & Credit = %s
@@ -337,11 +343,13 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on
 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_ENABLE_LETTERING=Enable the lettering function in the accounting
+ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
 
 ## Export
 NotExportLettering=Do not export the lettering when generating the file
 NotifiedExportDate=Flag exported lines as Exported <span class="warning">(to modify a line, you will need to delete the whole transaction and re-transfert it into accounting)</span>
 NotifiedValidationDate=Validate and Lock the exported entries <span class="warning">(same effect than the "%s" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+NotifiedExportFull=Export documents ?
 DateValidationAndLock=Date validation and lock
 ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=导出日常报表草稿
@@ -398,7 +406,7 @@ 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.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the thirdparty, or change the product account suggested for binding if needed.
 ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
 ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
 ## Dictionary
@@ -442,6 +450,7 @@ AccountancyErrorMismatchLetterCode=Mismatch in reconcile code
 AccountancyErrorMismatchBalanceAmount=The balance (%s) is not equal to 0
 AccountancyErrorLetteringBookkeeping=Errors have occurred concerning the transactions: %s
 ErrorAccountNumberAlreadyExists=The accounting number %s already exists
+ErrorArchiveAddFile=Can't put "%s" file in archive
 
 ## Import
 ImportAccountingEntries=会计分录
@@ -468,5 +477,7 @@ 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.
 ExpenseReportJournal=费用报告日常报表
+DocsAlreadyExportedAreExcluded=Docs already exported are excluded
+ClickToHideAlreadyExportedLines=Click to hide already exported lines
 
 NAccounts=%s accounts
diff --git a/htdocs/langs/zh_CN/ticket.lang b/htdocs/langs/zh_CN/ticket.lang
index 5126ad8236d..068b620dd89 100644
--- a/htdocs/langs/zh_CN/ticket.lang
+++ b/htdocs/langs/zh_CN/ticket.lang
@@ -26,6 +26,7 @@ Permission56002=修改票证
 Permission56003=删除票据
 Permission56004=管理票据
 Permission56005=See tickets of all third parties (not effective for external users, always be limited to the third party they depend on)
+Permission56006=Export tickets
 
 Tickets=工单
 TicketDictType=Ticket - Types
@@ -61,6 +62,8 @@ TypeContact_ticket_external_CONTRIBUTOR=外部贡献者
 OriginEmail=Reporter Email
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
+ExportDataset_ticket_1=工单
+
 # Status
 Read=阅读
 Assigned=分配
diff --git a/htdocs/langs/zh_CN/users.lang b/htdocs/langs/zh_CN/users.lang
index 38faecdafd0..24ec2a2f3af 100644
--- a/htdocs/langs/zh_CN/users.lang
+++ b/htdocs/langs/zh_CN/users.lang
@@ -66,7 +66,8 @@ LinkedToDolibarrUser=Link to user
 LinkedToDolibarrThirdParty=Link to third party
 CreateDolibarrLogin=创建用户
 CreateDolibarrThirdParty=创建合伙人
-LoginAccountDisableInDolibarr=停用帐户
+LoginAccountDisableInDolibarr=Account disabled in Dolibarr
+PASSWORDInDolibarr=Password modified in Dolibarr
 UsePersonalValue=使用自定义值
 ExportDataset_user_1=用户及属性
 DomainUser=域用户%s
@@ -129,3 +130,6 @@ IPLastLogin=IP last login
 IPPreviousLogin=IP previous login
 ShowAllPerms=Show all permission rows
 HideAllPerms=Hide all permission rows
+UserPublicPageDesc=You can enable a virtual card for this user. An url with the user profile and a barcode will be available to allow anybody with a smartphone to scan it and add your contact to its address book.
+EnablePublicVirtualCard=Enable the public virtual user card
+PublicVirtualCardUrl=Public virtual user card
diff --git a/htdocs/langs/zh_TW/accountancy.lang b/htdocs/langs/zh_TW/accountancy.lang
index 2e30e85acf7..e790ccb78db 100644
--- a/htdocs/langs/zh_TW/accountancy.lang
+++ b/htdocs/langs/zh_TW/accountancy.lang
@@ -14,8 +14,8 @@ ACCOUNTING_EXPORT_ENDLINE=選擇退回類型
 ACCOUNTING_EXPORT_PREFIX_SPEC=指定檔案名稱的前綴字元
 ThisService=此服務
 ThisProduct=此產品
-DefaultForService=服務的預設
-DefaultForProduct=產品的預設
+DefaultForService=Default for services
+DefaultForProduct=Default for products
 ProductForThisThirdparty=此合作方的產品
 ServiceForThisThirdparty=此合作方的服務
 CantSuggest=無法建議
@@ -101,7 +101,8 @@ ShowAccountingAccount=顯示會計項目
 ShowAccountingJournal=顯示會計日記帳
 ShowAccountingAccountInLedger=在分類帳中顯示會計科目
 ShowAccountingAccountInJournals=在日記帳中顯示會計科目
-AccountAccountingSuggest=建議的會計項目
+DataUsedToSuggestAccount=Data used to suggest account
+AccountAccountingSuggest=Account suggested
 MenuDefaultAccounts=預設會計項目
 MenuBankAccounts=銀行帳戶
 MenuVatAccounts=營業稅帳戶
@@ -126,6 +127,7 @@ WriteBookKeeping=在會計中記錄交易
 Bookkeeping=總帳
 BookkeepingSubAccount=子分類帳
 AccountBalance=帳戶餘額
+AccountBalanceSubAccount=Sub-accounts balance
 ObjectsRef=參考的來源物件
 CAHTF=稅前總採購供應商
 TotalExpenseReport=總費用報表
@@ -189,6 +191,7 @@ ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Account (from the Chart Of Account) to be us
 UseAuxiliaryAccountOnCustomerDeposit=Store customer account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
 ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Account (from the Chart Of Account) to be used as the default
 UseAuxiliaryAccountOnSupplierDeposit=Store supplier account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
+ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY=Accounting account by default to register customer retained warranty
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased within same country (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased from EEC to another EEC country (used if not defined in the product sheet)
@@ -218,6 +221,7 @@ JournalLabel=日記帳標籤
 NumPiece=件數
 TransactionNumShort=交易編號
 AccountingCategory=Custom group of accounts
+AccountingCategories=Custom groups of accounts
 GroupByAccountAccounting=依總分類帳帳戶的群組
 GroupBySubAccountAccounting=依子分類帳帳戶的群組
 AccountingAccountGroupsDesc=您可定義某些會計科目大類。他們可以在個人化會計報表中使用。
@@ -265,6 +269,7 @@ ShowSubtotalByGroup=依級別顯示小計
 
 Pcgtype=會計項目大類
 PcgtypeDesc=用作某些會計報告的預定義“過濾器”和“分組”標準的科目組。例如“ INCOME”或“ EXPENSE”用作產品的會計科目組，以建立費用/收入報告。
+AccountingCategoriesDesc=Custom group of accounts can be used to group accounting accounts into one name to ease filter use or building of custom reports.
 
 Reconcilable=可和解
 
@@ -294,6 +299,7 @@ DescValidateMovements=禁止修改，刪除任何文字內容。所有條目都
 
 ValidateHistory=自動關聯
 AutomaticBindingDone=自動綁定完成 (%s) - 某些記錄無法自動綁定 (%s)
+DoManualBindingForFailedRecord=You have to do a manual link for the %s row(s) not linked automatically.
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot remove or disable this account of chart of account because it is used
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s & Credit = %s
@@ -337,11 +343,13 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=停用銷售中的會計綁定和轉移（
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=停用採購中的會計綁定和轉移（會計中不考慮供應商發票）
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=停用費用報表中的會計綁定和轉移（會計中不考慮費用報表）
 ACCOUNTING_ENABLE_LETTERING=Enable the lettering function in the accounting
+ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
 
 ## Export
 NotExportLettering=Do not export the lettering when generating the file
 NotifiedExportDate=Flag exported lines as Exported <span class="warning">(to modify a line, you will need to delete the whole transaction and re-transfert it into accounting)</span>
 NotifiedValidationDate=Validate and Lock the exported entries <span class="warning">(same effect than the "%s" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+NotifiedExportFull=Export documents ?
 DateValidationAndLock=驗證與鎖定的日期
 ConfirmExportFile=確定要產生會計匯出檔案 ?
 ExportDraftJournal=匯出日記帳草稿
@@ -398,7 +406,7 @@ SaleLocal=本地銷售
 SaleExport=出口銷售
 SaleEEC=在歐盟銷售
 SaleEECWithVAT=在EEC中具有營業稅的銷售不為空，因此我們認為這不是內部銷售，建議的帳戶是標準產品帳戶。
-SaleEECWithoutVATNumber=在EEC中銷售沒有營業稅但合作方的營業稅ID未定義。我們退回標準銷售的產品帳戶。您可以根據需要修改合作方或產品帳戶的營業稅ID。
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the thirdparty, or change the product account suggested for binding if needed.
 ForbiddenTransactionAlreadyExported=禁止：交易已被驗證和/或匯出。
 ForbiddenTransactionAlreadyValidated=禁止：交易已被驗證。
 ## Dictionary
@@ -442,6 +450,7 @@ AccountancyErrorMismatchLetterCode=協調代碼不匹配
 AccountancyErrorMismatchBalanceAmount=餘額（%s）不等於0
 AccountancyErrorLetteringBookkeeping=交易發生錯誤：%s
 ErrorAccountNumberAlreadyExists=The accounting number %s already exists
+ErrorArchiveAddFile=Can't put "%s" file in archive
 
 ## Import
 ImportAccountingEntries=會計條目
@@ -468,5 +477,7 @@ FECFormatMulticurrencyCode=多國幣別代碼（Idevise）
 DateExport=日期輸出
 WarningReportNotReliable=警告，此報表非依總帳製作的，所以不含總帳中人工修改的交易。若您日記簿是最新的日期，則記帳檢視會比較準確。
 ExpenseReportJournal=費用報表日記帳
+DocsAlreadyExportedAreExcluded=Docs already exported are excluded
+ClickToHideAlreadyExportedLines=Click to hide already exported lines
 
 NAccounts=%s 個帳戶
diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang
index b20e87b40be..78c3c9ba4c9 100644
--- a/htdocs/langs/zh_TW/admin.lang
+++ b/htdocs/langs/zh_TW/admin.lang
@@ -645,6 +645,8 @@ Module2300Name=排程工作
 Module2300Desc=排程工作管理(連到 cron 或是 chrono table)
 Module2400Name=事件/應辦事項
 Module2400Desc=追蹤事件。記錄自動事件以進行追踪或記錄手動事件或會議。這是良好的客戶或供應商關係管理的主要模組。
+Module2430Name=日曆預約系統
+Module2430Desc=Provide an online calendar to allow anyone to book rendez-vous, according to predefined ranges or availabilities.
 Module2500Name=檔案管理系統(DMS) / 電子控制管理(ECM)
 Module2500Desc=文件管理系統 / 電子內容管理。您產生或是儲存的文件會自動整理組織。當您有需要就分享吧。
 Module2600Name=API / 網頁伺服器（SOAP 伺服器）
@@ -660,6 +662,8 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind轉換功能
 Module3200Name=不可改變的檔案
 Module3200Desc=啟用不可更改的商業事件日誌。事件是即時存檔的。日誌是可以匯出的鍊式事件的唯讀表格。在某些國家/地區，此模組可能是必需的。
+Module3300Name=模組產生器
+Module3200Desc=啟用不可更改的商業事件日誌。事件是即時存檔的。日誌是可以匯出的鍊式事件的唯讀表格。在某些國家/地區，此模組可能是必需的。
 Module3400Name=社群網路
 Module3400Desc=啟用合作方與地址的社群網路欄位 (skype, twitter, facebook, ...).
 Module4000Name=人資
@@ -975,7 +979,7 @@ Permission4001=讀取技能/工作/職位
 Permission4002=建立/修改技能/工作/職位
 Permission4003=刪除技能/工作/職位
 Permission4021=Read evaluations (yours and your subordinates)
-Permission4022=Create/modify evaluations
+Permission4022=建立/修改評估
 Permission4023=驗證評估
 Permission4025=刪除評價
 Permission4028=查看比較選單
@@ -1270,6 +1274,7 @@ TriggerActiveAsModuleActive=當模組<b>%s</b>啟用時，此檔案中的觸發
 GeneratedPasswordDesc=選擇用於自動產生密碼的方法。
 DictionaryDesc=插入全部參考資料。您可加入您的預設值。
 ConstDesc=此頁面允許您編輯（覆蓋）其他頁面中不可用的參數。這些大多是保留的參數，僅供開發人員/進階故障排除。
+MiscellaneousOptions=Miscellaneous options
 MiscellaneousDesc=在此定義所有其他與安全有關的參數。
 LimitsSetup=限制/精準度設定
 LimitsDesc=您可以在此處定義Dolibarr使用的限制，精度和優化
@@ -1826,6 +1831,9 @@ AGENDA_USE_EVENT_TYPE=使用事件類型（在選單設定->分類->應辦事項
 AGENDA_USE_EVENT_TYPE_DEFAULT=在事件建立表單中自動為事件類型設定此預設值
 AGENDA_DEFAULT_FILTER_TYPE=在應辦事項視圖的搜索過濾器中自動設定此類事件
 AGENDA_DEFAULT_FILTER_STATUS=在應辦事項視圖的搜索過濾器中自動為事件設定此狀態
+AGENDA_EVENT_PAST_COLOR=Past event color
+AGENDA_EVENT_CURRENT_COLOR=Current event color
+AGENDA_EVENT_FUTURE_COLOR=Future event color
 AGENDA_DEFAULT_VIEW=當選擇應辦事項選單時預設要打開的分頁
 AGENDA_REMINDER_BROWSER=<b>在用戶的瀏覽器上</b>啟用事件提醒（到達事件日期時，瀏覽器會跳出提醒視窗.每個用戶都可以從瀏覽器提醒設定中停用此提醒）
 AGENDA_REMINDER_BROWSER_SOUND=啟用音效警告
@@ -2129,6 +2137,7 @@ CodeLastResult=最新結果代碼
 NbOfEmailsInInbox=來源資料夾中的電子郵件數量
 LoadThirdPartyFromName=在%s載入合作方搜尋 (僅載入)
 LoadThirdPartyFromNameOrCreate= 在%s載入合作方搜尋 (如果找不到就建立)
+LoadContactFromEmailOrCreate=Load contact searching on %s (create if not found)
 AttachJoinedDocumentsToObject=如果在電子郵件主題中找到項目的引用，則將附件保存到項目文件中。
 WithDolTrackingID=來自Dolibarr寄送的第一封電子郵件發起的對話訊息
 WithoutDolTrackingID=來自第一封電子郵件發起的對話的訊息不是從 Dolibarr 發送的
@@ -2355,3 +2364,5 @@ AllowExternalDownload=允許外部下載（無需登入，使用共享連結）
 DeadlineDayVATSubmission=Deadline day for vat submission on the next month
 MaxNumberOfAttachementOnForms=表單中最大合併文件數
 IfDefinedUseAValueBeetween=如果已定義，則使用 %s 和 %s 之間的值
+Reload=Reload
+ConfirmReload=Confirm module reload
diff --git a/htdocs/langs/zh_TW/companies.lang b/htdocs/langs/zh_TW/companies.lang
index f9e71c6bd97..2de41283014 100644
--- a/htdocs/langs/zh_TW/companies.lang
+++ b/htdocs/langs/zh_TW/companies.lang
@@ -312,8 +312,8 @@ CustomerRelativeDiscountShort=相對折扣
 CustomerAbsoluteDiscountShort=無條件折扣
 CompanyHasRelativeDiscount=此客戶有預設的<b>%s%%</b>的折扣
 CompanyHasNoRelativeDiscount=此客戶預設沒有相對的折扣
-HasRelativeDiscountFromSupplier=您有此供應商的預設折扣<b>%s%%</b>
-HasNoRelativeDiscountFromSupplier=您沒有該供應商的預設相對折扣
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> with this vendor
+HasNoRelativeDiscountFromSupplier=No default relative discount with this vendor
 CompanyHasAbsoluteDiscount=在<b>%s</b>%s此客戶有折扣(信用票據或預付款)
 CompanyHasDownPaymentOrCommercialDiscount=在 <b>%s</b>%s 此客戶有折扣(商業預付款)
 CompanyHasCreditNote=在<b>%s</b>%s情況下，此客戶仍然有信用票據
@@ -499,4 +499,7 @@ OutOfEurope=歐洲以外（EEC）
 CurrentOutstandingBillLate=目前拖欠帳單
 BecarefullChangeThirdpartyBeforeAddProductToInvoice=請注意，根據您的產品價格設定，應在將產品增加到POS之前更改合作方。
 EmailAlreadyExistsPleaseRewriteYourCompanyName=電子郵件已存在，請重新輸入您的公司名稱
-TwoRecordsOfCompanyName=該公司存在多個記錄，請聯繫我們以完成您的合作請求”
+TwoRecordsOfCompanyName=more than one record exists for this company, please contact us to complete your partnership request
+CompanySection=Company section
+ShowSocialNetworks=Show social networks
+HideSocialNetworks=Hide social networks
diff --git a/htdocs/langs/zh_TW/main.lang b/htdocs/langs/zh_TW/main.lang
index a85591c3c84..13a1532d842 100644
--- a/htdocs/langs/zh_TW/main.lang
+++ b/htdocs/langs/zh_TW/main.lang
@@ -226,6 +226,7 @@ NoUserGroupDefined=未定義用戶群組
 Password=密碼
 PasswordRetype=重新輸入您的密碼
 NoteSomeFeaturesAreDisabled=請注意在這個示範中多項功能/模組已關閉。
+YourUserFile=Your user file
 Name=名稱
 NameSlashCompany=姓名/公司
 Person=人員
@@ -897,6 +898,9 @@ MassFilesArea=批次檔案建立區域
 ShowTempMassFilesArea=顯示批次檔案建立區域
 ConfirmMassDeletion=批次刪除確認
 ConfirmMassDeletionQuestion=您確定要刪除%s已選記錄嗎？
+ConfirmMassClone=Bulk clone confirmation
+ConfirmMassCloneQuestion=Select project to clone to
+ConfirmMassCloneToOneProject=Clone to project %s
 RelatedObjects=相關項目
 ClassifyBilled=分類已開票
 ClassifyUnbilled=分類未開票
@@ -912,8 +916,8 @@ ExportFilteredList=匯出已篩選清單
 ExportList=匯出清單
 ExportOptions=匯出選項
 IncludeDocsAlreadyExported=包含的文件已輸出
-ExportOfPiecesAlreadyExportedIsEnable=啟用已匯出出口件
-ExportOfPiecesAlreadyExportedIsDisable=已停用已匯出出口件
+ExportOfPiecesAlreadyExportedIsEnable=Documents already exported are visible and will be exported
+ExportOfPiecesAlreadyExportedIsDisable=Documents already exported are hidden and won't be exported
 AllExportedMovementsWereRecordedAsExported=所有匯出動作均記錄為已匯出
 NotAllExportedMovementsCouldBeRecordedAsExported=並非所有匯出動作都可以記錄為已匯出
 Miscellaneous=雜項
@@ -1128,6 +1132,7 @@ DeleteFileText=您確定要刪除檔案嗎？
 ShowOtherLanguages=顯示其他語言
 SwitchInEditModeToAddTranslation=切換到編輯模式以添加該語言的翻譯
 NotUsedForThisCustomer=未用於此客戶
+NotUsedForThisVendor=Not used for this vendor
 AmountMustBePositive=金額必須為正
 ByStatus=依狀態
 InformationMessage=資訊
@@ -1148,14 +1153,14 @@ EventReminder=事件提醒
 UpdateForAllLines=更新所有行
 OnHold=On hold
 Civility=稱謂或頭銜
-AffectTag=Assign Tag
-AffectUser=Assign User
-SetSupervisor=設定主管
+AffectTag=Assign a Tag
+AffectUser=Assign a User
+SetSupervisor=Set the supervisor
 CreateExternalUser=建立外部用戶
 ConfirmAffectTag=Bulk Tag Assignement
 ConfirmAffectUser=Bulk User Assignement
-ProjectRole=Role assigned on each project
-TasksRole=Role assigned on each task of each project
+ProjectRole=Role assigned on each project/opportunity
+TasksRole=Role assigned on each task (if used)
 ConfirmSetSupervisor=批量設定主管
 ConfirmUpdatePrice=Choose a increase/decrease price rate
 ConfirmAffectTagQuestion=Are you sure you want to assign tags to the %s selected record(s)?
@@ -1210,3 +1215,10 @@ CreatedByPublicPortal=Created from Public portal
 UserAgent=User Agent
 InternalUser=內部用戶
 ExternalUser=外部用戶
+NoSpecificContactAddress=No specific contact or address
+NoSpecificContactAddressBis=This tab is dedicated to force specific contacts or addresses for the current object. Use it only if you want to define one or several specific contacts or addresses for the object when the information on the thirdparty is not enough or not accurate.
+HideOnVCard=Hide %s
+AddToContacts=Add address to my contacts
+LastAccess=Last access
+UploadAnImageToSeeAPhotoHere=Upload an image from the tab %s to see a photo here
+LastPasswordChangeDate=Last password change date
diff --git a/htdocs/langs/zh_TW/stripe.lang b/htdocs/langs/zh_TW/stripe.lang
index 3e6691b8381..6b3597352d5 100644
--- a/htdocs/langs/zh_TW/stripe.lang
+++ b/htdocs/langs/zh_TW/stripe.lang
@@ -41,7 +41,8 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook live金鑰
 ONLINE_PAYMENT_WAREHOUSE=完成線上支付時用於減少庫存的庫存<br>（待辦事項 如果針對發票操作完成了減少庫存的選項，線上支付也同時產生發票？）
 StripeLiveEnabled=啟用Stripe live模式（否則為測試/沙盒模式）
 StripeImportPayment=匯入Stripe付款
-ExampleOfTestCreditCard=用於信用卡測試的範例：%s =>有效，%s =>錯誤CVC，%s =>已過期，%s =>加值失敗
+ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+ExampleOfTestBankAcountForSEPA=Example of bank account BAN for direct debit test: %s
 StripeGateways=Stripe閘道
 OAUTH_STRIPE_TEST_ID=Stripe Connect客戶端ID（ca _...）
 OAUTH_STRIPE_LIVE_ID=Stripe Connect客戶端ID（ca _...）
@@ -61,6 +62,7 @@ DeleteACard=刪除卡片
 ConfirmDeleteCard=您確定要刪除此信用卡或金融信用卡嗎？
 CreateCustomerOnStripe=在Stripe上建立客戶
 CreateCardOnStripe=在Stripe上建立卡片
+CreateBANOnStripe=Create bank on Stripe
 ShowInStripe=在Stripe上顯示
 StripeUserAccountForActions=用於某些Stripe事件的電子郵件通知用戶帳戶（Stripe支出）
 StripePayoutList=Stripe支出清單
@@ -69,3 +71,8 @@ ToOfferALinkForLiveWebhook=連結到Stripe WebHook設定以呼叫IPN（live模
 PaymentWillBeRecordedForNextPeriod=付款將記錄在下一個期間。
 ClickHereToTryAgain=<a href="%s">點擊此處重試... </a>
 CreationOfPaymentModeMustBeDoneFromStripeInterface=由於嚴格的客戶身份驗證規則，必須在Stripe後台進行卡的建立。您可以點擊此處打開Stripe客戶記錄：%s
+STRIPE_CARD_PRESENT=Card Present for Stripe Terminals
+TERMINAL_LOCATION=Location (address) for Stripe Terminals
+RequestDirectDebitWithStripe=Request Direct Debit with Stripe
+STRIPE_SEPA_DIRECT_DEBIT=Enable the Direct Debit payments through Stripe
+
diff --git a/htdocs/langs/zh_TW/suppliers.lang b/htdocs/langs/zh_TW/suppliers.lang
index 1c8d77181c5..c3977ac0623 100644
--- a/htdocs/langs/zh_TW/suppliers.lang
+++ b/htdocs/langs/zh_TW/suppliers.lang
@@ -4,6 +4,7 @@ SuppliersInvoice=供應商發票
 SupplierInvoices=供應商發票
 ShowSupplierInvoice=顯示供應商發票
 NewSupplier=新供應商
+NewSupplierInvoice = 新供應商發票
 History=歷史紀錄
 ListOfSuppliers=供應商名單
 ShowSupplier=顯示供應商
@@ -47,3 +48,10 @@ BuyerName=買家名稱
 AllProductServicePrices=所有產品/服務價格
 AllProductReferencesOfSupplier=供應商的所有參考
 BuyingPriceNumShort=供應商價格
+RepeatableSupplierInvoice=供應商發票模板
+RepeatableSupplierInvoices=供應商發票模板
+RepeatableSupplierInvoicesList=供應商發票模板
+RecurringSupplierInvoices=經常性供應商發票
+ToCreateAPredefinedSupplierInvoice=為了建立供應商發票模板，您必須建立一個標準發票，然後在不驗證它的情況下點擊"%s"按鈕
+GeneratedFromSupplierTemplate=已從供應商發票模板 %s 產生
+SupplierInvoiceGeneratedFromTemplate=供應商發票 %s 已從供應商發票模板 %s 產生
diff --git a/htdocs/langs/zh_TW/ticket.lang b/htdocs/langs/zh_TW/ticket.lang
index c045124c766..f348b5ae9aa 100644
--- a/htdocs/langs/zh_TW/ticket.lang
+++ b/htdocs/langs/zh_TW/ticket.lang
@@ -26,6 +26,7 @@ Permission56002=修改服務單
 Permission56003=刪除服務單
 Permission56004=管理服務單
 Permission56005=查看所有合作方的服務單（對外部用戶無效，始終僅限於他們所依賴的合作方）
+Permission56006=匯出服務單
 
 Tickets=服務單
 TicketDictType=服務單-類型
@@ -61,6 +62,8 @@ TypeContact_ticket_external_CONTRIBUTOR=外部合作者
 OriginEmail=填寫人Email
 Notify_TICKET_SENTBYMAIL=以電子郵件發送服務單訊息
 
+ExportDataset_ticket_1=服務單
+
 # Status
 Read=已讀取
 Assigned=已分配
diff --git a/htdocs/langs/zh_TW/users.lang b/htdocs/langs/zh_TW/users.lang
index 010735d8c63..c0b619b0fbb 100644
--- a/htdocs/langs/zh_TW/users.lang
+++ b/htdocs/langs/zh_TW/users.lang
@@ -66,7 +66,8 @@ LinkedToDolibarrUser=連結到用戶
 LinkedToDolibarrThirdParty=連結到合作方
 CreateDolibarrLogin=建立一位用戶
 CreateDolibarrThirdParty=建立一位合作方(客戶/供應商)
-LoginAccountDisableInDolibarr=在 Dolibarr 中帳戶已關閉。
+LoginAccountDisableInDolibarr=Account disabled in Dolibarr
+PASSWORDInDolibarr=Password modified in Dolibarr
 UsePersonalValue=使用個人設定值
 ExportDataset_user_1=用戶及其屬性
 DomainUser=網域用戶%s
@@ -129,3 +130,6 @@ IPLastLogin=上次登入的IP
 IPPreviousLogin=以前登入的IP
 ShowAllPerms=Show all permission rows
 HideAllPerms=Hide all permission rows
+UserPublicPageDesc=You can enable a virtual card for this user. An url with the user profile and a barcode will be available to allow anybody with a smartphone to scan it and add your contact to its address book.
+EnablePublicVirtualCard=Enable the public virtual user card
+PublicVirtualCardUrl=Public virtual user card
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index a45577b6608..afa7aa5eaa8 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -66,6 +66,7 @@ $error = 0;
  * Actions
  */
 
+$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');
@@ -291,13 +292,13 @@ if ($action == 'create') {
 	// Date Start
 	print "<tr>";
 	print '<td class="fieldrequired">'.$langs->trans("DateStart").'</td><td>';
-	print $form->selectDate($datestart ? $datestart : -1, 'start', '', '', '', 'add', 1, 1);
+	print $form->selectDate(!empty($datestart) ? $datestart : -1, 'start', '', '', '', 'add', 1, 1);
 	print '</td></tr>';
 
 	// Date End
 	print "<tr>";
 	print '<td class="fieldrequired">'.$langs->trans("DateEnd").'</td><td>';
-	print $form->selectDate($dateend ? $dateend : -1, 'end', '', '', '', 'add', 1, 1);
+	print $form->selectDate(!empty($dateend) ? $dateend : -1, 'end', '', '', '', 'add', 1, 1);
 	print '</td></tr>';
 
 	// Number of terms
diff --git a/htdocs/loan/list.php b/htdocs/loan/list.php
index 1225f5304be..b664d784e7e 100644
--- a/htdocs/loan/list.php
+++ b/htdocs/loan/list.php
@@ -42,6 +42,7 @@ $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');
+$massaction = GETPOST('massaction', 'alpha');
 if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
@@ -148,6 +149,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	}
 	$db->free($resql);
 }
+$arrayfields = array();
 
 // Complete request and execute it with limit
 $sql .= $db->order($sortfield, $sortorder);
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 115be3cf0cf..b439ec70133 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -879,9 +879,9 @@ if (!defined('NOLOGIN')) {
 			exit;
 		}
 
-		$resultFetchUser = $user->fetch('', $login, '', 1, ($entitytotest > 0 ? $entitytotest : -1)); // login was retrieved previously when checking password.
-		if ($resultFetchUser <= 0) {
-			dol_syslog('User not found, connexion refused');
+		$resultFetchUser = $user->fetch('', $login, '', 1, ($entitytotest > 0 ? $entitytotest : -1)); // value for $login was retrieved previously when checking password.
+		if ($resultFetchUser <= 0 || $user->isNotIntoValidityDateRange()) {
+			dol_syslog('User not found or not valid, connexion refused');
 			session_destroy();
 			session_set_cookie_params(0, '/', null, (empty($dolibarr_main_force_https) ? false : true), true); // Add tag secure and httponly on session cookie
 			session_name($sessionname);
@@ -894,11 +894,17 @@ if (!defined('NOLOGIN')) {
 				$_SESSION["dol_loginmesg"] = $langs->transnoentitiesnoconv("ErrorCantLoadUserFromDolibarrDatabase", $login);
 
 				$user->trigger_mesg = 'ErrorCantLoadUserFromDolibarrDatabase - login='.$login;
-			}
-			if ($resultFetchUser < 0) {
+			} elseif ($resultFetchUser < 0) {
 				$_SESSION["dol_loginmesg"] = $user->error;
 
 				$user->trigger_mesg = $user->error;
+			} else {
+				// Load translation files required by the page
+				$langs->loadLangs(array('main', 'errors'));
+
+				$_SESSION["dol_loginmesg"] = $langs->transnoentitiesnoconv("ErrorLoginDateValidity");
+
+				$user->trigger_mesg = $langs->trans("ErrorLoginDateValidity").' - login='.$login;
 			}
 
 			// Call trigger
@@ -943,13 +949,25 @@ if (!defined('NOLOGIN')) {
 		dol_syslog("- This is an already logged session. _SESSION['dol_login']=".$login." _SESSION['dol_entity']=".$entity, LOG_DEBUG);
 
 		$resultFetchUser = $user->fetch('', $login, '', 1, ($entity > 0 ? $entity : -1));
-		if ($resultFetchUser <= 0 || ($user->flagdelsessionsbefore && !empty($_SESSION["dol_logindate"]) && $user->flagdelsessionsbefore > $_SESSION["dol_logindate"])) {
+
+		//var_dump(dol_print_date($user->flagdelsessionsbefore, 'dayhour', 'gmt')." ".dol_print_date($_SESSION["dol_logindate"], 'dayhour', 'gmt'));
+
+		if ($resultFetchUser <= 0
+			|| ($user->flagdelsessionsbefore && !empty($_SESSION["dol_logindate"]) && $user->flagdelsessionsbefore > $_SESSION["dol_logindate"])
+			|| ($user->status != $user::STATUS_ENABLED)
+			|| ($user->isNotIntoValidityDateRange())) {
 			if ($resultFetchUser <= 0) {
 				// Account has been removed after login
 				dol_syslog("Can't load user even if session logged. _SESSION['dol_login']=".$login, LOG_WARNING);
-			} else {
+			} elseif ($user->flagdelsessionsbefore && !empty($_SESSION["dol_logindate"]) && $user->flagdelsessionsbefore > $_SESSION["dol_logindate"]) {
 				// Session is no more valid
 				dol_syslog("The user has a date for session invalidation = ".$user->flagdelsessionsbefore." and a session date = ".$_SESSION["dol_logindate"].". We must invalidate its sessions.");
+			} elseif ($user->status != $user::STATUS_ENABLED) {
+				// User is not enabled
+				dol_syslog("The user login is disabled");
+			} else {
+				// User validity dates are no more valid
+				dol_syslog("The user login has a validity between [".$user->datestartvalidity." and ".$user->dateendvalidity."], curren date is ".dol_now());
 			}
 			session_destroy();
 			session_set_cookie_params(0, '/', null, (empty($dolibarr_main_force_https) ? false : true), true); // Add tag secure and httponly on session cookie
@@ -2005,11 +2023,11 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 				$logouthtmltext .= $langs->trans("Logout").'<br>';
 
 				$logouttext .= '<a accesskey="l" href="'.DOL_URL_ROOT.'/user/logout.php?token='.newToken().'">';
-				$logouttext .= img_picto($langs->trans('Logout'), 'sign-out', '', false, 0, 0, '', 'atoplogin');
+				$logouttext .= img_picto($langs->trans('Logout'), 'sign-out', '', false, 0, 0, '', 'atoplogin valignmiddle');
 				$logouttext .= '</a>';
 			} else {
 				$logouthtmltext .= $langs->trans("NoLogoutProcessWithAuthMode", $_SESSION["dol_authmode"]);
-				$logouttext .= img_picto($langs->trans('Logout'), 'sign-out', '', false, 0, 0, '', 'atoplogin opacitymedium');
+				$logouttext .= img_picto($langs->trans('Logout'), 'sign-out', '', false, 0, 0, '', 'atoplogin valignmiddle opacitymedium');
 			}
 		}
 
diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php
index 8b9feb7b60a..dea2a1a596e 100644
--- a/htdocs/modulebuilder/template/admin/setup.php
+++ b/htdocs/modulebuilder/template/admin/setup.php
@@ -55,9 +55,6 @@ global $langs, $user;
 // Libraries
 require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
 require_once '../lib/mymodule.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-
-
 //require_once "../class/myclass.class.php";
 
 // Translations
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index c988da72b3f..cbac98b693c 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -81,7 +81,7 @@ class MyObject extends CommonObject
 	 *  	'date', 'datetime', 'timestamp', 'duration',
 	 *  	'boolean', 'checkbox', 'radio', 'array',
 	 *  	'mail', 'phone', 'url', 'password', 'ip'
-	 *		Note: Filter can be a string like "(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.nature:is:NULL)"
+	 *		Note: Filter must be a Dolibarr filter syntax string. Example: "(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.status:!=:0) 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' or 'isModEnabled("multicurrency")' ...)
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 58231ee7de5..8cdbd1f9938 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -118,7 +118,7 @@ $pagenext = $page + 1;
 $object = new MyObject($db);
 $extrafields = new ExtraFields($db);
 $diroutputmassaction = $conf->mymodule->dir_output.'/temp/massgeneration/'.$user->id;
-$hookmanager->initHooks(array('myobjectlist')); // Note that conf->hooks_modules contains array
+$hookmanager->initHooks(array($contextpage)); 	// Note that conf->hooks_modules contains array of activated contexes
 
 // Fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
@@ -155,6 +155,13 @@ foreach ($object->fields as $key => $val) {
 		$fieldstosearchall['t.'.$key] = $val['label'];
 	}
 }
+$parameters = array('fieldstosearchall'=>$fieldstosearchall);
+$reshook = $hookmanager->executeHooks('completeFieldsToSearchAll', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook > 0) {
+	$fieldstosearchall = $hookmanager->resArray['fieldstosearchall'];
+} elseif ($reshook == 0) {
+	$fieldstosearchall = array_merge($fieldstosearchall, $hookmanager->resArray['fieldstosearchall']);
+}
 
 // Definition of array of fields for columns
 $arrayfields = array();
@@ -517,7 +524,7 @@ if ($search_all) {
 		$fieldstosearchall[$key] = $langs->trans($val);
 		$setupstring .= $key."=".$val.";";
 	}
-	print '<!-- Search done like if PRODUCT_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
+	print '<!-- Search done like if MYOBJECT_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>'."\n";
 }
 
@@ -527,7 +534,7 @@ $moreforfilter.= $langs->trans('MyFilter') . ': <input type="text" name="search_
 $moreforfilter.= '</div>';*/
 
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 if (empty($reshook)) {
 	$moreforfilter .= $hookmanager->resPrint;
 } else {
@@ -709,6 +716,9 @@ while ($i < $imaxinloop) {
 				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']++;
+			}
 		}
 		foreach ($object->fields as $key => $val) {
 			$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
@@ -730,7 +740,7 @@ while ($i < $imaxinloop) {
 			//if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
 
 			if (!empty($arrayfields['t.'.$key]['checked'])) {
-				print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '');
+				print '<td'.($cssforfield ? ' class="'.$cssforfield.(preg_match('/tdoverflow/', $cssforfield) ? ' classfortooltip' : '').'"' : '');
 				if (preg_match('/tdoverflow/', $cssforfield)) {
 					print ' title="'.dol_escape_htmltag($object->$key).'"';
 				}
@@ -780,9 +790,9 @@ while ($i < $imaxinloop) {
 				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";
diff --git a/htdocs/partnership/partnership_list.php b/htdocs/partnership/partnership_list.php
index a795d8d33f4..7144f201022 100644
--- a/htdocs/partnership/partnership_list.php
+++ b/htdocs/partnership/partnership_list.php
@@ -664,7 +664,7 @@ if ($search_all) {
 		$fieldstosearchall[$key] = $langs->trans($val);
 		$setupstring .= $key."=".$val.";";
 	}
-	print '<!-- Search done like if PRODUCT_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
+	print '<!-- Search done like if PARTNERSHIP_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>'."\n";
 }
 
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 8a5aecf1513..ba1bc47046f 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -93,7 +93,11 @@ $refalreadyexists = 0;
 
 // Get parameters
 $id  = GETPOST('id', 'int');
-$ref = (GETPOSTISSET('ref') ? GETPOST('ref', 'alpha') : null);
+if (!empty($conf->global->MAIN_SECURITY_ALLOW_UNSECURED_REF_LABELS)) {
+	$ref = (GETPOSTISSET('ref') ? GETPOST('ref', 'nohtml') : null);
+} else {
+	$ref = (GETPOSTISSET('ref') ? GETPOST('ref', 'alpha') : null);
+}
 $type = (GETPOSTISSET('type') ? GETPOST('type', 'int') : Product::TYPE_PRODUCT);
 $action = (GETPOST('action', 'alpha') ? GETPOST('action', 'alpha') : 'view');
 $cancel = GETPOST('cancel', 'alpha');
@@ -113,7 +117,11 @@ $accountancy_code_buy_export = GETPOST('accountancy_code_buy_export', 'alpha');
 $checkmandatory = GETPOST('accountancy_code_buy_export', 'alpha');
 
 // by default 'alphanohtml' (better security); hidden conf MAIN_SECURITY_ALLOW_UNSECURED_LABELS_WITH_HTML allows basic html
-$label_security_check = empty($conf->global->MAIN_SECURITY_ALLOW_UNSECURED_LABELS_WITH_HTML) ? 'alphanohtml' : 'restricthtml';
+if (!empty($conf->global->MAIN_SECURITY_ALLOW_UNSECURED_REF_LABELS)) {
+	$label_security_check = 'nohtml';
+} else {
+	$label_security_check = empty($conf->global->MAIN_SECURITY_ALLOW_UNSECURED_LABELS_WITH_HTML) ? 'alphanohtml' : 'restricthtml';
+}
 
 if (!empty($user->socid)) {
 	$socid = $user->socid;
@@ -1485,7 +1493,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			}
 		}
 
-		if ($type == 1  && $conf->workstation->enabled) {
+		if ($type == 1  && isModEnabled("workstation")) {
 				// Default workstation
 				print '<tr><td>'.$langs->trans("DefaultWorkstation").'</td><td>';
 				print img_picto($langs->trans("DefaultWorkstation"), 'workstation', 'class="pictofixedwidth"');
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index d464871941a..60de90d819d 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -515,7 +515,7 @@ 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'=>2, 'position'=>15),
+		'label'         =>array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>2, 'position'=>15, 'csslist'=>'tdoverflowmax250'),
 		'barcode'       =>array('type'=>'varchar(255)', 'label'=>'Barcode', 'enabled'=>'isModEnabled("barcode")', '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),
@@ -572,7 +572,11 @@ class Product extends CommonObject
 	 */
 	public function check()
 	{
-		$this->ref = dol_sanitizeFileName(stripslashes($this->ref));
+		if (!empty($conf->global->MAIN_SECURITY_ALLOW_UNSECURED_REF_LABELS)) {
+			$this->ref = trim($this->ref);
+		} else {
+			$this->ref = dol_sanitizeFileName(stripslashes($this->ref));
+		}
 
 		$err = 0;
 		if (dol_strlen(trim($this->ref)) == 0) {
@@ -604,7 +608,11 @@ class Product extends CommonObject
 		$error = 0;
 
 		// Clean parameters
-		$this->ref = dol_sanitizeFileName(dol_string_nospecial(trim($this->ref)));
+		if (!empty($conf->global->MAIN_SECURITY_ALLOW_UNSECURED_REF_LABELS)) {
+			$this->ref = trim($this->ref);
+		} else {
+			$this->ref = dol_sanitizeFileName(dol_string_nospecial(trim($this->ref)));
+		}
 		$this->label = trim($this->label);
 		$this->price_ttc = price2num($this->price_ttc);
 		$this->price = price2num($this->price);
@@ -999,7 +1007,11 @@ class Product extends CommonObject
 		}
 
 		// Clean parameters
-		$this->ref = dol_string_nospecial(trim($this->ref));
+		if (!empty($conf->global->MAIN_SECURITY_ALLOW_UNSECURED_REF_LABELS)) {
+			$this->ref = trim($this->ref);
+		} else {
+			$this->ref = dol_string_nospecial(trim($this->ref));
+		}
 		$this->label = trim($this->label);
 		$this->description = trim($this->description);
 		$this->note_private = (isset($this->note_private) ? trim($this->note_private) : null);
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index f9a353b81b0..3b911a4c2c7 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -1456,7 +1456,7 @@ while ($i < $imaxinloop) {
 
 		// Ref
 		if (!empty($arrayfields['p.ref']['checked'])) {
-			print '<td class="tdoverflowmax200">';
+			print '<td class="tdoverflowmax250">';
 			print $product_static->getNomUrl(1);
 			print "</td>\n";
 			if (!$i) {
diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index 10581d19b7c..9946e7a9077 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -133,7 +133,7 @@ $helpurl = 'EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
 
 $form = new Form($db);
 $htmlother = new FormOther($db);
-if ($objp->stock_physique < 0) { print '<span class="warning">'; }
+if (!empty($objp->stock_physique) && $objp->stock_physique < 0) { print '<span class="warning">'; }
 
 $sql = 'SELECT 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 as datem,';
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 3dc116d9931..0d2724ff3bb 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -1304,7 +1304,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
 
 		// Budget
 		print '<tr><td>'.$langs->trans("Budget").'</td><td>';
-		if (strcmp($object->budget_amount, '')) {
+		if (!is_null($object->budget_amount) && strcmp($object->budget_amount, '')) {
 			print '<span class="amount">'.price($object->budget_amount, 0, $langs, 1, 0, 0, $conf->currency).'</span>';
 		}
 		print '</td></tr>';
@@ -1448,9 +1448,11 @@ if ($action == 'create' && $user->rights->projet->creer) {
         </script>';
 	}
 
+
 	/*
 	 * Actions Buttons
 	 */
+
 	print '<div class="tabsAction">';
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
diff --git a/htdocs/projet/class/api_projects.class.php b/htdocs/projet/class/api_projects.class.php
index 8cbb3949cd5..fc10f49d38d 100644
--- a/htdocs/projet/class/api_projects.class.php
+++ b/htdocs/projet/class/api_projects.class.php
@@ -122,6 +122,7 @@ class Projects extends DolibarrApi
 			$sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
 		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet as t";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_extrafields AS ef ON ef.fk_object = t.rowid";	// So we will be able to filter on extrafields
 		if ($category > 0) {
 			$sql .= ", ".MAIN_DB_PREFIX."categorie_project as c";
 		}
diff --git a/htdocs/projet/comment.php b/htdocs/projet/comment.php
index 024dce3abc9..7103916cdb4 100644
--- a/htdocs/projet/comment.php
+++ b/htdocs/projet/comment.php
@@ -136,7 +136,7 @@ print '</td></tr>';
 
 // Budget
 print '<tr><td>'.$langs->trans("Budget").'</td><td>';
-if (strcmp($object->budget_amount, '')) {
+if (!is_null($object->budget_amount) && strcmp($object->budget_amount, '')) {
 	print price($object->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
 }
 print '</td></tr>';
diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php
index f6827fc19b3..2174a02c347 100644
--- a/htdocs/projet/contact.php
+++ b/htdocs/projet/contact.php
@@ -387,7 +387,7 @@ if ($id > 0 || !empty($ref)) {
 
 	// Budget
 	print '<tr><td>'.$langs->trans("Budget").'</td><td>';
-	if (strcmp($object->budget_amount, '')) {
+	if (!is_null($object->budget_amount) && strcmp($object->budget_amount, '')) {
 		print '<span class="amount">'.price($object->budget_amount, '', $langs, 0, 0, 0, $conf->currency).'</span>';
 	}
 	print '</td></tr>';
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 7bad7fd493d..8f548685631 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -291,14 +291,14 @@ if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
 
 	// Opportunity percent
 	print '<tr><td>'.$langs->trans("OpportunityProbability").'</td><td>';
-	if (strcmp($object->opp_percent, '')) {
+	if (!is_null($object->opp_percent) && strcmp($object->opp_percent, '')) {
 		print price($object->opp_percent, '', $langs, 1, 0).' %';
 	}
 	print '</td></tr>';
 
 	// Opportunity Amount
 	print '<tr><td>'.$langs->trans("OpportunityAmount").'</td><td>';
-	if (strcmp($object->opp_amount, '')) {
+	if (!is_null($object->opp_amount) && strcmp($object->opp_amount, '')) {
 		print '<span class="amount">'.price($object->opp_amount, '', $langs, 1, 0, 0, $conf->currency).'</span>';
 		if (strcmp($object->opp_percent, '')) {
 			print ' &nbsp; &nbsp; &nbsp; <span title="'.dol_escape_htmltag($langs->trans('OpportunityWeightedAmount')).'"><span class="opacitymedium">'.$langs->trans("Weighted").'</span>: <span class="amount">'.price($object->opp_amount * $object->opp_percent / 100, 0, $langs, 1, 0, -1, $conf->currency).'</span></span>';
@@ -309,7 +309,7 @@ if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
 
 // Budget
 print '<tr><td>'.$langs->trans("Budget").'</td><td>';
-if (strcmp($object->budget_amount, '')) {
+if (!is_null($object->budget_amount) && strcmp($object->budget_amount, '')) {
 	print '<span class="amount">'.price($object->budget_amount, '', $langs, 1, 0, 0, $conf->currency).'</span>';
 }
 print '</td></tr>';
@@ -657,7 +657,6 @@ if (!empty($conf->global->PROJECT_ELEMENTS_FOR_MINUS_MARGIN)) {
 }
 
 
-
 $parameters = array('listofreferent'=>$listofreferent);
 $resHook = $hookmanager->executeHooks('completeListOfReferent', $parameters, $object, $action);
 
@@ -693,7 +692,7 @@ if (!$showdatefilter) {
 	print '<div class="center centpercent">';
 	print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="POST">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
-	print '<input type="hidden" name="tablename" value="'.$tablename.'">';
+	print '<input type="hidden" name="tablename" value="'.(empty($tablename) ? '' : $tablename).'">';
 	print '<input type="hidden" name="action" value="view">';
 	print '<div class="inline-block">';
 	print $form->selectDate($dates, 'dates', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
@@ -730,7 +729,7 @@ $tooltiponprofitplus = $tooltiponprofitminus = '';
 foreach ($listofreferent as $key => $value) {
 	$name = $langs->trans($value['name']);
 	$qualified = $value['test'];
-	$margin = $value['margin'];
+	$margin = empty($value['margin']) ? 0 : $value['margin'];
 	if ($qualified && isset($margin)) {		// If this element must be included into profit calculation ($margin is 'minus' or 'add')
 		if ($margin == 'add') {
 			$tooltiponprofitplus .= ' &gt; '.$name." (+)<br>\n";
@@ -777,8 +776,8 @@ foreach ($listofreferent as $key => $value) {
 	$tablename = $value['table'];
 	$datefieldname = $value['datefieldname'];
 	$qualified = $value['test'];
-	$margin = $value['margin'];
-	$project_field = $value['project_field'];
+	$margin = empty($value['margin']) ? 0 : $value['margin'];
+	$project_field = empty($value['project_field']) ? '' : $value['project_field'];
 	if ($qualified && isset($margin)) {		// If this element must be included into profit calculation ($margin is 'minus' or 'add')
 		$element = new $classname($db);
 
@@ -990,11 +989,11 @@ foreach ($listofreferent as $key => $value) {
 	$tablename = $value['table'];
 	$datefieldname = $value['datefieldname'];
 	$qualified = $value['test'];
-	$langtoload = $value['lang'];
-	$urlnew = $value['urlnew'];
-	$buttonnew = $value['buttonnew'];
-	$testnew = $value['testnew'];
-	$project_field = $value['project_field'];
+	$langtoload = empty($value['lang']) ? '' : $value['lang'];
+	$urlnew = empty($value['urlnew']) ? '' : $value['urlnew'];
+	$buttonnew = empty($value['buttonnew']) ? '' : $value['buttonnew'];
+	$testnew = empty($value['testnew']) ? '' : $value['testnew'];
+	$project_field = empty($value['project_field']) ? '' : $value['project_field'];
 
 	$exclude_select_element = array('payment_various');
 	if (!empty($value['exclude_select_element'])) {
diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php
index 07ff2bd38c9..47f7cb0a9ef 100644
--- a/htdocs/projet/ganttview.php
+++ b/htdocs/projet/ganttview.php
@@ -181,7 +181,7 @@ if (($id > 0 && is_numeric($id)) || !empty($ref)) {
 
 	// Budget
 	print '<tr><td>'.$langs->trans("Budget").'</td><td>';
-	if (strcmp($object->budget_amount, '')) {
+	if (!is_null($object->budget_amount) && strcmp($object->budget_amount, '')) {
 		print price($object->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
 	}
 	print '</td></tr>';
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 877cd910311..ec10af0f884 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -637,7 +637,7 @@ if ($id > 0 || !empty($ref)) {
 
 	// Budget
 	print '<tr><td>'.$langs->trans("Budget").'</td><td>';
-	if (strcmp($object->budget_amount, '')) {
+	if (!is_null($object->budget_amount) && strcmp($object->budget_amount, '')) {
 		print '<span class="amount">'.price($object->budget_amount, '', $langs, 1, 0, 0, $conf->currency).'</span>';
 	}
 	print '</td></tr>';
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index fccf9d2ffe1..dfa26202a2d 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -632,7 +632,7 @@ if ($id > 0 || !empty($ref)) {
 
 		// Budget
 		print '<tr><td>'.$langs->trans("Budget").'</td><td>';
-		if (strcmp($object->budget_amount, '')) {
+		if (!is_null($object->budget_amount) && strcmp($object->budget_amount, '')) {
 			print '<span class="amount">'.price($object->budget_amount, 0, $langs, 1, 0, 0, $conf->currency).'</span>';
 		}
 		print '</td></tr>';
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 3c8597cd862..df2dd77175f 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -1012,7 +1012,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 
 			// Budget
 			print '<tr><td>'.$langs->trans("Budget").'</td><td>';
-			if (strcmp($projectstatic->budget_amount, '')) {
+			if (!is_null($projectstatic->budget_amount) && strcmp($projectstatic->budget_amount, '')) {
 				print '<span class="amount">'.price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency).'</span>';
 			}
 			print '</td></tr>';
@@ -2669,7 +2669,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 		if (!count($tasks)) {
 			$totalnboffields = 1;
 			foreach ($arrayfields as $value) {
-				if ($value['checked']) {
+				if (!empty($value['checked'])) {
 					$totalnboffields++;
 				}
 			}
diff --git a/htdocs/public/onlinesign/newonlinesign.php b/htdocs/public/onlinesign/newonlinesign.php
index c47bbd7f734..cd793a91bfc 100644
--- a/htdocs/public/onlinesign/newonlinesign.php
+++ b/htdocs/public/onlinesign/newonlinesign.php
@@ -2,6 +2,7 @@
 /* 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) 2023		anthony Berton			<anthony.berton@bb2a.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
@@ -156,6 +157,8 @@ if ($source == 'proposal') {
 	httponly_accessforbidden($langs->trans('ErrorBadParameters')." - Bad value for source", 400, 1);
 }
 
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('onlinesign'));
 
 /*
  * Actions
@@ -346,10 +349,21 @@ if ($source == 'proposal') {
 	print '</td></tr>'."\n";
 
 	// Amount
-	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Amount");
-	print '</td><td class="CTableRow2">';
-	print '<b>'.price($object->total_ttc, 0, $langs, 1, -1, -1, $conf->currency).'</b>';
-	print '</td></tr>'."\n";
+	$amount = '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Amount");
+	$amount .= '</td><td class="CTableRow2">';
+	$amount .= '<b>'.price($object->total_ttc, 0, $langs, 1, -1, -1, $conf->currency).'</b>';
+	$amount .= '</td></tr>'."\n";
+
+	// Call Hook amountPropalSign
+	$parameters = array('source' => $source);
+	$reshook = $hookmanager->executeHooks('amountPropalSign', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	if (empty($reshook)) {
+		$amount .= $hookmanager->resPrint;
+	} elseif ($reshook > 0) {
+		$amount = $hookmanager->resPrint;
+	}
+
+	print $amount;
 
 	// Object
 	$text = '<b>'.$langs->trans("SignatureProposalRef", $object->ref).'</b>';
@@ -457,6 +471,7 @@ if ($source == 'proposal') {
 	$langs->load("fichinter");
 
 	$result = $object->fetch_thirdparty($object->socid);
+
 	// Proposer
 	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Proposer");
 	print '</td><td class="CTableRow2">';
@@ -496,13 +511,14 @@ if ($source == 'proposal') {
 			print $langs->trans("DownloadDocument").'</a>';
 		}
 	}
-
-
 	print '<input type="hidden" name="source" value="'.GETPOST("source", 'alpha').'">';
 	print '<input type="hidden" name="ref" value="'.$object->ref.'">';
 	print '</td></tr>'."\n";
 }
 
+// Call Hook addFormSign
+$parameters = array('source' => $source);
+$reshook = $hookmanager->executeHooks('addFormSign', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 
 if (!$found && !$mesg) {
 	$mesg = $langs->transnoentitiesnoconv("ErrorBadParameters");
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 4f2b91a51e7..7b2251138d3 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -812,6 +812,19 @@ if ($action == 'charge' && isModEnabled('stripe')) {
 	}
 }
 
+// This hook is used to push to $validpaymentmethod by external payment modules (ie Payzen, ...)
+$parameters = array(
+	'paymentmethod' => $paymentmethod,
+	'validpaymentmethod' => &$validpaymentmethod
+);
+$reshook = $hookmanager->executeHooks('doPayment', $parameters, $object, $action);
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+} elseif ($reshook > 0) {
+	print $hookmanager->resPrint;
+}
+
+
 
 /*
  * View
@@ -2022,6 +2035,12 @@ if ($action != 'dopayment') {
 			'object' => $object
 		];
 		$reshook = $hookmanager->executeHooks('doCheckStatus', $parameters, $object, $action);
+		if ($reshook < 0) {
+			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		} elseif ($reshook > 0) {
+			print $hookmanager->resPrint;
+		}
+
 		if ($source == 'order' && $object->billed) {
 			print '<br><br><span class="amountpaymentcomplete size15x">'.$langs->trans("OrderBilled").'</span>';
 		} elseif ($source == 'invoice' && $object->paye) {
@@ -2043,6 +2062,12 @@ if ($action != 'dopayment') {
 				'paymentmethod' => $paymentmethod
 			];
 			$reshook = $hookmanager->executeHooks('doAddButton', $parameters, $object, $action);
+			if ($reshook < 0) {
+				setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+			} elseif ($reshook > 0) {
+				print $hookmanager->resPrint;
+			}
+
 			if ((empty($paymentmethod) || $paymentmethod == 'paybox') && isModEnabled('paybox')) {
 				print '<div class="button buttonpayment" id="div_dopayment_paybox"><span class="fa fa-credit-card"></span> <input class="" type="submit" id="dopayment_paybox" name="dopayment_paybox" value="'.$langs->trans("PayBoxDoPayment").'">';
 				print '<br>';
@@ -2646,9 +2671,13 @@ if (preg_match('/^dopayment/', $action)) {			// If we choosed/click on the payme
 		'dopayment' => GETPOST('dopayment', 'alpha')
 	];
 	$reshook = $hookmanager->executeHooks('doPayment', $parameters, $object, $action);
+	if ($reshook < 0) {
+		setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+	} elseif ($reshook > 0) {
+		print $hookmanager->resPrint;
+	}
 }
 
-
 htmlPrintOnlinePaymentFooter($mysoc, $langs, 1, $suffix, $object);
 
 llxFooter('', 'public');
diff --git a/htdocs/public/ticket/list.php b/htdocs/public/ticket/list.php
index c929c2486bd..aafea0365e0 100644
--- a/htdocs/public/ticket/list.php
+++ b/htdocs/public/ticket/list.php
@@ -229,9 +229,10 @@ if ($action == "view_ticketlist") {
 		$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
 		$filter = array();
+
 		$param = '&action=view_ticketlist';
 		if (!empty($entity) && isModEnabled('multicompany')) {
-			$param .= '&entity='.$entity;
+			$param .= '&entity='.((int) $entity);
 		}
 
 		// Definition of fields for list
@@ -407,7 +408,8 @@ if ($action == "view_ticketlist") {
 			$resql = $db->query($sql);
 			if ($resql) {
 				$num = $db->num_rows($resql);
-				print_barre_liste($langs->trans('TicketList'), $page, '/public/ticket/list.php', $param, $sortfield, $sortorder, '', $num, $num_total, 'ticket');
+
+				print_barre_liste($langs->trans('TicketList'), $page, 'list.php', $param, $sortfield, $sortorder, '', $num, $num_total, 'ticket');
 
 				// Search bar
 				print '<form method="POST" action="'.$_SERVER['PHP_SELF'].(!empty($entity) && isModEnabled('multicompany')?'?entity='.$entity:'').'" id="searchFormList" >'."\n";
diff --git a/htdocs/public/users/view.php b/htdocs/public/users/view.php
index d63a2a66eee..b0b4b3ae32f 100644
--- a/htdocs/public/users/view.php
+++ b/htdocs/public/users/view.php
@@ -229,6 +229,12 @@ if ($object->job && !getDolUserInt('USER_PUBLIC_HIDE_JOBPOSITION', 0, $object))
 	print dol_escape_htmltag($object->job);
 	print '</div>';
 }
+if (!getDolUserInt('USER_PUBLIC_HIDE_COMPANY', 0, $object)) {
+	print '<div class="bold">';
+	print dol_escape_htmltag($mysoc->name);
+	print '</div>';
+}
+
 
 
 print '</div>';
@@ -240,7 +246,7 @@ print '</div>';
 
 if (!empty($conf->global->USER_IMAGE_PUBLIC_INTERFACE)) {
 	print '<div class="backimagepublicrecruitment">';
-	print '<img id="idUSER_IMAGE_PUBLIC_SUGGEST_BOOTH" src="'.$conf->global->USER_IMAGE_PUBLIC_INTERFACE.'">';
+	print '<img id="idUSER_IMAGE_PUBLIC_INTERFACE" src="'.$conf->global->USER_IMAGE_PUBLIC_INTERFACE.'">';
 	print '</div>';
 }
 
@@ -292,19 +298,19 @@ if ($object->office_phone && !getDolUserInt('USER_PUBLIC_HIDE_OFFICE_PHONE', 0,
 	$usersection .= '<div class="flexitemsmall">';
 	$usersection .= img_picto('', 'phone', 'class="pictofixedwidth"');
 	$usersection .= dol_print_phone($object->office_phone, $object->country_code, 0, $mysoc->id, 'tel', ' ', 0, '');
-	$usersection .= '<div>';
+	$usersection .= '</div>';
 }
 if ($object->office_fax && !getDolUserInt('USER_PUBLIC_HIDE_OFFICE_FAX', 0, $object)) {
 	$usersection .= '<div class="flexitemsmall">';
 	$usersection .= img_picto('', 'phoning_fax', 'class="pictofixedwidth"');
 	$usersection .= dol_print_phone($object->office_fax, $object->country_code, 0, $mysoc->id, 'fax', ' ', 0, '');
-	$usersection .= '<div>';
+	$usersection .= '</div>';
 }
 if ($object->user_mobile && !getDolUserInt('USER_PUBLIC_HIDE_USER_MOBILE', 0, $object)) {
 	$usersection .= '<div class="flexitemsmall">';
 	$usersection .= img_picto('', 'phone', 'class="pictofixedwidth"');
 	$usersection .= dol_print_phone($object->user_mobile, $object->country_code, 0, $mysoc->id, 'tel', ' ', 0, '');
-	$usersection .= '<div>';
+	$usersection .= '</div>';
 }
 
 // Social networks
@@ -324,7 +330,7 @@ if ($usersection) {
 	// Output payment summary form
 	print '<tr><td class="left">';
 
-	print '<div class="nowidthimp" id="tablepublicpayment">';
+	print '<div class="nowidthimp nopaddingtoponsmartphone" id="tablepublicpayment">';
 
 	print $usersection;
 
@@ -344,7 +350,7 @@ if (!getDolUserInt('USER_PUBLIC_HIDE_COMPANY', 0, $object)) {
 		$companysection .= '<div class="flexitemsmall">';
 		$companysection .= img_picto('', 'email', 'class="pictofixedwidth"');
 		$companysection .= dol_print_email($mysoc->email, 0, 0, 1);
-		$companysection .= '<div>';
+		$companysection .= '</div>';
 	}
 
 	if ($mysoc->url) {
@@ -358,13 +364,13 @@ if (!getDolUserInt('USER_PUBLIC_HIDE_COMPANY', 0, $object)) {
 		$companysection .= '<div class="flexitemsmall">';
 		$companysection .= img_picto('', 'phone', 'class="pictofixedwidth"');
 		$companysection .= dol_print_phone($mysoc->phone, $mysoc->country_code, 0, $mysoc->id, 'tel', ' ', 0, '');
-		$companysection .= '<div>';
+		$companysection .= '</div>';
 	}
 	if ($mysoc->fax) {
 		$companysection .= '<div class="flexitemsmall">';
 		$companysection .= img_picto('', 'phoning_fax', 'class="pictofixedwidth"');
 		$companysection .= dol_print_phone($mysoc->fax, $mysoc->country_code, 0, $mysoc->id, 'fax', ' ', 0, '');
-		$companysection .= '<div>';
+		$companysection .= '</div>';
 	}
 
 	// Social networks
@@ -414,12 +420,12 @@ if (!getDolUserInt('USER_PUBLIC_HIDE_COMPANY', 0, $object)) {
 	// Output payment summary form
 	print '<tr><td class="left">';
 
-	print '<div class="nowidthimp" id="tablepublicpayment">';
+	print '<div class="nowidthimp nopaddingtoponsmartphone" id="tablepublicpayment">';
 
 	// Add company info
 	if ($mysoc->name) {
 		print '<div class="center bold">';
-		print $mysoc->name;
+		print dol_escape_htmltag($mysoc->name);
 		print '</div>';
 		print '<br>';
 	}
diff --git a/htdocs/reception/contact.php b/htdocs/reception/contact.php
index 02cbc9af957..97d6d19a4f9 100644
--- a/htdocs/reception/contact.php
+++ b/htdocs/reception/contact.php
@@ -72,7 +72,7 @@ if ($origin == 'reception') {
 } else {
 	if ($origin == 'supplierorder' || $origin == 'order_supplier') {
 		$result = restrictedArea($user, 'fournisseur', $origin_id, 'commande_fournisseur', 'commande');
-	} elseif (empty($user->rights->{$origin}->lire) && empty($user->rights->{$origin}->read)) {
+	} elseif (!$user->hasRight($origin, "lire") && !$user->hasRight($origin, "read")) {
 		accessforbidden();
 	}
 }
diff --git a/htdocs/recruitment/recruitmentcandidature_list.php b/htdocs/recruitment/recruitmentcandidature_list.php
index aff8c86a955..95b6ac6203d 100644
--- a/htdocs/recruitment/recruitmentcandidature_list.php
+++ b/htdocs/recruitment/recruitmentcandidature_list.php
@@ -571,7 +571,7 @@ if ($search_all) {
 		$fieldstosearchall[$key] = $langs->trans($val);
 		$setupstring .= $key."=".$val.";";
 	}
-	print '<!-- Search done like if PRODUCT_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
+	print '<!-- Search done like if RECRUITMENT_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>'."\n";
 }
 
diff --git a/htdocs/salaries/payments.php b/htdocs/salaries/payments.php
index 5a5ccb08bf6..7bf61f3021f 100644
--- a/htdocs/salaries/payments.php
+++ b/htdocs/salaries/payments.php
@@ -97,6 +97,7 @@ $search_chq_number = GETPOST('search_chq_number', 'int');
 
 $filtre = GETPOST("filtre", 'restricthtml');
 
+$search_type_id = '';
 if (!GETPOST('search_type_id', 'int')) {
 	$newfiltre = str_replace('filtre=', '', $filtre);
 	$filterarray = explode('-', $newfiltre);
@@ -532,6 +533,7 @@ if (isset($extrafields->attributes[$object->table_element]['computed']) && is_ar
 $i = 0;
 $total = 0;
 $totalarray = array();
+$totalarray['nbfield'] = 0;
 while ($i < ($limit ? min($num, $limit) : $num)) {
 	$obj = $db->fetch_object($resql);
 	if (empty($obj)) {
@@ -697,7 +699,12 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 		if (!$i) {
 			$totalarray['pos'][$totalarray['nbfield']] = 'totalttcfield';
 		}
-		$totalarray['val']['totalttcfield'] += $obj->amount;
+		if (!$i) {
+			$totalarray['val']['totalttcfield'] = $obj->amount;
+		} else {
+			$totalarray['val']['totalttcfield'] += $obj->amount;
+		}
+
 
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index 10266b6f0ac..9921167d00c 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -1826,16 +1826,6 @@ class Thirdparties extends DolibarrApi
 
 		unset($object->fk_delivery_address); // deprecated feature
 
-		unset($object->skype);
-		unset($object->twitter);
-		unset($object->facebook);
-		unset($object->linkedin);
-		unset($object->instagram);
-		unset($object->snapchat);
-		unset($object->googleplus);
-		unset($object->youtube);
-		unset($object->whatsapp);
-
 		return $object;
 	}
 
diff --git a/htdocs/societe/class/companypaymentmode.class.php b/htdocs/societe/class/companypaymentmode.class.php
index eb77a928f14..1e221695a11 100644
--- a/htdocs/societe/class/companypaymentmode.class.php
+++ b/htdocs/societe/class/companypaymentmode.class.php
@@ -122,7 +122,7 @@ class CompanyPaymentMode extends CommonObject
 		'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'position'=>20),
 		'tms' =>array('type'=>'timestamp', 'label'=>'Tms', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>25),
 		'import_key' =>array('type'=>'varchar(14)', 'label'=>'Import key', 'enabled'=>1, 'visible'=>-2, 'position'=>105),
-	//'aaa' =>array('type'=>'date', 'label'=>'Ending date', 'enabled'=>0, 'visible'=>-2, 'position'=>185),
+		//'aaa' =>array('type'=>'date', 'label'=>'Ending date', 'enabled'=>0, 'visible'=>-2, 'position'=>185),
 	);
 
 	/**
@@ -146,6 +146,18 @@ class CompanyPaymentMode extends CommonObject
 	public $number;
 	public $cle_rib;
 	public $bic;
+
+	/**
+	 * @var string iban
+	 * @deprecated
+	 * @see iban_prefix
+	 */
+	public $iban;
+
+	/**
+	 * iban_prefix
+	 * @var string
+	 */
 	public $iban_prefix;
 	public $domiciliation;
 	public $proprio;
@@ -255,8 +267,7 @@ class CompanyPaymentMode extends CommonObject
 
 		// Clear fields
 		$object->ref = "copy_of_".$object->ref;
-		$object->title = $langs->trans("CopyOf")." ".$object->title;
-		// ...
+		// $object->title = $langs->trans("CopyOf")." ".$object->title;
 
 		// Create clone
 		$object->context['createfromclone'] = 'createfromclone';
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index e0309535ab7..fa6d77ad485 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -15,7 +15,7 @@
  * Copyright (C) 2017       Rui Strecht			    <rui.strecht@aliartalentos.com>
  * Copyright (C) 2018	    Philippe Grand	        <philippe.grand@atoo-net.com>
  * Copyright (C) 2019-2020  Josep Lluís Amador      <joseplluis@lliuretic.cat>
- * Copyright (C) 2019-2022  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2023  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2020       Open-Dsi         		<support@open-dsi.fr>
  * Copyright (C) 2022		ButterflyOfFire         <butterflyoffire+dolibarr@protonmail.com>
  *
@@ -130,6 +130,22 @@ class Societe extends CommonObject
 	 */
 	public $restrictiononfksoc = 1;
 
+	/**
+	 * @var Societe To store a cloned copy of object before to edit it and keep track of old properties
+	 */
+	public $oldcopy;
+
+	/**
+	 * array of supplier categories
+	 * @var array
+	 */
+	public $SupplierCategories = array();
+
+	/**
+	 * prefixCustomerIsRequired
+	 * @var int
+	 */
+	public $prefixCustomerIsRequired;
 
 	/**
 	 *  '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')
@@ -353,6 +369,7 @@ class Societe extends CommonObject
 	 * @var string
 	 */
 	public $fax;
+
 	/**
 	 * Email
 	 * @var string
@@ -360,9 +377,10 @@ class Societe extends CommonObject
 	public $email;
 
 	/**
-	 * @var array array of socialnetworks
+	 * No Email
+	 * @var int		Set if company email found into unsubscribe of emailing list table
 	 */
-	public $socialnetworks;
+	public $no_email;
 
 	/**
 	 * Skype username
@@ -464,6 +482,12 @@ class Societe extends CommonObject
 	 */
 	public $idprof6;
 
+	/**
+	 * Social object of the company
+	 * @var string
+	 */
+	public $socialobject;
+
 	/**
 	 * @var string Prefix comm
 	 */
@@ -786,11 +810,6 @@ class Societe extends CommonObject
 	 */
 	public $multicurrency_code;
 
-	/**
-	 * @var string  Set if company email found into unsubscribe of emailing list table
-	 */
-	public $no_email;
-
 	// Fields loaded by fetchPartnerships()
 
 	public $partnerships = array();
@@ -4263,14 +4282,15 @@ class Societe extends CommonObject
 		global $langs;
 
 		$this->id = 0;
-		$this->name = empty($conf->global->MAIN_INFO_SOCIETE_NOM) ? '' : $conf->global->MAIN_INFO_SOCIETE_NOM;
-		$this->address = empty($conf->global->MAIN_INFO_SOCIETE_ADDRESS) ? '' : $conf->global->MAIN_INFO_SOCIETE_ADDRESS;
-		$this->zip = empty($conf->global->MAIN_INFO_SOCIETE_ZIP) ? '' : $conf->global->MAIN_INFO_SOCIETE_ZIP;
-		$this->town = empty($conf->global->MAIN_INFO_SOCIETE_TOWN) ? '' : $conf->global->MAIN_INFO_SOCIETE_TOWN;
-		$this->region_code = empty($conf->global->MAIN_INFO_SOCIETE_REGION) ? '' : $conf->global->MAIN_INFO_SOCIETE_REGION;
-		$this->object = empty($conf->global->MAIN_INFO_SOCIETE_OBJECT) ? '' : $conf->global->MAIN_INFO_SOCIETE_OBJECT;
+		$this->name = getDolGlobalString('MAIN_INFO_SOCIETE_NOM');
+		$this->address = getDolGlobalString('MAIN_INFO_SOCIETE_ADDRESS');
+		$this->zip = getDolGlobalString('MAIN_INFO_SOCIETE_ZIP');
+		$this->town = getDolGlobalString('MAIN_INFO_SOCIETE_TOWN');
+		$this->region_code = getDolGlobalString('MAIN_INFO_SOCIETE_REGION');
 
-		$this->note_private = empty($conf->global->MAIN_INFO_SOCIETE_NOTE) ? '' : $conf->global->MAIN_INFO_SOCIETE_NOTE;
+		$this->socialobject = getDolGlobalString('MAIN_INFO_SOCIETE_OBJECT');
+
+		$this->note_private = getDolGlobalString('MAIN_INFO_SOCIETE_NOTE');
 
 		$this->nom = $this->name; // deprecated
 
@@ -4282,8 +4302,8 @@ class Societe extends CommonObject
 			if (!empty($tmp[1])) {   // If $conf->global->MAIN_INFO_SOCIETE_COUNTRY is "id:code:label"
 				$country_code = $tmp[1];
 				$country_label = $tmp[2];
-			} else // For backward compatibility
-			{
+			} else {
+				// For backward compatibility
 				dol_syslog("Your country setup use an old syntax. Reedit it using setup area.", LOG_WARNING);
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 				$country_code = getCountry($country_id, 2, $this->db); // This need a SQL request, but it's the old feature that should not be used anymore
@@ -4320,56 +4340,56 @@ class Societe extends CommonObject
 			$this->state = ($langs->trans('State'.$state_code) != 'State'.$state_code) ? $langs->trans('State'.$state_code) : $state_label;
 		}
 
-		$this->phone = empty($conf->global->MAIN_INFO_SOCIETE_TEL) ? '' : $conf->global->MAIN_INFO_SOCIETE_TEL;
-		$this->fax = empty($conf->global->MAIN_INFO_SOCIETE_FAX) ? '' : $conf->global->MAIN_INFO_SOCIETE_FAX;
-		$this->url = empty($conf->global->MAIN_INFO_SOCIETE_WEB) ? '' : $conf->global->MAIN_INFO_SOCIETE_WEB;
+		$this->phone = getDolGlobalString('MAIN_INFO_SOCIETE_TEL');
+		$this->fax = getDolGlobalString('MAIN_INFO_SOCIETE_FAX');
+		$this->url = getDolGlobalString('MAIN_INFO_SOCIETE_WEB');
 
 		// Social networks
-		$this->facebook_url = empty($conf->global->MAIN_INFO_SOCIETE_FACEBOOK_URL) ? '' : $conf->global->MAIN_INFO_SOCIETE_FACEBOOK_URL;
-		$this->twitter_url = empty($conf->global->MAIN_INFO_SOCIETE_TWITTER_URL) ? '' : $conf->global->MAIN_INFO_SOCIETE_TWITTER_URL;
-		$this->linkedin_url = empty($conf->global->MAIN_INFO_SOCIETE_LINKEDIN_URL) ? '' : $conf->global->MAIN_INFO_SOCIETE_LINKEDIN_URL;
-		$this->instagram_url = empty($conf->global->MAIN_INFO_SOCIETE_INSTAGRAM_URL) ? '' : $conf->global->MAIN_INFO_SOCIETE_INSTAGRAM_URL;
-		$this->youtube_url = empty($conf->global->MAIN_INFO_SOCIETE_YOUTUBE_URL) ? '' : $conf->global->MAIN_INFO_SOCIETE_YOUTUBE_URL;
-		$this->github_url = empty($conf->global->MAIN_INFO_SOCIETE_GITHUB_URL) ? '' : $conf->global->MAIN_INFO_SOCIETE_GITHUB_URL;
+		$facebook_url = getDolGlobalString('MAIN_INFO_SOCIETE_FACEBOOK_URL');
+		$twitter_url = getDolGlobalString('MAIN_INFO_SOCIETE_TWITTER_URL');
+		$linkedin_url = getDolGlobalString('MAIN_INFO_SOCIETE_LINKEDIN_URL');
+		$instagram_url = getDolGlobalString('MAIN_INFO_SOCIETE_INSTAGRAM_URL');
+		$youtube_url = getDolGlobalString('MAIN_INFO_SOCIETE_YOUTUBE_URL');
+		$github_url = getDolGlobalString('MAIN_INFO_SOCIETE_GITHUB_URL');
 		$this->socialnetworks = array();
-		if (!empty($this->facebook_url)) {
-			$this->socialnetworks['facebook'] = $this->facebook_url;
+		if (!empty($facebook_url)) {
+			$this->socialnetworks['facebook'] = $facebook_url;
 		}
-		if (!empty($this->twitter_url)) {
-			$this->socialnetworks['twitter'] = $this->twitter_url;
+		if (!empty($twitter_url)) {
+			$this->socialnetworks['twitter'] = $twitter_url;
 		}
-		if (!empty($this->linkedin_url)) {
-			$this->socialnetworks['linkedin'] = $this->linkedin_url;
+		if (!empty($linkedin_url)) {
+			$this->socialnetworks['linkedin'] = $linkedin_url;
 		}
-		if (!empty($this->instagram_url)) {
-			$this->socialnetworks['instagram'] = $this->instagram_url;
+		if (!empty($instagram_url)) {
+			$this->socialnetworks['instagram'] = $instagram_url;
 		}
-		if (!empty($this->youtube_url)) {
-			$this->socialnetworks['youtube'] = $this->youtube_url;
+		if (!empty($youtube_url)) {
+			$this->socialnetworks['youtube'] = $youtube_url;
 		}
-		if (!empty($this->github_url)) {
-			$this->socialnetworks['github'] = $this->github_url;
+		if (!empty($github_url)) {
+			$this->socialnetworks['github'] = $github_url;
 		}
 
 		// Id prof generiques
-		$this->idprof1 = empty($conf->global->MAIN_INFO_SIREN) ? '' : $conf->global->MAIN_INFO_SIREN;
-		$this->idprof2 = empty($conf->global->MAIN_INFO_SIRET) ? '' : $conf->global->MAIN_INFO_SIRET;
-		$this->idprof3 = empty($conf->global->MAIN_INFO_APE) ? '' : $conf->global->MAIN_INFO_APE;
-		$this->idprof4 = empty($conf->global->MAIN_INFO_RCS) ? '' : $conf->global->MAIN_INFO_RCS;
-		$this->idprof5 = empty($conf->global->MAIN_INFO_PROFID5) ? '' : $conf->global->MAIN_INFO_PROFID5;
-		$this->idprof6 = empty($conf->global->MAIN_INFO_PROFID6) ? '' : $conf->global->MAIN_INFO_PROFID6;
-		$this->tva_intra = empty($conf->global->MAIN_INFO_TVAINTRA) ? '' : $conf->global->MAIN_INFO_TVAINTRA; // VAT number, not necessarly INTRA.
-		$this->managers = empty($conf->global->MAIN_INFO_SOCIETE_MANAGERS) ? '' : $conf->global->MAIN_INFO_SOCIETE_MANAGERS;
-		$this->capital = empty($conf->global->MAIN_INFO_CAPITAL) ? '' : $conf->global->MAIN_INFO_CAPITAL;
-		$this->forme_juridique_code = empty($conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE) ? '' : $conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE;
-		$this->email = empty($conf->global->MAIN_INFO_SOCIETE_MAIL) ? '' : $conf->global->MAIN_INFO_SOCIETE_MAIL;
-		$this->default_lang = (empty($conf->global->MAIN_LANG_DEFAULT) ? 'auto' : $conf->global->MAIN_LANG_DEFAULT);
-		$this->logo = empty($conf->global->MAIN_INFO_SOCIETE_LOGO) ? '' : $conf->global->MAIN_INFO_SOCIETE_LOGO;
-		$this->logo_small = empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SMALL) ? '' : $conf->global->MAIN_INFO_SOCIETE_LOGO_SMALL;
-		$this->logo_mini = empty($conf->global->MAIN_INFO_SOCIETE_LOGO_MINI) ? '' : $conf->global->MAIN_INFO_SOCIETE_LOGO_MINI;
-		$this->logo_squarred = empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED) ? '' : $conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED;
-		$this->logo_squarred_small = empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_SMALL) ? '' : $conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_SMALL;
-		$this->logo_squarred_mini = empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI) ? '' : $conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI;
+		$this->idprof1 = getDolGlobalString('MAIN_INFO_SIREN');
+		$this->idprof2 = getDolGlobalString('MAIN_INFO_SIRET');
+		$this->idprof3 = getDolGlobalString('MAIN_INFO_APE');
+		$this->idprof4 = getDolGlobalString('MAIN_INFO_RCS');
+		$this->idprof5 = getDolGlobalString('MAIN_INFO_PROFID5');
+		$this->idprof6 = getDolGlobalString('MAIN_INFO_PROFID6');
+		$this->tva_intra = getDolGlobalString('MAIN_INFO_TVAINTRA'); // VAT number, not necessarly INTRA.
+		$this->managers = getDolGlobalString('MAIN_INFO_SOCIETE_MANAGERS');
+		$this->capital = getDolGlobalString('MAIN_INFO_CAPITAL');
+		$this->forme_juridique_code = getDolGlobalString('MAIN_INFO_SOCIETE_FORME_JURIDIQUE');
+		$this->email = getDolGlobalString('MAIN_INFO_SOCIETE_MAIL');
+		$this->default_lang = getDolGlobalString('MAIN_LANG_DEFAULT', 'auto');
+		$this->logo =getDolGlobalString('MAIN_INFO_SOCIETE_LOGO');
+		$this->logo_small = getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_SMALL');
+		$this->logo_mini = getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_MINI');
+		$this->logo_squarred = getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_SQUARRED');
+		$this->logo_squarred_small = getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_SQUARRED_SMALL');
+		$this->logo_squarred_mini = getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI');
 
 		// Define if company use vat or not
 		$this->tva_assuj = $conf->global->FACTURE_TVAOPTION;
diff --git a/htdocs/societe/class/societeaccount.class.php b/htdocs/societe/class/societeaccount.class.php
index 79f5aedbe68..411b11a4cd9 100644
--- a/htdocs/societe/class/societeaccount.class.php
+++ b/htdocs/societe/class/societeaccount.class.php
@@ -216,8 +216,7 @@ class SocieteAccount extends CommonObject
 
 		// Clear fields
 		$object->ref = "copy_of_".$object->ref;
-		$object->title = $langs->trans("CopyOf")." ".$object->title;
-		// ...
+		// $object->title = $langs->trans("CopyOf")." ".$object->title;
 
 		// Create clone
 		$object->context['createfromclone'] = 'createfromclone';
diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index 6a6ad66a96a..bc98a085d08 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -1013,8 +1013,8 @@ class Stripe extends CommonObject
 
 						$s = new \Stripe\StripeClient($stripeacc);
 
-						// TODO Deprecated with the new Stripe API and SCA.
-						// TODO Replace ->create() and ->createSource() and replace with ->getSetupIntent() to get a Payment mode with $payment_method = \Stripe\PaymentMethod::retrieve($setupintent->payment_method); ?
+						// TODO LMR Deprecated with the new Stripe API and SCA.
+						// TODO LMR Replace ->create() and ->createSource() and replace with ->getSetupIntent() to then, get the Payment mode with $payment_method = \Stripe\PaymentMethod::retrieve($setupintent->payment_method); ?
 						$sepa = $s->sources->create($dataforcard);
 						if (!$sepa) {
 							$this->error = 'Creation of sepa_debit on Stripe has failed';
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index a8a79e8bb34..027305965ed 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -156,6 +156,7 @@ th.liste_titre a div div:hover, th.liste_titre_sel a div div:hover { text-decora
 tr.liste_titre th.liste_titre_sel:not(.maxwidthsearch), tr.liste_titre td.liste_titre_sel:not(.maxwidthsearch),
 tr.liste_titre th.liste_titre:not(.maxwidthsearch), tr.liste_titre td.liste_titre:not(.maxwidthsearch) { opacity: 0.8; }
 /* th.liste_titre_sel a, th.liste_titre a, td.liste_titre_sel a, td.liste_titre a { color: #766; } */
+tr.liste_titre_filter th.liste_titre { text-align: unset; }
 
 input {
 	font-size: unset;
@@ -1770,6 +1771,13 @@ select.widthcentpercentminusxx, span.widthcentpercentminusxx:not(.select2-select
 	.smallonsmartphone {
 		font-size: 0.8em;
 	}
+
+	.nopaddingtoponsmartphone {
+		padding-top: 0 !important;
+	}
+	.nopaddingbottomonsmartphone {
+		padding-bottom: 0 !important;
+	}
 }
 
 /* Force values for small screen 570 */
@@ -3803,7 +3811,7 @@ td.border, div.tagtable div div.border {
 }
 
 
-.fichehalfright table.noborder {
+.fichehalfright table.noborder , .fichehalfleft table.noborder{
 	margin: 0px 0px 0px 0px;
 }
 table.liste, table.noborder:not(.paymenttable):not(.margintable):not(.tableforcontact), table.formdoc, div.noborder:not(.paymenttable):not(.margintable):not(.tableforcontact) {
@@ -3832,12 +3840,12 @@ table.liste, table.noborder, table.formdoc, div.noborder {
 	box-shadow: 1px 1px 5px #ddd;
 	*/
 }
-#tablelines {
+#tablelines, #tablelinesservice {
 	border-bottom-width: 1px;
 	border-bottom-color: var(--colortopbordertitle1);
 	border-bottom-style: solid;
 }
-table.liste tr:last-of-type td, table.noborder:not(#tablelines) tr:last-of-type td, table.formdoc tr:last-of-type td, div.noborder tr:last-of-type td {
+table.liste tr:last-of-type td, table.noborder:not(#tablelines):not(#tablelinesservice) tr:last-of-type td, table.formdoc tr:last-of-type td, div.noborder tr:last-of-type td {
 	border-bottom-width: 1px;
 	border-bottom-color: var(--colortopbordertitle1);
 	border-bottom-style: solid;
@@ -4390,10 +4398,10 @@ div.tabBar .noborder {
 	box-shadow: 0px 0px 0px #DDD !important;
 }
 
-#tablelines tr.liste_titre td, .paymenttable tr.liste_titre td, .margintable tr.liste_titre td, .tableforservicepart1 tr.liste_titre td {
+#tablelines tr.liste_titre td, #tablelinesservice tr.liste_titre td, .paymenttable tr.liste_titre td, .margintable tr.liste_titre td, .tableforservicepart1 tr.liste_titre td {
 	border-bottom: 1px solid var(--colortopbordertitle1) !important;
 }
-#tablelines tr td {
+#tablelines tr td, #tablelinesservice tr td {
 	height: unset;
 }
 
diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php
index dd6c21368db..cbd4cae931c 100644
--- a/htdocs/theme/eldy/info-box.inc.php
+++ b/htdocs/theme/eldy/info-box.inc.php
@@ -516,12 +516,9 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) {
 	min-width: 350px;
 	max-width: 350px;
 }
-
-/**for make a checkbox in the right of the box in mode kanban */
 .fright {
 	float:right;
 }
-
 @media only screen and (max-width: 1740px) {
 	.info-box-module {
 		min-width: 315px;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 0fde8b72044..2493afa058b 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1981,6 +1981,13 @@ select.widthcentpercentminusxx, span.widthcentpercentminusxx:not(.select2-select
 	.smallonsmartphone {
 		font-size: 0.8em;
 	}
+	
+	.nopaddingtoponsmartphone {
+		padding-top: 0 !important;
+	}
+	.nopaddingbottomonsmartphone {
+		padding-bottom: 0 !important;
+	}	
 }
 
 /* Force values for small screen 570 */
@@ -3129,11 +3136,11 @@ div.login_block {
 	<?php } ?>
 }
 div.login_block a {
-	color: var(--colortextbackhmenu);
+	color: var(--colortexthmenu);
 	display: inline-block;
 }
 div.login_block span.aversion {
-	color: var(--colortextbackhmenu);
+	color: var(--colortexthmenu);
 	filter: contrast(0.7);
 }
 div.login_block table {
@@ -3145,10 +3152,10 @@ div.login {
 	float: right;
 }
 div.login a {
-	color: var(--colortextbackvmenu);
+	color: var(--colortextvmenu);
 }
 div.login a:hover {
-	color: var(--colortextbackvmenu);
+	color: var(--colortextvmenu);
 	text-decoration:underline;
 }
 div.login_block_user, div.login_block_other { clear: both; }
@@ -3170,10 +3177,14 @@ div.login_block_other { padding-top: 15px; }
 	max-width: 200px;
 }
 
+.login_block_other .login_block_elem {
+	height: 25px;
+	line-height: 25px;
+}
 .login_block_elem {
 	float: right;
-	vertical-align: top;
-	padding: 0px 0px 0px 2px !important;
+	vertical-align: middle;
+	padding: 0px 3px 0px 3px !important;
 	height: 18px;
 }
 .login_block_elem_name {
@@ -3188,7 +3199,7 @@ a.aversion {
 }
 
 .atoplogin, .atoplogin:hover {
-	color: var(--colortextbackhmenu) !important;
+	color: var(--colortexthmenu) !important;
 }
 .alogin, .alogin:hover {
 	color: #888 !important;
@@ -4408,6 +4419,7 @@ tr.liste_titre:last-child th.liste_titre, tr.liste_titre:last-child th.liste_tit
 	/* border-bottom: 1px solid var(--colortopbordertitle1); */
 	border-bottom: none;
 }
+tr.liste_titre_filter th.liste_titre { text-align: unset; }
 
 div.liste_titre {
 	padding-left: 3px;
@@ -4491,10 +4503,10 @@ div .tdtop:not(.tagtdnote) {
 	padding-bottom: 0px !important;
 }
 
-#tablelines tr.liste_titre td, .paymenttable tr.liste_titre td, .margintable tr.liste_titre td, .tableforservicepart1 tr.liste_titre td {
+#tablelines tr.liste_titre td, #tablelinesservice tr.liste_titre td, .paymenttable tr.liste_titre td, .margintable tr.liste_titre td, .tableforservicepart1 tr.liste_titre td {
 	border-bottom: 1px solid #AAA !important;
 }
-#tablelines tr td {
+#tablelines tr td, #tablelinesservice tr td {
 	height: unset;
 }
 
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index e0f880264f9..be035f7ea46 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -294,7 +294,7 @@ class Ticket extends CommonObject
 		'email_msgid' => array('type'=>'varchar(255)', 'label'=>'EmailMsgID', 'visible'=>-2, 'enabled'=>1, 'position'=>540, 'notnull'=>-1, 'help'=>'EmailMsgIDDesc', 'csslist'=>'tdoverflowmax100'),
 		'email_date' => array('type'=>'datetime', 'label'=>'EmailDate', 'visible'=>-2, 'enabled'=>1, 'position'=>541),
 		'progress' => array('type'=>'integer', 'label'=>'Progression', 'visible'=>-1, 'enabled'=>1, 'position'=>540, 'notnull'=>-1, 'css'=>'right', 'help'=>"", 'isameasure'=>2, 'csslist'=>'width50'),
-		'resolution' => array('type'=>'integer', 'label'=>'Resolution', 'visible'=>-1, 'enabled'=>'$conf->global->TICKET_ENABLE_RESOLUTION', 'position'=>550, 'notnull'=>1),
+		'resolution' => array('type'=>'integer', 'label'=>'Resolution', 'visible'=>-1, 'enabled'=>'getDolGlobalString("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),
 	);
diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index 1d2cefaf622..f3e2c82d703 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -782,7 +782,7 @@ if ($search_all) {
 		$fieldstosearchall[$key] = $langs->trans($val);
 		$setupstring .= $key."=".$val.";";
 	}
-	print '<!-- Search done like if PRODUCT_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
+	print '<!-- Search done like if TICKET_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>'."\n";
 }
 
diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php
index 9cc825082d7..4c26ec27021 100644
--- a/htdocs/user/bank.php
+++ b/htdocs/user/bank.php
@@ -83,6 +83,8 @@ if (empty($account->userid)) {
 $canadduser = (!empty($user->admin) || $user->rights->user->user->creer || $user->rights->hrm->write_personal_information->write);
 $canreaduser = (!empty($user->admin) || $user->rights->user->user->lire || $user->rights->hrm->read_personal_information->read);
 $permissiontoaddbankaccount = (!empty($user->rights->salaries->write) || !empty($user->rights->hrm->employee->write) || !empty($user->rights->user->creer));
+$permissiontoreadhr = $user->hasRight('hrm', 'read_personal_information', 'read') || $user->hasRight('hrm', 'write_personal_information', 'write');
+$permissiontowritehr = $user->hasRight('hrm', 'write_personal_information', 'write');
 
 // Ok if user->rights->salaries->read or user->rights->hrm->read
 //$result = restrictedArea($user, 'salaries|hrm', $object->id, 'user&user', $feature2);
@@ -551,23 +553,23 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 	}
 
 	// Employee Number
-	if ($user->hasRight('hrm', 'read_personal_information', 'read') || $user->hasRight('hrm', 'write_personal_information', 'write')) {
+	if ($permissiontoreadhr) {
 		print '<tr class="nowrap">';
 		print '<td>';
-		print $form->editfieldkey("RefEmployee", 'ref_employee', $object->ref_employee, $object, $user->rights->user->user->creer || $user->rights->hrm->write_personal_information->write);
+		print $form->editfieldkey("RefEmployee", 'ref_employee', $object->ref_employee, $object, $permissiontowritehr);
 		print '</td><td>';
-		print $form->editfieldval("RefEmployee", 'ref_employee', $object->ref_employee, $object, $user->rights->user->user->creer || $user->rights->hrm->write_personal_information->write, 'string', $object->ref_employee);
+		print $form->editfieldval("RefEmployee", 'ref_employee', $object->ref_employee, $object, $permissiontowritehr, 'string', $object->ref_employee);
 		print '</td>';
 		print '</tr>';
 	}
 
 	// National registration number
-	if ($user->hasRight('hrm', 'read_personal_information', 'read') || $user->hasRight('hrm', 'write_personal_information', 'write')) {
+	if ($permissiontoreadhr) {
 		print '<tr class="nowrap">';
 		print '<td>';
-		print $form->editfieldkey("NationalRegistrationNumber", 'national_registration_number', $object->national_registration_number, $object, $user->rights->user->user->creer || $user->rights->hrm->write_personal_information->write);
+		print $form->editfieldkey("NationalRegistrationNumber", 'national_registration_number', $object->national_registration_number, $object, $permissiontowritehr);
 		print '</td><td>';
-		print $form->editfieldval("NationalRegistrationNumber", 'national_registration_number', $object->national_registration_number, $object, $user->rights->user->user->creer || $user->rights->hrm->write_personal_information->write, 'string', $object->national_registration_number);
+		print $form->editfieldval("NationalRegistrationNumber", 'national_registration_number', $object->national_registration_number, $object, $permissiontowritehr, 'string', $object->national_registration_number);
 		print '</td>';
 		print '</tr>';
 	}
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 9e00ddc0920..964f4b9a67f 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -422,8 +422,18 @@ if (empty($reshook)) {
 				$object->civility_code = GETPOST("civility_code", 'aZ09');
 				$object->lastname = GETPOST("lastname", 'alphanohtml');
 				$object->firstname = GETPOST("firstname", 'alphanohtml');
-				$object->ref_employee = GETPOST("ref_employee", 'alphanohtml');
-				$object->national_registration_number = GETPOST("national_registration_number", 'alphanohtml');
+				/*
+				* Protection against deletion of ref_employee while the field is not present in the user tab
+				*/
+				if (GETPOSTISSET("ref_employee")) {
+					$object->ref_employee = GETPOST("ref_employee", 'alphanohtml');
+				}
+				/*
+				* Protection against deletion of national_registration_number while the field is not present in the user tab
+				*/
+				if (GETPOSTISSET("national_registration_number")) {
+					$object->national_registration_number = GETPOST("national_registration_number", 'alphanohtml');
+				}
 				$object->gender = GETPOST("gender", 'aZ09');
 				$object->pass = GETPOST("password", 'none');	// We can keep 'none' for password fields
 				$object->api_key = (GETPOST("api_key", 'alphanohtml')) ? GETPOST("api_key", 'alphanohtml') : $object->api_key;
diff --git a/htdocs/user/class/api_users.class.php b/htdocs/user/class/api_users.class.php
index 747d4ab3286..2bbadd267cf 100644
--- a/htdocs/user/class/api_users.class.php
+++ b/htdocs/user/class/api_users.class.php
@@ -701,11 +701,6 @@ class Users extends DolibarrApi
 		unset($object->lines);
 		unset($object->model_pdf);
 
-		unset($object->skype);
-		unset($object->twitter);
-		unset($object->facebook);
-		unset($object->linkedin);
-
 		$canreadsalary = ((!empty($conf->salaries->enabled) && !empty(DolibarrApiAccess::$user->rights->salaries->read)) || (empty($conf->salaries->enabled)));
 
 		if (!$canreadsalary) {
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index b32c23ab7fc..f8610a7ff85 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -99,34 +99,10 @@ class User extends CommonObject
 	public $personal_email;
 
 	/**
-	 * @var array array of socialnetworks
+	 * @var array array of socialnetwo18dprks
 	 */
 	public $socialnetworks;
 
-	/**
-	 * @var string skype account
-	 * @deprecated
-	 */
-	public $skype;
-
-	/**
-	 * @var string twitter account
-	 * @deprecated
-	 */
-	public $twitter;
-
-	/**
-	 * @var string facebook account
-	 * @deprecated
-	 */
-	public $facebook;
-
-	/**
-	 * @var string linkedin account
-	 * @deprecated
-	 */
-	public $linkedin;
-
 	/**
 	 * @var string job position
 	 */
@@ -718,6 +694,7 @@ class User extends CommonObject
 		global $conf;
 		// For compatibility with bad naming permissions on module
 		$moduletomoduletouse = array(
+			'compta' => 'comptabilite',
 			'contract' => 'contrat',
 			'member' => 'adherent',
 			'mo' => 'mrp',
@@ -745,7 +722,8 @@ class User extends CommonObject
 
 		$moduleRightsMapping = array(
 			'product' => 'produit',	// We must check $user->rights->produit...
-			'margin' => 'margins'
+			'margin' => 'margins',
+			'comptabilite' => 'compta'
 		);
 
 		$rightsPath = $module;
@@ -767,8 +745,10 @@ class User extends CommonObject
 		// In $conf->modules, we have 'accounting', 'product', 'facture', ...
 		// In $user->rights, we have 'accounting', 'produit', 'facture', ...
 		//var_dump($module);
+		//var_dump($rightsPath);
 		//var_dump($this->rights->$rightsPath);
 		//var_dump($conf->modules);
+		//var_dump($module.' '.isModEnabled($module).' '.$rightsPath.' '.$permlevel1.' '.$permlevel2);
 		if (!isModEnabled($module)) {
 			return 0;
 		}
@@ -785,6 +765,7 @@ class User extends CommonObject
 		}
 
 		//var_dump($this->rights);
+		//var_dump($rightsPath.' '.$permlevel1.' '.$permlevel2);
 		if (empty($rightsPath) || empty($this->rights) || empty($this->rights->$rightsPath) || empty($permlevel1)) {
 			return 0;
 		}
@@ -1885,8 +1866,12 @@ class User extends CommonObject
 		$this->employee						= ($this->employee > 0 ? $this->employee : 0);
 		$this->login						= trim((string) $this->login);
 		$this->gender						= trim((string) $this->gender);
+
 		$this->pass							= trim((string) $this->pass);
 		$this->api_key						= trim((string) $this->api_key);
+		$this->datestartvalidity			= empty($this->datestartvalidity) ? '' : $this->datestartvalidity;
+		$this->dateendvalidity				= empty($this->dateendvalidity) ? '' : $this->dateendvalidity;
+
 		$this->address						= trim((string) $this->address);
 		$this->zip							= trim((string) $this->zip);
 		$this->town							= trim((string) $this->town);
@@ -1911,8 +1896,7 @@ class User extends CommonObject
 		$this->color						= trim((string) $this->color);
 		$this->dateemployment				= empty($this->dateemployment) ? '' : $this->dateemployment;
 		$this->dateemploymentend			= empty($this->dateemploymentend) ? '' : $this->dateemploymentend;
-		$this->datestartvalidity			= empty($this->datestartvalidity) ? '' : $this->datestartvalidity;
-		$this->dateendvalidity				= empty($this->dateendvalidity) ? '' : $this->dateendvalidity;
+
 		$this->birth						= empty($this->birth) ? '' : $this->birth;
 		$this->fk_warehouse					= (int) $this->fk_warehouse;
 
@@ -2695,6 +2679,33 @@ class User extends CommonObject
 	}
 
 
+	/**
+	 *  Return a link with photo
+	 * 	Use this->id,this->photo
+	 *
+	 *	@return	int		0=Valid, >0 if not valid
+	 */
+	public function isNotIntoValidityDateRange()
+	{
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+
+		$now = dol_now();
+
+		//dol_syslog("isNotIntoValidityDateRange ".$this->datestartvalidity);
+
+		// Check date start validity
+		if ($this->datestartvalidity && $this->datestartvalidity > dol_get_last_hour($now)) {
+			return 1;
+		}
+		// Check date end validity
+		if ($this->dateendvalidity && $this->dateendvalidity < dol_get_first_hour($now)) {
+			return 1;
+		}
+
+		return 0;
+	}
+
+
 	/**
 	 *  Return a link with photo
 	 * 	Use this->id,this->photo
diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index a9884ca59d1..250fec08c30 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -100,6 +100,7 @@ class UserGroup extends CommonObject
 	public $members = array(); // Array of users
 
 	public $nb_rights; // Number of rights granted to the user
+	public $nb_users;  // Number of users in the group
 
 	private $_tab_loaded = array(); // Array of cache of already loaded permissions
 
@@ -151,7 +152,7 @@ class UserGroup extends CommonObject
 	 *  @param		boolean	$load_members	Load all members of the group
 	 *	@return		int						<0 if KO, >0 if OK
 	 */
-	public function fetch($id = '', $groupname = '', $load_members = true)
+	public function fetch($id = '', $groupname = '', $load_members = false)
 	{
 		global $conf;
 
@@ -166,7 +167,7 @@ class UserGroup extends CommonObject
 
 		if ($result) {
 			if ($load_members) {
-				$this->members = $this->listUsersForGroup();
+				$this->members = $this->listUsersForGroup();	// This make a lot of subrequests
 			}
 
 			return 1;
@@ -237,7 +238,7 @@ class UserGroup extends CommonObject
 
 		$ret = array();
 
-		$sql = "SELECT u.rowid";
+		$sql = "SELECT u.rowid, u.login, u.lastname, u.firstname, u.photo, u.fk_soc, u.entity, u.employee, u.email";
 		if (!empty($this->id)) {
 			$sql .= ", ug.entity as usergroup_entity";
 		}
@@ -263,12 +264,23 @@ class UserGroup extends CommonObject
 
 		dol_syslog(get_class($this)."::listUsersForGroup", LOG_DEBUG);
 		$resql = $this->db->query($sql);
+
 		if ($resql) {
 			while ($obj = $this->db->fetch_object($resql)) {
 				if (!array_key_exists($obj->rowid, $ret)) {
 					if ($mode != 1) {
 						$newuser = new User($this->db);
-						$newuser->fetch($obj->rowid);
+						//$newuser->fetch($obj->rowid);		// We are inside a loop, no subrequests inside a loop
+						$newuser->id = $obj->rowid;
+						$newuser->login = $obj->login;
+						$newuser->photo = $obj->photo;
+						$newuser->lastname = $obj->lastname;
+						$newuser->firstname = $obj->firstname;
+						$newuser->email = $obj->email;
+						$newuser->socid = $obj->fk_soc;
+						$newuser->entity = $obj->entity;
+						$newuser->employee = $obj->employee;
+
 						$ret[$obj->rowid] = $newuser;
 					} else {
 						$ret[$obj->rowid] = $obj->rowid;
@@ -936,10 +948,10 @@ class UserGroup extends CommonObject
 		$return .= '<div class="info-box-content">';
 		$return .= '<span class="info-box-ref">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).'</span>';
 		if (property_exists($this, 'members')) {
-			$return .= '<br><span class="info-box-status opacitymedium">'.(!empty($this->members)? $this->members : 0).' '.$langs->trans('Users').'</span>';
+			$return .= '<br><span class="info-box-status opacitymedium">'.(empty($this->nb_users) ? 0 : $this->nb_users).' '.$langs->trans('Users').'</span>';
 		}
 		if (property_exists($this, 'nb_rights')) {
-			$return .= '<br><div class="info-box-status margintoponly opacitymedium">'.$langs->trans('NbOfPermissions').' : '.$this->nb_rights.'</div>';
+			$return .= '<br><div class="info-box-status margintoponly opacitymedium">'.$langs->trans('NbOfPermissions').' : '.(empty($this->nb_rights) ? 0 : $this->nb_rights).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php
index a9a16826ee3..7bafaf5aee5 100644
--- a/htdocs/user/group/card.php
+++ b/htdocs/user/group/card.php
@@ -247,6 +247,7 @@ if (empty($reshook)) {
 /*
  * View
  */
+
 $title = $object->name.' - '.$langs->trans("Card");
 if ($action == 'create') {
 	$title = $langs->trans("NewGroup");
@@ -309,8 +310,6 @@ if ($action == 'create') {
 	/*                                                                            */
 	/* ************************************************************************** */
 	if ($id) {
-		$res = $object->fetch_optionals();
-
 		$head = group_prepare_head($object);
 		$title = $langs->trans("Group");
 
@@ -447,6 +446,8 @@ if ($action == 'create') {
 				print '<td class="liste_titre right" width="5">&nbsp;</td>';
 				print "</tr>\n";
 
+				$object->fetch($object->id, '', true);	// true to force load of all users, member of the group
+
 				if (!empty($object->members)) {
 					foreach ($object->members as $useringroup) {
 						print '<tr class="oddeven">';
diff --git a/htdocs/user/group/list.php b/htdocs/user/group/list.php
index 7e707b6b4fc..5f017da01c9 100644
--- a/htdocs/user/group/list.php
+++ b/htdocs/user/group/list.php
@@ -285,7 +285,7 @@ if ($search_all) {
 		$fieldstosearchall[$key] = $langs->trans($val);
 		$setupstring .= $key."=".$val.";";
 	}
-	print '<!-- Search done like if PRODUCT_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
+	print '<!-- Search done like if USER_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>'."\n";
 }
 
@@ -380,8 +380,8 @@ while ($i < $imaxinloop) {
 
 	$object->name = $obj->name;
 	$object->note = $obj->note;
-	$object->members = $obj->nb;
 	$object->nb_rights = $obj->nbpermissions;
+	$object->nb_users = $obj->nb;
 
 	if ($mode == 'kanban') {
 		if ($i == 0) {
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index 3cac5d06c56..ef659197607 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -44,7 +44,7 @@ $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'userlist'; // 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')
-$mode = GETPOST("mode", 'alpha');
+$mode = GETPOST("mode", 'aZ');
 
 // Security check (for external users)
 $socid = 0;
@@ -84,7 +84,7 @@ if (!$sortorder) {
 }
 
 // Initialize array of search criterias
-$search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml');
+$search_all = GETPOST('search_all', 'alphanohtml');
 $search = array();
 foreach ($object->fields as $key => $val) {
 	if (GETPOST('search_'.$key, 'alpha') !== '') {
@@ -116,6 +116,9 @@ if (!empty($conf->api->enabled)) {
 	$fieldstosearchall['u.api_key'] = "ApiKey";
 }
 
+$permissiontoreadhr = $user->hasRight('hrm', 'read_personal_information', 'read') || $user->hasRight('hrm', 'write_personal_information', 'write');
+$permissiontowritehr = $user->hasRight('hrm', 'write_personal_information', 'write');
+
 // Definition of fields for list
 $arrayfields = array(
 	'u.login'=>array('label'=>"Login", 'checked'=>1, 'position'=>10),
@@ -124,14 +127,16 @@ $arrayfields = array(
 	'u.entity'=>array('label'=>"Entity", 'checked'=>1, 'position'=>50, 'enabled'=>(isModEnabled('multicompany') && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))),
 	'u.gender'=>array('label'=>"Gender", 'checked'=>0, 'position'=>22),
 	'u.employee'=>array('label'=>"Employee", 'checked'=>($contextpage == 'employeelist' ? 1 : 0), 'position'=>25),
-	'u.fk_user'=>array('label'=>"HierarchicalResponsible", 'checked'=>1, 'position'=>27),
+	'u.fk_user'=>array('label'=>"HierarchicalResponsible", 'checked'=>1, 'position'=>27, 'csslist'=>'maxwidth150'),
 	'u.accountancy_code'=>array('label'=>"AccountancyCode", 'checked'=>0, 'position'=>30),
 	'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"=>(!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'=>(!empty($conf->salaries->enabled) && $user->hasRight("salaries", "readall"))),
+	'u.ref_employee'=>array('label'=>"RefEmployee", 'checked'=>-1, 'position'=>60, 'enabled'=>(isModEnabled('hrm') && $permissiontoreadhr)),
+	'u.national_registration_number'=>array('label'=>"NationalRegistrationNumber", 'checked'=>-1, 'position'=>61, 'enabled'=>(isModEnabled('hrm') && $permissiontoreadhr)),
+	'u.salary'=>array('label'=>"Salary", 'checked'=>-1, 'position'=>80, 'enabled'=>(isModEnabled('salaries') && $user->hasRight("salaries", "readall")), 'isameasure'=>1),
 	'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),
@@ -357,7 +362,7 @@ $morehtmlright = "";
 // Build and execute select
 // --------------------------------------------------------------------
 $sql = "SELECT DISTINCT u.rowid, u.lastname, u.firstname, u.admin, u.fk_soc, u.login, u.office_phone, u.user_mobile, u.email, u.api_key, u.accountancy_code, u.gender, u.employee, u.photo,";
-$sql .= " u.salary, u.datelastlogin, u.datepreviouslogin,";
+$sql .= " u.ref_employee, u.national_registration_number, u.salary, u.datelastlogin, u.datepreviouslogin,";
 $sql .= " u.ldap_sid, u.statut as status, u.entity,";
 $sql .= " u.tms as date_update, u.datec as date_creation,";
 $sql .= " u2.rowid as id2, u2.login as login2, u2.firstname as firstname2, u2.lastname as lastname2, u2.admin as admin2, u2.fk_soc as fk_soc2, u2.office_phone as ofice_phone2, u2.user_mobile as user_mobile2, u2.email as email2, u2.gender as gender2, u2.photo as photo2, u2.entity as entity2, u2.statut as status2,";
@@ -626,6 +631,7 @@ 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.'">';
+print '<input type="hidden" name="page_y" value="">';
 print '<input type="hidden" name="mode" value="'.$mode.'">';
 
 $url = DOL_URL_ROOT.'/user/card.php?action=create'.($contextpage == 'employeelist' ? '&search_employee=1' : '').'&leftmenu=';
@@ -719,7 +725,7 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
 // Action column
-if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print '<td class="liste_titre maxwidthsearch">';
 	$searchpicto = $form->showFilterButtons('left');
 	print $searchpicto;
@@ -748,7 +754,7 @@ if (!empty($arrayfields['u.employee']['checked'])) {
 // Supervisor
 if (!empty($arrayfields['u.fk_user']['checked'])) {
 	print '<td class="liste_titre">';
-	print $form->select_dolusers($search_supervisor, 'search_supervisor', 1, array(), 0, '', 0, 0, 0, 0, '', 0, '', 'maxwidth150');
+	print $form->select_dolusers($search_supervisor, 'search_supervisor', 1, array(), 0, '', 0, 0, 0, 0, '', 0, '', 'maxwidth125');
 	print '</td>';
 }
 if (!empty($arrayfields['u.accountancy_code']['checked'])) {
@@ -772,6 +778,12 @@ if (!empty($arrayfields['u.fk_soc']['checked'])) {
 if (!empty($arrayfields['u.entity']['checked'])) {
 	print '<td class="liste_titre"></td>';
 }
+if (!empty($arrayfields['u.ref_employee']['checked'])) {
+	print '<td class="liste_titre"></td>';
+}
+if (!empty($arrayfields['u.national_registration_number']['checked'])) {
+	print '<td class="liste_titre"></td>';
+}
 if (!empty($arrayfields['u.salary']['checked'])) {
 	print '<td class="liste_titre"></td>';
 }
@@ -804,7 +816,7 @@ if (!empty($arrayfields['u.statut']['checked'])) {
 	print '</td>';
 }
 // Action column
-if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print '<td class="liste_titre maxwidthsearch">';
 	$searchpicto = $form->showFilterButtons();
 	print $searchpicto;
@@ -818,7 +830,7 @@ $totalarray['nbfield'] = 0;
 // Fields title label
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
-if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
 	$totalarray['nbfield']++;
 }
@@ -874,6 +886,14 @@ if (!empty($arrayfields['u.entity']['checked'])) {
 	print_liste_field_titre("Entity", $_SERVER['PHP_SELF'], "u.entity", $param, "", "", $sortfield, $sortorder);
 	$totalarray['nbfield']++;
 }
+if (!empty($arrayfields['u.ref_employee']['checked'])) {
+	print_liste_field_titre("RefEmployee", $_SERVER['PHP_SELF'], "u.ref_employee", $param, "", "", $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['u.national_registration_number']['checked'])) {
+	print_liste_field_titre("NationalRegistrationNumber", $_SERVER['PHP_SELF'], "u.national_registration_number", $param, "", "", $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
 if (!empty($arrayfields['u.salary']['checked'])) {
 	print_liste_field_titre("Salary", $_SERVER['PHP_SELF'], "u.salary", $param, "", "", $sortfield, $sortorder, 'right ');
 	$totalarray['nbfield']++;
@@ -905,7 +925,7 @@ if (!empty($arrayfields['u.statut']['checked'])) {
 	$totalarray['nbfield']++;
 }
 // Action column
-if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
 	$totalarray['nbfield']++;
 }
@@ -927,6 +947,7 @@ if (isset($extrafields->attributes[$object->table_element]['computed']) && is_ar
 // --------------------------------------------------------------------
 $i = 0;
 $savnbfield = $totalarray['nbfield'];
+$totalarray = array('val'=>array('u.salary'=>0));
 $totalarray['nbfield'] = 0;
 $imaxinloop = ($limit ? min($num, $limit) : $num);
 while ($i < $imaxinloop) {
@@ -935,7 +956,9 @@ while ($i < $imaxinloop) {
 		break; // Should not happen
 	}
 
-	if (empty($obj->country_code)) $obj->country_code = '';		// TODO Add join in select with country table to get country_code
+	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);
@@ -986,7 +1009,7 @@ while ($i < $imaxinloop) {
 		$j = 0;
 		print '<tr data-rowid="'.$object->id.'" class="oddeven">';
 		// Action column
-		if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+		if (getDolGlobalString('MAIN_CHECKBOX_LEFT_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;
@@ -996,16 +1019,19 @@ while ($i < $imaxinloop) {
 				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']++;
+			}
 		}
 		// Login
 		if (!empty($arrayfields['u.login']['checked'])) {
 			print '<td class="nowraponall tdoverflowmax150">';
-			print $li;
 			if (isModEnabled('multicompany') && $obj->admin && !$obj->entity) {
-				print img_picto($langs->trans("SuperAdministrator"), 'redstar', 'class="valignmiddle paddingleft"');
+				print img_picto($langs->trans("SuperAdministrator"), 'redstar', 'class="valignmiddle paddingright"');
 			} elseif ($obj->admin) {
-				print img_picto($langs->trans("Administrator"), 'star', 'class="valignmiddle paddingleft"');
+				print img_picto($langs->trans("Administrator"), 'star', 'class="valignmiddle paddingright"');
 			}
+			print $li;
 			print '</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
@@ -1057,8 +1083,7 @@ while ($i < $imaxinloop) {
 
 		// Supervisor
 		if (!empty($arrayfields['u.fk_user']['checked'])) {
-			// Resp
-			print '<td class="nowrap">';
+			print '<td class="tdoverflowmax125">';
 			if ($obj->login2) {
 				$user2->id = $obj->id2;
 				$user2->login = $obj->login2;
@@ -1073,12 +1098,12 @@ while ($i < $imaxinloop) {
 				$user2->socid = $obj->fk_soc2;
 				$user2->statut = $obj->status2;
 				$user2->status = $obj->status2;
-				print $user2->getNomUrl(-1, '', 0, 0, 24, 0, '', '', 1);
 				if (isModEnabled('multicompany') && $obj->admin2 && !$obj->entity2) {
-					print img_picto($langs->trans("SuperAdministrator"), 'redstar', 'class="valignmiddle paddingleft"');
+					print img_picto($langs->trans("SuperAdministrator"), 'redstar', 'class="valignmiddle paddingright"');
 				} elseif ($obj->admin2) {
-					print img_picto($langs->trans("Administrator"), 'star', 'class="valignmiddle paddingleft"');
+					print img_picto($langs->trans("Administrator"), 'star', 'class="valignmiddle paddingright"');
 				}
+				print $user2->getNomUrl(-1, '', 0, 0, 24, 0, '', '', 1);
 			}
 			print '</td>';
 			if (!$i) {
@@ -1160,6 +1185,24 @@ while ($i < $imaxinloop) {
 			}
 		}
 
+		// Ref employee
+		if (!empty($arrayfields['u.ref_employee']['checked'])) {
+			print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($obj->ref_employee).'">';
+			print dol_escape_htmltag($obj->ref_employee);
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// National number
+		if (!empty($arrayfields['u.national_registration_number']['checked'])) {
+			print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($obj->national_registration_number).'">';
+			print dol_escape_htmltag($obj->national_registration_number);
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
 		// Salary
 		if (!empty($arrayfields['u.salary']['checked'])) {
 			print '<td class="nowraponall right amount">';
@@ -1174,6 +1217,16 @@ while ($i < $imaxinloop) {
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'u.salary';
+			}
+			if (!isset($totalarray['val'])) {
+				$totalarray['val'] = array();
+			}
+			if (!isset($totalarray['val']['u.salary'])) {
+				$totalarray['val']['u.salary'] = 0;
+			}
+			$totalarray['val']['u.salary'] += $obj->salary;
 		}
 
 		// Date last login
@@ -1223,7 +1276,7 @@ while ($i < $imaxinloop) {
 			}
 		}
 		// Action column
-		if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_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;
@@ -1233,9 +1286,9 @@ while ($i < $imaxinloop) {
 				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";
@@ -1262,7 +1315,7 @@ if ($num == 0) {
 $db->free($resql);
 
 $parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
-$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
 print '</table>'."\n";