From 278b708e1729345b1d47f022ec2c55f3cd8651ad Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe@altairis.fr>
Date: Thu, 11 Apr 2019 11:57:50 +0200
Subject: [PATCH 001/316] use subproducts costprice and pmp if empty on father

---
 htdocs/fourn/ajax/getSupplierPrices.php | 34 +++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/htdocs/fourn/ajax/getSupplierPrices.php b/htdocs/fourn/ajax/getSupplierPrices.php
index 85b0ed37155..57874e3a122 100644
--- a/htdocs/fourn/ajax/getSupplierPrices.php
+++ b/htdocs/fourn/ajax/getSupplierPrices.php
@@ -86,12 +86,46 @@ if ($idprod > 0)
 
 	// Add price for costprice
 	$price=$producttmp->cost_price;
+	if (empty($price))
+	{
+		// get costprice for subproducts if any
+		$producttmp->get_sousproduits_arbo();
+		$prods_arbo=$producttmp->get_arbo_each_prod();
+		if (!empty($prods_arbo))
+		{
+			$price = 0;
+			foreach($prods_arbo as $child)
+			{
+				$sousprod = new Product($db);
+				$sousprod->fetch($child['id']);
+				$price += $sousprod->cost_price;
+			}
+		}
+	}
+
 	$prices[] = array("id" => 'costprice', "price" => price2num($price), "label" => $langs->trans("CostPrice").': '.price($price, 0, $langs, 0, 0, -1, $conf->currency), "title" => $langs->trans("PMPValueShort").': '.price($price, 0, $langs, 0, 0, -1, $conf->currency));  // For price field, we must use price2num(), for label or title, price()
 
 	if(!empty($conf->stock->enabled))
 	{
 		// Add price for pmp
 		$price=$producttmp->pmp;
+		if (empty($price))
+		{
+			// get pmp for subproducts if any
+			$producttmp->get_sousproduits_arbo();
+			$prods_arbo=$producttmp->get_arbo_each_prod();
+			if (!empty($prods_arbo))
+			{
+				$price = 0;
+				foreach($prods_arbo as $child)
+				{
+					$sousprod = new Product($db);
+					$sousprod->fetch($child['id']);
+					$price += $sousprod->pmp;
+				}
+			}
+		}
+
 		$prices[] = array("id" => 'pmpprice', "price" => price2num($price), "label" => $langs->trans("PMPValueShort").': '.price($price, 0, $langs, 0, 0, -1, $conf->currency), "title" => $langs->trans("PMPValueShort").': '.price($price, 0, $langs, 0, 0, -1, $conf->currency));  // For price field, we must use price2num(), for label or title, price()
 	}
 }

From 30ad0e7e11260d089d30743f1536ab4248031fc8 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe@altairis.fr>
Date: Tue, 16 Apr 2019 09:00:39 +0200
Subject: [PATCH 002/316] introduce
 PRODUCT_USE_SUB_COST_PRICES_IF_COST_PRICE_EMPTY

---
 htdocs/fourn/ajax/getSupplierPrices.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/fourn/ajax/getSupplierPrices.php b/htdocs/fourn/ajax/getSupplierPrices.php
index 57874e3a122..211734f1129 100644
--- a/htdocs/fourn/ajax/getSupplierPrices.php
+++ b/htdocs/fourn/ajax/getSupplierPrices.php
@@ -86,7 +86,7 @@ if ($idprod > 0)
 
 	// Add price for costprice
 	$price=$producttmp->cost_price;
-	if (empty($price))
+	if (empty($price) && ! empty($conf->global->PRODUCT_USE_SUB_COST_PRICES_IF_COST_PRICE_EMPTY))
 	{
 		// get costprice for subproducts if any
 		$producttmp->get_sousproduits_arbo();

From ff178667a3ee966b865c6693e961866bdd043893 Mon Sep 17 00:00:00 2001
From: Pierre Payet <pierre.p@synergies-france.fr>
Date: Tue, 11 May 2021 12:33:35 +0200
Subject: [PATCH 003/316] add thirdparty customer code to substitutionarray

---
 htdocs/comm/mailing/card.php              | 7 +++++++
 htdocs/core/class/html.formmail.class.php | 2 ++
 htdocs/langs/fr_FR/mails.lang             | 2 ++
 3 files changed, 11 insertions(+)

diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 5148956163e..4bf304bc519 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -201,6 +201,13 @@ if (empty($reshook))
 
 						// Array of possible substitutions (See also file mailing-send.php that should manage same substitutions)
 						$substitutionarray['__ID__'] = $obj->source_id;
+						if ($obj->source_type == "thirdparty") {
+							$thirdpartystatic = new Societe($db);
+							$thirdpartystatic->fetch($obj->source_id);
+
+							$substitutionarray['__THIRDPARTY_CUSTOMER_CODE__'] = $thirdpartystatic->code_client;
+							$substitutionarray['__THIRDPARTY_CUSTOMER_CODE_WITHOUT_PREFIX__'] = substr($thirdpartystatic->code_client, 1);
+						}
 						$substitutionarray['__EMAIL__'] = $obj->email;
 						$substitutionarray['__LASTNAME__'] = $obj->lastname;
 						$substitutionarray['__FIRSTNAME__'] = $obj->firstname;
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index c4723eacc57..5947ad8d810 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -1502,6 +1502,8 @@ class FormMail extends Form
 
 			// For mass emailing, we have different keys
 			$tmparray['__ID__'] = 'IdRecord';
+			$tmparray['__THIRDPARTY_CUSTOMER_CODE__'] = 'CustomerCode';
+			$tmparray['__THIRDPARTY_CUSTOMER_CODE_WITHOUT_PREFIX__'] = 'CustomerCodeWithoutPrefix';
 			$tmparray['__EMAIL__'] = 'EMailRecipient';
 			$tmparray['__LASTNAME__'] = 'Lastname';
 			$tmparray['__FIRSTNAME__'] = 'Firstname';
diff --git a/htdocs/langs/fr_FR/mails.lang b/htdocs/langs/fr_FR/mails.lang
index 3788acb53c4..9adfc684b8d 100644
--- a/htdocs/langs/fr_FR/mails.lang
+++ b/htdocs/langs/fr_FR/mails.lang
@@ -116,6 +116,8 @@ ToAddRecipientsChooseHere=Pour ajouter des destinataires, choisir dans les liste
 NbOfEMailingsReceived=Emailings de masse reçus
 NbOfEMailingsSend=Emailings de masse envoyés
 IdRecord=ID enregistrement
+CustomerCode = Code client
+CustomerCodeWithoutPrefix = Code client sans préfix
 DeliveryReceipt=Accusé de réception
 YouCanUseCommaSeparatorForSeveralRecipients=Vous pouvez utiliser le caractère de séparation <b>virgule</b> pour spécifier plusieurs destinataires.
 TagCheckMail=Suivre l'ouverture de l'email

From 4ce81ee53591f9b98088c2bada735c1c1c113204 Mon Sep 17 00:00:00 2001
From: Pierre Payet <pierre.p@synergies-france.fr>
Date: Tue, 11 May 2021 20:30:57 +0200
Subject: [PATCH 004/316] set new outside the loop, add fetch result check

---
 htdocs/comm/mailing/card.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 4bf304bc519..2aae9ef1d73 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -171,6 +171,7 @@ if (empty($reshook))
 						dol_print_error($db);
 					}
 
+					$thirdpartystatic = new Societe($db);
 					// Loop on each email and send it
 					$i = 0;
 
@@ -202,11 +203,12 @@ if (empty($reshook))
 						// Array of possible substitutions (See also file mailing-send.php that should manage same substitutions)
 						$substitutionarray['__ID__'] = $obj->source_id;
 						if ($obj->source_type == "thirdparty") {
-							$thirdpartystatic = new Societe($db);
-							$thirdpartystatic->fetch($obj->source_id);
+							$result = $thirdpartystatic->fetch($obj->source_id);
 
-							$substitutionarray['__THIRDPARTY_CUSTOMER_CODE__'] = $thirdpartystatic->code_client;
-							$substitutionarray['__THIRDPARTY_CUSTOMER_CODE_WITHOUT_PREFIX__'] = substr($thirdpartystatic->code_client, 1);
+							if ($result > 0) {
+								$substitutionarray['__THIRDPARTY_CUSTOMER_CODE__'] = $thirdpartystatic->code_client;
+								$substitutionarray['__THIRDPARTY_CUSTOMER_CODE_WITHOUT_PREFIX__'] = substr($thirdpartystatic->code_client, 1);
+							}
 						}
 						$substitutionarray['__EMAIL__'] = $obj->email;
 						$substitutionarray['__LASTNAME__'] = $obj->lastname;

From 09a694628106d1be9caae44a3f270571b0ed0588 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 May 2021 08:34:58 +0200
Subject: [PATCH 005/316] Update html.formmail.class.php

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

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 5947ad8d810..a784521fcf9 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -1503,7 +1503,7 @@ class FormMail extends Form
 			// For mass emailing, we have different keys
 			$tmparray['__ID__'] = 'IdRecord';
 			$tmparray['__THIRDPARTY_CUSTOMER_CODE__'] = 'CustomerCode';
-			$tmparray['__THIRDPARTY_CUSTOMER_CODE_WITHOUT_PREFIX__'] = 'CustomerCodeWithoutPrefix';
+			//$tmparray['__THIRDPARTY_CUSTOMER_CODE_WITHOUT_PREFIX__'] = 'CustomerCodeWithoutPrefix';	// Not yet working
 			$tmparray['__EMAIL__'] = 'EMailRecipient';
 			$tmparray['__LASTNAME__'] = 'Lastname';
 			$tmparray['__FIRSTNAME__'] = 'Firstname';

From 40106ff7670afb1de4d887ee2f8cea08433278bf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 May 2021 08:35:29 +0200
Subject: [PATCH 006/316] Update html.formmail.class.php

---
 htdocs/core/class/html.formmail.class.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index a784521fcf9..99b25d27fc4 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -1503,7 +1503,6 @@ class FormMail extends Form
 			// For mass emailing, we have different keys
 			$tmparray['__ID__'] = 'IdRecord';
 			$tmparray['__THIRDPARTY_CUSTOMER_CODE__'] = 'CustomerCode';
-			//$tmparray['__THIRDPARTY_CUSTOMER_CODE_WITHOUT_PREFIX__'] = 'CustomerCodeWithoutPrefix';	// Not yet working
 			$tmparray['__EMAIL__'] = 'EMailRecipient';
 			$tmparray['__LASTNAME__'] = 'Lastname';
 			$tmparray['__FIRSTNAME__'] = 'Firstname';

From a4f4cca895b7fcb3a4f1fd6c56f3f355d676fd45 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 May 2021 08:36:49 +0200
Subject: [PATCH 007/316] Prefix length may have different length and be at a
 different place so i remove this tag. Must be replaced by a generic method to
 substring a substitution variable.

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

diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 2aae9ef1d73..f2b93ddbb80 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -207,7 +207,6 @@ if (empty($reshook))
 
 							if ($result > 0) {
 								$substitutionarray['__THIRDPARTY_CUSTOMER_CODE__'] = $thirdpartystatic->code_client;
-								$substitutionarray['__THIRDPARTY_CUSTOMER_CODE_WITHOUT_PREFIX__'] = substr($thirdpartystatic->code_client, 1);
 							}
 						}
 						$substitutionarray['__EMAIL__'] = $obj->email;

From aa9642b86fd58299131565fe58a276f9280e0146 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 May 2021 08:38:38 +0200
Subject: [PATCH 008/316] Update mails.lang

---
 htdocs/langs/fr_FR/mails.lang | 2 --
 1 file changed, 2 deletions(-)

diff --git a/htdocs/langs/fr_FR/mails.lang b/htdocs/langs/fr_FR/mails.lang
index 9adfc684b8d..3788acb53c4 100644
--- a/htdocs/langs/fr_FR/mails.lang
+++ b/htdocs/langs/fr_FR/mails.lang
@@ -116,8 +116,6 @@ ToAddRecipientsChooseHere=Pour ajouter des destinataires, choisir dans les liste
 NbOfEMailingsReceived=Emailings de masse reçus
 NbOfEMailingsSend=Emailings de masse envoyés
 IdRecord=ID enregistrement
-CustomerCode = Code client
-CustomerCodeWithoutPrefix = Code client sans préfix
 DeliveryReceipt=Accusé de réception
 YouCanUseCommaSeparatorForSeveralRecipients=Vous pouvez utiliser le caractère de séparation <b>virgule</b> pour spécifier plusieurs destinataires.
 TagCheckMail=Suivre l'ouverture de l'email

From 23249751d57ab712642544027d72908cd6d61080 Mon Sep 17 00:00:00 2001
From: Gauthier PC portable 024 <gauthier.verdol@atm-consulting.fr>
Date: Wed, 17 Nov 2021 12:10:12 +0100
Subject: [PATCH 009/316] FIX : reorder all lines when delete document line
 everywhere

---
 htdocs/commande/card.php       | 2 ++
 htdocs/compta/facture/card.php | 2 ++
 htdocs/fourn/commande/card.php | 2 ++
 htdocs/fourn/facture/card.php  | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index b9900459006..21b8897a3e3 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -216,6 +216,8 @@ if (empty($reshook))
 		$result = $object->deleteline($user, $lineid);
 		if ($result > 0)
 		{
+			// reorder lines
+			$object->line_order(true);
 			// Define output language
 			$outputlangs = $langs;
 			$newlang = '';
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 86d3abedd2b..5a500eafe12 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -243,6 +243,8 @@ if (empty($reshook))
 
 		$result = $object->deleteline(GETPOST('lineid'));
 		if ($result > 0) {
+			// reorder lines
+			$object->line_order(true);
 			// Define output language
 			$outputlangs = $langs;
 			$newlang = '';
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index f79f37d16e5..c85d1f56c29 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -805,6 +805,8 @@ if (empty($reshook))
 		$result = $object->deleteline($lineid);
 		if ($result > 0)
 		{
+			// reorder lines
+			$object->line_order(true);
 			// Define output language
 			$outputlangs = $langs;
 			$newlang = '';
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 985c9a4cc62..d912f6917f7 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -253,6 +253,8 @@ if (empty($reshook))
 		$result = $object->deleteline($lineid);
 		if ($result > 0)
 		{
+			// reorder lines
+			$object->line_order(true);
 			// Define output language
 			/*$outputlangs = $langs;
 			$newlang = '';

From e43b95f05a191a1a541bf6918c862b66541fa534 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A9lina?= <melina@melina.altairis.net>
Date: Tue, 30 Nov 2021 15:41:46 +0100
Subject: [PATCH 010/316] Show reference product

---
 htdocs/takepos/index.php   | 20 +++++++++++++++++---
 htdocs/takepos/invoice.php |  6 +++++-
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index 8bd1c4dbca9..ad123ccd5e7 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -335,7 +335,11 @@ function LoadProducts(position, issubcat) {
 				var titlestring = <?php echo $titlestring; ?>;
 				<?php if (!$conf->global->TAKEPOS_HIDE_PRODUCT_IMAGES) {
 					echo '$("#prodivdesc"+ishow).show();';
-					echo '$("#prodesc"+ishow).text(data[parseInt(idata)][\'label\']);';
+					if ($conf->global->TAKEPOS_SHOW_PRODUCT_REFERENCE == 1) {
+						echo '$("#prodesc"+ishow).html(data[parseInt(idata)][\'ref\'].bold() + \' - \' + data[parseInt(idata)][\'label\']);';
+					} else {
+						echo '$("#prodesc"+ishow).text(data[parseInt(idata)][\'label\']);';
+					}
 					echo '$("#proimg"+ishow).attr("title", titlestring);';
 					echo '$("#proimg"+ishow).attr("src", "genimg/index.php?query=pro&id="+data[idata][\'id\']);';
 				} else {
@@ -401,7 +405,12 @@ function MoreProducts(moreorless) {
 			else if ((data[idata]['status']) == "1") {
 				//Only show products with status=1 (for sell)
 				$("#prodivdesc"+ishow).show();
-				$("#prodesc"+ishow).text(data[parseInt(idata)]['label']);
+				<?php
+				if ($conf->global->TAKEPOS_SHOW_PRODUCT_REFERENCE == 1) { ?>
+					$("#prodesc"+ishow).html(data[parseInt(idata)]['ref'].bold() + ' - ' + data[parseInt(idata)]['label']);
+				<?php } else { ?>
+					$("#prodesc"+ishow).text(data[parseInt(idata)]['label']);
+				<?php } ?>
 				$("#probutton"+ishow).text(data[parseInt(idata)]['label']);
 				$("#probutton"+ishow).show();
 				if (data[parseInt(idata)]['price_formated']) {
@@ -579,7 +588,12 @@ function Search2(keyCodeForEnter) {
 					$titlestring .= " + ' - ".dol_escape_js($langs->trans("Barcode").': ')."' + data[i]['barcode']";
 					?>
 					var titlestring = <?php echo $titlestring; ?>;
-					$("#prodesc" + i).text(data[i]['label']);
+					<?php
+				if ($conf->global->TAKEPOS_SHOW_PRODUCT_REFERENCE == 1) { ?>
+					$("#prodesc" + i).html(data[i]['ref'].bold() + ' - ' + data[i]['label']);
+					<?php } else { ?>
+						$("#prodesc" + i).text(data[i]['label']);
+					<?php } ?>
 					$("#prodivdesc" + i).show();
 					$("#probutton" + i).text(data[i]['label']);
 					$("#probutton" + i).show();
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 2a951a505ae..01599cae4b6 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -1447,7 +1447,11 @@ if ($placeid > 0) {
 						$tooltiptext .= $line->desc;
 					}
 				}
-				$htmlforlines .= $form->textwithpicto($line->product_label ? $line->product_label : ($line->product_ref ? $line->product_ref : dolGetFirstLineOfText($line->desc, 1)), $tooltiptext);
+				if ($conf->global->TAKEPOS_SHOW_PRODUCT_REFERENCE == 1) { 
+					$htmlforlines .= $form->textwithpicto($line->product_label ? '<b>' . $line->product_ref . '</b> - ' . $line->product_label : dolGetFirstLineOfText($line->desc, 1), $tooltiptext);
+				} else { 
+					$htmlforlines .= $form->textwithpicto($line->product_label ? $line->product_label : ($line->product_ref ? $line->product_ref : dolGetFirstLineOfText($line->desc, 1)), $tooltiptext);
+				}
 			} else {
 				if ($line->product_label) {
 					$htmlforlines .= $line->product_label;

From 7c3b2f1e9bed3f2b45438810a89d2bba6c266dda Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Tue, 30 Nov 2021 15:07:59 +0000
Subject: [PATCH 011/316] Fixing style errors.

---
 htdocs/takepos/index.php   | 2 +-
 htdocs/takepos/invoice.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index ad123ccd5e7..bf5428f81d0 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -589,7 +589,7 @@ function Search2(keyCodeForEnter) {
 					?>
 					var titlestring = <?php echo $titlestring; ?>;
 					<?php
-				if ($conf->global->TAKEPOS_SHOW_PRODUCT_REFERENCE == 1) { ?>
+					if ($conf->global->TAKEPOS_SHOW_PRODUCT_REFERENCE == 1) { ?>
 					$("#prodesc" + i).html(data[i]['ref'].bold() + ' - ' + data[i]['label']);
 					<?php } else { ?>
 						$("#prodesc" + i).text(data[i]['label']);
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 01599cae4b6..2f857e7a3ce 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -1447,9 +1447,9 @@ if ($placeid > 0) {
 						$tooltiptext .= $line->desc;
 					}
 				}
-				if ($conf->global->TAKEPOS_SHOW_PRODUCT_REFERENCE == 1) { 
+				if ($conf->global->TAKEPOS_SHOW_PRODUCT_REFERENCE == 1) {
 					$htmlforlines .= $form->textwithpicto($line->product_label ? '<b>' . $line->product_ref . '</b> - ' . $line->product_label : dolGetFirstLineOfText($line->desc, 1), $tooltiptext);
-				} else { 
+				} else {
 					$htmlforlines .= $form->textwithpicto($line->product_label ? $line->product_label : ($line->product_ref ? $line->product_ref : dolGetFirstLineOfText($line->desc, 1)), $tooltiptext);
 				}
 			} else {

From 16ab6ce800a10887e31890d772a6356b34759f72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A9lina?= <melina@melina.altairis.net>
Date: Wed, 1 Dec 2021 10:26:24 +0100
Subject: [PATCH 012/316] No Category

---
 htdocs/takepos/index.php | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index 8bd1c4dbca9..59205c638a6 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -1186,13 +1186,22 @@ if (!empty($conf->global->TAKEPOS_WEIGHING_SCALE)) {
 
 	<div class="row2<?php if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 		print 'withhead';
-					} ?>">
+					} ?>"
+					<?php
+					if ($conf->global->TAKEPOS_NO_CATEGORY == 1) {
+						print '';
+					}
+					?>>
 
 		<!--  Show categories -->
-		<div class="div4">
-	<?php
-	$count = 0;
-	while ($count < $MAXCATEG) {
+		<?php
+			if ($conf->global->TAKEPOS_NO_CATEGORY == 1) {
+				print '<div class="div4" style= "display: none;">';
+			} else {
+				print '<div class="div4">';
+			}
+			$count = 0;
+			while ($count < $MAXCATEG) {
 		?>
 			<div class="wrapper" <?php if ($count == ($MAXCATEG - 2)) {
 				echo 'onclick="MoreCategories(\'less\');"';
@@ -1228,12 +1237,19 @@ if (!empty($conf->global->TAKEPOS_WEIGHING_SCALE)) {
 		</div>
 
 		<!--  Show product -->
-		<div class="div5">
+		<div class="div5"<?php if ($conf->global->TAKEPOS_NO_CATEGORY == 1) {
+			print ' style="width:100%;"';
+		} ?>>
 	<?php
 	$count = 0;
 	while ($count < $MAXPRODUCT) {
-		?>
-				<div class="wrapper2" id='prodiv<?php echo $count; ?>' <?php if ($count == ($MAXPRODUCT - 2)) {
+		if ($conf->global->TAKEPOS_NO_CATEGORY == 1) {
+			print '<div class="wrapper2" id="prodiv'.$count.'"  ';
+		} else {
+			print '<div class="wrapper2" id="prodiv'.$count.'" ';
+		}
+	?>
+				<?php if ($count == ($MAXPRODUCT - 2)) {
 					?> onclick="MoreProducts('less');" <?php
 												} if ($count == ($MAXPRODUCT - 1)) {
 													?> onclick="MoreProducts('more');" <?php

From 9190581d0a67c48579860c6264be11afd1dc35fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A9lina?= <melina@melina.altairis.net>
Date: Wed, 1 Dec 2021 10:45:56 +0100
Subject: [PATCH 013/316] No category

---
 htdocs/takepos/index.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index 59205c638a6..1b9799efec4 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -1186,12 +1186,7 @@ if (!empty($conf->global->TAKEPOS_WEIGHING_SCALE)) {
 
 	<div class="row2<?php if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 		print 'withhead';
-					} ?>"
-					<?php
-					if ($conf->global->TAKEPOS_NO_CATEGORY == 1) {
-						print '';
-					}
-					?>>
+					} ?>">
 
 		<!--  Show categories -->
 		<?php

From cc3ef5a3fb162231945d752f52e3b5a94ab70921 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 1 Dec 2021 09:53:28 +0000
Subject: [PATCH 014/316] Fixing style errors.

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

diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index 1b9799efec4..9ac9ca39c36 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -1190,14 +1190,14 @@ if (!empty($conf->global->TAKEPOS_WEIGHING_SCALE)) {
 
 		<!--  Show categories -->
 		<?php
-			if ($conf->global->TAKEPOS_NO_CATEGORY == 1) {
-				print '<div class="div4" style= "display: none;">';
-			} else {
-				print '<div class="div4">';
-			}
+		if ($conf->global->TAKEPOS_NO_CATEGORY == 1) {
+			print '<div class="div4" style= "display: none;">';
+		} else {
+			print '<div class="div4">';
+		}
 			$count = 0;
-			while ($count < $MAXCATEG) {
-		?>
+		while ($count < $MAXCATEG) {
+			?>
 			<div class="wrapper" <?php if ($count == ($MAXCATEG - 2)) {
 				echo 'onclick="MoreCategories(\'less\');"';
 								 } elseif ($count == ($MAXCATEG - 1)) {
@@ -1225,16 +1225,16 @@ if (!empty($conf->global->TAKEPOS_WEIGHING_SCALE)) {
 				<?php } ?>
 				<div class="catwatermark" id='catwatermark<?php echo $count; ?>'>...</div>
 			</div>
-		<?php
-		$count++;
-	}
-	?>
+			<?php
+			$count++;
+		}
+		?>
 		</div>
 
 		<!--  Show product -->
 		<div class="div5"<?php if ($conf->global->TAKEPOS_NO_CATEGORY == 1) {
 			print ' style="width:100%;"';
-		} ?>>
+						 } ?>>
 	<?php
 	$count = 0;
 	while ($count < $MAXPRODUCT) {
@@ -1243,14 +1243,14 @@ if (!empty($conf->global->TAKEPOS_WEIGHING_SCALE)) {
 		} else {
 			print '<div class="wrapper2" id="prodiv'.$count.'" ';
 		}
-	?>
+		?>
 				<?php if ($count == ($MAXPRODUCT - 2)) {
 					?> onclick="MoreProducts('less');" <?php
-												} if ($count == ($MAXPRODUCT - 1)) {
-													?> onclick="MoreProducts('more');" <?php
-												} else {
-													echo 'onclick="ClickProduct('.$count.');"';
-												} ?>>
+				} if ($count == ($MAXPRODUCT - 1)) {
+					?> onclick="MoreProducts('more');" <?php
+				} else {
+					echo 'onclick="ClickProduct('.$count.');"';
+				} ?>>
 					<?php
 					if ($count == ($MAXPRODUCT - 2)) {
 						//echo '<img class="imgwrapper" src="img/arrow-prev-top.png" height="100%" id="proimg'.$count.'" />';

From 1ca199d7962505f92be5af52a11d409385bda992 Mon Sep 17 00:00:00 2001
From: kamel <kamel@kam>
Date: Tue, 7 Dec 2021 17:11:34 +0100
Subject: [PATCH 015/316] FIX: Update swiftmailer librairies

---
 .../EmailValidator/EmailLexer.php             |  74 ++-
 .../EmailValidator/EmailParser.php            |  39 +-
 .../EmailValidator/EmailValidator.php         |  10 +-
 .../Exception/DomainAcceptsNoMail.php         |   9 +
 .../Exception/ExpectingQPair.php              |   2 +-
 .../Exception/LocalOrReservedDomain.php       |   9 +
 .../EmailValidator/Exception/NoDNSRecord.php  |   2 -
 .../Exception/UnclosedComment.php             |   2 +-
 .../EmailValidator/Parser/DomainPart.php      | 125 ++++-
 .../EmailValidator/Parser/LocalPart.php       |  25 +-
 .../EmailValidator/Parser/Parser.php          |  40 +-
 .../Validation/DNSCheckValidation.php         | 129 ++++-
 .../Exception/EmptyValidationList.php         |   3 +
 .../Validation/MultipleErrors.php             |   8 +-
 .../Validation/MultipleValidationWithAnd.php  |  22 +-
 .../Validation/NoRFCWarningsValidation.php    |   5 +-
 .../Validation/RFCValidation.php              |   4 +-
 .../Validation/SpoofCheckValidation.php       |   8 +-
 .../EmailValidator/Warning/QuotedPart.php     |   4 +
 .../EmailValidator/Warning/QuotedString.php   |   4 +
 .../EmailValidator/Warning/Warning.php        |  23 +-
 .../Doctrine/Common/Lexer/AbstractLexer.php   |   5 +
 .../swiftmailer/lib/classes/Swift.php         |   9 +-
 .../lib/classes/Swift/AddressEncoder.php      |  25 +
 .../AddressEncoder/IdnAddressEncoder.php      |  50 ++
 .../AddressEncoder/Utf8AddressEncoder.php     |  36 ++
 .../classes/Swift/AddressEncoderException.php |  32 ++
 .../lib/classes/Swift/Attachment.php          |  11 +-
 .../AbstractFilterableInputStream.php         |  15 +-
 .../Swift/ByteStream/ArrayByteStream.php      |  20 +-
 .../Swift/ByteStream/FileByteStream.php       |  14 +-
 .../ByteStream/TemporaryFileByteStream.php    |  14 +-
 .../GenericFixedWidthReader.php               |   2 +-
 .../Swift/CharacterReader/UsAsciiReader.php   |   4 +-
 .../Swift/CharacterReader/Utf8Reader.php      |  22 +-
 .../SimpleCharacterReaderFactory.php          |  34 +-
 .../lib/classes/Swift/CharacterStream.php     |   2 -
 .../CharacterStream/ArrayCharacterStream.php  |  40 +-
 .../CharacterStream/NgCharacterStream.php     |  17 +-
 .../lib/classes/Swift/DependencyContainer.php |  62 ++-
 .../lib/classes/Swift/EmbeddedFile.php        |   4 +-
 .../classes/Swift/Encoder/Base64Encoder.php   |   2 +-
 .../lib/classes/Swift/Encoder/QpEncoder.php   |  34 +-
 .../classes/Swift/Encoder/Rfc2231Encoder.php  |   8 +-
 .../lib/classes/Swift/Events/CommandEvent.php |   9 +-
 .../classes/Swift/Events/CommandListener.php  |   2 -
 .../classes/Swift/Events/EventDispatcher.php  |  25 +-
 .../lib/classes/Swift/Events/EventObject.php  |   2 -
 .../classes/Swift/Events/ResponseEvent.php    |   5 +-
 .../classes/Swift/Events/ResponseListener.php |   2 -
 .../lib/classes/Swift/Events/SendEvent.php    |   5 +-
 .../lib/classes/Swift/Events/SendListener.php |   4 -
 .../Swift/Events/SimpleEventDispatcher.php    |  56 +-
 .../Swift/Events/TransportChangeListener.php  |   8 -
 .../Swift/Events/TransportExceptionEvent.php  |   3 -
 .../Events/TransportExceptionListener.php     |   2 -
 .../lib/classes/Swift/FailoverTransport.php   |   6 +-
 .../lib/classes/Swift/FileSpool.php           |   8 +-
 .../lib/classes/Swift/Filterable.php          |   3 +-
 .../lib/classes/Swift/InputByteStream.php     |   4 +-
 .../lib/classes/Swift/IoException.php         |   5 +-
 .../lib/classes/Swift/KeyCache.php            |   7 +-
 .../classes/Swift/KeyCache/ArrayKeyCache.php  |  33 +-
 .../classes/Swift/KeyCache/DiskKeyCache.php   |  36 +-
 .../Swift/KeyCache/KeyCacheInputStream.php    |   4 -
 .../classes/Swift/KeyCache/NullKeyCache.php   |  12 +-
 .../KeyCache/SimpleKeyCacheInputStream.php    |   4 -
 .../classes/Swift/LoadBalancedTransport.php   |   6 +-
 .../swiftmailer/lib/classes/Swift/Mailer.php  |   8 +-
 .../Swift/Mailer/ArrayRecipientIterator.php   |   4 +-
 .../lib/classes/Swift/MemorySpool.php         |   2 +-
 .../swiftmailer/lib/classes/Swift/Message.php |  45 +-
 .../lib/classes/Swift/Mime/Attachment.php     |  15 +-
 .../ContentEncoder/Base64ContentEncoder.php   |  21 +-
 .../ContentEncoder/NativeQpContentEncoder.php |  20 +-
 .../ContentEncoder/NullContentEncoder.php     |  79 +++
 .../ContentEncoder/PlainContentEncoder.php    |  24 +-
 .../Mime/ContentEncoder/QpContentEncoder.php  |  10 +-
 .../ContentEncoder/QpContentEncoderProxy.php  |   6 +-
 .../Mime/ContentEncoder/RawContentEncoder.php |   9 +-
 .../lib/classes/Swift/Mime/EmbeddedFile.php   |   8 +-
 .../classes/Swift/Mime/EncodingObserver.php   |   2 -
 .../lib/classes/Swift/Mime/Header.php         |   2 +-
 .../HeaderEncoder/Base64HeaderEncoder.php     |   2 +-
 .../Mime/HeaderEncoder/QpHeaderEncoder.php    |   6 +-
 .../Swift/Mime/Headers/AbstractHeader.php     |  61 ++-
 .../classes/Swift/Mime/Headers/DateHeader.php |   2 -
 .../Mime/Headers/IdentificationHeader.php     |  25 +-
 .../Swift/Mime/Headers/MailboxHeader.php      |  25 +-
 .../Swift/Mime/Headers/OpenDKIMHeader.php     |   4 +-
 .../Mime/Headers/ParameterizedHeader.php      |  28 +-
 .../classes/Swift/Mime/Headers/PathHeader.php |  15 +-
 .../Swift/Mime/Headers/UnstructuredHeader.php |   3 +-
 .../lib/classes/Swift/Mime/IdGenerator.php    |   7 +-
 .../lib/classes/Swift/Mime/MimePart.php       |  23 +-
 .../Swift/Mime/SimpleHeaderFactory.php        |  24 +-
 .../classes/Swift/Mime/SimpleHeaderSet.php    |  88 ++--
 .../lib/classes/Swift/Mime/SimpleMessage.php  |  65 +--
 .../classes/Swift/Mime/SimpleMimeEntity.php   |  99 ++--
 .../lib/classes/Swift/MimePart.php            |   4 +-
 .../lib/classes/Swift/NullTransport.php       |   4 +-
 .../classes/Swift/Plugins/AntiFloodPlugin.php |   4 -
 .../Swift/Plugins/BandwidthMonitorPlugin.php  |  18 +-
 .../classes/Swift/Plugins/DecoratorPlugin.php |  28 +-
 .../Swift/Plugins/ImpersonatePlugin.php       |   4 -
 .../classes/Swift/Plugins/LoggerPlugin.php    |  24 +-
 .../Swift/Plugins/Loggers/ArrayLogger.php     |   6 +-
 .../classes/Swift/Plugins/MessageLogger.php   |  14 +-
 .../Swift/Plugins/PopBeforeSmtpPlugin.php     |  37 +-
 .../Swift/Plugins/RedirectingPlugin.php       |  26 +-
 .../lib/classes/Swift/Plugins/Reporter.php    |   5 +-
 .../classes/Swift/Plugins/ReporterPlugin.php  |  10 +-
 .../Swift/Plugins/Reporters/HitReporter.php   |  11 +-
 .../Swift/Plugins/Reporters/HtmlReporter.php  |   5 +-
 .../classes/Swift/Plugins/ThrottlerPlugin.php |   6 +-
 .../lib/classes/Swift/Preferences.php         |   2 +-
 .../lib/classes/Swift/SendmailTransport.php   |   4 +-
 .../swiftmailer/lib/classes/Swift/Signer.php  |   1 -
 .../lib/classes/Swift/Signers/BodySigner.php  |   2 -
 .../lib/classes/Swift/Signers/DKIMSigner.php  |  78 ++-
 .../classes/Swift/Signers/DomainKeySigner.php |  46 +-
 .../classes/Swift/Signers/HeaderSigner.php    |   4 -
 .../classes/Swift/Signers/OpenDKIMSigner.php  |  28 +-
 .../lib/classes/Swift/Signers/SMimeSigner.php | 485 +++++++++++-------
 .../lib/classes/Swift/SmtpTransport.php       |  17 +-
 .../lib/classes/Swift/SpoolTransport.php      |   6 +-
 .../ByteArrayReplacementFilter.php            |  44 +-
 .../StringReplacementFilterFactory.php        |   6 +-
 .../lib/classes/Swift/SwiftException.php      |   5 +-
 .../lib/classes/Swift/Transport.php           |   7 +-
 .../Swift/Transport/AbstractSmtpTransport.php | 164 +++---
 .../Esmtp/Auth/CramMd5Authenticator.php       |  28 +-
 .../Esmtp/Auth/LoginAuthenticator.php         |  18 +-
 .../Esmtp/Auth/NTLMAuthenticator.php          | 123 ++---
 .../Esmtp/Auth/PlainAuthenticator.php         |  16 +-
 .../Esmtp/Auth/XOAuth2Authenticator.php       |  14 +-
 .../Swift/Transport/Esmtp/AuthHandler.php     |  47 +-
 .../Swift/Transport/Esmtp/Authenticator.php   |   9 +-
 .../Transport/Esmtp/EightBitMimeHandler.php   | 113 ++++
 .../Swift/Transport/Esmtp/SmtpUtf8Handler.php | 107 ++++
 .../classes/Swift/Transport/EsmtpHandler.php  |   4 +-
 .../Swift/Transport/EsmtpTransport.php        | 101 ++--
 .../Swift/Transport/FailoverTransport.php     |  15 +-
 .../lib/classes/Swift/Transport/IoBuffer.php  |   2 -
 .../Swift/Transport/LoadBalancedTransport.php |  23 +-
 .../classes/Swift/Transport/NullTransport.php |  11 +-
 .../Swift/Transport/SendmailTransport.php     |  31 +-
 .../lib/classes/Swift/Transport/SmtpAgent.php |   2 +-
 .../Swift/Transport/SpoolTransport.php        |   7 +-
 .../classes/Swift/Transport/StreamBuffer.php  |  65 ++-
 .../lib/classes/Swift/TransportException.php  |   5 +-
 .../lib/dependency_maps/cache_deps.php        |   4 +-
 .../lib/dependency_maps/mime_deps.php         |  62 +--
 .../lib/dependency_maps/transport_deps.php    |  56 +-
 .../includes/swiftmailer/lib/mime_types.php   |   4 +-
 .../lib/swiftmailer_generate_mimes_config.php |  43 +-
 156 files changed, 2370 insertions(+), 1637 deletions(-)
 create mode 100644 htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/DomainAcceptsNoMail.php
 create mode 100644 htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/LocalOrReservedDomain.php
 create mode 100644 htdocs/includes/swiftmailer/lib/classes/Swift/AddressEncoder.php
 create mode 100644 htdocs/includes/swiftmailer/lib/classes/Swift/AddressEncoder/IdnAddressEncoder.php
 create mode 100644 htdocs/includes/swiftmailer/lib/classes/Swift/AddressEncoder/Utf8AddressEncoder.php
 create mode 100644 htdocs/includes/swiftmailer/lib/classes/Swift/AddressEncoderException.php
 create mode 100644 htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NullContentEncoder.php
 create mode 100644 htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/EightBitMimeHandler.php
 create mode 100644 htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/SmtpUtf8Handler.php

diff --git a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/EmailLexer.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/EmailLexer.php
index 882c968154d..59dcd5876fd 100644
--- a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/EmailLexer.php
+++ b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/EmailLexer.php
@@ -13,6 +13,8 @@ class EmailLexer extends AbstractLexer
     const S_BACKSLASH        = 92;
     const S_DOT              = 46;
     const S_DQUOTE           = 34;
+    const S_SQUOTE           = 39;
+    const S_BACKTICK         = 96;
     const S_OPENPARENTHESIS  = 49;
     const S_CLOSEPARENTHESIS = 261;
     const S_OPENBRACKET      = 262;
@@ -58,6 +60,8 @@ class EmailLexer extends AbstractLexer
         '/'    => self::S_SLASH,
         ','    => self::S_COMMA,
         '.'    => self::S_DOT,
+        "'"    => self::S_SQUOTE,
+        "`"    => self::S_BACKTICK,
         '"'    => self::S_DQUOTE,
         '-'    => self::S_HYPHEN,
         '::'   => self::S_DOUBLECOLON,
@@ -73,25 +77,73 @@ class EmailLexer extends AbstractLexer
         '\0'   => self::C_NUL,
     );
 
+    /**
+     * @var bool
+     */
     protected $hasInvalidTokens = false;
 
-    protected $previous;
+    /**
+     * @var array
+     *
+     * @psalm-var array{value:string, type:null|int, position:int}|array<empty, empty>
+     */
+    protected $previous = [];
 
+    /**
+     * The last matched/seen token.
+     *
+     * @var array
+     *
+     * @psalm-var array{value:string, type:null|int, position:int}
+     */
+    public $token;
+
+    /**
+     * The next token in the input.
+     *
+     * @var array|null
+     */
+    public $lookahead;
+
+    /**
+     * @psalm-var array{value:'', type:null, position:0}
+     */
+    private static $nullToken = [
+        'value' => '',
+        'type' => null,
+        'position' => 0,
+    ];
+
+    public function __construct()
+    {
+        $this->previous = $this->token = self::$nullToken;
+        $this->lookahead = null;
+    }
+
+    /**
+     * @return void
+     */
     public function reset()
     {
         $this->hasInvalidTokens = false;
         parent::reset();
+        $this->previous = $this->token = self::$nullToken;
     }
 
+    /**
+     * @return bool
+     */
     public function hasInvalidTokens()
     {
         return $this->hasInvalidTokens;
     }
 
     /**
-     * @param $type
+     * @param int $type
      * @throws \UnexpectedValueException
      * @return boolean
+     *
+     * @psalm-suppress InvalidScalarArgument
      */
     public function find($type)
     {
@@ -107,7 +159,7 @@ class EmailLexer extends AbstractLexer
     /**
      * getPrevious
      *
-     * @return array token
+     * @return array
      */
     public function getPrevious()
     {
@@ -122,8 +174,10 @@ class EmailLexer extends AbstractLexer
     public function moveNext()
     {
         $this->previous = $this->token;
+        $hasNext = parent::moveNext();
+        $this->token = $this->token ?: self::$nullToken;
 
-        return parent::moveNext();
+        return $hasNext;
     }
 
     /**
@@ -179,6 +233,11 @@ class EmailLexer extends AbstractLexer
         return  self::GENERIC;
     }
 
+    /**
+     * @param string $value
+     *
+     * @return bool
+     */
     protected function isValid($value)
     {
         if (isset($this->charValue[$value])) {
@@ -189,7 +248,7 @@ class EmailLexer extends AbstractLexer
     }
 
     /**
-     * @param $value
+     * @param string $value
      * @return bool
      */
     protected function isNullType($value)
@@ -202,7 +261,7 @@ class EmailLexer extends AbstractLexer
     }
 
     /**
-     * @param $value
+     * @param string $value
      * @return bool
      */
     protected function isUTF8Invalid($value)
@@ -214,6 +273,9 @@ class EmailLexer extends AbstractLexer
         return false;
     }
 
+    /**
+     * @return string
+     */
     protected function getModifiers()
     {
         return 'iu';
diff --git a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/EmailParser.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/EmailParser.php
index d0627d82410..6b7bad66927 100644
--- a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/EmailParser.php
+++ b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/EmailParser.php
@@ -17,11 +17,33 @@ class EmailParser
 {
     const EMAIL_MAX_LENGTH = 254;
 
-    protected $warnings;
+    /**
+     * @var array
+     */
+    protected $warnings = [];
+
+    /**
+     * @var string
+     */
     protected $domainPart = '';
+
+    /**
+     * @var string
+     */
     protected $localPart = '';
+    /**
+     * @var EmailLexer
+     */
     protected $lexer;
+
+    /**
+     * @var LocalPart
+     */
     protected $localPartParser;
+
+    /**
+     * @var DomainPart
+     */
     protected $domainPartParser;
 
     public function __construct(EmailLexer $lexer)
@@ -29,11 +51,10 @@ class EmailParser
         $this->lexer = $lexer;
         $this->localPartParser = new LocalPart($this->lexer);
         $this->domainPartParser = new DomainPart($this->lexer);
-        $this->warnings = new \SplObjectStorage();
     }
 
     /**
-     * @param $str
+     * @param string $str
      * @return array
      */
     public function parse($str)
@@ -57,6 +78,9 @@ class EmailParser
         return array('local' => $this->localPart, 'domain' => $this->domainPart);
     }
 
+    /**
+     * @return Warning\Warning[]
+     */
     public function getWarnings()
     {
         $localPartWarnings = $this->localPartParser->getWarnings();
@@ -68,11 +92,17 @@ class EmailParser
         return $this->warnings;
     }
 
+    /**
+     * @return string
+     */
     public function getParsedDomainPart()
     {
         return $this->domainPart;
     }
 
+    /**
+     * @param string $email
+     */
     protected function setParts($email)
     {
         $parts = explode('@', $email);
@@ -80,6 +110,9 @@ class EmailParser
         $this->localPart = $parts[0];
     }
 
+    /**
+     * @return bool
+     */
     protected function hasAtToken()
     {
         $this->lexer->moveNext();
diff --git a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/EmailValidator.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/EmailValidator.php
index 44b4b93c6bb..a30f21dcd30 100644
--- a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/EmailValidator.php
+++ b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/EmailValidator.php
@@ -13,12 +13,12 @@ class EmailValidator
     private $lexer;
 
     /**
-     * @var array
+     * @var Warning\Warning[]
      */
-    protected $warnings;
+    protected $warnings = [];
 
     /**
-     * @var InvalidEmail
+     * @var InvalidEmail|null
      */
     protected $error;
 
@@ -28,7 +28,7 @@ class EmailValidator
     }
 
     /**
-     * @param                 $email
+     * @param string          $email
      * @param EmailValidation $emailValidation
      * @return bool
      */
@@ -58,7 +58,7 @@ class EmailValidator
     }
 
     /**
-     * @return InvalidEmail
+     * @return InvalidEmail|null
      */
     public function getError()
     {
diff --git a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/DomainAcceptsNoMail.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/DomainAcceptsNoMail.php
new file mode 100644
index 00000000000..40a99705ce9
--- /dev/null
+++ b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/DomainAcceptsNoMail.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+class DomainAcceptsNoMail extends InvalidEmail
+{
+    const CODE = 154;
+    const REASON = 'Domain accepts no mail (Null MX, RFC7505)';
+}
\ No newline at end of file
diff --git a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/ExpectingQPair.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/ExpectingQPair.php
index 2502811cac0..a738eeb62f0 100644
--- a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/ExpectingQPair.php
+++ b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/ExpectingQPair.php
@@ -2,7 +2,7 @@
 
 namespace Egulias\EmailValidator\Exception;
 
-class ExpectedQPair extends InvalidEmail
+class ExpectingQPair extends InvalidEmail
 {
     const CODE = 136;
     const REASON = "Expecting QPAIR";
diff --git a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/LocalOrReservedDomain.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/LocalOrReservedDomain.php
new file mode 100644
index 00000000000..695b05a46d4
--- /dev/null
+++ b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/LocalOrReservedDomain.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+class LocalOrReservedDomain extends InvalidEmail
+{
+    const CODE = 153;
+    const REASON = 'Local, mDNS or reserved domain (RFC2606, RFC6762)';
+}
\ No newline at end of file
diff --git a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/NoDNSRecord.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/NoDNSRecord.php
index 86ca21d557b..0aa5fa78902 100644
--- a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/NoDNSRecord.php
+++ b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/NoDNSRecord.php
@@ -2,8 +2,6 @@
 
 namespace Egulias\EmailValidator\Exception;
 
-use Egulias\EmailValidator\Exception\InvalidEmail;
-
 class NoDNSRecord extends InvalidEmail
 {
     const CODE = 5;
diff --git a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/UnclosedComment.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/UnclosedComment.php
index c87c97ac773..86b2b09622d 100644
--- a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/UnclosedComment.php
+++ b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/UnclosedComment.php
@@ -5,5 +5,5 @@ namespace Egulias\EmailValidator\Exception;
 class UnclosedComment extends InvalidEmail
 {
     const CODE = 146;
-    const REASON = "No colosing comment token found";
+    const REASON = "No closing comment token found";
 }
diff --git a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Parser/DomainPart.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Parser/DomainPart.php
index 51769dea1b2..4dadba8af7c 100644
--- a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Parser/DomainPart.php
+++ b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Parser/DomainPart.php
@@ -35,27 +35,18 @@ use Egulias\EmailValidator\Warning\TLD;
 class DomainPart extends Parser
 {
     const DOMAIN_MAX_LENGTH = 254;
+    const LABEL_MAX_LENGTH = 63;
+
+    /**
+     * @var string
+     */
     protected $domainPart = '';
 
     public function parse($domainPart)
     {
         $this->lexer->moveNext();
 
-        if ($this->lexer->token['type'] === EmailLexer::S_DOT) {
-            throw new DotAtStart();
-        }
-
-        if ($this->lexer->token['type'] === EmailLexer::S_EMPTY) {
-            throw new NoDomainPart();
-        }
-        if ($this->lexer->token['type'] === EmailLexer::S_HYPHEN) {
-            throw new DomainHyphened();
-        }
-
-        if ($this->lexer->token['type'] === EmailLexer::S_OPENPARENTHESIS) {
-            $this->warnings[DeprecatedComment::CODE] = new DeprecatedComment();
-            $this->parseDomainComments();
-        }
+        $this->performDomainStartChecks();
 
         $domain = $this->doParseDomainPart();
 
@@ -77,11 +68,50 @@ class DomainPart extends Parser
         $this->domainPart = $domain;
     }
 
+    private function performDomainStartChecks()
+    {
+        $this->checkInvalidTokensAfterAT();
+        $this->checkEmptyDomain();
+
+        if ($this->lexer->token['type'] === EmailLexer::S_OPENPARENTHESIS) {
+            $this->warnings[DeprecatedComment::CODE] = new DeprecatedComment();
+            $this->parseDomainComments();
+        }
+    }
+
+    private function checkEmptyDomain()
+    {
+        $thereIsNoDomain = $this->lexer->token['type'] === EmailLexer::S_EMPTY ||
+            ($this->lexer->token['type'] === EmailLexer::S_SP &&
+            !$this->lexer->isNextToken(EmailLexer::GENERIC));
+
+        if ($thereIsNoDomain) {
+            throw new NoDomainPart();
+        }
+    }
+
+    private function checkInvalidTokensAfterAT()
+    {
+        if ($this->lexer->token['type'] === EmailLexer::S_DOT) {
+            throw new DotAtStart();
+        }
+        if ($this->lexer->token['type'] === EmailLexer::S_HYPHEN) {
+            throw new DomainHyphened();
+        }
+    }
+
+    /**
+     * @return string
+     */
     public function getDomainPart()
     {
         return $this->domainPart;
     }
 
+    /**
+     * @param string $addressLiteral
+     * @param int $maxGroups
+     */
     public function checkIPV6Tag($addressLiteral, $maxGroups = 8)
     {
         $prev = $this->lexer->getPrevious();
@@ -125,9 +155,13 @@ class DomainPart extends Parser
         }
     }
 
+    /**
+     * @return string
+     */
     protected function doParseDomainPart()
     {
         $domain = '';
+        $label = '';
         $openedParenthesis = 0;
         do {
             $prev = $this->lexer->getPrevious();
@@ -158,7 +192,12 @@ class DomainPart extends Parser
                 $this->parseDomainLiteral();
             }
 
-            $this->checkLabelLength($prev);
+            if ($this->lexer->token['type'] === EmailLexer::S_DOT) {
+                $this->checkLabelLength($label);
+                $label = '';
+            } else {
+                $label .= $this->lexer->token['value'];
+            }
 
             if ($this->isFWS()) {
                 $this->parseFWS();
@@ -166,12 +205,17 @@ class DomainPart extends Parser
 
             $domain .= $this->lexer->token['value'];
             $this->lexer->moveNext();
-        } while ($this->lexer->token);
+            if ($this->lexer->token['type'] === EmailLexer::S_SP) {
+                throw new CharNotAllowed();
+            }
+        } while (null !== $this->lexer->token['type']);
+
+        $this->checkLabelLength($label);
 
         return $domain;
     }
 
-    private function checkNotAllowedChars($token)
+    private function checkNotAllowedChars(array $token)
     {
         $notAllowed = [EmailLexer::S_BACKSLASH => true, EmailLexer::S_SLASH=> true];
         if (isset($notAllowed[$token['type']])) {
@@ -179,6 +223,9 @@ class DomainPart extends Parser
         }
     }
 
+    /**
+     * @return string|false
+     */
     protected function parseDomainLiteral()
     {
         if ($this->lexer->isNextToken(EmailLexer::S_COLON)) {
@@ -195,6 +242,9 @@ class DomainPart extends Parser
         return $this->doParseDomainLiteral();
     }
 
+    /**
+     * @return string|false
+     */
     protected function doParseDomainLiteral()
     {
         $IPv6TAG = false;
@@ -262,6 +312,11 @@ class DomainPart extends Parser
         return $addressLiteral;
     }
 
+    /**
+     * @param string $addressLiteral
+     *
+     * @return string|false
+     */
     protected function checkIPV4Tag($addressLiteral)
     {
         $matchesIP  = array();
@@ -279,16 +334,18 @@ class DomainPart extends Parser
                 return false;
             }
             // Convert IPv4 part to IPv6 format for further testing
-            $addressLiteral = substr($addressLiteral, 0, $index) . '0:0';
+            $addressLiteral = substr($addressLiteral, 0, (int) $index) . '0:0';
         }
 
         return $addressLiteral;
     }
 
-    protected function checkDomainPartExceptions($prev)
+    protected function checkDomainPartExceptions(array $prev)
     {
         $invalidDomainTokens = array(
             EmailLexer::S_DQUOTE => true,
+            EmailLexer::S_SQUOTE => true,
+            EmailLexer::S_BACKTICK => true,
             EmailLexer::S_SEMICOLON => true,
             EmailLexer::S_GREATERTHAN => true,
             EmailLexer::S_LOWERTHAN => true,
@@ -320,6 +377,9 @@ class DomainPart extends Parser
         }
     }
 
+    /**
+     * @return bool
+     */
     protected function hasBrackets()
     {
         if ($this->lexer->token['type'] !== EmailLexer::S_OPENBRACKET) {
@@ -335,16 +395,31 @@ class DomainPart extends Parser
         return true;
     }
 
-    protected function checkLabelLength($prev)
+    /**
+     * @param string $label
+     */
+    protected function checkLabelLength($label)
     {
-        if ($this->lexer->token['type'] === EmailLexer::S_DOT &&
-            $prev['type'] === EmailLexer::GENERIC &&
-            strlen($prev['value']) > 63
-        ) {
+        if ($this->isLabelTooLong($label)) {
             $this->warnings[LabelTooLong::CODE] = new LabelTooLong();
         }
     }
 
+    /**
+     * @param string $label
+     * @return bool
+     */
+    private function isLabelTooLong($label)
+    {
+        if (preg_match('/[^\x00-\x7F]/', $label)) {
+            idn_to_ascii($label, IDNA_DEFAULT, INTL_IDNA_VARIANT_UTS46, $idnaInfo);
+
+            return (bool) ($idnaInfo['errors'] & IDNA_ERROR_LABEL_TOO_LONG);
+        }
+
+        return strlen($label) > self::LABEL_MAX_LENGTH;
+    }
+
     protected function parseDomainComments()
     {
         $this->isUnclosedComment();
diff --git a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Parser/LocalPart.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Parser/LocalPart.php
index 8ab16ab4a1f..3c21f34ac07 100644
--- a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Parser/LocalPart.php
+++ b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Parser/LocalPart.php
@@ -5,7 +5,6 @@ namespace Egulias\EmailValidator\Parser;
 use Egulias\EmailValidator\Exception\DotAtEnd;
 use Egulias\EmailValidator\Exception\DotAtStart;
 use Egulias\EmailValidator\EmailLexer;
-use Egulias\EmailValidator\EmailValidator;
 use Egulias\EmailValidator\Exception\ExpectingAT;
 use Egulias\EmailValidator\Exception\ExpectingATEXT;
 use Egulias\EmailValidator\Exception\UnclosedQuotedString;
@@ -20,9 +19,10 @@ class LocalPart extends Parser
         $parseDQuote = true;
         $closingQuote = false;
         $openedParenthesis = 0;
+        $totalLength = 0;
 
-        while ($this->lexer->token['type'] !== EmailLexer::S_AT && $this->lexer->token) {
-            if ($this->lexer->token['type'] === EmailLexer::S_DOT && !$this->lexer->getPrevious()) {
+        while ($this->lexer->token['type'] !== EmailLexer::S_AT && null !== $this->lexer->token['type']) {
+            if ($this->lexer->token['type'] === EmailLexer::S_DOT && null === $this->lexer->getPrevious()['type']) {
                 throw new DotAtStart();
             }
 
@@ -35,12 +35,13 @@ class LocalPart extends Parser
                 $this->parseComments();
                 $openedParenthesis += $this->getOpenedParenthesis();
             }
+
             if ($this->lexer->token['type'] === EmailLexer::S_CLOSEPARENTHESIS) {
                 if ($openedParenthesis === 0) {
                     throw new UnopenedComment();
-                } else {
-                    $openedParenthesis--;
                 }
+
+                $openedParenthesis--;
             }
 
             $this->checkConsecutiveDots();
@@ -58,15 +59,18 @@ class LocalPart extends Parser
                 $this->parseFWS();
             }
 
+            $totalLength += strlen($this->lexer->token['value']);
             $this->lexer->moveNext();
         }
 
-        $prev = $this->lexer->getPrevious();
-        if (strlen($prev['value']) > LocalTooLong::LOCAL_PART_LENGTH) {
+        if ($totalLength > LocalTooLong::LOCAL_PART_LENGTH) {
             $this->warnings[LocalTooLong::CODE] = new LocalTooLong();
         }
     }
 
+    /**
+     * @return bool
+     */
     protected function parseDoubleQuote()
     {
         $parseAgain = true;
@@ -86,7 +90,7 @@ class LocalPart extends Parser
 
         $this->lexer->moveNext();
 
-        while ($this->lexer->token['type'] !== EmailLexer::S_DQUOTE && $this->lexer->token) {
+        while ($this->lexer->token['type'] !== EmailLexer::S_DQUOTE && null !== $this->lexer->token['type']) {
             $parseAgain = false;
             if (isset($special[$this->lexer->token['type']]) && $setSpecialsWarning) {
                 $this->warnings[CFWSWithFWS::CODE] = new CFWSWithFWS();
@@ -118,7 +122,10 @@ class LocalPart extends Parser
         return $parseAgain;
     }
 
-    protected function isInvalidToken($token, $closingQuote)
+    /**
+     * @param bool $closingQuote
+     */
+    protected function isInvalidToken(array $token, $closingQuote)
     {
         $forbidden = array(
             EmailLexer::S_COMMA,
diff --git a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Parser/Parser.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Parser/Parser.php
index e5042e1a859..ccdc93889a2 100644
--- a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Parser/Parser.php
+++ b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Parser/Parser.php
@@ -8,7 +8,7 @@ use Egulias\EmailValidator\Exception\ConsecutiveDot;
 use Egulias\EmailValidator\Exception\CRLFAtTheEnd;
 use Egulias\EmailValidator\Exception\CRLFX2;
 use Egulias\EmailValidator\Exception\CRNoLF;
-use Egulias\EmailValidator\Exception\ExpectedQPair;
+use Egulias\EmailValidator\Exception\ExpectingQPair;
 use Egulias\EmailValidator\Exception\ExpectingATEXT;
 use Egulias\EmailValidator\Exception\ExpectingCTEXT;
 use Egulias\EmailValidator\Exception\UnclosedComment;
@@ -21,8 +21,19 @@ use Egulias\EmailValidator\Warning\QuotedString;
 
 abstract class Parser
 {
+    /**
+     * @var array
+     */
     protected $warnings = [];
+
+    /**
+     * @var EmailLexer
+     */
     protected $lexer;
+
+    /**
+     * @var int
+     */
     protected $openedParenthesis = 0;
 
     public function __construct(EmailLexer $lexer)
@@ -30,11 +41,17 @@ abstract class Parser
         $this->lexer = $lexer;
     }
 
+    /**
+     * @return \Egulias\EmailValidator\Warning\Warning[]
+     */
     public function getWarnings()
     {
         return $this->warnings;
     }
 
+    /**
+     * @param string $str
+     */
     abstract public function parse($str);
 
     /** @return int */
@@ -50,7 +67,7 @@ abstract class Parser
     {
         if (!($this->lexer->token['type'] === EmailLexer::INVALID
             || $this->lexer->token['type'] === EmailLexer::C_DEL)) {
-            throw new ExpectedQPair();
+            throw new ExpectingQPair();
         }
 
         $this->warnings[QuotedPart::CODE] =
@@ -80,6 +97,9 @@ abstract class Parser
         }
     }
 
+    /**
+     * @return bool
+     */
     protected function isUnclosedComment()
     {
         try {
@@ -122,6 +142,9 @@ abstract class Parser
         }
     }
 
+    /**
+     * @return bool
+     */
     protected function isFWS()
     {
         if ($this->escaped()) {
@@ -140,11 +163,14 @@ abstract class Parser
         return false;
     }
 
+    /**
+     * @return bool
+     */
     protected function escaped()
     {
         $previous = $this->lexer->getPrevious();
 
-        if ($previous['type'] === EmailLexer::S_BACKSLASH
+        if ($previous && $previous['type'] === EmailLexer::S_BACKSLASH
             &&
             $this->lexer->token['type'] !== EmailLexer::GENERIC
         ) {
@@ -154,6 +180,9 @@ abstract class Parser
         return false;
     }
 
+    /**
+     * @return bool
+     */
     protected function warnEscaping()
     {
         if ($this->lexer->token['type'] !== EmailLexer::S_BACKSLASH) {
@@ -174,6 +203,11 @@ abstract class Parser
 
     }
 
+    /**
+     * @param bool $hasClosingQuote
+     *
+     * @return bool
+     */
     protected function checkDQUOTE($hasClosingQuote)
     {
         if ($this->lexer->token['type'] !== EmailLexer::S_DQUOTE) {
diff --git a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/DNSCheckValidation.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/DNSCheckValidation.php
index ecca1dd976a..491082a590f 100644
--- a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/DNSCheckValidation.php
+++ b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/DNSCheckValidation.php
@@ -4,6 +4,8 @@ namespace Egulias\EmailValidator\Validation;
 
 use Egulias\EmailValidator\EmailLexer;
 use Egulias\EmailValidator\Exception\InvalidEmail;
+use Egulias\EmailValidator\Exception\LocalOrReservedDomain;
+use Egulias\EmailValidator\Exception\DomainAcceptsNoMail;
 use Egulias\EmailValidator\Warning\NoDNSMXRecord;
 use Egulias\EmailValidator\Exception\NoDNSRecord;
 
@@ -15,10 +17,23 @@ class DNSCheckValidation implements EmailValidation
     private $warnings = [];
 
     /**
-     * @var InvalidEmail
+     * @var InvalidEmail|null
      */
     private $error;
 
+    /**
+     * @var array
+     */
+    private $mxRecords = [];
+
+
+    public function __construct()
+    {
+        if (!function_exists('idn_to_ascii')) {
+            throw new \LogicException(sprintf('The %s class requires the Intl extension.', __CLASS__));
+        }
+    }
+
     public function isValid($email, EmailLexer $emailLexer)
     {
         // use the input to check DNS if we cannot extract something similar to a domain
@@ -29,7 +44,40 @@ class DNSCheckValidation implements EmailValidation
             $host = substr($email, $lastAtPos + 1);
         }
 
-        return $this->checkDNS($host);
+        // Get the domain parts
+        $hostParts = explode('.', $host);
+
+        // Reserved Top Level DNS Names (https://tools.ietf.org/html/rfc2606#section-2),
+        // mDNS and private DNS Namespaces (https://tools.ietf.org/html/rfc6762#appendix-G)
+        $reservedTopLevelDnsNames = [
+            // Reserved Top Level DNS Names
+            'test',
+            'example',
+            'invalid',
+            'localhost',
+
+            // mDNS
+            'local',
+
+            // Private DNS Namespaces
+            'intranet',
+            'internal',
+            'private',
+            'corp',
+            'home',
+            'lan',
+        ];
+
+        $isLocalDomain = count($hostParts) <= 1;
+        $isReservedTopLevel = in_array($hostParts[(count($hostParts) - 1)], $reservedTopLevelDnsNames, true);
+
+        // Exclude reserved top level DNS names
+        if ($isLocalDomain || $isReservedTopLevel) {
+            $this->error = new LocalOrReservedDomain();
+            return false;
+        }
+
+        return $this->checkDns($host);
     }
 
     public function getError()
@@ -42,20 +90,77 @@ class DNSCheckValidation implements EmailValidation
         return $this->warnings;
     }
 
-    protected function checkDNS($host)
+    /**
+     * @param string $host
+     *
+     * @return bool
+     */
+    protected function checkDns($host)
     {
-        $host = rtrim($host, '.') . '.';
+        $variant = INTL_IDNA_VARIANT_UTS46;
 
-        $Aresult = true;
-        $MXresult = checkdnsrr($host, 'MX');
+        $host = rtrim(idn_to_ascii($host, IDNA_DEFAULT, $variant), '.') . '.';
 
-        if (!$MXresult) {
-            $this->warnings[NoDNSMXRecord::CODE] = new NoDNSMXRecord();
-            $Aresult = checkdnsrr($host, 'A') || checkdnsrr($host, 'AAAA');
-            if (!$Aresult) {
-                $this->error = new NoDNSRecord();
+        return $this->validateDnsRecords($host);
+    }
+
+
+    /**
+     * Validate the DNS records for given host.
+     *
+     * @param string $host A set of DNS records in the format returned by dns_get_record.
+     *
+     * @return bool True on success.
+     */
+    private function validateDnsRecords($host)
+    {
+        // Get all MX, A and AAAA DNS records for host
+        // Using @ as workaround to fix https://bugs.php.net/bug.php?id=73149
+        $dnsRecords = @dns_get_record($host, DNS_MX + DNS_A + DNS_AAAA);
+
+
+        // No MX, A or AAAA DNS records
+        if (empty($dnsRecords)) {
+            $this->error = new NoDNSRecord();
+            return false;
+        }
+
+        // For each DNS record
+        foreach ($dnsRecords as $dnsRecord) {
+            if (!$this->validateMXRecord($dnsRecord)) {
+                return false;
             }
         }
-        return $MXresult || $Aresult;
+
+        // No MX records (fallback to A or AAAA records)
+        if (empty($this->mxRecords)) {
+            $this->warnings[NoDNSMXRecord::CODE] = new NoDNSMXRecord();
+        }
+
+        return true;
+    }
+
+    /**
+     * Validate an MX record
+     *
+     * @param array $dnsRecord Given DNS record.
+     *
+     * @return bool True if valid.
+     */
+    private function validateMxRecord($dnsRecord)
+    {
+        if ($dnsRecord['type'] !== 'MX') {
+            return true;
+        }
+
+        // "Null MX" record indicates the domain accepts no mail (https://tools.ietf.org/html/rfc7505)
+        if (empty($dnsRecord['target']) || $dnsRecord['target'] === '.') {
+            $this->error = new DomainAcceptsNoMail();
+            return false;
+        }
+
+        $this->mxRecords[] = $dnsRecord;
+
+        return true;
     }
 }
diff --git a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/Exception/EmptyValidationList.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/Exception/EmptyValidationList.php
index 775ad16fb51..ee7c41aa033 100644
--- a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/Exception/EmptyValidationList.php
+++ b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/Exception/EmptyValidationList.php
@@ -6,6 +6,9 @@ use Exception;
 
 class EmptyValidationList extends \InvalidArgumentException
 {
+    /**
+    * @param int $code
+    */
     public function __construct($code = 0, Exception $previous = null)
     {
         parent::__construct("Empty validation list is not allowed", $code, $previous);
diff --git a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/MultipleErrors.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/MultipleErrors.php
index d5e87d8ce06..3be59732664 100644
--- a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/MultipleErrors.php
+++ b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/MultipleErrors.php
@@ -9,16 +9,22 @@ class MultipleErrors extends InvalidEmail
     const CODE = 999;
     const REASON = "Accumulated errors for multiple validations";
     /**
-     * @var array
+     * @var InvalidEmail[]
      */
     private $errors = [];
 
+    /**
+     * @param InvalidEmail[] $errors
+     */
     public function __construct(array $errors)
     {
         $this->errors = $errors;
         parent::__construct();
     }
 
+    /**
+     * @return InvalidEmail[]
+     */
     public function getErrors()
     {
         return $this->errors;
diff --git a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/MultipleValidationWithAnd.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/MultipleValidationWithAnd.php
index 43fa42a64b7..feb224023da 100644
--- a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/MultipleValidationWithAnd.php
+++ b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/MultipleValidationWithAnd.php
@@ -30,12 +30,12 @@ class MultipleValidationWithAnd implements EmailValidation
     private $warnings = [];
 
     /**
-     * @var MultipleErrors
+     * @var MultipleErrors|null
      */
     private $error;
 
     /**
-     * @var bool
+     * @var int
      */
     private $mode;
 
@@ -62,7 +62,8 @@ class MultipleValidationWithAnd implements EmailValidation
         $errors = [];
         foreach ($this->validations as $validation) {
             $emailLexer->reset();
-            $result = $result && $validation->isValid($email, $emailLexer);
+            $validationResult = $validation->isValid($email, $emailLexer);
+            $result = $result && $validationResult;
             $this->warnings = array_merge($this->warnings, $validation->getWarnings());
             $errors = $this->addNewError($validation->getError(), $errors);
 
@@ -78,6 +79,12 @@ class MultipleValidationWithAnd implements EmailValidation
         return $result;
     }
 
+    /**
+     * @param \Egulias\EmailValidator\Exception\InvalidEmail|null $possibleError
+     * @param \Egulias\EmailValidator\Exception\InvalidEmail[] $errors
+     *
+     * @return \Egulias\EmailValidator\Exception\InvalidEmail[]
+     */
     private function addNewError($possibleError, array $errors)
     {
         if (null !== $possibleError) {
@@ -87,13 +94,20 @@ class MultipleValidationWithAnd implements EmailValidation
         return $errors;
     }
 
+    /**
+     * @param bool $result
+     *
+     * @return bool
+     */
     private function shouldStop($result)
     {
         return !$result && $this->mode === self::STOP_ON_ERROR;
     }
 
     /**
-     * {@inheritdoc}
+     * Returns the validation errors.
+     *
+     * @return MultipleErrors|null
      */
     public function getError()
     {
diff --git a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/NoRFCWarningsValidation.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/NoRFCWarningsValidation.php
index f3656b35a52..6b31e5440ec 100644
--- a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/NoRFCWarningsValidation.php
+++ b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/NoRFCWarningsValidation.php
@@ -9,7 +9,7 @@ use Egulias\EmailValidator\Validation\Error\RFCWarnings;
 class NoRFCWarningsValidation extends RFCValidation
 {
     /**
-     * @var InvalidEmail
+     * @var InvalidEmail|null
      */
     private $error;
 
@@ -22,8 +22,7 @@ class NoRFCWarningsValidation extends RFCValidation
             return false;
         }
 
-        $ret = $this->getWarnings();
-        if (empty($ret)) {
+        if (empty($this->getWarnings())) {
             return true;
         }
 
diff --git a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/RFCValidation.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/RFCValidation.php
index c4ffe35034b..8781e0b62d1 100644
--- a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/RFCValidation.php
+++ b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/RFCValidation.php
@@ -9,7 +9,7 @@ use Egulias\EmailValidator\Exception\InvalidEmail;
 class RFCValidation implements EmailValidation
 {
     /**
-     * @var EmailParser
+     * @var EmailParser|null
      */
     private $parser;
 
@@ -19,7 +19,7 @@ class RFCValidation implements EmailValidation
     private $warnings = [];
 
     /**
-     * @var InvalidEmail
+     * @var InvalidEmail|null
      */
     private $error;
 
diff --git a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/SpoofCheckValidation.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/SpoofCheckValidation.php
index 4721f0d8c98..e10bfabd92f 100644
--- a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/SpoofCheckValidation.php
+++ b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/SpoofCheckValidation.php
@@ -10,7 +10,7 @@ use \Spoofchecker;
 class SpoofCheckValidation implements EmailValidation
 {
     /**
-     * @var InvalidEmail
+     * @var InvalidEmail|null
      */
     private $error;
 
@@ -21,6 +21,9 @@ class SpoofCheckValidation implements EmailValidation
         }
     }
 
+    /**
+     * @psalm-suppress InvalidArgument
+     */
     public function isValid($email, EmailLexer $emailLexer)
     {
         $checker = new Spoofchecker();
@@ -33,6 +36,9 @@ class SpoofCheckValidation implements EmailValidation
         return $this->error === null;
     }
 
+    /**
+     * @return InvalidEmail|null
+     */
     public function getError()
     {
         return $this->error;
diff --git a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/QuotedPart.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/QuotedPart.php
index 7be9e6a3f25..36a4265a515 100644
--- a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/QuotedPart.php
+++ b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/QuotedPart.php
@@ -6,6 +6,10 @@ class QuotedPart extends Warning
 {
     const CODE = 36;
 
+    /**
+     * @param scalar $prevToken
+     * @param scalar $postToken
+     */
     public function __construct($prevToken, $postToken)
     {
         $this->message = "Deprecated Quoted String found between $prevToken and $postToken";
diff --git a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/QuotedString.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/QuotedString.php
index e9d56e1e032..817e4e84b07 100644
--- a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/QuotedString.php
+++ b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/QuotedString.php
@@ -6,6 +6,10 @@ class QuotedString extends Warning
 {
     const CODE = 11;
 
+    /**
+     * @param scalar $prevToken
+     * @param scalar $postToken
+     */
     public function __construct($prevToken, $postToken)
     {
         $this->message = "Quoted String found between $prevToken and $postToken";
diff --git a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/Warning.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/Warning.php
index ec6a365ffb7..a2ee7b0de1e 100644
--- a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/Warning.php
+++ b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/Warning.php
@@ -5,19 +5,36 @@ namespace Egulias\EmailValidator\Warning;
 abstract class Warning
 {
     const CODE = 0;
-    protected $message;
-    protected $rfcNumber;
 
+    /**
+     * @var string
+     */
+    protected $message = '';
+
+    /**
+     * @var int
+     */
+    protected $rfcNumber = 0;
+
+    /**
+     * @return string
+     */
     public function message()
     {
         return $this->message;
     }
 
+    /**
+     * @return int
+     */
     public function code()
     {
-        return self::CODE;
+        return static::CODE;
     }
 
+    /**
+     * @return int
+     */
     public function RFCNumber()
     {
         return $this->rfcNumber;
diff --git a/htdocs/includes/swiftmailer/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php b/htdocs/includes/swiftmailer/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php
index 399a55230b0..dd3ea768e3b 100644
--- a/htdocs/includes/swiftmailer/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php
+++ b/htdocs/includes/swiftmailer/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php
@@ -258,6 +258,11 @@ abstract class AbstractLexer
         $flags = PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_OFFSET_CAPTURE;
         $matches = preg_split($regex, $input, -1, $flags);
 
+        if (false === $matches) {
+            // Work around https://bugs.php.net/78122
+            $matches = array(array($input, 0));
+        }
+
         foreach ($matches as $match) {
             // Must remain before 'value' assignment since it can change content
             $type = $this->getType($match[0]);
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift.php b/htdocs/includes/swiftmailer/lib/classes/Swift.php
index e89703eaebb..51b19c9cb4e 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift.php
@@ -11,15 +11,14 @@
 /**
  * General utility class in Swift Mailer, not to be instantiated.
  *
- *
  * @author Chris Corbyn
  */
 abstract class Swift
 {
-    const VERSION = '6.0.2';
+    const VERSION = '6.3.0';
 
     public static $initialized = false;
-    public static $inits = array();
+    public static $inits = [];
 
     /**
      * Registers an initializer callable that will be called the first time
@@ -57,7 +56,7 @@ abstract class Swift
         if (self::$inits && !self::$initialized) {
             self::$initialized = true;
             foreach (self::$inits as $init) {
-                call_user_func($init);
+                \call_user_func($init);
             }
         }
     }
@@ -74,6 +73,6 @@ abstract class Swift
         if (null !== $callable) {
             self::$inits[] = $callable;
         }
-        spl_autoload_register(array('Swift', 'autoload'));
+        spl_autoload_register(['Swift', 'autoload']);
     }
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/AddressEncoder.php b/htdocs/includes/swiftmailer/lib/classes/Swift/AddressEncoder.php
new file mode 100644
index 00000000000..a1704ffb40a
--- /dev/null
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/AddressEncoder.php
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2018 Christian Schmidt
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Email address encoder.
+ *
+ * @author Christian Schmidt
+ */
+interface Swift_AddressEncoder
+{
+    /**
+     * Encodes an email address.
+     *
+     * @throws Swift_AddressEncoderException if the email cannot be represented in
+     *                                       the encoding implemented by this class
+     */
+    public function encodeString(string $address): string;
+}
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/AddressEncoder/IdnAddressEncoder.php b/htdocs/includes/swiftmailer/lib/classes/Swift/AddressEncoder/IdnAddressEncoder.php
new file mode 100644
index 00000000000..a373ef9d546
--- /dev/null
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/AddressEncoder/IdnAddressEncoder.php
@@ -0,0 +1,50 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2018 Christian Schmidt
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * An IDN email address encoder.
+ *
+ * Encodes the domain part of an address using IDN. This is compatible will all
+ * SMTP servers.
+ *
+ * This encoder does not support email addresses with non-ASCII characters in
+ * local-part (the substring before @). To send to such addresses, use
+ * Swift_AddressEncoder_Utf8AddressEncoder together with
+ * Swift_Transport_Esmtp_SmtpUtf8Handler. Your outbound SMTP server must support
+ * the SMTPUTF8 extension.
+ *
+ * @author Christian Schmidt
+ */
+class Swift_AddressEncoder_IdnAddressEncoder implements Swift_AddressEncoder
+{
+    /**
+     * Encodes the domain part of an address using IDN.
+     *
+     * @throws Swift_AddressEncoderException If local-part contains non-ASCII characters
+     */
+    public function encodeString(string $address): string
+    {
+        $i = strrpos($address, '@');
+        if (false !== $i) {
+            $local = substr($address, 0, $i);
+            $domain = substr($address, $i + 1);
+
+            if (preg_match('/[^\x00-\x7F]/', $local)) {
+                throw new Swift_AddressEncoderException('Non-ASCII characters not supported in local-part', $address);
+            }
+
+            if (preg_match('/[^\x00-\x7F]/', $domain)) {
+                $address = sprintf('%s@%s', $local, idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46));
+            }
+        }
+
+        return $address;
+    }
+}
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/AddressEncoder/Utf8AddressEncoder.php b/htdocs/includes/swiftmailer/lib/classes/Swift/AddressEncoder/Utf8AddressEncoder.php
new file mode 100644
index 00000000000..1b454305678
--- /dev/null
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/AddressEncoder/Utf8AddressEncoder.php
@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2018 Christian Schmidt
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * A UTF-8 email address encoder.
+ *
+ * Returns the email address verbatimly in UTF-8 as permitted by RFC 6531 and
+ * RFC 6532. It supports addresses containing non-ASCII characters in both
+ * local-part and domain (i.e. on both sides of @).
+ *
+ * This encoder must be used together with Swift_Transport_Esmtp_SmtpUtf8Handler
+ * and requires that the outbound SMTP server supports the SMTPUTF8 extension.
+ *
+ * If your outbound SMTP server does not support SMTPUTF8, use
+ * Swift_AddressEncoder_IdnAddressEncoder instead. This allows sending to email
+ * addresses with non-ASCII characters in the domain, but not in local-part.
+ *
+ * @author Christian Schmidt
+ */
+class Swift_AddressEncoder_Utf8AddressEncoder implements Swift_AddressEncoder
+{
+    /**
+     * Returns the address verbatimly.
+     */
+    public function encodeString(string $address): string
+    {
+        return $address;
+    }
+}
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/AddressEncoderException.php b/htdocs/includes/swiftmailer/lib/classes/Swift/AddressEncoderException.php
new file mode 100644
index 00000000000..9b405476bcb
--- /dev/null
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/AddressEncoderException.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2018 Christian Schmidt
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * AddressEncoderException when the specified email address is in a format that
+ * cannot be encoded by a given address encoder.
+ *
+ * @author Christian Schmidt
+ */
+class Swift_AddressEncoderException extends Swift_RfcComplianceException
+{
+    protected $address;
+
+    public function __construct(string $message, string $address)
+    {
+        parent::__construct($message);
+
+        $this->address = $address;
+    }
+
+    public function getAddress(): string
+    {
+        return $this->address;
+    }
+}
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Attachment.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Attachment.php
index 1fb232c9fe6..7a1420f7986 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Attachment.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Attachment.php
@@ -26,17 +26,14 @@ class Swift_Attachment extends Swift_Mime_Attachment
      */
     public function __construct($data = null, $filename = null, $contentType = null)
     {
-        call_user_func_array(
-            array($this, 'Swift_Mime_Attachment::__construct'),
+        \call_user_func_array(
+            [$this, 'Swift_Mime_Attachment::__construct'],
             Swift_DependencyContainer::getInstance()
                 ->createDependenciesFor('mime.attachment')
             );
 
-        $this->setBody($data);
+        $this->setBody($data, $contentType);
         $this->setFilename($filename);
-        if ($contentType) {
-            $this->setContentType($contentType);
-        }
     }
 
     /**
@@ -45,7 +42,7 @@ class Swift_Attachment extends Swift_Mime_Attachment
      * @param string $path
      * @param string $contentType optional
      *
-     * @return Swift_Mime_Attachment
+     * @return self
      */
     public static function fromPath($path, $contentType = null)
     {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/ByteStream/AbstractFilterableInputStream.php b/htdocs/includes/swiftmailer/lib/classes/Swift/ByteStream/AbstractFilterableInputStream.php
index bfd2c79bcbd..3a69c15f1c4 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/ByteStream/AbstractFilterableInputStream.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/ByteStream/AbstractFilterableInputStream.php
@@ -25,7 +25,7 @@ abstract class Swift_ByteStream_AbstractFilterableInputStream implements Swift_I
      *
      * @var Swift_StreamFilter[]
      */
-    private $filters = array();
+    private $filters = [];
 
     /**
      * A buffer for writing.
@@ -37,7 +37,7 @@ abstract class Swift_ByteStream_AbstractFilterableInputStream implements Swift_I
      *
      * @var Swift_InputByteStream[]
      */
-    private $mirrors = array();
+    private $mirrors = [];
 
     /**
      * Commit the given bytes to the storage medium immediately.
@@ -54,8 +54,7 @@ abstract class Swift_ByteStream_AbstractFilterableInputStream implements Swift_I
     /**
      * Add a StreamFilter to this InputByteStream.
      *
-     * @param Swift_StreamFilter $filter
-     * @param string             $key
+     * @param string $key
      */
     public function addFilter(Swift_StreamFilter $filter, $key)
     {
@@ -110,8 +109,6 @@ abstract class Swift_ByteStream_AbstractFilterableInputStream implements Swift_I
      *
      * The stream acts as an observer, receiving all data that is written.
      * All {@link write()} and {@link flushBuffers()} operations will be mirrored.
-     *
-     * @param Swift_InputByteStream $is
      */
     public function bind(Swift_InputByteStream $is)
     {
@@ -124,14 +121,12 @@ abstract class Swift_ByteStream_AbstractFilterableInputStream implements Swift_I
      * If $is is not bound, no errors will be raised.
      * If the stream currently has any buffered data it will be written to $is
      * before unbinding occurs.
-     *
-     * @param Swift_InputByteStream $is
      */
     public function unbind(Swift_InputByteStream $is)
     {
         foreach ($this->mirrors as $k => $stream) {
             if ($is === $stream) {
-                if ($this->writeBuffer !== '') {
+                if ('' !== $this->writeBuffer) {
                     $stream->write($this->writeBuffer);
                 }
                 unset($this->mirrors[$k]);
@@ -147,7 +142,7 @@ abstract class Swift_ByteStream_AbstractFilterableInputStream implements Swift_I
      */
     public function flushBuffers()
     {
-        if ($this->writeBuffer !== '') {
+        if ('' !== $this->writeBuffer) {
             $this->doWrite($this->writeBuffer);
         }
         $this->flush();
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/ByteStream/ArrayByteStream.php b/htdocs/includes/swiftmailer/lib/classes/Swift/ByteStream/ArrayByteStream.php
index 31b85e0e02a..4f3dcc37745 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/ByteStream/ArrayByteStream.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/ByteStream/ArrayByteStream.php
@@ -20,7 +20,7 @@ class Swift_ByteStream_ArrayByteStream implements Swift_InputByteStream, Swift_O
      *
      * @var string[]
      */
-    private $array = array();
+    private $array = [];
 
     /**
      * The size of the stack.
@@ -41,7 +41,7 @@ class Swift_ByteStream_ArrayByteStream implements Swift_InputByteStream, Swift_O
      *
      * @var Swift_InputByteStream[]
      */
-    private $mirrors = array();
+    private $mirrors = [];
 
     /**
      * Create a new ArrayByteStream.
@@ -52,13 +52,13 @@ class Swift_ByteStream_ArrayByteStream implements Swift_InputByteStream, Swift_O
      */
     public function __construct($stack = null)
     {
-        if (is_array($stack)) {
+        if (\is_array($stack)) {
             $this->array = $stack;
-            $this->arraySize = count($stack);
-        } elseif (is_string($stack)) {
+            $this->arraySize = \count($stack);
+        } elseif (\is_string($stack)) {
             $this->write($stack);
         } else {
-            $this->array = array();
+            $this->array = [];
         }
     }
 
@@ -102,7 +102,7 @@ class Swift_ByteStream_ArrayByteStream implements Swift_InputByteStream, Swift_O
         foreach ($to_add as $value) {
             $this->array[] = $value;
         }
-        $this->arraySize = count($this->array);
+        $this->arraySize = \count($this->array);
 
         foreach ($this->mirrors as $stream) {
             $stream->write($bytes);
@@ -121,8 +121,6 @@ class Swift_ByteStream_ArrayByteStream implements Swift_InputByteStream, Swift_O
      *
      * The stream acts as an observer, receiving all data that is written.
      * All {@link write()} and {@link flushBuffers()} operations will be mirrored.
-     *
-     * @param Swift_InputByteStream $is
      */
     public function bind(Swift_InputByteStream $is)
     {
@@ -135,8 +133,6 @@ class Swift_ByteStream_ArrayByteStream implements Swift_InputByteStream, Swift_O
      * If $is is not bound, no errors will be raised.
      * If the stream currently has any buffered data it will be written to $is
      * before unbinding occurs.
-     *
-     * @param Swift_InputByteStream $is
      */
     public function unbind(Swift_InputByteStream $is)
     {
@@ -172,7 +168,7 @@ class Swift_ByteStream_ArrayByteStream implements Swift_InputByteStream, Swift_O
     public function flushBuffers()
     {
         $this->offset = 0;
-        $this->array = array();
+        $this->array = [];
         $this->arraySize = 0;
 
         foreach ($this->mirrors as $stream) {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/ByteStream/FileByteStream.php b/htdocs/includes/swiftmailer/lib/classes/Swift/ByteStream/FileByteStream.php
index 61f820e5a14..f6391219e71 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/ByteStream/FileByteStream.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/ByteStream/FileByteStream.php
@@ -81,7 +81,7 @@ class Swift_ByteStream_FileByteStream extends Swift_ByteStream_AbstractFilterabl
 
             // If we read one byte after reaching the end of the file
             // feof() will return false and an empty string is returned
-            if ($bytes === '' && feof($fp)) {
+            if ((false === $bytes || '' === $bytes) && feof($fp)) {
                 $this->resetReadHandle();
 
                 return false;
@@ -131,7 +131,7 @@ class Swift_ByteStream_FileByteStream extends Swift_ByteStream_AbstractFilterabl
                 throw new Swift_IoException('Unable to open file for reading ['.$this->path.']');
             }
             $this->reader = $pointer;
-            if ($this->offset != 0) {
+            if (0 != $this->offset) {
                 $this->getReadStreamSeekableStatus();
                 $this->seekReadStreamToPosition($this->offset);
             }
@@ -145,9 +145,7 @@ class Swift_ByteStream_FileByteStream extends Swift_ByteStream_AbstractFilterabl
     {
         if (!isset($this->writer)) {
             if (!$this->writer = fopen($this->path, $this->mode)) {
-                throw new Swift_IoException(
-                    'Unable to open file for writing ['.$this->path.']'
-                );
+                throw new Swift_IoException('Unable to open file for writing ['.$this->path.']');
             }
         }
 
@@ -173,10 +171,10 @@ class Swift_ByteStream_FileByteStream extends Swift_ByteStream_AbstractFilterabl
     /** Streams in a readOnly stream ensuring copy if needed */
     private function seekReadStreamToPosition($offset)
     {
-        if ($this->seekable === null) {
+        if (null === $this->seekable) {
             $this->getReadStreamSeekableStatus();
         }
-        if ($this->seekable === false) {
+        if (false === $this->seekable) {
             $currentPos = ftell($this->reader);
             if ($currentPos < $offset) {
                 $toDiscard = $offset - $currentPos;
@@ -194,7 +192,7 @@ class Swift_ByteStream_FileByteStream extends Swift_ByteStream_AbstractFilterabl
     {
         if ($tmpFile = fopen('php://temp/maxmemory:4096', 'w+b')) {
             /* We have opened a php:// Stream Should work without problem */
-        } elseif (function_exists('sys_get_temp_dir') && is_writable(sys_get_temp_dir()) && ($tmpFile = tmpfile())) {
+        } elseif (\function_exists('sys_get_temp_dir') && is_writable(sys_get_temp_dir()) && ($tmpFile = tmpfile())) {
             /* We have opened a tmpfile */
         } else {
             throw new Swift_IoException('Unable to copy the file to make it seekable, sys_temp_dir is not writable, php://memory not available');
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/ByteStream/TemporaryFileByteStream.php b/htdocs/includes/swiftmailer/lib/classes/Swift/ByteStream/TemporaryFileByteStream.php
index 1c9a80c0376..0dc61909d31 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/ByteStream/TemporaryFileByteStream.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/ByteStream/TemporaryFileByteStream.php
@@ -17,7 +17,7 @@ class Swift_ByteStream_TemporaryFileByteStream extends Swift_ByteStream_FileByte
     {
         $filePath = tempnam(sys_get_temp_dir(), 'FileByteStream');
 
-        if ($filePath === false) {
+        if (false === $filePath) {
             throw new Swift_IoException('Failed to retrieve temporary file name.');
         }
 
@@ -26,7 +26,7 @@ class Swift_ByteStream_TemporaryFileByteStream extends Swift_ByteStream_FileByte
 
     public function getContent()
     {
-        if (($content = file_get_contents($this->getPath())) === false) {
+        if (false === ($content = file_get_contents($this->getPath()))) {
             throw new Swift_IoException('Failed to get temporary file content.');
         }
 
@@ -39,4 +39,14 @@ class Swift_ByteStream_TemporaryFileByteStream extends Swift_ByteStream_FileByte
             @unlink($this->getPath());
         }
     }
+
+    public function __sleep()
+    {
+        throw new \BadMethodCallException('Cannot serialize '.__CLASS__);
+    }
+
+    public function __wakeup()
+    {
+        throw new \BadMethodCallException('Cannot unserialize '.__CLASS__);
+    }
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReader/GenericFixedWidthReader.php b/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReader/GenericFixedWidthReader.php
index b09bb5b6c38..3e055afd9dc 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReader/GenericFixedWidthReader.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReader/GenericFixedWidthReader.php
@@ -45,7 +45,7 @@ class Swift_CharacterReader_GenericFixedWidthReader implements Swift_CharacterRe
      */
     public function getCharPositions($string, $startOffset, &$currentMap, &$ignoredChars)
     {
-        $strlen = strlen($string);
+        $strlen = \strlen($string);
         // % and / are CPU intensive, so, maybe find a better way
         $ignored = $strlen % $this->width;
         $ignoredChars = $ignored ? substr($string, -$ignored) : '';
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReader/UsAsciiReader.php b/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReader/UsAsciiReader.php
index 67da48f6cb0..ffc05f7166a 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReader/UsAsciiReader.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReader/UsAsciiReader.php
@@ -27,7 +27,7 @@ class Swift_CharacterReader_UsAsciiReader implements Swift_CharacterReader
      */
     public function getCharPositions($string, $startOffset, &$currentMap, &$ignoredChars)
     {
-        $strlen = strlen($string);
+        $strlen = \strlen($string);
         $ignoredChars = '';
         for ($i = 0; $i < $strlen; ++$i) {
             if ($string[$i] > "\x07F") {
@@ -65,7 +65,7 @@ class Swift_CharacterReader_UsAsciiReader implements Swift_CharacterReader
     public function validateByteSequence($bytes, $size)
     {
         $byte = reset($bytes);
-        if (1 == count($bytes) && $byte >= 0x00 && $byte <= 0x7F) {
+        if (1 == \count($bytes) && $byte >= 0x00 && $byte <= 0x7F) {
             return 0;
         }
 
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php b/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php
index 22746bd8575..da37e0da9ab 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php
@@ -17,8 +17,8 @@
 class Swift_CharacterReader_Utf8Reader implements Swift_CharacterReader
 {
     /** Pre-computed for optimization */
-    private static $length_map = array(
-        // N=0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F,
+    private static $length_map = [
+        // N=0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F
         1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x0N
         1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x1N
         1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x2N
@@ -34,10 +34,10 @@ class Swift_CharacterReader_Utf8Reader implements Swift_CharacterReader
         2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, // 0xCN
         2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, // 0xDN
         3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 0xEN
-        4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 0, 0,  // 0xFN
-    );
+        4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 0, 0, // 0xFN
+    ];
 
-    private static $s_length_map = array(
+    private static $s_length_map = [
         "\x00" => 1, "\x01" => 1, "\x02" => 1, "\x03" => 1, "\x04" => 1, "\x05" => 1, "\x06" => 1, "\x07" => 1,
         "\x08" => 1, "\x09" => 1, "\x0a" => 1, "\x0b" => 1, "\x0c" => 1, "\x0d" => 1, "\x0e" => 1, "\x0f" => 1,
         "\x10" => 1, "\x11" => 1, "\x12" => 1, "\x13" => 1, "\x14" => 1, "\x15" => 1, "\x16" => 1, "\x17" => 1,
@@ -70,7 +70,7 @@ class Swift_CharacterReader_Utf8Reader implements Swift_CharacterReader
         "\xe8" => 3, "\xe9" => 3, "\xea" => 3, "\xeb" => 3, "\xec" => 3, "\xed" => 3, "\xee" => 3, "\xef" => 3,
         "\xf0" => 4, "\xf1" => 4, "\xf2" => 4, "\xf3" => 4, "\xf4" => 4, "\xf5" => 4, "\xf6" => 4, "\xf7" => 4,
         "\xf8" => 5, "\xf9" => 5, "\xfa" => 5, "\xfb" => 5, "\xfc" => 6, "\xfd" => 6, "\xfe" => 0, "\xff" => 0,
-     );
+     ];
 
     /**
      * Returns the complete character map.
@@ -85,22 +85,22 @@ class Swift_CharacterReader_Utf8Reader implements Swift_CharacterReader
     public function getCharPositions($string, $startOffset, &$currentMap, &$ignoredChars)
     {
         if (!isset($currentMap['i']) || !isset($currentMap['p'])) {
-            $currentMap['p'] = $currentMap['i'] = array();
+            $currentMap['p'] = $currentMap['i'] = [];
         }
 
-        $strlen = strlen($string);
-        $charPos = count($currentMap['p']);
+        $strlen = \strlen($string);
+        $charPos = \count($currentMap['p']);
         $foundChars = 0;
         $invalid = false;
         for ($i = 0; $i < $strlen; ++$i) {
             $char = $string[$i];
             $size = self::$s_length_map[$char];
-            if ($size == 0) {
+            if (0 == $size) {
                 /* char is invalid, we must wait for a resync */
                 $invalid = true;
                 continue;
             } else {
-                if ($invalid == true) {
+                if (true === $invalid) {
                     /* We mark the chars as invalid and start a new char */
                     $currentMap['p'][$charPos + $foundChars] = $startOffset + $i;
                     $currentMap['i'][$charPos + $foundChars] = true;
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php b/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php
index f3641f46b46..86900894ab1 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php
@@ -20,14 +20,14 @@ class Swift_CharacterReaderFactory_SimpleCharacterReaderFactory implements Swift
      *
      * @var array
      */
-    private static $map = array();
+    private static $map = [];
 
     /**
      * Factories which have already been loaded.
      *
      * @var Swift_CharacterReaderFactory[]
      */
-    private static $loaded = array();
+    private static $loaded = [];
 
     /**
      * Creates a new CharacterReaderFactory.
@@ -44,32 +44,32 @@ class Swift_CharacterReaderFactory_SimpleCharacterReaderFactory implements Swift
 
     public function init()
     {
-        if (count(self::$map) > 0) {
+        if (\count(self::$map) > 0) {
             return;
         }
 
         $prefix = 'Swift_CharacterReader_';
 
-        $singleByte = array(
+        $singleByte = [
             'class' => $prefix.'GenericFixedWidthReader',
-            'constructor' => array(1),
-            );
+            'constructor' => [1],
+            ];
 
-        $doubleByte = array(
+        $doubleByte = [
             'class' => $prefix.'GenericFixedWidthReader',
-            'constructor' => array(2),
-            );
+            'constructor' => [2],
+            ];
 
-        $fourBytes = array(
+        $fourBytes = [
             'class' => $prefix.'GenericFixedWidthReader',
-            'constructor' => array(4),
-            );
+            'constructor' => [4],
+            ];
 
         // Utf-8
-        self::$map['utf-?8'] = array(
+        self::$map['utf-?8'] = [
             'class' => $prefix.'Utf8Reader',
-            'constructor' => array(),
-            );
+            'constructor' => [],
+            ];
 
         //7-8 bit charsets
         self::$map['(us-)?ascii'] = $singleByte;
@@ -103,11 +103,11 @@ class Swift_CharacterReaderFactory_SimpleCharacterReaderFactory implements Swift
      */
     public function getReaderFor($charset)
     {
-        $charset = strtolower(trim($charset));
+        $charset = strtolower(trim($charset ?? ''));
         foreach (self::$map as $pattern => $spec) {
             $re = '/^'.$pattern.'$/D';
             if (preg_match($re, $charset)) {
-                if (!array_key_exists($pattern, self::$loaded)) {
+                if (!\array_key_exists($pattern, self::$loaded)) {
                     $reflector = new ReflectionClass($spec['class']);
                     if ($reflector->getConstructor()) {
                         $reader = $reflector->newInstanceArgs($spec['constructor']);
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterStream.php b/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterStream.php
index 717924f5d63..c9d8a078ee0 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterStream.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterStream.php
@@ -28,8 +28,6 @@ interface Swift_CharacterStream
 
     /**
      * Set the CharacterReaderFactory for multi charset support.
-     *
-     * @param Swift_CharacterReaderFactory $factory
      */
     public function setCharacterReaderFactory(Swift_CharacterReaderFactory $factory);
 
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php b/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php
index e43bd2ed510..5c2869455b8 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php
@@ -31,10 +31,10 @@ class Swift_CharacterStream_ArrayCharacterStream implements Swift_CharacterStrea
     private $charset;
 
     /** Array of characters */
-    private $array = array();
+    private $array = [];
 
     /** Size of the array of character */
-    private $array_size = array();
+    private $array_size = [];
 
     /** The current character offset in the stream */
     private $offset = 0;
@@ -65,8 +65,6 @@ class Swift_CharacterStream_ArrayCharacterStream implements Swift_CharacterStrea
 
     /**
      * Set the CharacterReaderFactory for multi charset support.
-     *
-     * @param Swift_CharacterReaderFactory $factory
      */
     public function setCharacterReaderFactory(Swift_CharacterReaderFactory $factory)
     {
@@ -87,16 +85,16 @@ class Swift_CharacterStream_ArrayCharacterStream implements Swift_CharacterStrea
 
         $startLength = $this->charReader->getInitialByteSize();
         while (false !== $bytes = $os->read($startLength)) {
-            $c = array();
-            for ($i = 0, $len = strlen($bytes); $i < $len; ++$i) {
+            $c = [];
+            for ($i = 0, $len = \strlen($bytes); $i < $len; ++$i) {
                 $c[] = self::$byteMap[$bytes[$i]];
             }
-            $size = count($c);
+            $size = \count($c);
             $need = $this->charReader
                 ->validateByteSequence($c, $size);
             if ($need > 0 &&
                 false !== $bytes = $os->read($need)) {
-                for ($i = 0, $len = strlen($bytes); $i < $len; ++$i) {
+                for ($i = 0, $len = \strlen($bytes); $i < $len; ++$i) {
                     $c[] = self::$byteMap[$bytes[$i]];
                 }
             }
@@ -132,7 +130,7 @@ class Swift_CharacterStream_ArrayCharacterStream implements Swift_CharacterStrea
         }
 
         // Don't use array slice
-        $arrays = array();
+        $arrays = [];
         $end = $length + $this->offset;
         for ($i = $this->offset; $i < $end; ++$i) {
             if (!isset($this->array[$i])) {
@@ -162,7 +160,7 @@ class Swift_CharacterStream_ArrayCharacterStream implements Swift_CharacterStrea
         if ($this->offset == $this->array_size) {
             return false;
         }
-        $arrays = array();
+        $arrays = [];
         $end = $length + $this->offset;
         for ($i = $this->offset; $i < $end; ++$i) {
             if (!isset($this->array[$i])) {
@@ -172,7 +170,7 @@ class Swift_CharacterStream_ArrayCharacterStream implements Swift_CharacterStrea
         }
         $this->offset += ($i - $this->offset); // Limit function calls
 
-        return call_user_func_array('array_merge', $arrays);
+        return array_merge(...$arrays);
     }
 
     /**
@@ -194,19 +192,19 @@ class Swift_CharacterStream_ArrayCharacterStream implements Swift_CharacterStrea
         unset($chars);
         fseek($fp, 0, SEEK_SET);
 
-        $buffer = array(0);
+        $buffer = [0];
         $buf_pos = 1;
         $buf_len = 1;
         $has_datas = true;
         do {
-            $bytes = array();
+            $bytes = [];
             // Buffer Filing
             if ($buf_len - $buf_pos < $startLength) {
                 $buf = array_splice($buffer, $buf_pos);
                 $new = $this->reloadBuffer($fp, 100);
                 if ($new) {
                     $buffer = array_merge($buf, $new);
-                    $buf_len = count($buffer);
+                    $buf_len = \count($buffer);
                     $buf_pos = 0;
                 } else {
                     $has_datas = false;
@@ -226,7 +224,7 @@ class Swift_CharacterStream_ArrayCharacterStream implements Swift_CharacterStrea
 
                         if ($new) {
                             $buffer = array_merge($buffer, $new);
-                            $buf_len = count($buffer);
+                            $buf_len = \count($buffer);
                         }
                     }
                     for ($i = 0; $i < $need && isset($buffer[$buf_pos]); ++$i) {
@@ -262,15 +260,15 @@ class Swift_CharacterStream_ArrayCharacterStream implements Swift_CharacterStrea
     public function flushContents()
     {
         $this->offset = 0;
-        $this->array = array();
+        $this->array = [];
         $this->array_size = 0;
     }
 
     private function reloadBuffer($fp, $len)
     {
-        if (!feof($fp) && ($bytes = fread($fp, $len)) !== false) {
-            $buf = array();
-            for ($i = 0, $len = strlen($bytes); $i < $len; ++$i) {
+        if (!feof($fp) && false !== ($bytes = fread($fp, $len))) {
+            $buf = [];
+            for ($i = 0, $len = \strlen($bytes); $i < $len; ++$i) {
                 $buf[] = self::$byteMap[$bytes[$i]];
             }
 
@@ -283,9 +281,9 @@ class Swift_CharacterStream_ArrayCharacterStream implements Swift_CharacterStrea
     private static function initializeMaps()
     {
         if (!isset(self::$charMap)) {
-            self::$charMap = array();
+            self::$charMap = [];
             for ($byte = 0; $byte < 256; ++$byte) {
-                self::$charMap[$byte] = chr($byte);
+                self::$charMap[$byte] = \chr($byte);
             }
             self::$byteMap = array_flip(self::$charMap);
         }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterStream/NgCharacterStream.php b/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterStream/NgCharacterStream.php
index 0d62fa68ff3..7578dda9cac 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterStream/NgCharacterStream.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterStream/NgCharacterStream.php
@@ -81,8 +81,7 @@ class Swift_CharacterStream_NgCharacterStream implements Swift_CharacterStream
     /**
      * Constructor.
      *
-     * @param Swift_CharacterReaderFactory $factory
-     * @param string                       $charset
+     * @param string $charset
      */
     public function __construct(Swift_CharacterReaderFactory $factory, $charset)
     {
@@ -106,8 +105,6 @@ class Swift_CharacterStream_NgCharacterStream implements Swift_CharacterStream
 
     /**
      * Set the CharacterReaderFactory for multi charset support.
-     *
-     * @param Swift_CharacterReaderFactory $factory
      */
     public function setCharacterReaderFactory(Swift_CharacterReaderFactory $factory)
     {
@@ -128,8 +125,6 @@ class Swift_CharacterStream_NgCharacterStream implements Swift_CharacterStream
 
     /**
      * @see Swift_CharacterStream::importByteStream()
-     *
-     * @param Swift_OutputByteStream $os
      */
     public function importByteStream(Swift_OutputByteStream $os)
     {
@@ -220,7 +215,7 @@ class Swift_CharacterStream_NgCharacterStream implements Swift_CharacterStream
     public function readBytes($length)
     {
         $read = $this->read($length);
-        if ($read !== false) {
+        if (false !== $read) {
             $ret = array_map('ord', str_split($read, 1));
 
             return $ret;
@@ -252,16 +247,16 @@ class Swift_CharacterStream_NgCharacterStream implements Swift_CharacterStream
         if (!isset($this->charReader)) {
             $this->charReader = $this->charReaderFactory->getReaderFor(
                 $this->charset);
-            $this->map = array();
+            $this->map = [];
             $this->mapType = $this->charReader->getMapType();
         }
         $ignored = '';
         $this->datas .= $chars;
         $this->charCount += $this->charReader->getCharPositions(substr($this->datas, $this->datasSize), $this->datasSize, $this->map, $ignored);
-        if ($ignored !== false) {
-            $this->datasSize = strlen($this->datas) - strlen($ignored);
+        if (false !== $ignored) {
+            $this->datasSize = \strlen($this->datas) - \strlen($ignored);
         } else {
-            $this->datasSize = strlen($this->datas);
+            $this->datasSize = \strlen($this->datas);
         }
     }
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/DependencyContainer.php b/htdocs/includes/swiftmailer/lib/classes/Swift/DependencyContainer.php
index b1bc3306f22..3cc885ec03b 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/DependencyContainer.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/DependencyContainer.php
@@ -16,22 +16,25 @@
 class Swift_DependencyContainer
 {
     /** Constant for literal value types */
-    const TYPE_VALUE = 0x0001;
+    const TYPE_VALUE = 0x00001;
 
     /** Constant for new instance types */
-    const TYPE_INSTANCE = 0x0010;
+    const TYPE_INSTANCE = 0x00010;
 
     /** Constant for shared instance types */
-    const TYPE_SHARED = 0x0100;
+    const TYPE_SHARED = 0x00100;
 
     /** Constant for aliases */
-    const TYPE_ALIAS = 0x1000;
+    const TYPE_ALIAS = 0x01000;
+
+    /** Constant for arrays */
+    const TYPE_ARRAY = 0x10000;
 
     /** Singleton instance */
     private static $instance = null;
 
     /** The data container */
-    private $store = array();
+    private $store = [];
 
     /** The current endpoint in the data container */
     private $endPoint;
@@ -80,7 +83,7 @@ class Swift_DependencyContainer
      */
     public function has($itemName)
     {
-        return array_key_exists($itemName, $this->store)
+        return \array_key_exists($itemName, $this->store)
             && isset($this->store[$itemName]['lookupType']);
     }
 
@@ -98,9 +101,7 @@ class Swift_DependencyContainer
     public function lookup($itemName)
     {
         if (!$this->has($itemName)) {
-            throw new Swift_DependencyException(
-                'Cannot lookup dependency "'.$itemName.'" since it is not registered.'
-                );
+            throw new Swift_DependencyException('Cannot lookup dependency "'.$itemName.'" since it is not registered.');
         }
 
         switch ($this->store[$itemName]['lookupType']) {
@@ -112,6 +113,8 @@ class Swift_DependencyContainer
                 return $this->createNewInstance($itemName);
             case self::TYPE_SHARED:
                 return $this->createSharedInstance($itemName);
+            case self::TYPE_ARRAY:
+                return $this->createDependenciesFor($itemName);
         }
     }
 
@@ -124,7 +127,7 @@ class Swift_DependencyContainer
      */
     public function createDependenciesFor($itemName)
     {
-        $args = array();
+        $args = [];
         if (isset($this->store[$itemName]['args'])) {
             $args = $this->resolveArgs($this->store[$itemName]['args']);
         }
@@ -147,7 +150,7 @@ class Swift_DependencyContainer
      */
     public function register($itemName)
     {
-        $this->store[$itemName] = array();
+        $this->store[$itemName] = [];
         $this->endPoint = &$this->store[$itemName];
 
         return $this;
@@ -227,6 +230,21 @@ class Swift_DependencyContainer
         return $this;
     }
 
+    /**
+     * Specify the previously registered item as array of dependencies.
+     *
+     * {@link register()} must be called before this will work.
+     *
+     * @return $this
+     */
+    public function asArray()
+    {
+        $endPoint = &$this->getEndPoint();
+        $endPoint['lookupType'] = self::TYPE_ARRAY;
+
+        return $this;
+    }
+
     /**
      * Specify a list of injected dependencies for the previously registered item.
      *
@@ -234,14 +252,12 @@ class Swift_DependencyContainer
      *
      * @see addConstructorValue(), addConstructorLookup()
      *
-     * @param array $lookups
-     *
      * @return $this
      */
     public function withDependencies(array $lookups)
     {
         $endPoint = &$this->getEndPoint();
-        $endPoint['args'] = array();
+        $endPoint['args'] = [];
         foreach ($lookups as $lookup) {
             $this->addConstructorLookup($lookup);
         }
@@ -263,9 +279,9 @@ class Swift_DependencyContainer
     {
         $endPoint = &$this->getEndPoint();
         if (!isset($endPoint['args'])) {
-            $endPoint['args'] = array();
+            $endPoint['args'] = [];
         }
-        $endPoint['args'][] = array('type' => 'value', 'item' => $value);
+        $endPoint['args'][] = ['type' => 'value', 'item' => $value];
 
         return $this;
     }
@@ -284,9 +300,9 @@ class Swift_DependencyContainer
     {
         $endPoint = &$this->getEndPoint();
         if (!isset($this->endPoint['args'])) {
-            $endPoint['args'] = array();
+            $endPoint['args'] = [];
         }
-        $endPoint['args'][] = array('type' => 'lookup', 'item' => $lookup);
+        $endPoint['args'][] = ['type' => 'lookup', 'item' => $lookup];
 
         return $this;
     }
@@ -330,9 +346,7 @@ class Swift_DependencyContainer
     private function &getEndPoint()
     {
         if (!isset($this->endPoint)) {
-            throw new BadMethodCallException(
-                'Component must first be registered by calling register()'
-                );
+            throw new BadMethodCallException('Component must first be registered by calling register()');
         }
 
         return $this->endPoint;
@@ -341,7 +355,7 @@ class Swift_DependencyContainer
     /** Get an argument list with dependencies resolved */
     private function resolveArgs(array $args)
     {
-        $resolved = array();
+        $resolved = [];
         foreach ($args as $argDefinition) {
             switch ($argDefinition['type']) {
                 case 'lookup':
@@ -359,8 +373,8 @@ class Swift_DependencyContainer
     /** Resolve a single dependency with an collections */
     private function lookupRecursive($item)
     {
-        if (is_array($item)) {
-            $collection = array();
+        if (\is_array($item)) {
+            $collection = [];
             foreach ($item as $k => $v) {
                 $collection[$k] = $this->lookupRecursive($v);
             }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/EmbeddedFile.php b/htdocs/includes/swiftmailer/lib/classes/Swift/EmbeddedFile.php
index 9755a88e176..30fc68ab03e 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/EmbeddedFile.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/EmbeddedFile.php
@@ -26,8 +26,8 @@ class Swift_EmbeddedFile extends Swift_Mime_EmbeddedFile
      */
     public function __construct($data = null, $filename = null, $contentType = null)
     {
-        call_user_func_array(
-            array($this, 'Swift_Mime_EmbeddedFile::__construct'),
+        \call_user_func_array(
+            [$this, 'Swift_Mime_EmbeddedFile::__construct'],
             Swift_DependencyContainer::getInstance()
                 ->createDependenciesFor('mime.embeddedfile')
             );
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Encoder/Base64Encoder.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Encoder/Base64Encoder.php
index 0e7b2a1b0c8..b1eedaa051b 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Encoder/Base64Encoder.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Encoder/Base64Encoder.php
@@ -34,7 +34,7 @@ class Swift_Encoder_Base64Encoder implements Swift_Encoder
             $maxLineLength = 76;
         }
 
-        $encodedString = base64_encode($string);
+        $encodedString = base64_encode($string ?? '');
         $firstLine = '';
 
         if (0 != $firstLineOffset) {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php
index b23b07702ef..f078d6d7c38 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php
@@ -36,7 +36,7 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
      *
      * @var string[]
      */
-    protected static $qpMap = array(
+    protected static $qpMap = [
         0 => '=00', 1 => '=01', 2 => '=02', 3 => '=03', 4 => '=04',
         5 => '=05', 6 => '=06', 7 => '=07', 8 => '=08', 9 => '=09',
         10 => '=0A', 11 => '=0B', 12 => '=0C', 13 => '=0D', 14 => '=0E',
@@ -89,16 +89,16 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
         245 => '=F5', 246 => '=F6', 247 => '=F7', 248 => '=F8', 249 => '=F9',
         250 => '=FA', 251 => '=FB', 252 => '=FC', 253 => '=FD', 254 => '=FE',
         255 => '=FF',
-        );
+        ];
 
-    protected static $safeMapShare = array();
+    protected static $safeMapShare = [];
 
     /**
      * A map of non-encoded ascii characters.
      *
      * @var string[]
      */
-    protected $safeMap = array();
+    protected $safeMap = [];
 
     /**
      * Creates a new QpEncoder for the given CharacterStream.
@@ -120,7 +120,7 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
 
     public function __sleep()
     {
-        return array('charStream', 'filter');
+        return ['charStream', 'filter'];
     }
 
     public function __wakeup()
@@ -135,14 +135,14 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
 
     protected function getSafeMapShareId()
     {
-        return get_class($this);
+        return static::class;
     }
 
     protected function initSafeMap()
     {
         foreach (array_merge(
-            array(0x09, 0x20), range(0x21, 0x3C), range(0x3E, 0x7E)) as $byte) {
-            $this->safeMap[$byte] = chr($byte);
+            [0x09, 0x20], range(0x21, 0x3C), range(0x3E, 0x7E)) as $byte) {
+            $this->safeMap[$byte] = \chr($byte);
         }
     }
 
@@ -153,9 +153,9 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
      * If the first line needs to be shorter, indicate the difference with
      * $firstLineOffset.
      *
-     * @param string $string           to encode
-     * @param int    $firstLineOffset, optional
-     * @param int    $maxLineLength,   optional 0 indicates the default of 76 chars
+     * @param string $string          to encode
+     * @param int    $firstLineOffset optional
+     * @param int    $maxLineLength   optional 0 indicates the default of 76 chars
      *
      * @return string
      */
@@ -167,7 +167,7 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
 
         $thisLineLength = $maxLineLength - $firstLineOffset;
 
-        $lines = array();
+        $lines = [];
         $lNo = 0;
         $lines[$lNo] = '';
         $currentLine = &$lines[$lNo++];
@@ -200,7 +200,7 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
             $enc = $this->encodeByteSequence($bytes, $size);
 
             $i = strpos($enc, '=0D=0A');
-            $newLineLength = $lineLen + ($i === false ? $size : $i);
+            $newLineLength = $lineLen + (false === $i ? $size : $i);
 
             if ($currentLine && $newLineLength >= $thisLineLength) {
                 $lines[$lNo] = '';
@@ -211,7 +211,7 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
 
             $currentLine .= $enc;
 
-            if ($i === false) {
+            if (false === $i) {
                 $lineLen += $size;
             } else {
                 // 6 is the length of '=0D=0A'.
@@ -278,10 +278,10 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
      */
     protected function standardize($string)
     {
-        $string = str_replace(array("\t=0D=0A", ' =0D=0A', '=0D=0A'),
-            array("=09\r\n", "=20\r\n", "\r\n"), $string
+        $string = str_replace(["\t=0D=0A", ' =0D=0A', '=0D=0A'],
+            ["=09\r\n", "=20\r\n", "\r\n"], $string
             );
-        switch ($end = ord(substr($string, -1))) {
+        switch ($end = \ord(substr($string, -1))) {
             case 0x09:
             case 0x20:
                 $string = substr_replace($string, self::$qpMap[$end], -1);
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Encoder/Rfc2231Encoder.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Encoder/Rfc2231Encoder.php
index bebb13494bd..7eac36813e0 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Encoder/Rfc2231Encoder.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Encoder/Rfc2231Encoder.php
@@ -24,8 +24,6 @@ class Swift_Encoder_Rfc2231Encoder implements Swift_Encoder
 
     /**
      * Creates a new Rfc2231Encoder using the given character stream instance.
-     *
-     * @param Swift_CharacterStream
      */
     public function __construct(Swift_CharacterStream $charStream)
     {
@@ -44,7 +42,7 @@ class Swift_Encoder_Rfc2231Encoder implements Swift_Encoder
      */
     public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0)
     {
-        $lines = array();
+        $lines = [];
         $lineCount = 0;
         $lines[] = '';
         $currentLine = &$lines[$lineCount++];
@@ -60,8 +58,8 @@ class Swift_Encoder_Rfc2231Encoder implements Swift_Encoder
 
         while (false !== $char = $this->charStream->read(4)) {
             $encodedChar = rawurlencode($char);
-            if (0 != strlen($currentLine)
-                && strlen($currentLine.$encodedChar) > $thisLineLength) {
+            if (0 != \strlen($currentLine)
+                && \strlen($currentLine.$encodedChar) > $thisLineLength) {
                 $lines[] = '';
                 $currentLine = &$lines[$lineCount++];
                 $thisLineLength = $maxLineLength;
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/CommandEvent.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/CommandEvent.php
index 9834aa95883..18994c184f3 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/CommandEvent.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/CommandEvent.php
@@ -27,16 +27,15 @@ class Swift_Events_CommandEvent extends Swift_Events_EventObject
      *
      * @var int[]
      */
-    private $successCodes = array();
+    private $successCodes = [];
 
     /**
      * Create a new CommandEvent for $source with $command.
      *
-     * @param Swift_Transport $source
-     * @param string          $command
-     * @param array           $successCodes
+     * @param string $command
+     * @param array  $successCodes
      */
-    public function __construct(Swift_Transport $source, $command, $successCodes = array())
+    public function __construct(Swift_Transport $source, $command, $successCodes = [])
     {
         parent::__construct($source);
         $this->command = $command;
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/CommandListener.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/CommandListener.php
index 7545404e765..b158eab462a 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/CommandListener.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/CommandListener.php
@@ -17,8 +17,6 @@ interface Swift_Events_CommandListener extends Swift_Events_EventListener
 {
     /**
      * Invoked immediately following a command being sent.
-     *
-     * @param Swift_Events_CommandEvent $evt
      */
     public function commandSent(Swift_Events_CommandEvent $evt);
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/EventDispatcher.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/EventDispatcher.php
index f602608eeb6..df25a124863 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/EventDispatcher.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/EventDispatcher.php
@@ -18,9 +18,6 @@ interface Swift_Events_EventDispatcher
     /**
      * Create a new SendEvent for $source and $message.
      *
-     * @param Swift_Transport $source
-     * @param Swift_Mime_SimpleMessage
-     *
      * @return Swift_Events_SendEvent
      */
     public function createSendEvent(Swift_Transport $source, Swift_Mime_SimpleMessage $message);
@@ -28,20 +25,18 @@ interface Swift_Events_EventDispatcher
     /**
      * Create a new CommandEvent for $source and $command.
      *
-     * @param Swift_Transport $source
-     * @param string          $command      That will be executed
-     * @param array           $successCodes That are needed
+     * @param string $command      That will be executed
+     * @param array  $successCodes That are needed
      *
      * @return Swift_Events_CommandEvent
      */
-    public function createCommandEvent(Swift_Transport $source, $command, $successCodes = array());
+    public function createCommandEvent(Swift_Transport $source, $command, $successCodes = []);
 
     /**
      * Create a new ResponseEvent for $source and $response.
      *
-     * @param Swift_Transport $source
-     * @param string          $response
-     * @param bool            $valid    If the response is valid
+     * @param string $response
+     * @param bool   $valid    If the response is valid
      *
      * @return Swift_Events_ResponseEvent
      */
@@ -50,8 +45,6 @@ interface Swift_Events_EventDispatcher
     /**
      * Create a new TransportChangeEvent for $source.
      *
-     * @param Swift_Transport $source
-     *
      * @return Swift_Events_TransportChangeEvent
      */
     public function createTransportChangeEvent(Swift_Transport $source);
@@ -59,25 +52,19 @@ interface Swift_Events_EventDispatcher
     /**
      * Create a new TransportExceptionEvent for $source.
      *
-     * @param Swift_Transport          $source
-     * @param Swift_TransportException $ex
-     *
      * @return Swift_Events_TransportExceptionEvent
      */
     public function createTransportExceptionEvent(Swift_Transport $source, Swift_TransportException $ex);
 
     /**
      * Bind an event listener to this dispatcher.
-     *
-     * @param Swift_Events_EventListener $listener
      */
     public function bindEventListener(Swift_Events_EventListener $listener);
 
     /**
      * Dispatch the given Event to all suitable listeners.
      *
-     * @param Swift_Events_EventObject $evt
-     * @param string                   $target method
+     * @param string $target method
      */
     public function dispatchEvent(Swift_Events_EventObject $evt, $target);
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/EventObject.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/EventObject.php
index 21e7c8127d6..24a11f44e23 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/EventObject.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/EventObject.php
@@ -43,8 +43,6 @@ class Swift_Events_EventObject implements Swift_Events_Event
 
     /**
      * Prevent this Event from bubbling any further up the stack.
-     *
-     * @param bool $cancel, optional
      */
     public function cancelBubble($cancel = true)
     {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/ResponseEvent.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/ResponseEvent.php
index 5ae6c04b627..ff7c37116ba 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/ResponseEvent.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/ResponseEvent.php
@@ -32,9 +32,8 @@ class Swift_Events_ResponseEvent extends Swift_Events_EventObject
     /**
      * Create a new ResponseEvent for $source and $response.
      *
-     * @param Swift_Transport $source
-     * @param string          $response
-     * @param bool            $valid
+     * @param string $response
+     * @param bool   $valid
      */
     public function __construct(Swift_Transport $source, $response, $valid = false)
     {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/ResponseListener.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/ResponseListener.php
index c40919d210f..85115a33811 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/ResponseListener.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/ResponseListener.php
@@ -17,8 +17,6 @@ interface Swift_Events_ResponseListener extends Swift_Events_EventListener
 {
     /**
      * Invoked immediately following a response coming back.
-     *
-     * @param Swift_Events_ResponseEvent $evt
      */
     public function responseReceived(Swift_Events_ResponseEvent $evt);
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/SendEvent.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/SendEvent.php
index 5dc8efb1fd6..a435691e0b0 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/SendEvent.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/SendEvent.php
@@ -42,7 +42,7 @@ class Swift_Events_SendEvent extends Swift_Events_EventObject
      *
      * @var string[]
      */
-    private $failedRecipients = array();
+    private $failedRecipients = [];
 
     /**
      * The overall result as a bitmask from the class constants.
@@ -53,9 +53,6 @@ class Swift_Events_SendEvent extends Swift_Events_EventObject
 
     /**
      * Create a new SendEvent for $source and $message.
-     *
-     * @param Swift_Transport          $source
-     * @param Swift_Mime_SimpleMessage $message
      */
     public function __construct(Swift_Transport $source, Swift_Mime_SimpleMessage $message)
     {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/SendListener.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/SendListener.php
index d922e1bfa96..f7bf55ef56c 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/SendListener.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/SendListener.php
@@ -17,15 +17,11 @@ interface Swift_Events_SendListener extends Swift_Events_EventListener
 {
     /**
      * Invoked immediately before the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function beforeSendPerformed(Swift_Events_SendEvent $evt);
 
     /**
      * Invoked immediately after the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function sendPerformed(Swift_Events_SendEvent $evt);
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/SimpleEventDispatcher.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/SimpleEventDispatcher.php
index 815fa4d922b..6557103c99a 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/SimpleEventDispatcher.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/SimpleEventDispatcher.php
@@ -16,34 +16,28 @@
 class Swift_Events_SimpleEventDispatcher implements Swift_Events_EventDispatcher
 {
     /** A map of event types to their associated listener types */
-    private $eventMap = array();
+    private $eventMap = [];
 
     /** Event listeners bound to this dispatcher */
-    private $listeners = array();
-
-    /** Listeners queued to have an Event bubbled up the stack to them */
-    private $bubbleQueue = array();
+    private $listeners = [];
 
     /**
      * Create a new EventDispatcher.
      */
     public function __construct()
     {
-        $this->eventMap = array(
+        $this->eventMap = [
             'Swift_Events_CommandEvent' => 'Swift_Events_CommandListener',
             'Swift_Events_ResponseEvent' => 'Swift_Events_ResponseListener',
             'Swift_Events_SendEvent' => 'Swift_Events_SendListener',
             'Swift_Events_TransportChangeEvent' => 'Swift_Events_TransportChangeListener',
             'Swift_Events_TransportExceptionEvent' => 'Swift_Events_TransportExceptionListener',
-            );
+            ];
     }
 
     /**
      * Create a new SendEvent for $source and $message.
      *
-     * @param Swift_Transport $source
-     * @param Swift_Mime_SimpleMessage
-     *
      * @return Swift_Events_SendEvent
      */
     public function createSendEvent(Swift_Transport $source, Swift_Mime_SimpleMessage $message)
@@ -54,13 +48,12 @@ class Swift_Events_SimpleEventDispatcher implements Swift_Events_EventDispatcher
     /**
      * Create a new CommandEvent for $source and $command.
      *
-     * @param Swift_Transport $source
-     * @param string          $command      That will be executed
-     * @param array           $successCodes That are needed
+     * @param string $command      That will be executed
+     * @param array  $successCodes That are needed
      *
      * @return Swift_Events_CommandEvent
      */
-    public function createCommandEvent(Swift_Transport $source, $command, $successCodes = array())
+    public function createCommandEvent(Swift_Transport $source, $command, $successCodes = [])
     {
         return new Swift_Events_CommandEvent($source, $command, $successCodes);
     }
@@ -68,9 +61,8 @@ class Swift_Events_SimpleEventDispatcher implements Swift_Events_EventDispatcher
     /**
      * Create a new ResponseEvent for $source and $response.
      *
-     * @param Swift_Transport $source
-     * @param string          $response
-     * @param bool            $valid    If the response is valid
+     * @param string $response
+     * @param bool   $valid    If the response is valid
      *
      * @return Swift_Events_ResponseEvent
      */
@@ -82,8 +74,6 @@ class Swift_Events_SimpleEventDispatcher implements Swift_Events_EventDispatcher
     /**
      * Create a new TransportChangeEvent for $source.
      *
-     * @param Swift_Transport $source
-     *
      * @return Swift_Events_TransportChangeEvent
      */
     public function createTransportChangeEvent(Swift_Transport $source)
@@ -94,9 +84,6 @@ class Swift_Events_SimpleEventDispatcher implements Swift_Events_EventDispatcher
     /**
      * Create a new TransportExceptionEvent for $source.
      *
-     * @param Swift_Transport          $source
-     * @param Swift_TransportException $ex
-     *
      * @return Swift_Events_TransportExceptionEvent
      */
     public function createTransportExceptionEvent(Swift_Transport $source, Swift_TransportException $ex)
@@ -106,8 +93,6 @@ class Swift_Events_SimpleEventDispatcher implements Swift_Events_EventDispatcher
 
     /**
      * Bind an event listener to this dispatcher.
-     *
-     * @param Swift_Events_EventListener $listener
      */
     public function bindEventListener(Swift_Events_EventListener $listener)
     {
@@ -123,34 +108,35 @@ class Swift_Events_SimpleEventDispatcher implements Swift_Events_EventDispatcher
     /**
      * Dispatch the given Event to all suitable listeners.
      *
-     * @param Swift_Events_EventObject $evt
-     * @param string                   $target method
+     * @param string $target method
      */
     public function dispatchEvent(Swift_Events_EventObject $evt, $target)
     {
-        $this->prepareBubbleQueue($evt);
-        $this->bubble($evt, $target);
+        $bubbleQueue = $this->prepareBubbleQueue($evt);
+        $this->bubble($bubbleQueue, $evt, $target);
     }
 
     /** Queue listeners on a stack ready for $evt to be bubbled up it */
     private function prepareBubbleQueue(Swift_Events_EventObject $evt)
     {
-        $this->bubbleQueue = array();
-        $evtClass = get_class($evt);
+        $bubbleQueue = [];
+        $evtClass = \get_class($evt);
         foreach ($this->listeners as $listener) {
-            if (array_key_exists($evtClass, $this->eventMap)
+            if (\array_key_exists($evtClass, $this->eventMap)
                 && ($listener instanceof $this->eventMap[$evtClass])) {
-                $this->bubbleQueue[] = $listener;
+                $bubbleQueue[] = $listener;
             }
         }
+
+        return $bubbleQueue;
     }
 
     /** Bubble $evt up the stack calling $target() on each listener */
-    private function bubble(Swift_Events_EventObject $evt, $target)
+    private function bubble(array &$bubbleQueue, Swift_Events_EventObject $evt, $target)
     {
-        if (!$evt->bubbleCancelled() && $listener = array_shift($this->bubbleQueue)) {
+        if (!$evt->bubbleCancelled() && $listener = array_shift($bubbleQueue)) {
             $listener->$target($evt);
-            $this->bubble($evt, $target);
+            $this->bubble($bubbleQueue, $evt, $target);
         }
     }
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/TransportChangeListener.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/TransportChangeListener.php
index 253165de89f..4a7492bc551 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/TransportChangeListener.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/TransportChangeListener.php
@@ -17,29 +17,21 @@ interface Swift_Events_TransportChangeListener extends Swift_Events_EventListene
 {
     /**
      * Invoked just before a Transport is started.
-     *
-     * @param Swift_Events_TransportChangeEvent $evt
      */
     public function beforeTransportStarted(Swift_Events_TransportChangeEvent $evt);
 
     /**
      * Invoked immediately after the Transport is started.
-     *
-     * @param Swift_Events_TransportChangeEvent $evt
      */
     public function transportStarted(Swift_Events_TransportChangeEvent $evt);
 
     /**
      * Invoked just before a Transport is stopped.
-     *
-     * @param Swift_Events_TransportChangeEvent $evt
      */
     public function beforeTransportStopped(Swift_Events_TransportChangeEvent $evt);
 
     /**
      * Invoked immediately after the Transport is stopped.
-     *
-     * @param Swift_Events_TransportChangeEvent $evt
      */
     public function transportStopped(Swift_Events_TransportChangeEvent $evt);
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/TransportExceptionEvent.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/TransportExceptionEvent.php
index 77534e3e033..df442cc70f6 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/TransportExceptionEvent.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/TransportExceptionEvent.php
@@ -24,9 +24,6 @@ class Swift_Events_TransportExceptionEvent extends Swift_Events_EventObject
 
     /**
      * Create a new TransportExceptionEvent for $transport.
-     *
-     * @param Swift_Transport          $transport
-     * @param Swift_TransportException $ex
      */
     public function __construct(Swift_Transport $transport, Swift_TransportException $ex)
     {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/TransportExceptionListener.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/TransportExceptionListener.php
index cc3c0993793..ad80eb01d0f 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/TransportExceptionListener.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/TransportExceptionListener.php
@@ -17,8 +17,6 @@ interface Swift_Events_TransportExceptionListener extends Swift_Events_EventList
 {
     /**
      * Invoked as a TransportException is thrown in the Transport system.
-     *
-     * @param Swift_Events_TransportExceptionEvent $evt
      */
     public function exceptionThrown(Swift_Events_TransportExceptionEvent $evt);
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/FailoverTransport.php b/htdocs/includes/swiftmailer/lib/classes/Swift/FailoverTransport.php
index dc2859f74a0..af0be917903 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/FailoverTransport.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/FailoverTransport.php
@@ -20,10 +20,10 @@ class Swift_FailoverTransport extends Swift_Transport_FailoverTransport
      *
      * @param Swift_Transport[] $transports
      */
-    public function __construct($transports = array())
+    public function __construct($transports = [])
     {
-        call_user_func_array(
-            array($this, 'Swift_Transport_FailoverTransport::__construct'),
+        \call_user_func_array(
+            [$this, 'Swift_Transport_FailoverTransport::__construct'],
             Swift_DependencyContainer::getInstance()
                 ->createDependenciesFor('transport.failover')
             );
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/FileSpool.php b/htdocs/includes/swiftmailer/lib/classes/Swift/FileSpool.php
index b0b9eb064c5..7af8471c9d7 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/FileSpool.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/FileSpool.php
@@ -121,7 +121,7 @@ class Swift_FileSpool extends Swift_ConfigurableSpool
         foreach (new DirectoryIterator($this->path) as $file) {
             $file = $file->getRealPath();
 
-            if (substr($file, -16) == '.message.sending') {
+            if ('.message.sending' == substr($file, -16)) {
                 $lockedtime = filectime($file);
                 if ((time() - $lockedtime) > $timeout) {
                     rename($file, substr($file, 0, -8));
@@ -145,7 +145,7 @@ class Swift_FileSpool extends Swift_ConfigurableSpool
         /* Start the transport only if there are queued files to send */
         if (!$transport->isStarted()) {
             foreach ($directoryIterator as $file) {
-                if (substr($file->getRealPath(), -8) == '.message') {
+                if ('.message' == substr($file->getRealPath(), -8)) {
                     $transport->start();
                     break;
                 }
@@ -158,7 +158,7 @@ class Swift_FileSpool extends Swift_ConfigurableSpool
         foreach ($directoryIterator as $file) {
             $file = $file->getRealPath();
 
-            if (substr($file, -8) != '.message') {
+            if ('.message' != substr($file, -8)) {
                 continue;
             }
 
@@ -198,7 +198,7 @@ class Swift_FileSpool extends Swift_ConfigurableSpool
         // This string MUST stay FS safe, avoid special chars
         $base = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-';
         $ret = '';
-        $strlen = strlen($base);
+        $strlen = \strlen($base);
         for ($i = 0; $i < $count; ++$i) {
             $ret .= $base[random_int(0, $strlen - 1)];
         }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Filterable.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Filterable.php
index 6b75b52748d..efa1b1def5e 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Filterable.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Filterable.php
@@ -18,8 +18,7 @@ interface Swift_Filterable
     /**
      * Add a new StreamFilter, referenced by $key.
      *
-     * @param Swift_StreamFilter $filter
-     * @param string             $key
+     * @param string $key
      */
     public function addFilter(Swift_StreamFilter $filter, $key);
 
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/InputByteStream.php b/htdocs/includes/swiftmailer/lib/classes/Swift/InputByteStream.php
index 56efc7593ac..379a5a17870 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/InputByteStream.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/InputByteStream.php
@@ -52,7 +52,7 @@ interface Swift_InputByteStream
      *
      * @param Swift_InputByteStream $is
      */
-    public function bind(Swift_InputByteStream $is);
+    public function bind(self $is);
 
     /**
      * Remove an already bound stream.
@@ -63,7 +63,7 @@ interface Swift_InputByteStream
      *
      * @param Swift_InputByteStream $is
      */
-    public function unbind(Swift_InputByteStream $is);
+    public function unbind(self $is);
 
     /**
      * Flush the contents of the stream (empty it) and set the internal pointer
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/IoException.php b/htdocs/includes/swiftmailer/lib/classes/Swift/IoException.php
index c405f352b50..5452bd416a6 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/IoException.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/IoException.php
@@ -18,9 +18,8 @@ class Swift_IoException extends Swift_SwiftException
     /**
      * Create a new IoException with $message.
      *
-     * @param string    $message
-     * @param int       $code
-     * @param Exception $previous
+     * @param string $message
+     * @param int    $code
      */
     public function __construct($message, $code = 0, Exception $previous = null)
     {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache.php b/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache.php
index cd6f786df63..87f6a074212 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache.php
@@ -38,10 +38,9 @@ interface Swift_KeyCache
      *
      * @see MODE_WRITE, MODE_APPEND
      *
-     * @param string                 $nsKey
-     * @param string                 $itemKey
-     * @param Swift_OutputByteStream $os
-     * @param int                    $mode
+     * @param string $nsKey
+     * @param string $itemKey
+     * @param int    $mode
      */
     public function importFromByteStream($nsKey, $itemKey, Swift_OutputByteStream $os, $mode);
 
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/ArrayKeyCache.php b/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/ArrayKeyCache.php
index cdd08503004..e8fef1c95d4 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/ArrayKeyCache.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/ArrayKeyCache.php
@@ -20,7 +20,7 @@ class Swift_KeyCache_ArrayKeyCache implements Swift_KeyCache
      *
      * @var array
      */
-    private $contents = array();
+    private $contents = [];
 
     /**
      * An InputStream for cloning.
@@ -32,8 +32,6 @@ class Swift_KeyCache_ArrayKeyCache implements Swift_KeyCache
     /**
      * Create a new ArrayKeyCache with the given $stream for cloning to make
      * InputByteStreams.
-     *
-     * @param Swift_KeyCache_KeyCacheInputStream $stream
      */
     public function __construct(Swift_KeyCache_KeyCacheInputStream $stream)
     {
@@ -64,10 +62,7 @@ class Swift_KeyCache_ArrayKeyCache implements Swift_KeyCache
                 $this->contents[$nsKey][$itemKey] .= $string;
                 break;
             default:
-                throw new Swift_SwiftException(
-                    'Invalid mode ['.$mode.'] used to set nsKey='.
-                    $nsKey.', itemKey='.$itemKey
-                    );
+                throw new Swift_SwiftException('Invalid mode ['.$mode.'] used to set nsKey='.$nsKey.', itemKey='.$itemKey);
         }
     }
 
@@ -76,10 +71,9 @@ class Swift_KeyCache_ArrayKeyCache implements Swift_KeyCache
      *
      * @see MODE_WRITE, MODE_APPEND
      *
-     * @param string                 $nsKey
-     * @param string                 $itemKey
-     * @param Swift_OutputByteStream $os
-     * @param int                    $mode
+     * @param string $nsKey
+     * @param string $itemKey
+     * @param int    $mode
      */
     public function importFromByteStream($nsKey, $itemKey, Swift_OutputByteStream $os, $mode)
     {
@@ -87,6 +81,7 @@ class Swift_KeyCache_ArrayKeyCache implements Swift_KeyCache
         switch ($mode) {
             case self::MODE_WRITE:
                 $this->clearKey($nsKey, $itemKey);
+                // no break
             case self::MODE_APPEND:
                 if (!$this->hasKey($nsKey, $itemKey)) {
                     $this->contents[$nsKey][$itemKey] = '';
@@ -96,10 +91,7 @@ class Swift_KeyCache_ArrayKeyCache implements Swift_KeyCache
                 }
                 break;
             default:
-                throw new Swift_SwiftException(
-                    'Invalid mode ['.$mode.'] used to set nsKey='.
-                    $nsKey.', itemKey='.$itemKey
-                    );
+                throw new Swift_SwiftException('Invalid mode ['.$mode.'] used to set nsKey='.$nsKey.', itemKey='.$itemKey);
         }
     }
 
@@ -108,9 +100,8 @@ class Swift_KeyCache_ArrayKeyCache implements Swift_KeyCache
      *
      * NOTE: The stream will always write in append mode.
      *
-     * @param string                $nsKey
-     * @param string                $itemKey
-     * @param Swift_InputByteStream $writeThrough
+     * @param string $nsKey
+     * @param string $itemKey
      *
      * @return Swift_InputByteStream
      */
@@ -168,7 +159,7 @@ class Swift_KeyCache_ArrayKeyCache implements Swift_KeyCache
     {
         $this->prepareCache($nsKey);
 
-        return array_key_exists($itemKey, $this->contents[$nsKey]);
+        return \array_key_exists($itemKey, $this->contents[$nsKey]);
     }
 
     /**
@@ -199,8 +190,8 @@ class Swift_KeyCache_ArrayKeyCache implements Swift_KeyCache
      */
     private function prepareCache($nsKey)
     {
-        if (!array_key_exists($nsKey, $this->contents)) {
-            $this->contents[$nsKey] = array();
+        if (!\array_key_exists($nsKey, $this->contents)) {
+            $this->contents[$nsKey] = [];
         }
     }
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/DiskKeyCache.php b/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/DiskKeyCache.php
index d6a633a1512..33b6367cb8b 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/DiskKeyCache.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/DiskKeyCache.php
@@ -43,14 +43,13 @@ class Swift_KeyCache_DiskKeyCache implements Swift_KeyCache
      *
      * @var array
      */
-    private $keys = array();
+    private $keys = [];
 
     /**
      * Create a new DiskKeyCache with the given $stream for cloning to make
      * InputByteStreams, and the given $path to save to.
      *
-     * @param Swift_KeyCache_KeyCacheInputStream $stream
-     * @param string                             $path   to save to
+     * @param string $path to save to
      */
     public function __construct(Swift_KeyCache_KeyCacheInputStream $stream, $path)
     {
@@ -81,10 +80,7 @@ class Swift_KeyCache_DiskKeyCache implements Swift_KeyCache
                 $fp = $this->getHandle($nsKey, $itemKey, self::POSITION_END);
                 break;
             default:
-                throw new Swift_SwiftException(
-                    'Invalid mode ['.$mode.'] used to set nsKey='.
-                    $nsKey.', itemKey='.$itemKey
-                    );
+                throw new Swift_SwiftException('Invalid mode ['.$mode.'] used to set nsKey='.$nsKey.', itemKey='.$itemKey);
                 break;
         }
         fwrite($fp, $string);
@@ -96,10 +92,9 @@ class Swift_KeyCache_DiskKeyCache implements Swift_KeyCache
      *
      * @see MODE_WRITE, MODE_APPEND
      *
-     * @param string                 $nsKey
-     * @param string                 $itemKey
-     * @param Swift_OutputByteStream $os
-     * @param int                    $mode
+     * @param string $nsKey
+     * @param string $itemKey
+     * @param int    $mode
      *
      * @throws Swift_IoException
      */
@@ -114,10 +109,7 @@ class Swift_KeyCache_DiskKeyCache implements Swift_KeyCache
                 $fp = $this->getHandle($nsKey, $itemKey, self::POSITION_END);
                 break;
             default:
-                throw new Swift_SwiftException(
-                    'Invalid mode ['.$mode.'] used to set nsKey='.
-                    $nsKey.', itemKey='.$itemKey
-                    );
+                throw new Swift_SwiftException('Invalid mode ['.$mode.'] used to set nsKey='.$nsKey.', itemKey='.$itemKey);
                 break;
         }
         while (false !== $bytes = $os->read(8192)) {
@@ -131,9 +123,8 @@ class Swift_KeyCache_DiskKeyCache implements Swift_KeyCache
      *
      * NOTE: The stream will always write in append mode.
      *
-     * @param string                $nsKey
-     * @param string                $itemKey
-     * @param Swift_InputByteStream $writeThrough
+     * @param string $nsKey
+     * @param string $itemKey
      *
      * @return Swift_InputByteStream
      */
@@ -227,7 +218,7 @@ class Swift_KeyCache_DiskKeyCache implements Swift_KeyCache
      */
     public function clearAll($nsKey)
     {
-        if (array_key_exists($nsKey, $this->keys)) {
+        if (\array_key_exists($nsKey, $this->keys)) {
             foreach ($this->keys[$nsKey] as $itemKey => $null) {
                 $this->clearKey($nsKey, $itemKey);
             }
@@ -250,7 +241,7 @@ class Swift_KeyCache_DiskKeyCache implements Swift_KeyCache
             if (!mkdir($cacheDir)) {
                 throw new Swift_IoException('Failed to create cache directory '.$cacheDir);
             }
-            $this->keys[$nsKey] = array();
+            $this->keys[$nsKey] = [];
         }
     }
 
@@ -295,4 +286,9 @@ class Swift_KeyCache_DiskKeyCache implements Swift_KeyCache
             $this->clearAll($nsKey);
         }
     }
+
+    public function __wakeup()
+    {
+        $this->keys = [];
+    }
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/KeyCacheInputStream.php b/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/KeyCacheInputStream.php
index af80bdca6bf..be2dbba0c58 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/KeyCacheInputStream.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/KeyCacheInputStream.php
@@ -17,8 +17,6 @@ interface Swift_KeyCache_KeyCacheInputStream extends Swift_InputByteStream
 {
     /**
      * Set the KeyCache to wrap.
-     *
-     * @param Swift_KeyCache $keyCache
      */
     public function setKeyCache(Swift_KeyCache $keyCache);
 
@@ -38,8 +36,6 @@ interface Swift_KeyCache_KeyCacheInputStream extends Swift_InputByteStream
 
     /**
      * Specify a stream to write through for each write().
-     *
-     * @param Swift_InputByteStream $is
      */
     public function setWriteThroughStream(Swift_InputByteStream $is);
 
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/NullKeyCache.php b/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/NullKeyCache.php
index 4efe785648f..957b1b2a000 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/NullKeyCache.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/NullKeyCache.php
@@ -34,10 +34,9 @@ class Swift_KeyCache_NullKeyCache implements Swift_KeyCache
      *
      * @see MODE_WRITE, MODE_APPEND
      *
-     * @param string                 $nsKey
-     * @param string                 $itemKey
-     * @param Swift_OutputByteStream $os
-     * @param int                    $mode
+     * @param string $nsKey
+     * @param string $itemKey
+     * @param int    $mode
      */
     public function importFromByteStream($nsKey, $itemKey, Swift_OutputByteStream $os, $mode)
     {
@@ -48,9 +47,8 @@ class Swift_KeyCache_NullKeyCache implements Swift_KeyCache
      *
      * NOTE: The stream will always write in append mode.
      *
-     * @param string                $nsKey
-     * @param string                $itemKey
-     * @param Swift_InputByteStream $writeThrough
+     * @param string $nsKey
+     * @param string $itemKey
      *
      * @return Swift_InputByteStream
      */
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php b/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php
index a74df434c46..03bab481ea3 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php
@@ -29,8 +29,6 @@ class Swift_KeyCache_SimpleKeyCacheInputStream implements Swift_KeyCache_KeyCach
 
     /**
      * Set the KeyCache to wrap.
-     *
-     * @param Swift_KeyCache $keyCache
      */
     public function setKeyCache(Swift_KeyCache $keyCache)
     {
@@ -39,8 +37,6 @@ class Swift_KeyCache_SimpleKeyCacheInputStream implements Swift_KeyCache_KeyCach
 
     /**
      * Specify a stream to write through for each write().
-     *
-     * @param Swift_InputByteStream $is
      */
     public function setWriteThroughStream(Swift_InputByteStream $is)
     {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/LoadBalancedTransport.php b/htdocs/includes/swiftmailer/lib/classes/Swift/LoadBalancedTransport.php
index 03106e55d4e..244b5f60245 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/LoadBalancedTransport.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/LoadBalancedTransport.php
@@ -20,10 +20,10 @@ class Swift_LoadBalancedTransport extends Swift_Transport_LoadBalancedTransport
      *
      * @param array $transports
      */
-    public function __construct($transports = array())
+    public function __construct($transports = [])
     {
-        call_user_func_array(
-            array($this, 'Swift_Transport_LoadBalancedTransport::__construct'),
+        \call_user_func_array(
+            [$this, 'Swift_Transport_LoadBalancedTransport::__construct'],
             Swift_DependencyContainer::getInstance()
                 ->createDependenciesFor('transport.loadbalanced')
             );
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mailer.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mailer.php
index 3561ec6e68e..57630074cd9 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mailer.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mailer.php
@@ -20,8 +20,6 @@ class Swift_Mailer
 
     /**
      * Create a new Mailer using $transport for delivery.
-     *
-     * @param Swift_Transport $transport
      */
     public function __construct(Swift_Transport $transport)
     {
@@ -54,8 +52,7 @@ class Swift_Mailer
      * The return value is the number of recipients who were accepted for
      * delivery.
      *
-     * @param Swift_Mime_SimpleMessage $message
-     * @param array                    $failedRecipients An array of failures by-reference
+     * @param array $failedRecipients An array of failures by-reference
      *
      * @return int The number of successful recipients. Can be 0 which indicates failure
      */
@@ -63,6 +60,7 @@ class Swift_Mailer
     {
         $failedRecipients = (array) $failedRecipients;
 
+        // FIXME: to be removed in 7.0 (as transport must now start itself on send)
         if (!$this->transport->isStarted()) {
             $this->transport->start();
         }
@@ -82,8 +80,6 @@ class Swift_Mailer
 
     /**
      * Register a plugin using a known unique key (e.g. myPlugin).
-     *
-     * @param Swift_Events_EventListener $plugin
      */
     public function registerPlugin(Swift_Events_EventListener $plugin)
     {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mailer/ArrayRecipientIterator.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mailer/ArrayRecipientIterator.php
index 84dacb5f185..19aa82a9c40 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mailer/ArrayRecipientIterator.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mailer/ArrayRecipientIterator.php
@@ -20,12 +20,10 @@ class Swift_Mailer_ArrayRecipientIterator implements Swift_Mailer_RecipientItera
      *
      * @var array
      */
-    private $recipients = array();
+    private $recipients = [];
 
     /**
      * Create a new ArrayRecipientIterator from $recipients.
-     *
-     * @param array $recipients
      */
     public function __construct(array $recipients)
     {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/MemorySpool.php b/htdocs/includes/swiftmailer/lib/classes/Swift/MemorySpool.php
index 9aa62835b32..e3b0894d87a 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/MemorySpool.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/MemorySpool.php
@@ -15,7 +15,7 @@
  */
 class Swift_MemorySpool implements Swift_Spool
 {
-    protected $messages = array();
+    protected $messages = [];
     private $flushRetries = 3;
 
     /**
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Message.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Message.php
index 00f6e160027..5c5834e23d8 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Message.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Message.php
@@ -18,17 +18,17 @@ class Swift_Message extends Swift_Mime_SimpleMessage
     /**
      * @var Swift_Signers_HeaderSigner[]
      */
-    private $headerSigners = array();
+    private $headerSigners = [];
 
     /**
      * @var Swift_Signers_BodySigner[]
      */
-    private $bodySigners = array();
+    private $bodySigners = [];
 
     /**
      * @var array
      */
-    private $savedMessage = array();
+    private $savedMessage = [];
 
     /**
      * Create a new Message.
@@ -42,8 +42,8 @@ class Swift_Message extends Swift_Mime_SimpleMessage
      */
     public function __construct($subject = null, $body = null, $contentType = null, $charset = null)
     {
-        call_user_func_array(
-            array($this, 'Swift_Mime_SimpleMessage::__construct'),
+        \call_user_func_array(
+            [$this, 'Swift_Mime_SimpleMessage::__construct'],
             Swift_DependencyContainer::getInstance()
                 ->createDependenciesFor('mime.message')
             );
@@ -75,9 +75,7 @@ class Swift_Message extends Swift_Mime_SimpleMessage
     }
 
     /**
-     * Detach a signature handler from a message.
-     *
-     * @param Swift_Signer $signer
+     * Attach a new signature handler to the message.
      *
      * @return $this
      */
@@ -93,9 +91,7 @@ class Swift_Message extends Swift_Mime_SimpleMessage
     }
 
     /**
-     * Attach a new signature handler to the message.
-     *
-     * @param Swift_Signer $signer
+     * Detach a signature handler from a message.
      *
      * @return $this
      */
@@ -122,6 +118,19 @@ class Swift_Message extends Swift_Mime_SimpleMessage
         return $this;
     }
 
+    /**
+     * Clear all signature handlers attached to the message.
+     *
+     * @return $this
+     */
+    public function clearSigners()
+    {
+        $this->headerSigners = [];
+        $this->bodySigners = [];
+
+        return $this;
+    }
+
     /**
      * Get this message as a complete string.
      *
@@ -146,8 +155,6 @@ class Swift_Message extends Swift_Mime_SimpleMessage
 
     /**
      * Write this message to a {@link Swift_InputByteStream}.
-     *
-     * @param Swift_InputByteStream $is
      */
     public function toByteStream(Swift_InputByteStream $is)
     {
@@ -202,24 +209,22 @@ class Swift_Message extends Swift_Mime_SimpleMessage
      */
     protected function saveMessage()
     {
-        $this->savedMessage = array('headers' => array());
+        $this->savedMessage = ['headers' => []];
         $this->savedMessage['body'] = $this->getBody();
         $this->savedMessage['children'] = $this->getChildren();
-        if (count($this->savedMessage['children']) > 0 && $this->getBody() != '') {
-            $this->setChildren(array_merge(array($this->becomeMimePart()), $this->savedMessage['children']));
+        if (\count($this->savedMessage['children']) > 0 && '' != $this->getBody()) {
+            $this->setChildren(array_merge([$this->becomeMimePart()], $this->savedMessage['children']));
             $this->setBody('');
         }
     }
 
     /**
      * save the original headers.
-     *
-     * @param array $altered
      */
     protected function saveHeaders(array $altered)
     {
         foreach ($altered as $head) {
-            $lc = strtolower($head);
+            $lc = strtolower($head ?? '');
 
             if (!isset($this->savedMessage['headers'][$lc])) {
                 $this->savedMessage['headers'][$lc] = $this->getHeaders()->getAll($head);
@@ -252,7 +257,7 @@ class Swift_Message extends Swift_Mime_SimpleMessage
         $this->setChildren($this->savedMessage['children']);
 
         $this->restoreHeaders();
-        $this->savedMessage = array();
+        $this->savedMessage = [];
     }
 
     /**
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Attachment.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Attachment.php
index a36ce7237cf..d994373bd78 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Attachment.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Attachment.php
@@ -16,18 +16,14 @@
 class Swift_Mime_Attachment extends Swift_Mime_SimpleMimeEntity
 {
     /** Recognized MIME types */
-    private $mimeTypes = array();
+    private $mimeTypes = [];
 
     /**
      * Create a new Attachment with $headers, $encoder and $cache.
      *
-     * @param Swift_Mime_SimpleHeaderSet $headers
-     * @param Swift_Mime_ContentEncoder  $encoder
-     * @param Swift_KeyCache             $cache
-     * @param Swift_IdGenerator          $idGenerator
-     * @param array                      $mimeTypes
+     * @param array $mimeTypes
      */
-    public function __construct(Swift_Mime_SimpleHeaderSet $headers, Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache, Swift_IdGenerator $idGenerator, $mimeTypes = array())
+    public function __construct(Swift_Mime_SimpleHeaderSet $headers, Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache, Swift_IdGenerator $idGenerator, $mimeTypes = [])
     {
         parent::__construct($headers, $encoder, $cache, $idGenerator);
         $this->setDisposition('attachment');
@@ -127,8 +123,7 @@ class Swift_Mime_Attachment extends Swift_Mime_SimpleMimeEntity
     /**
      * Set the file that this attachment is for.
      *
-     * @param Swift_FileStream $file
-     * @param string           $contentType optional
+     * @param string $contentType optional
      *
      * @return $this
      */
@@ -139,7 +134,7 @@ class Swift_Mime_Attachment extends Swift_Mime_SimpleMimeEntity
         if (!isset($contentType)) {
             $extension = strtolower(substr($file->getPath(), strrpos($file->getPath(), '.') + 1));
 
-            if (array_key_exists($extension, $this->mimeTypes)) {
+            if (\array_key_exists($extension, $this->mimeTypes)) {
                 $this->setContentType($this->mimeTypes[$extension]);
             }
         }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php
index 8f76d70f358..b7e1e028307 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php
@@ -18,10 +18,7 @@ class Swift_Mime_ContentEncoder_Base64ContentEncoder extends Swift_Encoder_Base6
     /**
      * Encode stream $in to stream $out.
      *
-     * @param Swift_OutputByteStream $os
-     * @param Swift_InputByteStream  $is
-     * @param int                    $firstLineOffset
-     * @param int                    $maxLineLength,  optional, 0 indicates the default of 76 bytes
+     * @param int $firstLineOffset
      */
     public function encodeByteStream(Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0, $maxLineLength = 0)
     {
@@ -30,7 +27,7 @@ class Swift_Mime_ContentEncoder_Base64ContentEncoder extends Swift_Encoder_Base6
         }
 
         $remainder = 0;
-        $base64ReadBufferRemainderBytes = null;
+        $base64ReadBufferRemainderBytes = '';
 
         // To reduce memory usage, the output buffer is streamed to the input buffer like so:
         //   Output Stream => base64encode => wrap line length => Input Stream
@@ -41,17 +38,17 @@ class Swift_Mime_ContentEncoder_Base64ContentEncoder extends Swift_Encoder_Base6
         // When the OutputStream is empty, we must flush any remainder bytes.
         while (true) {
             $readBytes = $os->read(8192);
-            $atEOF = ($readBytes === false);
+            $atEOF = (false === $readBytes);
 
             if ($atEOF) {
                 $streamTheseBytes = $base64ReadBufferRemainderBytes;
             } else {
                 $streamTheseBytes = $base64ReadBufferRemainderBytes.$readBytes;
             }
-            $base64ReadBufferRemainderBytes = null;
-            $bytesLength = strlen($streamTheseBytes);
+            $base64ReadBufferRemainderBytes = '';
+            $bytesLength = \strlen($streamTheseBytes);
 
-            if ($bytesLength === 0) { // no data left to encode
+            if (0 === $bytesLength) { // no data left to encode
                 break;
             }
 
@@ -59,7 +56,7 @@ class Swift_Mime_ContentEncoder_Base64ContentEncoder extends Swift_Encoder_Base6
             // and carry over remainder 1-2 bytes to the next loop iteration
             if (!$atEOF) {
                 $excessBytes = $bytesLength % 3;
-                if ($excessBytes !== 0) {
+                if (0 !== $excessBytes) {
                     $base64ReadBufferRemainderBytes = substr($streamTheseBytes, -$excessBytes);
                     $streamTheseBytes = substr($streamTheseBytes, 0, $bytesLength - $excessBytes);
                 }
@@ -69,7 +66,7 @@ class Swift_Mime_ContentEncoder_Base64ContentEncoder extends Swift_Encoder_Base6
             $encodedTransformed = '';
             $thisMaxLineLength = $maxLineLength - $remainder - $firstLineOffset;
 
-            while ($thisMaxLineLength < strlen($encoded)) {
+            while ($thisMaxLineLength < \strlen($encoded)) {
                 $encodedTransformed .= substr($encoded, 0, $thisMaxLineLength)."\r\n";
                 $firstLineOffset = 0;
                 $encoded = substr($encoded, $thisMaxLineLength);
@@ -77,7 +74,7 @@ class Swift_Mime_ContentEncoder_Base64ContentEncoder extends Swift_Encoder_Base6
                 $remainder = 0;
             }
 
-            if (0 < $remainingLength = strlen($encoded)) {
+            if (0 < $remainingLength = \strlen($encoded)) {
                 $remainder += $remainingLength;
                 $encodedTransformed .= $encoded;
                 $encoded = null;
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php
index 34de4ef39a4..8dfea605fde 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php
@@ -16,16 +16,16 @@
 class Swift_Mime_ContentEncoder_NativeQpContentEncoder implements Swift_Mime_ContentEncoder
 {
     /**
-     * @var null|string
+     * @var string|null
      */
     private $charset;
 
     /**
-     * @param null|string $charset
+     * @param string|null $charset
      */
     public function __construct($charset = null)
     {
-        $this->charset = $charset ? $charset : 'utf-8';
+        $this->charset = $charset ?: 'utf-8';
     }
 
     /**
@@ -50,9 +50,8 @@ class Swift_Mime_ContentEncoder_NativeQpContentEncoder implements Swift_Mime_Con
      */
     public function encodeByteStream(Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0, $maxLineLength = 0)
     {
-        if ($this->charset !== 'utf-8') {
-            throw new RuntimeException(
-                sprintf('Charset "%s" not supported. NativeQpContentEncoder only supports "utf-8"', $this->charset));
+        if ('utf-8' !== $this->charset) {
+            throw new RuntimeException(sprintf('Charset "%s" not supported. NativeQpContentEncoder only supports "utf-8"', $this->charset));
         }
 
         $string = '';
@@ -87,9 +86,8 @@ class Swift_Mime_ContentEncoder_NativeQpContentEncoder implements Swift_Mime_Con
      */
     public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0)
     {
-        if ($this->charset !== 'utf-8') {
-            throw new RuntimeException(
-                sprintf('Charset "%s" not supported. NativeQpContentEncoder only supports "utf-8"', $this->charset));
+        if ('utf-8' !== $this->charset) {
+            throw new RuntimeException(sprintf('Charset "%s" not supported. NativeQpContentEncoder only supports "utf-8"', $this->charset));
         }
 
         return $this->standardize(quoted_printable_encode($string));
@@ -107,9 +105,9 @@ class Swift_Mime_ContentEncoder_NativeQpContentEncoder implements Swift_Mime_Con
         // transform CR or LF to CRLF
         $string = preg_replace('~=0D(?!=0A)|(?<!=0D)=0A~', '=0D=0A', $string);
         // transform =0D=0A to CRLF
-        $string = str_replace(array("\t=0D=0A", ' =0D=0A', '=0D=0A'), array("=09\r\n", "=20\r\n", "\r\n"), $string);
+        $string = str_replace(["\t=0D=0A", ' =0D=0A', '=0D=0A'], ["=09\r\n", "=20\r\n", "\r\n"], $string);
 
-        switch ($end = ord(substr($string, -1))) {
+        switch (\ord(substr($string, -1))) {
             case 0x09:
                 $string = substr_replace($string, '=09', -1);
                 break;
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NullContentEncoder.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NullContentEncoder.php
new file mode 100644
index 00000000000..6539de77b12
--- /dev/null
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NullContentEncoder.php
@@ -0,0 +1,79 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Handles the case where the email body is already encoded and you just need specify the correct
+ * encoding without actually changing the encoding of the body.
+ *
+ * @author Jan Flora <jf@penneo.com>
+ */
+class Swift_Mime_ContentEncoder_NullContentEncoder implements Swift_Mime_ContentEncoder
+{
+    /**
+     * The name of this encoding scheme (probably 7bit or 8bit).
+     *
+     * @var string
+     */
+    private $name;
+
+    /**
+     * Creates a new NullContentEncoder with $name (probably 7bit or 8bit).
+     *
+     * @param string $name
+     */
+    public function __construct($name)
+    {
+        $this->name = $name;
+    }
+
+    /**
+     * Encode a given string to produce an encoded string.
+     *
+     * @param string $string
+     * @param int    $firstLineOffset ignored
+     * @param int    $maxLineLength   ignored
+     *
+     * @return string
+     */
+    public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0)
+    {
+        return $string;
+    }
+
+    /**
+     * Encode stream $in to stream $out.
+     *
+     * @param int $firstLineOffset ignored
+     * @param int $maxLineLength   ignored
+     */
+    public function encodeByteStream(Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0, $maxLineLength = 0)
+    {
+        while (false !== ($bytes = $os->read(8192))) {
+            $is->write($bytes);
+        }
+    }
+
+    /**
+     * Get the name of this encoding scheme.
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * Not used.
+     */
+    public function charsetChanged($charset)
+    {
+    }
+}
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php
index 866b0c7c980..72592fc5894 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php
@@ -11,6 +11,10 @@
 /**
  * Handles binary/7/8-bit Transfer Encoding in Swift Mailer.
  *
+ * When sending 8-bit content over SMTP, you should use
+ * Swift_Transport_Esmtp_EightBitMimeHandler to enable the 8BITMIME SMTP
+ * extension.
+ *
  * @author Chris Corbyn
  */
 class Swift_Mime_ContentEncoder_PlainContentEncoder implements Swift_Mime_ContentEncoder
@@ -33,7 +37,7 @@ class Swift_Mime_ContentEncoder_PlainContentEncoder implements Swift_Mime_Conten
      * Creates a new PlainContentEncoder with $name (probably 7bit or 8bit).
      *
      * @param string $name
-     * @param bool   $canonical If canonicalization transformation should be done.
+     * @param bool   $canonical if canonicalization transformation should be done
      */
     public function __construct($name, $canonical = false)
     {
@@ -62,10 +66,8 @@ class Swift_Mime_ContentEncoder_PlainContentEncoder implements Swift_Mime_Conten
     /**
      * Encode stream $in to stream $out.
      *
-     * @param Swift_OutputByteStream $os
-     * @param Swift_InputByteStream  $is
-     * @param int                    $firstLineOffset ignored
-     * @param int                    $maxLineLength   optional, 0 means no wrapping will occur
+     * @param int $firstLineOffset ignored
+     * @param int $maxLineLength   optional, 0 means no wrapping will occur
      */
     public function encodeByteStream(Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0, $maxLineLength = 0)
     {
@@ -82,7 +84,7 @@ class Swift_Mime_ContentEncoder_PlainContentEncoder implements Swift_Mime_Conten
 
             $is->write($wrapped);
         }
-        if (strlen($leftOver)) {
+        if (\strlen($leftOver)) {
             $is->write($leftOver);
         }
     }
@@ -121,7 +123,7 @@ class Swift_Mime_ContentEncoder_PlainContentEncoder implements Swift_Mime_Conten
 
         $originalLines = explode($le, $string);
 
-        $lines = array();
+        $lines = [];
         $lineCount = 0;
 
         foreach ($originalLines as $originalLine) {
@@ -132,8 +134,8 @@ class Swift_Mime_ContentEncoder_PlainContentEncoder implements Swift_Mime_Conten
             $chunks = preg_split('/(?<=\s)/', $originalLine);
 
             foreach ($chunks as $chunk) {
-                if (0 != strlen($currentLine)
-                    && strlen($currentLine.$chunk) > $length) {
+                if (0 != \strlen($currentLine)
+                    && \strlen($currentLine.$chunk) > $length) {
                     $lines[] = '';
                     $currentLine = &$lines[$lineCount++];
                 }
@@ -154,8 +156,8 @@ class Swift_Mime_ContentEncoder_PlainContentEncoder implements Swift_Mime_Conten
     private function canonicalize($string)
     {
         return str_replace(
-            array("\r\n", "\r", "\n"),
-            array("\n", "\n", "\r\n"),
+            ["\r\n", "\r", "\n"],
+            ["\n", "\n", "\r\n"],
             $string
             );
     }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php
index b3577dbe61f..465ffd87850 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php
@@ -32,12 +32,12 @@ class Swift_Mime_ContentEncoder_QpContentEncoder extends Swift_Encoder_QpEncoder
 
     public function __sleep()
     {
-        return array('charStream', 'filter', 'dotEscape');
+        return ['charStream', 'filter', 'dotEscape'];
     }
 
     protected function getSafeMapShareId()
     {
-        return get_class($this).($this->dotEscape ? '.dotEscape' : '');
+        return static::class.($this->dotEscape ? '.dotEscape' : '');
     }
 
     protected function initSafeMap()
@@ -97,7 +97,7 @@ class Swift_Mime_ContentEncoder_QpContentEncoder extends Swift_Encoder_QpEncoder
             $enc = $this->encodeByteSequence($bytes, $size);
 
             $i = strpos($enc, '=0D=0A');
-            $newLineLength = $lineLen + ($i === false ? $size : $i);
+            $newLineLength = $lineLen + (false === $i ? $size : $i);
 
             if ($currentLine && $newLineLength >= $thisLineLength) {
                 $is->write($prepend.$this->standardize($currentLine));
@@ -109,14 +109,14 @@ class Swift_Mime_ContentEncoder_QpContentEncoder extends Swift_Encoder_QpEncoder
 
             $currentLine .= $enc;
 
-            if ($i === false) {
+            if (false === $i) {
                 $lineLen += $size;
             } else {
                 // 6 is the length of '=0D=0A'.
                 $lineLen = $size - strrpos($enc, '=0D=0A') - 6;
             }
         }
-        if (strlen($currentLine)) {
+        if (\strlen($currentLine)) {
             $is->write($prepend.$this->standardize($currentLine));
         }
     }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoderProxy.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoderProxy.php
index 3214e1cf3fd..f3ece43aecd 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoderProxy.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoderProxy.php
@@ -28,16 +28,14 @@ class Swift_Mime_ContentEncoder_QpContentEncoderProxy implements Swift_Mime_Cont
     private $nativeEncoder;
 
     /**
-     * @var null|string
+     * @var string|null
      */
     private $charset;
 
     /**
      * Constructor.
      *
-     * @param Swift_Mime_ContentEncoder_QpContentEncoder       $safeEncoder
-     * @param Swift_Mime_ContentEncoder_NativeQpContentEncoder $nativeEncoder
-     * @param string|null                                      $charset
+     * @param string|null $charset
      */
     public function __construct(Swift_Mime_ContentEncoder_QpContentEncoder $safeEncoder, Swift_Mime_ContentEncoder_NativeQpContentEncoder $nativeEncoder, $charset)
     {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/RawContentEncoder.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/RawContentEncoder.php
index 0b8526e38c3..870e7f41a93 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/RawContentEncoder.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/RawContentEncoder.php
@@ -11,6 +11,9 @@
 /**
  * Handles raw Transfer Encoding in Swift Mailer.
  *
+ * When sending 8-bit content over SMTP, you should use
+ * Swift_Transport_Esmtp_EightBitMimeHandler to enable the 8BITMIME SMTP
+ * extension.
  *
  * @author Sebastiaan Stok <s.stok@rollerscapes.net>
  */
@@ -33,10 +36,8 @@ class Swift_Mime_ContentEncoder_RawContentEncoder implements Swift_Mime_ContentE
     /**
      * Encode stream $in to stream $out.
      *
-     * @param Swift_OutputByteStream $in
-     * @param Swift_InputByteStream  $out
-     * @param int                    $firstLineOffset ignored
-     * @param int                    $maxLineLength   ignored
+     * @param int $firstLineOffset ignored
+     * @param int $maxLineLength   ignored
      */
     public function encodeByteStream(Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0, $maxLineLength = 0)
     {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/EmbeddedFile.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/EmbeddedFile.php
index 7835a492873..42a51770c76 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/EmbeddedFile.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/EmbeddedFile.php
@@ -18,13 +18,9 @@ class Swift_Mime_EmbeddedFile extends Swift_Mime_Attachment
     /**
      * Creates a new Attachment with $headers and $encoder.
      *
-     * @param Swift_Mime_SimpleHeaderSet $headers
-     * @param Swift_Mime_ContentEncoder  $encoder
-     * @param Swift_KeyCache             $cache
-     * @param Swift_IdGenerator          $idGenerator
-     * @param array                      $mimeTypes   optional
+     * @param array $mimeTypes optional
      */
-    public function __construct(Swift_Mime_SimpleHeaderSet $headers, Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache, Swift_IdGenerator $idGenerator, $mimeTypes = array())
+    public function __construct(Swift_Mime_SimpleHeaderSet $headers, Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache, Swift_IdGenerator $idGenerator, $mimeTypes = [])
     {
         parent::__construct($headers, $encoder, $cache, $idGenerator, $mimeTypes);
         $this->setDisposition('inline');
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/EncodingObserver.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/EncodingObserver.php
index cc44a6efb97..1a952ece12c 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/EncodingObserver.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/EncodingObserver.php
@@ -17,8 +17,6 @@ interface Swift_Mime_EncodingObserver
 {
     /**
      * Notify this observer that the observed entity's ContentEncoder has changed.
-     *
-     * @param Swift_Mime_ContentEncoder $encoder
      */
     public function encoderChanged(Swift_Mime_ContentEncoder $encoder);
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Header.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Header.php
index a8ddd272165..ca712f35aa0 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Header.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Header.php
@@ -85,7 +85,7 @@ interface Swift_Mime_Header
     public function getFieldBody();
 
     /**
-     * Get this Header rendered as a compliant string.
+     * Get this Header rendered as a compliant string, including trailing CRLF.
      *
      * @return string
      */
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php
index 83a4f2f3b2d..21c8aaabfea 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php
@@ -41,7 +41,7 @@ class Swift_Mime_HeaderEncoder_Base64HeaderEncoder extends Swift_Encoder_Base64E
      */
     public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0, $charset = 'utf-8')
     {
-        if (strtolower($charset) === 'iso-2022-jp') {
+        if ('iso-2022-jp' === strtolower($charset ?? '')) {
             $old = mb_internal_encoding();
             mb_internal_encoding('utf-8');
             $newstring = mb_encode_mimeheader($string, $charset, $this->getName(), "\r\n");
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php
index 062be7d7967..378c4805057 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php
@@ -29,9 +29,9 @@ class Swift_Mime_HeaderEncoder_QpHeaderEncoder extends Swift_Encoder_QpEncoder i
     {
         foreach (array_merge(
             range(0x61, 0x7A), range(0x41, 0x5A),
-            range(0x30, 0x39), array(0x20, 0x21, 0x2A, 0x2B, 0x2D, 0x2F)
+            range(0x30, 0x39), [0x20, 0x21, 0x2A, 0x2B, 0x2D, 0x2F]
         ) as $byte) {
-            $this->safeMap[$byte] = chr($byte);
+            $this->safeMap[$byte] = \chr($byte);
         }
     }
 
@@ -58,7 +58,7 @@ class Swift_Mime_HeaderEncoder_QpHeaderEncoder extends Swift_Encoder_QpEncoder i
      */
     public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0)
     {
-        return str_replace(array(' ', '=20', "=\r\n"), array('_', '_', "\r\n"),
+        return str_replace([' ', '=20', "=\r\n"], ['_', '_', "\r\n"],
             parent::encodeString($string, $firstLineOffset, $maxLineLength)
         );
     }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php
index a569f816189..25740d1155c 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php
@@ -109,8 +109,6 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
 
     /**
      * Set the encoder used for encoding the header.
-     *
-     * @param Swift_Mime_HeaderEncoder $encoder
      */
     public function setEncoder(Swift_Mime_HeaderEncoder $encoder)
     {
@@ -196,11 +194,9 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
     /**
      * Produces a compliant, formatted RFC 2822 'phrase' based on the string given.
      *
-     * @param Swift_Mime_Header        $header
-     * @param string                   $string  as displayed
-     * @param string                   $charset of the text
-     * @param Swift_Mime_HeaderEncoder $encoder
-     * @param bool                     $shorten the first line to make remove for header name
+     * @param string $string  as displayed
+     * @param string $charset of the text
+     * @param bool   $shorten the first line to make remove for header name
      *
      * @return string
      */
@@ -214,13 +210,13 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
             // .. but it is just ascii text, try escaping some characters
             // and make it a quoted-string
             if (preg_match('/^[\x00-\x08\x0B\x0C\x0E-\x7F]*$/D', $phraseStr)) {
-                $phraseStr = $this->escapeSpecials($phraseStr, array('"'));
+                $phraseStr = $this->escapeSpecials($phraseStr, ['"']);
                 $phraseStr = '"'.$phraseStr.'"';
             } else {
                 // ... otherwise it needs encoding
                 // Determine space remaining on line if first line
                 if ($shorten) {
-                    $usedLength = strlen($header->getFieldName().': ');
+                    $usedLength = \strlen($header->getFieldName().': ');
                 } else {
                     $usedLength = 0;
                 }
@@ -239,9 +235,9 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
      *
      * @return string
      */
-    private function escapeSpecials($token, $include = array())
+    private function escapeSpecials($token, $include = [])
     {
-        foreach (array_merge(array('\\'), $include) as $char) {
+        foreach (array_merge(['\\'], $include) as $char) {
             $token = str_replace($char, '\\'.$char, $token);
         }
 
@@ -251,9 +247,8 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
     /**
      * Encode needed word tokens within a string of input.
      *
-     * @param Swift_Mime_Header $header
-     * @param string            $input
-     * @param string            $usedLength optional
+     * @param string $input
+     * @param string $usedLength optional
      *
      * @return string
      */
@@ -276,7 +271,7 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
                 }
 
                 if (-1 == $usedLength) {
-                    $usedLength = strlen($header->getFieldName().': ') + strlen($value);
+                    $usedLength = \strlen($header->getFieldName().': ') + \strlen($value);
                 }
                 $value .= $this->getTokenAsEncodedWord($token, $usedLength);
 
@@ -310,22 +305,22 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
      */
     protected function getEncodableWordTokens($string)
     {
-        $tokens = array();
+        $tokens = [];
 
         $encodedToken = '';
         // Split at all whitespace boundaries
-        foreach (preg_split('~(?=[\t ])~', $string) as $token) {
+        foreach (preg_split('~(?=[\t ])~', $string ?? '') as $token) {
             if ($this->tokenNeedsEncoding($token)) {
                 $encodedToken .= $token;
             } else {
-                if (strlen($encodedToken) > 0) {
+                if (\strlen($encodedToken) > 0) {
                     $tokens[] = $encodedToken;
                     $encodedToken = '';
                 }
                 $tokens[] = $token;
             }
         }
-        if (strlen($encodedToken)) {
+        if (\strlen($encodedToken)) {
             $tokens[] = $encodedToken;
         }
 
@@ -347,7 +342,7 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
         if (isset($this->lang)) {
             $charsetDecl .= '*'.$this->lang;
         }
-        $encodingWrapperLength = strlen(
+        $encodingWrapperLength = \strlen(
             '=?'.$charsetDecl.'?'.$this->encoder->getName().'??='
             );
 
@@ -359,10 +354,10 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
         $encodedTextLines = explode("\r\n",
             $this->encoder->encodeString(
                 $token, $firstLineOffset, 75 - $encodingWrapperLength, $this->charset
-                )
+            ) ?? ''
         );
 
-        if (strtolower($this->charset) !== 'iso-2022-jp') {
+        if ('iso-2022-jp' !== strtolower($this->charset ?? '')) {
             // special encoding for iso-2022-jp using mb_encode_mimeheader
             foreach ($encodedTextLines as $lineNum => $line) {
                 $encodedTextLines[$lineNum] = '=?'.$charsetDecl.
@@ -383,7 +378,7 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
      */
     protected function generateTokenLines($token)
     {
-        return preg_split('~(\r\n)~', $token, -1, PREG_SPLIT_DELIM_CAPTURE);
+        return preg_split('~(\r\n)~', $token ?? '', -1, PREG_SPLIT_DELIM_CAPTURE);
     }
 
     /**
@@ -431,10 +426,10 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
             $string = $this->getFieldBody();
         }
 
-        $tokens = array();
+        $tokens = [];
 
         // Generate atoms; split at all invisible boundaries followed by WSP
-        foreach (preg_split('~(?=[ \t])~', $string) as $token) {
+        foreach (preg_split('~(?=[ \t])~', $string ?? '') as $token) {
             $newTokens = $this->generateTokenLines($token);
             foreach ($newTokens as $newToken) {
                 $tokens[] = $newToken;
@@ -455,7 +450,7 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
     private function tokensToString(array $tokens)
     {
         $lineCount = 0;
-        $headerLines = array();
+        $headerLines = [];
         $headerLines[] = $this->name.': ';
         $currentLine = &$headerLines[$lineCount++];
 
@@ -463,8 +458,8 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
         foreach ($tokens as $i => $token) {
             // Line longer than specified maximum or token was just a new line
             if (("\r\n" == $token) ||
-                ($i > 0 && strlen($currentLine.$token) > $this->lineLength)
-                && 0 < strlen($currentLine)) {
+                ($i > 0 && \strlen($currentLine.$token) > $this->lineLength)
+                && 0 < \strlen($currentLine)) {
                 $headerLines[] = '';
                 $currentLine = &$headerLines[$lineCount++];
             }
@@ -478,4 +473,14 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
         // Implode with FWS (RFC 2822, 2.2.3)
         return implode("\r\n", $headerLines)."\r\n";
     }
+
+    /**
+     * Make a deep copy of object.
+     */
+    public function __clone()
+    {
+        if ($this->encoder) {
+            $this->encoder = clone $this->encoder;
+        }
+    }
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php
index 6dcc92bfdd6..efe1dad6619 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php
@@ -79,8 +79,6 @@ class Swift_Mime_Headers_DateHeader extends Swift_Mime_Headers_AbstractHeader
      * Set the date-time of the Date in this Header.
      *
      * If a DateTime instance is provided, it is converted to DateTimeImmutable.
-     *
-     * @param DateTimeInterface $dateTime
      */
     public function setDateTime(DateTimeInterface $dateTime)
     {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/IdentificationHeader.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/IdentificationHeader.php
index acf794479b6..4fcdff418a7 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/IdentificationHeader.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/IdentificationHeader.php
@@ -9,6 +9,7 @@
  */
 
 use Egulias\EmailValidator\EmailValidator;
+use Egulias\EmailValidator\Validation\MessageIDValidation;
 use Egulias\EmailValidator\Validation\RFCValidation;
 
 /**
@@ -25,7 +26,7 @@ class Swift_Mime_Headers_IdentificationHeader extends Swift_Mime_Headers_Abstrac
      *
      * @var string[]
      */
-    private $ids = array();
+    private $ids = [];
 
     /**
      * The strict EmailValidator.
@@ -34,16 +35,18 @@ class Swift_Mime_Headers_IdentificationHeader extends Swift_Mime_Headers_Abstrac
      */
     private $emailValidator;
 
+    private $addressEncoder;
+
     /**
      * Creates a new IdentificationHeader with the given $name and $id.
      *
-     * @param string         $name
-     * @param EmailValidator $emailValidator
+     * @param string $name
      */
-    public function __construct($name, EmailValidator $emailValidator)
+    public function __construct($name, EmailValidator $emailValidator, Swift_AddressEncoder $addressEncoder = null)
     {
         $this->setFieldName($name);
         $this->emailValidator = $emailValidator;
+        $this->addressEncoder = $addressEncoder ?? new Swift_AddressEncoder_IdnAddressEncoder();
     }
 
     /**
@@ -94,7 +97,7 @@ class Swift_Mime_Headers_IdentificationHeader extends Swift_Mime_Headers_Abstrac
      */
     public function setId($id)
     {
-        $this->setIds(is_array($id) ? $id : array($id));
+        $this->setIds(\is_array($id) ? $id : [$id]);
     }
 
     /**
@@ -106,7 +109,7 @@ class Swift_Mime_Headers_IdentificationHeader extends Swift_Mime_Headers_Abstrac
      */
     public function getId()
     {
-        if (count($this->ids) > 0) {
+        if (\count($this->ids) > 0) {
             return $this->ids[0];
         }
     }
@@ -120,7 +123,7 @@ class Swift_Mime_Headers_IdentificationHeader extends Swift_Mime_Headers_Abstrac
      */
     public function setIds(array $ids)
     {
-        $actualIds = array();
+        $actualIds = [];
 
         foreach ($ids as $id) {
             $this->assertValidId($id);
@@ -156,10 +159,10 @@ class Swift_Mime_Headers_IdentificationHeader extends Swift_Mime_Headers_Abstrac
     public function getFieldBody()
     {
         if (!$this->getCachedValue()) {
-            $angleAddrs = array();
+            $angleAddrs = [];
 
             foreach ($this->ids as $id) {
-                $angleAddrs[] = '<'.$id.'>';
+                $angleAddrs[] = '<'.$this->addressEncoder->encodeString($id).'>';
             }
 
             $this->setCachedValue(implode(' ', $angleAddrs));
@@ -177,7 +180,9 @@ class Swift_Mime_Headers_IdentificationHeader extends Swift_Mime_Headers_Abstrac
      */
     private function assertValidId($id)
     {
-        if (!$this->emailValidator->isValid($id, new RFCValidation())) {
+        $emailValidation = class_exists(MessageIDValidation::class) ? new MessageIDValidation() : new RFCValidation();
+
+        if (!$this->emailValidator->isValid($id, $emailValidation)) {
             throw new Swift_RfcComplianceException('Invalid ID given <'.$id.'>');
         }
     }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php
index 450e0f25b7e..ddd5e8cffb1 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php
@@ -23,7 +23,7 @@ class Swift_Mime_Headers_MailboxHeader extends Swift_Mime_Headers_AbstractHeader
      *
      * @var string[]
      */
-    private $mailboxes = array();
+    private $mailboxes = [];
 
     /**
      * The strict EmailValidator.
@@ -32,18 +32,19 @@ class Swift_Mime_Headers_MailboxHeader extends Swift_Mime_Headers_AbstractHeader
      */
     private $emailValidator;
 
+    private $addressEncoder;
+
     /**
      * Creates a new MailboxHeader with $name.
      *
-     * @param string                   $name           of Header
-     * @param Swift_Mime_HeaderEncoder $encoder
-     * @param EmailValidator           $emailValidator
+     * @param string $name of Header
      */
-    public function __construct($name, Swift_Mime_HeaderEncoder $encoder, EmailValidator $emailValidator)
+    public function __construct($name, Swift_Mime_HeaderEncoder $encoder, EmailValidator $emailValidator, Swift_AddressEncoder $addressEncoder = null)
     {
         $this->setFieldName($name);
         $this->setEncoder($encoder);
         $this->emailValidator = $emailValidator;
+        $this->addressEncoder = $addressEncoder ?? new Swift_AddressEncoder_IdnAddressEncoder();
     }
 
     /**
@@ -257,10 +258,10 @@ class Swift_Mime_Headers_MailboxHeader extends Swift_Mime_Headers_AbstractHeader
      */
     protected function normalizeMailboxes(array $mailboxes)
     {
-        $actualMailboxes = array();
+        $actualMailboxes = [];
 
         foreach ($mailboxes as $key => $value) {
-            if (is_string($key)) {
+            if (\is_string($key)) {
                 //key is email addr
                 $address = $key;
                 $name = $value;
@@ -327,10 +328,10 @@ class Swift_Mime_Headers_MailboxHeader extends Swift_Mime_Headers_AbstractHeader
      */
     private function createNameAddressStrings(array $mailboxes)
     {
-        $strings = array();
+        $strings = [];
 
         foreach ($mailboxes as $email => $name) {
-            $mailboxStr = $email;
+            $mailboxStr = $this->addressEncoder->encodeString($email);
             if (null !== $name) {
                 $nameStr = $this->createDisplayNameString($name, empty($strings));
                 $mailboxStr = $nameStr.' <'.$mailboxStr.'>';
@@ -346,14 +347,12 @@ class Swift_Mime_Headers_MailboxHeader extends Swift_Mime_Headers_AbstractHeader
      *
      * @param string $address
      *
-     * @throws Swift_RfcComplianceException If invalid.
+     * @throws Swift_RfcComplianceException if invalid
      */
     private function assertValidAddress($address)
     {
         if (!$this->emailValidator->isValid($address, new RFCValidation())) {
-            throw new Swift_RfcComplianceException(
-                'Address in mailbox given ['.$address.'] does not comply with RFC 2822, 3.6.2.'
-            );
+            throw new Swift_RfcComplianceException('Address in mailbox given ['.$address.'] does not comply with RFC 2822, 3.6.2.');
         }
     }
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/OpenDKIMHeader.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/OpenDKIMHeader.php
index 29277994c0a..fafb5bae21f 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/OpenDKIMHeader.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/OpenDKIMHeader.php
@@ -12,6 +12,8 @@
  * An OpenDKIM Specific Header using only raw header datas without encoding.
  *
  * @author De Cock Xavier <xdecock@gmail.com>
+ *
+ * @deprecated since SwiftMailer 6.1.0; use Swift_Signers_DKIMSigner instead.
  */
 class Swift_Mime_Headers_OpenDKIMHeader implements Swift_Mime_Header
 {
@@ -111,7 +113,7 @@ class Swift_Mime_Headers_OpenDKIMHeader implements Swift_Mime_Header
      */
     public function toString()
     {
-        return $this->fieldName.': '.$this->value;
+        return $this->fieldName.': '.$this->value."\r\n";
     }
 
     /**
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php
index 228946a5ee9..47c15e6c05f 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php
@@ -34,14 +34,12 @@ class Swift_Mime_Headers_ParameterizedHeader extends Swift_Mime_Headers_Unstruct
      *
      * @var string[]
      */
-    private $params = array();
+    private $params = [];
 
     /**
      * Creates a new ParameterizedHeader with $name.
      *
-     * @param string                   $name
-     * @param Swift_Mime_HeaderEncoder $encoder
-     * @param Swift_Encoder            $paramEncoder, optional
+     * @param string $name
      */
     public function __construct($name, Swift_Mime_HeaderEncoder $encoder, Swift_Encoder $paramEncoder = null)
     {
@@ -83,7 +81,7 @@ class Swift_Mime_Headers_ParameterizedHeader extends Swift_Mime_Headers_Unstruct
      */
     public function setParameter($parameter, $value)
     {
-        $this->setParameters(array_merge($this->getParameters(), array($parameter => $value)));
+        $this->setParameters(array_merge($this->getParameters(), [$parameter => $value]));
     }
 
     /**
@@ -97,7 +95,7 @@ class Swift_Mime_Headers_ParameterizedHeader extends Swift_Mime_Headers_Unstruct
     {
         $params = $this->getParameters();
 
-        return isset($params[$parameter]) ? $params[$parameter] : null;
+        return $params[$parameter] ?? null;
     }
 
     /**
@@ -157,7 +155,7 @@ class Swift_Mime_Headers_ParameterizedHeader extends Swift_Mime_Headers_Unstruct
         foreach ($this->params as $name => $value) {
             if (null !== $value) {
                 // Add the semi-colon separator
-                $tokens[count($tokens) - 1] .= ';';
+                $tokens[\count($tokens) - 1] .= ';';
                 $tokens = array_merge($tokens, $this->generateTokenLines(
                     ' '.$this->createParameter($name, $value)
                     ));
@@ -181,7 +179,7 @@ class Swift_Mime_Headers_ParameterizedHeader extends Swift_Mime_Headers_Unstruct
 
         $encoded = false;
         // Allow room for parameter name, indices, "=" and DQUOTEs
-        $maxValueLength = $this->getMaxLineLength() - strlen($name.'=*N"";') - 1;
+        $maxValueLength = $this->getMaxLineLength() - \strlen($name.'=*N"";') - 1;
         $firstLineOffset = 0;
 
         // If it's not already a valid parameter value...
@@ -191,15 +189,15 @@ class Swift_Mime_Headers_ParameterizedHeader extends Swift_Mime_Headers_Unstruct
             if (!preg_match('/^[\x00-\x08\x0B\x0C\x0E-\x7F]*$/D', $value)) {
                 $encoded = true;
                 // Allow space for the indices, charset and language
-                $maxValueLength = $this->getMaxLineLength() - strlen($name.'*N*="";') - 1;
-                $firstLineOffset = strlen(
+                $maxValueLength = $this->getMaxLineLength() - \strlen($name.'*N*="";') - 1;
+                $firstLineOffset = \strlen(
                     $this->getCharset()."'".$this->getLanguage()."'"
                     );
             }
         }
 
         // Encode if we need to
-        if ($encoded || strlen($value) > $maxValueLength) {
+        if ($encoded || \strlen($value) > $maxValueLength) {
             if (isset($this->paramEncoder)) {
                 $value = $this->paramEncoder->encodeString(
                     $origValue, $firstLineOffset, $maxValueLength, $this->getCharset()
@@ -211,14 +209,14 @@ class Swift_Mime_Headers_ParameterizedHeader extends Swift_Mime_Headers_Unstruct
             }
         }
 
-        $valueLines = isset($this->paramEncoder) ? explode("\r\n", $value) : array($value);
+        $valueLines = isset($this->paramEncoder) ? explode("\r\n", $value) : [$value];
 
         // Need to add indices
-        if (count($valueLines) > 1) {
-            $paramLines = array();
+        if (\count($valueLines) > 1) {
+            $paramLines = [];
             foreach ($valueLines as $i => $line) {
                 $paramLines[] = $name.'*'.$i.
-                    $this->getEndOfParameterValue($line, true, $i == 0);
+                    $this->getEndOfParameterValue($line, true, 0 == $i);
             }
 
             return implode(";\r\n ", $paramLines);
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/PathHeader.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/PathHeader.php
index f79e19fd8b3..81b421ee7a8 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/PathHeader.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/PathHeader.php
@@ -32,16 +32,18 @@ class Swift_Mime_Headers_PathHeader extends Swift_Mime_Headers_AbstractHeader
      */
     private $emailValidator;
 
+    private $addressEncoder;
+
     /**
      * Creates a new PathHeader with the given $name.
      *
-     * @param string         $name
-     * @param EmailValidator $emailValidator
+     * @param string $name
      */
-    public function __construct($name, EmailValidator $emailValidator)
+    public function __construct($name, EmailValidator $emailValidator, Swift_AddressEncoder $addressEncoder = null)
     {
         $this->setFieldName($name);
         $this->emailValidator = $emailValidator;
+        $this->addressEncoder = $addressEncoder ?? new Swift_AddressEncoder_IdnAddressEncoder();
     }
 
     /**
@@ -127,7 +129,8 @@ class Swift_Mime_Headers_PathHeader extends Swift_Mime_Headers_AbstractHeader
     {
         if (!$this->getCachedValue()) {
             if (isset($this->address)) {
-                $this->setCachedValue('<'.$this->address.'>');
+                $address = $this->addressEncoder->encodeString($this->address);
+                $this->setCachedValue('<'.$address.'>');
             }
         }
 
@@ -144,9 +147,7 @@ class Swift_Mime_Headers_PathHeader extends Swift_Mime_Headers_AbstractHeader
     private function assertValidAddress($address)
     {
         if (!$this->emailValidator->isValid($address, new RFCValidation())) {
-            throw new Swift_RfcComplianceException(
-                'Address set in PathHeader does not comply with addr-spec of RFC 2822.'
-            );
+            throw new Swift_RfcComplianceException('Address set in PathHeader does not comply with addr-spec of RFC 2822.');
         }
     }
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/UnstructuredHeader.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/UnstructuredHeader.php
index d9d9f5e25d3..64f160dec7c 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/UnstructuredHeader.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/UnstructuredHeader.php
@@ -25,8 +25,7 @@ class Swift_Mime_Headers_UnstructuredHeader extends Swift_Mime_Headers_AbstractH
     /**
      * Creates a new SimpleHeader with $name.
      *
-     * @param string                   $name
-     * @param Swift_Mime_HeaderEncoder $encoder
+     * @param string $name
      */
     public function __construct($name, Swift_Mime_HeaderEncoder $encoder)
     {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/IdGenerator.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/IdGenerator.php
index 8d9452bd0f0..3ce35f27c03 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/IdGenerator.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/IdGenerator.php
@@ -13,6 +13,8 @@
  */
 class Swift_Mime_IdGenerator implements Swift_IdGenerator
 {
+    private $idRight;
+
     /**
      * @param string $idRight
      */
@@ -46,8 +48,7 @@ class Swift_Mime_IdGenerator implements Swift_IdGenerator
      */
     public function generateId()
     {
-        $idLeft = md5(getmypid().'.'.time().'.'.uniqid(mt_rand(), true));
-
-        return $idLeft.'@'.$this->idRight;
+        // 32 hex values for the left part
+        return bin2hex(random_bytes(16)).'@'.$this->idRight;
     }
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/MimePart.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/MimePart.php
index d49449fe5be..d0b2e6586b4 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/MimePart.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/MimePart.php
@@ -30,11 +30,7 @@ class Swift_Mime_MimePart extends Swift_Mime_SimpleMimeEntity
     /**
      * Create a new MimePart with $headers, $encoder and $cache.
      *
-     * @param Swift_Mime_SimpleHeaderSet $headers
-     * @param Swift_Mime_ContentEncoder  $encoder
-     * @param Swift_KeyCache             $cache
-     * @param Swift_IdGenerator          $idGenerator
-     * @param string                     $charset
+     * @param string $charset
      */
     public function __construct(Swift_Mime_SimpleHeaderSet $headers, Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache, Swift_IdGenerator $idGenerator, $charset = null)
     {
@@ -173,7 +169,7 @@ class Swift_Mime_MimePart extends Swift_Mime_SimpleMimeEntity
     protected function fixHeaders()
     {
         parent::fixHeaders();
-        if (count($this->getChildren())) {
+        if (\count($this->getChildren())) {
             $this->setHeaderParameter('Content-Type', 'charset', null);
             $this->setHeaderParameter('Content-Type', 'format', null);
             $this->setHeaderParameter('Content-Type', 'delsp', null);
@@ -193,18 +189,9 @@ class Swift_Mime_MimePart extends Swift_Mime_SimpleMimeEntity
     /** Encode charset when charset is not utf-8 */
     protected function convertString($string)
     {
-        $charset = strtolower($this->getCharset());
-        if (!in_array($charset, array('utf-8', 'iso-8859-1', 'iso-8859-15', ''))) {
-            // mb_convert_encoding must be the first one to check, since iconv cannot convert some words.
-            if (function_exists('mb_convert_encoding')) {
-                $string = mb_convert_encoding($string, $charset, 'utf-8');
-            } elseif (function_exists('iconv')) {
-                $string = iconv('utf-8//TRANSLIT//IGNORE', $charset, $string);
-            } else {
-                throw new Swift_SwiftException('No suitable convert encoding function (use UTF-8 as your charset or install the mbstring or iconv extension).');
-            }
-
-            return $string;
+        $charset = strtolower($this->getCharset() ?? '');
+        if (!\in_array($charset, ['utf-8', 'iso-8859-1', 'iso-8859-15', ''])) {
+            return mb_convert_encoding($string, $charset, 'utf-8');
         }
 
         return $string;
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderFactory.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderFactory.php
index e14c9d6f88e..ab3ce6b1914 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderFactory.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderFactory.php
@@ -23,29 +23,27 @@ class Swift_Mime_SimpleHeaderFactory implements Swift_Mime_CharsetObserver
     /** The Encoder used by parameters */
     private $paramEncoder;
 
-    /** The Grammar */
-    private $grammar;
-
     /** Strict EmailValidator */
     private $emailValidator;
 
     /** The charset of created Headers */
     private $charset;
 
+    /** Swift_AddressEncoder */
+    private $addressEncoder;
+
     /**
      * Creates a new SimpleHeaderFactory using $encoder and $paramEncoder.
      *
-     * @param Swift_Mime_HeaderEncoder $encoder
-     * @param Swift_Encoder            $paramEncoder
-     * @param EmailValidator           $emailValidator
-     * @param string|null              $charset
+     * @param string|null $charset
      */
-    public function __construct(Swift_Mime_HeaderEncoder $encoder, Swift_Encoder $paramEncoder, EmailValidator $emailValidator, $charset = null)
+    public function __construct(Swift_Mime_HeaderEncoder $encoder, Swift_Encoder $paramEncoder, EmailValidator $emailValidator, $charset = null, Swift_AddressEncoder $addressEncoder = null)
     {
         $this->encoder = $encoder;
         $this->paramEncoder = $paramEncoder;
         $this->emailValidator = $emailValidator;
         $this->charset = $charset;
+        $this->addressEncoder = $addressEncoder ?? new Swift_AddressEncoder_IdnAddressEncoder();
     }
 
     /**
@@ -58,7 +56,7 @@ class Swift_Mime_SimpleHeaderFactory implements Swift_Mime_CharsetObserver
      */
     public function createMailboxHeader($name, $addresses = null)
     {
-        $header = new Swift_Mime_Headers_MailboxHeader($name, $this->encoder, $this->emailValidator);
+        $header = new Swift_Mime_Headers_MailboxHeader($name, $this->encoder, $this->emailValidator, $this->addressEncoder);
         if (isset($addresses)) {
             $header->setFieldBodyModel($addresses);
         }
@@ -70,8 +68,7 @@ class Swift_Mime_SimpleHeaderFactory implements Swift_Mime_CharsetObserver
     /**
      * Create a new Date header using $dateTime.
      *
-     * @param string                 $name
-     * @param DateTimeInterface|null $dateTime
+     * @param string $name
      *
      * @return Swift_Mime_Header
      */
@@ -114,9 +111,9 @@ class Swift_Mime_SimpleHeaderFactory implements Swift_Mime_CharsetObserver
      *
      * @return Swift_Mime_Headers_ParameterizedHeader
      */
-    public function createParameterizedHeader($name, $value = null, $params = array())
+    public function createParameterizedHeader($name, $value = null, $params = [])
     {
-        $header = new Swift_Mime_Headers_ParameterizedHeader($name, $this->encoder, (strtolower($name) == 'content-disposition') ? $this->paramEncoder : null);
+        $header = new Swift_Mime_Headers_ParameterizedHeader($name, $this->encoder, ('content-disposition' == strtolower($name ?? '')) ? $this->paramEncoder : null);
         if (isset($value)) {
             $header->setFieldBodyModel($value);
         }
@@ -185,6 +182,7 @@ class Swift_Mime_SimpleHeaderFactory implements Swift_Mime_CharsetObserver
     {
         $this->encoder = clone $this->encoder;
         $this->paramEncoder = clone $this->paramEncoder;
+        $this->addressEncoder = clone $this->addressEncoder;
     }
 
     /** Apply the charset to the Header */
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php
index 6f71fcac132..5195bcf48ae 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php
@@ -19,13 +19,13 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
     private $factory;
 
     /** Collection of set Headers */
-    private $headers = array();
+    private $headers = [];
 
     /** Field ordering details */
-    private $order = array();
+    private $order = [];
 
     /** List of fields which are required to be displayed */
-    private $required = array();
+    private $required = [];
 
     /** The charset used by Headers */
     private $charset;
@@ -33,8 +33,7 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
     /**
      * Create a new SimpleHeaderSet with the given $factory.
      *
-     * @param Swift_Mime_SimpleHeaderFactory $factory
-     * @param string                         $charset
+     * @param string $charset
      */
     public function __construct(Swift_Mime_SimpleHeaderFactory $factory, $charset = null)
     {
@@ -69,20 +68,17 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
      */
     public function addMailboxHeader($name, $addresses = null)
     {
-        $this->storeHeader($name,
-        $this->factory->createMailboxHeader($name, $addresses));
+        $this->storeHeader($name, $this->factory->createMailboxHeader($name, $addresses));
     }
 
     /**
      * Add a new Date header using $dateTime.
      *
-     * @param string            $name
-     * @param DateTimeInterface $dateTime
+     * @param string $name
      */
     public function addDateHeader($name, DateTimeInterface $dateTime = null)
     {
-        $this->storeHeader($name,
-        $this->factory->createDateHeader($name, $dateTime));
+        $this->storeHeader($name, $this->factory->createDateHeader($name, $dateTime));
     }
 
     /**
@@ -93,8 +89,7 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
      */
     public function addTextHeader($name, $value = null)
     {
-        $this->storeHeader($name,
-        $this->factory->createTextHeader($name, $value));
+        $this->storeHeader($name, $this->factory->createTextHeader($name, $value));
     }
 
     /**
@@ -104,7 +99,7 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
      * @param string $value
      * @param array  $params
      */
-    public function addParameterizedHeader($name, $value = null, $params = array())
+    public function addParameterizedHeader($name, $value = null, $params = [])
     {
         $this->storeHeader($name, $this->factory->createParameterizedHeader($name, $value, $params));
     }
@@ -143,18 +138,18 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
      */
     public function has($name, $index = 0)
     {
-        $lowerName = strtolower($name);
+        $lowerName = strtolower($name ?? '');
 
-        if (!array_key_exists($lowerName, $this->headers)) {
+        if (!\array_key_exists($lowerName, $this->headers)) {
             return false;
         }
 
-        if (func_num_args() < 2) {
+        if (\func_num_args() < 2) {
             // index was not specified, so we only need to check that there is at least one header value set
-            return (bool) count($this->headers[$lowerName]);
+            return (bool) \count($this->headers[$lowerName]);
         }
 
-        return array_key_exists($index, $this->headers[$lowerName]);
+        return \array_key_exists($index, $this->headers[$lowerName]);
     }
 
     /**
@@ -166,8 +161,7 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
      * If $index is specified, the header will be inserted into the set at this
      * offset.
      *
-     * @param Swift_Mime_Header $header
-     * @param int               $index
+     * @param int $index
      */
     public function set(Swift_Mime_Header $header, $index = 0)
     {
@@ -183,13 +177,13 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
      * @param string $name
      * @param int    $index
      *
-     * @return Swift_Mime_Header
+     * @return Swift_Mime_Header|null
      */
     public function get($name, $index = 0)
     {
-        $name = strtolower($name);
+        $name = strtolower($name ?? '');
 
-        if (func_num_args() < 2) {
+        if (\func_num_args() < 2) {
             if ($this->has($name)) {
                 $values = array_values($this->headers[$name]);
 
@@ -212,7 +206,7 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
     public function getAll($name = null)
     {
         if (!isset($name)) {
-            $headers = array();
+            $headers = [];
             foreach ($this->headers as $collection) {
                 $headers = array_merge($headers, $collection);
             }
@@ -220,9 +214,9 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
             return $headers;
         }
 
-        $lowerName = strtolower($name);
-        if (!array_key_exists($lowerName, $this->headers)) {
-            return array();
+        $lowerName = strtolower($name ?? '');
+        if (!\array_key_exists($lowerName, $this->headers)) {
+            return [];
         }
 
         return $this->headers[$lowerName];
@@ -237,7 +231,7 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
     {
         $headers = $this->headers;
         if ($this->canSort()) {
-            uksort($headers, array($this, 'sortHeaders'));
+            uksort($headers, [$this, 'sortHeaders']);
         }
 
         return array_keys($headers);
@@ -253,7 +247,7 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
      */
     public function remove($name, $index = 0)
     {
-        $lowerName = strtolower($name);
+        $lowerName = strtolower($name ?? '');
         unset($this->headers[$lowerName][$index]);
     }
 
@@ -264,7 +258,7 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
      */
     public function removeAll($name)
     {
-        $lowerName = strtolower($name);
+        $lowerName = strtolower($name ?? '');
         unset($this->headers[$lowerName]);
     }
 
@@ -272,8 +266,6 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
      * Define a list of Header names as an array in the correct order.
      *
      * These Headers will be output in the given order where present.
-     *
-     * @param array $sequence
      */
     public function defineOrdering(array $sequence)
     {
@@ -284,8 +276,6 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
      * Set a list of header names which must always be displayed when set.
      *
      * Usually headers without a field value won't be output unless set here.
-     *
-     * @param array $names
      */
     public function setAlwaysDisplayed(array $names)
     {
@@ -312,11 +302,11 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
         $string = '';
         $headers = $this->headers;
         if ($this->canSort()) {
-            uksort($headers, array($this, 'sortHeaders'));
+            uksort($headers, [$this, 'sortHeaders']);
         }
         foreach ($headers as $collection) {
             foreach ($collection as $header) {
-                if ($this->isDisplayed($header) || $header->getFieldBody() != '') {
+                if ($this->isDisplayed($header) || '' != $header->getFieldBody()) {
                     $string .= $header->toString();
                 }
             }
@@ -340,38 +330,38 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
     /** Save a Header to the internal collection */
     private function storeHeader($name, Swift_Mime_Header $header, $offset = null)
     {
-        if (!isset($this->headers[strtolower($name)])) {
-            $this->headers[strtolower($name)] = array();
+        if (!isset($this->headers[strtolower($name ?? '')])) {
+            $this->headers[strtolower($name ?? '')] = [];
         }
         if (!isset($offset)) {
-            $this->headers[strtolower($name)][] = $header;
+            $this->headers[strtolower($name ?? '')][] = $header;
         } else {
-            $this->headers[strtolower($name)][$offset] = $header;
+            $this->headers[strtolower($name ?? '')][$offset] = $header;
         }
     }
 
     /** Test if the headers can be sorted */
     private function canSort()
     {
-        return count($this->order) > 0;
+        return \count($this->order) > 0;
     }
 
     /** uksort() algorithm for Header ordering */
     private function sortHeaders($a, $b)
     {
-        $lowerA = strtolower($a);
-        $lowerB = strtolower($b);
-        $aPos = array_key_exists($lowerA, $this->order) ? $this->order[$lowerA] : -1;
-        $bPos = array_key_exists($lowerB, $this->order) ? $this->order[$lowerB] : -1;
+        $lowerA = strtolower($a ?? '');
+        $lowerB = strtolower($b ?? '');
+        $aPos = \array_key_exists($lowerA, $this->order) ? $this->order[$lowerA] : -1;
+        $bPos = \array_key_exists($lowerB, $this->order) ? $this->order[$lowerB] : -1;
 
         if (-1 === $aPos && -1 === $bPos) {
             // just be sure to be determinist here
             return $a > $b ? -1 : 1;
         }
 
-        if ($aPos == -1) {
+        if (-1 == $aPos) {
             return 1;
-        } elseif ($bPos == -1) {
+        } elseif (-1 == $bPos) {
             return -1;
         }
 
@@ -381,7 +371,7 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
     /** Test if the given Header is always displayed */
     private function isDisplayed(Swift_Mime_Header $header)
     {
-        return array_key_exists(strtolower($header->getFieldName()), $this->required);
+        return \array_key_exists(strtolower($header->getFieldName() ?? ''), $this->required);
     }
 
     /** Notify all Headers of the new charset */
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php
index f8667954bcf..62da1650a7b 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php
@@ -24,16 +24,12 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart
     /**
      * Create a new SimpleMessage with $headers, $encoder and $cache.
      *
-     * @param Swift_Mime_SimpleHeaderSet $headers
-     * @param Swift_Mime_ContentEncoder  $encoder
-     * @param Swift_KeyCache             $cache
-     * @param Swift_IdGenerator          $idGenerator
-     * @param string                     $charset
+     * @param string $charset
      */
     public function __construct(Swift_Mime_SimpleHeaderSet $headers, Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache, Swift_IdGenerator $idGenerator, $charset = null)
     {
         parent::__construct($headers, $encoder, $cache, $idGenerator, $charset);
-        $this->getHeaders()->defineOrdering(array(
+        $this->getHeaders()->defineOrdering([
             'Return-Path',
             'Received',
             'DKIM-Signature',
@@ -50,8 +46,8 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart
             'MIME-Version',
             'Content-Type',
             'Content-Transfer-Encoding',
-            ));
-        $this->getHeaders()->setAlwaysDisplayed(array('Date', 'Message-ID', 'From'));
+            ]);
+        $this->getHeaders()->setAlwaysDisplayed(['Date', 'Message-ID', 'From']);
         $this->getHeaders()->addTextHeader('MIME-Version', '1.0');
         $this->setDate(new DateTimeImmutable());
         $this->setId($this->getId());
@@ -97,8 +93,6 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart
     /**
      * Set the date at which this message was created.
      *
-     * @param DateTimeInterface $dateTime
-     *
      * @return $this
      */
     public function setDate(DateTimeInterface $dateTime)
@@ -158,8 +152,8 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart
      */
     public function setSender($address, $name = null)
     {
-        if (!is_array($address) && isset($name)) {
-            $address = array($address => $name);
+        if (!\is_array($address) && isset($name)) {
+            $address = [$address => $name];
         }
 
         if (!$this->setHeaderFieldModel('Sender', (array) $address)) {
@@ -212,8 +206,8 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart
      */
     public function setFrom($addresses, $name = null)
     {
-        if (!is_array($addresses) && isset($name)) {
-            $addresses = array($addresses => $name);
+        if (!\is_array($addresses) && isset($name)) {
+            $addresses = [$addresses => $name];
         }
 
         if (!$this->setHeaderFieldModel('From', (array) $addresses)) {
@@ -266,8 +260,8 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart
      */
     public function setReplyTo($addresses, $name = null)
     {
-        if (!is_array($addresses) && isset($name)) {
-            $addresses = array($addresses => $name);
+        if (!\is_array($addresses) && isset($name)) {
+            $addresses = [$addresses => $name];
         }
 
         if (!$this->setHeaderFieldModel('Reply-To', (array) $addresses)) {
@@ -321,8 +315,8 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart
      */
     public function setTo($addresses, $name = null)
     {
-        if (!is_array($addresses) && isset($name)) {
-            $addresses = array($addresses => $name);
+        if (!\is_array($addresses) && isset($name)) {
+            $addresses = [$addresses => $name];
         }
 
         if (!$this->setHeaderFieldModel('To', (array) $addresses)) {
@@ -373,8 +367,8 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart
      */
     public function setCc($addresses, $name = null)
     {
-        if (!is_array($addresses) && isset($name)) {
-            $addresses = array($addresses => $name);
+        if (!\is_array($addresses) && isset($name)) {
+            $addresses = [$addresses => $name];
         }
 
         if (!$this->setHeaderFieldModel('Cc', (array) $addresses)) {
@@ -425,8 +419,8 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart
      */
     public function setBcc($addresses, $name = null)
     {
-        if (!is_array($addresses) && isset($name)) {
-            $addresses = array($addresses => $name);
+        if (!\is_array($addresses) && isset($name)) {
+            $addresses = [$addresses => $name];
         }
 
         if (!$this->setHeaderFieldModel('Bcc', (array) $addresses)) {
@@ -457,13 +451,13 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart
      */
     public function setPriority($priority)
     {
-        $priorityMap = array(
+        $priorityMap = [
             self::PRIORITY_HIGHEST => 'Highest',
             self::PRIORITY_HIGH => 'High',
             self::PRIORITY_NORMAL => 'Normal',
             self::PRIORITY_LOW => 'Low',
             self::PRIORITY_LOWEST => 'Lowest',
-            );
+            ];
         $pMapKeys = array_keys($priorityMap);
         if ($priority > max($pMapKeys)) {
             $priority = max($pMapKeys);
@@ -493,7 +487,7 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart
             '%[1-5]'
             );
 
-        return isset($priority) ? $priority : 3;
+        return $priority ?? 3;
     }
 
     /**
@@ -526,13 +520,11 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart
     /**
      * Attach a {@link Swift_Mime_SimpleMimeEntity} such as an Attachment or MimePart.
      *
-     * @param Swift_Mime_SimpleMimeEntity $entity
-     *
      * @return $this
      */
     public function attach(Swift_Mime_SimpleMimeEntity $entity)
     {
-        $this->setChildren(array_merge($this->getChildren(), array($entity)));
+        $this->setChildren(array_merge($this->getChildren(), [$entity]));
 
         return $this;
     }
@@ -540,13 +532,11 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart
     /**
      * Remove an already attached entity.
      *
-     * @param Swift_Mime_SimpleMimeEntity $entity
-     *
      * @return $this
      */
     public function detach(Swift_Mime_SimpleMimeEntity $entity)
     {
-        $newChildren = array();
+        $newChildren = [];
         foreach ($this->getChildren() as $child) {
             if ($entity !== $child) {
                 $newChildren[] = $child;
@@ -559,9 +549,8 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart
 
     /**
      * Attach a {@link Swift_Mime_SimpleMimeEntity} and return it's CID source.
-     * This method should be used when embedding images or other data in a message.
      *
-     * @param Swift_Mime_SimpleMimeEntity $entity
+     * This method should be used when embedding images or other data in a message.
      *
      * @return string
      */
@@ -579,8 +568,8 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart
      */
     public function toString()
     {
-        if (count($children = $this->getChildren()) > 0 && $this->getBody() != '') {
-            $this->setChildren(array_merge(array($this->becomeMimePart()), $children));
+        if (\count($children = $this->getChildren()) > 0 && '' != $this->getBody()) {
+            $this->setChildren(array_merge([$this->becomeMimePart()], $children));
             $string = parent::toString();
             $this->setChildren($children);
         } else {
@@ -604,13 +593,11 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart
 
     /**
      * Write this message to a {@link Swift_InputByteStream}.
-     *
-     * @param Swift_InputByteStream $is
      */
     public function toByteStream(Swift_InputByteStream $is)
     {
-        if (count($children = $this->getChildren()) > 0 && $this->getBody() != '') {
-            $this->setChildren(array_merge(array($this->becomeMimePart()), $children));
+        if (\count($children = $this->getChildren()) > 0 && '' != $this->getBody()) {
+            $this->setChildren(array_merge([$this->becomeMimePart()], $children));
             parent::toByteStream($is);
             $this->setChildren($children);
         } else {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php
index 980f1cedc1c..03eaf472dd5 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php
@@ -43,14 +43,14 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
     private $boundary;
 
     /** Mime types to be used based on the nesting level */
-    private $compositeRanges = array(
-        'multipart/mixed' => array(self::LEVEL_TOP, self::LEVEL_MIXED),
-        'multipart/alternative' => array(self::LEVEL_MIXED, self::LEVEL_ALTERNATIVE),
-        'multipart/related' => array(self::LEVEL_ALTERNATIVE, self::LEVEL_RELATED),
-    );
+    private $compositeRanges = [
+        'multipart/mixed' => [self::LEVEL_TOP, self::LEVEL_MIXED],
+        'multipart/alternative' => [self::LEVEL_MIXED, self::LEVEL_ALTERNATIVE],
+        'multipart/related' => [self::LEVEL_ALTERNATIVE, self::LEVEL_RELATED],
+    ];
 
     /** A set of filter rules to define what level an entity should be nested at */
-    private $compoundLevelFilters = array();
+    private $compoundLevelFilters = [];
 
     /** The nesting level of this entity */
     private $nestingLevel = self::LEVEL_ALTERNATIVE;
@@ -59,20 +59,20 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
     private $cache;
 
     /** Direct descendants of this entity */
-    private $immediateChildren = array();
+    private $immediateChildren = [];
 
     /** All descendants of this entity */
-    private $children = array();
+    private $children = [];
 
     /** The maximum line length of the body of this entity */
     private $maxLineLength = 78;
 
     /** The order in which alternative mime types should appear */
-    private $alternativePartOrder = array(
+    private $alternativePartOrder = [
         'text/plain' => 1,
         'text/html' => 2,
         'multipart/related' => 3,
-    );
+    ];
 
     /** The CID of this entity */
     private $id;
@@ -84,20 +84,15 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
 
     /**
      * Create a new SimpleMimeEntity with $headers, $encoder and $cache.
-     *
-     * @param Swift_Mime_SimpleHeaderSet $headers
-     * @param Swift_Mime_ContentEncoder  $encoder
-     * @param Swift_KeyCache             $cache
-     * @param Swift_IdGenerator          $idGenerator
      */
     public function __construct(Swift_Mime_SimpleHeaderSet $headers, Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache, Swift_IdGenerator $idGenerator)
     {
-        $this->cacheKey = md5(getmypid().'.'.time().'.'.uniqid(mt_rand(), true));
+        $this->cacheKey = bin2hex(random_bytes(16)); // set 32 hex values
         $this->cache = $cache;
         $this->headers = $headers;
         $this->idGenerator = $idGenerator;
         $this->setEncoder($encoder);
-        $this->headers->defineOrdering(array('Content-Type', 'Content-Transfer-Encoding'));
+        $this->headers->defineOrdering(['Content-Type', 'Content-Transfer-Encoding']);
 
         // This array specifies that, when the entire MIME document contains
         // $compoundLevel, then for each child within $level, if its Content-Type
@@ -112,14 +107,14 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
         //   )
         // )
 
-        $this->compoundLevelFilters = array(
-            (self::LEVEL_ALTERNATIVE + self::LEVEL_RELATED) => array(
-                self::LEVEL_ALTERNATIVE => array(
+        $this->compoundLevelFilters = [
+            (self::LEVEL_ALTERNATIVE + self::LEVEL_RELATED) => [
+                self::LEVEL_ALTERNATIVE => [
                     'text/plain' => self::LEVEL_ALTERNATIVE,
                     'text/html' => self::LEVEL_RELATED,
-                    ),
-                ),
-            );
+                    ],
+                ],
+            ];
 
         $this->id = $this->idGenerator->generateId();
     }
@@ -168,6 +163,16 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
         return $this->getHeaderFieldModel('Content-Type');
     }
 
+    /**
+     * Get the Body Content-type of this entity.
+     *
+     * @return string
+     */
+    public function getBodyContentType()
+    {
+        return $this->userContentType;
+    }
+
     /**
      * Set the Content-type of this entity.
      *
@@ -293,16 +298,16 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
     public function setChildren(array $children, $compoundLevel = null)
     {
         // TODO: Try to refactor this logic
-        $compoundLevel = isset($compoundLevel) ? $compoundLevel : $this->getCompoundLevel($children);
-        $immediateChildren = array();
-        $grandchildren = array();
+        $compoundLevel = $compoundLevel ?? $this->getCompoundLevel($children);
+        $immediateChildren = [];
+        $grandchildren = [];
         $newContentType = $this->userContentType;
 
         foreach ($children as $child) {
             $level = $this->getNeededChildLevel($child, $compoundLevel);
             if (empty($immediateChildren)) {
                 //first iteration
-                $immediateChildren = array($child);
+                $immediateChildren = [$child];
             } else {
                 $nextLevel = $this->getNeededChildLevel($immediateChildren[0], $compoundLevel);
                 if ($nextLevel == $level) {
@@ -311,7 +316,7 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
                     // Re-assign immediateChildren to grandchildren
                     $grandchildren = array_merge($grandchildren, $immediateChildren);
                     // Set new children
-                    $immediateChildren = array($child);
+                    $immediateChildren = [$child];
                 } else {
                     $grandchildren[] = $child;
                 }
@@ -375,7 +380,7 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
         }
 
         $this->body = $body;
-        if (isset($contentType)) {
+        if (null !== $contentType) {
             $this->setContentType($contentType);
         }
 
@@ -395,8 +400,6 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
     /**
      * Set the encoder used for the body of this entity.
      *
-     * @param Swift_Mime_ContentEncoder $encoder
-     *
      * @return $this
      */
     public function setEncoder(Swift_Mime_ContentEncoder $encoder)
@@ -420,7 +423,7 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
     public function getBoundary()
     {
         if (!isset($this->boundary)) {
-            $this->boundary = '_=_swift_'.time().'_'.md5(getmypid().'.'.time().'.'.uniqid(mt_rand(), true)).'_=_';
+            $this->boundary = '_=_swift_'.time().'_'.bin2hex(random_bytes(16)).'_=_';
         }
 
         return $this->boundary;
@@ -457,8 +460,6 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
     /**
      * Receive notification that the encoder of this entity or a parent entity
      * has changed.
-     *
-     * @param Swift_Mime_ContentEncoder $encoder
      */
     public function encoderChanged(Swift_Mime_ContentEncoder $encoder)
     {
@@ -522,8 +523,6 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
 
     /**
      * Write this entire entity to a {@see Swift_InputByteStream}.
-     *
-     * @param Swift_InputByteStream
      */
     public function toByteStream(Swift_InputByteStream $is)
     {
@@ -535,8 +534,6 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
 
     /**
      * Write this entire entity to a {@link Swift_InputByteStream}.
-     *
-     * @param Swift_InputByteStream
      */
     protected function bodyToByteStream(Swift_InputByteStream $is)
     {
@@ -637,7 +634,7 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
      */
     protected function fixHeaders()
     {
-        if (count($this->immediateChildren)) {
+        if (\count($this->immediateChildren)) {
             $this->setHeaderParameter('Content-Type', 'boundary',
                 $this->getBoundary()
                 );
@@ -726,7 +723,7 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
 
     private function getNeededChildLevel($child, $compoundLevel)
     {
-        $filter = array();
+        $filter = [];
         foreach ($this->compoundLevelFilters as $bitmask => $rules) {
             if (($compoundLevel & $bitmask) === $bitmask) {
                 $filter = $rules + $filter;
@@ -734,7 +731,7 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
         }
 
         $realLevel = $child->getNestingLevel();
-        $lowercaseType = strtolower($child->getContentType());
+        $lowercaseType = strtolower($child->getContentType() ?? '');
 
         if (isset($filter[$realLevel]) && isset($filter[$realLevel][$lowercaseType])) {
             return $filter[$realLevel][$lowercaseType];
@@ -769,7 +766,7 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
         $shouldSort = false;
         foreach ($this->immediateChildren as $child) {
             // NOTE: This include alternative parts moved into a related part
-            if ($child->getNestingLevel() == self::LEVEL_ALTERNATIVE) {
+            if (self::LEVEL_ALTERNATIVE == $child->getNestingLevel()) {
                 $shouldSort = true;
                 break;
             }
@@ -778,13 +775,13 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
         // Sort in order of preference, if there is one
         if ($shouldSort) {
             // Group the messages by order of preference
-            $sorted = array();
+            $sorted = [];
             foreach ($this->immediateChildren as $child) {
                 $type = $child->getContentType();
-                $level = array_key_exists($type, $this->alternativePartOrder) ? $this->alternativePartOrder[$type] : max($this->alternativePartOrder) + 1;
+                $level = \array_key_exists($type, $this->alternativePartOrder) ? $this->alternativePartOrder[$type] : max($this->alternativePartOrder) + 1;
 
                 if (empty($sorted[$level])) {
-                    $sorted[$level] = array();
+                    $sorted[$level] = [];
                 }
 
                 $sorted[$level][] = $child;
@@ -792,7 +789,7 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
 
             ksort($sorted);
 
-            $this->immediateChildren = array_reduce($sorted, 'array_merge', array());
+            $this->immediateChildren = array_reduce($sorted, 'array_merge', []);
         }
     }
 
@@ -813,11 +810,17 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
     {
         $this->headers = clone $this->headers;
         $this->encoder = clone $this->encoder;
-        $this->cacheKey = md5(getmypid().'.'.time().'.'.uniqid(mt_rand(), true));
-        $children = array();
+        $this->cacheKey = bin2hex(random_bytes(16)); // set 32 hex values
+        $children = [];
         foreach ($this->children as $pos => $child) {
             $children[$pos] = clone $child;
         }
         $this->setChildren($children);
     }
+
+    public function __wakeup()
+    {
+        $this->cacheKey = bin2hex(random_bytes(16)); // set 32 hex values
+        $this->cache = new Swift_KeyCache_ArrayKeyCache(new Swift_KeyCache_SimpleKeyCacheInputStream());
+    }
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/MimePart.php b/htdocs/includes/swiftmailer/lib/classes/Swift/MimePart.php
index 8fa0cbebcd2..ea97619ad69 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/MimePart.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/MimePart.php
@@ -26,8 +26,8 @@ class Swift_MimePart extends Swift_Mime_MimePart
      */
     public function __construct($body = null, $contentType = null, $charset = null)
     {
-        call_user_func_array(
-            array($this, 'Swift_Mime_MimePart::__construct'),
+        \call_user_func_array(
+            [$this, 'Swift_Mime_MimePart::__construct'],
             Swift_DependencyContainer::getInstance()
                 ->createDependenciesFor('mime.part')
             );
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/NullTransport.php b/htdocs/includes/swiftmailer/lib/classes/Swift/NullTransport.php
index a580dfbefb6..e44b7af982f 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/NullTransport.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/NullTransport.php
@@ -17,8 +17,8 @@ class Swift_NullTransport extends Swift_Transport_NullTransport
 {
     public function __construct()
     {
-        call_user_func_array(
-            array($this, 'Swift_Transport_NullTransport::__construct'),
+        \call_user_func_array(
+            [$this, 'Swift_Transport_NullTransport::__construct'],
             Swift_DependencyContainer::getInstance()
                 ->createDependenciesFor('transport.null')
         );
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/AntiFloodPlugin.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/AntiFloodPlugin.php
index 06b3109e62c..5b1d7deefff 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/AntiFloodPlugin.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/AntiFloodPlugin.php
@@ -99,8 +99,6 @@ class Swift_Plugins_AntiFloodPlugin implements Swift_Events_SendListener, Swift_
 
     /**
      * Invoked immediately before the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function beforeSendPerformed(Swift_Events_SendEvent $evt)
     {
@@ -108,8 +106,6 @@ class Swift_Plugins_AntiFloodPlugin implements Swift_Events_SendListener, Swift_
 
     /**
      * Invoked immediately after the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function sendPerformed(Swift_Events_SendEvent $evt)
     {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/BandwidthMonitorPlugin.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/BandwidthMonitorPlugin.php
index af060a99cc3..36451f44f1f 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/BandwidthMonitorPlugin.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/BandwidthMonitorPlugin.php
@@ -30,7 +30,7 @@ class Swift_Plugins_BandwidthMonitorPlugin implements Swift_Events_SendListener,
     private $in = 0;
 
     /** Bound byte streams */
-    private $mirrors = array();
+    private $mirrors = [];
 
     /**
      * Not used.
@@ -41,8 +41,6 @@ class Swift_Plugins_BandwidthMonitorPlugin implements Swift_Events_SendListener,
 
     /**
      * Invoked immediately after the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function sendPerformed(Swift_Events_SendEvent $evt)
     {
@@ -52,24 +50,20 @@ class Swift_Plugins_BandwidthMonitorPlugin implements Swift_Events_SendListener,
 
     /**
      * Invoked immediately following a command being sent.
-     *
-     * @param Swift_Events_CommandEvent $evt
      */
     public function commandSent(Swift_Events_CommandEvent $evt)
     {
         $command = $evt->getCommand();
-        $this->out += strlen($command);
+        $this->out += \strlen($command);
     }
 
     /**
      * Invoked immediately following a response coming back.
-     *
-     * @param Swift_Events_ResponseEvent $evt
      */
     public function responseReceived(Swift_Events_ResponseEvent $evt)
     {
         $response = $evt->getResponse();
-        $this->in += strlen($response);
+        $this->in += \strlen($response);
     }
 
     /**
@@ -79,7 +73,7 @@ class Swift_Plugins_BandwidthMonitorPlugin implements Swift_Events_SendListener,
      */
     public function write($bytes)
     {
-        $this->out += strlen($bytes);
+        $this->out += \strlen($bytes);
         foreach ($this->mirrors as $stream) {
             $stream->write($bytes);
         }
@@ -97,8 +91,6 @@ class Swift_Plugins_BandwidthMonitorPlugin implements Swift_Events_SendListener,
      *
      * The stream acts as an observer, receiving all data that is written.
      * All {@link write()} and {@link flushBuffers()} operations will be mirrored.
-     *
-     * @param Swift_InputByteStream $is
      */
     public function bind(Swift_InputByteStream $is)
     {
@@ -111,8 +103,6 @@ class Swift_Plugins_BandwidthMonitorPlugin implements Swift_Events_SendListener,
      * If $is is not bound, no errors will be raised.
      * If the stream currently has any buffered data it will be written to $is
      * before unbinding occurs.
-     *
-     * @param Swift_InputByteStream $is
      */
     public function unbind(Swift_InputByteStream $is)
     {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/DecoratorPlugin.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/DecoratorPlugin.php
index 745ee879003..93124c9a5f4 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/DecoratorPlugin.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/DecoratorPlugin.php
@@ -23,10 +23,10 @@ class Swift_Plugins_DecoratorPlugin implements Swift_Events_SendListener, Swift_
     private $originalBody;
 
     /** The original headers of the message, before replacements */
-    private $originalHeaders = array();
+    private $originalHeaders = [];
 
     /** Bodies of children before they are replaced */
-    private $originalChildBodies = array();
+    private $originalChildBodies = [];
 
     /** The Message that was last replaced */
     private $lastMessage;
@@ -74,8 +74,6 @@ class Swift_Plugins_DecoratorPlugin implements Swift_Events_SendListener, Swift_
 
     /**
      * Invoked immediately before the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function beforeSendPerformed(Swift_Events_SendEvent $evt)
     {
@@ -98,20 +96,20 @@ class Swift_Plugins_DecoratorPlugin implements Swift_Events_SendListener, Swift_
             foreach ($message->getHeaders()->getAll() as $header) {
                 $body = $header->getFieldBodyModel();
                 $count = 0;
-                if (is_array($body)) {
-                    $bodyReplaced = array();
+                if (\is_array($body)) {
+                    $bodyReplaced = [];
                     foreach ($body as $key => $value) {
                         $count1 = 0;
                         $count2 = 0;
-                        $key = is_string($key) ? str_replace($search, $replace, $key, $count1) : $key;
-                        $value = is_string($value) ? str_replace($search, $replace, $value, $count2) : $value;
+                        $key = \is_string($key) ? str_replace($search, $replace, $key, $count1) : $key;
+                        $value = \is_string($value) ? str_replace($search, $replace, $value, $count2) : $value;
                         $bodyReplaced[$key] = $value;
 
                         if (!$count && ($count1 || $count2)) {
                             $count = 1;
                         }
                     }
-                } elseif (is_string($body)) {
+                } elseif (\is_string($body)) {
                     $bodyReplaced = str_replace($search, $replace, $body, $count);
                 }
 
@@ -159,13 +157,11 @@ class Swift_Plugins_DecoratorPlugin implements Swift_Events_SendListener, Swift_
             return $this->replacements->getReplacementsFor($address);
         }
 
-        return isset($this->replacements[$address]) ? $this->replacements[$address] : null;
+        return $this->replacements[$address] ?? null;
     }
 
     /**
      * Invoked immediately after the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function sendPerformed(Swift_Events_SendEvent $evt)
     {
@@ -182,21 +178,21 @@ class Swift_Plugins_DecoratorPlugin implements Swift_Events_SendListener, Swift_
             }
             if (!empty($this->originalHeaders)) {
                 foreach ($message->getHeaders()->getAll() as $header) {
-                    if (array_key_exists($header->getFieldName(), $this->originalHeaders)) {
+                    if (\array_key_exists($header->getFieldName(), $this->originalHeaders)) {
                         $header->setFieldBodyModel($this->originalHeaders[$header->getFieldName()]);
                     }
                 }
-                $this->originalHeaders = array();
+                $this->originalHeaders = [];
             }
             if (!empty($this->originalChildBodies)) {
                 $children = (array) $message->getChildren();
                 foreach ($children as $child) {
                     $id = $child->getId();
-                    if (array_key_exists($id, $this->originalChildBodies)) {
+                    if (\array_key_exists($id, $this->originalChildBodies)) {
                         $child->setBody($this->originalChildBodies[$id]);
                     }
                 }
-                $this->originalChildBodies = array();
+                $this->originalChildBodies = [];
             }
             $this->lastMessage = null;
         }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/ImpersonatePlugin.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/ImpersonatePlugin.php
index b975d36b858..3f4dbbfa40f 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/ImpersonatePlugin.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/ImpersonatePlugin.php
@@ -34,8 +34,6 @@ class Swift_Plugins_ImpersonatePlugin implements Swift_Events_SendListener
 
     /**
      * Invoked immediately before the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function beforeSendPerformed(Swift_Events_SendEvent $evt)
     {
@@ -51,8 +49,6 @@ class Swift_Plugins_ImpersonatePlugin implements Swift_Events_SendListener
 
     /**
      * Invoked immediately after the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function sendPerformed(Swift_Events_SendEvent $evt)
     {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/LoggerPlugin.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/LoggerPlugin.php
index 7ddf1fd16db..e183749b7ec 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/LoggerPlugin.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/LoggerPlugin.php
@@ -20,8 +20,6 @@ class Swift_Plugins_LoggerPlugin implements Swift_Events_CommandListener, Swift_
 
     /**
      * Create a new LoggerPlugin using $logger.
-     *
-     * @param Swift_Plugins_Logger $logger
      */
     public function __construct(Swift_Plugins_Logger $logger)
     {
@@ -58,8 +56,6 @@ class Swift_Plugins_LoggerPlugin implements Swift_Events_CommandListener, Swift_
 
     /**
      * Invoked immediately following a command being sent.
-     *
-     * @param Swift_Events_CommandEvent $evt
      */
     public function commandSent(Swift_Events_CommandEvent $evt)
     {
@@ -69,8 +65,6 @@ class Swift_Plugins_LoggerPlugin implements Swift_Events_CommandListener, Swift_
 
     /**
      * Invoked immediately following a response coming back.
-     *
-     * @param Swift_Events_ResponseEvent $evt
      */
     public function responseReceived(Swift_Events_ResponseEvent $evt)
     {
@@ -80,52 +74,42 @@ class Swift_Plugins_LoggerPlugin implements Swift_Events_CommandListener, Swift_
 
     /**
      * Invoked just before a Transport is started.
-     *
-     * @param Swift_Events_TransportChangeEvent $evt
      */
     public function beforeTransportStarted(Swift_Events_TransportChangeEvent $evt)
     {
-        $transportName = get_class($evt->getSource());
+        $transportName = \get_class($evt->getSource());
         $this->logger->add(sprintf('++ Starting %s', $transportName));
     }
 
     /**
      * Invoked immediately after the Transport is started.
-     *
-     * @param Swift_Events_TransportChangeEvent $evt
      */
     public function transportStarted(Swift_Events_TransportChangeEvent $evt)
     {
-        $transportName = get_class($evt->getSource());
+        $transportName = \get_class($evt->getSource());
         $this->logger->add(sprintf('++ %s started', $transportName));
     }
 
     /**
      * Invoked just before a Transport is stopped.
-     *
-     * @param Swift_Events_TransportChangeEvent $evt
      */
     public function beforeTransportStopped(Swift_Events_TransportChangeEvent $evt)
     {
-        $transportName = get_class($evt->getSource());
+        $transportName = \get_class($evt->getSource());
         $this->logger->add(sprintf('++ Stopping %s', $transportName));
     }
 
     /**
      * Invoked immediately after the Transport is stopped.
-     *
-     * @param Swift_Events_TransportChangeEvent $evt
      */
     public function transportStopped(Swift_Events_TransportChangeEvent $evt)
     {
-        $transportName = get_class($evt->getSource());
+        $transportName = \get_class($evt->getSource());
         $this->logger->add(sprintf('++ %s stopped', $transportName));
     }
 
     /**
      * Invoked as a TransportException is thrown in the Transport system.
-     *
-     * @param Swift_Events_TransportExceptionEvent $evt
      */
     public function exceptionThrown(Swift_Events_TransportExceptionEvent $evt)
     {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Loggers/ArrayLogger.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Loggers/ArrayLogger.php
index 186b6b41bcd..6f595adaa4d 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Loggers/ArrayLogger.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Loggers/ArrayLogger.php
@@ -20,7 +20,7 @@ class Swift_Plugins_Loggers_ArrayLogger implements Swift_Plugins_Logger
      *
      * @var array
      */
-    private $log = array();
+    private $log = [];
 
     /**
      * Max size of the log.
@@ -47,7 +47,7 @@ class Swift_Plugins_Loggers_ArrayLogger implements Swift_Plugins_Logger
     public function add($entry)
     {
         $this->log[] = $entry;
-        while (count($this->log) > $this->size) {
+        while (\count($this->log) > $this->size) {
             array_shift($this->log);
         }
     }
@@ -57,7 +57,7 @@ class Swift_Plugins_Loggers_ArrayLogger implements Swift_Plugins_Logger
      */
     public function clear()
     {
-        $this->log = array();
+        $this->log = [];
     }
 
     /**
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/MessageLogger.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/MessageLogger.php
index 5ff1d9321c0..39c48ed18f5 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/MessageLogger.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/MessageLogger.php
@@ -16,19 +16,19 @@
 class Swift_Plugins_MessageLogger implements Swift_Events_SendListener
 {
     /**
-     * @var Swift_Mime_Message[]
+     * @var Swift_Mime_SimpleMessage[]
      */
     private $messages;
 
     public function __construct()
     {
-        $this->messages = array();
+        $this->messages = [];
     }
 
     /**
      * Get the message list.
      *
-     * @return Swift_Mime_Message[]
+     * @return Swift_Mime_SimpleMessage[]
      */
     public function getMessages()
     {
@@ -42,7 +42,7 @@ class Swift_Plugins_MessageLogger implements Swift_Events_SendListener
      */
     public function countMessages()
     {
-        return count($this->messages);
+        return \count($this->messages);
     }
 
     /**
@@ -50,13 +50,11 @@ class Swift_Plugins_MessageLogger implements Swift_Events_SendListener
      */
     public function clear()
     {
-        $this->messages = array();
+        $this->messages = [];
     }
 
     /**
      * Invoked immediately before the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function beforeSendPerformed(Swift_Events_SendEvent $evt)
     {
@@ -65,8 +63,6 @@ class Swift_Plugins_MessageLogger implements Swift_Events_SendListener
 
     /**
      * Invoked immediately after the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function sendPerformed(Swift_Events_SendEvent $evt)
     {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php
index c19403aec61..9448594090b 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php
@@ -45,7 +45,8 @@ class Swift_Plugins_PopBeforeSmtpPlugin implements Swift_Events_TransportChangeL
     /**
      * Create a new PopBeforeSmtpPlugin for $host and $port.
      *
-     * @param string $host
+     * @param string $host   Hostname or IP. Literal IPv6 addresses should be
+     *                       wrapped in square brackets.
      * @param int    $port
      * @param string $crypto as "tls" or "ssl"
      */
@@ -59,8 +60,6 @@ class Swift_Plugins_PopBeforeSmtpPlugin implements Swift_Events_TransportChangeL
     /**
      * Set a Pop3Connection to delegate to instead of connecting directly.
      *
-     * @param Swift_Plugins_Pop_Pop3Connection $connection
-     *
      * @return $this
      */
     public function setConnection(Swift_Plugins_Pop_Pop3Connection $connection)
@@ -72,8 +71,6 @@ class Swift_Plugins_PopBeforeSmtpPlugin implements Swift_Events_TransportChangeL
 
     /**
      * Bind this plugin to a specific SMTP transport instance.
-     *
-     * @param Swift_Transport
      */
     public function bindSmtp(Swift_Transport $smtp)
     {
@@ -135,16 +132,12 @@ class Swift_Plugins_PopBeforeSmtpPlugin implements Swift_Events_TransportChangeL
             if (!isset($this->socket)) {
                 if (!$socket = fsockopen(
                     $this->getHostString(), $this->port, $errno, $errstr, $this->timeout)) {
-                    throw new Swift_Plugins_Pop_Pop3Exception(
-                        sprintf('Failed to connect to POP3 host [%s]: %s', $this->host, $errstr)
-                    );
+                    throw new Swift_Plugins_Pop_Pop3Exception(sprintf('Failed to connect to POP3 host [%s]: %s', $this->host, $errstr));
                 }
                 $this->socket = $socket;
 
                 if (false === $greeting = fgets($this->socket)) {
-                    throw new Swift_Plugins_Pop_Pop3Exception(
-                        sprintf('Failed to connect to POP3 host [%s]', trim($greeting))
-                    );
+                    throw new Swift_Plugins_Pop_Pop3Exception(sprintf('Failed to connect to POP3 host [%s]', trim($greeting ?? '')));
                 }
 
                 $this->assertOk($greeting);
@@ -167,9 +160,7 @@ class Swift_Plugins_PopBeforeSmtpPlugin implements Swift_Events_TransportChangeL
         } else {
             $this->command("QUIT\r\n");
             if (!fclose($this->socket)) {
-                throw new Swift_Plugins_Pop_Pop3Exception(
-                    sprintf('POP3 host [%s] connection could not be stopped', $this->host)
-                );
+                throw new Swift_Plugins_Pop_Pop3Exception(sprintf('POP3 host [%s] connection could not be stopped', $this->host));
             }
             $this->socket = null;
         }
@@ -177,8 +168,6 @@ class Swift_Plugins_PopBeforeSmtpPlugin implements Swift_Events_TransportChangeL
 
     /**
      * Invoked just before a Transport is started.
-     *
-     * @param Swift_Events_TransportChangeEvent $evt
      */
     public function beforeTransportStarted(Swift_Events_TransportChangeEvent $evt)
     {
@@ -216,15 +205,11 @@ class Swift_Plugins_PopBeforeSmtpPlugin implements Swift_Events_TransportChangeL
     private function command($command)
     {
         if (!fwrite($this->socket, $command)) {
-            throw new Swift_Plugins_Pop_Pop3Exception(
-                sprintf('Failed to write command [%s] to POP3 host', trim($command))
-            );
+            throw new Swift_Plugins_Pop_Pop3Exception(sprintf('Failed to write command [%s] to POP3 host', trim($command ?? '')));
         }
 
         if (false === $response = fgets($this->socket)) {
-            throw new Swift_Plugins_Pop_Pop3Exception(
-                sprintf('Failed to read from POP3 host after command [%s]', trim($command))
-            );
+            throw new Swift_Plugins_Pop_Pop3Exception(sprintf('Failed to read from POP3 host after command [%s]', trim($command ?? '')));
         }
 
         $this->assertOk($response);
@@ -234,17 +219,15 @@ class Swift_Plugins_PopBeforeSmtpPlugin implements Swift_Events_TransportChangeL
 
     private function assertOk($response)
     {
-        if (substr($response, 0, 3) != '+OK') {
-            throw new Swift_Plugins_Pop_Pop3Exception(
-                sprintf('POP3 command failed [%s]', trim($response))
-            );
+        if ('+OK' != substr($response, 0, 3)) {
+            throw new Swift_Plugins_Pop_Pop3Exception(sprintf('POP3 command failed [%s]', trim($response ?? '')));
         }
     }
 
     private function getHostString()
     {
         $host = $this->host;
-        switch (strtolower($this->crypto)) {
+        switch (strtolower($this->crypto ?? '')) {
             case 'ssl':
                 $host = 'ssl://'.$host;
                 break;
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/RedirectingPlugin.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/RedirectingPlugin.php
index 8d797dd117b..f7373b2424c 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/RedirectingPlugin.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/RedirectingPlugin.php
@@ -27,15 +27,14 @@ class Swift_Plugins_RedirectingPlugin implements Swift_Events_SendListener
      *
      * @var array
      */
-    private $whitelist = array();
+    private $whitelist = [];
 
     /**
      * Create a new RedirectingPlugin.
      *
      * @param mixed $recipient
-     * @param array $whitelist
      */
-    public function __construct($recipient, array $whitelist = array())
+    public function __construct($recipient, array $whitelist = [])
     {
         $this->recipient = $recipient;
         $this->whitelist = $whitelist;
@@ -63,8 +62,6 @@ class Swift_Plugins_RedirectingPlugin implements Swift_Events_SendListener
 
     /**
      * Set a list of regular expressions to whitelist certain recipients.
-     *
-     * @param array $whitelist
      */
     public function setWhitelist(array $whitelist)
     {
@@ -83,8 +80,6 @@ class Swift_Plugins_RedirectingPlugin implements Swift_Events_SendListener
 
     /**
      * Invoked immediately before the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function beforeSendPerformed(Swift_Events_SendEvent $evt)
     {
@@ -113,11 +108,11 @@ class Swift_Plugins_RedirectingPlugin implements Swift_Events_SendListener
         // Add each hard coded recipient
         $to = $message->getTo();
         if (null === $to) {
-            $to = array();
+            $to = [];
         }
 
         foreach ((array) $this->recipient as $recipient) {
-            if (!array_key_exists($recipient, $to)) {
+            if (!\array_key_exists($recipient, $to)) {
                 $message->addTo($recipient);
             }
         }
@@ -126,8 +121,7 @@ class Swift_Plugins_RedirectingPlugin implements Swift_Events_SendListener
     /**
      * Filter header set against a whitelist of regular expressions.
      *
-     * @param Swift_Mime_SimpleHeaderSet $headerSet
-     * @param string                     $type
+     * @param string $type
      */
     private function filterHeaderSet(Swift_Mime_SimpleHeaderSet $headerSet, $type)
     {
@@ -139,13 +133,11 @@ class Swift_Plugins_RedirectingPlugin implements Swift_Events_SendListener
     /**
      * Filtered list of addresses => name pairs.
      *
-     * @param array $recipients
-     *
      * @return array
      */
     private function filterNameAddresses(array $recipients)
     {
-        $filtered = array();
+        $filtered = [];
 
         foreach ($recipients as $address => $name) {
             if ($this->isWhitelisted($address)) {
@@ -159,13 +151,11 @@ class Swift_Plugins_RedirectingPlugin implements Swift_Events_SendListener
     /**
      * Matches address against whitelist of regular expressions.
      *
-     * @param $recipient
-     *
      * @return bool
      */
     protected function isWhitelisted($recipient)
     {
-        if (in_array($recipient, (array) $this->recipient)) {
+        if (\in_array($recipient, (array) $this->recipient)) {
             return true;
         }
 
@@ -180,8 +170,6 @@ class Swift_Plugins_RedirectingPlugin implements Swift_Events_SendListener
 
     /**
      * Invoked immediately after the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function sendPerformed(Swift_Events_SendEvent $evt)
     {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Reporter.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Reporter.php
index 3a2b6657c09..b8818339722 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Reporter.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Reporter.php
@@ -24,9 +24,8 @@ interface Swift_Plugins_Reporter
     /**
      * Notifies this ReportNotifier that $address failed or succeeded.
      *
-     * @param Swift_Mime_SimpleMessage $message
-     * @param string                   $address
-     * @param int                      $result  from {@link RESULT_PASS, RESULT_FAIL}
+     * @param string $address
+     * @param int    $result  from {@link RESULT_PASS, RESULT_FAIL}
      */
     public function notify(Swift_Mime_SimpleMessage $message, $address, $result);
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/ReporterPlugin.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/ReporterPlugin.php
index 5ffca24c61c..c4a016520f6 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/ReporterPlugin.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/ReporterPlugin.php
@@ -24,8 +24,6 @@ class Swift_Plugins_ReporterPlugin implements Swift_Events_SendListener
 
     /**
      * Create a new ReporterPlugin using $reporter.
-     *
-     * @param Swift_Plugins_Reporter $reporter
      */
     public function __construct(Swift_Plugins_Reporter $reporter)
     {
@@ -41,21 +39,19 @@ class Swift_Plugins_ReporterPlugin implements Swift_Events_SendListener
 
     /**
      * Invoked immediately after the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function sendPerformed(Swift_Events_SendEvent $evt)
     {
         $message = $evt->getMessage();
         $failures = array_flip($evt->getFailedRecipients());
         foreach ((array) $message->getTo() as $address => $null) {
-            $this->reporter->notify($message, $address, (array_key_exists($address, $failures) ? Swift_Plugins_Reporter::RESULT_FAIL : Swift_Plugins_Reporter::RESULT_PASS));
+            $this->reporter->notify($message, $address, (\array_key_exists($address, $failures) ? Swift_Plugins_Reporter::RESULT_FAIL : Swift_Plugins_Reporter::RESULT_PASS));
         }
         foreach ((array) $message->getCc() as $address => $null) {
-            $this->reporter->notify($message, $address, (array_key_exists($address, $failures) ? Swift_Plugins_Reporter::RESULT_FAIL : Swift_Plugins_Reporter::RESULT_PASS));
+            $this->reporter->notify($message, $address, (\array_key_exists($address, $failures) ? Swift_Plugins_Reporter::RESULT_FAIL : Swift_Plugins_Reporter::RESULT_PASS));
         }
         foreach ((array) $message->getBcc() as $address => $null) {
-            $this->reporter->notify($message, $address, (array_key_exists($address, $failures) ? Swift_Plugins_Reporter::RESULT_FAIL : Swift_Plugins_Reporter::RESULT_PASS));
+            $this->reporter->notify($message, $address, (\array_key_exists($address, $failures) ? Swift_Plugins_Reporter::RESULT_FAIL : Swift_Plugins_Reporter::RESULT_PASS));
         }
     }
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Reporters/HitReporter.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Reporters/HitReporter.php
index 67c117ac7c2..249cffbde7b 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Reporters/HitReporter.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Reporters/HitReporter.php
@@ -20,16 +20,15 @@ class Swift_Plugins_Reporters_HitReporter implements Swift_Plugins_Reporter
      *
      * @var array
      */
-    private $failures = array();
+    private $failures = [];
 
-    private $failures_cache = array();
+    private $failures_cache = [];
 
     /**
      * Notifies this ReportNotifier that $address failed or succeeded.
      *
-     * @param Swift_Mime_SimpleMessage $message
-     * @param string                   $address
-     * @param int                      $result  from {@link RESULT_PASS, RESULT_FAIL}
+     * @param string $address
+     * @param int    $result  from {@link RESULT_PASS, RESULT_FAIL}
      */
     public function notify(Swift_Mime_SimpleMessage $message, $address, $result)
     {
@@ -54,6 +53,6 @@ class Swift_Plugins_Reporters_HitReporter implements Swift_Plugins_Reporter
      */
     public function clear()
     {
-        $this->failures = $this->failures_cache = array();
+        $this->failures = $this->failures_cache = [];
     }
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Reporters/HtmlReporter.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Reporters/HtmlReporter.php
index 525eef570a9..1cfc3f974f8 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Reporters/HtmlReporter.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Reporters/HtmlReporter.php
@@ -18,9 +18,8 @@ class Swift_Plugins_Reporters_HtmlReporter implements Swift_Plugins_Reporter
     /**
      * Notifies this ReportNotifier that $address failed or succeeded.
      *
-     * @param Swift_Mime_SimpleMessage $message
-     * @param string                   $address
-     * @param int                      $result  from {@see RESULT_PASS, RESULT_FAIL}
+     * @param string $address
+     * @param int    $result  from {@see RESULT_PASS, RESULT_FAIL}
      */
     public function notify(Swift_Mime_SimpleMessage $message, $address, $result)
     {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/ThrottlerPlugin.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/ThrottlerPlugin.php
index 77c2e8db6ec..83d3044927f 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/ThrottlerPlugin.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/ThrottlerPlugin.php
@@ -72,7 +72,7 @@ class Swift_Plugins_ThrottlerPlugin extends Swift_Plugins_BandwidthMonitorPlugin
      * Create a new ThrottlerPlugin.
      *
      * @param int                   $rate
-     * @param int                   $mode,   defaults to {@link BYTES_PER_MINUTE}
+     * @param int                   $mode    defaults to {@link BYTES_PER_MINUTE}
      * @param Swift_Plugins_Sleeper $sleeper (only needed in testing)
      * @param Swift_Plugins_Timer   $timer   (only needed in testing)
      */
@@ -86,8 +86,6 @@ class Swift_Plugins_ThrottlerPlugin extends Swift_Plugins_BandwidthMonitorPlugin
 
     /**
      * Invoked immediately before the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function beforeSendPerformed(Swift_Events_SendEvent $evt)
     {
@@ -119,8 +117,6 @@ class Swift_Plugins_ThrottlerPlugin extends Swift_Plugins_BandwidthMonitorPlugin
 
     /**
      * Invoked when a Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function sendPerformed(Swift_Events_SendEvent $evt)
     {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Preferences.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Preferences.php
index 79eafde9ad9..16103e11031 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Preferences.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Preferences.php
@@ -92,7 +92,7 @@ class Swift_Preferences
         Swift_DependencyContainer::getInstance()
             ->register('mime.qpcontentencoder')
             ->asNewInstanceOf('Swift_Mime_ContentEncoder_QpContentEncoder')
-            ->withDependencies(array('mime.charstream', 'mime.bytecanonicalizer'))
+            ->withDependencies(['mime.charstream', 'mime.bytecanonicalizer'])
             ->addConstructorValue($dotEscape);
 
         return $this;
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/SendmailTransport.php b/htdocs/includes/swiftmailer/lib/classes/Swift/SendmailTransport.php
index c129281b347..3c756436cc8 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/SendmailTransport.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/SendmailTransport.php
@@ -22,8 +22,8 @@ class Swift_SendmailTransport extends Swift_Transport_SendmailTransport
      */
     public function __construct($command = '/usr/sbin/sendmail -bs')
     {
-        call_user_func_array(
-            array($this, 'Swift_Transport_SendmailTransport::__construct'),
+        \call_user_func_array(
+            [$this, 'Swift_Transport_SendmailTransport::__construct'],
             Swift_DependencyContainer::getInstance()
                 ->createDependenciesFor('transport.sendmail')
             );
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Signer.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Signer.php
index 2d8176d905c..26c5e285c03 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Signer.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Signer.php
@@ -11,7 +11,6 @@
 /**
  * Base Class of Signer Infrastructure.
  *
- *
  * @author Xavier De Cock <xdecock@gmail.com>
  */
 interface Swift_Signer
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/BodySigner.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/BodySigner.php
index 8e66e18f4e0..b25c427af83 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/BodySigner.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/BodySigner.php
@@ -18,8 +18,6 @@ interface Swift_Signers_BodySigner extends Swift_Signer
     /**
      * Change the Swift_Signed_Message to apply the singing.
      *
-     * @param Swift_Message $message
-     *
      * @return self
      */
     public function signMessage(Swift_Message $message);
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php
index a88daa19815..ec82dc05663 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php
@@ -66,7 +66,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
      *
      * @var array
      */
-    protected $ignoredHeaders = array('return-path' => true);
+    protected $ignoredHeaders = ['return-path' => true];
 
     /**
      * Signer identity.
@@ -124,14 +124,14 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
      *
      * @var array
      */
-    protected $signedHeaders = array();
+    protected $signedHeaders = [];
 
     /**
      * If debugHeaders is set store debugData here.
      *
-     * @var string
+     * @var string[]
      */
-    private $debugHeadersData = '';
+    private $debugHeadersData = [];
 
     /**
      * Stores the bodyHash.
@@ -163,7 +163,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
 
     private $bodyCanonLine = '';
 
-    private $bound = array();
+    private $bound = [];
 
     /**
      * Constructor.
@@ -190,7 +190,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
     public function reset()
     {
         $this->headerHash = null;
-        $this->signedHeaders = array();
+        $this->signedHeaders = [];
         $this->bodyHash = null;
         $this->bodyHashHandler = null;
         $this->bodyCanonIgnoreStart = 2;
@@ -236,10 +236,9 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
 
     /**
      * Attach $is to this stream.
+     *
      * The stream acts as an observer, receiving all data that is written.
      * All {@link write()} and {@link flushBuffers()} operations will be mirrored.
-     *
-     * @param Swift_InputByteStream $is
      */
     public function bind(Swift_InputByteStream $is)
     {
@@ -251,11 +250,10 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
 
     /**
      * Remove an already bound stream.
+     *
      * If $is is not bound, no errors will be raised.
      * If the stream currently has any buffered data it will be written to $is
      * before unbinding occurs.
-     *
-     * @param Swift_InputByteStream $is
      */
     public function unbind(Swift_InputByteStream $is)
     {
@@ -297,7 +295,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
                 break;
             case 'rsa-sha256':
                 $this->hashAlgorithm = 'rsa-sha256';
-                if (!defined('OPENSSL_ALGO_SHA256')) {
+                if (!\defined('OPENSSL_ALGO_SHA256')) {
                     throw new Swift_SwiftException('Unable to set sha256 as it is not supported by OpenSSL.');
                 }
                 break;
@@ -317,7 +315,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
      */
     public function setBodyCanon($canon)
     {
-        if ($canon == 'relaxed') {
+        if ('relaxed' == $canon) {
             $this->bodyCanon = 'relaxed';
         } else {
             $this->bodyCanon = 'simple';
@@ -335,7 +333,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
      */
     public function setHeaderCanon($canon)
     {
-        if ($canon == 'relaxed') {
+        if ('relaxed' == $canon) {
             $this->headerCanon = 'relaxed';
         } else {
             $this->headerCanon = 'simple';
@@ -367,10 +365,10 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
      */
     public function setBodySignedLen($len)
     {
-        if ($len === true) {
+        if (true === $len) {
             $this->showLen = true;
             $this->maxLen = PHP_INT_MAX;
-        } elseif ($len === false) {
+        } elseif (false === $len) {
             $this->showLen = false;
             $this->maxLen = PHP_INT_MAX;
         } else {
@@ -456,9 +454,9 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
     public function getAlteredHeaders()
     {
         if ($this->debugHeaders) {
-            return array('DKIM-Signature', 'X-DebugHash');
+            return ['DKIM-Signature', 'X-DebugHash'];
         } else {
-            return array('DKIM-Signature');
+            return ['DKIM-Signature'];
         }
     }
 
@@ -471,7 +469,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
      */
     public function ignoreHeader($header_name)
     {
-        $this->ignoredHeaders[strtolower($header_name)] = true;
+        $this->ignoredHeaders[strtolower($header_name ?? '')] = true;
 
         return $this;
     }
@@ -479,8 +477,6 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
     /**
      * Set the headers to sign.
      *
-     * @param Swift_Mime_SimpleHeaderSet $headers
-     *
      * @return Swift_Signers_DKIMSigner
      */
     public function setHeaders(Swift_Mime_SimpleHeaderSet $headers)
@@ -490,11 +486,11 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
         $listHeaders = $headers->listAll();
         foreach ($listHeaders as $hName) {
             // Check if we need to ignore Header
-            if (!isset($this->ignoredHeaders[strtolower($hName)])) {
+            if (!isset($this->ignoredHeaders[strtolower($hName ?? '')])) {
                 if ($headers->has($hName)) {
                     $tmp = $headers->getAll($hName);
                     foreach ($tmp as $header) {
-                        if ($header->getFieldBody() != '') {
+                        if ('' != $header->getFieldBody()) {
                             $this->addHeader($header->toString());
                             $this->signedHeaders[] = $header->getFieldName();
                         }
@@ -509,32 +505,30 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
     /**
      * Add the signature to the given Headers.
      *
-     * @param Swift_Mime_SimpleHeaderSet $headers
-     *
      * @return Swift_Signers_DKIMSigner
      */
     public function addSignature(Swift_Mime_SimpleHeaderSet $headers)
     {
         // Prepare the DKIM-Signature
-        $params = array('v' => '1', 'a' => $this->hashAlgorithm, 'bh' => base64_encode($this->bodyHash), 'd' => $this->domainName, 'h' => implode(': ', $this->signedHeaders), 'i' => $this->signerIdentity, 's' => $this->selector);
-        if ($this->bodyCanon != 'simple') {
+        $params = ['v' => '1', 'a' => $this->hashAlgorithm, 'bh' => base64_encode($this->bodyHash ?? ''), 'd' => $this->domainName, 'h' => implode(': ', $this->signedHeaders), 'i' => $this->signerIdentity, 's' => $this->selector];
+        if ('simple' != $this->bodyCanon) {
             $params['c'] = $this->headerCanon.'/'.$this->bodyCanon;
-        } elseif ($this->headerCanon != 'simple') {
+        } elseif ('simple' != $this->headerCanon) {
             $params['c'] = $this->headerCanon;
         }
         if ($this->showLen) {
             $params['l'] = $this->bodyLen;
         }
-        if ($this->signatureTimestamp === true) {
+        if (true === $this->signatureTimestamp) {
             $params['t'] = time();
-            if ($this->signatureExpiration !== false) {
+            if (false !== $this->signatureExpiration) {
                 $params['x'] = $params['t'] + $this->signatureExpiration;
             }
         } else {
-            if ($this->signatureTimestamp !== false) {
+            if (false !== $this->signatureTimestamp) {
                 $params['t'] = $this->signatureTimestamp;
             }
-            if ($this->signatureExpiration !== false) {
+            if (false !== $this->signatureExpiration) {
                 $params['x'] = $this->signatureExpiration;
             }
         }
@@ -550,11 +544,11 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
         // Add the last DKIM-Signature
         $tmp = $headers->getAll('DKIM-Signature');
         $this->dkimHeader = end($tmp);
-        $this->addHeader(trim($this->dkimHeader->toString())."\r\n b=", true);
+        $this->addHeader(trim($this->dkimHeader->toString() ?? '')."\r\n b=", true);
         if ($this->debugHeaders) {
-            $headers->addTextHeader('X-DebugHash', base64_encode($this->headerHash));
+            $headers->addTextHeader('X-DebugHash', base64_encode($this->headerHash ?? ''));
         }
-        $this->dkimHeader->setValue($string.' b='.trim(chunk_split(base64_encode($this->getEncryptedHash()), 73, ' ')));
+        $this->dkimHeader->setValue($string.' b='.trim(chunk_split(base64_encode($this->getEncryptedHash() ?? ''), 73, ' ')));
 
         return $this;
     }
@@ -571,6 +565,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
                 $value = str_replace("\r\n", '', $exploded[1]);
                 $value = preg_replace("/[ \t][ \t]+/", ' ', $value);
                 $header = $name.':'.trim($value).($is_sig ? '' : "\r\n");
+                // no break
             case 'simple':
                 // Nothing to do
         }
@@ -579,9 +574,9 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
 
     protected function canonicalizeBody($string)
     {
-        $len = strlen($string);
+        $len = \strlen($string);
         $canon = '';
-        $method = ($this->bodyCanon == 'relaxed');
+        $method = ('relaxed' == $this->bodyCanon);
         for ($i = 0; $i < $len; ++$i) {
             if ($this->bodyCanonIgnoreStart > 0) {
                 --$this->bodyCanonIgnoreStart;
@@ -592,11 +587,11 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
                     $this->bodyCanonLastChar = "\r";
                     break;
                 case "\n":
-                    if ($this->bodyCanonLastChar == "\r") {
+                    if ("\r" == $this->bodyCanonLastChar) {
                         if ($method) {
                             $this->bodyCanonSpace = false;
                         }
-                        if ($this->bodyCanonLine == '') {
+                        if ('' == $this->bodyCanonLine) {
                             ++$this->bodyCanonEmptyCounter;
                         } else {
                             $this->bodyCanonLine = '';
@@ -613,6 +608,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
                         $this->bodyCanonSpace = true;
                         break;
                     }
+                    // no break
                 default:
                     if ($this->bodyCanonEmptyCounter > 0) {
                         $canon .= str_repeat("\r\n", $this->bodyCanonEmptyCounter);
@@ -633,7 +629,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
     protected function endOfBody()
     {
         // Add trailing Line return if last line is non empty
-        if (strlen($this->bodyCanonLine) > 0) {
+        if (\strlen($this->bodyCanonLine) > 0) {
             $this->addToBodyHash("\r\n");
         }
         $this->bodyHash = hash_final($this->bodyHashHandler, true);
@@ -641,7 +637,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
 
     private function addToBodyHash($string)
     {
-        $len = strlen($string);
+        $len = \strlen($string);
         if ($len > ($new_len = ($this->maxLen - $this->bodyLen))) {
             $string = substr($string, 0, $new_len);
             $len = $new_len;
@@ -653,7 +649,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
     private function addToHeaderHash($header)
     {
         if ($this->debugHeaders) {
-            $this->debugHeadersData[] = trim($header);
+            $this->debugHeadersData[] = trim($header ?? '');
         }
         $this->headerCanonData .= $header;
     }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php
index 40654987f9b..5e2b67b6520 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php
@@ -55,7 +55,7 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
      *
      * @var array
      */
-    protected $ignoredHeaders = array();
+    protected $ignoredHeaders = [];
 
     /**
      * Signer identity.
@@ -77,7 +77,7 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
      *
      * @var array
      */
-    private $signedHeaders = array();
+    private $signedHeaders = [];
 
     /**
      * Stores the signature header.
@@ -93,8 +93,6 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
      */
     private $hashHandler;
 
-    private $hash;
-
     private $canonData = '';
 
     private $bodyCanonEmptyCounter = 0;
@@ -107,7 +105,7 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
 
     private $bodyCanonLine = '';
 
-    private $bound = array();
+    private $bound = [];
 
     /**
      * Constructor.
@@ -131,7 +129,6 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
      */
     public function reset()
     {
-        $this->hash = null;
         $this->hashHandler = null;
         $this->bodyCanonIgnoreStart = 2;
         $this->bodyCanonEmptyCounter = 0;
@@ -185,11 +182,10 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
 
     /**
      * Attach $is to this stream.
+     *
      * The stream acts as an observer, receiving all data that is written.
      * All {@link write()} and {@link flushBuffers()} operations will be mirrored.
      *
-     * @param Swift_InputByteStream $is
-     *
      * @return $this
      */
     public function bind(Swift_InputByteStream $is)
@@ -202,12 +198,11 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
 
     /**
      * Remove an already bound stream.
+     *
      * If $is is not bound, no errors will be raised.
      * If the stream currently has any buffered data it will be written to $is
      * before unbinding occurs.
      *
-     * @param Swift_InputByteStream $is
-     *
      * @return $this
      */
     public function unbind(Swift_InputByteStream $is)
@@ -262,7 +257,7 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
      */
     public function setCanon($canon)
     {
-        if ($canon == 'nofws') {
+        if ('nofws' == $canon) {
             $this->canon = 'nofws';
         } else {
             $this->canon = 'simple';
@@ -322,10 +317,10 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
     public function getAlteredHeaders()
     {
         if ($this->debugHeaders) {
-            return array('DomainKey-Signature', 'X-DebugHash');
+            return ['DomainKey-Signature', 'X-DebugHash'];
         }
 
-        return array('DomainKey-Signature');
+        return ['DomainKey-Signature'];
     }
 
     /**
@@ -337,7 +332,7 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
      */
     public function ignoreHeader($header_name)
     {
-        $this->ignoredHeaders[strtolower($header_name)] = true;
+        $this->ignoredHeaders[strtolower($header_name ?? '')] = true;
 
         return $this;
     }
@@ -345,8 +340,6 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
     /**
      * Set the headers to sign.
      *
-     * @param Swift_Mime_SimpleHeaderSet $headers
-     *
      * @return $this
      */
     public function setHeaders(Swift_Mime_SimpleHeaderSet $headers)
@@ -357,11 +350,11 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
         $listHeaders = $headers->listAll();
         foreach ($listHeaders as $hName) {
             // Check if we need to ignore Header
-            if (!isset($this->ignoredHeaders[strtolower($hName)])) {
+            if (!isset($this->ignoredHeaders[strtolower($hName ?? '')])) {
                 if ($headers->has($hName)) {
                     $tmp = $headers->getAll($hName);
                     foreach ($tmp as $header) {
-                        if ($header->getFieldBody() != '') {
+                        if ('' != $header->getFieldBody()) {
                             $this->addHeader($header->toString());
                             $this->signedHeaders[] = $header->getFieldName();
                         }
@@ -377,14 +370,12 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
     /**
      * Add the signature to the given Headers.
      *
-     * @param Swift_Mime_SimpleHeaderSet $headers
-     *
      * @return $this
      */
     public function addSignature(Swift_Mime_SimpleHeaderSet $headers)
     {
         // Prepare the DomainKey-Signature Header
-        $params = array('a' => $this->hashAlgorithm, 'b' => chunk_split(base64_encode($this->getEncryptedHash()), 73, ' '), 'c' => $this->canon, 'd' => $this->domainName, 'h' => implode(': ', $this->signedHeaders), 'q' => 'dns', 's' => $this->selector);
+        $params = ['a' => $this->hashAlgorithm, 'b' => chunk_split(base64_encode($this->getEncryptedHash() ?? ''), 73, ' '), 'c' => $this->canon, 'd' => $this->domainName, 'h' => implode(': ', $this->signedHeaders), 'q' => 'dns', 's' => $this->selector];
         $string = '';
         foreach ($params as $k => $v) {
             $string .= $k.'='.$v.'; ';
@@ -407,6 +398,7 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
                 $value = str_replace("\r\n", '', $exploded[1]);
                 $value = preg_replace("/[ \t][ \t]+/", ' ', $value);
                 $header = $name.':'.trim($value)."\r\n";
+                // no break
             case 'simple':
                 // Nothing to do
         }
@@ -420,9 +412,9 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
 
     protected function canonicalizeBody($string)
     {
-        $len = strlen($string);
+        $len = \strlen($string);
         $canon = '';
-        $nofws = ($this->canon == 'nofws');
+        $nofws = ('nofws' == $this->canon);
         for ($i = 0; $i < $len; ++$i) {
             if ($this->bodyCanonIgnoreStart > 0) {
                 --$this->bodyCanonIgnoreStart;
@@ -433,11 +425,11 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
                     $this->bodyCanonLastChar = "\r";
                     break;
                 case "\n":
-                    if ($this->bodyCanonLastChar == "\r") {
+                    if ("\r" == $this->bodyCanonLastChar) {
                         if ($nofws) {
                             $this->bodyCanonSpace = false;
                         }
-                        if ($this->bodyCanonLine == '') {
+                        if ('' == $this->bodyCanonLine) {
                             ++$this->bodyCanonEmptyCounter;
                         } else {
                             $this->bodyCanonLine = '';
@@ -455,6 +447,7 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
                         $this->bodyCanonSpace = true;
                         break;
                     }
+                    // no break
                 default:
                     if ($this->bodyCanonEmptyCounter > 0) {
                         $canon .= str_repeat("\r\n", $this->bodyCanonEmptyCounter);
@@ -469,10 +462,9 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
 
     protected function endOfBody()
     {
-        if (strlen($this->bodyCanonLine) > 0) {
+        if (\strlen($this->bodyCanonLine) > 0) {
             $this->addToHash("\r\n");
         }
-        $this->hash = hash_final($this->hashHandler, true);
     }
 
     private function addToHash($string)
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/HeaderSigner.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/HeaderSigner.php
index 6104e34f3f5..6f5c20923dc 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/HeaderSigner.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/HeaderSigner.php
@@ -41,8 +41,6 @@ interface Swift_Signers_HeaderSigner extends Swift_Signer, Swift_InputByteStream
     /**
      * Give the headers already given.
      *
-     * @param Swift_Mime_SimpleHeaderSet $headers
-     *
      * @return self
      */
     public function setHeaders(Swift_Mime_SimpleHeaderSet $headers);
@@ -50,8 +48,6 @@ interface Swift_Signers_HeaderSigner extends Swift_Signer, Swift_InputByteStream
     /**
      * Add the header(s) to the headerSet.
      *
-     * @param Swift_Mime_SimpleHeaderSet $headers
-     *
      * @return self
      */
     public function addSignature(Swift_Mime_SimpleHeaderSet $headers);
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/OpenDKIMSigner.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/OpenDKIMSigner.php
index deb29f575f2..520bcc15e8b 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/OpenDKIMSigner.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/OpenDKIMSigner.php
@@ -13,6 +13,8 @@
  * Takes advantage of pecl extension.
  *
  * @author     Xavier De Cock <xdecock@gmail.com>
+ *
+ * @deprecated since SwiftMailer 6.1.0; use Swift_Signers_DKIMSigner instead.
  */
 class Swift_Signers_OpenDKIMSigner extends Swift_Signers_DKIMSigner
 {
@@ -29,7 +31,7 @@ class Swift_Signers_OpenDKIMSigner extends Swift_Signers_DKIMSigner
 
     public function __construct($privateKey, $domainName, $selector)
     {
-        if (!extension_loaded('opendkim')) {
+        if (!\extension_loaded('opendkim')) {
             throw new Swift_SwiftException('php-opendkim extension not found');
         }
 
@@ -42,7 +44,7 @@ class Swift_Signers_OpenDKIMSigner extends Swift_Signers_DKIMSigner
     {
         $header = new Swift_Mime_Headers_OpenDKIMHeader('DKIM-Signature');
         $headerVal = $this->dkimHandler->getSignatureHeader();
-        if (!$headerVal) {
+        if (false === $headerVal || \is_int($headerVal)) {
             throw new Swift_SwiftException('OpenDKIM Error: '.$this->dkimHandler->getError());
         }
         $header->setValue($headerVal);
@@ -53,14 +55,10 @@ class Swift_Signers_OpenDKIMSigner extends Swift_Signers_DKIMSigner
 
     public function setHeaders(Swift_Mime_SimpleHeaderSet $headers)
     {
-        $bodyLen = $this->bodyLen;
-        if (is_bool($bodyLen)) {
-            $bodyLen = -1;
-        }
-        $hash = $this->hashAlgorithm == 'rsa-sha1' ? OpenDKIMSign::ALG_RSASHA1 : OpenDKIMSign::ALG_RSASHA256;
-        $bodyCanon = $this->bodyCanon == 'simple' ? OpenDKIMSign::CANON_SIMPLE : OpenDKIMSign::CANON_RELAXED;
-        $headerCanon = $this->headerCanon == 'simple' ? OpenDKIMSign::CANON_SIMPLE : OpenDKIMSign::CANON_RELAXED;
-        $this->dkimHandler = new OpenDKIMSign($this->privateKey, $this->selector, $this->domainName, $headerCanon, $bodyCanon, $hash, $bodyLen);
+        $hash = 'rsa-sha1' == $this->hashAlgorithm ? OpenDKIMSign::ALG_RSASHA1 : OpenDKIMSign::ALG_RSASHA256;
+        $bodyCanon = 'simple' == $this->bodyCanon ? OpenDKIMSign::CANON_SIMPLE : OpenDKIMSign::CANON_RELAXED;
+        $headerCanon = 'simple' == $this->headerCanon ? OpenDKIMSign::CANON_SIMPLE : OpenDKIMSign::CANON_RELAXED;
+        $this->dkimHandler = new OpenDKIMSign($this->privateKey, $this->selector, $this->domainName, $headerCanon, $bodyCanon, $hash, -1);
         // Hardcode signature Margin for now
         $this->dkimHandler->setMargin(78);
 
@@ -77,11 +75,11 @@ class Swift_Signers_OpenDKIMSigner extends Swift_Signers_DKIMSigner
         $listHeaders = $headers->listAll();
         foreach ($listHeaders as $hName) {
             // Check if we need to ignore Header
-            if (!isset($this->ignoredHeaders[strtolower($hName)])) {
+            if (!isset($this->ignoredHeaders[strtolower($hName ?? '')])) {
                 $tmp = $headers->getAll($hName);
                 if ($headers->has($hName)) {
                     foreach ($tmp as $header) {
-                        if ($header->getFieldBody() != '') {
+                        if ('' != $header->getFieldBody()) {
                             $htosign = $header->toString();
                             $this->dkimHandler->header($htosign);
                             $this->signedHeaders[] = $header->getFieldName();
@@ -172,13 +170,13 @@ class Swift_Signers_OpenDKIMSigner extends Swift_Signers_DKIMSigner
         if (!$this->peclLoaded) {
             return parent::canonicalizeBody($string);
         }
-        if (false && $this->dropFirstLF === true) {
-            if ($string[0] == "\r" && $string[1] == "\n") {
+        if (true === $this->dropFirstLF) {
+            if ("\r" == $string[0] && "\n" == $string[1]) {
                 $string = substr($string, 2);
             }
         }
         $this->dropFirstLF = false;
-        if (strlen($string)) {
+        if (\strlen($string)) {
             $this->dkimHandler->body($string);
         }
     }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php
index e2231151993..3dd3cd05f04 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php
@@ -11,9 +11,9 @@
 /**
  * MIME Message Signer used to apply S/MIME Signature/Encryption to a message.
  *
- *
  * @author Romain-Geissler
  * @author Sebastiaan Stok <s.stok@rollerscapes.net>
+ * @author Jan Flora <jf@penneo.com>
  */
 class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
 {
@@ -27,6 +27,7 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
     protected $encryptOptions;
     protected $encryptCipher;
     protected $extraCerts = null;
+    protected $wrapFullMessage = false;
 
     /**
      * @var Swift_StreamFilters_StringReplacementFilterFactory
@@ -65,7 +66,7 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
     /**
      * Set the certificate location to use for signing.
      *
-     * @see http://www.php.net/manual/en/openssl.pkcs7.flags.php
+     * @see https://secure.php.net/manual/en/openssl.pkcs7.flags.php
      *
      * @param string       $certificate
      * @param string|array $privateKey  If the key needs an passphrase use array('file-location', 'passphrase') instead
@@ -79,7 +80,7 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
         $this->signCertificate = 'file://'.str_replace('\\', '/', realpath($certificate));
 
         if (null !== $privateKey) {
-            if (is_array($privateKey)) {
+            if (\is_array($privateKey)) {
                 $this->signPrivateKey = $privateKey;
                 $this->signPrivateKey[0] = 'file://'.str_replace('\\', '/', realpath($privateKey[0]));
             } else {
@@ -88,9 +89,7 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
         }
 
         $this->signOptions = $signOptions;
-        if (null !== $extraCerts) {
-            $this->extraCerts = str_replace('\\', '/', realpath($extraCerts));
-        }
+        $this->extraCerts = $extraCerts ? realpath($extraCerts) : null;
 
         return $this;
     }
@@ -98,8 +97,8 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
     /**
      * Set the certificate location to use for encryption.
      *
-     * @see http://www.php.net/manual/en/openssl.pkcs7.flags.php
-     * @see http://nl3.php.net/manual/en/openssl.ciphers.php
+     * @see https://secure.php.net/manual/en/openssl.pkcs7.flags.php
+     * @see https://secure.php.net/manual/en/openssl.ciphers.php
      *
      * @param string|array $recipientCerts Either an single X.509 certificate, or an assoc array of X.509 certificates.
      * @param int          $cipher
@@ -108,8 +107,8 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
      */
     public function setEncryptCertificate($recipientCerts, $cipher = null)
     {
-        if (is_array($recipientCerts)) {
-            $this->encryptCert = array();
+        if (\is_array($recipientCerts)) {
+            $this->encryptCert = [];
 
             foreach ($recipientCerts as $cert) {
                 $this->encryptCert[] = 'file://'.str_replace('\\', '/', realpath($cert));
@@ -178,9 +177,27 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
     }
 
     /**
-     * Change the Swift_Message to apply the signing.
+     * Specify whether to wrap the entire MIME message in the S/MIME message.
      *
-     * @param Swift_Message $message
+     * According to RFC5751 section 3.1:
+     * In order to protect outer, non-content-related message header fields
+     * (for instance, the "Subject", "To", "From", and "Cc" fields), the
+     * sending client MAY wrap a full MIME message in a message/rfc822
+     * wrapper in order to apply S/MIME security services to these header
+     * fields.  It is up to the receiving client to decide how to present
+     * this "inner" header along with the unprotected "outer" header.
+     *
+     * @param bool $wrap
+     *
+     * @return $this
+     */
+    public function setWrapFullMessage($wrap)
+    {
+        $this->wrapFullMessage = $wrap;
+    }
+
+    /**
+     * Change the Swift_Message to apply the signing.
      *
      * @return $this
      */
@@ -190,17 +207,13 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
             return $this;
         }
 
-        // Store the message using ByteStream to a file{1}
-        // Remove all Children
-        // Sign file{1}, parse the new MIME headers and set them on the primary MimeEntity
-        // Set the singed-body as the new body (without boundary)
-
-        $messageStream = new Swift_ByteStream_TemporaryFileByteStream();
-        $this->toSMimeByteStream($messageStream, $message);
-        $message->setEncoder(Swift_DependencyContainer::getInstance()->lookup('mime.rawcontentencoder'));
-
-        $message->setChildren(array());
-        $this->streamToMime($messageStream, $message);
+        if ($this->signThenEncrypt) {
+            $this->smimeSignMessage($message);
+            $this->smimeEncryptMessage($message);
+        } else {
+            $this->smimeEncryptMessage($message);
+            $this->smimeSignMessage($message);
+        }
     }
 
     /**
@@ -210,102 +223,303 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
      */
     public function getAlteredHeaders()
     {
-        return array('Content-Type', 'Content-Transfer-Encoding', 'Content-Disposition');
+        return ['Content-Type', 'Content-Transfer-Encoding', 'Content-Disposition'];
     }
 
     /**
-     * @param Swift_InputByteStream $inputStream
-     * @param Swift_Message         $mimeEntity
+     * Sign a Swift message.
      */
-    protected function toSMimeByteStream(Swift_InputByteStream $inputStream, Swift_Message $message)
+    protected function smimeSignMessage(Swift_Message $message)
     {
-        $mimeEntity = $this->createMessage($message);
-        $messageStream = new Swift_ByteStream_TemporaryFileByteStream();
-
-        $mimeEntity->toByteStream($messageStream);
-        $messageStream->commit();
-
-        if (null !== $this->signCertificate && null !== $this->encryptCert) {
-            $temporaryStream = new Swift_ByteStream_TemporaryFileByteStream();
-
-            if ($this->signThenEncrypt) {
-                $this->messageStreamToSignedByteStream($messageStream, $temporaryStream);
-                $this->messageStreamToEncryptedByteStream($temporaryStream, $inputStream);
-            } else {
-                $this->messageStreamToEncryptedByteStream($messageStream, $temporaryStream);
-                $this->messageStreamToSignedByteStream($temporaryStream, $inputStream);
-            }
-        } elseif ($this->signCertificate !== null) {
-            $this->messageStreamToSignedByteStream($messageStream, $inputStream);
-        } else {
-            $this->messageStreamToEncryptedByteStream($messageStream, $inputStream);
+        // If we don't have a certificate we can't sign the message
+        if (null === $this->signCertificate) {
+            return;
         }
-    }
 
-    /**
-     * @param Swift_Message $message
-     *
-     * @return Swift_Message
-     */
-    protected function createMessage(Swift_Message $message)
-    {
-        $mimeEntity = new Swift_Message('', $message->getBody(), $message->getContentType(), $message->getCharset());
-        $mimeEntity->setChildren($message->getChildren());
+        // Work on a clone of the original message
+        $signMessage = clone $message;
+        $signMessage->clearSigners();
 
-        $messageHeaders = $mimeEntity->getHeaders();
-        $messageHeaders->remove('Message-ID');
-        $messageHeaders->remove('Date');
-        $messageHeaders->remove('Subject');
-        $messageHeaders->remove('MIME-Version');
-        $messageHeaders->remove('To');
-        $messageHeaders->remove('From');
+        if ($this->wrapFullMessage) {
+            // The original message essentially becomes the body of the new
+            // wrapped message
+            $signMessage = $this->wrapMimeMessage($signMessage);
+        } else {
+            // Only keep header needed to parse the body correctly
+            $this->clearAllHeaders($signMessage);
+            $this->copyHeaders(
+                $message,
+                $signMessage,
+                [
+                    'Content-Type',
+                    'Content-Transfer-Encoding',
+                    'Content-Disposition',
+                ]
+            );
+        }
 
-        return $mimeEntity;
-    }
-
-    /**
-     * @param Swift_FileStream      $outputStream
-     * @param Swift_InputByteStream $inputStream
-     *
-     * @throws Swift_IoException
-     */
-    protected function messageStreamToSignedByteStream(Swift_FileStream $outputStream, Swift_InputByteStream $inputStream)
-    {
+        // Copy the cloned message into a temporary file stream
+        $messageStream = new Swift_ByteStream_TemporaryFileByteStream();
+        $signMessage->toByteStream($messageStream);
+        $messageStream->commit();
         $signedMessageStream = new Swift_ByteStream_TemporaryFileByteStream();
 
-        $args = array($outputStream->getPath(), $signedMessageStream->getPath(), $this->signCertificate, $this->signPrivateKey, array(), $this->signOptions);
-        if (null !== $this->extraCerts) {
-            $args[] = $this->extraCerts;
-        }
-
-        if (!call_user_func_array('openssl_pkcs7_sign', $args)) {
+        // Sign the message using openssl
+        if (!openssl_pkcs7_sign(
+                $messageStream->getPath(),
+                $signedMessageStream->getPath(),
+                $this->signCertificate,
+                $this->signPrivateKey,
+                [],
+                $this->signOptions,
+                $this->extraCerts
+            )
+        ) {
             throw new Swift_IoException(sprintf('Failed to sign S/Mime message. Error: "%s".', openssl_error_string()));
         }
 
-        $this->copyFromOpenSSLOutput($signedMessageStream, $inputStream);
+        // Parse the resulting signed message content back into the Swift message
+        // preserving the original headers
+        $this->parseSSLOutput($signedMessageStream, $message);
     }
 
     /**
-     * @param Swift_FileStream      $outputStream
-     * @param Swift_InputByteStream $is
-     *
-     * @throws Swift_IoException
+     * Encrypt a Swift message.
      */
-    protected function messageStreamToEncryptedByteStream(Swift_FileStream $outputStream, Swift_InputByteStream $is)
+    protected function smimeEncryptMessage(Swift_Message $message)
     {
+        // If we don't have a certificate we can't encrypt the message
+        if (null === $this->encryptCert) {
+            return;
+        }
+
+        // Work on a clone of the original message
+        $encryptMessage = clone $message;
+        $encryptMessage->clearSigners();
+
+        if ($this->wrapFullMessage) {
+            // The original message essentially becomes the body of the new
+            // wrapped message
+            $encryptMessage = $this->wrapMimeMessage($encryptMessage);
+        } else {
+            // Only keep header needed to parse the body correctly
+            $this->clearAllHeaders($encryptMessage);
+            $this->copyHeaders(
+                $message,
+                $encryptMessage,
+                [
+                    'Content-Type',
+                    'Content-Transfer-Encoding',
+                    'Content-Disposition',
+                ]
+            );
+        }
+
+        // Convert the message content (including headers) to a string
+        // and place it in a temporary file
+        $messageStream = new Swift_ByteStream_TemporaryFileByteStream();
+        $encryptMessage->toByteStream($messageStream);
+        $messageStream->commit();
         $encryptedMessageStream = new Swift_ByteStream_TemporaryFileByteStream();
 
-        if (!openssl_pkcs7_encrypt($outputStream->getPath(), $encryptedMessageStream->getPath(), $this->encryptCert, array(), 0, $this->encryptCipher)) {
+        // Encrypt the message
+        if (!openssl_pkcs7_encrypt(
+                $messageStream->getPath(),
+                $encryptedMessageStream->getPath(),
+                $this->encryptCert,
+                [],
+                0,
+                $this->encryptCipher
+            )
+        ) {
             throw new Swift_IoException(sprintf('Failed to encrypt S/Mime message. Error: "%s".', openssl_error_string()));
         }
 
-        $this->copyFromOpenSSLOutput($encryptedMessageStream, $is);
+        // Parse the resulting signed message content back into the Swift message
+        // preserving the original headers
+        $this->parseSSLOutput($encryptedMessageStream, $message);
     }
 
     /**
-     * @param Swift_OutputByteStream $fromStream
-     * @param Swift_InputByteStream  $toStream
+     * Copy named headers from one Swift message to another.
      */
+    protected function copyHeaders(
+        Swift_Message $fromMessage,
+        Swift_Message $toMessage,
+        array $headers = []
+    ) {
+        foreach ($headers as $header) {
+            $this->copyHeader($fromMessage, $toMessage, $header);
+        }
+    }
+
+    /**
+     * Copy a single header from one Swift message to another.
+     *
+     * @param string $headerName
+     */
+    protected function copyHeader(Swift_Message $fromMessage, Swift_Message $toMessage, $headerName)
+    {
+        $header = $fromMessage->getHeaders()->get($headerName);
+        if (!$header) {
+            return;
+        }
+        $headers = $toMessage->getHeaders();
+        switch ($header->getFieldType()) {
+            case Swift_Mime_Header::TYPE_TEXT:
+                $headers->addTextHeader($header->getFieldName(), $header->getValue());
+                break;
+            case Swift_Mime_Header::TYPE_PARAMETERIZED:
+                $headers->addParameterizedHeader(
+                    $header->getFieldName(),
+                    $header->getValue(),
+                    $header->getParameters()
+                );
+                break;
+        }
+    }
+
+    /**
+     * Remove all headers from a Swift message.
+     */
+    protected function clearAllHeaders(Swift_Message $message)
+    {
+        $headers = $message->getHeaders();
+        foreach ($headers->listAll() as $header) {
+            $headers->removeAll($header);
+        }
+    }
+
+    /**
+     * Wraps a Swift_Message in a message/rfc822 MIME part.
+     *
+     * @return Swift_MimePart
+     */
+    protected function wrapMimeMessage(Swift_Message $message)
+    {
+        // Start by copying the original message into a message stream
+        $messageStream = new Swift_ByteStream_TemporaryFileByteStream();
+        $message->toByteStream($messageStream);
+        $messageStream->commit();
+
+        // Create a new MIME part that wraps the original stream
+        $wrappedMessage = new Swift_MimePart($messageStream, 'message/rfc822');
+        $wrappedMessage->setEncoder(new Swift_Mime_ContentEncoder_PlainContentEncoder('7bit'));
+
+        return $wrappedMessage;
+    }
+
+    protected function parseSSLOutput(Swift_InputByteStream $inputStream, Swift_Message $message)
+    {
+        $messageStream = new Swift_ByteStream_TemporaryFileByteStream();
+        $this->copyFromOpenSSLOutput($inputStream, $messageStream);
+
+        $this->streamToMime($messageStream, $message);
+    }
+
+    /**
+     * Merges an OutputByteStream from OpenSSL to a Swift_Message.
+     */
+    protected function streamToMime(Swift_OutputByteStream $fromStream, Swift_Message $message)
+    {
+        // Parse the stream into headers and body
+        list($headers, $messageStream) = $this->parseStream($fromStream);
+
+        // Get the original message headers
+        $messageHeaders = $message->getHeaders();
+
+        // Let the stream determine the headers describing the body content,
+        // since the body of the original message is overwritten by the body
+        // coming from the stream.
+        // These are all content-* headers.
+
+        // Default transfer encoding is 7bit if not set
+        $encoding = '';
+        // Remove all existing transfer encoding headers
+        $messageHeaders->removeAll('Content-Transfer-Encoding');
+        // See whether the stream sets the transfer encoding
+        if (isset($headers['content-transfer-encoding'])) {
+            $encoding = $headers['content-transfer-encoding'];
+        }
+
+        // We use the null content encoder, since the body is already encoded
+        // according to the transfer encoding specified in the stream
+        $message->setEncoder(new Swift_Mime_ContentEncoder_NullContentEncoder($encoding));
+
+        // Set the disposition, if present
+        if (isset($headers['content-disposition'])) {
+            $messageHeaders->addTextHeader('Content-Disposition', $headers['content-disposition']);
+        }
+
+        // Copy over the body from the stream using the content type dictated
+        // by the stream content
+        $message->setChildren([]);
+        $message->setBody($messageStream, $headers['content-type']);
+    }
+
+    /**
+     * This message will parse the headers of a MIME email byte stream
+     * and return an array that contains the headers as an associative
+     * array and the email body as a string.
+     *
+     * @return array
+     */
+    protected function parseStream(Swift_OutputByteStream $emailStream)
+    {
+        $bufferLength = 78;
+        $headerData = '';
+        $headerBodySeparator = "\r\n\r\n";
+
+        $emailStream->setReadPointer(0);
+
+        // Read out the headers section from the stream to a string
+        while (false !== ($buffer = $emailStream->read($bufferLength))) {
+            $headerData .= $buffer;
+
+            $headersPosEnd = strpos($headerData, $headerBodySeparator);
+
+            // Stop reading if we found the end of the headers
+            if (false !== $headersPosEnd) {
+                break;
+            }
+        }
+
+        // Split the header data into lines
+        $headerData = trim(substr($headerData, 0, $headersPosEnd));
+        $headerLines = explode("\r\n", $headerData);
+        unset($headerData);
+
+        $headers = [];
+        $currentHeaderName = '';
+
+        // Transform header lines into an associative array
+        foreach ($headerLines as $headerLine) {
+            // Handle headers that span multiple lines
+            if (false === strpos($headerLine, ':')) {
+                $headers[$currentHeaderName] .= ' '.trim($headerLine ?? '');
+                continue;
+            }
+
+            $header = explode(':', $headerLine, 2);
+            $currentHeaderName = strtolower($header[0] ?? '');
+            $headers[$currentHeaderName] = trim($header[1] ?? '');
+        }
+
+        // Read the entire email body into a byte stream
+        $bodyStream = new Swift_ByteStream_TemporaryFileByteStream();
+
+        // Skip the header and separator and point to the body
+        $emailStream->setReadPointer($headersPosEnd + \strlen($headerBodySeparator));
+
+        while (false !== ($buffer = $emailStream->read($bufferLength))) {
+            $bodyStream->write($buffer);
+        }
+
+        $bodyStream->commit();
+
+        return [$headers, $bodyStream];
+    }
+
     protected function copyFromOpenSSLOutput(Swift_OutputByteStream $fromStream, Swift_InputByteStream $toStream)
     {
         $bufferLength = 4096;
@@ -325,93 +539,4 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
 
         $toStream->commit();
     }
-
-    /**
-     * Merges an OutputByteStream to Swift_Message.
-     *
-     * @param Swift_OutputByteStream $fromStream
-     * @param Swift_Message          $message
-     */
-    protected function streamToMime(Swift_OutputByteStream $fromStream, Swift_Message $message)
-    {
-        $bufferLength = 78;
-        $headerData = '';
-
-        $fromStream->setReadPointer(0);
-
-        while (($buffer = $fromStream->read($bufferLength)) !== false) {
-            $headerData .= $buffer;
-
-            if (false !== strpos($buffer, "\r\n\r\n")) {
-                break;
-            }
-        }
-
-        $headersPosEnd = strpos($headerData, "\r\n\r\n");
-        $headerData = trim($headerData);
-        $headerData = substr($headerData, 0, $headersPosEnd);
-        $headerLines = explode("\r\n", $headerData);
-        unset($headerData);
-
-        $headers = array();
-        $currentHeaderName = '';
-
-        foreach ($headerLines as $headerLine) {
-            // Line separated
-            if (ctype_space($headerLines[0]) || false === strpos($headerLine, ':')) {
-                $headers[$currentHeaderName] .= ' '.trim($headerLine);
-                continue;
-            }
-
-            $header = explode(':', $headerLine, 2);
-            $currentHeaderName = strtolower($header[0]);
-            $headers[$currentHeaderName] = trim($header[1]);
-        }
-
-        $messageStream = new Swift_ByteStream_TemporaryFileByteStream();
-        $messageStream->addFilter($this->replacementFactory->createFilter("\r\n", "\n"), 'CRLF to LF');
-        $messageStream->addFilter($this->replacementFactory->createFilter("\n", "\r\n"), 'LF to CRLF');
-
-        $messageHeaders = $message->getHeaders();
-
-        // No need to check for 'application/pkcs7-mime', as this is always base64
-        if ('multipart/signed;' === substr($headers['content-type'], 0, 17)) {
-            if (!preg_match('/boundary=("[^"]+"|(?:[^\s]+|$))/is', $headers['content-type'], $contentTypeData)) {
-                throw new Swift_SwiftException('Failed to find Boundary parameter');
-            }
-
-            $boundary = trim($contentTypeData['1'], '"');
-
-            // Skip the header and CRLF CRLF
-            $fromStream->setReadPointer($headersPosEnd + 4);
-
-            while (false !== ($buffer = $fromStream->read($bufferLength))) {
-                $messageStream->write($buffer);
-            }
-
-            $messageStream->commit();
-
-            $messageHeaders->remove('Content-Transfer-Encoding');
-            $message->setContentType($headers['content-type']);
-            $message->setBoundary($boundary);
-            $message->setBody($messageStream);
-        } else {
-            $fromStream->setReadPointer($headersPosEnd + 4);
-
-            if (null === $this->headerFactory) {
-                $this->headerFactory = Swift_DependencyContainer::getInstance()->lookup('mime.headerfactory');
-            }
-
-            $message->setContentType($headers['content-type']);
-            $messageHeaders->set($this->headerFactory->createTextHeader('Content-Transfer-Encoding', $headers['content-transfer-encoding']));
-            $messageHeaders->set($this->headerFactory->createTextHeader('Content-Disposition', $headers['content-disposition']));
-
-            while (false !== ($buffer = $fromStream->read($bufferLength))) {
-                $messageStream->write($buffer);
-            }
-
-            $messageStream->commit();
-            $message->setBody($messageStream);
-        }
-    }
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/SmtpTransport.php b/htdocs/includes/swiftmailer/lib/classes/Swift/SmtpTransport.php
index 011c03ab188..56b62323ad7 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/SmtpTransport.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/SmtpTransport.php
@@ -23,22 +23,23 @@
 class Swift_SmtpTransport extends Swift_Transport_EsmtpTransport
 {
     /**
-     * Create a new SmtpTransport, optionally with $host, $port and $security.
-     *
      * @param string $host
      * @param int    $port
-     * @param string $security
+     * @param string|null $encryption SMTP encryption mode:
+     *        - null for plain SMTP (no encryption),
+     *        - 'tls' for SMTP with STARTTLS (best effort encryption),
+     *        - 'ssl' for SMTPS = SMTP over TLS (always encrypted).
      */
-    public function __construct($host = 'localhost', $port = 25, $security = null)
+    public function __construct($host = 'localhost', $port = 25, $encryption = null)
     {
-        call_user_func_array(
-            array($this, 'Swift_Transport_EsmtpTransport::__construct'),
+        \call_user_func_array(
+            [$this, 'Swift_Transport_EsmtpTransport::__construct'],
             Swift_DependencyContainer::getInstance()
                 ->createDependenciesFor('transport.smtp')
-            );
+        );
 
         $this->setHost($host);
         $this->setPort($port);
-        $this->setEncryption($security);
+        $this->setEncryption($encryption);
     }
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/SpoolTransport.php b/htdocs/includes/swiftmailer/lib/classes/Swift/SpoolTransport.php
index f92567ba021..c08e0fb17d5 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/SpoolTransport.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/SpoolTransport.php
@@ -17,8 +17,6 @@ class Swift_SpoolTransport extends Swift_Transport_SpoolTransport
 {
     /**
      * Create a new SpoolTransport.
-     *
-     * @param Swift_Spool $spool
      */
     public function __construct(Swift_Spool $spool)
     {
@@ -27,8 +25,8 @@ class Swift_SpoolTransport extends Swift_Transport_SpoolTransport
 
         $arguments[] = $spool;
 
-        call_user_func_array(
-            array($this, 'Swift_Transport_SpoolTransport::__construct'),
+        \call_user_func_array(
+            [$this, 'Swift_Transport_SpoolTransport::__construct'],
             $arguments
         );
     }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php b/htdocs/includes/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php
index ba1f6d323fc..7e5ddf1b7da 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php
@@ -17,9 +17,6 @@
  */
 class Swift_StreamFilters_ByteArrayReplacementFilter implements Swift_StreamFilter
 {
-    /** The needle(s) to search for */
-    private $search;
-
     /** The replacement(s) to make */
     private $replace;
 
@@ -27,7 +24,7 @@ class Swift_StreamFilters_ByteArrayReplacementFilter implements Swift_StreamFilt
     private $index;
 
     /** The Search Tree */
-    private $tree = array();
+    private $tree = [];
 
     /**  Gives the size of the largest search */
     private $treeMaxLen = 0;
@@ -42,26 +39,25 @@ class Swift_StreamFilters_ByteArrayReplacementFilter implements Swift_StreamFilt
      */
     public function __construct($search, $replace)
     {
-        $this->search = $search;
-        $this->index = array();
-        $this->tree = array();
-        $this->replace = array();
-        $this->repSize = array();
+        $this->index = [];
+        $this->tree = [];
+        $this->replace = [];
+        $this->repSize = [];
 
         $tree = null;
         $i = null;
         $last_size = $size = 0;
         foreach ($search as $i => $search_element) {
-            if ($tree !== null) {
-                $tree[-1] = min(count($replace) - 1, $i - 1);
+            if (null !== $tree) {
+                $tree[-1] = min(\count($replace) - 1, $i - 1);
                 $tree[-2] = $last_size;
             }
             $tree = &$this->tree;
-            if (is_array($search_element)) {
+            if (\is_array($search_element)) {
                 foreach ($search_element as $k => $char) {
                     $this->index[$char] = true;
                     if (!isset($tree[$char])) {
-                        $tree[$char] = array();
+                        $tree[$char] = [];
                     }
                     $tree = &$tree[$char];
                 }
@@ -70,27 +66,27 @@ class Swift_StreamFilters_ByteArrayReplacementFilter implements Swift_StreamFilt
             } else {
                 $last_size = 1;
                 if (!isset($tree[$search_element])) {
-                    $tree[$search_element] = array();
+                    $tree[$search_element] = [];
                 }
                 $tree = &$tree[$search_element];
                 $size = max($last_size, $size);
                 $this->index[$search_element] = true;
             }
         }
-        if ($i !== null) {
-            $tree[-1] = min(count($replace) - 1, $i);
+        if (null !== $i) {
+            $tree[-1] = min(\count($replace) - 1, $i);
             $tree[-2] = $last_size;
             $this->treeMaxLen = $size;
         }
         foreach ($replace as $rep) {
-            if (!is_array($rep)) {
-                $rep = array($rep);
+            if (!\is_array($rep)) {
+                $rep = [$rep];
             }
             $this->replace[] = $rep;
         }
-        for ($i = count($this->replace) - 1; $i >= 0; --$i) {
+        for ($i = \count($this->replace) - 1; $i >= 0; --$i) {
             $this->replace[$i] = $rep = $this->filter($this->replace[$i], $i);
-            $this->repSize[$i] = count($rep);
+            $this->repSize[$i] = \count($rep);
         }
     }
 
@@ -118,12 +114,12 @@ class Swift_StreamFilters_ByteArrayReplacementFilter implements Swift_StreamFilt
      */
     public function filter($buffer, $minReplaces = -1)
     {
-        if ($this->treeMaxLen == 0) {
+        if (0 == $this->treeMaxLen) {
             return $buffer;
         }
 
-        $newBuffer = array();
-        $buf_size = count($buffer);
+        $newBuffer = [];
+        $buf_size = \count($buffer);
         $last_size = 0;
         for ($i = 0; $i < $buf_size; ++$i) {
             $search_pos = $this->tree;
@@ -141,7 +137,7 @@ class Swift_StreamFilters_ByteArrayReplacementFilter implements Swift_StreamFilt
                     }
                 }
                 // We got a complete pattern
-                elseif ($last_found !== PHP_INT_MAX) {
+                elseif (PHP_INT_MAX !== $last_found) {
                     // Adding replacement datas to output buffer
                     $rep_size = $this->repSize[$last_found];
                     for ($j = 0; $j < $rep_size; ++$j) {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilterFactory.php b/htdocs/includes/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilterFactory.php
index f60f0cf8218..783b8896dd7 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilterFactory.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilterFactory.php
@@ -16,7 +16,7 @@
 class Swift_StreamFilters_StringReplacementFilterFactory implements Swift_ReplacementFilterFactory
 {
     /** Lazy-loaded filters */
-    private $filters = array();
+    private $filters = [];
 
     /**
      * Create a new StreamFilter to replace $search with $replace in a string.
@@ -30,11 +30,11 @@ class Swift_StreamFilters_StringReplacementFilterFactory implements Swift_Replac
     {
         if (!isset($this->filters[$search][$replace])) {
             if (!isset($this->filters[$search])) {
-                $this->filters[$search] = array();
+                $this->filters[$search] = [];
             }
 
             if (!isset($this->filters[$search][$replace])) {
-                $this->filters[$search][$replace] = array();
+                $this->filters[$search][$replace] = [];
             }
 
             $this->filters[$search][$replace] = new Swift_StreamFilters_StringReplacementFilter($search, $replace);
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/SwiftException.php b/htdocs/includes/swiftmailer/lib/classes/Swift/SwiftException.php
index db3d31093ef..15e68b18e79 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/SwiftException.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/SwiftException.php
@@ -18,9 +18,8 @@ class Swift_SwiftException extends Exception
     /**
      * Create a new SwiftException with $message.
      *
-     * @param string    $message
-     * @param int       $code
-     * @param Exception $previous
+     * @param string $message
+     * @param int    $code
      */
     public function __construct($message, $code = 0, Exception $previous = null)
     {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport.php
index f6214b7bfc5..bc324e8685a 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport.php
@@ -61,8 +61,9 @@ interface Swift_Transport
      * Recipient/sender data will be retrieved from the Message API.
      * The return value is the number of recipients who were accepted for delivery.
      *
-     * @param Swift_Mime_SimpleMessage $message
-     * @param string[]           $failedRecipients An array of failures by-reference
+     * This is the responsibility of the send method to start the transport if needed.
+     *
+     * @param string[] $failedRecipients An array of failures by-reference
      *
      * @return int
      */
@@ -70,8 +71,6 @@ interface Swift_Transport
 
     /**
      * Register a plugin in the Transport.
-     *
-     * @param Swift_Events_EventListener $plugin
      */
     public function registerPlugin(Swift_Events_EventListener $plugin);
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php
index 34c3323fdba..d2dbd7a66a0 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php
@@ -27,6 +27,14 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
     /** The event dispatching layer */
     protected $eventDispatcher;
 
+    protected $addressEncoder;
+
+    /** Whether the PIPELINING SMTP extension is enabled (RFC 2920) */
+    protected $pipelining = null;
+
+    /** The pipelined commands waiting for response */
+    protected $pipeline = [];
+
     /** Source Ip */
     protected $sourceIp;
 
@@ -36,14 +44,13 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
     /**
      * Creates a new EsmtpTransport using the given I/O buffer.
      *
-     * @param Swift_Transport_IoBuffer     $buf
-     * @param Swift_Events_EventDispatcher $dispatcher
-     * @param string                       $localDomain
+     * @param string $localDomain
      */
-    public function __construct(Swift_Transport_IoBuffer $buf, Swift_Events_EventDispatcher $dispatcher, $localDomain = '127.0.0.1')
+    public function __construct(Swift_Transport_IoBuffer $buf, Swift_Events_EventDispatcher $dispatcher, $localDomain = '127.0.0.1', Swift_AddressEncoder $addressEncoder = null)
     {
-        $this->eventDispatcher = $dispatcher;
         $this->buffer = $buf;
+        $this->eventDispatcher = $dispatcher;
+        $this->addressEncoder = $addressEncoder ?? new Swift_AddressEncoder_IdnAddressEncoder();
         $this->setLocalDomain($localDomain);
     }
 
@@ -63,7 +70,7 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
      */
     public function setLocalDomain($domain)
     {
-        if (substr($domain, 0, 1) !== '[') {
+        if ('[' !== substr($domain, 0, 1)) {
             if (filter_var($domain, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
                 $domain = '['.$domain.']';
             } elseif (filter_var($domain, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
@@ -109,6 +116,16 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
         return $this->sourceIp;
     }
 
+    public function setAddressEncoder(Swift_AddressEncoder $addressEncoder)
+    {
+        $this->addressEncoder = $addressEncoder;
+    }
+
+    public function getAddressEncoder()
+    {
+        return $this->addressEncoder;
+    }
+
     /**
      * Start the SMTP connection.
      */
@@ -154,13 +171,16 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
      * Recipient/sender data will be retrieved from the Message API.
      * The return value is the number of recipients who were accepted for delivery.
      *
-     * @param Swift_Mime_SimpleMessage $message
-     * @param string[]           $failedRecipients An array of failures by-reference
+     * @param string[] $failedRecipients An array of failures by-reference
      *
      * @return int
      */
     public function send(Swift_Mime_SimpleMessage $message, &$failedRecipients = null)
     {
+        if (!$this->isStarted()) {
+            $this->start();
+        }
+
         $sent = 0;
         $failedRecipients = (array) $failedRecipients;
 
@@ -172,31 +192,24 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
         }
 
         if (!$reversePath = $this->getReversePath($message)) {
-            $this->throwException(new Swift_TransportException(
-                'Cannot send message without a sender address'
-                )
-            );
+            $this->throwException(new Swift_TransportException('Cannot send message without a sender address'));
         }
 
         $to = (array) $message->getTo();
         $cc = (array) $message->getCc();
-        $tos = array_merge($to, $cc);
         $bcc = (array) $message->getBcc();
+        $tos = array_merge($to, $cc, $bcc);
 
-        $message->setBcc(array());
+        $message->setBcc([]);
 
         try {
             $sent += $this->sendTo($message, $reversePath, $tos, $failedRecipients);
-            $sent += $this->sendBcc($message, $reversePath, $bcc, $failedRecipients);
-        } catch (Exception $e) {
+        } finally {
             $message->setBcc($bcc);
-            throw $e;
         }
 
-        $message->setBcc($bcc);
-
         if ($evt) {
-            if ($sent == count($to) + count($cc) + count($bcc)) {
+            if ($sent == \count($to) + \count($cc) + \count($bcc)) {
                 $evt->setResult(Swift_Events_SendEvent::RESULT_SUCCESS);
             } elseif ($sent > 0) {
                 $evt->setResult(Swift_Events_SendEvent::RESULT_TENTATIVE);
@@ -226,7 +239,7 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
             }
 
             try {
-                $this->executeCommand("QUIT\r\n", array(221));
+                $this->executeCommand("QUIT\r\n", [221]);
             } catch (Swift_TransportException $e) {
             }
 
@@ -253,7 +266,7 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
                 $this->start();
             }
 
-            $this->executeCommand("NOOP\r\n", array(250));
+            $this->executeCommand("NOOP\r\n", [250]);
         } catch (Swift_TransportException $e) {
             try {
                 $this->stop();
@@ -268,8 +281,6 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
 
     /**
      * Register a plugin.
-     *
-     * @param Swift_Events_EventListener $plugin
      */
     public function registerPlugin(Swift_Events_EventListener $plugin)
     {
@@ -281,7 +292,7 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
      */
     public function reset()
     {
-        $this->executeCommand("RSET\r\n", array(250));
+        $this->executeCommand("RSET\r\n", [250], $failures, true);
     }
 
     /**
@@ -299,22 +310,46 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
      *
      * If no response codes are given, the response will not be validated.
      * If codes are given, an exception will be thrown on an invalid response.
+     * If the command is RCPT TO, and the pipeline is non-empty, no exception
+     * will be thrown; instead the failing address is added to $failures.
      *
      * @param string   $command
      * @param int[]    $codes
      * @param string[] $failures An array of failures by-reference
+     * @param bool     $pipeline Do not wait for response
+     * @param string   $address  the address, if command is RCPT TO
      *
-     * @return string
+     * @return string|null The server response, or null if pipelining is enabled
      */
-    public function executeCommand($command, $codes = array(), &$failures = null)
+    public function executeCommand($command, $codes = [], &$failures = null, $pipeline = false, $address = null)
     {
         $failures = (array) $failures;
         $seq = $this->buffer->write($command);
-        $response = $this->getFullResponse($seq);
         if ($evt = $this->eventDispatcher->createCommandEvent($this, $command, $codes)) {
             $this->eventDispatcher->dispatchEvent($evt, 'commandSent');
         }
-        $this->assertResponseCode($response, $codes);
+
+        $this->pipeline[] = [$command, $seq, $codes, $address];
+
+        if ($pipeline && $this->pipelining) {
+            return null;
+        }
+
+        $response = null;
+
+        while ($this->pipeline) {
+            list($command, $seq, $codes, $address) = array_shift($this->pipeline);
+            $response = $this->getFullResponse($seq);
+            try {
+                $this->assertResponseCode($response, $codes);
+            } catch (Swift_TransportException $e) {
+                if ($this->pipeline && $address) {
+                    $failures[] = $address;
+                } else {
+                    $this->throwException($e);
+                }
+            }
+        }
 
         return $response;
     }
@@ -322,51 +357,53 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
     /** Read the opening SMTP greeting */
     protected function readGreeting()
     {
-        $this->assertResponseCode($this->getFullResponse(0), array(220));
+        $this->assertResponseCode($this->getFullResponse(0), [220]);
     }
 
     /** Send the HELO welcome */
     protected function doHeloCommand()
     {
         $this->executeCommand(
-            sprintf("HELO %s\r\n", $this->domain), array(250)
+            sprintf("HELO %s\r\n", $this->domain), [250]
             );
     }
 
     /** Send the MAIL FROM command */
     protected function doMailFromCommand($address)
     {
+        $address = $this->addressEncoder->encodeString($address);
         $this->executeCommand(
-            sprintf("MAIL FROM:<%s>\r\n", $address), array(250)
+            sprintf("MAIL FROM:<%s>\r\n", $address), [250], $failures, true
             );
     }
 
     /** Send the RCPT TO command */
     protected function doRcptToCommand($address)
     {
+        $address = $this->addressEncoder->encodeString($address);
         $this->executeCommand(
-            sprintf("RCPT TO:<%s>\r\n", $address), array(250, 251, 252)
+            sprintf("RCPT TO:<%s>\r\n", $address), [250, 251, 252], $failures, true, $address
             );
     }
 
     /** Send the DATA command */
-    protected function doDataCommand()
+    protected function doDataCommand(&$failedRecipients)
     {
-        $this->executeCommand("DATA\r\n", array(354));
+        $this->executeCommand("DATA\r\n", [354], $failedRecipients);
     }
 
     /** Stream the contents of the message over the buffer */
     protected function streamMessage(Swift_Mime_SimpleMessage $message)
     {
-        $this->buffer->setWriteTranslations(array("\r\n." => "\r\n.."));
+        $this->buffer->setWriteTranslations(["\r\n." => "\r\n.."]);
         try {
             $message->toByteStream($this->buffer);
             $this->buffer->flushBuffers();
         } catch (Swift_TransportException $e) {
             $this->throwException($e);
         }
-        $this->buffer->setWriteTranslations(array());
-        $this->executeCommand("\r\n.\r\n", array(250));
+        $this->buffer->setWriteTranslations([]);
+        $this->executeCommand("\r\n.\r\n", [250]);
     }
 
     /** Determine the best-use reverse path for this message */
@@ -406,8 +443,12 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
     /** Throws an Exception if a response code is incorrect */
     protected function assertResponseCode($response, $wanted)
     {
+        if (!$response) {
+            $this->throwException(new Swift_TransportException('Expected response code '.implode('/', $wanted).' but got an empty response'));
+        }
+
         list($code) = sscanf($response, '%3d');
-        $valid = (empty($wanted) || in_array($code, $wanted));
+        $valid = (empty($wanted) || \in_array($code, $wanted));
 
         if ($evt = $this->eventDispatcher->createResponseEvent($this, $response,
             $valid)) {
@@ -415,12 +456,7 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
         }
 
         if (!$valid) {
-            $this->throwException(
-                new Swift_TransportException(
-                    'Expected response code '.implode('/', $wanted).' but got code '.
-                    '"'.$code.'", with message "'.$response.'"',
-                    $code)
-                );
+            $this->throwException(new Swift_TransportException('Expected response code '.implode('/', $wanted).' but got code "'.$code.'", with message "'.$response.'"', $code));
         }
     }
 
@@ -436,10 +472,7 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
         } catch (Swift_TransportException $e) {
             $this->throwException($e);
         } catch (Swift_IoException $e) {
-            $this->throwException(
-                new Swift_TransportException(
-                    $e->getMessage())
-                );
+            $this->throwException(new Swift_TransportException($e->getMessage(), 0, $e));
         }
 
         return $response;
@@ -456,11 +489,16 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
                 ++$sent;
             } catch (Swift_TransportException $e) {
                 $failedRecipients[] = $forwardPath;
+            } catch (Swift_AddressEncoderException $e) {
+                $failedRecipients[] = $forwardPath;
             }
         }
 
-        if ($sent != 0) {
-            $this->doDataCommand();
+        if (0 != $sent) {
+            $sent += \count($failedRecipients);
+            $this->doDataCommand($failedRecipients);
+            $sent -= \count($failedRecipients);
+
             $this->streamMessage($message);
         } else {
             $this->reset();
@@ -480,20 +518,6 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
             $failedRecipients);
     }
 
-    /** Send a message to all Bcc: recipients */
-    private function sendBcc(Swift_Mime_SimpleMessage $message, $reversePath, array $bcc, array &$failedRecipients)
-    {
-        $sent = 0;
-        foreach ($bcc as $forwardPath => $name) {
-            $message->setBcc(array($forwardPath => $name));
-            $sent += $this->doMailTransaction(
-                $message, $reversePath, array($forwardPath), $failedRecipients
-                );
-        }
-
-        return $sent;
-    }
-
     /**
      * Destructor.
      */
@@ -504,4 +528,14 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
         } catch (Exception $e) {
         }
     }
+
+    public function __sleep()
+    {
+        throw new \BadMethodCallException('Cannot serialize '.__CLASS__);
+    }
+
+    public function __wakeup()
+    {
+        throw new \BadMethodCallException('Cannot unserialize '.__CLASS__);
+    }
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php
index 26c2d745a95..bb3a1615096 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php
@@ -26,29 +26,23 @@ class Swift_Transport_Esmtp_Auth_CramMd5Authenticator implements Swift_Transport
     }
 
     /**
-     * Try to authenticate the user with $username and $password.
-     *
-     * @param Swift_Transport_SmtpAgent $agent
-     * @param string                    $username
-     * @param string                    $password
-     *
-     * @return bool
+     * {@inheritdoc}
      */
     public function authenticate(Swift_Transport_SmtpAgent $agent, $username, $password)
     {
         try {
-            $challenge = $agent->executeCommand("AUTH CRAM-MD5\r\n", array(334));
+            $challenge = $agent->executeCommand("AUTH CRAM-MD5\r\n", [334]);
             $challenge = base64_decode(substr($challenge, 4));
             $message = base64_encode(
                 $username.' '.$this->getResponse($password, $challenge)
-                );
-            $agent->executeCommand(sprintf("%s\r\n", $message), array(235));
+            );
+            $agent->executeCommand(sprintf("%s\r\n", $message), [235]);
 
             return true;
         } catch (Swift_TransportException $e) {
-            $agent->executeCommand("RSET\r\n", array(250));
+            $agent->executeCommand("RSET\r\n", [250]);
 
-            return false;
+            throw $e;
         }
     }
 
@@ -62,16 +56,16 @@ class Swift_Transport_Esmtp_Auth_CramMd5Authenticator implements Swift_Transport
      */
     private function getResponse($secret, $challenge)
     {
-        if (strlen($secret) > 64) {
+        if (\strlen($secret) > 64) {
             $secret = pack('H32', md5($secret));
         }
 
-        if (strlen($secret) < 64) {
-            $secret = str_pad($secret, 64, chr(0));
+        if (\strlen($secret) < 64) {
+            $secret = str_pad($secret, 64, \chr(0));
         }
 
-        $k_ipad = substr($secret, 0, 64) ^ str_repeat(chr(0x36), 64);
-        $k_opad = substr($secret, 0, 64) ^ str_repeat(chr(0x5C), 64);
+        $k_ipad = substr($secret, 0, 64) ^ str_repeat(\chr(0x36), 64);
+        $k_opad = substr($secret, 0, 64) ^ str_repeat(\chr(0x5C), 64);
 
         $inner = pack('H32', md5($k_ipad.$challenge));
         $digest = md5($k_opad.$inner);
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php
index 6ab6e3337e2..0b9d81b8ad6 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php
@@ -26,26 +26,20 @@ class Swift_Transport_Esmtp_Auth_LoginAuthenticator implements Swift_Transport_E
     }
 
     /**
-     * Try to authenticate the user with $username and $password.
-     *
-     * @param Swift_Transport_SmtpAgent $agent
-     * @param string                    $username
-     * @param string                    $password
-     *
-     * @return bool
+     * {@inheritdoc}
      */
     public function authenticate(Swift_Transport_SmtpAgent $agent, $username, $password)
     {
         try {
-            $agent->executeCommand("AUTH LOGIN\r\n", array(334));
-            $agent->executeCommand(sprintf("%s\r\n", base64_encode($username)), array(334));
-            $agent->executeCommand(sprintf("%s\r\n", base64_encode($password)), array(235));
+            $agent->executeCommand("AUTH LOGIN\r\n", [334]);
+            $agent->executeCommand(sprintf("%s\r\n", base64_encode($username ?? '')), [334]);
+            $agent->executeCommand(sprintf("%s\r\n", base64_encode($password ?? '')), [235]);
 
             return true;
         } catch (Swift_TransportException $e) {
-            $agent->executeCommand("RSET\r\n", array(250));
+            $agent->executeCommand("RSET\r\n", [250]);
 
-            return false;
+            throw $e;
         }
     }
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php
index 7b8608d4a1b..41931fdd226 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php
@@ -31,63 +31,57 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
     }
 
     /**
-     * Try to authenticate the user with $username and $password.
-     *
-     * @param Swift_Transport_SmtpAgent $agent
-     * @param string                    $username
-     * @param string                    $password
-     *
-     * @return bool
+     * {@inheritdoc}
      *
      * @throws \LogicException
      */
     public function authenticate(Swift_Transport_SmtpAgent $agent, $username, $password)
     {
-        if (!function_exists('openssl_encrypt')) {
+        if (!\function_exists('openssl_encrypt')) {
             throw new LogicException('The OpenSSL extension must be enabled to use the NTLM authenticator.');
         }
 
-        if (!function_exists('bcmul')) {
+        if (!\function_exists('bcmul')) {
             throw new LogicException('The BCMath functions must be enabled to use the NTLM authenticator.');
         }
 
         try {
             // execute AUTH command and filter out the code at the beginning
             // AUTH NTLM xxxx
-            $response = base64_decode(substr(trim($this->sendMessage1($agent)), 4));
+            $response = base64_decode(substr(trim($this->sendMessage1($agent) ?? ''), 4));
 
             // extra parameters for our unit cases
-            $timestamp = func_num_args() > 3 ? func_get_arg(3) : $this->getCorrectTimestamp(bcmul(microtime(true), '1000'));
-            $client = func_num_args() > 4 ? func_get_arg(4) : $this->getRandomBytes(8);
+            $timestamp = \func_num_args() > 3 ? func_get_arg(3) : $this->getCorrectTimestamp(bcmul(microtime(true), '1000'));
+            $client = \func_num_args() > 4 ? func_get_arg(4) : random_bytes(8);
 
             // Message 3 response
             $this->sendMessage3($response, $username, $password, $timestamp, $client, $agent);
 
             return true;
         } catch (Swift_TransportException $e) {
-            $agent->executeCommand("RSET\r\n", array(250));
+            $agent->executeCommand("RSET\r\n", [250]);
 
-            return false;
+            throw $e;
         }
     }
 
     protected function si2bin($si, $bits = 32)
     {
         $bin = null;
-        if ($si >= -pow(2, $bits - 1) && ($si <= pow(2, $bits - 1))) {
+        if ($si >= -2 ** ($bits - 1) && ($si <= 2 ** ($bits - 1))) {
             // positive or zero
             if ($si >= 0) {
                 $bin = base_convert($si, 10, 2);
                 // pad to $bits bit
-                $bin_length = strlen($bin);
+                $bin_length = \strlen($bin);
                 if ($bin_length < $bits) {
                     $bin = str_repeat('0', $bits - $bin_length).$bin;
                 }
             } else {
                 // negative
-                $si = -$si - pow(2, $bits);
+                $si = -$si - 2 ** $bits;
                 $bin = base_convert($si, 10, 2);
-                $bin_length = strlen($bin);
+                $bin_length = \strlen($bin);
                 if ($bin_length > $bits) {
                     $bin = str_repeat('1', $bits - $bin_length).$bin;
                 }
@@ -100,15 +94,13 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
     /**
      * Send our auth message and returns the response.
      *
-     * @param Swift_Transport_SmtpAgent $agent
-     *
      * @return string SMTP Response
      */
     protected function sendMessage1(Swift_Transport_SmtpAgent $agent)
     {
         $message = $this->createMessage1();
 
-        return $agent->executeCommand(sprintf("AUTH %s %s\r\n", $this->getAuthKeyword(), base64_encode($message)), array(334));
+        return $agent->executeCommand(sprintf("AUTH %s %s\r\n", $this->getAuthKeyword(), base64_encode($message)), [334]);
     }
 
     /**
@@ -131,7 +123,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
         $targetInfoBlock = substr($responseHex, $offset);
         list($domainName, $serverName, $DNSDomainName, $DNSServerName, $terminatorByte) = $this->readSubBlock($targetInfoBlock);
 
-        return array(
+        return [
             $challenge,
             $context,
             $targetInfoH,
@@ -142,14 +134,12 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
             $DNSServerName,
             hex2bin($targetInfoBlock),
             $terminatorByte,
-        );
+        ];
     }
 
     /**
      * Read the blob information in from message2.
      *
-     * @param $block
-     *
      * @return array
      */
     protected function readSubBlock($block)
@@ -157,9 +147,9 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
         // remove terminatorByte cause it's always the same
         $block = substr($block, 0, -8);
 
-        $length = strlen($block);
+        $length = \strlen($block);
         $offset = 0;
-        $data = array();
+        $data = [];
         while ($offset < $length) {
             $blockLength = hexdec(substr(substr($block, $offset, 8), -4)) / 256;
             $offset += 8;
@@ -167,7 +157,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
             $offset += $blockLength * 2;
         }
 
-        if (count($data) == 3) {
+        if (3 == \count($data)) {
             $data[] = $data[2];
             $data[2] = '';
         }
@@ -180,13 +170,12 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
     /**
      * Send our final message with all our data.
      *
-     * @param string                    $response  Message 1 response (message 2)
-     * @param string                    $username
-     * @param string                    $password
-     * @param string                    $timestamp
-     * @param string                    $client
-     * @param Swift_Transport_SmtpAgent $agent
-     * @param bool                      $v2        Use version2 of the protocol
+     * @param string $response  Message 1 response (message 2)
+     * @param string $username
+     * @param string $password
+     * @param string $timestamp
+     * @param string $client
+     * @param bool   $v2        Use version2 of the protocol
      *
      * @return string
      */
@@ -210,7 +199,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
 
         $message = $this->createMessage3($domain, $username, $workstation, $lmResponse, $ntlmResponse);
 
-        return $agent->executeCommand(sprintf("%s\r\n", base64_encode($message)), array(235));
+        return $agent->executeCommand(sprintf("%s\r\n", base64_encode($message)), [235]);
     }
 
     /**
@@ -294,18 +283,18 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
      */
     protected function getDomainAndUsername($name)
     {
-        if (strpos($name, '\\') !== false) {
+        if (false !== strpos($name, '\\')) {
             return explode('\\', $name);
         }
 
         if (false !== strpos($name, '@')) {
             list($user, $domain) = explode('@', $name);
 
-            return array($domain, $user);
+            return [$domain, $user];
         }
 
         // no domain passed
-        return array('', $name);
+        return ['', $name];
     }
 
     /**
@@ -375,7 +364,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
         $binary = $this->si2bin($time, 64); // create 64 bit binary string
         $timestamp = '';
         for ($i = 0; $i < 8; ++$i) {
-            $timestamp .= chr(bindec(substr($binary, -(($i + 1) * 8), 8)));
+            $timestamp .= \chr(bindec(substr($binary, -(($i + 1) * 8), 8)));
         }
 
         return $timestamp;
@@ -396,7 +385,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
     {
         $lmPass = '00'; // by default 00
         // if $password > 15 than we can't use this method
-        if (strlen($password) <= 15) {
+        if (\strlen($password) <= 15) {
             $ntlmHash = $this->md4Encrypt($password);
             $ntml2Hash = $this->md5Encrypt($ntlmHash, $this->convertTo16bit(strtoupper($username).$domain));
 
@@ -436,21 +425,21 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
 
     protected function createDesKey($key)
     {
-        $material = array(bin2hex($key[0]));
-        $len = strlen($key);
+        $material = [bin2hex($key[0])];
+        $len = \strlen($key);
         for ($i = 1; $i < $len; ++$i) {
             list($high, $low) = str_split(bin2hex($key[$i]));
-            $v = $this->castToByte(ord($key[$i - 1]) << (7 + 1 - $i) | $this->uRShift(hexdec(dechex(hexdec($high) & 0xf).dechex(hexdec($low) & 0xf)), $i));
+            $v = $this->castToByte(\ord($key[$i - 1]) << (7 + 1 - $i) | $this->uRShift(hexdec(dechex(hexdec($high) & 0xf).dechex(hexdec($low) & 0xf)), $i));
             $material[] = str_pad(substr(dechex($v), -2), 2, '0', STR_PAD_LEFT); // cast to byte
         }
-        $material[] = str_pad(substr(dechex($this->castToByte(ord($key[6]) << 1)), -2), 2, '0');
+        $material[] = str_pad(substr(dechex($this->castToByte(\ord($key[6]) << 1)), -2), 2, '0');
 
         // odd parity
         foreach ($material as $k => $v) {
             $b = $this->castToByte(hexdec($v));
-            $needsParity = (($this->uRShift($b, 7) ^ $this->uRShift($b, 6) ^ $this->uRShift($b, 5)
+            $needsParity = 0 == (($this->uRShift($b, 7) ^ $this->uRShift($b, 6) ^ $this->uRShift($b, 5)
                         ^ $this->uRShift($b, 4) ^ $this->uRShift($b, 3) ^ $this->uRShift($b, 2)
-                        ^ $this->uRShift($b, 1)) & 0x01) == 0;
+                        ^ $this->uRShift($b, 1)) & 0x01);
 
             list($high, $low) = str_split($v);
             if ($needsParity) {
@@ -476,7 +465,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
      */
     protected function createSecurityBuffer($value, $offset, $is16 = false)
     {
-        $length = strlen(bin2hex($value));
+        $length = \strlen(bin2hex($value));
         $length = $is16 ? $length / 2 : $length;
         $length = $this->createByte(str_pad(dechex($length), 2, '0', STR_PAD_LEFT), 2);
 
@@ -495,7 +484,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
         $length = floor(hexdec(substr($value, 0, 4)) / 256) * 2;
         $offset = floor(hexdec(substr($value, 8, 4)) / 256) * 2;
 
-        return array($length, $offset);
+        return [$length, $offset];
     }
 
     /**
@@ -521,7 +510,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
      */
     protected function uRShift($a, $b)
     {
-        if ($b == 0) {
+        if (0 == $b) {
             return $a;
         }
 
@@ -548,22 +537,6 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
         return $byte;
     }
 
-    /**
-     * Create random bytes.
-     *
-     * @param $length
-     *
-     * @return string
-     */
-    protected function getRandomBytes($length)
-    {
-        $bytes = openssl_random_pseudo_bytes($length, $strong);
-        if (false !== $bytes && true === $strong) {
-            return $bytes;
-        }
-        throw new RuntimeException('OpenSSL did not produce a secure random number.');
-    }
-
     /** ENCRYPTION ALGORITHMS */
 
     /**
@@ -590,7 +563,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
     protected function md5Encrypt($key, $msg)
     {
         $blocksize = 64;
-        if (strlen($key) > $blocksize) {
+        if (\strlen($key) > $blocksize) {
             $key = pack('H*', md5($key));
         }
 
@@ -608,13 +581,13 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
      *
      * @return string
      *
-     * @see http://php.net/manual/en/ref.hash.php
+     * @see https://secure.php.net/manual/en/ref.hash.php
      */
     protected function md4Encrypt($input)
     {
         $input = $this->convertTo16bit($input);
 
-        return function_exists('hash') ? hex2bin(hash('md4', $input)) : mhash(MHASH_MD4, $input);
+        return \function_exists('hash') ? hex2bin(hash('md4', $input)) : mhash(MHASH_MD4, $input);
     }
 
     /**
@@ -639,8 +612,8 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
         echo substr($message, 0, 16)." NTLMSSP Signature<br />\n";
         echo $messageId." Type Indicator<br />\n";
 
-        if ($messageId == '02000000') {
-            $map = array(
+        if ('02000000' == $messageId) {
+            $map = [
                 'Challenge',
                 'Context',
                 'Target Information Security Buffer',
@@ -651,14 +624,14 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
                 'DNS Server Name',
                 'BLOB',
                 'Target Information Terminator',
-            );
+            ];
 
             $data = $this->parseMessage2(hex2bin($message));
 
             foreach ($map as $key => $value) {
                 echo bin2hex($data[$key]).' - '.$data[$key].' ||| '.$value."<br />\n";
             }
-        } elseif ($messageId == '03000000') {
+        } elseif ('03000000' == $messageId) {
             $i = 0;
             $data[$i++] = substr($message, 24, 16);
             list($lmLength, $lmOffset) = $this->readSecurityBuffer($data[$i - 1]);
@@ -683,7 +656,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
             $data[$i++] = substr($message, $lmOffset, $lmLength);
             $data[$i] = substr($message, $ntmlOffset, $ntmlLength);
 
-            $map = array(
+            $map = [
                 'LM Response Security Buffer',
                 'NTLM Response Security Buffer',
                 'Target Name Security Buffer',
@@ -696,7 +669,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
                 'Workstation Name Data',
                 'LM Response Data',
                 'NTLM Response Data',
-            );
+            ];
 
             foreach ($map as $key => $value) {
                 echo $data[$key].' - '.hex2bin($data[$key]).' ||| '.$value."<br />\n";
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php
index 43219f93445..41d0a50a82b 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php
@@ -26,25 +26,19 @@ class Swift_Transport_Esmtp_Auth_PlainAuthenticator implements Swift_Transport_E
     }
 
     /**
-     * Try to authenticate the user with $username and $password.
-     *
-     * @param Swift_Transport_SmtpAgent $agent
-     * @param string                    $username
-     * @param string                    $password
-     *
-     * @return bool
+     * {@inheritdoc}
      */
     public function authenticate(Swift_Transport_SmtpAgent $agent, $username, $password)
     {
         try {
-            $message = base64_encode($username.chr(0).$username.chr(0).$password);
-            $agent->executeCommand(sprintf("AUTH PLAIN %s\r\n", $message), array(235));
+            $message = base64_encode($username.\chr(0).$username.\chr(0).$password);
+            $agent->executeCommand(sprintf("AUTH PLAIN %s\r\n", $message), [235]);
 
             return true;
         } catch (Swift_TransportException $e) {
-            $agent->executeCommand("RSET\r\n", array(250));
+            $agent->executeCommand("RSET\r\n", [250]);
 
-            return false;
+            throw $e;
         }
     }
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/XOAuth2Authenticator.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/XOAuth2Authenticator.php
index d1a4cc3d774..859f22f3d5e 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/XOAuth2Authenticator.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/XOAuth2Authenticator.php
@@ -36,25 +36,19 @@ class Swift_Transport_Esmtp_Auth_XOAuth2Authenticator implements Swift_Transport
     }
 
     /**
-     * Try to authenticate the user with $email and $token.
-     *
-     * @param Swift_Transport_SmtpAgent $agent
-     * @param string                    $email
-     * @param string                    $token
-     *
-     * @return bool
+     * {@inheritdoc}
      */
     public function authenticate(Swift_Transport_SmtpAgent $agent, $email, $token)
     {
         try {
             $param = $this->constructXOAuth2Params($email, $token);
-            $agent->executeCommand('AUTH XOAUTH2 '.$param."\r\n", array(235));
+            $agent->executeCommand('AUTH XOAUTH2 '.$param."\r\n", [235]);
 
             return true;
         } catch (Swift_TransportException $e) {
-            $agent->executeCommand("RSET\r\n", array(250));
+            $agent->executeCommand("RSET\r\n", [250]);
 
-            return false;
+            throw $e;
         }
     }
 
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/AuthHandler.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/AuthHandler.php
index 94387f01a2e..53a90a87383 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/AuthHandler.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/AuthHandler.php
@@ -9,7 +9,7 @@
  */
 
 /**
- * An ESMTP handler for AUTH support.
+ * An ESMTP handler for AUTH support (RFC 5248).
  *
  * @author Chris Corbyn
  */
@@ -20,7 +20,7 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
      *
      * @var Swift_Transport_Esmtp_Authenticator[]
      */
-    private $authenticators = array();
+    private $authenticators = [];
 
     /**
      * The username for authentication.
@@ -48,7 +48,7 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
      *
      * @var string[]
      */
-    private $esmtpParams = array();
+    private $esmtpParams = [];
 
     /**
      * Create a new AuthHandler with $authenticators for support.
@@ -143,7 +143,7 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
     /**
      * Get the name of the ESMTP extension this handles.
      *
-     * @return bool
+     * @return string
      */
     public function getHandledKeyword()
     {
@@ -169,19 +169,26 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
     {
         if ($this->username) {
             $count = 0;
+            $errors = [];
             foreach ($this->getAuthenticatorsForAgent() as $authenticator) {
-                if (in_array(strtolower($authenticator->getAuthKeyword()),
-                    array_map('strtolower', $this->esmtpParams))) {
+                if (\in_array(strtolower($authenticator->getAuthKeyword() ?? ''), array_map('strtolower', $this->esmtpParams))) {
                     ++$count;
-                    if ($authenticator->authenticate($agent, $this->username, $this->password)) {
-                        return;
+                    try {
+                        if ($authenticator->authenticate($agent, $this->username, $this->password)) {
+                            return;
+                        }
+                    } catch (Swift_TransportException $e) {
+                        // keep the error message, but tries the other authenticators
+                        $errors[] = [$authenticator->getAuthKeyword(), $e->getMessage()];
                     }
                 }
             }
-            throw new Swift_TransportException(
-                'Failed to authenticate on SMTP server with username "'.
-                $this->username.'" using '.$count.' possible authenticators'
-                );
+
+            $message = 'Failed to authenticate on SMTP server with username "'.$this->username.'" using '.$count.' possible authenticators.';
+            foreach ($errors as $error) {
+                $message .= ' Authenticator '.$error[0].' returned '.$error[1].'.';
+            }
+            throw new Swift_TransportException($message);
         }
     }
 
@@ -190,7 +197,7 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
      */
     public function getMailParams()
     {
-        return array();
+        return [];
     }
 
     /**
@@ -198,13 +205,13 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
      */
     public function getRcptParams()
     {
-        return array();
+        return [];
     }
 
     /**
      * Not used.
      */
-    public function onCommand(Swift_Transport_SmtpAgent $agent, $command, $codes = array(), &$failedRecipients = null, &$stop = false)
+    public function onCommand(Swift_Transport_SmtpAgent $agent, $command, $codes = [], &$failedRecipients = null, &$stop = false)
     {
     }
 
@@ -229,7 +236,7 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
      */
     public function exposeMixinMethods()
     {
-        return array('setUsername', 'getUsername', 'setPassword', 'getPassword', 'setAuthMode', 'getAuthMode');
+        return ['setUsername', 'getUsername', 'setPassword', 'getPassword', 'setAuthMode', 'getAuthMode'];
     }
 
     /**
@@ -242,19 +249,17 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
     /**
      * Returns the authenticator list for the given agent.
      *
-     * @param Swift_Transport_SmtpAgent $agent
-     *
      * @return array
      */
     protected function getAuthenticatorsForAgent()
     {
-        if (!$mode = strtolower($this->auth_mode)) {
+        if (!$mode = strtolower($this->auth_mode ?? '')) {
             return $this->authenticators;
         }
 
         foreach ($this->authenticators as $authenticator) {
-            if (strtolower($authenticator->getAuthKeyword()) == $mode) {
-                return array($authenticator);
+            if (strtolower($authenticator->getAuthKeyword() ?? '') == $mode) {
+                return [$authenticator];
             }
         }
 
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Authenticator.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Authenticator.php
index 12a9abf8199..f692a6fe40d 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Authenticator.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Authenticator.php
@@ -25,11 +25,12 @@ interface Swift_Transport_Esmtp_Authenticator
     /**
      * Try to authenticate the user with $username and $password.
      *
-     * @param Swift_Transport_SmtpAgent $agent
-     * @param string                    $username
-     * @param string                    $password
+     * @param string $username
+     * @param string $password
      *
-     * @return bool
+     * @return bool true if authentication worked (returning false is deprecated, throw a Swift_TransportException instead)
+     *
+     * @throws Swift_TransportException Allows the message to bubble up when authentication was not successful
      */
     public function authenticate(Swift_Transport_SmtpAgent $agent, $username, $password);
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/EightBitMimeHandler.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/EightBitMimeHandler.php
new file mode 100644
index 00000000000..63f70866939
--- /dev/null
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/EightBitMimeHandler.php
@@ -0,0 +1,113 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2018 Christian Schmidt
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * An ESMTP handler for 8BITMIME support (RFC 6152).
+ *
+ * 8BITMIME is required when sending 8-bit content to over SMTP, e.g. when using
+ * Swift_Mime_ContentEncoder_PlainContentEncoder in "8bit" mode.
+ *
+ * 8BITMIME mode is enabled unconditionally, even when sending ASCII-only
+ * messages, so it should only be used with an outbound SMTP server that will
+ * convert the message to 7-bit MIME if the next hop does not support 8BITMIME.
+ *
+ * @author Christian Schmidt
+ */
+class Swift_Transport_Esmtp_EightBitMimeHandler implements Swift_Transport_EsmtpHandler
+{
+    protected $encoding;
+
+    /**
+     * @param string $encoding The parameter so send with the MAIL FROM command;
+     *                         either "8BITMIME" or "7BIT"
+     */
+    public function __construct(string $encoding = '8BITMIME')
+    {
+        $this->encoding = $encoding;
+    }
+
+    /**
+     * Get the name of the ESMTP extension this handles.
+     *
+     * @return string
+     */
+    public function getHandledKeyword()
+    {
+        return '8BITMIME';
+    }
+
+    /**
+     * Not used.
+     */
+    public function setKeywordParams(array $parameters)
+    {
+    }
+
+    /**
+     * Not used.
+     */
+    public function afterEhlo(Swift_Transport_SmtpAgent $agent)
+    {
+    }
+
+    /**
+     * Get params which are appended to MAIL FROM:<>.
+     *
+     * @return string[]
+     */
+    public function getMailParams()
+    {
+        return ['BODY='.$this->encoding];
+    }
+
+    /**
+     * Not used.
+     */
+    public function getRcptParams()
+    {
+        return [];
+    }
+
+    /**
+     * Not used.
+     */
+    public function onCommand(Swift_Transport_SmtpAgent $agent, $command, $codes = [], &$failedRecipients = null, &$stop = false)
+    {
+    }
+
+    /**
+     * Returns +1, -1 or 0 according to the rules for usort().
+     *
+     * This method is called to ensure extensions can be execute in an appropriate order.
+     *
+     * @param string $esmtpKeyword to compare with
+     *
+     * @return int
+     */
+    public function getPriorityOver($esmtpKeyword)
+    {
+        return 0;
+    }
+
+    /**
+     * Not used.
+     */
+    public function exposeMixinMethods()
+    {
+        return [];
+    }
+
+    /**
+     * Not used.
+     */
+    public function resetState()
+    {
+    }
+}
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/SmtpUtf8Handler.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/SmtpUtf8Handler.php
new file mode 100644
index 00000000000..7d0252a01bf
--- /dev/null
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/SmtpUtf8Handler.php
@@ -0,0 +1,107 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2018 Christian Schmidt
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * An ESMTP handler for SMTPUTF8 support (RFC 6531).
+ *
+ * SMTPUTF8 is required when sending to email addresses containing non-ASCII
+ * characters in local-part (the substring before @). This handler should be
+ * used together with Swift_AddressEncoder_Utf8AddressEncoder.
+ *
+ * SMTPUTF8 mode is enabled unconditionally, even when sending to ASCII-only
+ * addresses, so it should only be used with an outbound SMTP server that will
+ * deliver ASCII-only messages even if the next hop does not support SMTPUTF8.
+ *
+ * @author Christian Schmidt
+ */
+class Swift_Transport_Esmtp_SmtpUtf8Handler implements Swift_Transport_EsmtpHandler
+{
+    public function __construct()
+    {
+    }
+
+    /**
+     * Get the name of the ESMTP extension this handles.
+     *
+     * @return string
+     */
+    public function getHandledKeyword()
+    {
+        return 'SMTPUTF8';
+    }
+
+    /**
+     * Not used.
+     */
+    public function setKeywordParams(array $parameters)
+    {
+    }
+
+    /**
+     * Not used.
+     */
+    public function afterEhlo(Swift_Transport_SmtpAgent $agent)
+    {
+    }
+
+    /**
+     * Get params which are appended to MAIL FROM:<>.
+     *
+     * @return string[]
+     */
+    public function getMailParams()
+    {
+        return ['SMTPUTF8'];
+    }
+
+    /**
+     * Not used.
+     */
+    public function getRcptParams()
+    {
+        return [];
+    }
+
+    /**
+     * Not used.
+     */
+    public function onCommand(Swift_Transport_SmtpAgent $agent, $command, $codes = [], &$failedRecipients = null, &$stop = false)
+    {
+    }
+
+    /**
+     * Returns +1, -1 or 0 according to the rules for usort().
+     *
+     * This method is called to ensure extensions can be execute in an appropriate order.
+     *
+     * @param string $esmtpKeyword to compare with
+     *
+     * @return int
+     */
+    public function getPriorityOver($esmtpKeyword)
+    {
+        return 0;
+    }
+
+    /**
+     * Not used.
+     */
+    public function exposeMixinMethods()
+    {
+        return [];
+    }
+
+    /**
+     * Not used.
+     */
+    public function resetState()
+    {
+    }
+}
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/EsmtpHandler.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/EsmtpHandler.php
index c17ef8feb3b..b8ea36e2fa8 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/EsmtpHandler.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/EsmtpHandler.php
@@ -18,7 +18,7 @@ interface Swift_Transport_EsmtpHandler
     /**
      * Get the name of the ESMTP extension this handles.
      *
-     * @return bool
+     * @return string
      */
     public function getHandledKeyword();
 
@@ -59,7 +59,7 @@ interface Swift_Transport_EsmtpHandler
      * @param string[]                  $failedRecipients to collect failures
      * @param bool                      $stop             to be set true  by-reference if the command is now sent
      */
-    public function onCommand(Swift_Transport_SmtpAgent $agent, $command, $codes = array(), &$failedRecipients = null, &$stop = false);
+    public function onCommand(Swift_Transport_SmtpAgent $agent, $command, $codes = [], &$failedRecipients = null, &$stop = false);
 
     /**
      * Returns +1, -1 or 0 according to the rules for usort().
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php
index 56d9c748769..36545f51feb 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php
@@ -20,21 +20,21 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
      *
      * @var Swift_Transport_EsmtpHandler[]
      */
-    private $handlers = array();
+    private $handlers = [];
 
     /**
      * ESMTP capabilities.
      *
      * @var string[]
      */
-    private $capabilities = array();
+    private $capabilities = [];
 
     /**
      * Connection buffer parameters.
      *
      * @var array
      */
-    private $params = array(
+    private $params = [
         'protocol' => 'tcp',
         'host' => 'localhost',
         'port' => 25,
@@ -42,26 +42,26 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
         'blocking' => 1,
         'tls' => false,
         'type' => Swift_Transport_IoBuffer::TYPE_SOCKET,
-        'stream_context_options' => array(),
-        );
+        'stream_context_options' => [],
+        ];
 
     /**
      * Creates a new EsmtpTransport using the given I/O buffer.
      *
-     * @param Swift_Transport_IoBuffer       $buf
      * @param Swift_Transport_EsmtpHandler[] $extensionHandlers
-     * @param Swift_Events_EventDispatcher   $dispatcher
      * @param string                         $localDomain
      */
-    public function __construct(Swift_Transport_IoBuffer $buf, array $extensionHandlers, Swift_Events_EventDispatcher $dispatcher, $localDomain = '127.0.0.1')
+    public function __construct(Swift_Transport_IoBuffer $buf, array $extensionHandlers, Swift_Events_EventDispatcher $dispatcher, $localDomain = '127.0.0.1', Swift_AddressEncoder $addressEncoder = null)
     {
-        parent::__construct($buf, $dispatcher, $localDomain);
+        parent::__construct($buf, $dispatcher, $localDomain, $addressEncoder);
         $this->setExtensionHandlers($extensionHandlers);
     }
 
     /**
      * Set the host to connect to.
      *
+     * Literal IPv6 addresses should be wrapped in square brackets.
+     *
      * @param string $host
      *
      * @return $this
@@ -141,7 +141,7 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
      */
     public function setEncryption($encryption)
     {
-        $encryption = strtolower($encryption);
+        $encryption = strtolower($encryption ?? '');
         if ('tls' == $encryption) {
             $this->params['protocol'] = 'tcp';
             $this->params['tls'] = true;
@@ -190,6 +190,8 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
     /**
      * Sets the source IP.
      *
+     * IPv6 addresses should be wrapped in square brackets.
+     *
      * @param string $source
      *
      * @return $this
@@ -208,7 +210,36 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
      */
     public function getSourceIp()
     {
-        return isset($this->params['sourceIp']) ? $this->params['sourceIp'] : null;
+        return $this->params['sourceIp'] ?? null;
+    }
+
+    /**
+     * Sets whether SMTP pipelining is enabled.
+     *
+     * By default, support is auto-detected using the PIPELINING SMTP extension.
+     * Use this function to override that in the unlikely event of compatibility
+     * issues.
+     *
+     * @param bool $enabled
+     *
+     * @return $this
+     */
+    public function setPipelining($enabled)
+    {
+        $this->pipelining = $enabled;
+
+        return $this;
+    }
+
+    /**
+     * Returns whether SMTP pipelining is enabled.
+     *
+     * @return bool|null a boolean if pipelining is explicitly enabled or disabled,
+     *                   or null if support is auto-detected
+     */
+    public function getPipelining()
+    {
+        return $this->pipelining;
     }
 
     /**
@@ -220,7 +251,7 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
      */
     public function setExtensionHandlers(array $handlers)
     {
-        $assoc = array();
+        $assoc = [];
         foreach ($handlers as $handler) {
             $assoc[$handler->getHandledKeyword()] = $handler;
         }
@@ -252,10 +283,12 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
      * @param string   $command
      * @param int[]    $codes
      * @param string[] $failures An array of failures by-reference
+     * @param bool     $pipeline Do not wait for response
+     * @param string   $address  the address, if command is RCPT TO
      *
-     * @return string
+     * @return string|null The server response, or null if pipelining is enabled
      */
-    public function executeCommand($command, $codes = array(), &$failures = null)
+    public function executeCommand($command, $codes = [], &$failures = null, $pipeline = false, $address = null)
     {
         $failures = (array) $failures;
         $stopSignal = false;
@@ -269,19 +302,19 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
             }
         }
 
-        return parent::executeCommand($command, $codes, $failures);
+        return parent::executeCommand($command, $codes, $failures, $pipeline, $address);
     }
 
     /** Mixin handling method for ESMTP handlers */
     public function __call($method, $args)
     {
         foreach ($this->handlers as $handler) {
-            if (in_array(strtolower($method),
+            if (\in_array(strtolower($method),
                 array_map('strtolower', (array) $handler->exposeMixinMethods())
                 )) {
-                $return = call_user_func_array(array($handler, $method), $args);
+                $return = \call_user_func_array([$handler, $method], $args);
                 // Allow fluid method calls
-                if (null === $return && substr($method, 0, 3) == 'set') {
+                if (null === $return && 'set' == substr($method, 0, 3)) {
                     return $this;
                 } else {
                     return $return;
@@ -302,7 +335,7 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
     {
         try {
             $response = $this->executeCommand(
-                sprintf("EHLO %s\r\n", $this->domain), array(250)
+                sprintf("EHLO %s\r\n", $this->domain), [250]
                 );
         } catch (Swift_TransportException $e) {
             return parent::doHeloCommand();
@@ -310,7 +343,7 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
 
         if ($this->params['tls']) {
             try {
-                $this->executeCommand("STARTTLS\r\n", array(220));
+                $this->executeCommand("STARTTLS\r\n", [220]);
 
                 if (!$this->buffer->startTLS()) {
                     throw new Swift_TransportException('Unable to connect with TLS encryption');
@@ -318,7 +351,7 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
 
                 try {
                     $response = $this->executeCommand(
-                        sprintf("EHLO %s\r\n", $this->domain), array(250)
+                        sprintf("EHLO %s\r\n", $this->domain), [250]
                         );
                 } catch (Swift_TransportException $e) {
                     return parent::doHeloCommand();
@@ -329,6 +362,10 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
         }
 
         $this->capabilities = $this->getCapabilities($response);
+        if (!isset($this->pipelining)) {
+            $this->pipelining = isset($this->capabilities['PIPELINING']);
+        }
+
         $this->setHandlerParams();
         foreach ($this->getActiveHandlers() as $handler) {
             $handler->afterEhlo($this);
@@ -338,43 +375,45 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
     /** Overridden to add Extension support */
     protected function doMailFromCommand($address)
     {
+        $address = $this->addressEncoder->encodeString($address);
         $handlers = $this->getActiveHandlers();
-        $params = array();
+        $params = [];
         foreach ($handlers as $handler) {
             $params = array_merge($params, (array) $handler->getMailParams());
         }
         $paramStr = !empty($params) ? ' '.implode(' ', $params) : '';
         $this->executeCommand(
-            sprintf("MAIL FROM:<%s>%s\r\n", $address, $paramStr), array(250)
+            sprintf("MAIL FROM:<%s>%s\r\n", $address, $paramStr), [250], $failures, true
             );
     }
 
     /** Overridden to add Extension support */
     protected function doRcptToCommand($address)
     {
+        $address = $this->addressEncoder->encodeString($address);
         $handlers = $this->getActiveHandlers();
-        $params = array();
+        $params = [];
         foreach ($handlers as $handler) {
             $params = array_merge($params, (array) $handler->getRcptParams());
         }
         $paramStr = !empty($params) ? ' '.implode(' ', $params) : '';
         $this->executeCommand(
-            sprintf("RCPT TO:<%s>%s\r\n", $address, $paramStr), array(250, 251, 252)
+            sprintf("RCPT TO:<%s>%s\r\n", $address, $paramStr), [250, 251, 252], $failures, true, $address
             );
     }
 
     /** Determine ESMTP capabilities by function group */
     private function getCapabilities($ehloResponse)
     {
-        $capabilities = array();
-        $ehloResponse = trim($ehloResponse);
+        $capabilities = [];
+        $ehloResponse = trim($ehloResponse ?? '');
         $lines = explode("\r\n", $ehloResponse);
         array_shift($lines);
         foreach ($lines as $line) {
             if (preg_match('/^[0-9]{3}[ -]([A-Z0-9-]+)((?:[ =].*)?)$/Di', $line, $matches)) {
                 $keyword = strtoupper($matches[1]);
                 $paramStr = strtoupper(ltrim($matches[2], ' ='));
-                $params = !empty($paramStr) ? explode(' ', $paramStr) : array();
+                $params = !empty($paramStr) ? explode(' ', $paramStr) : [];
                 $capabilities[$keyword] = $params;
             }
         }
@@ -386,7 +425,7 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
     private function setHandlerParams()
     {
         foreach ($this->handlers as $keyword => $handler) {
-            if (array_key_exists($keyword, $this->capabilities)) {
+            if (\array_key_exists($keyword, $this->capabilities)) {
                 $handler->setKeywordParams($this->capabilities[$keyword]);
             }
         }
@@ -395,9 +434,9 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
     /** Get ESMTP handlers which are currently ok to use */
     private function getActiveHandlers()
     {
-        $handlers = array();
+        $handlers = [];
         foreach ($this->handlers as $keyword => $handler) {
-            if (array_key_exists($keyword, $this->capabilities)) {
+            if (\array_key_exists($keyword, $this->capabilities)) {
                 $handlers[] = $handler;
             }
         }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/FailoverTransport.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/FailoverTransport.php
index 94151f89fef..1a4b4754f07 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/FailoverTransport.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/FailoverTransport.php
@@ -33,7 +33,7 @@ class Swift_Transport_FailoverTransport extends Swift_Transport_LoadBalancedTran
      */
     public function ping()
     {
-        $maxTransports = count($this->transports);
+        $maxTransports = \count($this->transports);
         for ($i = 0; $i < $maxTransports
             && $transport = $this->getNextTransport(); ++$i) {
             if ($transport->ping()) {
@@ -43,7 +43,7 @@ class Swift_Transport_FailoverTransport extends Swift_Transport_LoadBalancedTran
             }
         }
 
-        return count($this->transports) > 0;
+        return \count($this->transports) > 0;
     }
 
     /**
@@ -52,14 +52,13 @@ class Swift_Transport_FailoverTransport extends Swift_Transport_LoadBalancedTran
      * Recipient/sender data will be retrieved from the Message API.
      * The return value is the number of recipients who were accepted for delivery.
      *
-     * @param Swift_Mime_SimpleMessage $message
-     * @param string[]           $failedRecipients An array of failures by-reference
+     * @param string[] $failedRecipients An array of failures by-reference
      *
      * @return int
      */
     public function send(Swift_Mime_SimpleMessage $message, &$failedRecipients = null)
     {
-        $maxTransports = count($this->transports);
+        $maxTransports = \count($this->transports);
         $sent = 0;
         $this->lastUsedTransport = null;
 
@@ -80,10 +79,8 @@ class Swift_Transport_FailoverTransport extends Swift_Transport_LoadBalancedTran
             }
         }
 
-        if (count($this->transports) == 0) {
-            throw new Swift_TransportException(
-                'All Transports in FailoverTransport failed, or no Transports available'
-                );
+        if (0 == \count($this->transports)) {
+            throw new Swift_TransportException('All Transports in FailoverTransport failed, or no Transports available');
         }
 
         return $sent;
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/IoBuffer.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/IoBuffer.php
index af97adf1f8f..50f1e5e403c 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/IoBuffer.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/IoBuffer.php
@@ -25,8 +25,6 @@ interface Swift_Transport_IoBuffer extends Swift_InputByteStream, Swift_OutputBy
      * Perform any initialization needed, using the given $params.
      *
      * Parameters will vary depending upon the type of IoBuffer used.
-     *
-     * @param array $params
      */
     public function initialize(array $params);
 
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/LoadBalancedTransport.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/LoadBalancedTransport.php
index dc6a2149bab..0b5ba9d304e 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/LoadBalancedTransport.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/LoadBalancedTransport.php
@@ -20,14 +20,14 @@ class Swift_Transport_LoadBalancedTransport implements Swift_Transport
      *
      * @var Swift_Transport[]
      */
-    private $deadTransports = array();
+    private $deadTransports = [];
 
     /**
      * The Transports which are used in rotation.
      *
      * @var Swift_Transport[]
      */
-    protected $transports = array();
+    protected $transports = [];
 
     /**
      * The Transport used in the last successful send operation.
@@ -49,7 +49,7 @@ class Swift_Transport_LoadBalancedTransport implements Swift_Transport
     public function setTransports(array $transports)
     {
         $this->transports = $transports;
-        $this->deadTransports = array();
+        $this->deadTransports = [];
     }
 
     /**
@@ -79,7 +79,7 @@ class Swift_Transport_LoadBalancedTransport implements Swift_Transport
      */
     public function isStarted()
     {
-        return count($this->transports) > 0;
+        return \count($this->transports) > 0;
     }
 
     /**
@@ -111,7 +111,7 @@ class Swift_Transport_LoadBalancedTransport implements Swift_Transport
             }
         }
 
-        return count($this->transports) > 0;
+        return \count($this->transports) > 0;
     }
 
     /**
@@ -120,14 +120,13 @@ class Swift_Transport_LoadBalancedTransport implements Swift_Transport
      * Recipient/sender data will be retrieved from the Message API.
      * The return value is the number of recipients who were accepted for delivery.
      *
-     * @param Swift_Mime_SimpleMessage $message
-     * @param string[]           $failedRecipients An array of failures by-reference
+     * @param string[] $failedRecipients An array of failures by-reference
      *
      * @return int
      */
     public function send(Swift_Mime_SimpleMessage $message, &$failedRecipients = null)
     {
-        $maxTransports = count($this->transports);
+        $maxTransports = \count($this->transports);
         $sent = 0;
         $this->lastUsedTransport = null;
 
@@ -146,10 +145,8 @@ class Swift_Transport_LoadBalancedTransport implements Swift_Transport
             }
         }
 
-        if (count($this->transports) == 0) {
-            throw new Swift_TransportException(
-                'All Transports in LoadBalancedTransport failed, or no Transports available'
-                );
+        if (0 == \count($this->transports)) {
+            throw new Swift_TransportException('All Transports in LoadBalancedTransport failed, or no Transports available');
         }
 
         return $sent;
@@ -157,8 +154,6 @@ class Swift_Transport_LoadBalancedTransport implements Swift_Transport
 
     /**
      * Register a plugin.
-     *
-     * @param Swift_Events_EventListener $plugin
      */
     public function registerPlugin(Swift_Events_EventListener $plugin)
     {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/NullTransport.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/NullTransport.php
index dc38078c3c3..7d910db5a58 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/NullTransport.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/NullTransport.php
@@ -61,8 +61,7 @@ class Swift_Transport_NullTransport implements Swift_Transport
     /**
      * Sends the given message.
      *
-     * @param Swift_Mime_SimpleMessage $message
-     * @param string[]           $failedRecipients An array of failures by-reference
+     * @param string[] $failedRecipients An array of failures by-reference
      *
      * @return int The number of sent emails
      */
@@ -81,9 +80,9 @@ class Swift_Transport_NullTransport implements Swift_Transport
         }
 
         $count = (
-            count((array) $message->getTo())
-            + count((array) $message->getCc())
-            + count((array) $message->getBcc())
+            \count((array) $message->getTo())
+            + \count((array) $message->getCc())
+            + \count((array) $message->getBcc())
             );
 
         return $count;
@@ -91,8 +90,6 @@ class Swift_Transport_NullTransport implements Swift_Transport
 
     /**
      * Register a plugin.
-     *
-     * @param Swift_Events_EventListener $plugin
      */
     public function registerPlugin(Swift_Events_EventListener $plugin)
     {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/SendmailTransport.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/SendmailTransport.php
index 807538505bf..65a434d1173 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/SendmailTransport.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/SendmailTransport.php
@@ -24,23 +24,21 @@ class Swift_Transport_SendmailTransport extends Swift_Transport_AbstractSmtpTran
      *
      * @var array
      */
-    private $params = array(
+    private $params = [
         'timeout' => 30,
         'blocking' => 1,
         'command' => '/usr/sbin/sendmail -bs',
         'type' => Swift_Transport_IoBuffer::TYPE_PROCESS,
-        );
+        ];
 
     /**
      * Create a new SendmailTransport with $buf for I/O.
      *
-     * @param Swift_Transport_IoBuffer     $buf
-     * @param Swift_Events_EventDispatcher $dispatcher
-     * @param string                       $localDomain
+     * @param string $localDomain
      */
-    public function __construct(Swift_Transport_IoBuffer $buf, Swift_Events_EventDispatcher $dispatcher, $localDomain = '127.0.0.1')
+    public function __construct(Swift_Transport_IoBuffer $buf, Swift_Events_EventDispatcher $dispatcher, $localDomain = '127.0.0.1', Swift_AddressEncoder $addressEncoder = null)
     {
-        parent::__construct($buf, $dispatcher, $localDomain);
+        parent::__construct($buf, $dispatcher, $localDomain, $addressEncoder);
     }
 
     /**
@@ -93,8 +91,7 @@ class Swift_Transport_SendmailTransport extends Swift_Transport_AbstractSmtpTran
      * NOTE: If using 'sendmail -t' you will not be aware of any failures until
      * they bounce (i.e. send() will always return 100% success).
      *
-     * @param Swift_Mime_SimpleMessage $message
-     * @param string[]           $failedRecipients An array of failures by-reference
+     * @param string[] $failedRecipients An array of failures by-reference
      *
      * @return int
      */
@@ -114,24 +111,24 @@ class Swift_Transport_SendmailTransport extends Swift_Transport_AbstractSmtpTran
             }
 
             if (false === strpos($command, ' -f')) {
-                $command .= ' -f'.escapeshellarg($this->getReversePath($message));
+                $command .= ' -f'.escapeshellarg($this->getReversePath($message) ?? '');
             }
 
-            $buffer->initialize(array_merge($this->params, array('command' => $command)));
+            $buffer->initialize(array_merge($this->params, ['command' => $command]));
 
             if (false === strpos($command, ' -i') && false === strpos($command, ' -oi')) {
-                $buffer->setWriteTranslations(array("\r\n" => "\n", "\n." => "\n.."));
+                $buffer->setWriteTranslations(["\r\n" => "\n", "\n." => "\n.."]);
             } else {
-                $buffer->setWriteTranslations(array("\r\n" => "\n"));
+                $buffer->setWriteTranslations(["\r\n" => "\n"]);
             }
 
-            $count = count((array) $message->getTo())
-                + count((array) $message->getCc())
-                + count((array) $message->getBcc())
+            $count = \count((array) $message->getTo())
+                + \count((array) $message->getCc())
+                + \count((array) $message->getBcc())
                 ;
             $message->toByteStream($buffer);
             $buffer->flushBuffers();
-            $buffer->setWriteTranslations(array());
+            $buffer->setWriteTranslations([]);
             $buffer->terminate();
 
             if ($evt) {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/SmtpAgent.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/SmtpAgent.php
index 90e913f8edb..e8ce65c2648 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/SmtpAgent.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/SmtpAgent.php
@@ -32,5 +32,5 @@ interface Swift_Transport_SmtpAgent
      * @param int[]    $codes
      * @param string[] $failures An array of failures by-reference
      */
-    public function executeCommand($command, $codes = array(), &$failures = null);
+    public function executeCommand($command, $codes = [], &$failures = null);
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/SpoolTransport.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/SpoolTransport.php
index 9a1d07115e3..0cb6a5b80a9 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/SpoolTransport.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/SpoolTransport.php
@@ -33,8 +33,6 @@ class Swift_Transport_SpoolTransport implements Swift_Transport
     /**
      * Sets the spool object.
      *
-     * @param Swift_Spool $spool
-     *
      * @return $this
      */
     public function setSpool(Swift_Spool $spool)
@@ -89,8 +87,7 @@ class Swift_Transport_SpoolTransport implements Swift_Transport
     /**
      * Sends the given message.
      *
-     * @param Swift_Mime_SimpleMessage $message
-     * @param string[]           $failedRecipients An array of failures by-reference
+     * @param string[] $failedRecipients An array of failures by-reference
      *
      * @return int The number of sent e-mail's
      */
@@ -115,8 +112,6 @@ class Swift_Transport_SpoolTransport implements Swift_Transport
 
     /**
      * Register a plugin.
-     *
-     * @param Swift_Events_EventListener $plugin
      */
     public function registerPlugin(Swift_Events_EventListener $plugin)
     {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php
index bc6ed5a34b4..70782ada044 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php
@@ -25,18 +25,16 @@ class Swift_Transport_StreamBuffer extends Swift_ByteStream_AbstractFilterableIn
     private $out;
 
     /** Buffer initialization parameters */
-    private $params = array();
+    private $params = [];
 
     /** The ReplacementFilterFactory */
     private $replacementFactory;
 
     /** Translations performed on data being streamed into the buffer */
-    private $translations = array();
+    private $translations = [];
 
     /**
      * Create a new StreamBuffer using $replacementFactory for transformations.
-     *
-     * @param Swift_ReplacementFilterFactory $replacementFactory
      */
     public function __construct(Swift_ReplacementFilterFactory $replacementFactory)
     {
@@ -47,8 +45,6 @@ class Swift_Transport_StreamBuffer extends Swift_ByteStream_AbstractFilterableIn
      * Perform any initialization needed, using the given $params.
      *
      * Parameters will vary depending upon the type of IoBuffer used.
-     *
-     * @param array $params
      */
     public function initialize(array $params)
     {
@@ -91,7 +87,11 @@ class Swift_Transport_StreamBuffer extends Swift_ByteStream_AbstractFilterableIn
 
     public function startTLS()
     {
-        return stream_socket_enable_crypto($this->stream, true, STREAM_CRYPTO_METHOD_TLS_CLIENT);
+        // STREAM_CRYPTO_METHOD_TLS_CLIENT only allow tls1.0 connections (some php versions)
+        // To support modern tls we allow explicit tls1.0, tls1.1, tls1.2
+        // Ssl3 and older are not allowed because they are vulnerable
+        // @TODO make tls arguments configurable
+        return stream_socket_enable_crypto($this->stream, true, STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT | STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT | STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT);
     }
 
     /**
@@ -160,14 +160,10 @@ class Swift_Transport_StreamBuffer extends Swift_ByteStream_AbstractFilterableIn
     {
         if (isset($this->out) && !feof($this->out)) {
             $line = fgets($this->out);
-            if (strlen($line) == 0) {
+            if (0 == \strlen($line)) {
                 $metas = stream_get_meta_data($this->out);
                 if ($metas['timed_out']) {
-                    throw new Swift_IoException(
-                        'Connection to '.
-                            $this->getReadConnectionDescription().
-                        ' Timed Out'
-                    );
+                    throw new Swift_IoException('Connection to '.$this->getReadConnectionDescription().' Timed Out');
                 }
             }
 
@@ -192,14 +188,10 @@ class Swift_Transport_StreamBuffer extends Swift_ByteStream_AbstractFilterableIn
     {
         if (isset($this->out) && !feof($this->out)) {
             $ret = fread($this->out, $length);
-            if (strlen($ret) == 0) {
+            if (0 == \strlen($ret)) {
                 $metas = stream_get_meta_data($this->out);
                 if ($metas['timed_out']) {
-                    throw new Swift_IoException(
-                        'Connection to '.
-                            $this->getReadConnectionDescription().
-                        ' Timed Out'
-                    );
+                    throw new Swift_IoException('Connection to '.$this->getReadConnectionDescription().' Timed Out');
                 }
             }
 
@@ -224,7 +216,7 @@ class Swift_Transport_StreamBuffer extends Swift_ByteStream_AbstractFilterableIn
     protected function doCommit($bytes)
     {
         if (isset($this->in)) {
-            $bytesToWrite = strlen($bytes);
+            $bytesToWrite = \strlen($bytes);
             $totalBytesWritten = 0;
 
             while ($totalBytesWritten < $bytesToWrite) {
@@ -255,7 +247,7 @@ class Swift_Transport_StreamBuffer extends Swift_ByteStream_AbstractFilterableIn
         if (!empty($this->params['timeout'])) {
             $timeout = $this->params['timeout'];
         }
-        $options = array();
+        $options = [];
         if (!empty($this->params['sourceIp'])) {
             $options['socket']['bindto'] = $this->params['sourceIp'].':0';
         }
@@ -264,13 +256,16 @@ class Swift_Transport_StreamBuffer extends Swift_ByteStream_AbstractFilterableIn
             $options = array_merge($options, $this->params['stream_context_options']);
         }
         $streamContext = stream_context_create($options);
-        $this->stream = @stream_socket_client($host.':'.$this->params['port'], $errno, $errstr, $timeout, STREAM_CLIENT_CONNECT, $streamContext);
-        if (false === $this->stream) {
-            throw new Swift_TransportException(
-                'Connection could not be established with host '.$this->params['host'].
-                ' ['.$errstr.' #'.$errno.']'
-                );
+
+        set_error_handler(function ($type, $msg) {
+            throw new Swift_TransportException('Connection could not be established with host '.$this->params['host'].' :'.$msg);
+        });
+        try {
+            $this->stream = stream_socket_client($host.':'.$this->params['port'], $errno, $errstr, $timeout, STREAM_CLIENT_CONNECT, $streamContext);
+        } finally {
+            restore_error_handler();
         }
+
         if (!empty($this->params['blocking'])) {
             stream_set_blocking($this->stream, 1);
         } else {
@@ -287,18 +282,16 @@ class Swift_Transport_StreamBuffer extends Swift_ByteStream_AbstractFilterableIn
     private function establishProcessConnection()
     {
         $command = $this->params['command'];
-        $descriptorSpec = array(
-            0 => array('pipe', 'r'),
-            1 => array('pipe', 'w'),
-            2 => array('pipe', 'w'),
-            );
-        $pipes = array();
+        $descriptorSpec = [
+            0 => ['pipe', 'r'],
+            1 => ['pipe', 'w'],
+            2 => ['pipe', 'w'],
+            ];
+        $pipes = [];
         $this->stream = proc_open($command, $descriptorSpec, $pipes);
         stream_set_blocking($pipes[2], 0);
         if ($err = stream_get_contents($pipes[2])) {
-            throw new Swift_TransportException(
-                'Process could not be started ['.$err.']'
-                );
+            throw new Swift_TransportException('Process could not be started ['.$err.']');
         }
         $this->in = &$pipes[0];
         $this->out = &$pipes[1];
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/TransportException.php b/htdocs/includes/swiftmailer/lib/classes/Swift/TransportException.php
index 4ae2412e62a..c7417455b3e 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/TransportException.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/TransportException.php
@@ -18,9 +18,8 @@ class Swift_TransportException extends Swift_IoException
     /**
      * Create a new TransportException with $message.
      *
-     * @param string    $message
-     * @param int       $code
-     * @param Exception $previous
+     * @param string $message
+     * @param int    $code
      */
     public function __construct($message, $code = 0, Exception $previous = null)
     {
diff --git a/htdocs/includes/swiftmailer/lib/dependency_maps/cache_deps.php b/htdocs/includes/swiftmailer/lib/dependency_maps/cache_deps.php
index 6023448e85e..9d94d774014 100644
--- a/htdocs/includes/swiftmailer/lib/dependency_maps/cache_deps.php
+++ b/htdocs/includes/swiftmailer/lib/dependency_maps/cache_deps.php
@@ -12,11 +12,11 @@ Swift_DependencyContainer::getInstance()
 
     ->register('cache.array')
     ->asSharedInstanceOf('Swift_KeyCache_ArrayKeyCache')
-    ->withDependencies(array('cache.inputstream'))
+    ->withDependencies(['cache.inputstream'])
 
     ->register('cache.disk')
     ->asSharedInstanceOf('Swift_KeyCache_DiskKeyCache')
-    ->withDependencies(array('cache.inputstream', 'tempdir'))
+    ->withDependencies(['cache.inputstream', 'tempdir'])
 
     ->register('cache.inputstream')
     ->asNewInstanceOf('Swift_KeyCache_SimpleKeyCacheInputStream')
diff --git a/htdocs/includes/swiftmailer/lib/dependency_maps/mime_deps.php b/htdocs/includes/swiftmailer/lib/dependency_maps/mime_deps.php
index 4ce9c7cbbc5..307756c89f3 100644
--- a/htdocs/includes/swiftmailer/lib/dependency_maps/mime_deps.php
+++ b/htdocs/includes/swiftmailer/lib/dependency_maps/mime_deps.php
@@ -13,101 +13,105 @@ Swift_DependencyContainer::getInstance()
     // As SERVER_NAME can come from the user in certain configurations, check that
     // it does not contain forbidden characters (see RFC 952 and RFC 2181). Use
     // preg_replace() instead of preg_match() to prevent DoS attacks with long host names.
-    ->asValue(!empty($_SERVER['SERVER_NAME']) && preg_replace('/(?:^\[)?[a-zA-Z0-9-:\]_]+\.?/', '', $_SERVER['SERVER_NAME']) === '' ? $_SERVER['SERVER_NAME'] : 'swift.generated')
+    ->asValue(!empty($_SERVER['SERVER_NAME']) && '' === preg_replace('/(?:^\[)?[a-zA-Z0-9-:\]_]+\.?/', '', $_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : 'swift.generated')
 
     ->register('mime.idgenerator')
     ->asSharedInstanceOf('Swift_Mime_IdGenerator')
-    ->withDependencies(array(
+    ->withDependencies([
         'mime.idgenerator.idright',
-    ))
+    ])
 
     ->register('mime.message')
     ->asNewInstanceOf('Swift_Mime_SimpleMessage')
-    ->withDependencies(array(
+    ->withDependencies([
         'mime.headerset',
-        'mime.qpcontentencoder',
+        'mime.textcontentencoder',
         'cache',
         'mime.idgenerator',
         'properties.charset',
-    ))
+    ])
 
     ->register('mime.part')
     ->asNewInstanceOf('Swift_Mime_MimePart')
-    ->withDependencies(array(
+    ->withDependencies([
         'mime.headerset',
-        'mime.qpcontentencoder',
+        'mime.textcontentencoder',
         'cache',
         'mime.idgenerator',
         'properties.charset',
-    ))
+    ])
 
     ->register('mime.attachment')
     ->asNewInstanceOf('Swift_Mime_Attachment')
-    ->withDependencies(array(
+    ->withDependencies([
         'mime.headerset',
         'mime.base64contentencoder',
         'cache',
         'mime.idgenerator',
-    ))
+    ])
     ->addConstructorValue($swift_mime_types)
 
     ->register('mime.embeddedfile')
     ->asNewInstanceOf('Swift_Mime_EmbeddedFile')
-    ->withDependencies(array(
+    ->withDependencies([
         'mime.headerset',
         'mime.base64contentencoder',
         'cache',
         'mime.idgenerator',
-    ))
+    ])
     ->addConstructorValue($swift_mime_types)
 
     ->register('mime.headerfactory')
     ->asNewInstanceOf('Swift_Mime_SimpleHeaderFactory')
-    ->withDependencies(array(
-            'mime.qpheaderencoder',
-            'mime.rfc2231encoder',
-            'email.validator',
-            'properties.charset',
-        ))
+    ->withDependencies([
+        'mime.qpheaderencoder',
+        'mime.rfc2231encoder',
+        'email.validator',
+        'properties.charset',
+        'address.idnaddressencoder',
+    ])
 
     ->register('mime.headerset')
     ->asNewInstanceOf('Swift_Mime_SimpleHeaderSet')
-    ->withDependencies(array('mime.headerfactory', 'properties.charset'))
+    ->withDependencies(['mime.headerfactory', 'properties.charset'])
 
     ->register('mime.qpheaderencoder')
     ->asNewInstanceOf('Swift_Mime_HeaderEncoder_QpHeaderEncoder')
-    ->withDependencies(array('mime.charstream'))
+    ->withDependencies(['mime.charstream'])
 
     ->register('mime.base64headerencoder')
     ->asNewInstanceOf('Swift_Mime_HeaderEncoder_Base64HeaderEncoder')
-    ->withDependencies(array('mime.charstream'))
+    ->withDependencies(['mime.charstream'])
 
     ->register('mime.charstream')
     ->asNewInstanceOf('Swift_CharacterStream_NgCharacterStream')
-    ->withDependencies(array('mime.characterreaderfactory', 'properties.charset'))
+    ->withDependencies(['mime.characterreaderfactory', 'properties.charset'])
 
     ->register('mime.bytecanonicalizer')
     ->asSharedInstanceOf('Swift_StreamFilters_ByteArrayReplacementFilter')
-    ->addConstructorValue(array(array(0x0D, 0x0A), array(0x0D), array(0x0A)))
-    ->addConstructorValue(array(array(0x0A), array(0x0A), array(0x0D, 0x0A)))
+    ->addConstructorValue([[0x0D, 0x0A], [0x0D], [0x0A]])
+    ->addConstructorValue([[0x0A], [0x0A], [0x0D, 0x0A]])
 
     ->register('mime.characterreaderfactory')
     ->asSharedInstanceOf('Swift_CharacterReaderFactory_SimpleCharacterReaderFactory')
 
+    ->register('mime.textcontentencoder')
+    ->asAliasOf('mime.qpcontentencoder')
+
     ->register('mime.safeqpcontentencoder')
     ->asNewInstanceOf('Swift_Mime_ContentEncoder_QpContentEncoder')
-    ->withDependencies(array('mime.charstream', 'mime.bytecanonicalizer'))
+    ->withDependencies(['mime.charstream', 'mime.bytecanonicalizer'])
 
     ->register('mime.rawcontentencoder')
     ->asNewInstanceOf('Swift_Mime_ContentEncoder_RawContentEncoder')
 
     ->register('mime.nativeqpcontentencoder')
-    ->withDependencies(array('properties.charset'))
+    ->withDependencies(['properties.charset'])
     ->asNewInstanceOf('Swift_Mime_ContentEncoder_NativeQpContentEncoder')
 
     ->register('mime.qpcontentencoder')
     ->asNewInstanceOf('Swift_Mime_ContentEncoder_QpContentEncoderProxy')
-    ->withDependencies(array('mime.safeqpcontentencoder', 'mime.nativeqpcontentencoder', 'properties.charset'))
+    ->withDependencies(['mime.safeqpcontentencoder', 'mime.nativeqpcontentencoder', 'properties.charset'])
 
     ->register('mime.7bitcontentencoder')
     ->asNewInstanceOf('Swift_Mime_ContentEncoder_PlainContentEncoder')
@@ -124,7 +128,7 @@ Swift_DependencyContainer::getInstance()
 
     ->register('mime.rfc2231encoder')
     ->asNewInstanceOf('Swift_Encoder_Rfc2231Encoder')
-    ->withDependencies(array('mime.charstream'))
+    ->withDependencies(['mime.charstream'])
 ;
 
 unset($swift_mime_types);
diff --git a/htdocs/includes/swiftmailer/lib/dependency_maps/transport_deps.php b/htdocs/includes/swiftmailer/lib/dependency_maps/transport_deps.php
index 15772abb255..34a63c78e51 100644
--- a/htdocs/includes/swiftmailer/lib/dependency_maps/transport_deps.php
+++ b/htdocs/includes/swiftmailer/lib/dependency_maps/transport_deps.php
@@ -5,24 +5,25 @@ Swift_DependencyContainer::getInstance()
     // As SERVER_NAME can come from the user in certain configurations, check that
     // it does not contain forbidden characters (see RFC 952 and RFC 2181). Use
     // preg_replace() instead of preg_match() to prevent DoS attacks with long host names.
-    ->asValue(!empty($_SERVER['SERVER_NAME']) && preg_replace('/(?:^\[)?[a-zA-Z0-9-:\]_]+\.?/', '', $_SERVER['SERVER_NAME']) === '' ? trim($_SERVER['SERVER_NAME'], '[]') : '127.0.0.1')
+    ->asValue(!empty($_SERVER['SERVER_NAME']) && '' === preg_replace('/(?:^\[)?[a-zA-Z0-9-:\]_]+\.?/', '', $_SERVER['SERVER_NAME']) ? trim($_SERVER['SERVER_NAME'], '[]') : '127.0.0.1')
 
     ->register('transport.smtp')
     ->asNewInstanceOf('Swift_Transport_EsmtpTransport')
-    ->withDependencies(array(
+    ->withDependencies([
         'transport.buffer',
-        array('transport.authhandler'),
+        'transport.smtphandlers',
         'transport.eventdispatcher',
         'transport.localdomain',
-    ))
+        'address.idnaddressencoder',
+    ])
 
     ->register('transport.sendmail')
     ->asNewInstanceOf('Swift_Transport_SendmailTransport')
-    ->withDependencies(array(
+    ->withDependencies([
         'transport.buffer',
         'transport.eventdispatcher',
         'transport.localdomain',
-    ))
+    ])
 
     ->register('transport.loadbalanced')
     ->asNewInstanceOf('Swift_Transport_LoadBalancedTransport')
@@ -32,27 +33,40 @@ Swift_DependencyContainer::getInstance()
 
     ->register('transport.spool')
     ->asNewInstanceOf('Swift_Transport_SpoolTransport')
-    ->withDependencies(array('transport.eventdispatcher'))
+    ->withDependencies(['transport.eventdispatcher'])
 
     ->register('transport.null')
     ->asNewInstanceOf('Swift_Transport_NullTransport')
-    ->withDependencies(array('transport.eventdispatcher'))
+    ->withDependencies(['transport.eventdispatcher'])
 
     ->register('transport.buffer')
     ->asNewInstanceOf('Swift_Transport_StreamBuffer')
-    ->withDependencies(array('transport.replacementfactory'))
+    ->withDependencies(['transport.replacementfactory'])
+
+    ->register('transport.smtphandlers')
+    ->asArray()
+    ->withDependencies(['transport.authhandler'])
 
     ->register('transport.authhandler')
     ->asNewInstanceOf('Swift_Transport_Esmtp_AuthHandler')
-    ->withDependencies(array(
-        array(
-            'transport.crammd5auth',
-            'transport.loginauth',
-            'transport.plainauth',
-            'transport.ntlmauth',
-            'transport.xoauth2auth',
-        ),
-    ))
+    ->withDependencies(['transport.authhandlers'])
+
+    ->register('transport.authhandlers')
+    ->asArray()
+    ->withDependencies([
+        'transport.crammd5auth',
+        'transport.loginauth',
+        'transport.plainauth',
+        'transport.ntlmauth',
+        'transport.xoauth2auth',
+    ])
+
+    ->register('transport.smtputf8handler')
+    ->asNewInstanceOf('Swift_Transport_Esmtp_SmtpUtf8Handler')
+
+    ->register('transport.8bitmimehandler')
+    ->asNewInstanceOf('Swift_Transport_Esmtp_EightBitMimeHandler')
+    ->addConstructorValue('8BITMIME')
 
     ->register('transport.crammd5auth')
     ->asNewInstanceOf('Swift_Transport_Esmtp_Auth_CramMd5Authenticator')
@@ -74,4 +88,10 @@ Swift_DependencyContainer::getInstance()
 
     ->register('transport.replacementfactory')
     ->asSharedInstanceOf('Swift_StreamFilters_StringReplacementFilterFactory')
+
+    ->register('address.idnaddressencoder')
+    ->asNewInstanceOf('Swift_AddressEncoder_IdnAddressEncoder')
+
+    ->register('address.utf8addressencoder')
+    ->asNewInstanceOf('Swift_AddressEncoder_Utf8AddressEncoder')
 ;
diff --git a/htdocs/includes/swiftmailer/lib/mime_types.php b/htdocs/includes/swiftmailer/lib/mime_types.php
index b42c1cc1a3e..72c6fd2afa6 100644
--- a/htdocs/includes/swiftmailer/lib/mime_types.php
+++ b/htdocs/includes/swiftmailer/lib/mime_types.php
@@ -17,7 +17,7 @@
 
 // You may add or take away what you like (lowercase required)
 
-$swift_mime_types = array(
+$swift_mime_types = [
     '3dml' => 'text/vnd.in3d.3dml',
     '3ds' => 'image/x-3ds',
     '3g2' => 'video/3gpp2',
@@ -1004,4 +1004,4 @@ $swift_mime_types = array(
     'zirz' => 'application/vnd.zul',
     'zmm' => 'application/vnd.handheld-entertainment+xml',
     '123' => 'application/vnd.lotus-1-2-3',
-);
+];
diff --git a/htdocs/includes/swiftmailer/lib/swiftmailer_generate_mimes_config.php b/htdocs/includes/swiftmailer/lib/swiftmailer_generate_mimes_config.php
index 85f2d69f21c..ad8fd2aa0d5 100644
--- a/htdocs/includes/swiftmailer/lib/swiftmailer_generate_mimes_config.php
+++ b/htdocs/includes/swiftmailer/lib/swiftmailer_generate_mimes_config.php
@@ -1,8 +1,8 @@
 #!/usr/bin/php
 
 <?php
-define('APACHE_MIME_TYPES_URL', 'https://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types');
-define('FREEDESKTOP_XML_URL', 'https://raw.github.com/minad/mimemagic/master/script/freedesktop.org.xml');
+\define('APACHE_MIME_TYPES_URL', 'https://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types');
+\define('FREEDESKTOP_XML_URL', 'https://raw.github.com/minad/mimemagic/master/script/freedesktop.org.xml');
 
 function generateUpToDateMimeArray()
 {
@@ -25,12 +25,12 @@ function generateUpToDateMimeArray()
     $mime_xml = @file_get_contents(FREEDESKTOP_XML_URL);
 
     // prepare valid mime types
-    $valid_mime_types = array();
+    $valid_mime_types = [];
 
     // split mime type and extensions eg. "video/x-matroska        mkv mk3d mks"
-    if (preg_match_all('/^#?([a-z0-9\-\+\/\.]+)[\t]+(.*)$/miu', $mime_types, $matches) !== false) {
+    if (false !== preg_match_all('/^#?([a-z0-9\-\+\/\.]+)[\t]+(.*)$/miu', $mime_types, $matches)) {
         // collection of predefined mimetypes (bugfix for wrong resolved or missing mime types)
-        $valid_mime_types_preset = array(
+        $valid_mime_types_preset = [
             'php' => 'application/x-php',
             'php3' => 'application/x-php',
             'php4' => 'application/x-php',
@@ -95,7 +95,7 @@ function generateUpToDateMimeArray()
             'xls' => 'application/vnd.ms-excel',
             'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
             'xml' => 'application/xml',
-        );
+        ];
 
         // wrap array for generating file
         foreach ($valid_mime_types_preset as $extension => $mime_type) {
@@ -103,17 +103,14 @@ function generateUpToDateMimeArray()
             $valid_mime_types[$extension] = "'{$extension}' => '{$mime_type}'";
         }
 
-        // collect extensions
-        $valid_extensions = array();
-
         // all extensions from second match
         foreach ($matches[2] as $i => $extensions) {
             // explode multiple extensions from string
-            $extensions = explode(' ', strtolower($extensions));
+            $extensions = explode(' ', strtolower($extensions ?? ''));
 
             // force array for foreach
-            if (!is_array($extensions)) {
-                $extensions = array($extensions);
+            if (!\is_array($extensions)) {
+                $extensions = [$extensions];
             }
 
             foreach ($extensions as $extension) {
@@ -121,10 +118,7 @@ function generateUpToDateMimeArray()
                 $mime_type = $matches[1][$i];
 
                 // check if string length lower than 10
-                if (strlen($extension) < 10) {
-                    // add extension
-                    $valid_extensions[] = $extension;
-
+                if (\strlen($extension) < 10) {
                     if (!isset($valid_mime_types[$mime_type])) {
                         // generate array for mimetype to extension resolver (only first match)
                         $valid_mime_types[$extension] = "'{$extension}' => '{$mime_type}'";
@@ -145,29 +139,24 @@ function generateUpToDateMimeArray()
         // get all matching extensions from match
         foreach ((array) $node->glob['pattern'] as $extension) {
             // skip none glob extensions
-            if (strpos($extension, '.') === false) {
+            if (false === strpos($extension ?? '', '.')) {
                 continue;
             }
 
             // remove get only last part
-            $extension = explode('.', strtolower($extension));
+            $extension = explode('.', strtolower($extension ?? ''));
             $extension = end($extension);
-
-            // maximum length in database column
-            if (strlen($extension) <= 9) {
-                $valid_extensions[] = $extension;
-            }
         }
 
         if (isset($node->glob['pattern'][0])) {
             // mime type
-            $mime_type = strtolower((string) $node['type']);
+            $mime_type = strtolower((string) $node['type'] ?? '');
 
             // get first extension
-            $extension = strtolower(trim($node->glob['ddpattern'][0], '*.'));
+            $extension = strtolower(trim($node->glob['ddpattern'][0] ?? '', '*.'));
 
             // skip none glob extensions and check if string length between 1 and 10
-            if (strpos($extension, '.') !== false || strlen($extension) < 1 || strlen($extension) > 9) {
+            if (false !== strpos($extension, '.') || \strlen($extension) < 1 || \strlen($extension) > 9) {
                 continue;
             }
 
@@ -184,7 +173,7 @@ function generateUpToDateMimeArray()
     ksort($valid_mime_types);
 
     // combine mime types and extensions array
-    $output = "$preamble\$swift_mime_types = array(\n    ".implode($valid_mime_types, ",\n    ")."\n);";
+    $output = "$preamble\$swift_mime_types = array(\n    ".implode(",\n    ", $valid_mime_types)."\n);";
 
     // write mime_types.php config file
     @file_put_contents('./mime_types.php', $output);

From c9ae805e7a76d420e64e2c3ea1c110ea00968ada Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A9lina?= <melina@melina.altairis.net>
Date: Mon, 13 Dec 2021 10:43:02 +0100
Subject: [PATCH 016/316] Change constant

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

diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index 1b9799efec4..5797f52053d 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -1190,7 +1190,7 @@ if (!empty($conf->global->TAKEPOS_WEIGHING_SCALE)) {
 
 		<!--  Show categories -->
 		<?php
-			if ($conf->global->TAKEPOS_NO_CATEGORY == 1) {
+			if ($conf->global->TAKEPOS_HIDE_CATEGORY == 1) {
 				print '<div class="div4" style= "display: none;">';
 			} else {
 				print '<div class="div4">';
@@ -1232,13 +1232,13 @@ if (!empty($conf->global->TAKEPOS_WEIGHING_SCALE)) {
 		</div>
 
 		<!--  Show product -->
-		<div class="div5"<?php if ($conf->global->TAKEPOS_NO_CATEGORY == 1) {
+		<div class="div5"<?php if ($conf->global->TAKEPOS_HIDE_CATEGORY == 1) {
 			print ' style="width:100%;"';
 		} ?>>
 	<?php
 	$count = 0;
 	while ($count < $MAXPRODUCT) {
-		if ($conf->global->TAKEPOS_NO_CATEGORY == 1) {
+		if ($conf->global->TAKEPOS_HIDE_CATEGORY == 1) {
 			print '<div class="wrapper2" id="prodiv'.$count.'"  ';
 		} else {
 			print '<div class="wrapper2" id="prodiv'.$count.'" ';

From 0c7cf34125e7342f022d076f50901e5983d935e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A9lina?= <melina@melina.altairis.net>
Date: Mon, 13 Dec 2021 17:02:16 +0100
Subject: [PATCH 017/316] Change the name of the constant

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

diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index d55d8901be5..77128f485bf 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -1190,7 +1190,7 @@ if (!empty($conf->global->TAKEPOS_WEIGHING_SCALE)) {
 
 		<!--  Show categories -->
 		<?php
-		if ($conf->global->TAKEPOS_HIDE_CATEGORY == 1) {
+		if ($conf->global->TAKEPOS_HIDE_CATEGORIES == 1) {
 			print '<div class="div4" style= "display: none;">';
 		} else {
 			print '<div class="div4">';
@@ -1232,13 +1232,13 @@ if (!empty($conf->global->TAKEPOS_WEIGHING_SCALE)) {
 		</div>
 
 		<!--  Show product -->
-		<div class="div5"<?php if ($conf->global->TAKEPOS_HIDE_CATEGORY == 1) {
+		<div class="div5"<?php if ($conf->global->TAKEPOS_HIDE_CATEGORIES == 1) {
 			print ' style="width:100%;"';
 						 } ?>>
 	<?php
 	$count = 0;
 	while ($count < $MAXPRODUCT) {
-		if ($conf->global->TAKEPOS_HIDE_CATEGORY == 1) {
+		if ($conf->global->TAKEPOS_HIDE_CATEGORIES == 1) {
 			print '<div class="wrapper2" id="prodiv'.$count.'"  ';
 		} else {
 			print '<div class="wrapper2" id="prodiv'.$count.'" ';

From 9bc2a561bcf79ba2e247206f5c6411a403742d12 Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Tue, 14 Dec 2021 10:52:16 +0100
Subject: [PATCH 018/316] ok

---
 htdocs/admin/ihm.php                 |  8 ++++
 htdocs/core/lib/usergroups.lib.php   | 65 ++++++++++++++++++++++++----
 htdocs/langs/en_US/admin.lang        |  1 +
 htdocs/theme/eldy/btn.inc.php        |  7 ---
 htdocs/theme/eldy/global.inc.php     |  4 +-
 htdocs/theme/eldy/style.css.php      |  6 ++-
 htdocs/theme/eldy/theme_vars.inc.php |  2 +
 htdocs/theme/md/btn.inc.php          |  5 ---
 htdocs/theme/md/style.css.php        |  9 +++-
 htdocs/theme/md/theme_vars.inc.php   |  2 +
 10 files changed, 83 insertions(+), 26 deletions(-)

diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 697f8fa2130..ea675ed9001 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2016		Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2018       Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 2021       Alexandre Spangaro      <aspangaro@open-dsi.fr>
+ * Copyright (C) 2021       Anthony Berton          <bertonanthony@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -199,6 +200,13 @@ if ($action == 'update') {
 		} else {
 			dolibarr_set_const($db, "THEME_ELDY_USE_CHECKED", $val, 'chaine', 0, '', $conf->entity);
 		}
+
+		$val=(implode(',', (colorStringToArray(GETPOST('THEME_ELDY_BTNACTION'), array()))));
+		if ($val == '') {
+			dolibarr_del_const($db, 'THEME_ELDY_BTNACTION', $conf->entity);
+		} else {
+			dolibarr_set_const($db, 'THEME_ELDY_BTNACTION', $val, 'chaine', 0, '', $conf->entity);
+		}
 	}
 
 	if ($mode == 'dashboard') {
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index accbd84ba8c..9ee6afa182e 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2010-2017	Regis Houssin		<regis.houssin@inodbox.com>
  * Copyright (C) 2015	    Alexandre Spangaro	<aspangaro@open-dsi.fr>
  * Copyright (C) 2018       Ferran Marcet       <fmarcet@2byte.es>
+ * Copyright (C) 2021       Anthony Berton          <bertonanthony@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -859,15 +860,15 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	// Use Checked
 	if ($foruserprofile) {
 		/* Must first change option to choose color of highlight instead of yes or no.
-		 print '<tr class="oddeven">';
-		 print '<td>'.$langs->trans("HighlightLinesOnMouseHover").'</td>';
-		 print '<td><input name="check_THEME_ELDY_USE_HOVER" disabled="disabled" type="checkbox" '.($conf->global->THEME_ELDY_USE_HOVER?" checked":"").'></td>';
-		 print '<td class="nowrap left" width="20%"><input name="check_MAIN_THEME"'.($edit?'':' disabled').' type="checkbox" '.($selected_theme?" checked":"").'> '.$langs->trans("UsePersonalValue").'</td>';
-		 print '<td><input name="check_THEME_ELDY_USE_HOVER"'.($edit?'':' disabled="disabled"').' type="checkbox" '.($hoverdisabled?"":" checked").'>';
-		 print ' &nbsp; ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
-		 print '</td>';
-		 print '</tr>';
-		 */
+		print '<tr class="oddeven">';
+		print '<td>'.$langs->trans("HighlightLinesOnMouseHover").'</td>';
+		print '<td><input name="check_THEME_ELDY_USE_HOVER" disabled="disabled" type="checkbox" '.($conf->global->THEME_ELDY_USE_HOVER?" checked":"").'></td>';
+		print '<td class="nowrap left" width="20%"><input name="check_MAIN_THEME"'.($edit?'':' disabled').' type="checkbox" '.($selected_theme?" checked":"").'> '.$langs->trans("UsePersonalValue").'</td>';
+		print '<td><input name="check_THEME_ELDY_USE_HOVER"'.($edit?'':' disabled="disabled"').' type="checkbox" '.($hoverdisabled?"":" checked").'>';
+		print ' &nbsp; ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
+		print '</td>';
+		print '</tr>';
+		*/
 	} else {
 		$default = (empty($colorbacklinepairchecked) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbacklinepairchecked)));
 
@@ -905,6 +906,52 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '</tr>';
 	}
 
+	// Btn action
+	if ($foruserprofile) {
+		/*
+		 print '<tr class="oddeven">';
+		 print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
+		 print '<td>'.($conf->global->THEME_ELDY_TOPMENU_BACK1?$conf->global->THEME_ELDY_BTNACTION:$langs->trans("Default")).'</td>';
+		 print '<td class="nowrap left" width="20%"><input name="check_THEME_ELDY_BTNACTION" id="check_THEME_ELDY_BTNACTION" type="checkbox" '.(! empty($object->conf->THEME_ELDY_BTNACTION)?" checked":"");
+		 print (empty($dolibarr_main_demo) && $edit)?'':' disabled="disabled"';	// Disabled for demo
+		 print '> '.$langs->trans("UsePersonalValue").'</td>';
+		 print '<td>';
+		 if ($edit)
+		 {
+		 print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BTNACTION,array()),''),'THEME_ELDY_BTNACTION','',1).' ';
+		 }
+		 else
+		 {
+		 $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BTNACTION,array()),'');
+		 if ($color) print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+		 else print '';
+		 }
+			if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
+			print '</td>';*/
+	} else {
+		$default = (empty($butactionbg) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($butactionbg)));
+
+		print '<tr class="oddeven">';
+		print '<td>'.$langs->trans("BtnActionColor").'</td>';
+		print '<td colspan="'.($colspan - 1).'">';
+		if ($edit) {
+			print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_BTNACTION) ? $conf->global->THEME_ELDY_BTNACTION : ''), array()), ''), 'THEME_ELDY_BTNACTION', '', 1, '', '', 'colorbtnaction').' ';
+		} else {
+			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BTNACTION, array()), '');
+			if ($color) {
+				print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+			} else {
+				//print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$defaultcolor.'" value="'.$langs->trans("Default").'">';
+				//print '<span style="color: #000078">'.$langs->trans("Default").'</span>';
+				print $langs->trans("Default");
+			}
+		}
+		print ' &nbsp; <span class="nowraponall opacitymedium">'.$langs->trans("Default").'</span>: <strong><span style="color: #'.$default.'">'.$default.'</span></strong> ';
+		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
+		print '</td>';
+		print '</tr>';
+	}
+
 	// Use MAIN_OPTIMIZEFORTEXTBROWSER
 	if ($foruserprofile && !empty($fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 		//$default=yn($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER);
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 0d626c3b323..70f454aded4 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1920,6 +1920,7 @@ ConfFileMustContainCustom=Installing or building an external module from applica
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (use 'ffffff' for no highlight)
 HighlightLinesChecked=Highlight color of the line when it is checked (use 'ffffff' for no highlight)
+BtnActionColor=Color of the action button
 TextTitleColor=Text color of Page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
diff --git a/htdocs/theme/eldy/btn.inc.php b/htdocs/theme/eldy/btn.inc.php
index af8f26b9a24..9c570a79a5f 100644
--- a/htdocs/theme/eldy/btn.inc.php
+++ b/htdocs/theme/eldy/btn.inc.php
@@ -9,13 +9,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
 			--btncolorbg: #fbfbfb;
 			--btncolorborderhover: none;
 			--btncolorborder: #FFF;
-			/* --butactionbg:rgba(150, 110, 162, 0.95); */
-			--butactionbg:rgb(118, 145, 225);
-			--butactionbg:rgba(150, 110, 162, 0.95);
 			--butactiondeletebg: rgb(234,228,225);
-			/* tertiary color */
-			/* --butactionbg:rgb(218, 235, 225); */
-			/* --butactionbg:rgb(228, 218, 235); */
 }
 
 <?php
@@ -31,7 +25,6 @@ if (!empty($conf->global->THEME_DARKMODEENABLED)) {
             --btncolorbg: rgb(26,27,27);
             --btncolorborderhover: #ffffff;
             --btncolorborder: #2b2c2e;
-            --butactionbg: rgb(173,140,79);
             --butactiondeletebg: rgb(252,84,91);
 
       }\n";
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index da23e60498c..ec40936601a 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -211,7 +211,7 @@ input, select {
 	margin-top: 1px;
 }
 #mainbody input.button:not(.buttongen):not(.bordertransp), #mainbody a.button:not(.buttongen):not(.bordertransp) {
-	background: var(--butactionbg);
+	background: rgb(<?php echo $butactionbg ?>);
 	color: #FFF !important;
 	border-radius: 3px;
 	border-collapse: collapse;
@@ -358,7 +358,7 @@ a.butStatus {
 	padding-right: 5px;
 	background-color: transparent;
 	color: var(--colortext) !important;
-	border: 2px solid var( --butactionbg) !important;
+	border: 2px solid rgb(<?php echo $butactionbg ?>) !important;
 	margin: 0 0.45em !important;
 }
 
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index de089ecba54..edeab565f9d 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2011		Philippe Grand			<philippe.grand@atoo-net.com>
  * Copyright (C) 2012		Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2018       Ferran Marcet           <fmarcet@2byte.es>
+ * Copyright (C) 2021       Anthony Berton          <bertonanthony@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -150,7 +151,9 @@ if (!isset($conf->global->THEME_ELDY_TEXTTITLENOTAB)) {
 if (!isset($conf->global->THEME_ELDY_TEXTLINK)) {
 	$conf->global->THEME_ELDY_TEXTLINK = $colortextlink;
 }
-
+if (!isset($conf->global->THEME_ELDY_BTNACTION)) {
+	$conf->global->THEME_ELDY_BTNACTION = $butactionbg;
+}
 // Case of option editable only if option THEME_ELDY_ENABLE_PERSONALIZED is on
 if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED)) {
 	$conf->global->THEME_ELDY_BACKTABCARD1 = '255,255,255'; // card
@@ -178,6 +181,7 @@ $colortexttitle      = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (emp
 $colortexttitlelink  = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTTITLELINK) ? $colortexttitlelink : $conf->global->THEME_ELDY_TEXTTITLELINK) : (empty($user->conf->THEME_ELDY_TEXTTITLELINK) ? $colortexttitlelink : $user->conf->THEME_ELDY_TEXTTITLELINK);
 $colortext           = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXT) ? $colortext : $conf->global->THEME_ELDY_TEXT) : (empty($user->conf->THEME_ELDY_TEXT) ? $colortext : $user->conf->THEME_ELDY_TEXT);
 $colortextlink       = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTLINK) ? $colortextlink : $conf->global->THEME_ELDY_TEXTLINK) : (empty($user->conf->THEME_ELDY_TEXTLINK) ? $colortextlink : $user->conf->THEME_ELDY_TEXTLINK);
+$butactionbg       = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_BTNACTION) ? $butactionbg : $conf->global->THEME_ELDY_BTNACTION) : (empty($user->conf->THEME_ELDY_BTNACTION) ? $butactionbg : $user->conf->THEME_ELDY_BTNACTION);
 $fontsize            = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_FONT_SIZE1) ? $fontsize : $conf->global->THEME_ELDY_FONT_SIZE1) : (empty($user->conf->THEME_ELDY_FONT_SIZE1) ? $fontsize : $user->conf->THEME_ELDY_FONT_SIZE1);
 $fontsizesmaller     = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_FONT_SIZE2) ? $fontsize : $conf->global->THEME_ELDY_FONT_SIZE2) : (empty($user->conf->THEME_ELDY_FONT_SIZE2) ? $fontsize : $user->conf->THEME_ELDY_FONT_SIZE2);
 
diff --git a/htdocs/theme/eldy/theme_vars.inc.php b/htdocs/theme/eldy/theme_vars.inc.php
index 00d5456cab5..41d162e6cbc 100644
--- a/htdocs/theme/eldy/theme_vars.inc.php
+++ b/htdocs/theme/eldy/theme_vars.inc.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2011		Philippe Grand			<philippe.grand@atoo-net.com>
  * Copyright (C) 2012		Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2018       Ferran Marcet           <fmarcet@2byte.es>
+ * Copyright (C) 2021       Anthony Berton          <bertonanthony@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -73,6 +74,7 @@ $fontsizesmaller = '0.75em';
 $topMenuFontSize = '1.1em';
 $toolTipBgColor = 'rgba(255, 255, 255, 0.96)';
 $toolTipFontColor = '#333';
+$butactionbg = '150, 110, 162, 0.95';
 
 // text color
 $textSuccess   = '#28a745';
diff --git a/htdocs/theme/md/btn.inc.php b/htdocs/theme/md/btn.inc.php
index 0269bba74f2..5ef2dbe9e8d 100644
--- a/htdocs/theme/md/btn.inc.php
+++ b/htdocs/theme/md/btn.inc.php
@@ -10,10 +10,6 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
 			--btncolorborderhover: none;
 			--btncolorborder: #FFF;
 			--butactiondeletebg: rgb(234,228,225);
-			/* tertiary color */
-			/* --butactionbg:rgb(218, 235, 225); */
-			/* --butactionbg:rgb(228, 218, 235); */
-			--butactionbg:rgb(118, 145, 225);
 }
 
 <?php
@@ -29,7 +25,6 @@ if (!empty($conf->global->THEME_DARKMODEENABLED)) {
             --btncolorbg: rgb(26,27,27);
             --btncolorborderhover: #ffffff;
             --btncolorborder: #2b2c2e;
-            --butactionbg:rgb(173,140,79);
             --butactiondeletebg: rgb(252,84,91);
 
       }\n";
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 8873149a9be..9c3b2bb0202 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2012		Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2015		Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2018       Ferran Marcet           <fmarcet@2byte.es>
+ * Copyright (C) 2021       Anthony Berton          <bertonanthony@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -148,6 +149,9 @@ if (!isset($conf->global->THEME_ELDY_TEXTTITLENOTAB)) {
 if (!isset($conf->global->THEME_ELDY_TEXTLINK)) {
 	$conf->global->THEME_ELDY_TEXTLINK = $colortextlink;
 }
+if (!isset($conf->global->THEME_ELDY_BTNACTION)) {
+	$conf->global->THEME_ELDY_BTNACTION = $butactionbg;
+}
 
 // Case of option editable only if option THEME_ELDY_ENABLE_PERSONALIZED is on
 if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED)) {
@@ -177,6 +181,7 @@ $colortexttitle      = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (emp
 $colortexttitlelink  = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTTITLELINK) ? $colortexttitlelink : $conf->global->THEME_ELDY_TEXTTITLELINK) : (empty($user->conf->THEME_ELDY_TEXTTITLELINK) ? $colortexttitlelink : $user->conf->THEME_ELDY_TEXTTITLELINK);
 $colortext           = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXT) ? $colortext : $conf->global->THEME_ELDY_TEXT) : (empty($user->conf->THEME_ELDY_TEXT) ? $colortext : $user->conf->THEME_ELDY_TEXT);
 $colortextlink       = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTLINK) ? $colortext : $conf->global->THEME_ELDY_TEXTLINK) : (empty($user->conf->THEME_ELDY_TEXTLINK) ? $colortextlink : $user->conf->THEME_ELDY_TEXTLINK);
+$butactionbg       	 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_BTNACTION) ? $butactionbg : $conf->global->THEME_ELDY_BTNACTION) : (empty($user->conf->THEME_ELDY_BTNACTION) ? $butactionbg : $user->conf->THEME_ELDY_BTNACTION);
 $fontsize            = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_FONT_SIZE1) ? $fontsize : $conf->global->THEME_ELDY_FONT_SIZE1) : (empty($user->conf->THEME_ELDY_FONT_SIZE1) ? $fontsize : $user->conf->THEME_ELDY_FONT_SIZE1);
 $fontsizesmaller     = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_FONT_SIZE2) ? $fontsize : $conf->global->THEME_ELDY_FONT_SIZE2) : (empty($user->conf->THEME_ELDY_FONT_SIZE2) ? $fontsize : $user->conf->THEME_ELDY_FONT_SIZE2);
 
@@ -439,7 +444,7 @@ input, select {
 	margin-top:1px;
 }
 #mainbody input.button:not(.buttongen):not(.bordertransp), #mainbody a.button:not(.buttongen):not(.bordertransp) {
-	background: var(--butactionbg);
+	background: rgb(<?php echo $butactionbg ?>);
 	color: #FFF !important;
 	border-radius: 3px;
 	border-collapse: collapse;
@@ -564,7 +569,7 @@ a.butStatus {
 	padding-right: 5px;
 	background-color: transparent;
 	color: var(--colortext) !important;
-	border: 2px solid var( --butactionbg);
+	border: 2px solid rgb(<?php echo $butactionbg ?>);
 	margin: 0 0.45em !important;
 }
 
diff --git a/htdocs/theme/md/theme_vars.inc.php b/htdocs/theme/md/theme_vars.inc.php
index 216a5043111..d8441964f65 100644
--- a/htdocs/theme/md/theme_vars.inc.php
+++ b/htdocs/theme/md/theme_vars.inc.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2021       Anthony Berton          <bertonanthony@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -68,6 +69,7 @@ $fontsizesmaller = '11';
 $topMenuFontSize = '1.1em';
 $toolTipBgColor = 'rgba(255, 255, 255, 0.96)';
 $toolTipFontColor = '#333';
+$butactionbg = '150, 110, 162, 0.95';
 
 // text color
 $textSuccess   = '#28a745';

From 9a6f78fc15791235c36763e0426b67e7f02c0045 Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Tue, 14 Dec 2021 11:45:31 +0100
Subject: [PATCH 019/316] erreur btn action

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

diff --git a/htdocs/theme/eldy/btn.inc.php b/htdocs/theme/eldy/btn.inc.php
index 9c570a79a5f..cf2f1ead60e 100644
--- a/htdocs/theme/eldy/btn.inc.php
+++ b/htdocs/theme/eldy/btn.inc.php
@@ -64,7 +64,7 @@ span.butAction, span.butActionDelete {
 	font-size: 0.9em;
 }
 .butAction {
-	background: var(--butactionbg);
+	background: rgb(<?php echo $butactionbg ?>);
 	color: #FFF !important;
 	/* background: rgb(230, 232, 239); */
 }

From c3ac93b9175fee880cc92afececb929b2529b4dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A9lina?= <melina@melina.altairis.net>
Date: Tue, 14 Dec 2021 16:03:12 +0100
Subject: [PATCH 020/316] Add Hooks for takepos ajax search

---
 htdocs/takepos/ajax/ajax.php | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/htdocs/takepos/ajax/ajax.php b/htdocs/takepos/ajax/ajax.php
index 6cfbf4b3c1a..58c1906cd42 100644
--- a/htdocs/takepos/ajax/ajax.php
+++ b/htdocs/takepos/ajax/ajax.php
@@ -53,6 +53,8 @@ if (empty($user->rights->takepos->run)) {
 	accessforbidden();
 }
 
+// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array of hooks
+$hookmanager->initHooks(array('takeposproductsearch'));
 
 /*
  * View
@@ -109,13 +111,30 @@ if ($action == 'getProducts') {
 		}
 	}
 
-	$sql = 'SELECT rowid, ref, label, tosell, tobuy, barcode, price FROM '.MAIN_DB_PREFIX.'product as p';
+	$sql = 'SELECT rowid, ref, label, tosell, tobuy, barcode, price' ;
+	// Add fields from hooks
+	$parameters=array();
+	$reshook=$hookmanager->executeHooks('printFieldListSelect', $parameters);    // Note that $action and $object may have been modified by hook
+	$sql .= $hookmanager->resPrint;
+
+	$sql .= ' FROM '.MAIN_DB_PREFIX.'product as p';
+
+	// Add tables from hooks
+	$parameters=array();
+	$reshook=$hookmanager->executeHooks('printFieldListTables', $parameters);    // Note that $action and $object may have been modified by hook
+	$sql .= $hookmanager->resPrint;
+
 	$sql .= ' WHERE entity IN ('.getEntity('product').')';
 	if ($filteroncategids) {
 		$sql .= ' AND EXISTS (SELECT cp.fk_product FROM '.MAIN_DB_PREFIX.'categorie_product as cp WHERE cp.fk_product = p.rowid AND cp.fk_categorie IN ('.$db->sanitize($filteroncategids).'))';
 	}
 	$sql .= ' AND tosell = 1';
 	$sql .= natural_search(array('ref', 'label', 'barcode'), $term);
+	// Add where from hooks
+	$parameters=array();
+	$reshook=$hookmanager->executeHooks('printFieldListWhere', $parameters);    // Note that $action and $object may have been modified by hook
+	$sql .= $hookmanager->resPrint;
+
 	$resql = $db->query($sql);
 	if ($resql) {
 		$rows = array();

From 6024e779766a71665149b6e179833047ca724d95 Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Thu, 16 Dec 2021 19:43:42 +0100
Subject: [PATCH 021/316] --butactionbg

---
 htdocs/theme/eldy/global.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index ec40936601a..da23e60498c 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -211,7 +211,7 @@ input, select {
 	margin-top: 1px;
 }
 #mainbody input.button:not(.buttongen):not(.bordertransp), #mainbody a.button:not(.buttongen):not(.bordertransp) {
-	background: rgb(<?php echo $butactionbg ?>);
+	background: var(--butactionbg);
 	color: #FFF !important;
 	border-radius: 3px;
 	border-collapse: collapse;
@@ -358,7 +358,7 @@ a.butStatus {
 	padding-right: 5px;
 	background-color: transparent;
 	color: var(--colortext) !important;
-	border: 2px solid rgb(<?php echo $butactionbg ?>) !important;
+	border: 2px solid var( --butactionbg) !important;
 	margin: 0 0.45em !important;
 }
 

From d6ae2ae339c0f938fc0165cba93bc0a495d02a15 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Fri, 17 Dec 2021 12:07:04 +0100
Subject: [PATCH 022/316] add WordPress OAuth

---
 .../OAuth/OAuth2/Service/WordPress.php        | 97 +++++++++++++++++++
 1 file changed, 97 insertions(+)
 create mode 100755 htdocs/includes/OAuth/OAuth2/Service/WordPress.php

diff --git a/htdocs/includes/OAuth/OAuth2/Service/WordPress.php b/htdocs/includes/OAuth/OAuth2/Service/WordPress.php
new file mode 100755
index 00000000000..c59e90c605f
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth2/Service/WordPress.php
@@ -0,0 +1,97 @@
+<?php
+
+namespace OAuth\OAuth2\Service;
+
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Http\Client\ClientInterface;
+use OAuth\Common\Http\Uri\UriInterface;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\OAuth2\Token\StdOAuth2Token;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\OAuth2\Service\Exception\InvalidAccessTypeException;
+use OAuth\Common\Http\Uri\Uri;
+
+class WordPress extends AbstractService
+{
+    protected $accessType = 'online';
+
+    public function __construct(
+        CredentialsInterface $credentials,
+        ClientInterface $httpClient,
+        TokenStorageInterface $storage,
+        $scopes = array(),
+        UriInterface $baseApiUri = null
+    ) {
+        parent::__construct($credentials, $httpClient, $storage, $scopes, $baseApiUri, true);
+
+        if (null === $baseApiUri) {
+            $this->baseApiUri = new Uri('https://addresse_de_votre_site_wordpress');
+        }
+    }
+/*
+    // LDR CHANGE Add approval_prompt to force the prompt if value is set to 'force' so it force return of a "refresh token" in addition to "standard token"
+    public $approvalPrompt='auto';
+    public function setApprouvalPrompt($prompt)
+    {
+        if (!in_array($prompt, array('auto', 'force'), true)) {
+            // @todo Maybe could we rename this exception
+            throw new InvalidAccessTypeException('Invalid approuvalPrompt, expected either auto or force.');
+        }
+        $this->approvalPrompt = $prompt;
+    }*/
+    
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationEndpoint()
+    {
+        return new Uri(sprintf('%s/oauth/authorize', $this->baseApiUri));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAccessTokenEndpoint()
+    {
+        return new Uri(sprintf('%s/oauth/token', $this->baseApiUri));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getAuthorizationMethod()
+    {
+        global $conf;
+        return empty($conf->global->OAUTH_WORDPRESS_AUTHORIZATION_METHOD_QUERY_STRING) ? static::AUTHORIZATION_METHOD_HEADER_BEARER : static::AUTHORIZATION_METHOD_QUERY_STRING;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseAccessTokenResponse($responseBody)
+    {
+        $data = json_decode($responseBody, true);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response: "'.(isset($responseBody)?$responseBody:'NULL').'"');
+        } elseif (isset($data['error'])) {
+            throw new TokenResponseException('Error in retrieving token: "' . $data['error'] . '" : "'.$data['error_description'].'"');
+        }
+
+        $token = new StdOAuth2Token();
+        $token->setAccessToken($data['access_token']);
+        $token->setLifetime($data['expires_in']);
+
+        if (isset($data['refresh_token'])) {
+            $token->setRefreshToken($data['refresh_token']);
+            unset($data['refresh_token']);
+        }
+
+        unset($data['access_token']);
+        unset($data['expires_in']);
+
+        $token->setExtraParams($data);
+
+        return $token;
+    }
+}

From 5a2a6a07ea1ed9080851f16fbbdf38d91c243bc2 Mon Sep 17 00:00:00 2001
From: lvessiller <lvessiller@open-dsi.fr>
Date: Fri, 17 Dec 2021 12:38:13 +0100
Subject: [PATCH 023/316] NEW add entity filter in exports

---
 htdocs/core/modules/modCommande.class.php | 10 +++++++++-
 htdocs/core/modules/modFacture.class.php  | 10 +++++++++-
 htdocs/core/modules/modPropale.class.php  | 10 +++++++++-
 htdocs/core/modules/modSociete.class.php  | 23 ++++++++++++++++++++---
 4 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/modules/modCommande.class.php b/htdocs/core/modules/modCommande.class.php
index ffcfef61a6e..210389f3c90 100644
--- a/htdocs/core/modules/modCommande.class.php
+++ b/htdocs/core/modules/modCommande.class.php
@@ -210,6 +210,13 @@ class modCommande extends DolibarrModules
 			$this->export_fields_array[$r]['c.multicurrency_total_tva'] = 'MulticurrencyAmountVAT';
 			$this->export_fields_array[$r]['c.multicurrency_total_ttc'] = 'MulticurrencyAmountTTC';
 		}
+		// Add multicompany field
+		if (!empty($conf->global->MULTICOMPANY_ENTITY_IN_EXPORT_IF_SHARED)) {
+			$nbofallowedentities = count(explode(',', getEntity('commande')));
+			if (!empty($conf->multicompany->enabled) && $nbofallowedentities > 1) {
+				$this->export_fields_array[$r]['c.entity'] = 'Entity';
+			}
+		}
 		//$this->export_TypeFields_array[$r]=array(
 		//	's.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.label'=>'List:c_country:label:label',
 		//	'co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",
@@ -224,7 +231,8 @@ class modCommande extends DolibarrModules
 			'c.date_commande'=>"Date", 'c.date_livraison'=>"Date", 'c.amount_ht'=>"Numeric", 'c.remise_percent'=>"Numeric", 'c.total_ht'=>"Numeric",
 			'c.total_ttc'=>"Numeric", 'c.facture'=>"Boolean", 'c.fk_statut'=>'Status', 'c.note_public'=>"Text", 'c.date_livraison'=>'Date', 'pj.ref'=>'Text',
 			'cd.description'=>"Text", 'cd.product_type'=>'Boolean', 'cd.tva_tx'=>"Numeric", 'cd.qty'=>"Numeric", 'cd.total_ht'=>"Numeric", 'cd.total_tva'=>"Numeric",
-			'cd.total_ttc'=>"Numeric", 'p.rowid'=>'List:product:ref::product', 'p.ref'=>'Text', 'p.label'=>'Text', 'd.nom'=>'Text'
+			'cd.total_ttc'=>"Numeric", 'p.rowid'=>'List:product:ref::product', 'p.ref'=>'Text', 'p.label'=>'Text', 'd.nom'=>'Text',
+			'c.entity'=>'List:entity:label:rowid',
 		);
 		$this->export_entities_array[$r] = array(
 			's.rowid'=>"company", 's.nom'=>'company', 'ps.nom'=>'company', 's.address'=>'company', 's.zip'=>'company', 's.town'=>'company', 'd.nom'=>'company', 'co.label'=>'company',
diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php
index ef341c83e89..fac768b9c60 100644
--- a/htdocs/core/modules/modFacture.class.php
+++ b/htdocs/core/modules/modFacture.class.php
@@ -270,6 +270,13 @@ class modFacture extends DolibarrModules
 			$this->export_fields_array[$r]['f.module_source'] = 'Module';
 			$this->export_fields_array[$r]['f.pos_source'] = 'POSTerminal';
 		}
+		// Add multicompany field
+		if (!empty($conf->global->MULTICOMPANY_ENTITY_IN_EXPORT_IF_SHARED)) {
+			$nbofallowedentities = count(explode(',', getEntity('invoice')));
+			if (!empty($conf->multicompany->enabled) && $nbofallowedentities > 1) {
+				$this->export_fields_array[$r]['f.entity'] = 'Entity';
+			}
+		}
 		$this->export_TypeFields_array[$r] = array(
 			's.rowid'=>'Numeric', 's.nom'=>'Text', 'ps.nom'=>'Text', 's.code_client'=>'Text', 's.address'=>'Text', 's.zip'=>'Text', 's.town'=>'Text', 'c.code'=>'Text', 'cd.nom'=>'Text', 's.phone'=>'Text', 's.siren'=>'Text',
 			's.siret'=>'Text', 's.ape'=>'Text', 's.idprof4'=>'Text', 's.code_compta'=>'Text', 's.code_compta_fournisseur'=>'Text', 's.tva_intra'=>'Text',
@@ -280,7 +287,8 @@ class modFacture extends DolibarrModules
 			'pj.ref'=>'Text', 'pj.title'=>'Text', 'fd.rowid'=>'Numeric', 'fd.label'=>'Text', 'fd.description'=>"Text", 'fd.subprice'=>"Numeric", 'fd.tva_tx'=>"Numeric",
 			'fd.qty'=>"Numeric", 'fd.total_ht'=>"Numeric", 'fd.total_tva'=>"Numeric", 'fd.total_ttc'=>"Numeric", 'fd.date_start'=>"Date", 'fd.date_end'=>"Date",
 			'fd.special_code'=>'Numeric', 'fd.product_type'=>"Numeric", 'fd.fk_product'=>'List:product:label', 'p.ref'=>'Text', 'p.label'=>'Text',
-			$alias_product_perentity . '.accountancy_code_sell'=>'Text'
+			$alias_product_perentity . '.accountancy_code_sell'=>'Text',
+			'f.entity'=>'List:entity:label:rowid',
 		);
 		if (!empty($conf->cashdesk->enabled) || !empty($conf->takepos->enabled) || !empty($conf->global->INVOICE_SHOW_POS)) {
 			$this->export_TypeFields_array[$r]['f.module_source'] = 'Text';
diff --git a/htdocs/core/modules/modPropale.class.php b/htdocs/core/modules/modPropale.class.php
index 1374e70d6d4..1add612d0a8 100644
--- a/htdocs/core/modules/modPropale.class.php
+++ b/htdocs/core/modules/modPropale.class.php
@@ -204,6 +204,13 @@ class modPropale extends DolibarrModules
 			$this->export_fields_array[$r]['c.multicurrency_total_tva'] = 'MulticurrencyAmountVAT';
 			$this->export_fields_array[$r]['c.multicurrency_total_ttc'] = 'MulticurrencyAmountTTC';
 		}
+		// Add multicompany field
+		if (!empty($conf->global->MULTICOMPANY_ENTITY_IN_EXPORT_IF_SHARED)) {
+			$nbofallowedentities = count(explode(',', getEntity('propal')));
+			if (!empty($conf->multicompany->enabled) && $nbofallowedentities > 1) {
+				$this->export_fields_array[$r]['c.entity'] = 'Entity';
+			}
+		}
 		//$this->export_TypeFields_array[$r]=array(
 		//	's.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.code'=>'Text','s.phone'=>'Text',
 		//	's.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.datec'=>"Date",'c.datep'=>"Date",
@@ -216,7 +223,8 @@ class modPropale extends DolibarrModules
 			's.ape'=>'Text', 's.idprof4'=>'Text', 'c.ref'=>"Text", 'c.ref_client'=>"Text", 'c.datec'=>"Date", 'c.datep'=>"Date", 'c.fin_validite'=>"Date",
 			'c.remise_percent'=>"Numeric", 'c.total_ht'=>"Numeric", 'c.total_ttc'=>"Numeric", 'c.fk_statut'=>'Status', 'c.note_public'=>"Text", 'c.date_livraison'=>'Date',
 			'pj.ref'=>'Text', 'cd.description'=>"Text", 'cd.product_type'=>'Boolean', 'cd.tva_tx'=>"Numeric", 'cd.qty'=>"Numeric", 'cd.total_ht'=>"Numeric",
-			'cd.total_tva'=>"Numeric", 'cd.total_ttc'=>"Numeric", 'p.ref'=>'Text', 'p.label'=>'Text'
+			'cd.total_tva'=>"Numeric", 'cd.total_ttc'=>"Numeric", 'p.ref'=>'Text', 'p.label'=>'Text',
+			'c.entity'=>'List:entity:label:rowid',
 		);
 		$this->export_entities_array[$r] = array(
 			's.rowid'=>"company", 's.nom'=>'company', 'ps.nom'=>'company', 's.address'=>'company', 's.zip'=>'company', 's.town'=>'company', 'co.code'=>'company', 's.phone'=>'company',
diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index e70011a2195..67b9357d468 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -327,7 +327,7 @@ class modSociete extends DolibarrModules
 			'payterm.libelle'=>'Text', 'paymode.libelle'=>'Text',
 			's.outstanding_limit'=>'Numeric', 'pbacc.ref'=>'Text', 'incoterm.code'=>'Text',
 			'u.login'=>'Text', 'u.firstname'=>'Text', 'u.lastname'=>'Text',
-			's.entity'=>'Numeric', 's.price_level'=>'Numeric',
+			's.entity'=>'List:entity:label:rowid', 's.price_level'=>'Numeric',
 			's.accountancy_code_sell'=>'Text', 's.accountancy_code_buy'=>'Text'
 		);
 
@@ -376,6 +376,20 @@ class modSociete extends DolibarrModules
 			's.address'=>'Address', 's.zip'=>"Zip", 's.town'=>"Town", 's.phone'=>'Phone', 's.email'=>"Email",
 			't.libelle'=>"ThirdPartyType"
 		);
+		// Add multicompany field
+		if (! empty($conf->global->MULTICOMPANY_ENTITY_IN_EXPORT_IF_SHARED)) {
+			if (!empty($conf->multicompany->enabled)) {
+				$nbofallowedentities = count(explode(',', getEntity('socpeople')));
+			 	if ($nbofallowedentities > 1) {
+					$this->export_fields_array[$r]['c.entity'] = 'Entity';
+				}
+
+				$nbofallowedentities = count(explode(',', getEntity('societe')));
+				if ($nbofallowedentities > 1) {
+					$this->export_fields_array[$r]['s.entity'] = 'Entity';
+				}
+			}
+		}
 		$this->export_examplevalues_array[$r] = array('s.client'=>'0 (no customer no prospect)/1 (customer)/2 (prospect)/3 (customer and prospect)', 's.fournisseur'=>'0 (not a supplier) or 1 (supplier)');
 		$this->export_TypeFields_array[$r] = array(
 			'c.civility'=>"List:c_civility:label:code", 'c.lastname'=>'Text', 'c.firstname'=>'Text', 'c.poste'=>'Text', 'c.datec'=>"Date", 'c.priv'=>"Boolean",
@@ -386,14 +400,17 @@ class modSociete extends DolibarrModules
 			's.code_compta'=>"Text", 's.code_compta_fournisseur'=>"Text",
 			's.client'=>"Text", 's.fournisseur'=>"Text",
 			's.address'=>"Text", 's.zip'=>"Text", 's.town'=>"Text", 's.phone'=>"Text", 's.email'=>"Text",
-			't.libelle'=>"Text"
+			't.libelle'=>"Text",
+			'c.entity'=>'List:entity:label:rowid',
+			's.entity'=>'List:entity:label:rowid',
 		);
 		$this->export_entities_array[$r] = array(
 			's.rowid'=>"company", 's.nom'=>"company", 's.status'=>'company', 's.code_client'=>"company", 's.code_fournisseur'=>"company",
 			's.code_compta'=>"company", 's.code_compta_fournisseur'=>"company",
 			's.client'=>"company", 's.fournisseur'=>"company",
 			's.address'=>"company", 's.zip'=>"company", 's.town'=>"company", 's.phone'=>"company", 's.email'=>"company",
-			't.libelle'=>"company"
+			't.libelle'=>"company",
+			's.entity'=>'company',
 		); // We define here only fields that use another picto
 		if (empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) {
 			unset($this->export_fields_array[$r]['s.code_fournisseur']);

From 68174cf4400bec96d1a93f0223716a6ecbab2629 Mon Sep 17 00:00:00 2001
From: lvessiller <lvessiller@open-dsi.fr>
Date: Fri, 17 Dec 2021 12:41:44 +0100
Subject: [PATCH 024/316] FIX check stickler

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

diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index 67b9357d468..a733484d043 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -380,7 +380,7 @@ class modSociete extends DolibarrModules
 		if (! empty($conf->global->MULTICOMPANY_ENTITY_IN_EXPORT_IF_SHARED)) {
 			if (!empty($conf->multicompany->enabled)) {
 				$nbofallowedentities = count(explode(',', getEntity('socpeople')));
-			 	if ($nbofallowedentities > 1) {
+				if ($nbofallowedentities > 1) {
 					$this->export_fields_array[$r]['c.entity'] = 'Entity';
 				}
 

From 6bbbd99be901d51599eded1ac27e3c8be8bb951a Mon Sep 17 00:00:00 2001
From: Christian Foellmann <christian@foellmann.de>
Date: Tue, 26 Oct 2021 17:23:51 +0200
Subject: [PATCH 025/316] use any available fontawesome icon in picto

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index bf36a72bfa2..5d48edabe03 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1650,7 +1650,11 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
 		$limittitle = 30;
 		$out .= '<a class="tabTitle">';
 		if ($picto) {
-			$out .= img_picto($title, ($pictoisfullpath ? '' : 'object_').$picto, '', $pictoisfullpath, 0, 0, '', 'imgTabTitle').' ';
+			$noprefix = $pictoisfullpath;
+			if (strpos($picto, 'fontawesome_') !== false) {
+				$noprefix = 1;
+			}
+			$out .= img_picto($title, ($noprefix ? '' : 'object_').$picto, '', $pictoisfullpath, 0, 0, '', 'imgTabTitle').' ';
 		}
 		$out .= '<span class="tabTitleText">'.dol_escape_htmltag(dol_trunc($title, $limittitle)).'</span>';
 		$out .= '</a>';
@@ -2004,10 +2008,14 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 					$width = 14;
 					$cssclass = 'photorefcenter';
 					$picto = $object->picto;
+					$prefix = 'object_';
 					if ($object->element == 'project' && !$object->public) {
 						$picto = 'project'; // instead of projectpub
 					}
-					$nophoto = img_picto('No photo', 'object_'.$picto);
+					if (strpos($picto, 'fontawesome_') !== false) {
+						$prefix = '';
+					}
+					$nophoto = img_picto('No photo', $prefix.$picto);
 				}
 				$morehtmlleft .= '<!-- No photo to show -->';
 				$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref">';
@@ -3592,6 +3600,7 @@ function dol_trunc($string, $size = 40, $trunc = 'right', $stringencoding = 'UTF
  *                                  				Example: picto.png                  if picto.png is stored into htdocs/theme/mytheme/img
  *                                  				Example: picto.png@mymodule         if picto.png is stored into htdocs/mymodule/img
  *                                  				Example: /mydir/mysubdir/picto.png  if picto.png is stored into htdocs/mydir/mysubdir (pictoisfullpath must be set to 1)
+ *                                                  Example: fontawesome_envelope-open-text_fas_red if you want to use fontaweseome icons: fontawesome_<icon-name>_style_color_size
  *	@param		string		$moreatt				Add more attribute on img tag (For example 'class="pictofixedwidth"')
  *	@param		boolean|int	$pictoisfullpath		If true or 1, image path is a full path
  *	@param		int			$srconly				Return only content of the src attribute of img.
@@ -3623,6 +3632,40 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 		}
 	} else {
 		$pictowithouttext = preg_replace('/(\.png|\.gif|\.svg)$/', '', $picto);
+
+		if (strpos($pictowithouttext, 'fontawesome_') !== false) {
+			$pictowithouttext = explode('_', $pictowithouttext);
+			$marginleftonlyshort = 0;
+
+			$fakey      = 'fa-'.$pictowithouttext[1];
+			$fa         = $pictowithouttext[2] ? $pictowithouttext[2] : 'fa';
+			$facolor    = $pictowithouttext[3] ? $pictowithouttext[3] : '';
+			$fasize     = $pictowithouttext[4] ? $pictowithouttext[4] : '';
+
+			// This snippet only needed since function img_edit accepts only one additional parameter: no separate one for css only.
+			// class/style need to be extracted to avoid duplicate class/style validation errors when $moreatt is added to the end of the attributes.
+			$morestyle = '';
+			$reg = array();
+			if (preg_match('/class="([^"]+)"/', $moreatt, $reg)) {
+				$morecss .= ($morecss ? ' ' : '').$reg[1];
+				$moreatt = str_replace('class="'.$reg[1].'"', '', $moreatt);
+			}
+			if (preg_match('/style="([^"]+)"/', $moreatt, $reg)) {
+				$morestyle = $reg[1];
+				$moreatt = str_replace('style="'.$reg[1].'"', '', $moreatt);
+			}
+			$moreatt = trim($moreatt);
+
+			$enabledisablehtml = '<span class="'.$fa.' '.$fakey.($marginleftonlyshort ? ($marginleftonlyshort == 1 ? ' marginleftonlyshort' : ' marginleftonly') : '');
+			$enabledisablehtml .= ($morecss ? ' '.$morecss : '').'" style="'.($fasize ? ('font-size: '.$fasize.';') : '').($facolor ? (' color: '.$facolor.';') : '').($morestyle ? ' '.$morestyle : '').'"'.(($notitle || empty($titlealt)) ? '' : ' title="'.dol_escape_htmltag($titlealt).'"').($moreatt ? ' '.$moreatt : '').'>';
+			/*if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+				$enabledisablehtml .= $titlealt;
+			}*/
+			$enabledisablehtml .= '</span>';
+
+			return $enabledisablehtml;
+		}
+
 		$pictowithouttext = str_replace('object_', '', $pictowithouttext);
 		if (empty($srconly) && in_array($pictowithouttext, array(
 				'1downarrow', '1uparrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected',

From a3e4ea5699312e36241d186171fa80e1c0bc950c Mon Sep 17 00:00:00 2001
From: John BOTELLA <john.botella@atm-consulting.fr>
Date: Mon, 20 Dec 2021 10:29:10 +0100
Subject: [PATCH 026/316] WIP migrate situation invoice to new setup POO

---
 htdocs/admin/facture_situation.php | 126 +++++++++++++++++++++++++----
 1 file changed, 110 insertions(+), 16 deletions(-)

diff --git a/htdocs/admin/facture_situation.php b/htdocs/admin/facture_situation.php
index ffe1680c80f..5aba9e62074 100644
--- a/htdocs/admin/facture_situation.php
+++ b/htdocs/admin/facture_situation.php
@@ -28,24 +28,114 @@
  */
 
 require '../main.inc.php';
+
+// Libraries
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formsetup.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('admin', 'errors', 'other', 'bills'));
 
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('situationinvoicesetup', 'globalsetup'));
+
+// Access control
 if (!$user->admin) {
 	accessforbidden();
 }
 
 $action = GETPOST('action', 'aZ09');
+$backtopage = GETPOST('backtopage', 'alpha');
+
 $value = GETPOST('value', 'alpha');
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'invoice';
 
+$form = new Form($db);
+$formSetup = new FormSetup($db);
+
+
+// Setup conf MYMODULE_MYPARAM4 : exemple of quick define write style
+$formSetup->newItem('INVOICE_USE_SITUATION')
+	->setAsYesNo()
+	->nameText = $langs->trans('UseSituationInvoices');
+
+$item = $formSetup->newItem('INVOICE_USE_SITUATION_CREDIT_NOTE')
+	->setAsYesNo()
+	->nameText = $langs->trans('UseSituationInvoicesCreditNote');
+
+//$item = $formSetup->newItem('INVOICE_USE_RETAINED_WARRANTY')
+//	->setAsYesNo()
+//	->nameText = $langs->trans('Retainedwarranty');
+
+
+$item = $formSetup->newItem('INVOICE_USE_RETAINED_WARRANTY');
+$item->nameText = $langs->trans('AllowedInvoiceForRetainedWarranty');
+
+$arrayAvailableType = array(
+	Facture::TYPE_SITUATION => $langs->trans("InvoiceSituation"),
+	Facture::TYPE_STANDARD.'+'.Facture::TYPE_SITUATION => $langs->trans("InvoiceSituation").' + '.$langs->trans("InvoiceStandard"),
+);
+
+if ($action == 'edit') {
+	$item->fieldInputOverride = $form->selectarray('INVOICE_USE_RETAINED_WARRANTY', $arrayAvailableType, $conf->global->INVOICE_USE_RETAINED_WARRANTY, 1);
+} else {
+	$item->fieldOutputOverride= isset($arrayAvailableType[$conf->global->INVOICE_USE_RETAINED_WARRANTY])?$arrayAvailableType[$conf->global->INVOICE_USE_RETAINED_WARRANTY]:'';
+}
+
+//$item = $formSetup->newItem('INVOICE_RETAINED_WARRANTY_LIMITED_TO_SITUATION')->setAsYesNo();
+//$item->nameText = $langs->trans('RetainedwarrantyOnlyForSituation');
+
+$formSetup->newItem('INVOICE_RETAINED_WARRANTY_LIMITED_TO_FINAL_SITUATION')
+	->setAsYesNo()
+	->nameText = $langs->trans('RetainedwarrantyOnlyForSituationFinal');
+
+
+// TODO : TODO : TODO
+$item = $formSetup->newItem('INVOICE_RETAINED_WARRANTY_LIMITED_TO_FINAL_SITUATION');
+
+$metas = array(
+	'type' => 'number',
+	'step' => '0.01',
+	'min' => 0,
+	'max' => 100
+);
+_printInputFormPart('INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_PERCENT', $langs->trans('RetainedwarrantyDefaultPercent'), '', $metas);
+
+
+/*
+// Hôte
+$item = $formSetup->newItem('NO_PARAM_JUST_TEXT');
+$item->fieldOverride = (empty($_SERVER['HTTPS']) ? 'http://' : 'https://') . $_SERVER['HTTP_HOST'];
+$item->cssClass = 'minwidth500';
+
+// Setup conf MYMODULE_MYPARAM1 as a simple string input
+$item = $formSetup->newItem('MYMODULE_MYPARAM1');
+
+// Setup conf MYMODULE_MYPARAM1 as a simple textarea input but we replace the text of field title
+$item = $formSetup->newItem('MYMODULE_MYPARAM2');
+$item->nameText = $item->getNameText().' more html text ';
+
+// Setup conf MYMODULE_MYPARAM3
+$item = $formSetup->newItem('MYMODULE_MYPARAM3');
+$item->setAsThirdpartyType();
+
+// Setup conf MYMODULE_MYPARAM4 : exemple of quick define write style
+$formSetup->newItem('MYMODULE_MYPARAM4')->setAsYesNo();
+
+// Setup conf MYMODULE_MYPARAM5
+$formSetup->newItem('MYMODULE_MYPARAM5')->setAsEmailTemplate('thirdparty');
+
+// Setup conf MYMODULE_MYPARAM6
+$formSetup->newItem('MYMODULE_MYPARAM6')->setAsSecureKey()->enabled = 0; // disabled
+
+// Setup conf MYMODULE_MYPARAM7
+$formSetup->newItem('MYMODULE_MYPARAM7')->setAsProduct();
+*/
+
 
 /*
  * Actions
@@ -67,7 +157,6 @@ llxHeader(
 	'EN:Invoice_Configuration|FR:Configuration_module_facture|ES:ConfiguracionFactura'
 );
 
-$form = new Form($db);
 
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
@@ -84,6 +173,25 @@ print '<span class="opacitymedium">'.$langs->trans("InvoiceFirstSituationDesc").
  *  Numbering module
  */
 
+if ($action == 'edit') {
+	print $formSetup->generateOutput(true);
+} else {
+	print $formSetup->generateOutput();
+}
+
+if (count($formSetup->items) > 0) {
+	print '<div class="tabsAction">';
+	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a>';
+	print '</div>';
+} else {
+	print '<br>'.$langs->trans("NothingToSetup");
+}
+
+
+print '<hr/>';
+
+
+
 print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 
@@ -97,23 +205,9 @@ print '<td align="center" width="60">'.$langs->trans("Value").'</td>';
 print '<td width="80">&nbsp;</td>';
 print "</tr>\n";
 
-_printOnOff('INVOICE_USE_SITUATION', $langs->trans('UseSituationInvoices'));
-_printOnOff('INVOICE_USE_SITUATION_CREDIT_NOTE', $langs->trans('UseSituationInvoicesCreditNote'));
-//_printOnOff('INVOICE_USE_RETAINED_WARRANTY', $langs->trans('Retainedwarranty'));
 
-$confkey = 'INVOICE_USE_RETAINED_WARRANTY';
 
-$arrayAvailableType = array(
-	Facture::TYPE_SITUATION => $langs->trans("InvoiceSituation"),
-	Facture::TYPE_STANDARD.'+'.Facture::TYPE_SITUATION => $langs->trans("InvoiceSituation").' + '.$langs->trans("InvoiceStandard"),
-);
-$selected = $conf->global->$confkey;
-$curentInput = (empty($inputCount) ? 1 : ($inputCount + 1));
-$formSelectInvoiceType = $form->selectarray('value'.$curentInput, $arrayAvailableType, $selected, 1);
-_printInputFormPart($confkey, $langs->trans('AllowedInvoiceForRetainedWarranty'), '', array(), $formSelectInvoiceType);
 
-//_printOnOff('INVOICE_RETAINED_WARRANTY_LIMITED_TO_SITUATION', $langs->trans('RetainedwarrantyOnlyForSituation'));
-_printOnOff('INVOICE_RETAINED_WARRANTY_LIMITED_TO_FINAL_SITUATION', $langs->trans('RetainedwarrantyOnlyForSituationFinal'));
 
 $metas = array(
 	'type' => 'number',

From 649d5b009ec9ef73d3f76efdf71b25d3c070a093 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A9lina?= <melina@melina.altairis.net>
Date: Tue, 21 Dec 2021 10:10:28 +0100
Subject: [PATCH 027/316] Correction of a condition of the constant

---
 htdocs/takepos/index.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index 77128f485bf..d39fa98e59c 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -1238,11 +1238,7 @@ if (!empty($conf->global->TAKEPOS_WEIGHING_SCALE)) {
 	<?php
 	$count = 0;
 	while ($count < $MAXPRODUCT) {
-		if ($conf->global->TAKEPOS_HIDE_CATEGORIES == 1) {
 			print '<div class="wrapper2" id="prodiv'.$count.'"  ';
-		} else {
-			print '<div class="wrapper2" id="prodiv'.$count.'" ';
-		}
 		?>
 				<?php if ($count == ($MAXPRODUCT - 2)) {
 					?> onclick="MoreProducts('less');" <?php

From 3490dc32281469a529235d891f8cf77ecf61cdec Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 Dec 2021 16:31:28 +0100
Subject: [PATCH 028/316] Update functions.lib.php

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 5d48edabe03..741aa0816ef 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3600,7 +3600,7 @@ function dol_trunc($string, $size = 40, $trunc = 'right', $stringencoding = 'UTF
  *                                  				Example: picto.png                  if picto.png is stored into htdocs/theme/mytheme/img
  *                                  				Example: picto.png@mymodule         if picto.png is stored into htdocs/mymodule/img
  *                                  				Example: /mydir/mysubdir/picto.png  if picto.png is stored into htdocs/mydir/mysubdir (pictoisfullpath must be set to 1)
- *                                                  Example: fontawesome_envelope-open-text_fas_red if you want to use fontaweseome icons: fontawesome_<icon-name>_style_color_size
+ *                                                  Example: fontawesome_envelope-open-text_fas_red_1em if you want to use fontaweseome icons: fontawesome_<icon-name>_<style>_<color>_<size> (only icon-name is mandatory)
  *	@param		string		$moreatt				Add more attribute on img tag (For example 'class="pictofixedwidth"')
  *	@param		boolean|int	$pictoisfullpath		If true or 1, image path is a full path
  *	@param		int			$srconly				Return only content of the src attribute of img.

From a250c72ff360c8cb4cdc2875426bbaaf813cf88f Mon Sep 17 00:00:00 2001
From: kamel <kamel@kam>
Date: Wed, 22 Dec 2021 15:29:11 +0100
Subject: [PATCH 029/316] FIX: Edit card not permitted when invoice is
 validated and INVOICE_CAN_ALWAYS_BE_EDITED is set to 0

---
 htdocs/compta/facture/card.php | 88 ++++++++++++++++++----------------
 1 file changed, 46 insertions(+), 42 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 5ae4f00c66e..8da9b2c92dc 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -122,6 +122,7 @@ $usercanvalidate = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $usercancr
 $usercansend = (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->facture->invoice_advance->send);
 $usercanreopen = (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->facture->invoice_advance->reopen);
 $usercanunvalidate = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($usercancreate)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->facture->invoice_advance->unvalidate)));
+$usercanmodify = $usercancreate && ($object->statut == Facture::STATUS_DRAFT || ($object->statut == Facture::STATUS_VALIDATED && !empty($conf->global->INVOICE_CAN_ALWAYS_BE_EDITED)));
 
 $usercanproductignorepricemin = ((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS));
 $usercancreatemargin = $user->rights->margins->creer;
@@ -345,13 +346,13 @@ if (empty($reshook))
 		}
 	}
 
-	elseif ($action == 'classin' && $usercancreate)
+	elseif ($action == 'classin' && $usercanmodify)
 	{
 		$object->fetch($id);
 		$object->setProject($_POST['projectid']);
 	}
 
-	elseif ($action == 'setmode' && $usercancreate)
+	elseif ($action == 'setmode' && $usercanmodify)
 	{
 		$object->fetch($id);
 		$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
@@ -359,7 +360,7 @@ if (empty($reshook))
 			dol_print_error($db, $object->error);
 	}
 
-	elseif ($action == 'setretainedwarrantyconditions' && $user->rights->facture->creer)
+	elseif ($action == 'setretainedwarrantyconditions' && $usercanmodify)
 	{
 	    $object->fetch($id);
 	    $object->retained_warranty_fk_cond_reglement = 0; // To clean property
@@ -374,7 +375,7 @@ if (empty($reshook))
 	    if ($result < 0) dol_print_error($db, $object->error);
 	}
 
-	elseif ($action == 'setretainedwarranty' && $user->rights->facture->creer)
+	elseif ($action == 'setretainedwarranty' && $usercanmodify)
 	{
 	    $object->fetch($id);
 	    $result = $object->setRetainedWarranty(GETPOST('retained_warranty', 'float'));
@@ -382,7 +383,7 @@ if (empty($reshook))
 	        dol_print_error($db, $object->error);
 	}
 
-	elseif ($action == 'setretainedwarrantydatelimit' && $user->rights->facture->creer)
+	elseif ($action == 'setretainedwarrantydatelimit' && $usercanmodify)
 	{
 	    $object->fetch($id);
 	    $result = $object->setRetainedWarrantyDateLimit(GETPOST('retained_warranty_date_limit', 'float'));
@@ -392,16 +393,16 @@ if (empty($reshook))
 
 
 	// Multicurrency Code
-	elseif ($action == 'setmulticurrencycode' && $usercancreate) {
+	elseif ($action == 'setmulticurrencycode' && $usercanmodify) {
 		$result = $object->setMulticurrencyCode(GETPOST('multicurrency_code', 'alpha'));
 	}
 
 	// Multicurrency rate
-	elseif ($action == 'setmulticurrencyrate' && $usercancreate) {
+	elseif ($action == 'setmulticurrencyrate' && $usercanmodify) {
 		$result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx')), GETPOST('calculation_mode', 'int'));
 	}
 
-	elseif ($action == 'setinvoicedate' && $usercancreate)
+	elseif ($action == 'setinvoicedate' && $usercanmodify)
 	{
 		$object->fetch($id);
 		$old_date_lim_reglement = $object->date_lim_reglement;
@@ -422,7 +423,7 @@ if (empty($reshook))
 		}
 	}
 
-	elseif ($action == 'setdate_pointoftax' && $usercancreate)
+	elseif ($action == 'setdate_pointoftax' && $usercanmodify)
 	{
 		$object->fetch($id);
 		$date_pointoftax = dol_mktime(12, 0, 0, $_POST['date_pointoftaxmonth'], $_POST['date_pointoftaxday'], $_POST['date_pointoftaxyear']);
@@ -433,7 +434,7 @@ if (empty($reshook))
 		}
 	}
 
-	elseif ($action == 'setconditions' && $usercancreate)
+	elseif ($action == 'setconditions' && $usercanmodify)
 	{
 		$object->fetch($id);
 		$object->cond_reglement_code = 0; // To clean property
@@ -470,7 +471,7 @@ if (empty($reshook))
 		}
 	}
 
-	elseif ($action == 'setpaymentterm' && $usercancreate)
+	elseif ($action == 'setpaymentterm' && $usercanmodify)
 	{
 		$object->fetch($id);
 		$object->date_lim_reglement = dol_mktime(12, 0, 0, $_POST['paymenttermmonth'], $_POST['paymenttermday'], $_POST['paymenttermyear']);
@@ -484,7 +485,7 @@ if (empty($reshook))
 		}
 	}
 
-	elseif ($action == 'setrevenuestamp' && $usercancreate)
+	elseif ($action == 'setrevenuestamp' && $usercanmodify)
 	{
 		$object->fetch($id);
 		$object->revenuestamp = GETPOST('revenuestamp');
@@ -515,24 +516,24 @@ if (empty($reshook))
 	}
 
 	// Set incoterm
-	elseif ($action == 'set_incoterms' && !empty($conf->incoterm->enabled))
+	elseif ($action == 'set_incoterms' && !empty($conf->incoterm->enabled) && $usercanmodify)
 	{
 		$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
 	}
 
 	// bank account
-	elseif ($action == 'setbankaccount' && $usercancreate)
+	elseif ($action == 'setbankaccount' && $usercanmodify)
 	{
 		$result = $object->setBankAccount(GETPOST('fk_account', 'int'));
 	}
 
-	elseif ($action == 'setremisepercent' && $usercancreate)
+	elseif ($action == 'setremisepercent' && $usercanmodify)
 	{
 		$object->fetch($id);
 		$result = $object->set_remise($user, $_POST['remise_percent']);
 	}
 
-	elseif ($action == "setabsolutediscount" && $usercancreate)
+	elseif ($action == "setabsolutediscount" && $usercanmodify)
 	{
 		// POST[remise_id] or POST[remise_id_for_payment]
 
@@ -590,13 +591,13 @@ if (empty($reshook))
 		}
 	}
 
-	elseif ($action == 'setref' && $usercancreate)
+	elseif ($action == 'setref' && $usercanmodify)
 	{
 		$object->fetch($id);
 		$object->setValueFrom('ref', GETPOST('ref'), '', null, '', '', $user, 'BILL_MODIFY');
 	}
 
-	elseif ($action == 'setref_client' && $usercancreate)
+	elseif ($action == 'setref_client' && $usercanmodify)
 	{
 		$object->fetch($id);
 		$object->set_ref_client(GETPOST('ref_client'));
@@ -1971,7 +1972,7 @@ if (empty($reshook))
 	}
 
 	// Add a new line
-	elseif ($action == 'addline' && $usercancreate)
+	elseif ($action == 'addline' && $usercanmodify)
 	{
 		$langs->load('errors');
 		$error = 0;
@@ -2300,7 +2301,7 @@ if (empty($reshook))
 		}
 	}
 
-	elseif ($action == 'updateline' && $usercancreate && !GETPOST('cancel', 'alpha'))
+	elseif ($action == 'updateline' && $usercanmodify && !GETPOST('cancel', 'alpha'))
 	{
 		if (!$object->fetch($id) > 0)	dol_print_error($db);
 		$object->fetch_thirdparty();
@@ -2510,7 +2511,7 @@ if (empty($reshook))
 		}
 	}
 
-	elseif ($action == 'updatealllines' && $usercancreate && $_POST['all_percent'] == $langs->trans('Modifier'))	// Update all lines of situation invoice
+	elseif ($action == 'updatealllines' && $usercanmodify && $_POST['all_percent'] == $langs->trans('Modifier'))	// Update all lines of situation invoice
 	{
 		if (!$object->fetch($id) > 0) dol_print_error($db);
 		if (GETPOST('all_progress') != "")
@@ -2529,7 +2530,7 @@ if (empty($reshook))
 		}
 	}
 
-	elseif ($action == 'updateline' && $usercancreate && $_POST['cancel'] == $langs->trans('Cancel')) {
+	elseif ($action == 'updateline' && $usercanmodify && $_POST['cancel'] == $langs->trans('Cancel')) {
 		header('Location: '.$_SERVER["PHP_SELF"].'?facid='.$id); // To show again edited page
 		exit();
 	}
@@ -2755,7 +2756,7 @@ if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
 
-	if ($action == 'update_extras') {
+	if ($action == 'update_extras' && $usercanmodify) {
 		$object->oldcopy = dol_clone($object);
 
 		// Fill array 'array_options' with data from add form
@@ -3764,6 +3765,9 @@ elseif ($id > 0 || !empty($ref))
 		exit;
 	}
 
+	// Reassign, case when status is reset to draft
+	$usercanmodify = $usercancreate && ($object->statut == Facture::STATUS_DRAFT || ($object->statut == Facture::STATUS_VALIDATED && !empty($conf->global->INVOICE_CAN_ALWAYS_BE_EDITED)));
+
 	/*
 	 * Show object in view mode
 	 */
@@ -4131,13 +4135,13 @@ elseif ($id > 0 || !empty($ref))
 	$morehtmlref = '<div class="refidno">';
 	// Ref invoice
 	if ($object->status == $object::STATUS_DRAFT && !$mysoc->isInEEC() && !empty($conf->global->INVOICE_ALLOW_FREE_REF)) {
-		$morehtmlref .= $form->editfieldkey("Ref", 'ref', $object->ref, $object, $usercancreate, 'string', '', 0, 1);
-		$morehtmlref .= $form->editfieldval("Ref", 'ref', $object->ref, $object, $usercancreate, 'string', '', null, null, '', 1);
+		$morehtmlref .= $form->editfieldkey("Ref", 'ref', $object->ref, $object, $usercanmodify, 'string', '', 0, 1);
+		$morehtmlref .= $form->editfieldval("Ref", 'ref', $object->ref, $object, $usercanmodify, 'string', '', null, null, '', 1);
 		$morehtmlref .= '<br>';
 	}
 	// Ref customer
-	$morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, $usercancreate, 'string', '', 0, 1);
-	$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, $usercancreate, 'string', '', null, null, '', 1);
+	$morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, $usercanmodify, 'string', '', 0, 1);
+	$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, $usercanmodify, 'string', '', null, null, '', 1);
 	// Thirdparty
 	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'customer');
 	if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) $morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$object->thirdparty->id.'&search_societe='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)';
@@ -4146,7 +4150,7 @@ elseif ($id > 0 || !empty($ref))
 	{
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-		if ($usercancreate)
+		if ($usercanmodify)
 		{
 			if ($action != 'classify') {
 				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
@@ -4262,7 +4266,7 @@ elseif ($id > 0 || !empty($ref))
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('DateInvoice');
 	print '</td>';
-	if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editinvoicedate' && !empty($object->brouillon) && $usercancreate && empty($conf->global->FAC_FORCE_DATE_VALIDATION))
+	if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editinvoicedate' && !empty($object->brouillon) && $usercanmodify && empty($conf->global->FAC_FORCE_DATE_VALIDATION))
 		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editinvoicedate&amp;facid='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
 	print '</tr></table>';
 	print '</td><td>';
@@ -4287,7 +4291,7 @@ elseif ($id > 0 || !empty($ref))
 		print '<table class="nobordernopadding" width="100%"><tr><td>';
 		print $langs->trans('DatePointOfTax');
 		print '</td>';
-		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate_pointoftax&amp;facid='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
+		if ($usercanmodify) print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate_pointoftax&amp;facid='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
 		print '</tr></table>';
 		print '</td><td>';
 		if ($action == 'editdate_pointoftax') {
@@ -4303,7 +4307,7 @@ elseif ($id > 0 || !empty($ref))
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('PaymentConditionsShort');
 	print '</td>';
-	if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editconditions' && $usercancreate)
+	if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editconditions' && $usercanmodify)
 		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;facid='.$object->id.'">'.img_edit($langs->trans('SetConditions'), 1).'</a></td>';
 	print '</tr></table>';
 	print '</td><td>';
@@ -4324,7 +4328,7 @@ elseif ($id > 0 || !empty($ref))
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('DateMaxPayment');
 	print '</td>';
-	if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editpaymentterm' && $usercancreate)
+	if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editpaymentterm' && $usercanmodify)
 		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editpaymentterm&amp;facid='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
 	print '</tr></table>';
 	print '</td><td>';
@@ -4348,7 +4352,7 @@ elseif ($id > 0 || !empty($ref))
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('PaymentMode');
 	print '</td>';
-	if ($action != 'editmode' && $usercancreate)
+	if ($action != 'editmode' && $usercanmodify)
 		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;facid='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
 	print '</tr></table>';
 	print '</td><td>';
@@ -4371,7 +4375,7 @@ elseif ($id > 0 || !empty($ref))
 		print '<table class="nobordernopadding" width="100%"><tr><td>';
 		print $form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0);
 		print '</td>';
-		if ($usercancreate && $action != 'editmulticurrencycode' && !empty($object->brouillon))
+		if ($usercanmodify && $action != 'editmulticurrencycode' && !empty($object->brouillon))
 			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmulticurrencycode&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).'</a></td>';
 		print '</tr></table>';
 		print '</td><td>';
@@ -4387,7 +4391,7 @@ elseif ($id > 0 || !empty($ref))
 			print '<table class="nobordernopadding" width="100%"><tr><td>';
 			print $form->editfieldkey('CurrencyRate', 'multicurrency_tx', '', $object, 0);
 			print '</td>';
-			if ($usercancreate && $action != 'editmulticurrencyrate' && !empty($object->brouillon) && $object->multicurrency_code && $object->multicurrency_code != $conf->currency)
+			if ($usercanmodify && $action != 'editmulticurrencyrate' && !empty($object->brouillon) && $object->multicurrency_code && $object->multicurrency_code != $conf->currency)
 				print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editmulticurrencyrate&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).'</a></td>';
 			print '</tr></table>';
 			print '</td><td>';
@@ -4395,7 +4399,7 @@ elseif ($id > 0 || !empty($ref))
 				if ($action == 'actualizemulticurrencyrate') {
 					list($object->fk_multicurrency, $object->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($object->db, $object->multicurrency_code);
 				}
-				$form->form_multicurrency_rate($_SERVER['PHP_SELF'].'?id='.$object->id, $object->multicurrency_tx, ($usercancreate ? 'multicurrency_tx' : 'none'), $object->multicurrency_code);
+				$form->form_multicurrency_rate($_SERVER['PHP_SELF'].'?id='.$object->id, $object->multicurrency_tx, ($usercanmodify ? 'multicurrency_tx' : 'none'), $object->multicurrency_code);
 			} else {
 				$form->form_multicurrency_rate($_SERVER['PHP_SELF'].'?id='.$object->id, $object->multicurrency_tx, 'none', $object->multicurrency_code);
 				if ($object->statut == $object::STATUS_DRAFT && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) {
@@ -4413,7 +4417,7 @@ elseif ($id > 0 || !empty($ref))
 	print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
 	print $langs->trans('BankAccount');
 	print '<td>';
-	if (($action != 'editbankaccount') && $usercancreate)
+	if (($action != 'editbankaccount') && $usercanmodify)
 		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
 	print '</tr></table>';
 	print '</td><td>';
@@ -4435,7 +4439,7 @@ elseif ($id > 0 || !empty($ref))
 		print '<table width="100%" class="nobordernopadding"><tr><td>';
 		print $langs->trans('IncotermLabel');
 		print '<td><td class="right">';
-		if ($usercancreate) print '<a class="editfielda" href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
+		if ($usercanmodify) print '<a class="editfielda" href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
 		else print '&nbsp;';
 		print '</td></tr></table>';
 		print '</td>';
@@ -4465,7 +4469,7 @@ elseif ($id > 0 || !empty($ref))
 			print '<table id="retained-warranty-table" class="nobordernopadding" width="100%"><tr><td>';
 			print $langs->trans('RetainedWarranty');
 			print '</td>';
-			if ($action != 'editretainedwarranty' && $user->rights->facture->creer) {
+			if ($action != 'editretainedwarranty' && $usercanmodify) {
 			    print '<td align="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editretainedwarranty&amp;facid='.$object->id.'">'.img_edit($langs->trans('setretainedwarranty'), 1).'</a></td>';
 			}
 
@@ -4491,7 +4495,7 @@ elseif ($id > 0 || !empty($ref))
 		    print '<table id="retained-warranty-cond-reglement-table"  class="nobordernopadding" width="100%"><tr><td>';
 		    print $langs->trans('PaymentConditionsShortRetainedWarranty');
 		    print '</td>';
-		    if ($action != 'editretainedwarrantypaymentterms' && $user->rights->facture->creer) {
+		    if ($action != 'editretainedwarrantypaymentterms' && $usercanmodify) {
 		        print '<td align="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editretainedwarrantypaymentterms&amp;facid='.$object->id.'">'.img_edit($langs->trans('setPaymentConditionsShortRetainedWarranty'), 1).'</a></td>';
 		    }
 
@@ -4529,7 +4533,7 @@ elseif ($id > 0 || !empty($ref))
             print '<table id="retained-warranty-date-limit-table"  class="nobordernopadding" width="100%"><tr><td>';
             print $langs->trans('RetainedWarrantyDateLimit');
             print '</td>';
-            if ($action != 'editretainedwarrantydatelimit' && $user->rights->facture->creer) {
+            if ($action != 'editretainedwarrantydatelimit' && $usercanmodify) {
                 print '<td align="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editretainedwarrantydatelimit&amp;facid='.$object->id.'">'.img_edit($langs->trans('setretainedwarrantyDateLimit'), 1).'</a></td>';
             }
 
@@ -4616,7 +4620,7 @@ elseif ($id > 0 || !empty($ref))
 		print '<table class="nobordernopadding" width="100%"><tr><td>';
 		print $langs->trans('RevenueStamp');
 		print '</td>';
-		if ($action != 'editrevenuestamp' && !empty($object->brouillon) && $usercancreate)
+		if ($action != 'editrevenuestamp' && !empty($object->brouillon) && $usercanmodify)
 		{
 			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editrevenuestamp&amp;facid='.$object->id.'">'.img_edit($langs->trans('SetRevenuStamp'), 1).'</a></td>';
 		}

From 551e187b21e1963a4223c896ed747eed5d65b5ed Mon Sep 17 00:00:00 2001
From: kamel <kamel@kam>
Date: Wed, 22 Dec 2021 15:35:41 +0100
Subject: [PATCH 030/316] Revert "FIX: Edit card not permitted when invoice is
 validated and INVOICE_CAN_ALWAYS_BE_EDITED is set to 0"

This reverts commit a250c72ff360c8cb4cdc2875426bbaaf813cf88f.
---
 htdocs/compta/facture/card.php | 88 ++++++++++++++++------------------
 1 file changed, 42 insertions(+), 46 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 8da9b2c92dc..5ae4f00c66e 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -122,7 +122,6 @@ $usercanvalidate = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $usercancr
 $usercansend = (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->facture->invoice_advance->send);
 $usercanreopen = (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->facture->invoice_advance->reopen);
 $usercanunvalidate = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($usercancreate)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->facture->invoice_advance->unvalidate)));
-$usercanmodify = $usercancreate && ($object->statut == Facture::STATUS_DRAFT || ($object->statut == Facture::STATUS_VALIDATED && !empty($conf->global->INVOICE_CAN_ALWAYS_BE_EDITED)));
 
 $usercanproductignorepricemin = ((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS));
 $usercancreatemargin = $user->rights->margins->creer;
@@ -346,13 +345,13 @@ if (empty($reshook))
 		}
 	}
 
-	elseif ($action == 'classin' && $usercanmodify)
+	elseif ($action == 'classin' && $usercancreate)
 	{
 		$object->fetch($id);
 		$object->setProject($_POST['projectid']);
 	}
 
-	elseif ($action == 'setmode' && $usercanmodify)
+	elseif ($action == 'setmode' && $usercancreate)
 	{
 		$object->fetch($id);
 		$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
@@ -360,7 +359,7 @@ if (empty($reshook))
 			dol_print_error($db, $object->error);
 	}
 
-	elseif ($action == 'setretainedwarrantyconditions' && $usercanmodify)
+	elseif ($action == 'setretainedwarrantyconditions' && $user->rights->facture->creer)
 	{
 	    $object->fetch($id);
 	    $object->retained_warranty_fk_cond_reglement = 0; // To clean property
@@ -375,7 +374,7 @@ if (empty($reshook))
 	    if ($result < 0) dol_print_error($db, $object->error);
 	}
 
-	elseif ($action == 'setretainedwarranty' && $usercanmodify)
+	elseif ($action == 'setretainedwarranty' && $user->rights->facture->creer)
 	{
 	    $object->fetch($id);
 	    $result = $object->setRetainedWarranty(GETPOST('retained_warranty', 'float'));
@@ -383,7 +382,7 @@ if (empty($reshook))
 	        dol_print_error($db, $object->error);
 	}
 
-	elseif ($action == 'setretainedwarrantydatelimit' && $usercanmodify)
+	elseif ($action == 'setretainedwarrantydatelimit' && $user->rights->facture->creer)
 	{
 	    $object->fetch($id);
 	    $result = $object->setRetainedWarrantyDateLimit(GETPOST('retained_warranty_date_limit', 'float'));
@@ -393,16 +392,16 @@ if (empty($reshook))
 
 
 	// Multicurrency Code
-	elseif ($action == 'setmulticurrencycode' && $usercanmodify) {
+	elseif ($action == 'setmulticurrencycode' && $usercancreate) {
 		$result = $object->setMulticurrencyCode(GETPOST('multicurrency_code', 'alpha'));
 	}
 
 	// Multicurrency rate
-	elseif ($action == 'setmulticurrencyrate' && $usercanmodify) {
+	elseif ($action == 'setmulticurrencyrate' && $usercancreate) {
 		$result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx')), GETPOST('calculation_mode', 'int'));
 	}
 
-	elseif ($action == 'setinvoicedate' && $usercanmodify)
+	elseif ($action == 'setinvoicedate' && $usercancreate)
 	{
 		$object->fetch($id);
 		$old_date_lim_reglement = $object->date_lim_reglement;
@@ -423,7 +422,7 @@ if (empty($reshook))
 		}
 	}
 
-	elseif ($action == 'setdate_pointoftax' && $usercanmodify)
+	elseif ($action == 'setdate_pointoftax' && $usercancreate)
 	{
 		$object->fetch($id);
 		$date_pointoftax = dol_mktime(12, 0, 0, $_POST['date_pointoftaxmonth'], $_POST['date_pointoftaxday'], $_POST['date_pointoftaxyear']);
@@ -434,7 +433,7 @@ if (empty($reshook))
 		}
 	}
 
-	elseif ($action == 'setconditions' && $usercanmodify)
+	elseif ($action == 'setconditions' && $usercancreate)
 	{
 		$object->fetch($id);
 		$object->cond_reglement_code = 0; // To clean property
@@ -471,7 +470,7 @@ if (empty($reshook))
 		}
 	}
 
-	elseif ($action == 'setpaymentterm' && $usercanmodify)
+	elseif ($action == 'setpaymentterm' && $usercancreate)
 	{
 		$object->fetch($id);
 		$object->date_lim_reglement = dol_mktime(12, 0, 0, $_POST['paymenttermmonth'], $_POST['paymenttermday'], $_POST['paymenttermyear']);
@@ -485,7 +484,7 @@ if (empty($reshook))
 		}
 	}
 
-	elseif ($action == 'setrevenuestamp' && $usercanmodify)
+	elseif ($action == 'setrevenuestamp' && $usercancreate)
 	{
 		$object->fetch($id);
 		$object->revenuestamp = GETPOST('revenuestamp');
@@ -516,24 +515,24 @@ if (empty($reshook))
 	}
 
 	// Set incoterm
-	elseif ($action == 'set_incoterms' && !empty($conf->incoterm->enabled) && $usercanmodify)
+	elseif ($action == 'set_incoterms' && !empty($conf->incoterm->enabled))
 	{
 		$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
 	}
 
 	// bank account
-	elseif ($action == 'setbankaccount' && $usercanmodify)
+	elseif ($action == 'setbankaccount' && $usercancreate)
 	{
 		$result = $object->setBankAccount(GETPOST('fk_account', 'int'));
 	}
 
-	elseif ($action == 'setremisepercent' && $usercanmodify)
+	elseif ($action == 'setremisepercent' && $usercancreate)
 	{
 		$object->fetch($id);
 		$result = $object->set_remise($user, $_POST['remise_percent']);
 	}
 
-	elseif ($action == "setabsolutediscount" && $usercanmodify)
+	elseif ($action == "setabsolutediscount" && $usercancreate)
 	{
 		// POST[remise_id] or POST[remise_id_for_payment]
 
@@ -591,13 +590,13 @@ if (empty($reshook))
 		}
 	}
 
-	elseif ($action == 'setref' && $usercanmodify)
+	elseif ($action == 'setref' && $usercancreate)
 	{
 		$object->fetch($id);
 		$object->setValueFrom('ref', GETPOST('ref'), '', null, '', '', $user, 'BILL_MODIFY');
 	}
 
-	elseif ($action == 'setref_client' && $usercanmodify)
+	elseif ($action == 'setref_client' && $usercancreate)
 	{
 		$object->fetch($id);
 		$object->set_ref_client(GETPOST('ref_client'));
@@ -1972,7 +1971,7 @@ if (empty($reshook))
 	}
 
 	// Add a new line
-	elseif ($action == 'addline' && $usercanmodify)
+	elseif ($action == 'addline' && $usercancreate)
 	{
 		$langs->load('errors');
 		$error = 0;
@@ -2301,7 +2300,7 @@ if (empty($reshook))
 		}
 	}
 
-	elseif ($action == 'updateline' && $usercanmodify && !GETPOST('cancel', 'alpha'))
+	elseif ($action == 'updateline' && $usercancreate && !GETPOST('cancel', 'alpha'))
 	{
 		if (!$object->fetch($id) > 0)	dol_print_error($db);
 		$object->fetch_thirdparty();
@@ -2511,7 +2510,7 @@ if (empty($reshook))
 		}
 	}
 
-	elseif ($action == 'updatealllines' && $usercanmodify && $_POST['all_percent'] == $langs->trans('Modifier'))	// Update all lines of situation invoice
+	elseif ($action == 'updatealllines' && $usercancreate && $_POST['all_percent'] == $langs->trans('Modifier'))	// Update all lines of situation invoice
 	{
 		if (!$object->fetch($id) > 0) dol_print_error($db);
 		if (GETPOST('all_progress') != "")
@@ -2530,7 +2529,7 @@ if (empty($reshook))
 		}
 	}
 
-	elseif ($action == 'updateline' && $usercanmodify && $_POST['cancel'] == $langs->trans('Cancel')) {
+	elseif ($action == 'updateline' && $usercancreate && $_POST['cancel'] == $langs->trans('Cancel')) {
 		header('Location: '.$_SERVER["PHP_SELF"].'?facid='.$id); // To show again edited page
 		exit();
 	}
@@ -2756,7 +2755,7 @@ if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
 
-	if ($action == 'update_extras' && $usercanmodify) {
+	if ($action == 'update_extras') {
 		$object->oldcopy = dol_clone($object);
 
 		// Fill array 'array_options' with data from add form
@@ -3765,9 +3764,6 @@ elseif ($id > 0 || !empty($ref))
 		exit;
 	}
 
-	// Reassign, case when status is reset to draft
-	$usercanmodify = $usercancreate && ($object->statut == Facture::STATUS_DRAFT || ($object->statut == Facture::STATUS_VALIDATED && !empty($conf->global->INVOICE_CAN_ALWAYS_BE_EDITED)));
-
 	/*
 	 * Show object in view mode
 	 */
@@ -4135,13 +4131,13 @@ elseif ($id > 0 || !empty($ref))
 	$morehtmlref = '<div class="refidno">';
 	// Ref invoice
 	if ($object->status == $object::STATUS_DRAFT && !$mysoc->isInEEC() && !empty($conf->global->INVOICE_ALLOW_FREE_REF)) {
-		$morehtmlref .= $form->editfieldkey("Ref", 'ref', $object->ref, $object, $usercanmodify, 'string', '', 0, 1);
-		$morehtmlref .= $form->editfieldval("Ref", 'ref', $object->ref, $object, $usercanmodify, 'string', '', null, null, '', 1);
+		$morehtmlref .= $form->editfieldkey("Ref", 'ref', $object->ref, $object, $usercancreate, 'string', '', 0, 1);
+		$morehtmlref .= $form->editfieldval("Ref", 'ref', $object->ref, $object, $usercancreate, 'string', '', null, null, '', 1);
 		$morehtmlref .= '<br>';
 	}
 	// Ref customer
-	$morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, $usercanmodify, 'string', '', 0, 1);
-	$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, $usercanmodify, 'string', '', null, null, '', 1);
+	$morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, $usercancreate, 'string', '', 0, 1);
+	$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, $usercancreate, 'string', '', null, null, '', 1);
 	// Thirdparty
 	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'customer');
 	if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) $morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$object->thirdparty->id.'&search_societe='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)';
@@ -4150,7 +4146,7 @@ elseif ($id > 0 || !empty($ref))
 	{
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-		if ($usercanmodify)
+		if ($usercancreate)
 		{
 			if ($action != 'classify') {
 				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
@@ -4266,7 +4262,7 @@ elseif ($id > 0 || !empty($ref))
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('DateInvoice');
 	print '</td>';
-	if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editinvoicedate' && !empty($object->brouillon) && $usercanmodify && empty($conf->global->FAC_FORCE_DATE_VALIDATION))
+	if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editinvoicedate' && !empty($object->brouillon) && $usercancreate && empty($conf->global->FAC_FORCE_DATE_VALIDATION))
 		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editinvoicedate&amp;facid='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
 	print '</tr></table>';
 	print '</td><td>';
@@ -4291,7 +4287,7 @@ elseif ($id > 0 || !empty($ref))
 		print '<table class="nobordernopadding" width="100%"><tr><td>';
 		print $langs->trans('DatePointOfTax');
 		print '</td>';
-		if ($usercanmodify) print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate_pointoftax&amp;facid='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate_pointoftax&amp;facid='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
 		print '</tr></table>';
 		print '</td><td>';
 		if ($action == 'editdate_pointoftax') {
@@ -4307,7 +4303,7 @@ elseif ($id > 0 || !empty($ref))
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('PaymentConditionsShort');
 	print '</td>';
-	if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editconditions' && $usercanmodify)
+	if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editconditions' && $usercancreate)
 		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;facid='.$object->id.'">'.img_edit($langs->trans('SetConditions'), 1).'</a></td>';
 	print '</tr></table>';
 	print '</td><td>';
@@ -4328,7 +4324,7 @@ elseif ($id > 0 || !empty($ref))
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('DateMaxPayment');
 	print '</td>';
-	if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editpaymentterm' && $usercanmodify)
+	if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editpaymentterm' && $usercancreate)
 		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editpaymentterm&amp;facid='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
 	print '</tr></table>';
 	print '</td><td>';
@@ -4352,7 +4348,7 @@ elseif ($id > 0 || !empty($ref))
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('PaymentMode');
 	print '</td>';
-	if ($action != 'editmode' && $usercanmodify)
+	if ($action != 'editmode' && $usercancreate)
 		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;facid='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
 	print '</tr></table>';
 	print '</td><td>';
@@ -4375,7 +4371,7 @@ elseif ($id > 0 || !empty($ref))
 		print '<table class="nobordernopadding" width="100%"><tr><td>';
 		print $form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0);
 		print '</td>';
-		if ($usercanmodify && $action != 'editmulticurrencycode' && !empty($object->brouillon))
+		if ($usercancreate && $action != 'editmulticurrencycode' && !empty($object->brouillon))
 			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmulticurrencycode&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).'</a></td>';
 		print '</tr></table>';
 		print '</td><td>';
@@ -4391,7 +4387,7 @@ elseif ($id > 0 || !empty($ref))
 			print '<table class="nobordernopadding" width="100%"><tr><td>';
 			print $form->editfieldkey('CurrencyRate', 'multicurrency_tx', '', $object, 0);
 			print '</td>';
-			if ($usercanmodify && $action != 'editmulticurrencyrate' && !empty($object->brouillon) && $object->multicurrency_code && $object->multicurrency_code != $conf->currency)
+			if ($usercancreate && $action != 'editmulticurrencyrate' && !empty($object->brouillon) && $object->multicurrency_code && $object->multicurrency_code != $conf->currency)
 				print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editmulticurrencyrate&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).'</a></td>';
 			print '</tr></table>';
 			print '</td><td>';
@@ -4399,7 +4395,7 @@ elseif ($id > 0 || !empty($ref))
 				if ($action == 'actualizemulticurrencyrate') {
 					list($object->fk_multicurrency, $object->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($object->db, $object->multicurrency_code);
 				}
-				$form->form_multicurrency_rate($_SERVER['PHP_SELF'].'?id='.$object->id, $object->multicurrency_tx, ($usercanmodify ? 'multicurrency_tx' : 'none'), $object->multicurrency_code);
+				$form->form_multicurrency_rate($_SERVER['PHP_SELF'].'?id='.$object->id, $object->multicurrency_tx, ($usercancreate ? 'multicurrency_tx' : 'none'), $object->multicurrency_code);
 			} else {
 				$form->form_multicurrency_rate($_SERVER['PHP_SELF'].'?id='.$object->id, $object->multicurrency_tx, 'none', $object->multicurrency_code);
 				if ($object->statut == $object::STATUS_DRAFT && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) {
@@ -4417,7 +4413,7 @@ elseif ($id > 0 || !empty($ref))
 	print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
 	print $langs->trans('BankAccount');
 	print '<td>';
-	if (($action != 'editbankaccount') && $usercanmodify)
+	if (($action != 'editbankaccount') && $usercancreate)
 		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
 	print '</tr></table>';
 	print '</td><td>';
@@ -4439,7 +4435,7 @@ elseif ($id > 0 || !empty($ref))
 		print '<table width="100%" class="nobordernopadding"><tr><td>';
 		print $langs->trans('IncotermLabel');
 		print '<td><td class="right">';
-		if ($usercanmodify) print '<a class="editfielda" href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
+		if ($usercancreate) print '<a class="editfielda" href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
 		else print '&nbsp;';
 		print '</td></tr></table>';
 		print '</td>';
@@ -4469,7 +4465,7 @@ elseif ($id > 0 || !empty($ref))
 			print '<table id="retained-warranty-table" class="nobordernopadding" width="100%"><tr><td>';
 			print $langs->trans('RetainedWarranty');
 			print '</td>';
-			if ($action != 'editretainedwarranty' && $usercanmodify) {
+			if ($action != 'editretainedwarranty' && $user->rights->facture->creer) {
 			    print '<td align="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editretainedwarranty&amp;facid='.$object->id.'">'.img_edit($langs->trans('setretainedwarranty'), 1).'</a></td>';
 			}
 
@@ -4495,7 +4491,7 @@ elseif ($id > 0 || !empty($ref))
 		    print '<table id="retained-warranty-cond-reglement-table"  class="nobordernopadding" width="100%"><tr><td>';
 		    print $langs->trans('PaymentConditionsShortRetainedWarranty');
 		    print '</td>';
-		    if ($action != 'editretainedwarrantypaymentterms' && $usercanmodify) {
+		    if ($action != 'editretainedwarrantypaymentterms' && $user->rights->facture->creer) {
 		        print '<td align="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editretainedwarrantypaymentterms&amp;facid='.$object->id.'">'.img_edit($langs->trans('setPaymentConditionsShortRetainedWarranty'), 1).'</a></td>';
 		    }
 
@@ -4533,7 +4529,7 @@ elseif ($id > 0 || !empty($ref))
             print '<table id="retained-warranty-date-limit-table"  class="nobordernopadding" width="100%"><tr><td>';
             print $langs->trans('RetainedWarrantyDateLimit');
             print '</td>';
-            if ($action != 'editretainedwarrantydatelimit' && $usercanmodify) {
+            if ($action != 'editretainedwarrantydatelimit' && $user->rights->facture->creer) {
                 print '<td align="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editretainedwarrantydatelimit&amp;facid='.$object->id.'">'.img_edit($langs->trans('setretainedwarrantyDateLimit'), 1).'</a></td>';
             }
 
@@ -4620,7 +4616,7 @@ elseif ($id > 0 || !empty($ref))
 		print '<table class="nobordernopadding" width="100%"><tr><td>';
 		print $langs->trans('RevenueStamp');
 		print '</td>';
-		if ($action != 'editrevenuestamp' && !empty($object->brouillon) && $usercanmodify)
+		if ($action != 'editrevenuestamp' && !empty($object->brouillon) && $usercancreate)
 		{
 			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editrevenuestamp&amp;facid='.$object->id.'">'.img_edit($langs->trans('SetRevenuStamp'), 1).'</a></td>';
 		}

From 817a9594ae96ae0abaf04e1f80eae492193887d6 Mon Sep 17 00:00:00 2001
From: John BOTELLA <john.botella@atm-consulting.fr>
Date: Tue, 28 Dec 2021 14:32:57 +0100
Subject: [PATCH 031/316] Convert setup of situation invoice to new setup
 system + fix size

---
 htdocs/admin/facture_situation.php         | 204 ++-------------------
 htdocs/core/class/html.form.class.php      |  43 +++--
 htdocs/core/class/html.formsetup.class.php |  28 ++-
 3 files changed, 68 insertions(+), 207 deletions(-)

diff --git a/htdocs/admin/facture_situation.php b/htdocs/admin/facture_situation.php
index 5aba9e62074..636c5781b69 100644
--- a/htdocs/admin/facture_situation.php
+++ b/htdocs/admin/facture_situation.php
@@ -94,47 +94,22 @@ $formSetup->newItem('INVOICE_RETAINED_WARRANTY_LIMITED_TO_FINAL_SITUATION')
 	->nameText = $langs->trans('RetainedwarrantyOnlyForSituationFinal');
 
 
-// TODO : TODO : TODO
-$item = $formSetup->newItem('INVOICE_RETAINED_WARRANTY_LIMITED_TO_FINAL_SITUATION');
-
-$metas = array(
+$item = $formSetup->newItem('INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_PERCENT');
+$item->nameText = $langs->trans('RetainedwarrantyDefaultPercent');
+$item->fieldAttr = array(
 	'type' => 'number',
 	'step' => '0.01',
 	'min' => 0,
 	'max' => 100
 );
-_printInputFormPart('INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_PERCENT', $langs->trans('RetainedwarrantyDefaultPercent'), '', $metas);
 
 
-/*
-// Hôte
-$item = $formSetup->newItem('NO_PARAM_JUST_TEXT');
-$item->fieldOverride = (empty($_SERVER['HTTPS']) ? 'http://' : 'https://') . $_SERVER['HTTP_HOST'];
-$item->cssClass = 'minwidth500';
-
-// Setup conf MYMODULE_MYPARAM1 as a simple string input
-$item = $formSetup->newItem('MYMODULE_MYPARAM1');
-
-// Setup conf MYMODULE_MYPARAM1 as a simple textarea input but we replace the text of field title
-$item = $formSetup->newItem('MYMODULE_MYPARAM2');
-$item->nameText = $item->getNameText().' more html text ';
-
-// Setup conf MYMODULE_MYPARAM3
-$item = $formSetup->newItem('MYMODULE_MYPARAM3');
-$item->setAsThirdpartyType();
-
-// Setup conf MYMODULE_MYPARAM4 : exemple of quick define write style
-$formSetup->newItem('MYMODULE_MYPARAM4')->setAsYesNo();
-
-// Setup conf MYMODULE_MYPARAM5
-$formSetup->newItem('MYMODULE_MYPARAM5')->setAsEmailTemplate('thirdparty');
-
-// Setup conf MYMODULE_MYPARAM6
-$formSetup->newItem('MYMODULE_MYPARAM6')->setAsSecureKey()->enabled = 0; // disabled
-
-// Setup conf MYMODULE_MYPARAM7
-$formSetup->newItem('MYMODULE_MYPARAM7')->setAsProduct();
-*/
+// Conditions paiements
+$item = $formSetup->newItem('INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID');
+$item->nameText = $langs->trans('PaymentConditionsShortRetainedWarranty');
+$form->load_cache_conditions_paiements();
+$item->fieldOutputOverride = $form->cache_conditions_paiements[$conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID]['label'];
+$item->fieldInputOverride = $form->getSelectConditionsPaiements($conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID, 'INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID', -1, 1);
 
 
 /*
@@ -180,169 +155,18 @@ if ($action == 'edit') {
 }
 
 if (count($formSetup->items) > 0) {
-	print '<div class="tabsAction">';
-	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a>';
-	print '</div>';
+	if ($action != 'edit') {
+		print '<div class="tabsAction">';
+		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a>';
+		print '</div>';
+	}
 } else {
 	print '<br>'.$langs->trans("NothingToSetup");
 }
 
 
-print '<hr/>';
-
-
-
-print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
-print '<input type="hidden" name="token" value="'.newToken().'">';
-
-
-print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
-print '<table class="noborder centpercent">';
-
-print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("Parameter").'</td>';
-print '<td align="center" width="60">'.$langs->trans("Value").'</td>';
-print '<td width="80">&nbsp;</td>';
-print "</tr>\n";
-
-
-
-
-
-$metas = array(
-	'type' => 'number',
-	'step' => '0.01',
-	'min' => 0,
-	'max' => 100
-);
-_printInputFormPart('INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_PERCENT', $langs->trans('RetainedwarrantyDefaultPercent'), '', $metas);
-
-// Conditions paiements
-$inputCount = empty($inputCount) ? 1 : ($inputCount + 1);
-print '<tr class="oddeven">';
-print '<td>'.$langs->trans('PaymentConditionsShortRetainedWarranty').'</td>';
-print '<td class="center" width="20">&nbsp;</td>';
-print '<td class="right" width="300">';
-print '<input type="hidden" name="param'.$inputCount.'" value="INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID">';
-$form->select_conditions_paiements($conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID, 'value'.$inputCount, -1, 1);
-print '</td></tr>';
-
-
-print '</table>';
-print '</div>';
-
-print '<br>';
-
-_updateBtn();
-
-print '</form>';
-
 print dol_get_fiche_end();
 
 // End of page
 llxFooter();
 $db->close();
-
-/**
- * Print an update button
- *
- * @return void
- */
-function _updateBtn()
-{
-	global $langs;
-	print '<div class="center">';
-	print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
-	print '</div>';
-}
-
-/**
- * Print a On/Off button
- *
- * @param string $confkey the conf key
- * @param bool   $title   Title of conf
- * @param string $desc    Description
- *
- * @return void
- */
-function _printOnOff($confkey, $title = false, $desc = '')
-{
-	global $langs;
-
-	print '<tr class="oddeven">';
-	print '<td>'.($title ? $title : $langs->trans($confkey));
-	if (!empty($desc)) {
-		print '<br><small>'.$langs->trans($desc).'</small>';
-	}
-	print '</td>';
-	print '<td class="center" width="20">&nbsp;</td>';
-	print '<td class="right" width="300">';
-	print ajax_constantonoff($confkey);
-	print '</td></tr>';
-}
-
-
-/**
- * Print a form part
- *
- * @param string $confkey the conf key
- * @param bool   $title   Title of conf
- * @param string $desc    Description of
- * @param array  $metas   html meta
- * @param string $type    type of input textarea or input
- * @param bool   $help    help description
- *
- * @return void
- */
-function _printInputFormPart($confkey, $title = false, $desc = '', $metas = array(), $type = 'input', $help = false)
-{
-	global $langs, $conf, $db, $inputCount;
-
-	$inputCount = empty($inputCount) ? 1 : ($inputCount + 1);
-	$form = new Form($db);
-
-	$defaultMetas = array(
-		'name' => 'value'.$inputCount
-	);
-
-	if ($type != 'textarea') {
-		$defaultMetas['type']   = 'text';
-		$defaultMetas['value']  = $conf->global->{$confkey};
-	}
-
-
-	$metas = array_merge($defaultMetas, $metas);
-	$metascompil = '';
-	foreach ($metas as $key => $values) {
-		$metascompil .= ' '.$key.'="'.$values.'" ';
-	}
-
-	print '<tr class="oddeven">';
-	print '<td>';
-
-	if (!empty($help)) {
-		print $form->textwithtooltip(($title ? $title : $langs->trans($confkey)), $langs->trans($help), 2, 1, img_help(1, ''));
-	} else {
-		print $title ? $title : $langs->trans($confkey);
-	}
-
-	if (!empty($desc)) {
-		print '<br><small>'.$langs->trans($desc).'</small>';
-	}
-
-	print '</td>';
-	print '<td class="center" width="20">&nbsp;</td>';
-	print '<td class="right" width="300">';
-	print '<input type="hidden" name="param'.$inputCount.'" value="'.$confkey.'">';
-
-	print '<input type="hidden" name="action" value="setModuleOptions">';
-	if ($type == 'textarea') {
-		print '<textarea '.$metascompil.'  >'.dol_htmlentities($conf->global->{$confkey}).'</textarea>';
-	} elseif ($type == 'input') {
-		print '<input '.$metascompil.'  />';
-	} else {
-		// custom
-		print $type;
-	}
-	print '</td></tr>';
-}
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 0525ad6f3c8..693cf235cf3 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -3893,7 +3893,7 @@ class Form
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *      Return list of payment modes.
+	 *      print list of payment modes.
 	 *      Constant MAIN_DEFAULT_PAYMENT_TERM_ID can used to set default value but scope is all application, probably not what you want.
 	 *      See instead to force the default value by the caller.
 	 *
@@ -3908,8 +3908,28 @@ class Form
 	public function select_conditions_paiements($selected = 0, $htmlname = 'condid', $filtertype = -1, $addempty = 0, $noinfoadmin = 0, $morecss = '')
 	{
 		// phpcs:enable
-		global $langs, $user, $conf;
+		print $this->getSelectConditionsPaiements($selected, $htmlname, $filtertype, $addempty, $noinfoadmin, $morecss);
+	}
 
+
+	/**
+	 *      Return list of payment modes.
+	 *      Constant MAIN_DEFAULT_PAYMENT_TERM_ID can used to set default value but scope is all application, probably not what you want.
+	 *      See instead to force the default value by the caller.
+	 *
+	 *      @param	int		$selected		Id of payment term to preselect by default
+	 *      @param	string	$htmlname		Nom de la zone select
+	 *      @param	int		$filtertype		Not used
+	 *		@param	int		$addempty		Add an empty entry
+	 * 		@param	int		$noinfoadmin	0=Add admin info, 1=Disable admin info
+	 * 		@param	string	$morecss		Add more CSS on select tag
+	 *		@return	void
+	 */
+	public function getSelectConditionsPaiements($selected = 0, $htmlname = 'condid', $filtertype = -1, $addempty = 0, $noinfoadmin = 0, $morecss = '')
+	{
+
+		global $langs, $user, $conf;
+		$out = '';
 		dol_syslog(__METHOD__." selected=".$selected.", htmlname=".$htmlname, LOG_DEBUG);
 
 		$this->load_cache_conditions_paiements();
@@ -3919,24 +3939,25 @@ class Form
 			$selected = $conf->global->MAIN_DEFAULT_PAYMENT_TERM_ID;
 		}
 
-		print '<select id="'.$htmlname.'" class="flat selectpaymentterms'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'">';
+		$out.=  '<select id="'.$htmlname.'" class="flat selectpaymentterms'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'">';
 		if ($addempty) {
-			print '<option value="0">&nbsp;</option>';
+			$out.=  '<option value="0">&nbsp;</option>';
 		}
 		foreach ($this->cache_conditions_paiements as $id => $arrayconditions) {
 			if ($selected == $id) {
-				print '<option value="'.$id.'" selected>';
+				$out.=  '<option value="'.$id.'" selected>';
 			} else {
-				print '<option value="'.$id.'">';
+				$out.=  '<option value="'.$id.'">';
 			}
-			print $arrayconditions['label'];
-			print '</option>';
+			$out.=  $arrayconditions['label'];
+			$out.=  '</option>';
 		}
-		print '</select>';
+		$out.=  '</select>';
 		if ($user->admin && empty($noinfoadmin)) {
-			print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			$out.=  info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 		}
-		print ajax_combobox($htmlname);
+		$out.=  ajax_combobox($htmlname);
+		return $out;
 	}
 
 
diff --git a/htdocs/core/class/html.formsetup.class.php b/htdocs/core/class/html.formsetup.class.php
index 25ab99bfe01..722d7a8f247 100644
--- a/htdocs/core/class/html.formsetup.class.php
+++ b/htdocs/core/class/html.formsetup.class.php
@@ -215,7 +215,7 @@ class FormSetup
 			$out = '<table class="noborder centpercent">';
 			$out .= '<thead>';
 			$out .= '<tr class="liste_titre">';
-			$out .= '	<td class="titlefield">' . $this->langs->trans("Parameter") . '</td>';
+			$out .= '	<td>' . $this->langs->trans("Parameter") . '</td>';
 			$out .= '	<td>' . $this->langs->trans("Value") . '</td>';
 			$out .= '</tr>';
 			$out .= '</thead>';
@@ -560,13 +560,16 @@ class FormSetupItem
 	/** @var string $helpText  */
 	public $helpText = '';
 
-	/** @var string $value  */
+	/** @var string $fieldValue  */
 	public $fieldValue;
 
+	/** @var array $fieldAttr  fields attribute only for compatible fields like input text */
+	public $fieldAttr;
+
 	/** @var bool|string set this var to override field output will override $fieldInputOverride and $fieldOutputOverride too */
 	public $fieldOverride = false;
 
-	/** @var bool|string set this var to override field output */
+	/** @var bool|string set this var to override field input */
 	public $fieldInputOverride = false;
 
 	/** @var bool|string set this var to override field output */
@@ -583,6 +586,7 @@ class FormSetupItem
 	/**
 	 * TODO each type must have setAs{type} method to help configuration
 	 *   And set var as protected when its done configuration must be done by method
+	 *   this is important for retrocompatibility of futures versions
 	 * @var string $type  'string', 'textarea', 'category:'.Categorie::TYPE_CUSTOMER', 'emailtemplate', 'thirdparty_type'
 	 */
 	protected $type = 'string';
@@ -598,9 +602,15 @@ class FormSetupItem
 	 */
 	public function __construct($confKey)
 	{
-		global $langs, $db, $conf;
+		global $langs, $db, $conf, $form;
 		$this->db = $db;
-		$this->form = new Form($this->db);
+
+		if (!empty($form) && is_object($form) && get_class($form) == 'Form') { // form class have cache inside so I use it for optimise
+			$this->form = $form;
+		} else {
+			$this->form = new Form($this->db);
+		}
+
 		$this->langs = $langs;
 		$this->entity = $conf->entity;
 
@@ -700,6 +710,10 @@ class FormSetupItem
 			return $this->fieldInputOverride;
 		}
 
+		$this->fieldAttr['name'] = $this->confKey;
+		$this->fieldAttr['id'] = 'setup-'.$this->confKey;
+		$this->fieldAttr['value'] = $this->fieldValue;
+
 		$out = '';
 
 		if ($this->type == 'title') {
@@ -726,7 +740,9 @@ class FormSetupItem
 				$out.= $this->form->select_produits($selected, $this->confKey, '', 0, 0, 1, 2, '', 0, array(), 0, '1', 0, $this->cssClass, 0, '', null, 1);
 			}
 		} else {
-			$out.= '<input name="'.$this->confKey.'"  class="flat '.(empty($this->cssClass) ? 'minwidth200' : $this->cssClass).'" value="'.$this->fieldValue.'">';
+			if (empty($this->fieldAttr)) { $this->fieldAttr['class'] = 'flat '.(empty($this->cssClass) ? 'minwidth200' : $this->cssClass); }
+
+			$out.= '<input '.FormSetup::generateAttributesStringFromArray($this->fieldAttr).' />';
 		}
 
 		return $out;

From e9e100410a814d917e452227091ab741a2618545 Mon Sep 17 00:00:00 2001
From: John BOTELLA <john.botella@atm-consulting.fr>
Date: Tue, 28 Dec 2021 14:51:19 +0100
Subject: [PATCH 032/316] Fix empty value

---
 htdocs/admin/facture_situation.php         | 4 +++-
 htdocs/core/class/html.formsetup.class.php | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/facture_situation.php b/htdocs/admin/facture_situation.php
index 636c5781b69..789faacacad 100644
--- a/htdocs/admin/facture_situation.php
+++ b/htdocs/admin/facture_situation.php
@@ -108,7 +108,9 @@ $item->fieldAttr = array(
 $item = $formSetup->newItem('INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID');
 $item->nameText = $langs->trans('PaymentConditionsShortRetainedWarranty');
 $form->load_cache_conditions_paiements();
-$item->fieldOutputOverride = $form->cache_conditions_paiements[$conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID]['label'];
+if (!empty($conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID) && isset($form->cache_conditions_paiements[$conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID]['label'])) {
+	$item->fieldOutputOverride = $form->cache_conditions_paiements[$conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID]['label'];
+}
 $item->fieldInputOverride = $form->getSelectConditionsPaiements($conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID, 'INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID', -1, 1);
 
 
diff --git a/htdocs/core/class/html.formsetup.class.php b/htdocs/core/class/html.formsetup.class.php
index 722d7a8f247..8cfab129444 100644
--- a/htdocs/core/class/html.formsetup.class.php
+++ b/htdocs/core/class/html.formsetup.class.php
@@ -605,7 +605,7 @@ class FormSetupItem
 		global $langs, $db, $conf, $form;
 		$this->db = $db;
 
-		if (!empty($form) && is_object($form) && get_class($form) == 'Form') { // form class have cache inside so I use it for optimise
+		if (!empty($form) && is_object($form) && get_class($form) == 'Form') { // the form class has a cache inside so I am using it to optimize
 			$this->form = $form;
 		} else {
 			$this->form = new Form($this->db);

From 9af621c6f882dedcaa47ec2eb6134fb0e2f7f4ee Mon Sep 17 00:00:00 2001
From: John BOTELLA <john.botella@atm-consulting.fr>
Date: Tue, 28 Dec 2021 18:43:04 +0100
Subject: [PATCH 033/316] Fix scrutinizerh

---
 htdocs/core/class/html.formsetup.class.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/html.formsetup.class.php b/htdocs/core/class/html.formsetup.class.php
index 8cfab129444..4f5557279f4 100644
--- a/htdocs/core/class/html.formsetup.class.php
+++ b/htdocs/core/class/html.formsetup.class.php
@@ -353,7 +353,8 @@ class FormSetup
 		 */
 
 		$item = new FormSetupItem($confKey);
-		$item->setTypeFromTypeString($params['type']);
+		// need to be ignored from scrutinizer setTypeFromTypeString was created as deprecated to incite developper to use object oriented usage
+		/** @scrutinizer ignore-deprecated */ $item->setTypeFromTypeString($params['type']);
 
 		if (!empty($params['enabled'])) {
 			$item->enabled = $params['enabled'];
@@ -598,7 +599,7 @@ class FormSetupItem
 	/**
 	 * Constructor
 	 *
-	 * @param $confKey the conf key used in database
+	 * @param string $confKey the conf key used in database
 	 */
 	public function __construct($confKey)
 	{

From e07905f9503b5cfeaeb798b55712d6056055c7b3 Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Wed, 29 Dec 2021 20:34:08 +0100
Subject: [PATCH 034/316] var

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

diff --git a/htdocs/theme/eldy/btn.inc.php b/htdocs/theme/eldy/btn.inc.php
index cf2f1ead60e..1b92ef80f04 100644
--- a/htdocs/theme/eldy/btn.inc.php
+++ b/htdocs/theme/eldy/btn.inc.php
@@ -5,11 +5,12 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
 /* <style type="text/css" > */
 
 :root {
-			--btncolortext:rgb(<?php print $colortextlink; ?>);
+			--btncolortext: rgb(<?php print $colortextlink; ?>);
 			--btncolorbg: #fbfbfb;
 			--btncolorborderhover: none;
 			--btncolorborder: #FFF;
 			--butactiondeletebg: rgb(234,228,225);
+			--butactionbg: rgb(<?php print $butactionbg; ?>);
 }
 
 <?php
@@ -26,6 +27,7 @@ if (!empty($conf->global->THEME_DARKMODEENABLED)) {
             --btncolorborderhover: #ffffff;
             --btncolorborder: #2b2c2e;
             --butactiondeletebg: rgb(252,84,91);
+			--butactionbg: rgb(173,140,79);
 
       }\n";
 	if ($conf->global->THEME_DARKMODEENABLED != 2) {
@@ -64,7 +66,7 @@ span.butAction, span.butActionDelete {
 	font-size: 0.9em;
 }
 .butAction {
-	background: rgb(<?php echo $butactionbg ?>);
+	background: var(--butactionbg);
 	color: #FFF !important;
 	/* background: rgb(230, 232, 239); */
 }
diff --git a/htdocs/theme/md/btn.inc.php b/htdocs/theme/md/btn.inc.php
index 5ef2dbe9e8d..867da470971 100644
--- a/htdocs/theme/md/btn.inc.php
+++ b/htdocs/theme/md/btn.inc.php
@@ -10,6 +10,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
 			--btncolorborderhover: none;
 			--btncolorborder: #FFF;
 			--butactiondeletebg: rgb(234,228,225);
+			--butactionbg: rgb(<?php print $butactionbg; ?>);
 }
 
 <?php
@@ -26,6 +27,7 @@ if (!empty($conf->global->THEME_DARKMODEENABLED)) {
             --btncolorborderhover: #ffffff;
             --btncolorborder: #2b2c2e;
             --butactiondeletebg: rgb(252,84,91);
+			--butactionbg: rgb(173,140,79);
 
       }\n";
 	if ($conf->global->THEME_DARKMODEENABLED != 2) {

From cab4b762d34208f4accd12cd54c3e552f6f4aa53 Mon Sep 17 00:00:00 2001
From: bjoern86 <github@sitemind.de>
Date: Sat, 1 Jan 2022 20:24:30 +0100
Subject: [PATCH 035/316] Adds possibility to add senders name to
 $formmail->fromname

If INVOICE_EMAIL_SENDER_NAME, SHIPPING_EMAIL_SENDER_NAME, COMMANDE_EMAIL_SENDER_NAME or ORDER_SUPPLIER_EMAIL_SENDER_NAME is beeing set, use it as sender name. If not, keep $formmail->fromname blank
---
 htdocs/core/tpl/card_presend.tpl.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index 7cc95c81fe0..ff107a0dea3 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -124,22 +124,22 @@ if ($action == 'presend') {
 
 	if ($object->element === 'facture' && !empty($conf->global->INVOICE_EMAIL_SENDER)) {
 		$formmail->frommail = $conf->global->INVOICE_EMAIL_SENDER;
-		$formmail->fromname = '';
+		(!empty($conf->global->INVOICE_EMAIL_SENDER_NAME) ? $formmail->fromname = $conf->global->INVOICE_EMAIL_SENDER_NAME : $formmail->fromname = '');
 		$formmail->fromtype = 'special';
 	}
 	if ($object->element === 'shipping' && !empty($conf->global->SHIPPING_EMAIL_SENDER)) {
 		$formmail->frommail = $conf->global->SHIPPING_EMAIL_SENDER;
-		$formmail->fromname = '';
+		(!empty($conf->global->SHIPPING_EMAIL_SENDER_NAME) ? $formmail->fromname = $conf->global->SHIPPING_EMAIL_SENDER_NAME : $formmail->fromname = '');
 		$formmail->fromtype = 'special';
 	}
 	if ($object->element === 'commande' && !empty($conf->global->COMMANDE_EMAIL_SENDER)) {
 		$formmail->frommail = $conf->global->COMMANDE_EMAIL_SENDER;
-		$formmail->fromname = '';
+		(!empty($conf->global->COMMANDE_EMAIL_SENDER_NAME) ? $formmail->fromname = $conf->global->COMMANDE_EMAIL_SENDER_NAME : $formmail->fromname = '');
 		$formmail->fromtype = 'special';
 	}
 	if ($object->element === 'order_supplier' && !empty($conf->global->ORDER_SUPPLIER_EMAIL_SENDER)) {
 		$formmail->frommail = $conf->global->ORDER_SUPPLIER_EMAIL_SENDER;
-		$formmail->fromname = '';
+		(!empty($conf->global->ORDER_SUPPLIER_EMAIL_SENDER_NAME) ? $formmail->fromname = $conf->global->ORDER_SUPPLIER_EMAIL_SENDER_NAME : $formmail->fromname = '');
 		$formmail->fromtype = 'special';
 	}
 

From b1f750ac2f55959b9f6371c04ad21bec6cd7edf2 Mon Sep 17 00:00:00 2001
From: Quentin VIAL-GOUTEYRON <quentin.vial-gouteyron@atm-consulting.fr>
Date: Tue, 4 Jan 2022 10:35:44 +0100
Subject: [PATCH 036/316] NEW: Project contact tab

---
 htdocs/contact/project.php       | 118 +++++++++++++++++++++++
 htdocs/core/lib/contact.lib.php  | 159 +++++++++++++++++++++++++++++++
 htdocs/langs/en_US/projects.lang |   1 +
 htdocs/langs/fr_FR/projects.lang |   1 +
 4 files changed, 279 insertions(+)
 create mode 100644 htdocs/contact/project.php

diff --git a/htdocs/contact/project.php b/htdocs/contact/project.php
new file mode 100644
index 00000000000..2a5888f02f5
--- /dev/null
+++ b/htdocs/contact/project.php
@@ -0,0 +1,118 @@
+<?php
+/*
+ * Copyright (C) 2021		VIAL--GOUTEYRON Quentin		<quentin.vial-gouteyron@atm-consulting.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * 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/contact/project.php
+ *  \ingroup    contact
+ *  \brief      Page of third party projects
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+
+$langs->loadLangs(array("contacts", "companies", "projects"));
+
+// Security check
+$id = GETPOST('id', 'int');
+$result = restrictedArea($user, 'contact', $id, 'socpeople&societe');
+
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('projectcontact'));
+
+/*
+ *	Actions
+ */
+
+$parameters = array('id' => $id);
+$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');
+}
+
+/*
+ *	View
+ */
+
+$form = new Form($db);
+
+if($id) {
+    require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/contact.lib.php';
+
+    $object = new Contact($db);
+
+    $result = $object->fetch($id);
+    if(empty($object->thirdparty)) {
+        $object->fetch_thirdparty();
+    }
+    $socid = $object->thirdparty->id;
+    $title = $langs->trans("Projects");
+    if(! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+        $title = $object->name." - ".$title;
+    }
+    llxHeader('', $title);
+
+    if(! empty($conf->notification->enabled)) {
+        $langs->load("mails");
+    }
+    $head = contact_prepare_head($object);
+
+    print dol_get_fiche_head($head, 'project', $langs->trans("Contact"), -1, 'contact');
+
+    $linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+
+    $morehtmlref = '<div class="refidno">';
+    if(empty($conf->global->SOCIETE_DISABLE_CONTACTS) && !empty($socid)) {
+        $object->thirdparty->fetch($socid);
+        // Thirdparty
+        $morehtmlref .= $langs->trans('ThirdParty').' : ';
+        if($object->thirdparty->id > 0) {
+            $morehtmlref .= $object->thirdparty->getNomUrl(1, 'contact');
+        }
+        else {
+            $morehtmlref .= $langs->trans("ContactNotLinkedToCompany");
+        }
+    }
+    $morehtmlref .= '</div>';
+
+    dol_banner_tab($object, 'id', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom', $morehtmlref);
+
+    print '<div class="fichecenter">';
+
+    print '<div class="underbanner clearboth"></div>';
+    print '<table class="border centpercent tableforfield">';
+
+// Civility
+    print '<tr><td class="titlefield">'.$langs->trans("UserTitle").'</td><td>';
+    print $object->getCivilityLabel();
+    print '</td></tr>';
+
+    print '</table>';
+
+    print '</div>';
+
+    print dol_get_fiche_end();
+    print '<br>';
+
+    // Projects list
+    $result = show_contacts_projects($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?id='.$object->id, 1);
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/core/lib/contact.lib.php b/htdocs/core/lib/contact.lib.php
index c60cb0c8c18..e2f735dc25d 100644
--- a/htdocs/core/lib/contact.lib.php
+++ b/htdocs/core/lib/contact.lib.php
@@ -57,6 +57,40 @@ function contact_prepare_head(Contact $object)
 	$head[$tab][2] = 'perso';
 	$tab++;
 
+    if (!empty($conf->projet->enabled) && (!empty($user->rights->projet->lire))) {
+		$nbProject = 0;
+		// Enable caching of thirdrparty count projects
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
+		$cachekey = 'count_projects_contact_'.$object->id;
+		$dataretrieved = dol_getcache($cachekey);
+
+		if (!is_null($dataretrieved)) {
+			$nbProject = $dataretrieved;
+		} else {
+            $sql = 'SELECT COUNT(n.rowid) as nb';
+            $sql .= ' FROM '.MAIN_DB_PREFIX.'projet as n';
+            $sql .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact as cc ON (n.rowid = cc.element_id)';
+            $sql .= ' WHERE cc.fk_socpeople = '.((int) $object->id);
+            $sql .= ' AND cc.fk_c_type_contact IN (SELECT rowid FROM '.MAIN_DB_PREFIX.'c_type_contact WHERE element="project" AND source="external")';
+            $sql .= ' AND n.entity IN ('.getEntity('project').')';
+			$resql = $db->query($sql);
+			if ($resql) {
+				$obj = $db->fetch_object($resql);
+				$nbProject = $obj->nb;
+			} else {
+				dol_print_error($db);
+			}
+			dol_setcache($cachekey, $nbProject, 120);	// If setting cache fails, this is not a problem, so we do not test result.
+		}
+		$head[$tab][0] = DOL_URL_ROOT.'/contact/project.php?id='.$object->id;
+		$head[$tab][1] = $langs->trans("Projects");
+		if ($nbProject > 0) {
+			$head[$tab][1] .= '<span class="badge marginleftonlyshort">'.$nbProject.'</span>';
+		}
+		$head[$tab][2] = 'project';
+		$tab++;
+	}
+
 	// Related items
 	if (!empty($conf->commande->enabled) || !empty($conf->propal->enabled) || !empty($conf->facture->enabled) || !empty($conf->ficheinter->enabled) || (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) {
 		$head[$tab][0] = DOL_URL_ROOT.'/contact/consumption.php?id='.$object->id;
@@ -117,3 +151,128 @@ function contact_prepare_head(Contact $object)
 
 	return $head;
 }
+
+/**
+ * 		Show html area for list of projects
+ *
+ *		@param	Conf		$conf			Object conf
+ * 		@param	Translate	$langs			Object langs
+ * 		@param	DoliDB		$db				Database handler
+ * 		@param	Object		$object			Third party object
+ *      @param  string		$backtopage		Url to go once contact is created
+ *      @param  int         $nocreatelink   1=Hide create project link
+ *      @param	string		$morehtmlright	More html on right of title
+ *      @return	int
+ */
+function show_contacts_projects($conf, $langs, $db, $object, $backtopage = '', $nocreatelink = 0, $morehtmlright = '')
+{
+	global $user;
+
+	$i = -1;
+
+	if (!empty($conf->projet->enabled) && $user->rights->projet->lire) {
+		$langs->load("projects");
+
+		$newcardbutton = '';
+		if (!empty($conf->projet->enabled) && $user->rights->projet->creer && empty($nocreatelink)) {
+			$newcardbutton .= dolGetButtonTitle($langs->trans('AddProject'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/projet/card.php?socid='.$object->id.'&amp;action=create&amp;backtopage='.urlencode($backtopage));
+		}
+
+		print "\n";
+		print load_fiche_titre($langs->trans("ProjectsHavingThisContact"), $newcardbutton.$morehtmlright, '');
+		print '<div class="div-table-responsive">';
+		print "\n".'<table class="noborder" width=100%>';
+
+		$sql  = 'SELECT p.rowid as id, p.entity, p.title, p.ref, p.public, p.dateo as do, p.datee as de, p.fk_statut as status, p.fk_opp_status, p.opp_amount, p.opp_percent, p.tms as date_update, p.budget_amount';
+        $sql .= ', cls.code as opp_status_code';
+        $sql .= ' FROM '.MAIN_DB_PREFIX.'projet as p';
+        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_lead_status as cls on p.fk_opp_status = cls.rowid';
+        $sql .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact as cc ON (p.rowid = cc.element_id)';
+        $sql .= ' WHERE cc.fk_socpeople = '.((int) $object->id);
+        $sql .= ' AND cc.fk_c_type_contact IN (SELECT rowid FROM '.MAIN_DB_PREFIX.'c_type_contact WHERE element="project" AND source="external")';
+        $sql .= ' AND p.entity IN ('.getEntity('project').')';
+        $sql .= ' ORDER BY p.dateo DESC';
+
+		$result = $db->query($sql);
+		if ($result) {
+			$num = $db->num_rows($result);
+
+			print '<tr class="liste_titre">';
+			print '<td>'.$langs->trans("Ref").'</td>';
+			print '<td>'.$langs->trans("Name").'</td>';
+			print '<td class="center">'.$langs->trans("DateStart").'</td>';
+			print '<td class="center">'.$langs->trans("DateEnd").'</td>';
+			print '<td class="right">'.$langs->trans("OpportunityAmountShort").'</td>';
+			print '<td class="center">'.$langs->trans("OpportunityStatusShort").'</td>';
+			print '<td class="right">'.$langs->trans("OpportunityProbabilityShort").'</td>';
+			print '<td class="right">'.$langs->trans("Status").'</td>';
+			print '</tr>';
+
+			if ($num > 0) {
+				require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+
+				$projecttmp = new Project($db);
+
+				$i = 0;
+
+				while ($i < $num) {
+					$obj = $db->fetch_object($result);
+					$projecttmp->fetch($obj->id);
+
+					// To verify role of users
+					$userAccess = $projecttmp->restrictedProjectArea($user);
+
+					if ($user->rights->projet->lire && $userAccess > 0) {
+						print '<tr class="oddeven">';
+
+						// Ref
+						print '<td>';
+						print $projecttmp->getNomUrl(1);
+						print '</td>';
+
+						// Label
+						print '<td>'.$obj->title.'</td>';
+						// Date start
+						print '<td class="center">'.dol_print_date($db->jdate($obj->do), "day").'</td>';
+						// Date end
+						print '<td class="center">'.dol_print_date($db->jdate($obj->de), "day").'</td>';
+						// Opp amount
+						print '<td class="right">';
+						if ($obj->opp_status_code) {
+							print price($obj->opp_amount, 1, '', 1, -1, -1, '');
+						}
+						print '</td>';
+						// Opp status
+						print '<td class="center">';
+						if ($obj->opp_status_code) {
+							print $langs->trans("OppStatus".$obj->opp_status_code);
+						}
+						print '</td>';
+						// Opp percent
+						print '<td class="right">';
+						if ($obj->opp_percent) {
+							print price($obj->opp_percent, 1, '', 1, 0).'%';
+						}
+						print '</td>';
+						// Status
+						print '<td class="right">'.$projecttmp->getLibStatut(5).'</td>';
+
+						print '</tr>';
+					}
+					$i++;
+				}
+			} else {
+				print '<tr class="oddeven"><td colspan="8"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
+			}
+			$db->free($result);
+		} else {
+			dol_print_error($db);
+		}
+		print "</table>";
+		print '</div>';
+
+		print "<br>\n";
+	}
+
+	return $i;
+}
\ No newline at end of file
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index c19f32a0396..517eb09ae2d 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them 
 ProjectTasksWithoutTimeSpent=Project tasks without time spent
 FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+ProjectsHavingThisContact=Projects having this contact
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang
index b158ed28334..dc8ecb24b55 100644
--- a/htdocs/langs/fr_FR/projects.lang
+++ b/htdocs/langs/fr_FR/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Remarque : les projets existant
 SelectLinesOfTimeSpentToInvoice=Sélectionnez les lignes de temps passé non facturées, puis l'action groupée "Générer la facture" pour les facturer
 ProjectTasksWithoutTimeSpent=Tâches de projet sans temps consommé
 FormForNewLeadDesc=Veuillez remplir ce formulaire de contact ou écrivez un e-mail à <b>%s</b>.
+ProjectsHavingThisContact=Projets ayant ce contact associé
\ No newline at end of file

From f0677ed665280517df698247585fb018a033216b Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Tue, 4 Jan 2022 09:42:24 +0000
Subject: [PATCH 037/316] Fixing style errors.

---
 htdocs/contact/project.php      | 97 ++++++++++++++++-----------------
 htdocs/core/lib/contact.lib.php | 32 +++++------
 2 files changed, 64 insertions(+), 65 deletions(-)

diff --git a/htdocs/contact/project.php b/htdocs/contact/project.php
index 2a5888f02f5..b05709f019a 100644
--- a/htdocs/contact/project.php
+++ b/htdocs/contact/project.php
@@ -40,8 +40,8 @@ $hookmanager->initHooks(array('projectcontact'));
 
 $parameters = array('id' => $id);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if($reshook < 0) {
-    setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
 
 /*
@@ -50,67 +50,66 @@ if($reshook < 0) {
 
 $form = new Form($db);
 
-if($id) {
-    require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/lib/contact.lib.php';
+if ($id) {
+	require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/contact.lib.php';
 
-    $object = new Contact($db);
+	$object = new Contact($db);
 
-    $result = $object->fetch($id);
-    if(empty($object->thirdparty)) {
-        $object->fetch_thirdparty();
-    }
-    $socid = $object->thirdparty->id;
-    $title = $langs->trans("Projects");
-    if(! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
-        $title = $object->name." - ".$title;
-    }
-    llxHeader('', $title);
+	$result = $object->fetch($id);
+	if (empty($object->thirdparty)) {
+		$object->fetch_thirdparty();
+	}
+	$socid = $object->thirdparty->id;
+	$title = $langs->trans("Projects");
+	if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+		$title = $object->name." - ".$title;
+	}
+	llxHeader('', $title);
 
-    if(! empty($conf->notification->enabled)) {
-        $langs->load("mails");
-    }
-    $head = contact_prepare_head($object);
+	if (! empty($conf->notification->enabled)) {
+		$langs->load("mails");
+	}
+	$head = contact_prepare_head($object);
 
-    print dol_get_fiche_head($head, 'project', $langs->trans("Contact"), -1, 'contact');
+	print dol_get_fiche_head($head, 'project', $langs->trans("Contact"), -1, 'contact');
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    $morehtmlref = '<div class="refidno">';
-    if(empty($conf->global->SOCIETE_DISABLE_CONTACTS) && !empty($socid)) {
-        $object->thirdparty->fetch($socid);
-        // Thirdparty
-        $morehtmlref .= $langs->trans('ThirdParty').' : ';
-        if($object->thirdparty->id > 0) {
-            $morehtmlref .= $object->thirdparty->getNomUrl(1, 'contact');
-        }
-        else {
-            $morehtmlref .= $langs->trans("ContactNotLinkedToCompany");
-        }
-    }
-    $morehtmlref .= '</div>';
+	$morehtmlref = '<div class="refidno">';
+	if (empty($conf->global->SOCIETE_DISABLE_CONTACTS) && !empty($socid)) {
+		$object->thirdparty->fetch($socid);
+		// Thirdparty
+		$morehtmlref .= $langs->trans('ThirdParty').' : ';
+		if ($object->thirdparty->id > 0) {
+			$morehtmlref .= $object->thirdparty->getNomUrl(1, 'contact');
+		} else {
+			$morehtmlref .= $langs->trans("ContactNotLinkedToCompany");
+		}
+	}
+	$morehtmlref .= '</div>';
 
-    dol_banner_tab($object, 'id', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom', $morehtmlref);
+	dol_banner_tab($object, 'id', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom', $morehtmlref);
 
-    print '<div class="fichecenter">';
+	print '<div class="fichecenter">';
 
-    print '<div class="underbanner clearboth"></div>';
-    print '<table class="border centpercent tableforfield">';
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border centpercent tableforfield">';
 
-// Civility
-    print '<tr><td class="titlefield">'.$langs->trans("UserTitle").'</td><td>';
-    print $object->getCivilityLabel();
-    print '</td></tr>';
+	// Civility
+	print '<tr><td class="titlefield">'.$langs->trans("UserTitle").'</td><td>';
+	print $object->getCivilityLabel();
+	print '</td></tr>';
 
-    print '</table>';
+	print '</table>';
 
-    print '</div>';
+	print '</div>';
 
-    print dol_get_fiche_end();
-    print '<br>';
+	print dol_get_fiche_end();
+	print '<br>';
 
-    // Projects list
-    $result = show_contacts_projects($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?id='.$object->id, 1);
+	// Projects list
+	$result = show_contacts_projects($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?id='.$object->id, 1);
 }
 
 // End of page
diff --git a/htdocs/core/lib/contact.lib.php b/htdocs/core/lib/contact.lib.php
index e2f735dc25d..ba116d3b904 100644
--- a/htdocs/core/lib/contact.lib.php
+++ b/htdocs/core/lib/contact.lib.php
@@ -57,7 +57,7 @@ function contact_prepare_head(Contact $object)
 	$head[$tab][2] = 'perso';
 	$tab++;
 
-    if (!empty($conf->projet->enabled) && (!empty($user->rights->projet->lire))) {
+	if (!empty($conf->projet->enabled) && (!empty($user->rights->projet->lire))) {
 		$nbProject = 0;
 		// Enable caching of thirdrparty count projects
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
@@ -67,12 +67,12 @@ function contact_prepare_head(Contact $object)
 		if (!is_null($dataretrieved)) {
 			$nbProject = $dataretrieved;
 		} else {
-            $sql = 'SELECT COUNT(n.rowid) as nb';
-            $sql .= ' FROM '.MAIN_DB_PREFIX.'projet as n';
-            $sql .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact as cc ON (n.rowid = cc.element_id)';
-            $sql .= ' WHERE cc.fk_socpeople = '.((int) $object->id);
-            $sql .= ' AND cc.fk_c_type_contact IN (SELECT rowid FROM '.MAIN_DB_PREFIX.'c_type_contact WHERE element="project" AND source="external")';
-            $sql .= ' AND n.entity IN ('.getEntity('project').')';
+			$sql = 'SELECT COUNT(n.rowid) as nb';
+			$sql .= ' FROM '.MAIN_DB_PREFIX.'projet as n';
+			$sql .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact as cc ON (n.rowid = cc.element_id)';
+			$sql .= ' WHERE cc.fk_socpeople = '.((int) $object->id);
+			$sql .= ' AND cc.fk_c_type_contact IN (SELECT rowid FROM '.MAIN_DB_PREFIX.'c_type_contact WHERE element="project" AND source="external")';
+			$sql .= ' AND n.entity IN ('.getEntity('project').')';
 			$resql = $db->query($sql);
 			if ($resql) {
 				$obj = $db->fetch_object($resql);
@@ -184,14 +184,14 @@ function show_contacts_projects($conf, $langs, $db, $object, $backtopage = '', $
 		print "\n".'<table class="noborder" width=100%>';
 
 		$sql  = 'SELECT p.rowid as id, p.entity, p.title, p.ref, p.public, p.dateo as do, p.datee as de, p.fk_statut as status, p.fk_opp_status, p.opp_amount, p.opp_percent, p.tms as date_update, p.budget_amount';
-        $sql .= ', cls.code as opp_status_code';
-        $sql .= ' FROM '.MAIN_DB_PREFIX.'projet as p';
-        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_lead_status as cls on p.fk_opp_status = cls.rowid';
-        $sql .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact as cc ON (p.rowid = cc.element_id)';
-        $sql .= ' WHERE cc.fk_socpeople = '.((int) $object->id);
-        $sql .= ' AND cc.fk_c_type_contact IN (SELECT rowid FROM '.MAIN_DB_PREFIX.'c_type_contact WHERE element="project" AND source="external")';
-        $sql .= ' AND p.entity IN ('.getEntity('project').')';
-        $sql .= ' ORDER BY p.dateo DESC';
+		$sql .= ', cls.code as opp_status_code';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'projet as p';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_lead_status as cls on p.fk_opp_status = cls.rowid';
+		$sql .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact as cc ON (p.rowid = cc.element_id)';
+		$sql .= ' WHERE cc.fk_socpeople = '.((int) $object->id);
+		$sql .= ' AND cc.fk_c_type_contact IN (SELECT rowid FROM '.MAIN_DB_PREFIX.'c_type_contact WHERE element="project" AND source="external")';
+		$sql .= ' AND p.entity IN ('.getEntity('project').')';
+		$sql .= ' ORDER BY p.dateo DESC';
 
 		$result = $db->query($sql);
 		if ($result) {
@@ -275,4 +275,4 @@ function show_contacts_projects($conf, $langs, $db, $object, $backtopage = '', $
 	}
 
 	return $i;
-}
\ No newline at end of file
+}

From 8034b5316a777596b817e02133f90dc4d9565387 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Tue, 4 Jan 2022 12:05:06 +0100
Subject: [PATCH 038/316] NEW Add possibility with constant
 MAIN_LOGIN_BADCHARUNAUTHORIZED to define bad character unauthorized into
 login name

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

diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 780744b4c8e..4da393f6564 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1393,6 +1393,8 @@ class User extends CommonObject
 
 		dol_syslog(get_class($this)."::create login=".$this->login.", user=".(is_object($user) ? $user->id : ''), LOG_DEBUG);
 
+		$badCharUnauthorizedIntoLoginName = getDolGlobalString('MAIN_LOGIN_BADCHARUNAUTHORIZED', '/[,@<>"\']/');
+
 		// Check parameters
 		if (!empty($conf->global->USER_MAIL_REQUIRED) && !isValidEMail($this->email)) {
 			$langs->load("errors");
@@ -1403,7 +1405,7 @@ class User extends CommonObject
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Login"));
 			return -1;
-		} elseif (preg_match('/[,@<>"\']/', $this->login)) {
+		} elseif (preg_match($badCharUnauthorizedIntoLoginName, $this->login)) {
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorBadCharIntoLoginName");
 			return -1;
@@ -1787,6 +1789,8 @@ class User extends CommonObject
 		$this->fk_warehouse = (int) $this->fk_warehouse;
 
 		// Check parameters
+		$badCharUnauthorizedIntoLoginName = getDolGlobalString('MAIN_LOGIN_BADCHARUNAUTHORIZED', '/[,@<>"\']/');
+
 		if (!empty($conf->global->USER_MAIL_REQUIRED) && !isValidEMail($this->email)) {
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorBadEMail", $this->email);
@@ -1796,7 +1800,7 @@ class User extends CommonObject
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorFieldRequired", 'Login');
 			return -1;
-		} elseif (preg_match('/[,@<>"\']/', $this->login)) {
+		} elseif (preg_match($badCharUnauthorizedIntoLoginName, $this->login)) {
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorBadCharIntoLoginName");
 			return -1;

From 7a4b0e38cdd8d7050ca6cbee4d51a743d42bb4f9 Mon Sep 17 00:00:00 2001
From: Quentin VIAL-GOUTEYRON <quentin.vial-gouteyron@atm-consulting.fr>
Date: Wed, 5 Jan 2022 14:35:11 +0100
Subject: [PATCH 039/316] NEW : Contact filter project list

---
 htdocs/core/class/html.form.class.php | 17 +++++++++++------
 htdocs/langs/en_US/projects.lang      |  1 +
 htdocs/langs/fr_FR/projects.lang      |  1 +
 htdocs/projet/list.php                | 26 +++++++++++++++++++++++---
 4 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 89c45d4236b..dfd22cd644f 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1690,12 +1690,17 @@ class Form
 				$out .= '<select class="flat'.($moreclass ? ' '.$moreclass : '').'" id="'.$htmlid.'" name="'.$htmlname.(($num || empty($disableifempty)) ? '' : ' disabled').($multiple ? '[]' : '').'" '.($multiple ? 'multiple' : '').' '.(!empty($moreparam) ? $moreparam : '').'>';
 			}
 
-			if (($showempty == 1 || ($showempty == 3 && $num > 1)) && !$multiple) {
-				$out .= '<option value="0"'.(in_array(0, $selected) ? ' selected' : '').'>&nbsp;</option>';
-			}
-			if ($showempty == 2) {
-				$out .= '<option value="0"'.(in_array(0, $selected) ? ' selected' : '').'>-- '.$langs->trans("Internal").' --</option>';
-			}
+            if($showempty && !is_numeric($showempty)) {
+                    $textforempty = $showempty;
+                    $out .= '<option class="optiongrey" value="-1"'.(in_array(-1, $selected) ? ' selected' : '').'>'.$textforempty.'</option>';
+            } else {
+                if(($showempty == 1 || ($showempty == 3 && $num > 1)) && ! $multiple) {
+                    $out .= '<option value="0"'.(in_array(0, $selected) ? ' selected' : '').'>&nbsp;</option>';
+                }
+                if($showempty == 2) {
+                    $out .= '<option value="0"'.(in_array(0, $selected) ? ' selected' : '').'>-- '.$langs->trans("Internal").' --</option>';
+                }
+            }
 
 			$i = 0;
 			if ($num) {
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index c19f32a0396..fe0197d8739 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -197,6 +197,7 @@ InputPerMonth=Input per month
 InputDetail=Input detail
 TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=Projects with this user as contact
+ProjectsWithThisContact=Projects with this contact
 TasksWithThisUserAsContact=Tasks assigned to this user
 ResourceNotAssignedToProject=Not assigned to project
 ResourceNotAssignedToTheTask=Not assigned to the task
diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang
index b158ed28334..39112b60bd7 100644
--- a/htdocs/langs/fr_FR/projects.lang
+++ b/htdocs/langs/fr_FR/projects.lang
@@ -197,6 +197,7 @@ InputPerMonth=Saisie par mois
 InputDetail=Saisir le détail
 TimeAlreadyRecorded=C'est le temps passé déjà enregistré pour cette tâche/jour et pour l'utilisateur %s
 ProjectsWithThisUserAsContact=Projets avec cet utilisateur comme contact
+ProjectsWithThisContact=Projets avec ce contact
 TasksWithThisUserAsContact=Tâches assignées à cet utilisateur
 ResourceNotAssignedToProject=Non assigné au projet
 ResourceNotAssignedToTheTask=Non assigné à la tache
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 4078afb20c0..2f99fd99b4a 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -98,6 +98,7 @@ $search_opp_amount = GETPOST("search_opp_amount", 'alpha');
 $search_budget_amount = GETPOST("search_budget_amount", 'alpha');
 $search_public = GETPOST("search_public", 'int');
 $search_project_user = GETPOST('search_project_user', 'int');
+$search_project_contact = GETPOST('search_project_contact', 'int');
 $search_sale = GETPOST('search_sale', 'int');
 $search_usage_opportunity = GETPOST('search_usage_opportunity', 'int');
 $search_usage_task = GETPOST('search_usage_task', 'int');
@@ -252,6 +253,7 @@ if (empty($reshook)) {
 		$search_public = "";
 		$search_sale = "";
 		$search_project_user = '';
+		$search_project_contact = '';
 		$search_sday = "";
 		$search_smonth = "";
 		$search_syear = "";
@@ -363,13 +365,14 @@ if (empty($user->rights->projet->all->lire)) {
 
 // Get id of types of contacts for projects (This list never contains a lot of elements)
 $listofprojectcontacttype = array();
-$sql = "SELECT ctc.rowid, ctc.code FROM ".MAIN_DB_PREFIX."c_type_contact as ctc";
+$listofprojectcontacttypeexternal = array();
+$sql = "SELECT ctc.rowid, ctc.code, ctc.source FROM ".MAIN_DB_PREFIX."c_type_contact as ctc";
 $sql .= " WHERE ctc.element = '".$db->escape($object->element)."'";
-$sql .= " AND ctc.source = 'internal'";
 $resql = $db->query($sql);
 if ($resql) {
 	while ($obj = $db->fetch_object($resql)) {
-		$listofprojectcontacttype[$obj->rowid] = $obj->code;
+		if($obj->source == 'internal') $listofprojectcontacttype[$obj->rowid] = $obj->code;
+		else $listofprojectcontacttypeexternal[$obj->rowid] = $obj->code;
 	}
 } else {
 	dol_print_error($db);
@@ -377,6 +380,9 @@ if ($resql) {
 if (count($listofprojectcontacttype) == 0) {
 	$listofprojectcontacttype[0] = '0'; // To avoid sql syntax error if not found
 }
+if (count($listofprojectcontacttypeexternal) == 0) {
+	$listofprojectcontacttypeexternal[0] = '0'; // To avoid sql syntax error if not found
+}
 
 $distinct = 'DISTINCT'; // We add distinct until we are added a protection to be sure a contact of a project and task is only once.
 $sql = "SELECT ".$distinct." p.rowid as id, p.ref, p.title, p.fk_statut as status, p.fk_opp_status, p.public, p.fk_user_creat,";
@@ -417,6 +423,9 @@ if ($search_sale > 0) {
 if ($search_project_user > 0) {
 	$sql .= ", ".MAIN_DB_PREFIX."element_contact as ecp";
 }
+if ($search_project_contact > 0) {
+	$sql .= ", ".MAIN_DB_PREFIX."element_contact as ecp_contact";
+}
 $sql .= " WHERE p.entity IN (".getEntity('project').')';
 if (!empty($conf->categorie->enabled)) {
 	$sql .= Categorie::getFilterSelectQuery(Categorie::TYPE_PROJECT, "p.rowid", $search_category_array);
@@ -501,6 +510,9 @@ if ($search_sale > 0) {
 if ($search_project_user > 0) {
 	$sql .= " AND ecp.fk_c_type_contact IN (".$db->sanitize(join(',', array_keys($listofprojectcontacttype))).") AND ecp.element_id = p.rowid AND ecp.fk_socpeople = ".((int) $search_project_user);
 }
+if ($search_project_contact > 0) {
+	$sql .= " AND ecp_contact.fk_c_type_contact IN (".$db->sanitize(join(',', array_keys($listofprojectcontacttypeexternal))).") AND ecp_contact.element_id = p.rowid AND ecp_contact.fk_socpeople = ".((int) $search_project_contact);
+}
 if ($search_opp_amount != '') {
 	$sql .= natural_search('p.opp_amount', $search_opp_amount, 1);
 }
@@ -689,6 +701,9 @@ if ($search_public != '') {
 if ($search_project_user != '') {
 	$param .= '&search_project_user='.urlencode($search_project_user);
 }
+if ($search_project_contact != '') {
+	$param .= '&search_project_user='.urlencode($search_project_contact);
+}
 if ($search_sale > 0) {
 	$param .= '&search_sale='.urlencode($search_sale);
 }
@@ -808,6 +823,11 @@ if (empty($user->rights->user->user->lire)) {
 $moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form->select_dolusers($search_project_user ? $search_project_user : '', 'search_project_user', $tmptitle, '', 0, $includeonly, '', 0, 0, 0, '', 0, '', 'maxwidth250');
 $moreforfilter .= '</div>';
 
+$moreforfilter .= '<div class="divsearchfield">';
+$tmptitle = $langs->trans('ProjectsWithThisContact');
+$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form->selectcontacts(0, $search_project_contact ? $search_project_contact : '', 'search_project_contact', $tmptitle);
+$moreforfilter .= '</div>';
+
 // If the user can view thirdparties other than his'
 if ($user->rights->societe->client->voir || $socid) {
 	$langs->load("commercial");

From 446ba2a416dc802b2bd525835d662a1c5807dc12 Mon Sep 17 00:00:00 2001
From: Quentin VIAL-GOUTEYRON <quentin.vial-gouteyron@atm-consulting.fr>
Date: Wed, 5 Jan 2022 15:33:05 +0100
Subject: [PATCH 040/316] FIX stickler

---
 htdocs/core/class/html.form.class.php | 23 ++++++++++++-----------
 htdocs/projet/list.php                |  2 +-
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index dfd22cd644f..3b46c69f4c0 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1690,17 +1690,18 @@ class Form
 				$out .= '<select class="flat'.($moreclass ? ' '.$moreclass : '').'" id="'.$htmlid.'" name="'.$htmlname.(($num || empty($disableifempty)) ? '' : ' disabled').($multiple ? '[]' : '').'" '.($multiple ? 'multiple' : '').' '.(!empty($moreparam) ? $moreparam : '').'>';
 			}
 
-            if($showempty && !is_numeric($showempty)) {
-                    $textforempty = $showempty;
-                    $out .= '<option class="optiongrey" value="-1"'.(in_array(-1, $selected) ? ' selected' : '').'>'.$textforempty.'</option>';
-            } else {
-                if(($showempty == 1 || ($showempty == 3 && $num > 1)) && ! $multiple) {
-                    $out .= '<option value="0"'.(in_array(0, $selected) ? ' selected' : '').'>&nbsp;</option>';
-                }
-                if($showempty == 2) {
-                    $out .= '<option value="0"'.(in_array(0, $selected) ? ' selected' : '').'>-- '.$langs->trans("Internal").' --</option>';
-                }
-            }
+			if ($showempty && ! is_numeric($showempty)) {
+				$textforempty = $showempty;
+				$out .= '<option class="optiongrey" value="-1"'.(in_array(-1, $selected) ? ' selected' : '').'>'.$textforempty.'</option>';
+			}
+			else {
+				if (($showempty == 1 || ($showempty == 3 && $num > 1)) && ! $multiple) {
+					$out .= '<option value="0"'.(in_array(0, $selected) ? ' selected' : '').'>&nbsp;</option>';
+				}
+				if ($showempty == 2) {
+					$out .= '<option value="0"'.(in_array(0, $selected) ? ' selected' : '').'>-- '.$langs->trans("Internal").' --</option>';
+				}
+			}
 
 			$i = 0;
 			if ($num) {
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 2f99fd99b4a..bd7442b1827 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -371,7 +371,7 @@ $sql .= " WHERE ctc.element = '".$db->escape($object->element)."'";
 $resql = $db->query($sql);
 if ($resql) {
 	while ($obj = $db->fetch_object($resql)) {
-		if($obj->source == 'internal') $listofprojectcontacttype[$obj->rowid] = $obj->code;
+		if ($obj->source == 'internal') $listofprojectcontacttype[$obj->rowid] = $obj->code;
 		else $listofprojectcontacttypeexternal[$obj->rowid] = $obj->code;
 	}
 } else {

From c66e26cfd9d1b5ea5f1ea8c1270a6bd22418627d Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Thu, 6 Jan 2022 21:38:57 +0100
Subject: [PATCH 041/316] display product ref for Object link product tab

---
 htdocs/product/stats/bom.php | 35 +++++++++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/htdocs/product/stats/bom.php b/htdocs/product/stats/bom.php
index ef4923e89be..93f3be2a3ea 100644
--- a/htdocs/product/stats/bom.php
+++ b/htdocs/product/stats/bom.php
@@ -129,11 +129,11 @@ if ($id > 0 || !empty($ref)) {
 		//Calcul total qty and amount for global if full scan list
 		$total_qty_toconsume = 0;
 		$total_qty_toproduce = 0;
+		$product_cache=array();
 		$bom_data_result = array();
 
-
 		//Qauntity  to produce
-		$sql = "SELECT b.rowid as rowid, b.ref, b.status, b.date_valid,";
+		$sql = "SELECT b.rowid as rowid, b.ref, b.status, b.date_valid, b.fk_product,";
 		$sql .= " b.qty as qty_toproduce";
 		$sql .= " FROM ".MAIN_DB_PREFIX."bom_bom as b";
 		$sql .= " WHERE ";
@@ -166,7 +166,19 @@ if ($id > 0 || !empty($ref)) {
 					$objp = $db->fetch_object($result);
 					$bomtmp->id = $objp->rowid;
 					$bomtmp->ref = $objp->ref;
+					$product = new Product($db);
+					if (!empty($objp->fk_product)) {
+						if (!array_key_exists($product->id, $product_cache)) {
+							$resultFetch = $product->fetch($objp->fk_product);
+							if ($resultFetch < 0) {
+								setEventMessages($product->error, $product->errors, 'errors');
+							} else {
+								$product_cache[$product->id] = $product;
+							}
+						}
+					}
 					$bom_data_result[$objp->rowid]['link'] = $bomtmp->getNomUrl(1, 'production');
+					$bom_data_result[$objp->rowid]['product'] = (array_key_exists($objp->fk_product, $product_cache)? $product_cache[$objp->fk_product]->getNomUrl(1): '');
 					$bom_data_result[$objp->rowid]['qty_toproduce'] += ($objp->qty_toproduce > 0 ? $objp->qty_toproduce : 0);
 					$bom_data_result[$objp->rowid]['qty_toconsume'] = 0;
 					$bom_data_result[$objp->rowid]['date_valid'] = dol_print_date($db->jdate($objp->date_valid), 'dayhour');
@@ -180,7 +192,7 @@ if ($id > 0 || !empty($ref)) {
 		$db->free($result);
 
 		//Qauntity  to consume
-		$sql = "SELECT b.rowid as rowid, b.ref, b.status, b.date_valid,";
+		$sql = "SELECT b.rowid as rowid, b.ref, b.status, b.date_valid, b.fk_product,";
 		$sql .= " SUM(bl.qty) as qty_toconsume";
 		$sql .= " FROM ".MAIN_DB_PREFIX."bom_bom as b";
 		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."bom_bomline as bl ON bl.fk_bom=b.rowid";
@@ -214,9 +226,21 @@ if ($id > 0 || !empty($ref)) {
 					$objp = $db->fetch_object($result);
 					$bomtmp->id = $objp->rowid;
 					$bomtmp->ref = $objp->ref;
+					$product = new Product($db);
+					if (!empty($objp->fk_product)) {
+						if (!array_key_exists($product->id, $product_cache)) {
+							$resultFetch = $product->fetch($objp->fk_product);
+							if ($resultFetch < 0) {
+								setEventMessages($product->error, $product->errors, 'errors');
+							} else {
+								$product_cache[$product->id] = $product;
+							}
+						}
+					}
 
 					if (!array_key_exists($objp->rowid, $bom_data_result)) {
 						$bom_data_result[$objp->rowid]['link'] = $bomtmp->getNomUrl(1, 'production');
+						$bom_data_result[$objp->rowid]['product'] = (array_key_exists($objp->fk_product, $product_cache)? $product_cache[$objp->fk_product]->getNomUrl(1): '');
 						$bom_data_result[$objp->rowid]['qty_toproduce'] = 0;
 						$bom_data_result[$objp->rowid]['qty_toconsume'] += ($objp->qty_toconsume > 0 ? $objp->qty_toconsume : 0);
 						$bom_data_result[$objp->rowid]['date_valid'] = dol_print_date($db->jdate($objp->date_valid), 'dayhour');
@@ -232,7 +256,6 @@ if ($id > 0 || !empty($ref)) {
 		}
 		$db->free($result);
 
-
 		if ($limit > 0 && $limit != $conf->liste_limit) {
 			$option .= '&limit='.urlencode($limit);
 		}
@@ -265,6 +288,7 @@ if ($id > 0 || !empty($ref)) {
 
 		print '<tr class="liste_titre">';
 		print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "b.rowid", "", "&amp;id=".$product->id, '', $sortfield, $sortorder);
+		print_liste_field_titre("Product", $_SERVER["PHP_SELF"], "b.fk_product", "", "&amp;id=".$product->id, '', $sortfield, $sortorder);
 		print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "b.date_valid", "", "&amp;id=".$product->id, 'align="center"', $sortfield, $sortorder);
 		print_liste_field_titre("RowMaterial", $_SERVER["PHP_SELF"], "", "", "&amp;id=".$product->id, '', $sortfield, $sortorder, 'center ');
 		print_liste_field_titre("Finished", $_SERVER["PHP_SELF"], "", "", "&amp;id=".$product->id, '', $sortfield, $sortorder, 'center ');
@@ -277,6 +301,9 @@ if ($id > 0 || !empty($ref)) {
 				print '<td>';
 				print $data['link'];
 				print "</td>\n";
+				print '<td>';
+				print $data['product'];
+				print "</td>\n";
 				print "<td align=\"center\">";
 				print $data['date_valid']."</td>";
 				print '<td class="center">'.$data['qty_toconsume'].'</td>';

From 5fc0f18b0bc997ead31cb6b1cbf00dfd7048169f Mon Sep 17 00:00:00 2001
From: Quentin VIAL-GOUTEYRON <quentin.vial-gouteyron@atm-consulting.fr>
Date: Fri, 7 Jan 2022 10:17:00 +0100
Subject: [PATCH 042/316] add column contact type

---
 htdocs/core/lib/contact.lib.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/contact.lib.php b/htdocs/core/lib/contact.lib.php
index e2f735dc25d..a97a59a3da3 100644
--- a/htdocs/core/lib/contact.lib.php
+++ b/htdocs/core/lib/contact.lib.php
@@ -184,12 +184,13 @@ function show_contacts_projects($conf, $langs, $db, $object, $backtopage = '', $
 		print "\n".'<table class="noborder" width=100%>';
 
 		$sql  = 'SELECT p.rowid as id, p.entity, p.title, p.ref, p.public, p.dateo as do, p.datee as de, p.fk_statut as status, p.fk_opp_status, p.opp_amount, p.opp_percent, p.tms as date_update, p.budget_amount';
-        $sql .= ', cls.code as opp_status_code';
+        $sql .= ', cls.code as opp_status_code, ctc.libelle';
         $sql .= ' FROM '.MAIN_DB_PREFIX.'projet as p';
         $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_lead_status as cls on p.fk_opp_status = cls.rowid';
         $sql .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact as cc ON (p.rowid = cc.element_id)';
+        $sql .= ' INNER JOIN '.MAIN_DB_PREFIX.'c_type_contact as ctc ON (ctc.rowid = cc.fk_c_type_contact)';
         $sql .= ' WHERE cc.fk_socpeople = '.((int) $object->id);
-        $sql .= ' AND cc.fk_c_type_contact IN (SELECT rowid FROM '.MAIN_DB_PREFIX.'c_type_contact WHERE element="project" AND source="external")';
+        $sql .= ' AND ctc.element="project" AND ctc.source="external"';
         $sql .= ' AND p.entity IN ('.getEntity('project').')';
         $sql .= ' ORDER BY p.dateo DESC';
 
@@ -200,6 +201,7 @@ function show_contacts_projects($conf, $langs, $db, $object, $backtopage = '', $
 			print '<tr class="liste_titre">';
 			print '<td>'.$langs->trans("Ref").'</td>';
 			print '<td>'.$langs->trans("Name").'</td>';
+			print '<td>'.$langs->trans("ContactType").'</td>';
 			print '<td class="center">'.$langs->trans("DateStart").'</td>';
 			print '<td class="center">'.$langs->trans("DateEnd").'</td>';
 			print '<td class="right">'.$langs->trans("OpportunityAmountShort").'</td>';
@@ -232,6 +234,7 @@ function show_contacts_projects($conf, $langs, $db, $object, $backtopage = '', $
 
 						// Label
 						print '<td>'.$obj->title.'</td>';
+						print '<td>'.$obj->libelle.'</td>';
 						// Date start
 						print '<td class="center">'.dol_print_date($db->jdate($obj->do), "day").'</td>';
 						// Date end

From f78a9ea6f5d7eba399b535172f6f13cfdbf26d53 Mon Sep 17 00:00:00 2001
From: Quentin VIAL-GOUTEYRON <quentin.vial-gouteyron@atm-consulting.fr>
Date: Fri, 7 Jan 2022 10:19:44 +0100
Subject: [PATCH 043/316] missing column

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

diff --git a/htdocs/core/lib/contact.lib.php b/htdocs/core/lib/contact.lib.php
index 2e512fa7182..5a0c6c376fb 100644
--- a/htdocs/core/lib/contact.lib.php
+++ b/htdocs/core/lib/contact.lib.php
@@ -201,6 +201,7 @@ function show_contacts_projects($conf, $langs, $db, $object, $backtopage = '', $
 			print '<tr class="liste_titre">';
 			print '<td>'.$langs->trans("Ref").'</td>';
 			print '<td>'.$langs->trans("Name").'</td>';
+			print '<td>'.$langs->trans("ContactType").'</td>';
 			print '<td class="center">'.$langs->trans("DateStart").'</td>';
 			print '<td class="center">'.$langs->trans("DateEnd").'</td>';
 			print '<td class="right">'.$langs->trans("OpportunityAmountShort").'</td>';
@@ -233,6 +234,7 @@ function show_contacts_projects($conf, $langs, $db, $object, $backtopage = '', $
 
 						// Label
 						print '<td>'.$obj->title.'</td>';
+						print '<td>'.$obj->libelle.'</td>';
 						// Date start
 						print '<td class="center">'.dol_print_date($db->jdate($obj->do), "day").'</td>';
 						// Date end

From e87fb1c0dc80aedd63ef6565d31a8d0eee7ffaec Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Fri, 7 Jan 2022 12:19:03 +0100
Subject: [PATCH 044/316] add column into table inst

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

diff --git a/htdocs/install/mysql/tables/llx_projet_task_time.sql b/htdocs/install/mysql/tables/llx_projet_task_time.sql
index 786d8907588..63eadb1177f 100644
--- a/htdocs/install/mysql/tables/llx_projet_task_time.sql
+++ b/htdocs/install/mysql/tables/llx_projet_task_time.sql
@@ -24,6 +24,7 @@ create table llx_projet_task_time
   task_datehour    datetime,				-- day + hour
   task_date_withhour integer DEFAULT 0,	-- 0 by default, 1 if date was entered with start hour
   task_duration    double,
+  fk_product       integer NULL,
   fk_user          integer,
   thm			   double(24,8),
   invoice_id       integer DEFAULT NULL,				-- If we need to invoice each line of timespent, we can save invoice id here

From f5788bef669dfc72407e7237e6bc6927268071b3 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Fri, 7 Jan 2022 12:20:27 +0100
Subject: [PATCH 045/316] OK BDD

---
 .../install/mysql/migration/15.0.0-16.0.0.sql | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 htdocs/install/mysql/migration/15.0.0-16.0.0.sql

diff --git a/htdocs/install/mysql/migration/15.0.0-16.0.0.sql b/htdocs/install/mysql/migration/15.0.0-16.0.0.sql
new file mode 100644
index 00000000000..64df9ca79cb
--- /dev/null
+++ b/htdocs/install/mysql/migration/15.0.0-16.0.0.sql
@@ -0,0 +1,34 @@
+--
+-- Be carefull to requests order.
+-- This file must be loaded by calling /install/index.php page
+-- when current version is 14.0.0 or higher.
+--
+-- To restrict request to Mysql version x.y minimum use -- VMYSQLx.y
+-- To restrict request to Pgsql version x.y minimum use -- VPGSQLx.y
+-- To rename a table:       ALTER TABLE llx_table RENAME TO llx_table_new;
+-- To add a column:         ALTER TABLE llx_table ADD COLUMN newcol varchar(60) NOT NULL DEFAULT '0' AFTER existingcol;
+-- To rename a column:      ALTER TABLE llx_table CHANGE COLUMN oldname newname varchar(60);
+-- To drop a column:        ALTER TABLE llx_table DROP COLUMN oldname;
+-- To change type of field: ALTER TABLE llx_table MODIFY COLUMN name varchar(60);
+-- To drop a foreign key:   ALTER TABLE llx_table DROP FOREIGN KEY fk_name;
+-- To create a unique index ALTER TABLE llx_table ADD UNIQUE INDEX uk_table_field (field);
+-- To drop an index:        -- VMYSQL4.1 DROP INDEX nomindex on llx_table;
+-- To drop an index:        -- VPGSQL8.2 DROP INDEX nomindex;
+-- To make pk to be auto increment (mysql):    -- VMYSQL4.3 ALTER TABLE llx_table CHANGE COLUMN rowid rowid INTEGER NOT NULL AUTO_INCREMENT;
+-- To make pk to be auto increment (postgres):
+-- -- VPGSQL8.2 CREATE SEQUENCE llx_table_rowid_seq OWNED BY llx_table.rowid;
+-- -- VPGSQL8.2 ALTER TABLE llx_table ADD PRIMARY KEY (rowid);
+-- -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN rowid SET DEFAULT nextval('llx_table_rowid_seq');
+-- -- VPGSQL8.2 SELECT setval('llx_table_rowid_seq', MAX(rowid)) FROM llx_table;
+-- To set a field as NULL:                     -- VMYSQL4.3 ALTER TABLE llx_table MODIFY COLUMN name varchar(60) NULL;
+-- To set a field as NULL:                     -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name DROP NOT NULL;
+-- To set a field as NOT NULL:                 -- VMYSQL4.3 ALTER TABLE llx_table MODIFY COLUMN name varchar(60) NOT NULL;
+-- To set a field as NOT NULL:                 -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET NOT NULL;
+-- To set a field as default NULL:             -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET DEFAULT NULL;
+-- Note: fields with type BLOB/TEXT can't have default value.
+-- To rebuild sequence for postgresql after insert by forcing id autoincrement fields:
+-- -- VPGSQL8.2 SELECT dol_util_rebuild_sequences();
+
+
+-- Missing in v14 or lower
+ALTER TABLE llx_projet_task_time ADD COLUMN fk_product integer NULL;

From 840b0e48435da9f5b58271e44bfd81b046ee9c14 Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Sat, 8 Jan 2022 14:47:40 +0100
Subject: [PATCH 046/316] FIX #19760 Uniformize label length

---
 .../install/mysql/migration/15.0.0-16.0.0.sql | 67 +++++++++++++++++++
 .../install/mysql/tables/llx_c_actioncomm.sql |  3 +-
 .../mysql/tables/llx_c_availability.sql       |  3 +-
 .../mysql/tables/llx_c_barcode_type.sql       |  3 +-
 .../mysql/tables/llx_c_chargesociales.sql     |  3 +-
 .../install/mysql/tables/llx_c_civility.sql   |  3 +-
 htdocs/install/mysql/tables/llx_c_country.sql |  3 +-
 .../install/mysql/tables/llx_c_currencies.sql |  3 +-
 .../install/mysql/tables/llx_c_effectif.sql   |  3 +-
 .../mysql/tables/llx_c_exp_tax_cat.sql        |  3 +-
 .../mysql/tables/llx_c_hrm_department.sql     |  3 +-
 .../mysql/tables/llx_c_hrm_function.sql       |  3 +-
 .../mysql/tables/llx_c_input_method.sql       |  3 +-
 .../mysql/tables/llx_c_input_reason.sql       |  3 +-
 .../mysql/tables/llx_c_lead_status.sql        |  3 +-
 .../install/mysql/tables/llx_c_paiement.sql   |  3 +-
 .../mysql/tables/llx_c_paper_format.sql       |  3 +-
 .../mysql/tables/llx_c_partnership_type.sql   |  3 +-
 .../mysql/tables/llx_c_product_nature.sql     |  4 +-
 .../tables/llx_c_productbatch_qcstatus.sql    |  3 +-
 .../install/mysql/tables/llx_c_propalst.sql   |  3 +-
 .../tables/llx_c_prospectcontactlevel.sql     |  3 +-
 .../mysql/tables/llx_c_prospectlevel.sql      |  3 +-
 .../mysql/tables/llx_c_recruitment_origin.sql |  3 +-
 .../mysql/tables/llx_c_shipment_mode.sql      |  3 +-
 .../tables/llx_c_shipment_package_type.sql    |  2 +-
 htdocs/install/mysql/tables/llx_c_stcomm.sql  |  3 +-
 .../mysql/tables/llx_c_stcommcontact.sql      |  3 +-
 .../mysql/tables/llx_c_type_contact.sql       |  3 +-
 .../mysql/tables/llx_c_type_container.sql     |  3 +-
 .../install/mysql/tables/llx_c_type_fees.sql  |  3 +-
 .../mysql/tables/llx_c_type_resource.sql      |  3 +-
 htdocs/install/mysql/tables/llx_c_typent.sql  |  3 +-
 htdocs/install/mysql/tables/llx_c_units.sql   |  3 +-
 34 files changed, 133 insertions(+), 33 deletions(-)
 create mode 100644 htdocs/install/mysql/migration/15.0.0-16.0.0.sql

diff --git a/htdocs/install/mysql/migration/15.0.0-16.0.0.sql b/htdocs/install/mysql/migration/15.0.0-16.0.0.sql
new file mode 100644
index 00000000000..9158aad8ae8
--- /dev/null
+++ b/htdocs/install/mysql/migration/15.0.0-16.0.0.sql
@@ -0,0 +1,67 @@
+--
+-- Be carefull to requests order.
+-- This file must be loaded by calling /install/index.php page
+-- when current version is 14.0.0 or higher.
+--
+-- To restrict request to Mysql version x.y minimum use -- VMYSQLx.y
+-- To restrict request to Pgsql version x.y minimum use -- VPGSQLx.y
+-- To rename a table:       ALTER TABLE llx_table RENAME TO llx_table_new;
+-- To add a column:         ALTER TABLE llx_table ADD COLUMN newcol varchar(60) NOT NULL DEFAULT '0' AFTER existingcol;
+-- To rename a column:      ALTER TABLE llx_table CHANGE COLUMN oldname newname varchar(60);
+-- To drop a column:        ALTER TABLE llx_table DROP COLUMN oldname;
+-- To change type of field: ALTER TABLE llx_table MODIFY COLUMN name varchar(60);
+-- To drop a foreign key:   ALTER TABLE llx_table DROP FOREIGN KEY fk_name;
+-- To create a unique index ALTER TABLE llx_table ADD UNIQUE INDEX uk_table_field (field);
+-- To drop an index:        -- VMYSQL4.1 DROP INDEX nomindex on llx_table;
+-- To drop an index:        -- VPGSQL8.2 DROP INDEX nomindex;
+-- To make pk to be auto increment (mysql):    -- VMYSQL4.3 ALTER TABLE llx_table CHANGE COLUMN rowid rowid INTEGER NOT NULL AUTO_INCREMENT;
+-- To make pk to be auto increment (postgres):
+-- -- VPGSQL8.2 CREATE SEQUENCE llx_table_rowid_seq OWNED BY llx_table.rowid;
+-- -- VPGSQL8.2 ALTER TABLE llx_table ADD PRIMARY KEY (rowid);
+-- -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN rowid SET DEFAULT nextval('llx_table_rowid_seq');
+-- -- VPGSQL8.2 SELECT setval('llx_table_rowid_seq', MAX(rowid)) FROM llx_table;
+-- To set a field as NULL:                     -- VMYSQL4.3 ALTER TABLE llx_table MODIFY COLUMN name varchar(60) NULL;
+-- To set a field as NULL:                     -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name DROP NOT NULL;
+-- To set a field as NOT NULL:                 -- VMYSQL4.3 ALTER TABLE llx_table MODIFY COLUMN name varchar(60) NOT NULL;
+-- To set a field as NOT NULL:                 -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET NOT NULL;
+-- To set a field as default NULL:             -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET DEFAULT NULL;
+-- Note: fields with type BLOB/TEXT can't have default value.
+-- To rebuild sequence for postgresql after insert by forcing id autoincrement fields:
+-- -- VPGSQL8.2 SELECT dol_util_rebuild_sequences();
+
+-- Missing in v15 or lower
+
+ALTER TABLE llx_c_availability MODIFY COLUMN label varchar(128);
+ALTER TABLE llx_c_civility MODIFY COLUMN label varchar(128);
+ALTER TABLE llx_c_country MODIFY COLUMN label varchar(128);
+ALTER TABLE llx_c_currencies MODIFY COLUMN label varchar(128);
+ALTER TABLE llx_c_effectif MODIFY COLUMN libelle varchar(128);
+ALTER TABLE llx_c_exp_tax_cat MODIFY COLUMN label varchar(128);
+ALTER TABLE llx_c_hrm_department MODIFY COLUMN label varchar(128);
+ALTER TABLE llx_c_hrm_function MODIFY COLUMN label varchar(128);
+ALTER TABLE llx_c_input_reason MODIFY COLUMN label varchar(128);
+ALTER TABLE llx_c_lead_status MODIFY COLUMN label varchar(128);
+ALTER TABLE llx_c_paper_format MODIFY COLUMN label varchar(128);
+ALTER TABLE llx_c_partnership_type MODIFY COLUMN label varchar(128);
+ALTER TABLE llx_c_product_nature MODIFY COLUMN label varchar(128);
+ALTER TABLE llx_c_productbatch_qcstatus MODIFY COLUMN label varchar(128);
+ALTER TABLE llx_c_propalst MODIFY COLUMN label varchar(128);
+ALTER TABLE llx_c_prospectcontactlevel MODIFY COLUMN label varchar(128);
+ALTER TABLE llx_c_prospectlevel MODIFY COLUMN label varchar(128);
+ALTER TABLE llx_c_recruitment_origin MODIFY COLUMN label varchar(128);
+ALTER TABLE llx_c_shipment_package_type MODIFY COLUMN label varchar(128);
+ALTER TABLE llx_c_type_container MODIFY COLUMN label varchar(128);
+ALTER TABLE llx_c_type_fees MODIFY COLUMN label varchar(128);
+ALTER TABLE llx_c_type_resource MODIFY COLUMN label varchar(128);
+ALTER TABLE llx_c_units MODIFY COLUMN label varchar(128);
+ALTER TABLE llx_c_actioncomm MODIFY COLUMN libelle varchar(128);
+ALTER TABLE llx_c_barcode_type MODIFY COLUMN libelle varchar(128);
+ALTER TABLE llx_c_chargesociales MODIFY COLUMN libelle varchar(128);
+ALTER TABLE llx_c_input_method MODIFY COLUMN libelle varchar(128);
+ALTER TABLE llx_c_paiement MODIFY COLUMN libelle varchar(128);
+ALTER TABLE llx_c_shipment_mode MODIFY COLUMN libelle varchar(128);
+ALTER TABLE llx_c_stcomm MODIFY COLUMN libelle varchar(128);
+ALTER TABLE llx_c_stcommcontact MODIFY COLUMN libelle varchar(128);
+ALTER TABLE llx_c_type_contact MODIFY COLUMN libelle varchar(128);
+ALTER TABLE llx_c_typent MODIFY COLUMN libelle varchar(128);
+
diff --git a/htdocs/install/mysql/tables/llx_c_actioncomm.sql b/htdocs/install/mysql/tables/llx_c_actioncomm.sql
index a2b2dffe8a7..4ccbf4a1340 100644
--- a/htdocs/install/mysql/tables/llx_c_actioncomm.sql
+++ b/htdocs/install/mysql/tables/llx_c_actioncomm.sql
@@ -2,6 +2,7 @@
 -- Copyright (C) 2001-2002,2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 -- Copyright (C) 2004-2016      Laurent Destailleur  <eldy@users.sourceforge.net>
 -- Copyright (C) 2012 		    Florian Henry        <florian.henry@open-concept.pro>
+-- Copyright (C) 2022 		    Juanjo Menent        <jmenent@2byte.es>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -23,7 +24,7 @@ create table llx_c_actioncomm
   id         integer     PRIMARY KEY,
   code       varchar(50) NOT NULL,
   type       varchar(50) DEFAULT 'system' NOT NULL,
-  libelle    varchar(48) NOT NULL,
+  libelle    varchar(128) NOT NULL,
   module	 varchar(50) DEFAULT NULL,
   active     tinyint DEFAULT 1 NOT NULL,
   todo       tinyint,						-- deprecated
diff --git a/htdocs/install/mysql/tables/llx_c_availability.sql b/htdocs/install/mysql/tables/llx_c_availability.sql
index 4cdc8d6203c..b36d89870b4 100644
--- a/htdocs/install/mysql/tables/llx_c_availability.sql
+++ b/htdocs/install/mysql/tables/llx_c_availability.sql
@@ -1,6 +1,7 @@
 -- ========================================================================
 -- Copyright (C) 2011 Philippe GRAND      <philippe.grand@atoo-net.com>
 -- Copyright (C) 2020 Alexandre SPANGARO  <aspangaro@open-dsi.fr>
+-- Copyright (C) 2022 Juanjo Menent       <jmenent@2byte.es>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -21,7 +22,7 @@ create table llx_c_availability
 (
 	rowid		integer	 	AUTO_INCREMENT PRIMARY KEY,
 	code		varchar(30) NOT NULL,
-	label		varchar(60) NOT NULL,
+	label		varchar(128) NOT NULL,
 	active		tinyint 	DEFAULT 1  NOT NULL,
 	position    integer NOT NULL DEFAULT 0
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_barcode_type.sql b/htdocs/install/mysql/tables/llx_c_barcode_type.sql
index fc76fab2dc9..3aaea7a5f59 100644
--- a/htdocs/install/mysql/tables/llx_c_barcode_type.sql
+++ b/htdocs/install/mysql/tables/llx_c_barcode_type.sql
@@ -1,6 +1,7 @@
 -- ========================================================================
 -- Copyright (C) 2007-2009 Regis Houssin        <regis.houssin@inodbox.com>
 -- Copyright (C) 2008      Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2022      Juanjo Menent        <jmenent@2byte.es>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -22,7 +23,7 @@ create table llx_c_barcode_type
   rowid    integer            AUTO_INCREMENT PRIMARY KEY,
   code     varchar(16)        NOT NULL,
   entity   integer  DEFAULT 1 NOT NULL,	-- multi company id
-  libelle  varchar(50)        NOT NULL,
+  libelle  varchar(128)        NOT NULL,
   coder    varchar(16)        NOT NULL,
   example  varchar(16)        NOT NULL
   
diff --git a/htdocs/install/mysql/tables/llx_c_chargesociales.sql b/htdocs/install/mysql/tables/llx_c_chargesociales.sql
index 9da2976348f..78b87f95152 100644
--- a/htdocs/install/mysql/tables/llx_c_chargesociales.sql
+++ b/htdocs/install/mysql/tables/llx_c_chargesociales.sql
@@ -1,6 +1,7 @@
 -- ========================================================================
 -- Copyright (C) 2001-2002,2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 -- Copyright (C) 2004-2009      Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2022 		    Juanjo Menent        <jmenent@2byte.es>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -20,7 +21,7 @@
 create table llx_c_chargesociales
 (
   id           integer AUTO_INCREMENT PRIMARY KEY,
-  libelle      varchar(80),
+  libelle      varchar(128),
   deductible   smallint DEFAULT 0 NOT NULL,
   active       tinyint DEFAULT 1  NOT NULL,
   code         varchar(12) NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_c_civility.sql b/htdocs/install/mysql/tables/llx_c_civility.sql
index 63fc8fca81f..9586101b254 100644
--- a/htdocs/install/mysql/tables/llx_c_civility.sql
+++ b/htdocs/install/mysql/tables/llx_c_civility.sql
@@ -1,6 +1,7 @@
 -- ========================================================================
 -- Copyright (C) 2004 Benoit Mortier      <benoit.mortier@opensides.be>
 -- Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net>
+-- Copyright (C) 2022 Juanjo Menent       <jmenent@2byte.es>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -21,7 +22,7 @@ create table llx_c_civility
 (
   rowid       integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
   code        varchar(6) NOT NULL,
-  label		  varchar(50),
+  label		  varchar(128),
   active      tinyint DEFAULT 1  NOT NULL,
   module      varchar(32) NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_country.sql b/htdocs/install/mysql/tables/llx_c_country.sql
index 7f7ba0d4113..d97c3b90371 100644
--- a/htdocs/install/mysql/tables/llx_c_country.sql
+++ b/htdocs/install/mysql/tables/llx_c_country.sql
@@ -2,6 +2,7 @@
 -- Copyright (C) 2001-2004	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
 -- Copyright (C) 2004		Laurent Destailleur		<eldy@users.sourceforge.net>
 -- Copyright (C) 2014		Alexandre Spangaro		<aspangaro@open-dsi.fr>
+-- Copyright (C) 2022 	    Juanjo Menent           <jmenent@2byte.es>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -23,7 +24,7 @@ create table llx_c_country
   rowid    integer            PRIMARY KEY,
   code     varchar(2)         NOT NULL,
   code_iso varchar(3)         ,
-  label    varchar(50)        NOT NULL,
+  label    varchar(128)        NOT NULL,
   eec      integer            ,
   active   tinyint DEFAULT 1  NOT NULL,
   favorite tinyint DEFAULT 0  NOT NULL
diff --git a/htdocs/install/mysql/tables/llx_c_currencies.sql b/htdocs/install/mysql/tables/llx_c_currencies.sql
index 1943fa6eb41..d2d66236016 100644
--- a/htdocs/install/mysql/tables/llx_c_currencies.sql
+++ b/htdocs/install/mysql/tables/llx_c_currencies.sql
@@ -1,6 +1,7 @@
 -- ========================================================================
 -- Copyright (C) 2005	Laurent Destailleur	<eldy@users.sourceforge.net>
 -- Copyright (C) 2012	Regis Houssin		<regis.houssin@inodbox.com>
+-- Copyright (C) 2022 	Juanjo Menent       <jmenent@2byte.es>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -20,7 +21,7 @@
 create table llx_c_currencies
 (
   code_iso		varchar(3)  PRIMARY KEY,
-  label			varchar(64) NOT NULL,
+  label			varchar(128) NOT NULL,
   unicode		varchar(32) DEFAULT NULL,
   active		tinyint		DEFAULT 1  NOT NULL
   
diff --git a/htdocs/install/mysql/tables/llx_c_effectif.sql b/htdocs/install/mysql/tables/llx_c_effectif.sql
index 26cab5c43da..dda78304fd9 100644
--- a/htdocs/install/mysql/tables/llx_c_effectif.sql
+++ b/htdocs/install/mysql/tables/llx_c_effectif.sql
@@ -1,6 +1,7 @@
 -- ========================================================================
 -- Copyright (C) 2001-2002,2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 -- Copyright (C) 2004           Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2022 	        Juanjo Menent        <jmenent@2byte.es>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -21,7 +22,7 @@ create table llx_c_effectif
 (
   id      integer     PRIMARY KEY,
   code    varchar(12) NOT NULL,
-  libelle varchar(30),
+  libelle varchar(128),
   active  tinyint DEFAULT 1  NOT NULL,
   module  varchar(32) NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_exp_tax_cat.sql b/htdocs/install/mysql/tables/llx_c_exp_tax_cat.sql
index 90c60d87b97..6b106caa355 100644
--- a/htdocs/install/mysql/tables/llx_c_exp_tax_cat.sql
+++ b/htdocs/install/mysql/tables/llx_c_exp_tax_cat.sql
@@ -2,6 +2,7 @@
 -- Copyright (C) 2012 Mikael Carlavan     <mcarlavan@qis-network.com>
 -- Copyright (C) 2017 ATM Consulting      <contact@atm-consulting.fr>
 -- Copyright (C) 2017 Pierre-Henry Favre  <phf@atm-consulting.fr>
+-- Copyright (C) 2022 Juanjo Menent       <jmenent@2byte.es>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -20,7 +21,7 @@
 
 CREATE TABLE IF NOT EXISTS llx_c_exp_tax_cat (
     rowid       integer  AUTO_INCREMENT PRIMARY KEY,
-    label       varchar(48) NOT NULL, 
+    label       varchar(128) NOT NULL,
     entity      integer DEFAULT 1 NOT NULL,
     active      integer DEFAULT 1 NOT NULL	          
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_hrm_department.sql b/htdocs/install/mysql/tables/llx_c_hrm_department.sql
index 13380bf03b9..fbe6c67671c 100644
--- a/htdocs/install/mysql/tables/llx_c_hrm_department.sql
+++ b/htdocs/install/mysql/tables/llx_c_hrm_department.sql
@@ -1,6 +1,7 @@
 --
 -- Copyright (C) 2013 Jean-François Ferry <jfefe@aternatik.fr>
 -- Copyright (C) 2015 Alexandre Spangaro  <aspangaro@open-dsi.fr>
+-- Copyright (C) 2022 Juanjo Menent       <jmenent@2byte.es>
 --
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -20,7 +21,7 @@ create table llx_c_hrm_department
   rowid      	integer     PRIMARY KEY,
   pos   		tinyint DEFAULT 0 NOT NULL,
   code    		varchar(16) NOT NULL,
-  label 		varchar(50),
+  label 		varchar(128),
   active  		tinyint DEFAULT 1  NOT NULL
 )ENGINE=innodb;
 
diff --git a/htdocs/install/mysql/tables/llx_c_hrm_function.sql b/htdocs/install/mysql/tables/llx_c_hrm_function.sql
index 3d6fc37fc2b..558893ba8d6 100644
--- a/htdocs/install/mysql/tables/llx_c_hrm_function.sql
+++ b/htdocs/install/mysql/tables/llx_c_hrm_function.sql
@@ -1,6 +1,7 @@
 --
 -- Copyright (C) 2013 Jean-François Ferry <jfefe@aternatik.fr>
 -- Copyright (C) 2015 Alexandre Spangaro  <aspangaro@open-dsi.fr>
+-- Copyright (C) 2022 Juanjo Menent       <jmenent@2byte.es>
 --
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -20,7 +21,7 @@ create table llx_c_hrm_function
   rowid     integer     PRIMARY KEY,
   pos   	tinyint DEFAULT 0 NOT NULL,
   code    	varchar(16) NOT NULL,
-  label 	varchar(50),
+  label 	varchar(128),
   c_level   tinyint DEFAULT 0 NOT NULL,
   active  	tinyint DEFAULT 1  NOT NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_input_method.sql b/htdocs/install/mysql/tables/llx_c_input_method.sql
index 40ed48f8fc6..fc77566e6bd 100644
--- a/htdocs/install/mysql/tables/llx_c_input_method.sql
+++ b/htdocs/install/mysql/tables/llx_c_input_method.sql
@@ -1,6 +1,7 @@
 -- ========================================================================
 -- Copyright (C) 2004-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 -- Copyright (C) 2005-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2022 	   Juanjo Menent        <jmenent@2byte.es>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -21,7 +22,7 @@ create table llx_c_input_method
 (
   rowid    integer AUTO_INCREMENT PRIMARY KEY,
   code     varchar(30),
-  libelle  varchar(60),
+  libelle  varchar(128),
   active   tinyint default 1  NOT NULL,
   module   varchar(32) NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_input_reason.sql b/htdocs/install/mysql/tables/llx_c_input_reason.sql
index dba58dbbecc..f57a9a877ab 100644
--- a/htdocs/install/mysql/tables/llx_c_input_reason.sql
+++ b/htdocs/install/mysql/tables/llx_c_input_reason.sql
@@ -1,6 +1,7 @@
 -- ========================================================================
 -- Copyright (C) 2004-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 -- Copyright (C) 2005-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2022 	   Juanjo Menent        <jmenent@2byte.es>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -23,7 +24,7 @@ create table llx_c_input_reason
 (
   rowid		integer AUTO_INCREMENT PRIMARY KEY,
   code		varchar(30),
-  label		varchar(60),
+  label		varchar(128),
   active	tinyint default 1  NOT NULL,
   module    varchar(32) NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_lead_status.sql b/htdocs/install/mysql/tables/llx_c_lead_status.sql
index 9027c0f6ca1..7905c5b6c05 100644
--- a/htdocs/install/mysql/tables/llx_c_lead_status.sql
+++ b/htdocs/install/mysql/tables/llx_c_lead_status.sql
@@ -1,5 +1,6 @@
 -- Manage Lead
 -- Copyright (C) 2014  Florian HENRY <florian.henry@open-concept.pro>
+-- Copyright (C) 2022  Juanjo Menent <jmenent@2byte.es>
 --
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -18,7 +19,7 @@ create table llx_c_lead_status
 (
   rowid       integer AUTO_INCREMENT PRIMARY KEY,
   code 		  varchar(10),
-  label       varchar(50),
+  label       varchar(128),
   position    integer,
   percent     double(5,2),
   active      tinyint DEFAULT 1 NOT NULL
diff --git a/htdocs/install/mysql/tables/llx_c_paiement.sql b/htdocs/install/mysql/tables/llx_c_paiement.sql
index 739d31e946d..535e5115e85 100644
--- a/htdocs/install/mysql/tables/llx_c_paiement.sql
+++ b/htdocs/install/mysql/tables/llx_c_paiement.sql
@@ -3,6 +3,7 @@
 -- Copyright (C) 2004-2014	Laurent Destailleur		<eldy@users.sourceforge.net>
 -- Copyright (C) 2014		Alexandre Spangaro		<aspangaro@open-dsi.fr>
 -- Copyright (C) 2017		Regis Houssin			<regis.houssin@inodbox.com>
+-- Copyright (C) 2022 		Juanjo Menent           <jmenent@2byte.es>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -24,7 +25,7 @@ create table llx_c_paiement
   id					integer AUTO_INCREMENT PRIMARY KEY,
   entity				integer	DEFAULT 1 NOT NULL,	-- multi company id
   code       		varchar(6)  NOT NULL,
-  libelle    		varchar(62),
+  libelle    		varchar(128),
   type       		smallint,	-- 0: input money, 1: output money, 2: input and output, 3: other
   active     		tinyint DEFAULT 1  NOT NULL,
   accountancy_code	varchar(32) NULL,
diff --git a/htdocs/install/mysql/tables/llx_c_paper_format.sql b/htdocs/install/mysql/tables/llx_c_paper_format.sql
index 45c56ce379f..fd9fc672b68 100644
--- a/htdocs/install/mysql/tables/llx_c_paper_format.sql
+++ b/htdocs/install/mysql/tables/llx_c_paper_format.sql
@@ -1,5 +1,6 @@
 -- ========================================================================
 -- Copyright (C) 2007 Regis Houssin <regis.houssin@inodbox.com>
+-- Copyright (C) 2022 Juanjo Menent <jmenent@2byte.es>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -20,7 +21,7 @@ create table llx_c_paper_format
 (
   rowid    integer                          AUTO_INCREMENT PRIMARY KEY,
   code     varchar(16)                      NOT NULL,
-  label    varchar(50)                      NOT NULL,
+  label    varchar(128)                      NOT NULL,
   width    float(6,2)                       DEFAULT 0,  -- Largeur du papier
   height   float(6,2)                       DEFAULT 0,  -- Hauteur du papier
   unit     varchar(5)                       NOT NULL,   -- Mesure unit
diff --git a/htdocs/install/mysql/tables/llx_c_partnership_type.sql b/htdocs/install/mysql/tables/llx_c_partnership_type.sql
index d2a4a3b7549..99841f967cb 100644
--- a/htdocs/install/mysql/tables/llx_c_partnership_type.sql
+++ b/htdocs/install/mysql/tables/llx_c_partnership_type.sql
@@ -1,5 +1,6 @@
 -- ========================================================================
 -- Copyright (C) 2021 Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2022 Juanjo Menent        <jmenent@2byte.es>
 -- 
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -29,7 +30,7 @@ create table llx_c_partnership_type
   rowid      	integer AUTO_INCREMENT PRIMARY KEY,
   entity        integer DEFAULT 1 NOT NULL,
   code          varchar(32) NOT NULL,
-  label 	    varchar(64)	NOT NULL,
+  label 	    varchar(128)	NOT NULL,
   active  	    tinyint DEFAULT 1 NOT NULL
 )ENGINE=innodb;
 
diff --git a/htdocs/install/mysql/tables/llx_c_product_nature.sql b/htdocs/install/mysql/tables/llx_c_product_nature.sql
index 3c467ce7cf8..e2efdf2a981 100644
--- a/htdocs/install/mysql/tables/llx_c_product_nature.sql
+++ b/htdocs/install/mysql/tables/llx_c_product_nature.sql
@@ -1,5 +1,7 @@
 -- ========================================================================
 -- Copyright (C) 2020 Florian HENRY  <florian.henry@scopen.fr>
+-- Copyright (C) 2022 Juanjo Menent  <jmenent@2byte.es>
+
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -19,6 +21,6 @@
 CREATE TABLE llx_c_product_nature (
      rowid integer AUTO_INCREMENT PRIMARY KEY,
      code tinyint NOT NULL,
-     label varchar(100),
+     label varchar(128),
      active tinyint DEFAULT 1  NOT NULL
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_productbatch_qcstatus.sql b/htdocs/install/mysql/tables/llx_c_productbatch_qcstatus.sql
index 73daa56067a..06a2a76220d 100644
--- a/htdocs/install/mysql/tables/llx_c_productbatch_qcstatus.sql
+++ b/htdocs/install/mysql/tables/llx_c_productbatch_qcstatus.sql
@@ -1,5 +1,6 @@
 -- ========================================================================
 -- Copyright (C) 2012-2017      Noé Cendrier  <noe.cendrier@altairis.fr>
+-- Copyright (C) 2022 		    Juanjo Menent        <jmenent@2byte.es>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -21,6 +22,6 @@ CREATE TABLE llx_c_productbatch_qcstatus
   rowid    integer            AUTO_INCREMENT PRIMARY KEY,
   entity 	 integer NOT NULL DEFAULT 1,
   code     varchar(16)        NOT NULL,
-  label    varchar(50)        NOT NULL,
+  label    varchar(128)        NOT NULL,
   active   integer  DEFAULT 1 NOT NULL  
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_propalst.sql b/htdocs/install/mysql/tables/llx_c_propalst.sql
index 2a107b52735..7b3351a52b8 100644
--- a/htdocs/install/mysql/tables/llx_c_propalst.sql
+++ b/htdocs/install/mysql/tables/llx_c_propalst.sql
@@ -1,6 +1,7 @@
 -- ===================================================================
 -- Copyright (C) 2001-2002,2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 -- Copyright (C) 2004           Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2022 		    Juanjo Menent        <jmenent@2byte.es>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -21,7 +22,7 @@ create table llx_c_propalst
 (
   id              smallint    PRIMARY KEY,
   code            varchar(12) NOT NULL,
-  label           varchar(30),
+  label           varchar(128),
   active          tinyint DEFAULT 1  NOT NULL
 )ENGINE=innodb;
 
diff --git a/htdocs/install/mysql/tables/llx_c_prospectcontactlevel.sql b/htdocs/install/mysql/tables/llx_c_prospectcontactlevel.sql
index 421b3452371..b9efe7967ad 100644
--- a/htdocs/install/mysql/tables/llx_c_prospectcontactlevel.sql
+++ b/htdocs/install/mysql/tables/llx_c_prospectcontactlevel.sql
@@ -1,5 +1,6 @@
 -- ===================================================================
 -- Copyright (C) 2020 	   Open-Dsi  <support@open-dsi.fr>
+-- Copyright (C) 2022 	   Juanjo Menent        <jmenent@2byte.es>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -19,7 +20,7 @@
 create table llx_c_prospectcontactlevel
 (
   code            varchar(12) PRIMARY KEY,
-  label           varchar(30),
+  label           varchar(128),
   sortorder       smallint,
   active          smallint    DEFAULT 1 NOT NULL,
   module          varchar(32) NULL
diff --git a/htdocs/install/mysql/tables/llx_c_prospectlevel.sql b/htdocs/install/mysql/tables/llx_c_prospectlevel.sql
index 70e26dc3a26..31d3abcb5bc 100644
--- a/htdocs/install/mysql/tables/llx_c_prospectlevel.sql
+++ b/htdocs/install/mysql/tables/llx_c_prospectlevel.sql
@@ -1,5 +1,6 @@
 -- ===================================================================
 -- Copyright (C) 2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2022 Juanjo Menent        <jmenent@2byte.es>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -19,7 +20,7 @@
 create table llx_c_prospectlevel
 (
   code            varchar(12) PRIMARY KEY,
-  label           varchar(30),
+  label           varchar(128),
   sortorder       smallint,
   active          smallint    DEFAULT 1 NOT NULL,
   module          varchar(32) NULL
diff --git a/htdocs/install/mysql/tables/llx_c_recruitment_origin.sql b/htdocs/install/mysql/tables/llx_c_recruitment_origin.sql
index b18f7eb383c..2d1c6682900 100644
--- a/htdocs/install/mysql/tables/llx_c_recruitment_origin.sql
+++ b/htdocs/install/mysql/tables/llx_c_recruitment_origin.sql
@@ -1,5 +1,6 @@
 -- ========================================================================
 -- Copyright (C) 2005-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2022 	   Juanjo Menent        <jmenent@2byte.es>
 -- 
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -28,6 +29,6 @@ create table llx_c_recruitment_origin
 (
   rowid      	integer AUTO_INCREMENT PRIMARY KEY,
   code          varchar(32) NOT NULL,
-  label 	    varchar(64)	NOT NULL,
+  label 	    varchar(128)	NOT NULL,
   active  	    tinyint DEFAULT 1  NOT NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql b/htdocs/install/mysql/tables/llx_c_shipment_mode.sql
index 6f49f682f24..4f0d584d6d7 100644
--- a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql
+++ b/htdocs/install/mysql/tables/llx_c_shipment_mode.sql
@@ -1,5 +1,6 @@
 -- ===================================================================
 -- Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+-- Copyright (C) 2022 Juanjo Menent        <jmenent@2byte.es>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -22,7 +23,7 @@ create table llx_c_shipment_mode
   entity				   integer	DEFAULT 1 NOT NULL,	-- multi company id
   tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   code             varchar(30) NOT NULL,
-  libelle          varchar(50) NOT NULL,
+  libelle          varchar(128) NOT NULL,
   description      text,
   tracking         varchar(255) NULL,
   active           tinyint DEFAULT 0,
diff --git a/htdocs/install/mysql/tables/llx_c_shipment_package_type.sql b/htdocs/install/mysql/tables/llx_c_shipment_package_type.sql
index e510352eba2..92dd861fd49 100644
--- a/htdocs/install/mysql/tables/llx_c_shipment_package_type.sql
+++ b/htdocs/install/mysql/tables/llx_c_shipment_package_type.sql
@@ -2,7 +2,7 @@
 create table llx_c_shipment_package_type
 (
     rowid        integer  AUTO_INCREMENT PRIMARY KEY,
-    label        varchar(50) NOT NULL,  -- Short name
+    label        varchar(128) NOT NULL,  -- Short name
     description	 varchar(255), -- Description
     active       integer DEFAULT 1 NOT NULL, -- Active or not	
     entity       integer DEFAULT 1 NOT NULL -- Multi company id 
diff --git a/htdocs/install/mysql/tables/llx_c_stcomm.sql b/htdocs/install/mysql/tables/llx_c_stcomm.sql
index 5f31666b28c..aa5d58a280f 100644
--- a/htdocs/install/mysql/tables/llx_c_stcomm.sql
+++ b/htdocs/install/mysql/tables/llx_c_stcomm.sql
@@ -1,6 +1,7 @@
 -- ========================================================================
 -- Copyright (C) 2001-2002,2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 -- Copyright (C) 2004-2015      Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2022 		    Juanjo Menent        <jmenent@2byte.es>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -21,7 +22,7 @@ create table llx_c_stcomm
 (
   id       integer      PRIMARY KEY,
   code     varchar(12)  NOT NULL,
-  libelle  varchar(30),
+  libelle  varchar(128),
   picto    varchar(128),
   active   tinyint default 1  NOT NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_stcommcontact.sql b/htdocs/install/mysql/tables/llx_c_stcommcontact.sql
index c906e4f5103..7ab74e123f6 100644
--- a/htdocs/install/mysql/tables/llx_c_stcommcontact.sql
+++ b/htdocs/install/mysql/tables/llx_c_stcommcontact.sql
@@ -1,5 +1,6 @@
 -- ========================================================================
 -- Copyright (C) 2020 	   Open-Dsi  <support@open-dsi.fr>
+-- Copyright (C) 2022 	   Juanjo Menent        <jmenent@2byte.es>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -20,7 +21,7 @@ create table llx_c_stcommcontact
 (
   id       integer      PRIMARY KEY,
   code     varchar(12)  NOT NULL,
-  libelle  varchar(30),
+  libelle  varchar(128),
   picto    varchar(128),
   active   tinyint default 1  NOT NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_type_contact.sql b/htdocs/install/mysql/tables/llx_c_type_contact.sql
index c222b0fe273..4b12661657e 100644
--- a/htdocs/install/mysql/tables/llx_c_type_contact.sql
+++ b/htdocs/install/mysql/tables/llx_c_type_contact.sql
@@ -1,6 +1,7 @@
 -- ========================================================================
 -- Copyright (C) 2005     Patrick Rouillon     <patrick.rouillon.net>
 -- Copyright (C) 2005     Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2022 	  Juanjo Menent        <jmenent@2byte.es>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -32,7 +33,7 @@ create table llx_c_type_contact
   element       varchar(30) NOT NULL,
   source        varchar(8)  DEFAULT 'external' NOT NULL,
   code          varchar(32) NOT NULL,
-  libelle 	    varchar(64)	NOT NULL,
+  libelle 	    varchar(128)	NOT NULL,
   active  	    tinyint DEFAULT 1  NOT NULL,
   module        varchar(32) NULL,
   position      integer NOT NULL DEFAULT 0
diff --git a/htdocs/install/mysql/tables/llx_c_type_container.sql b/htdocs/install/mysql/tables/llx_c_type_container.sql
index 53a89fe873b..6de3d041669 100644
--- a/htdocs/install/mysql/tables/llx_c_type_container.sql
+++ b/htdocs/install/mysql/tables/llx_c_type_container.sql
@@ -1,5 +1,6 @@
 -- ========================================================================
 -- Copyright (C) 2018     Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2022 	  Juanjo Menent        <jmenent@2byte.es>
 -- 
 --
 -- This program is free software; you can redistribute it and/or modify
@@ -30,7 +31,7 @@ create table llx_c_type_container
   rowid      	integer AUTO_INCREMENT PRIMARY KEY,
   code          varchar(32) NOT NULL,
   entity		integer	DEFAULT 1 NOT NULL,	-- multi company id
-  label 	    varchar(64)	NOT NULL,
+  label 	    varchar(128)	NOT NULL,
   module     	varchar(32) NULL,
   active  	    tinyint DEFAULT 1  NOT NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_type_fees.sql b/htdocs/install/mysql/tables/llx_c_type_fees.sql
index 3f9c49c95d7..d620e38cf69 100644
--- a/htdocs/install/mysql/tables/llx_c_type_fees.sql
+++ b/htdocs/install/mysql/tables/llx_c_type_fees.sql
@@ -2,6 +2,7 @@
 -- Copyright (C) 2001-2002,2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 -- Copyright (C) 2004           Laurent Destailleur  <eldy@users.sourceforge.net>
 -- Copyright (C) 2014           Alexandre Spangaro   <aspangaro@open-dsi.fr>
+-- Copyright (C) 2022 	        Juanjo Menent        <jmenent@2byte.es>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -23,7 +24,7 @@ create table llx_c_type_fees
 (
   id        		integer      AUTO_INCREMENT PRIMARY KEY,
   code      		varchar(12)  NOT NULL,
-  label				varchar(30),
+  label				varchar(128),
   type				integer DEFAULT 0,		-- 0=type product, 1=type service
   accountancy_code	varchar(32) NULL,
   active    		tinyint DEFAULT 1   NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_c_type_resource.sql b/htdocs/install/mysql/tables/llx_c_type_resource.sql
index e490755b1f7..f88f502a038 100644
--- a/htdocs/install/mysql/tables/llx_c_type_resource.sql
+++ b/htdocs/install/mysql/tables/llx_c_type_resource.sql
@@ -1,5 +1,6 @@
 -- ========================================================================
 -- Copyright (C) 2014     Jean-François Ferry <jfefe@aternatik.fr>
+-- Copyright (C) 2022 	  Juanjo Menent        <jmenent@2byte.es>
 -- 
 --
 -- This program is free software; you can redistribute it and/or modify
@@ -29,6 +30,6 @@ create table llx_c_type_resource
 (
   rowid      	integer AUTO_INCREMENT PRIMARY KEY,
   code          varchar(32) NOT NULL,
-  label 	    varchar(64)	NOT NULL,
+  label 	    varchar(128)	NOT NULL,
   active  	    tinyint DEFAULT 1  NOT NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_typent.sql b/htdocs/install/mysql/tables/llx_c_typent.sql
index 0b15e70b15b..69253f98857 100644
--- a/htdocs/install/mysql/tables/llx_c_typent.sql
+++ b/htdocs/install/mysql/tables/llx_c_typent.sql
@@ -1,6 +1,7 @@
 -- ========================================================================
 -- Copyright (C) 2001-2002,2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 -- Copyright (C) 2004           Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2022 	        Juanjo Menent        <jmenent@2byte.es>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -21,7 +22,7 @@ create table llx_c_typent
 (
   id         integer      PRIMARY KEY,
   code       varchar(12)  NOT NULL,
-  libelle    varchar(64),
+  libelle    varchar(128),
   fk_country integer NULL,		-- Defined only to have specific list for countries that can't use generic list (like argentina that need type A or B)
   active     tinyint DEFAULT 1   NOT NULL,
   module     varchar(32) NULL,
diff --git a/htdocs/install/mysql/tables/llx_c_units.sql b/htdocs/install/mysql/tables/llx_c_units.sql
index 7b2424a8f54..94046d25b87 100644
--- a/htdocs/install/mysql/tables/llx_c_units.sql
+++ b/htdocs/install/mysql/tables/llx_c_units.sql
@@ -2,6 +2,7 @@
 -- Copyright (C) 2001-2002,2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 -- Copyright (C) 2004           Laurent Destailleur  <eldy@users.sourceforge.net>
 -- Copyright (C) 2012           Cédric Salvador      <csalvador@gpcsolutions.fr>
+-- Copyright (C) 2022 	        Juanjo Menent        <jmenent@2byte.es>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -23,7 +24,7 @@ create table llx_c_units(
 	code            varchar(3),
     sortorder		smallint,
 	scale           integer,
-	label           varchar(50),
+	label           varchar(128),
 	short_label     varchar(5),
 	unit_type       varchar(10),
 	active          tinyint DEFAULT 1 NOT NULL

From 960aaded8eba83f58c0a04f056869f9e28b6a694 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sun, 9 Jan 2022 21:08:06 +0100
Subject: [PATCH 047/316] NEW Thirdparty - Add rules customer accountancy code
 is mandatory to validate invoice

---
 htdocs/compta/facture/card.php                | 10 +++++-
 htdocs/compta/facture/class/facture.class.php |  2 +-
 htdocs/langs/en_US/errors.lang                |  2 ++
 htdocs/societe/admin/societe.php              | 31 +++++++++++++++++++
 4 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index c7376f961f8..7881c76ff80 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -607,7 +607,7 @@ if (empty($reshook)) {
 		// Check parameters
 
 		// Check for mandatory fields in thirdparty (defined into setup)
-		$array_to_check = array('IDPROF1', 'IDPROF2', 'IDPROF3', 'IDPROF4', 'IDPROF5', 'IDPROF6', 'EMAIL');
+		$array_to_check = array('IDPROF1', 'IDPROF2', 'IDPROF3', 'IDPROF4', 'IDPROF5', 'IDPROF6', 'EMAIL', 'ACCOUNTANCY_CODE_CUSTOMER');
 		foreach ($array_to_check as $key) {
 			$keymin = strtolower($key);
 			$i = (int) preg_replace('/[^0-9]/', '', $key);
@@ -635,6 +635,14 @@ if (empty($reshook)) {
 						setEventMessages($langs->trans("ErrorBadEMail", $object->thirdparty->email).' ('.$langs->trans("ForbiddenBySetupRules").')', null, 'errors');
 					}
 				}
+				if ($key == 'ACCOUNTANCY_CODE_CUSTOMER') {
+					// Check for mandatory
+					if (!empty($conf->global->SOCIETE_ACCOUNTANCY_CODE_CUSTOMER_INVOICE_MANDATORY) && empty($object->thirdparty->code_compta)) {
+						$langs->load("errors");
+						$error++;
+						setEventMessages($langs->trans("ErrorAccountancyCodeCustomerIsMandatory", $object->thirdparty->name).' ('.$langs->trans("ForbiddenBySetupRules").')', null, 'errors');
+					}
+				}
 			}
 		}
 
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 4f72b5a14a3..57d0f347913 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -1622,7 +1622,7 @@ class Facture extends CommonInvoice
 		if ($rowid) {
 			$sql .= " WHERE f.rowid=".((int) $rowid);
 		} else {
-			$sql .= ' WHERE f.entity IN ('.getEntity('invoice').')'; // Dont't use entity if you use rowid
+			$sql .= ' WHERE f.entity IN ('.getEntity('invoice').')'; // Don't use entity if you use rowid
 			if ($ref) {
 				$sql .= " AND f.ref='".$this->db->escape($ref)."'";
 			}
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 7f4ca7b074f..1f00d2fe5eb 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -27,7 +27,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as co
 ErrorCashAccountAcceptsOnlyCashMoney=This bank account is a cash account, so it accepts payments of type cash only.
 ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be different.
 ErrorBadThirdPartyName=Bad value for third-party name
+ForbiddenBySetupRules=Forbidden by setup rules
 ErrorProdIdIsMandatory=The %s is mandatory
+ErrorAccountancyCodeCustomerIsMandatory=The accountancy code of customer %s is mandatory
 ErrorBadCustomerCodeSyntax=Bad syntax for customer code
 ErrorBadBarCodeSyntax=Bad syntax for barcode. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
 ErrorCustomerCodeRequired=Customer code required
diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php
index 2f272ceca1c..9e1fb330019 100644
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@@ -169,6 +169,20 @@ if ($action == 'setdoc') {
 	}
 }
 
+//Activate Set accountancy code customer invoice mandatory
+if ($action == "setaccountancycodecustomerinvoicemandatory") {
+	$setaccountancycodecustomerinvoicemandatory = GETPOST('value', 'int');
+	$res = dolibarr_set_const($db, "SOCIETE_ACCOUNTANCY_CODE_CUSTOMER_INVOICE_MANDATORY", $setaccountancycodecustomerinvoicemandatory, 'yesno', 0, '', $conf->entity);
+	if (!($res > 0)) {
+		$error++;
+	}
+	if (!$error) {
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
+}
+
 //Activate Set ref in list
 if ($action == "setaddrefinlist") {
 	$setaddrefinlist = GETPOST('value', 'int');
@@ -709,6 +723,23 @@ foreach ($profid as $key => $val) {
 	$i++;
 }
 
+if ($conf->accounting->enabled) {
+	print '<tr class="oddeven">';
+	print '<td colspan="2">'.$langs->trans('CustomerAccountancyCodeShort')."</td>\n";
+	print '<td colspan="2"></td>';
+
+	if (!empty($conf->global->SOCIETE_ACCOUNTANCY_CODE_CUSTOMER_INVOICE_MANDATORY)) {
+		print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaccountancycodecustomerinvoicemandatory&token='.newToken().'&value=0">';
+		print img_picto($langs->trans("Activated"), 'switch_on');
+		print '</a></td>';
+	} else {
+		print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaccountancycodecustomerinvoicemandatory&token='.newToken().'&value=1">';
+		print img_picto($langs->trans("Disabled"), 'switch_off');
+		print '</a></td>';
+	}
+	print "</tr>\n";
+}
+
 print "</table>\n";
 print '</div>';
 

From 00108589fd9afe184ee3cb42ef66bff896be9298 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 11 Jan 2022 00:55:54 +0100
Subject: [PATCH 048/316] Fix creation of fields tms into sql scripts

---
 htdocs/core/lib/modulebuilder.lib.php         |  2 ++
 .../install/mysql/migration/13.0.0-14.0.0.sql | 20 +++++++++----------
 .../install/mysql/migration/14.0.0-15.0.0.sql | 18 ++++++++---------
 ...organization_conferenceorboothattendee.sql |  2 +-
 ..._conferenceorboothattendee_extrafields.sql |  2 +-
 .../mysql/tables/llx_hrm_evaluation-hrm.sql   |  2 +-
 .../llx_hrm_evaluation_extrafields-hrm.sql    |  2 +-
 .../tables/llx_hrm_evaluationdet-hrm.sql      |  2 +-
 .../llx_hrm_evaluationdet_extrafields-hrm.sql |  2 +-
 .../install/mysql/tables/llx_hrm_job-hrm.sql  |  2 +-
 .../tables/llx_hrm_job_extrafields-hrm.sql    |  2 +-
 .../mysql/tables/llx_hrm_job_user-hrm.sql     |  2 +-
 .../mysql/tables/llx_hrm_skill-hrm.sql        |  2 +-
 .../tables/llx_hrm_skill_extrafields-hrm.sql  |  2 +-
 .../mysql/tables/llx_intracommreport.sql      |  2 +-
 ...lx_knowledgemanagement_knowledgerecord.sql |  2 +-
 ...management_knowledgerecord_extrafields.sql |  2 +-
 .../install/mysql/tables/llx_partnership.sql  |  2 +-
 .../install/mysql/tables/llx_payment_vat.sql  |  2 +-
 .../tables/llx_workstation_workstation.sql    |  2 +-
 .../llx_workstation_workstation_resource.sql  |  2 +-
 .../llx_workstation_workstation_usergroup.sql |  2 +-
 test/phpunit/CodingSqlTest.php                |  4 ++++
 23 files changed, 44 insertions(+), 38 deletions(-)

diff --git a/htdocs/core/lib/modulebuilder.lib.php b/htdocs/core/lib/modulebuilder.lib.php
index d44da05fa38..7c32b377bd4 100644
--- a/htdocs/core/lib/modulebuilder.lib.php
+++ b/htdocs/core/lib/modulebuilder.lib.php
@@ -305,6 +305,8 @@ function rebuildObjectSql($destdir, $module, $objectname, $newmask, $readdir = '
 			$texttoinsert .= "\t".$key." ".$type;
 			if ($key == 'rowid') {
 				$texttoinsert .= ' AUTO_INCREMENT PRIMARY KEY';
+			} elseif ($type == 'timestamp') {
+				$texttoinsert .= ' DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP';
 			}
 			if ($key == 'entity') {
 				$texttoinsert .= ' DEFAULT 1';
diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index ac032d3541d..ab7ea0219ec 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -183,7 +183,7 @@ CREATE TABLE llx_workstation_workstation(
 	entity int DEFAULT 1,
 	note_private text,
 	date_creation datetime NOT NULL,
-	tms timestamp,
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	fk_user_creat integer NOT NULL,
 	fk_user_modif integer,
 	import_key varchar(14),
@@ -201,14 +201,14 @@ ALTER TABLE llx_workstation_workstation ADD INDEX idx_workstation_workstation_st
 
 CREATE TABLE llx_workstation_workstation_resource(
 	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
-	tms timestamp,
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	fk_resource integer,
 	fk_workstation integer
 ) ENGINE=innodb;
 
 CREATE TABLE llx_workstation_workstation_usergroup(
 	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
-	tms timestamp,
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	fk_usergroup integer,
 	fk_workstation integer
 ) ENGINE=innodb;
@@ -264,7 +264,7 @@ create table llx_payment_vat
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
   fk_tva          integer,
   datec           datetime,           -- date de creation
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datep           datetime,           -- payment date
   amount          double(24,8) DEFAULT 0,
   fk_typepaiement integer NOT NULL,
@@ -431,7 +431,7 @@ CREATE TABLE llx_eventorganization_conferenceorboothattendee(
     note_public text,
     note_private text,
     date_creation datetime NOT NULL,
-    tms timestamp,
+    tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     fk_user_creat integer,
     fk_user_modif integer,
     last_main_doc varchar(255),
@@ -466,7 +466,7 @@ ALTER TABLE llx_eventorganization_conferenceorboothattendee ADD UNIQUE INDEX uk_
 create table llx_eventorganization_conferenceorboothattendee_extrafields
 (
     rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-    tms                       timestamp,
+    tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     fk_object                 integer NOT NULL,
     import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -510,7 +510,7 @@ CREATE TABLE llx_partnership(
 	reason_decline_or_cancel text NULL,
 	date_creation datetime NOT NULL, 
 	fk_user_creat integer NOT NULL, 
-	tms timestamp, 
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	fk_user_modif integer, 
 	note_private text, 
 	note_public text, 
@@ -533,7 +533,7 @@ ALTER TABLE llx_partnership ADD INDEX idx_partnership_fk_member (fk_member);
 create table llx_partnership_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -568,7 +568,7 @@ CREATE TABLE llx_knowledgemanagement_knowledgerecord(
 	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL, 
 	ref varchar(128) NOT NULL, 
 	date_creation datetime NOT NULL, 
-	tms timestamp, 
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	last_main_doc varchar(255), 
 	fk_user_creat integer NOT NULL, 
 	fk_user_modif integer, 
@@ -592,7 +592,7 @@ ALTER TABLE llx_knowledgemanagement_knowledgerecord ADD COLUMN url varchar(255);
 create table llx_knowledgemanagement_knowledgerecord_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/migration/14.0.0-15.0.0.sql b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
index d33701c6ad6..c062b57c482 100644
--- a/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
+++ b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
@@ -193,7 +193,7 @@ CREATE TABLE llx_hrm_evaluation
     note_public text,
     note_private text,
     date_creation datetime NOT NULL,
-    tms timestamp,
+    tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     fk_user_creat integer NOT NULL,
     fk_user_modif integer,
     import_key varchar(14),
@@ -211,7 +211,7 @@ ALTER TABLE llx_hrm_evaluation ADD INDEX idx_hrm_evaluation_status (status);
 create table llx_hrm_evaluation_extrafields
 (
     rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-    tms                       timestamp,
+    tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     fk_object                 integer NOT NULL,
     import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -224,7 +224,7 @@ CREATE TABLE llx_hrm_evaluationdet
     -- BEGIN MODULEBUILDER FIELDS
     rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
     date_creation datetime NOT NULL,
-    tms timestamp,
+    tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     fk_user_creat integer NOT NULL,
     fk_user_modif integer,
     fk_skill integer NOT NULL,
@@ -243,7 +243,7 @@ ALTER TABLE llx_hrm_evaluationdet ADD INDEX idx_hrm_evaluationdet_fk_evaluation
 create table llx_hrm_evaluationdet_extrafields
 (
     rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-    tms                       timestamp,
+    tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     fk_object                 integer NOT NULL,
     import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -258,7 +258,7 @@ CREATE TABLE llx_hrm_job
     label varchar(255) NOT NULL,
     description text,
     date_creation datetime NOT NULL,
-    tms timestamp,
+    tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     deplacement varchar(255),
     note_public text,
     note_private text,
@@ -273,7 +273,7 @@ ALTER TABLE llx_hrm_job ADD INDEX idx_hrm_job_label (label);
 create table llx_hrm_job_extrafields
 (
     rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-    tms                       timestamp,
+    tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     fk_object                 integer NOT NULL,
     import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -287,7 +287,7 @@ CREATE TABLE llx_hrm_job_user(
     -- ref varchar(128) NOT NULL,
     description text,
     date_creation datetime NOT NULL,
-    tms timestamp,
+    tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     fk_contrat integer,
     fk_user integer NOT NULL,
     fk_job integer NOT NULL,
@@ -313,7 +313,7 @@ CREATE TABLE llx_hrm_skill
     label varchar(255),
     description text,
     date_creation datetime NOT NULL,
-    tms timestamp,
+    tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     fk_user_creat integer NOT NULL,
     fk_user_modif integer,
     required_level integer NOT NULL,
@@ -331,7 +331,7 @@ ALTER TABLE llx_hrm_skill ADD INDEX idx_hrm_skill_skill_type (skill_type);
 create table llx_hrm_skill_extrafields
 (
     rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-    tms                       timestamp,
+    tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     fk_object                 integer NOT NULL,
     import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_eventorganization_conferenceorboothattendee.sql b/htdocs/install/mysql/tables/llx_eventorganization_conferenceorboothattendee.sql
index b505f8f6a31..d6139f48f21 100644
--- a/htdocs/install/mysql/tables/llx_eventorganization_conferenceorboothattendee.sql
+++ b/htdocs/install/mysql/tables/llx_eventorganization_conferenceorboothattendee.sql
@@ -28,7 +28,7 @@ CREATE TABLE llx_eventorganization_conferenceorboothattendee(
 	note_public text, 
 	note_private text, 
 	date_creation datetime NOT NULL, 
-	tms timestamp, 
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
 	fk_user_creat integer, 
 	fk_user_modif integer, 
 	last_main_doc varchar(255), 
diff --git a/htdocs/install/mysql/tables/llx_eventorganization_conferenceorboothattendee_extrafields.sql b/htdocs/install/mysql/tables/llx_eventorganization_conferenceorboothattendee_extrafields.sql
index 5455314ff06..98a2bc5385f 100644
--- a/htdocs/install/mysql/tables/llx_eventorganization_conferenceorboothattendee_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_eventorganization_conferenceorboothattendee_extrafields.sql
@@ -16,7 +16,7 @@
 create table llx_eventorganization_conferenceorboothattendee_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_hrm_evaluation-hrm.sql b/htdocs/install/mysql/tables/llx_hrm_evaluation-hrm.sql
index bc9b7a1effc..7327d1403dc 100644
--- a/htdocs/install/mysql/tables/llx_hrm_evaluation-hrm.sql
+++ b/htdocs/install/mysql/tables/llx_hrm_evaluation-hrm.sql
@@ -25,7 +25,7 @@ CREATE TABLE llx_hrm_evaluation(
 	note_public text, 
 	note_private text, 
 	date_creation datetime NOT NULL, 
-	tms timestamp, 
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
 	fk_user_creat integer NOT NULL, 
 	fk_user_modif integer, 
 	import_key varchar(14), 
diff --git a/htdocs/install/mysql/tables/llx_hrm_evaluation_extrafields-hrm.sql b/htdocs/install/mysql/tables/llx_hrm_evaluation_extrafields-hrm.sql
index da00cc3c333..fe600797141 100644
--- a/htdocs/install/mysql/tables/llx_hrm_evaluation_extrafields-hrm.sql
+++ b/htdocs/install/mysql/tables/llx_hrm_evaluation_extrafields-hrm.sql
@@ -18,7 +18,7 @@
 create table llx_hrm_evaluation_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_hrm_evaluationdet-hrm.sql b/htdocs/install/mysql/tables/llx_hrm_evaluationdet-hrm.sql
index 4e1b3860ec8..4faa0a4bb91 100644
--- a/htdocs/install/mysql/tables/llx_hrm_evaluationdet-hrm.sql
+++ b/htdocs/install/mysql/tables/llx_hrm_evaluationdet-hrm.sql
@@ -20,7 +20,7 @@ CREATE TABLE llx_hrm_evaluationdet
 (
 	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
 	date_creation datetime NOT NULL,
-	tms timestamp,
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	fk_user_creat integer NOT NULL,
 	fk_user_modif integer,
 	fk_skill integer NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_hrm_evaluationdet_extrafields-hrm.sql b/htdocs/install/mysql/tables/llx_hrm_evaluationdet_extrafields-hrm.sql
index 4d4031ba228..44151cf78d0 100644
--- a/htdocs/install/mysql/tables/llx_hrm_evaluationdet_extrafields-hrm.sql
+++ b/htdocs/install/mysql/tables/llx_hrm_evaluationdet_extrafields-hrm.sql
@@ -18,7 +18,7 @@
 create table llx_hrm_evaluationdet_extrafields
 (
     rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-    tms                       timestamp,
+    tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     fk_object                 integer NOT NULL,
     import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_hrm_job-hrm.sql b/htdocs/install/mysql/tables/llx_hrm_job-hrm.sql
index 51f472af377..106d847b136 100644
--- a/htdocs/install/mysql/tables/llx_hrm_job-hrm.sql
+++ b/htdocs/install/mysql/tables/llx_hrm_job-hrm.sql
@@ -22,7 +22,7 @@ CREATE TABLE llx_hrm_job(
     label varchar(255) NOT NULL,
 	description text, 
 	date_creation datetime NOT NULL, 
-	tms timestamp, 
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
 	deplacement varchar(255),
     note_public text,
     note_private text,
diff --git a/htdocs/install/mysql/tables/llx_hrm_job_extrafields-hrm.sql b/htdocs/install/mysql/tables/llx_hrm_job_extrafields-hrm.sql
index 10cccf1c36f..f580abea39e 100644
--- a/htdocs/install/mysql/tables/llx_hrm_job_extrafields-hrm.sql
+++ b/htdocs/install/mysql/tables/llx_hrm_job_extrafields-hrm.sql
@@ -18,7 +18,7 @@
 create table llx_hrm_job_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_hrm_job_user-hrm.sql b/htdocs/install/mysql/tables/llx_hrm_job_user-hrm.sql
index 6124f84e1e6..33906d1607f 100644
--- a/htdocs/install/mysql/tables/llx_hrm_job_user-hrm.sql
+++ b/htdocs/install/mysql/tables/llx_hrm_job_user-hrm.sql
@@ -21,7 +21,7 @@ CREATE TABLE llx_hrm_job_user(
 	-- ref varchar(128) NOT NULL,
 	description text,
 	date_creation datetime NOT NULL,
-	tms timestamp,
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	fk_contrat integer,
 	fk_user integer NOT NULL,
 	fk_job integer NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_hrm_skill-hrm.sql b/htdocs/install/mysql/tables/llx_hrm_skill-hrm.sql
index 96a31be588a..441fdcf8505 100644
--- a/htdocs/install/mysql/tables/llx_hrm_skill-hrm.sql
+++ b/htdocs/install/mysql/tables/llx_hrm_skill-hrm.sql
@@ -22,7 +22,7 @@ CREATE TABLE llx_hrm_skill(
 	label varchar(255), 
 	description text, 
 	date_creation datetime NOT NULL, 
-	tms timestamp, 
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
 	fk_user_creat integer NOT NULL, 
 	fk_user_modif integer, 
 	required_level integer NOT NULL, 
diff --git a/htdocs/install/mysql/tables/llx_hrm_skill_extrafields-hrm.sql b/htdocs/install/mysql/tables/llx_hrm_skill_extrafields-hrm.sql
index d47657e34f8..15bf4da0464 100644
--- a/htdocs/install/mysql/tables/llx_hrm_skill_extrafields-hrm.sql
+++ b/htdocs/install/mysql/tables/llx_hrm_skill_extrafields-hrm.sql
@@ -18,7 +18,7 @@
 create table llx_hrm_skill_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_intracommreport.sql b/htdocs/install/mysql/tables/llx_intracommreport.sql
index d3d2956e4ab..c12f9eb0862 100644
--- a/htdocs/install/mysql/tables/llx_intracommreport.sql
+++ b/htdocs/install/mysql/tables/llx_intracommreport.sql
@@ -28,5 +28,5 @@ create table llx_intracommreport
   content_xml		text,
   type_export		varchar(10),
   datec             datetime,
-  tms               timestamp
+  tms               timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord.sql b/htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord.sql
index 384725056ab..a12c73b9cde 100644
--- a/htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord.sql
+++ b/htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord.sql
@@ -20,7 +20,7 @@ CREATE TABLE llx_knowledgemanagement_knowledgerecord(
 	entity integer DEFAULT 1 NOT NULL,  -- multi company id
 	ref varchar(128) NOT NULL, 
 	date_creation datetime NOT NULL, 
-	tms timestamp, 
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
 	last_main_doc varchar(255), 
 	lang varchar(6),
 	fk_user_creat integer NOT NULL, 
diff --git a/htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord_extrafields.sql b/htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord_extrafields.sql
index 6498324ed8c..5f7e09f5901 100644
--- a/htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord_extrafields.sql
@@ -16,7 +16,7 @@
 create table llx_knowledgemanagement_knowledgerecord_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_partnership.sql b/htdocs/install/mysql/tables/llx_partnership.sql
index 47ee7f3a48b..e3a5cb37e05 100644
--- a/htdocs/install/mysql/tables/llx_partnership.sql
+++ b/htdocs/install/mysql/tables/llx_partnership.sql
@@ -29,7 +29,7 @@ CREATE TABLE llx_partnership(
 	reason_decline_or_cancel text NULL,
 	date_creation datetime NOT NULL, 
 	fk_user_creat integer NOT NULL, 
-	tms timestamp, 
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
 	fk_user_modif integer, 
 	note_private text, 
 	note_public text, 
diff --git a/htdocs/install/mysql/tables/llx_payment_vat.sql b/htdocs/install/mysql/tables/llx_payment_vat.sql
index 4ebb5bb4af3..6975a5d3a35 100644
--- a/htdocs/install/mysql/tables/llx_payment_vat.sql
+++ b/htdocs/install/mysql/tables/llx_payment_vat.sql
@@ -22,7 +22,7 @@ create table llx_payment_vat
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
   fk_tva          integer,
   datec           datetime,           -- date de creation
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datep           datetime,           -- payment date
   amount          double(24,8) DEFAULT 0,
   fk_typepaiement integer NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_workstation_workstation.sql b/htdocs/install/mysql/tables/llx_workstation_workstation.sql
index a4d9fd4dbc8..5a8c1d90c7e 100755
--- a/htdocs/install/mysql/tables/llx_workstation_workstation.sql
+++ b/htdocs/install/mysql/tables/llx_workstation_workstation.sql
@@ -24,7 +24,7 @@ CREATE TABLE llx_workstation_workstation(
 	entity int DEFAULT 1,
 	note_private text, 
 	date_creation datetime NOT NULL, 
-	tms timestamp, 
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
 	fk_user_creat integer NOT NULL, 
 	fk_user_modif integer, 
 	import_key varchar(14), 
diff --git a/htdocs/install/mysql/tables/llx_workstation_workstation_resource.sql b/htdocs/install/mysql/tables/llx_workstation_workstation_resource.sql
index 92463ade696..06cb9d74635 100755
--- a/htdocs/install/mysql/tables/llx_workstation_workstation_resource.sql
+++ b/htdocs/install/mysql/tables/llx_workstation_workstation_resource.sql
@@ -16,7 +16,7 @@
 
 CREATE TABLE llx_workstation_workstation_resource(
 	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL, 
-	tms timestamp, 
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
 	fk_resource integer, 
 	fk_workstation integer
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_workstation_workstation_usergroup.sql b/htdocs/install/mysql/tables/llx_workstation_workstation_usergroup.sql
index 9ecccc88d82..7fa3bb5abf8 100755
--- a/htdocs/install/mysql/tables/llx_workstation_workstation_usergroup.sql
+++ b/htdocs/install/mysql/tables/llx_workstation_workstation_usergroup.sql
@@ -16,7 +16,7 @@
 
 CREATE TABLE llx_workstation_workstation_usergroup(
 	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL, 
-	tms timestamp, 
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
 	fk_usergroup integer, 
 	fk_workstation integer
 ) ENGINE=innodb;
diff --git a/test/phpunit/CodingSqlTest.php b/test/phpunit/CodingSqlTest.php
index f79205a0443..96ae1f61ab0 100644
--- a/test/phpunit/CodingSqlTest.php
+++ b/test/phpunit/CodingSqlTest.php
@@ -218,6 +218,10 @@ class CodingSqlTest extends PHPUnit\Framework\TestCase
 				//print __METHOD__." Result for checking we don't have 'integer(' = ".$result."\n";
 				$this->assertTrue($result===false, 'Found value in parenthesis after the integer. It must be integer not integer(x) into '.$file.'. Bad.');
 
+				$result=strpos($filecontent, 'timestamp,');
+				//print __METHOD__." Result for checking we don't have 'NUMERIC(' = ".$result."\n";
+				$this->assertTrue($result===false, 'Found type timestamp with option DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP after into '.$file.'. Bad.');
+
 				if ($dir == DOL_DOCUMENT_ROOT.'/install/mysql/migration') {
 					// Test for migration files only
 				} elseif ($dir == DOL_DOCUMENT_ROOT.'/install/mysql/data') {

From b9915800cff64c23997981162d3a102e289c97b8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 11 Jan 2022 01:30:24 +0100
Subject: [PATCH 049/316] Fix bad warning

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

diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php
index fb9809bd9f2..3812d72f405 100644
--- a/htdocs/compta/prelevement/card.php
+++ b/htdocs/compta/prelevement/card.php
@@ -439,6 +439,8 @@ if ($id > 0 || $ref) {
 		}
 
 		if ($num > 0) {
+			$total = price2num($total, 'MT');
+
 			print '<tr class="liste_total">';
 			print '<td>'.$langs->trans("Total").'</td>';
 			print '<td>&nbsp;</td>';

From 54cf91eda4034c8b566e31f0ed9807e1807dc729 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 11 Jan 2022 13:31:16 +0100
Subject: [PATCH 050/316] Update card.php

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

diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index f2b93ddbb80..d0b4fb03b2a 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -207,6 +207,8 @@ if (empty($reshook))
 
 							if ($result > 0) {
 								$substitutionarray['__THIRDPARTY_CUSTOMER_CODE__'] = $thirdpartystatic->code_client;
+							} else {
+								$substitutionarray['__THIRDPARTY_CUSTOMER_CODE__'] = '';
 							}
 						}
 						$substitutionarray['__EMAIL__'] = $obj->email;

From 71cf137da414f14d51a8c81201607fb93fd44b1a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 11 Jan 2022 13:32:32 +0100
Subject: [PATCH 051/316] Fix code for cli must be similar to same code for gui
 version.

---
 scripts/emailings/mailing-send.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/scripts/emailings/mailing-send.php b/scripts/emailings/mailing-send.php
index 876895d7c87..f427e42d8cb 100755
--- a/scripts/emailings/mailing-send.php
+++ b/scripts/emailings/mailing-send.php
@@ -168,6 +168,8 @@ if ($resql) {
 						$error++;
 					}
 
+					$thirdpartystatic = new Societe($db);
+
 					// Look on each email and sent message
 					$i = 0;
 					while ($i < $num2) {
@@ -200,6 +202,15 @@ if ($resql) {
 
 						// Array of possible substitutions (See also file mailing-send.php that should manage same substitutions)
 						$substitutionarray['__ID__'] = $obj->source_id;
+						if ($obj->source_type == "thirdparty") {
+							$result = $thirdpartystatic->fetch($obj->source_id);
+
+							if ($result > 0) {
+								$substitutionarray['__THIRDPARTY_CUSTOMER_CODE__'] = $thirdpartystatic->code_client;
+							} else {
+								$substitutionarray['__THIRDPARTY_CUSTOMER_CODE__'] = '';
+							}
+						}
 						$substitutionarray['__EMAIL__'] = $obj->email;
 						$substitutionarray['__LASTNAME__'] = $obj->lastname;
 						$substitutionarray['__FIRSTNAME__'] = $obj->firstname;

From 4a82210fa63494866992e70ed9d3d0edf30b1d35 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 11 Jan 2022 15:17:46 +0100
Subject: [PATCH 052/316] # WARNING: head commit changed in the meantime

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
---
 SECURITY.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SECURITY.md b/SECURITY.md
index 9c28e2874b9..05b3ac148fe 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -6,8 +6,8 @@ This file contains some policies about the security reports on Dolibarr ERP CRM
 
 | Version    | Supported              |
 | ---------- | ---------------------- |
-| <= 14.0.1  | :x:                    |
-| >= 14.0.2+ | :white_check_mark: except CSRF attacks|
+| <= 14.0.4  | :x:                    |
+| >= 14.0.5+ | :white_check_mark: except CSRF attacks|
 | >= develop | :white_check_mark:     |
 
 ## Reporting a Vulnerability

From b4f66226a8499fcf48d84c12e39e8d76de55847b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 11 Jan 2022 15:32:09 +0100
Subject: [PATCH 053/316] Update contributing file.

---
 .github/CONTRIBUTING.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 68fe9de68d6..d7463d62172 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -26,8 +26,9 @@ Default **language here is english**. So please prepare your contributions in en
 1. [Fork](https://help.github.com/articles/fork-a-repo) the [GitHub repository](https://github.com/Dolibarr/dolibarr).
 2. Clone your fork.
 3. Choose a branch(See the [Branches](#branches) section below).
-4. Commit and push your changes.
-5. [Make a pull request](https://help.github.com/articles/creating-a-pull-request).
+4. Read our developer documentation on the [Dolibarr Wiki](https://wiki.dolibarr.org/index.php?title=Developer_documentation).
+5. Commit and push your changes.
+6. [Make a pull request](https://help.github.com/articles/creating-a-pull-request).
 
 <span id="branches" name="branches"></span>
 ### Branches

From 1efbff8fea68bdc53a9b9c6b351e89441d191c8d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 11 Jan 2022 15:42:03 +0100
Subject: [PATCH 054/316] Fix error message

---
 htdocs/api/class/api_login.class.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/api/class/api_login.class.php b/htdocs/api/class/api_login.class.php
index 7afdb74b89d..f54fd08275a 100644
--- a/htdocs/api/class/api_login.class.php
+++ b/htdocs/api/class/api_login.class.php
@@ -135,7 +135,11 @@ class Login
 		if (empty($tmpuser->api_key) || $reset) {
 			$tmpuser->getrights();
 			if (empty($tmpuser->rights->user->self->creer)) {
-				throw new RestException(403, 'User need write permission on itself to reset its API token');
+				if (empty($tmpuser->api_key)) {
+					throw new RestException(403, 'No API token set for this user and user need write permission on itself to reset its API token');
+				} else {
+					throw new RestException(403, 'User need write permission on itself to reset its API token');
+				}
 			}
 
 			// Generate token for user

From 92585399edce77b88ee3a895f54b956785ee8b7a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 11 Jan 2022 16:04:04 +0100
Subject: [PATCH 055/316] Update doc

---
 SECURITY.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/SECURITY.md b/SECURITY.md
index 05b3ac148fe..4e7e5fa933a 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -12,7 +12,8 @@ This file contains some policies about the security reports on Dolibarr ERP CRM
 
 ## Reporting a Vulnerability
 
-To report a vulnerability, please use GitHub security advisory at [https://github.com/Dolibarr/dolibarr/security/advisories/new](https://github.com/Dolibarr/dolibarr/security/advisories/new) (if you have permissions) or alternatively send an email to security@dolibarr.org (for everybody)
+To report a vulnerability, for a private report, please use GitHub security advisory at [https://github.com/Dolibarr/dolibarr/security/advisories/new](https://github.com/Dolibarr/dolibarr/security/advisories/new) (if you have permissions).
+Alternatively send an email to security@dolibarr.org (for everybody)
 
 ## Hunting vulnerabilities on Dolibarr
 

From 2f249e9a7d0df8c204dd49a2bf3020f827d9df02 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 11 Jan 2022 16:55:58 +0100
Subject: [PATCH 056/316] Add Open SSF Best practices

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index b0f7a2c3761..4e120a4cb91 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,7 @@
 ![Build status](https://img.shields.io/travis/Dolibarr/dolibarr/develop.svg)
 [![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%205.6-8892BF.svg?style=flat-square)](https://php.net/)
 [![GitHub release](https://img.shields.io/github/v/release/Dolibarr/dolibarr)](https://github.com/Dolibarr/dolibarr)
+[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/5521/badge)](https://bestpractices.coreinfrastructure.org/projects/5521)
 
 Dolibarr ERP & CRM is a modern software package that helps manage your organization's activity (contacts, suppliers, invoices, orders, stocks, agenda…).
 

From 63611ab717bcc3e10190572b89f40528be2284fe Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Tue, 11 Jan 2022 20:24:23 +0100
Subject: [PATCH 057/316] NEW add setup/establishments API (need for
 recruitment API)

---
 htdocs/api/class/api_setup.class.php | 62 +++++++++++++++++++++++++++-
 1 file changed, 60 insertions(+), 2 deletions(-)

diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php
index f4e17f42556..d169c8220ec 100644
--- a/htdocs/api/class/api_setup.class.php
+++ b/htdocs/api/class/api_setup.class.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2017	Regis Houssin	        <regis.houssin@inodbox.com>
  * Copyright (C) 2017	Neil Orley	            <neil.orley@oeris.fr>
  * Copyright (C) 2018-2021   Frédéric France         <frederic.france@netlogic.fr>
- * Copyright (C) 2018-2021   Thibault FOUCART        <support@ptibogxiv.net>
+ * Copyright (C) 2018-2022   Thibault FOUCART        <support@ptibogxiv.net>
  *
  *
  * This program is free software; you can redistribute it and/or modify
@@ -26,7 +26,7 @@ use Luracast\Restler\RestException;
 require_once DOL_DOCUMENT_ROOT.'/main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/cstate.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/ccountry.class.php';
-
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/establishment.class.php';
 
 /**
  * API class for dictionaries
@@ -1721,6 +1721,64 @@ class Setup extends DolibarrApi
 		return $this->_cleanObjectDatas($mysoc);
 	}
 
+	/**
+	 * Get the list of establishments.
+	 *
+	 * @return array				List of establishments
+	 *
+	 * @url     GET /establishments
+	 *
+	 * @throws RestException
+	 */
+	public function getEstablishments()
+	{
+		$list = array();
+
+		$sql = "SELECT e.rowid, e.rowid as ref, e.label, e.address, e.zip, e.town, e.status";
+		$sql .= " FROM ".MAIN_DB_PREFIX."establishment as e";
+		$sql .= " WHERE e.entity IN (".getEntity('establishment').')';
+		// if ($type) $sql .= " AND t.type LIKE '%".$this->db->escape($type)."%'";
+		// if ($module)    $sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
+		// Add sql filters
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving list of establishments : '.$this->db->lasterror());
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Get establishment by ID.
+	 *
+	 * @param int       $id        ID of establishment
+	 * @return array    		   Array of cleaned object properties
+	 *
+	 * @url     GET establishments/{id}
+	 *
+	 * @throws RestException
+	 */
+	public function getEtablishmentByID($id)
+	{
+		$establishment = new Establishment($this->db);
+
+		$result = $establishment->fetch($id);
+		if ($result < 0) {
+			throw new RestException(503, 'Error when retrieving state : '.$establishment->error);
+		} elseif ($result == 0) {
+			throw new RestException(404, 'Establishment not found');
+		}
+
+		return $this->_cleanObjectDatas($establishment);
+	}
 
 	/**
 	 * Get value of a setup variables

From 61e6e33387ee7855fe0cfc5394d578d244074574 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Tue, 11 Jan 2022 20:37:20 +0100
Subject: [PATCH 058/316] FIX bom.class.php

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

diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index 656b3169eef..0520c76dde2 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -790,7 +790,7 @@ class BOM extends CommonObject
 			$label .= '<br><b>'.$langs->trans('Label').':</b> '.$this->label;
 		}
 		if (!empty($this->fk_product) && $this->fk_product > 0) {
-			include_once DOL_DOCUMENT_ROO.'/product/class/product.class.php';
+			include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 			$product = new Product($db);
 			$resultFetch = $product->fetch($this->fk_product);
 			if ($resultFetch > 0) {

From 338463200542737a4a43b92c8f9a949536260b05 Mon Sep 17 00:00:00 2001
From: DATUC <aurelien.tad@gmail.com>
Date: Wed, 12 Jan 2022 00:28:26 +0100
Subject: [PATCH 059/316] Update companies.lang

---
 htdocs/langs/am_ET/companies.lang | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/htdocs/langs/am_ET/companies.lang b/htdocs/langs/am_ET/companies.lang
index bce0a98ea83..a561a0f1e9b 100644
--- a/htdocs/langs/am_ET/companies.lang
+++ b/htdocs/langs/am_ET/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Registre de Commerce)
+ProfId2CM=Id. prof. 2 (N° Contribuable)
+ProfId3CM=Id. prof. 3 (N° Arrêté de création)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Registre de Commerce
+ProfId2ShortCM=N° Contribuable
+ProfId3ShortCM=N° Arrêté de création
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-

From 89e509b25121a66700e8953be71b64c6921f6f76 Mon Sep 17 00:00:00 2001
From: DATUC <aurelien.tad@gmail.com>
Date: Wed, 12 Jan 2022 00:30:11 +0100
Subject: [PATCH 060/316] Update companies.lang

---
 htdocs/langs/ar_JO/companies.lang | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/htdocs/langs/ar_JO/companies.lang b/htdocs/langs/ar_JO/companies.lang
index bce0a98ea83..a561a0f1e9b 100644
--- a/htdocs/langs/ar_JO/companies.lang
+++ b/htdocs/langs/ar_JO/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Registre de Commerce)
+ProfId2CM=Id. prof. 2 (N° Contribuable)
+ProfId3CM=Id. prof. 3 (N° Arrêté de création)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Registre de Commerce
+ProfId2ShortCM=N° Contribuable
+ProfId3ShortCM=N° Arrêté de création
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-

From e2306f5915b1ab2f316ec85d27856645a05d99a1 Mon Sep 17 00:00:00 2001
From: DATUC <aurelien.tad@gmail.com>
Date: Wed, 12 Jan 2022 00:41:05 +0100
Subject: [PATCH 061/316] Update companies.lang

---
 htdocs/langs/da_DK/companies.lang | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/htdocs/langs/da_DK/companies.lang b/htdocs/langs/da_DK/companies.lang
index 39a39716f1c..e95ec705f32 100644
--- a/htdocs/langs/da_DK/companies.lang
+++ b/htdocs/langs/da_DK/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Registre de Commerce)
+ProfId2CM=Id. prof. 2 (N° Contribuable)
+ProfId3CM=Id. prof. 3 (N° Arrêté de création)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Registre de Commerce
+ProfId2ShortCM=N° Contribuable
+ProfId3ShortCM=N° Arrêté de création
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (RUT)
 ProfId2CO=-
 ProfId3CO=-

From c024585ec9a8189cd0a1f64ffa812d498ddfa868 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 12 Jan 2022 11:13:14 +0100
Subject: [PATCH 062/316] Trans

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

diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index 3a97af20788..a3105a1eecd 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Registre de Commerce)
+ProfId2CM=Id. prof. 2 (N° Contribuable)
+ProfId3CM=Id. prof. 3 (N° Arrêté de création)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Registre de Commerce
+ProfId2ShortCM=N° Contribuable
+ProfId3ShortCM=N° Arrêté de création
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-

From 2d9c46ed3aeef2772c8f9293049cd05dfa29cbe3 Mon Sep 17 00:00:00 2001
From: lvessiller <lvessiller@open-dsi.fr>
Date: Wed, 12 Jan 2022 12:22:43 +0100
Subject: [PATCH 063/316] NEW pre-filled extra fields with slected credit note

---
 htdocs/compta/facture/card.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 03b14416587..caef83ad025 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -3415,6 +3415,10 @@ if ($action == 'create') {
 					$optionsav .= '<option value="'.$key.'"';
 					if ($key == GETPOST('fac_avoir')) {
 						$optionsav .= ' selected';
+
+						// pre-filled extra fields with selected credit note
+						$newinvoice_static->fetch_optionals($key);
+						$object->array_options = $newinvoice_static->array_options;
 					}
 					$optionsav .= '>';
 					$optionsav .= $newinvoice_static->ref;

From 800de88c6965a5298cfed6a0fff654bf0e605f15 Mon Sep 17 00:00:00 2001
From: DATUC <aurelien.tad@gmail.com>
Date: Wed, 12 Jan 2022 12:26:06 +0100
Subject: [PATCH 064/316] Update companies.lang

---
 htdocs/langs/en_US/companies.lang | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index a3105a1eecd..3e85f1b35f7 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -157,15 +157,15 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
-ProfId1CM=Id. prof. 1 (Registre de Commerce)
-ProfId2CM=Id. prof. 2 (N° Contribuable)
-ProfId3CM=Id. prof. 3 (N° Arrêté de création)
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
 ProfId4CM=-
 ProfId5CM=-
 ProfId6CM=-
-ProfId1ShortCM=Registre de Commerce
-ProfId2ShortCM=N° Contribuable
-ProfId3ShortCM=N° Arrêté de création
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
 ProfId4ShortCM=-
 ProfId5ShortCM=-
 ProfId6ShortCM=-

From 297d2ecfbda7f4397ec5e2453427420e8b2c379e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 12 Jan 2022 16:09:31 +0100
Subject: [PATCH 065/316] fix warning

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

diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index e51e3147519..db1447d57b9 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -652,7 +652,7 @@ function modules_prepare_head($nbofactivatedmodules, $nboftotalmodules)
 	if ($nbofactivatedmodules <= (empty($conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING) ? 1 : $conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING)) {	// If only minimal initial modules enabled)
 		//$head[$h][1] = $form->textwithpicto($langs->trans("AvailableModules"), $desc);
 		$head[$h][1] = $langs->trans("AvailableModules");
-		$head[$h][1] .= $form->textwithpicto('', $langs->trans("YouMustEnableOneModule").'.<br><br><span class="opacitymedium">'.$desc.'</span>', 1, warning);
+		$head[$h][1] .= $form->textwithpicto('', $langs->trans("YouMustEnableOneModule").'.<br><br><span class="opacitymedium">'.$desc.'</span>', 1, 'warning');
 	} else {
 		//$head[$h][1] = $langs->trans("AvailableModules").$form->textwithpicto('<span class="badge marginleftonly">'.$nbofactivatedmodules.' / '.$nboftotalmodules.'</span>', $desc, 1, 'help', '', 1, 3);
 		$head[$h][1] = $langs->trans("AvailableModules").'<span class="badge marginleftonly">'.$nbofactivatedmodules.' / '.$nboftotalmodules.'</span>';

From b110ca6eadf146881ff57e5609c0f6f7c723efc4 Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <68746600+marc-dll@users.noreply.github.com>
Date: Wed, 12 Jan 2022 16:40:43 +0100
Subject: [PATCH 066/316] FIX: order to shipment: FIX hidden conf
 SHIPMENT_GETS_ALL_ORDER_PRODUCTS (still not working when not preselecting a
 warehouse)

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

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 3e76b2bb12a..0b32229ae65 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -1245,13 +1245,17 @@ if ($action == 'create')
 						{
 							// Quantity to send
 							print '<td class="center">';
-							if ($line->product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES))
-							{
-	                            if (GETPOST('qtyl'.$indiceAsked, 'int')) $deliverableQty = GETPOST('qtyl'.$indiceAsked, 'int');
-	                            print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
+							print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
+							if ($line->product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+								if (GETPOST('qtyl'.$indiceAsked, 'int')) $deliverableQty = GETPOST('qtyl'.$indiceAsked, 'int');
 								print '<input name="qtyl'.$indiceAsked.'" id="qtyl'.$indiceAsked.'" type="text" size="4" value="'.$deliverableQty.'">';
+							} else {
+								if (! empty($conf->global->SHIPMENT_GETS_ALL_ORDER_PRODUCTS)) {
+									print '<input name="qtyl'.$indiceAsked.'" id="qtyl'.$indiceAsked.'" type="hidden" value="0">';
+								}
+
+								print $langs->trans("NA");
 							}
-							else print $langs->trans("NA");
 							print '</td>';
 
 							// Stock
@@ -1420,8 +1424,13 @@ if ($action == 'create')
 									{
 										print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'" type="text" size="4" value="'.$deliverableQty.'">';
 										print '<input name="ent1'.$indiceAsked.'_'.$subj.'" type="hidden" value="'.$warehouse_id.'">';
+									} else {
+										if (! empty($conf->global->SHIPMENT_GETS_ALL_ORDER_PRODUCTS)) {
+											print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'" type="hidden" value="0">';
+										}
+
+										print $langs->trans("NA");
 									}
-									else print $langs->trans("NA");
 									print '</td>';
 
 									// Stock

From 67ab70f37dd8c30349348a3d3d345a87ff26f611 Mon Sep 17 00:00:00 2001
From: Harry Winner KF <kamdemharry@gmail.com>
Date: Wed, 12 Jan 2022 15:05:11 -0500
Subject: [PATCH 067/316] FIX Solving non-blocking bug in user login

When using the function check_user_password_dolibarr to authenticate a user, a call is made to the function dol_verifyHash which requires a pre-calculated hash. This hash is not available with programmatically-created never-used accounts. Hence, in suce cases we have the following warning:
Notice: Trying to access array offset on value of type null in .../htdocs/core/lib/security.lib.php on line 156

This fix solves that bug by avoiding that unnecessary call
---
 htdocs/core/login/functions_dolibarr.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/login/functions_dolibarr.php b/htdocs/core/login/functions_dolibarr.php
index f102cd2f358..292ce1b44f5 100644
--- a/htdocs/core/login/functions_dolibarr.php
+++ b/htdocs/core/login/functions_dolibarr.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2007-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2007-2015 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2010-2011 Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2022      Harry Winner Kamdem  <harry@sense.africa>
  *
  * 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
@@ -104,7 +105,7 @@ function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotes
 				}
 				// Check crypted password according to crypt algorithm
 				if ($cryptType == 'auto') {
-					if (dol_verifyHash($passtyped, $passcrypted, '0')) {
+					if ($passcrypted && dol_verifyHash($passtyped, $passcrypted, '0')) {
 						$passok = true;
 						dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ok - hash ".$cryptType." of pass is ok");
 					}

From dc3670bc91c963c32deca9b9eae029778e62c99a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 13 Jan 2022 11:00:52 +0100
Subject: [PATCH 068/316] Clean search_status

---
 htdocs/compta/paiement/list.php | 1 -
 htdocs/expedition/list.php      | 2 +-
 htdocs/reception/list.php       | 2 +-
 htdocs/societe/website.php      | 2 --
 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index b52e4a3f554..3d38f97b687 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -293,7 +293,6 @@ print '<input type="hidden" name="action" value="list">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-print '<input type="hidden" name="search_status" value="'.$search_status.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 print_barre_liste($langs->trans("ReceivedCustomersPayments"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'bill', 0, '', '', $limit, 0, 0, 1);
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 79ed3b52215..d4f91a24466 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -94,7 +94,7 @@ $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-$search_status = GETPOST('search_status');
+$search_status = GETPOST('search_status', 'intcomma');
 
 $diroutputmassaction = $conf->expedition->dir_output.'/sending/temp/massgeneration/'.$user->id;
 
diff --git a/htdocs/reception/list.php b/htdocs/reception/list.php
index 2d6600dcc45..8f07d1bede7 100644
--- a/htdocs/reception/list.php
+++ b/htdocs/reception/list.php
@@ -75,7 +75,7 @@ $pagenext = $page + 1;
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $contextpage = 'receptionlist';
 
-$search_status = GETPOST('search_status');
+$search_status = GETPOST('search_status', 'intcomma');
 
 $object = new Reception($db);
 
diff --git a/htdocs/societe/website.php b/htdocs/societe/website.php
index 7d79a429eea..3b2e6104409 100644
--- a/htdocs/societe/website.php
+++ b/htdocs/societe/website.php
@@ -43,8 +43,6 @@ $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'web
 $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 
-$search_status = GETPOST('search_status');
-
 // Security check
 $id = GETPOST('id', 'int') ?GETPOST('id', 'int') : GETPOST('socid', 'int');
 if ($user->socid) {

From 620a88b8d67fa3381b40748079a98b51796aeb34 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 13 Jan 2022 11:05:21 +0100
Subject: [PATCH 069/316] Fix param sortfield/order

---
 htdocs/compta/sociales/list.php                         | 2 +-
 htdocs/compta/stats/cabyprodserv.php                    | 4 ++--
 htdocs/compta/stats/cabyuser.php                        | 4 ++--
 htdocs/compta/stats/casoc.php                           | 4 ++--
 htdocs/compta/stats/supplier_turnover_by_prodserv.php   | 4 ++--
 htdocs/compta/stats/supplier_turnover_by_thirdparty.php | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/htdocs/compta/sociales/list.php b/htdocs/compta/sociales/list.php
index a4deec56715..ce379774e0a 100644
--- a/htdocs/compta/sociales/list.php
+++ b/htdocs/compta/sociales/list.php
@@ -61,7 +61,7 @@ $search_account				= GETPOST('search_account', 'int');
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield			= GETPOST("sortfield", 'alpha');
-$sortorder			= GETPOST("sortorder", 'alpha');
+$sortorder			= GETPOST("sortorder", 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 
 if (empty($page) || $page == -1) {
diff --git a/htdocs/compta/stats/cabyprodserv.php b/htdocs/compta/stats/cabyprodserv.php
index 021bffe40b4..084516c52df 100644
--- a/htdocs/compta/stats/cabyprodserv.php
+++ b/htdocs/compta/stats/cabyprodserv.php
@@ -52,8 +52,8 @@ if (GETPOST("modecompta")) {
 	$modecompta = GETPOST("modecompta");
 }
 
-$sortorder = GETPOST("sortorder", 'aZ09');
-$sortfield = GETPOST("sortfield", 'aZ09');
+$sortorder = GETPOST("sortorder", 'aZ09comma');
+$sortfield = GETPOST("sortfield", 'aZ09comma');
 if (!$sortorder) {
 	$sortorder = "asc";
 }
diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php
index 8e3169f1e8c..35d5028e938 100644
--- a/htdocs/compta/stats/cabyuser.php
+++ b/htdocs/compta/stats/cabyuser.php
@@ -51,8 +51,8 @@ if (GETPOST("modecompta")) {
 	$modecompta = GETPOST("modecompta");
 }
 
-$sortorder = GETPOST("sortorder", 'aZ09');
-$sortfield = GETPOST("sortfield", 'aZ09');
+$sortorder = GETPOST("sortorder", 'aZ09comma');
+$sortfield = GETPOST("sortfield", 'aZ09comma');
 if (!$sortorder) {
 	$sortorder = "asc";
 }
diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php
index 10f7956c6b7..76dbc56beef 100644
--- a/htdocs/compta/stats/casoc.php
+++ b/htdocs/compta/stats/casoc.php
@@ -44,8 +44,8 @@ if (GETPOST("modecompta")) {
 	$modecompta = GETPOST("modecompta");
 }
 
-$sortorder = GETPOST("sortorder", 'aZ09');
-$sortfield = GETPOST("sortfield", 'aZ09');
+$sortorder = GETPOST("sortorder", 'aZ09comma');
+$sortfield = GETPOST("sortfield", 'aZ09comma');
 if (!$sortorder) {
 	$sortorder = "asc";
 }
diff --git a/htdocs/compta/stats/supplier_turnover_by_prodserv.php b/htdocs/compta/stats/supplier_turnover_by_prodserv.php
index 4e92325a323..f36383ad94b 100644
--- a/htdocs/compta/stats/supplier_turnover_by_prodserv.php
+++ b/htdocs/compta/stats/supplier_turnover_by_prodserv.php
@@ -36,8 +36,8 @@ if (GETPOST("modecompta")) {
 	$modecompta = GETPOST("modecompta");
 }
 
-$sortorder = GETPOST("sortorder", 'aZ09');
-$sortfield = GETPOST("sortfield", 'aZ09');
+$sortorder = GETPOST("sortorder", 'aZ09comma');
+$sortfield = GETPOST("sortfield", 'aZ09comma');
 if (!$sortorder) {
 	$sortorder = "asc";
 }
diff --git a/htdocs/compta/stats/supplier_turnover_by_thirdparty.php b/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
index 0ea8418381d..0be2df11190 100644
--- a/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
+++ b/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
@@ -38,8 +38,8 @@ if (GETPOST("modecompta")) {
 	$modecompta = GETPOST("modecompta");
 }
 
-$sortorder = GETPOST("sortorder", 'aZ09');
-$sortfield = GETPOST("sortfield", 'aZ09');
+$sortorder = GETPOST("sortorder", 'aZ09comma');
+$sortfield = GETPOST("sortfield", 'aZ09comma');
 if (!$sortorder) {
 	$sortorder = "asc";
 }

From 13510b99298bb03fe86fbb232c814c8db7789013 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 13 Jan 2022 11:09:37 +0100
Subject: [PATCH 070/316] Clean sortfield, sortorder

---
 htdocs/accountancy/admin/journals_list.php                    | 4 ++--
 htdocs/accountancy/admin/productaccount.php                   | 4 ++--
 .../accountancy/bookkeeping/thirdparty_lettering_customer.php | 4 ++--
 .../accountancy/bookkeeping/thirdparty_lettering_supplier.php | 4 ++--
 htdocs/adherents/agenda.php                                   | 4 ++--
 htdocs/adherents/document.php                                 | 4 ++--
 htdocs/adherents/list.php                                     | 4 ++--
 htdocs/adherents/subscription/list.php                        | 4 ++--
 htdocs/adherents/type.php                                     | 4 ++--
 htdocs/admin/defaultvalues.php                                | 4 ++--
 htdocs/admin/dict.php                                         | 4 ++--
 htdocs/admin/mails_templates.php                              | 4 ++--
 htdocs/admin/system/modules.php                               | 4 ++--
 htdocs/admin/tools/listsessions.php                           | 4 ++--
 htdocs/admin/translation.php                                  | 4 ++--
 htdocs/asset/document.php                                     | 4 ++--
 htdocs/asset/type.php                                         | 4 ++--
 htdocs/bom/bom_agenda.php                                     | 4 ++--
 htdocs/bom/bom_document.php                                   | 4 ++--
 htdocs/comm/action/document.php                               | 4 ++--
 htdocs/comm/action/index.php                                  | 4 ++--
 htdocs/comm/action/list.php                                   | 4 ++--
 htdocs/comm/action/pertype.php                                | 4 ++--
 htdocs/comm/action/peruser.php                                | 4 ++--
 htdocs/comm/action/rapport/index.php                          | 4 ++--
 htdocs/comm/card.php                                          | 4 ++--
 htdocs/comm/mailing/list.php                                  | 4 ++--
 htdocs/comm/propal/document.php                               | 4 ++--
 htdocs/comm/propal/list.php                                   | 4 ++--
 htdocs/commande/customer.php                                  | 4 ++--
 htdocs/commande/document.php                                  | 4 ++--
 htdocs/commande/list.php                                      | 4 ++--
 htdocs/compta/bank/account_statement_document.php             | 4 ++--
 htdocs/compta/bank/bankentries_list.php                       | 4 ++--
 htdocs/compta/bank/document.php                               | 4 ++--
 htdocs/compta/bank/list.php                                   | 4 ++--
 htdocs/compta/bank/releve.php                                 | 4 ++--
 htdocs/compta/bank/various_payment/list.php                   | 4 ++--
 htdocs/compta/cashcontrol/cashcontrol_card.php                | 4 ++--
 htdocs/compta/charges/index.php                               | 4 ++--
 htdocs/compta/clients.php                                     | 4 ++--
 htdocs/compta/deplacement/index.php                           | 4 ++--
 htdocs/compta/deplacement/list.php                            | 4 ++--
 htdocs/compta/facture/card-rec.php                            | 4 ++--
 htdocs/compta/facture/document.php                            | 4 ++--
 htdocs/compta/facture/invoicetemplate_list.php                | 4 ++--
 htdocs/compta/facture/list.php                                | 4 ++--
 htdocs/compta/paiement.php                                    | 2 +-
 htdocs/compta/paiement/cheque/list.php                        | 4 ++--
 htdocs/compta/paiement/list.php                               | 4 ++--
 htdocs/compta/prelevement/demandes.php                        | 4 ++--
 htdocs/compta/resultat/clientfourn.php                        | 4 ++--
 htdocs/compta/sociales/document.php                           | 4 ++--
 htdocs/compta/sociales/list.php                               | 2 +-
 htdocs/compta/sociales/payments.php                           | 4 ++--
 htdocs/compta/tva/document.php                                | 4 ++--
 htdocs/compta/tva/list.php                                    | 4 ++--
 htdocs/compta/tva/payments.php                                | 4 ++--
 htdocs/contact/agenda.php                                     | 4 ++--
 htdocs/contact/consumption.php                                | 4 ++--
 htdocs/contact/document.php                                   | 4 ++--
 htdocs/contrat/agenda.php                                     | 4 ++--
 htdocs/contrat/document.php                                   | 4 ++--
 htdocs/contrat/list.php                                       | 4 ++--
 htdocs/contrat/services_list.php                              | 4 ++--
 htdocs/core/lib/company.lib.php                               | 4 ++--
 htdocs/core/modules/movement/doc/pdf_standard.modules.php     | 4 ++--
 htdocs/cron/list.php                                          | 4 ++--
 htdocs/don/list.php                                           | 4 ++--
 htdocs/ecm/dir_add_card.php                                   | 4 ++--
 htdocs/ecm/dir_card.php                                       | 4 ++--
 htdocs/ecm/file_card.php                                      | 4 ++--
 htdocs/ecm/file_note.php                                      | 4 ++--
 htdocs/ecm/index.php                                          | 4 ++--
 htdocs/ecm/index_auto.php                                     | 4 ++--
 htdocs/ecm/search.php                                         | 4 ++--
 htdocs/eventorganization/conferenceorbooth_document.php       | 4 ++--
 htdocs/expedition/document.php                                | 4 ++--
 htdocs/expensereport/index.php                                | 4 ++--
 htdocs/fichinter/card-rec.php                                 | 2 +-
 htdocs/fourn/commande/document.php                            | 4 ++--
 htdocs/fourn/commande/info.php                                | 4 ++--
 htdocs/fourn/commande/list.php                                | 4 ++--
 htdocs/fourn/contact.php                                      | 4 ++--
 htdocs/fourn/facture/document.php                             | 4 ++--
 htdocs/fourn/facture/list.php                                 | 4 ++--
 htdocs/fourn/facture/paiement.php                             | 4 ++--
 htdocs/fourn/paiement/document.php                            | 4 ++--
 htdocs/fourn/paiement/list.php                                | 4 ++--
 htdocs/ftp/index.php                                          | 4 ++--
 htdocs/holiday/month_report.php                               | 2 +-
 htdocs/hrm/admin/admin_establishment.php                      | 4 ++--
 htdocs/hrm/establishment/info.php                             | 4 ++--
 htdocs/hrm/evaluation_agenda.php                              | 4 ++--
 htdocs/hrm/evaluation_document.php                            | 4 ++--
 htdocs/hrm/job_agenda.php                                     | 4 ++--
 htdocs/hrm/job_document.php                                   | 4 ++--
 htdocs/hrm/position_agenda.php                                | 4 ++--
 htdocs/hrm/position_document.php                              | 4 ++--
 htdocs/hrm/skill_agenda.php                                   | 4 ++--
 htdocs/hrm/skill_document.php                                 | 4 ++--
 htdocs/intracommreport/list.php                               | 4 ++--
 htdocs/knowledgemanagement/knowledgerecord_agenda.php         | 4 ++--
 htdocs/knowledgemanagement/knowledgerecord_document.php       | 4 ++--
 htdocs/loan/document.php                                      | 4 ++--
 htdocs/margin/customerMargins.php                             | 4 ++--
 htdocs/margin/tabs/productMargins.php                         | 4 ++--
 htdocs/margin/tabs/thirdpartyMargins.php                      | 4 ++--
 htdocs/modulebuilder/template/myobject_agenda.php             | 4 ++--
 htdocs/modulebuilder/template/myobject_document.php           | 4 ++--
 htdocs/mrp/mo_agenda.php                                      | 4 ++--
 htdocs/mrp/mo_document.php                                    | 4 ++--
 htdocs/mrp/mo_movements.php                                   | 4 ++--
 htdocs/multicurrency/multicurrency_rate.php                   | 4 ++--
 htdocs/partnership/partnership_agenda.php                     | 4 ++--
 htdocs/partnership/partnership_document.php                   | 4 ++--
 htdocs/product/agenda.php                                     | 4 ++--
 htdocs/product/document.php                                   | 4 ++--
 htdocs/product/fournisseurs.php                               | 4 ++--
 htdocs/product/list.php                                       | 4 ++--
 htdocs/product/popuprop.php                                   | 4 ++--
 htdocs/product/price.php                                      | 4 ++--
 htdocs/product/reassort.php                                   | 4 ++--
 htdocs/product/reassortlot.php                                | 4 ++--
 htdocs/product/stats/bom.php                                  | 4 ++--
 htdocs/product/stats/commande.php                             | 4 ++--
 htdocs/product/stats/contrat.php                              | 4 ++--
 htdocs/product/stats/facture.php                              | 4 ++--
 htdocs/product/stats/facture_fournisseur.php                  | 4 ++--
 htdocs/product/stats/mo.php                                   | 4 ++--
 htdocs/product/stock/card.php                                 | 4 ++--
 htdocs/product/stock/movement_card.php                        | 4 ++--
 htdocs/product/stock/movement_list.php                        | 4 ++--
 htdocs/product/stock/productlot_document.php                  | 4 ++--
 htdocs/product/stock/replenishorders.php                      | 4 ++--
 htdocs/product/stock/valo.php                                 | 4 ++--
 htdocs/projet/activity/perday.php                             | 4 ++--
 htdocs/projet/activity/perweek.php                            | 4 ++--
 htdocs/projet/document.php                                    | 4 ++--
 htdocs/projet/index.php                                       | 4 ++--
 htdocs/projet/tasks/document.php                              | 4 ++--
 htdocs/projet/tasks/list.php                                  | 4 ++--
 htdocs/projet/tasks/time.php                                  | 4 ++--
 htdocs/public/members/public_list.php                         | 4 ++--
 htdocs/public/ticket/list.php                                 | 4 ++--
 htdocs/reception/document.php                                 | 4 ++--
 htdocs/recruitment/recruitmentcandidature_agenda.php          | 4 ++--
 htdocs/recruitment/recruitmentcandidature_document.php        | 4 ++--
 htdocs/recruitment/recruitmentjobposition_agenda.php          | 4 ++--
 htdocs/recruitment/recruitmentjobposition_document.php        | 4 ++--
 htdocs/resource/agenda.php                                    | 4 ++--
 htdocs/resource/list.php                                      | 2 +-
 htdocs/societe/agenda.php                                     | 4 ++--
 htdocs/societe/consumption.php                                | 4 ++--
 htdocs/societe/document.php                                   | 4 ++--
 htdocs/societe/list.php                                       | 4 ++--
 htdocs/societe/notify/card.php                                | 4 ++--
 htdocs/societe/price.php                                      | 4 ++--
 htdocs/societe/societecontact.php                             | 4 ++--
 htdocs/societe/website.php                                    | 4 ++--
 htdocs/stripe/charge.php                                      | 4 ++--
 htdocs/stripe/payout.php                                      | 4 ++--
 htdocs/stripe/transaction.php                                 | 4 ++--
 htdocs/supplier_proposal/document.php                         | 4 ++--
 htdocs/supplier_proposal/list.php                             | 4 ++--
 htdocs/ticket/document.php                                    | 4 ++--
 htdocs/user/document.php                                      | 4 ++--
 htdocs/user/notify/card.php                                   | 4 ++--
 htdocs/website/index.php                                      | 4 ++--
 htdocs/workstation/workstation_agenda.php                     | 4 ++--
 htdocs/workstation/workstation_document.php                   | 4 ++--
 171 files changed, 337 insertions(+), 337 deletions(-)

diff --git a/htdocs/accountancy/admin/journals_list.php b/htdocs/accountancy/admin/journals_list.php
index 8af707c4626..7f000290e1c 100644
--- a/htdocs/accountancy/admin/journals_list.php
+++ b/htdocs/accountancy/admin/journals_list.php
@@ -58,8 +58,8 @@ $listoffset = GETPOST('listoffset', 'alpha');
 $listlimit = GETPOST('listlimit', 'int') > 0 ?GETPOST('listlimit', 'int') : 1000;
 $active = 1;
 
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
index 8503f3acfd6..847891c949b 100644
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -80,8 +80,8 @@ if (empty($accounting_product_mode)) {
 }
 
 $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", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php b/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
index 29a0171fe08..1ed29cfea27 100644
--- a/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
+++ b/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
@@ -48,8 +48,8 @@ $socid = GETPOSTINT("socid");
 // if ($user->socid) $socid=$user->socid;
 
 $limit = GETPOSTISSET('limit') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == - 1) {
 	$page = 0;
diff --git a/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php b/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
index d62a1e9fc25..5c315bee9fc 100644
--- a/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
+++ b/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
@@ -48,8 +48,8 @@ $socid = GETPOSTINT("socid");
 
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == - 1) {
 	$page = 0;
diff --git a/htdocs/adherents/agenda.php b/htdocs/adherents/agenda.php
index 4b59039d313..cb942ba3176 100644
--- a/htdocs/adherents/agenda.php
+++ b/htdocs/adherents/agenda.php
@@ -39,8 +39,8 @@ $langs->loadLangs(array("companies", "members"));
 $id = GETPOST('id', 'int') ?GETPOST('id', 'int') : GETPOST('rowid', 'int');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/adherents/document.php b/htdocs/adherents/document.php
index 6af133c655e..3dcab7a9c4c 100644
--- a/htdocs/adherents/document.php
+++ b/htdocs/adherents/document.php
@@ -44,8 +44,8 @@ $confirm = GETPOST('confirm', 'alpha');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 4936fadd326..322c08bd77c 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -83,8 +83,8 @@ if ($search_status < -2) {
 }
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index 4c9935b76a8..0b83881e502 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -52,8 +52,8 @@ $sall = '';
 $date_select = GETPOST("date_select", 'alpha');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 1d788457abe..76dd0617cee 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -53,8 +53,8 @@ $status = GETPOST('status', 'alpha');
 $optioncss = GETPOST('optioncss', 'alpha');
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index 9c80b1f7fa8..4d88675ffd4 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -46,8 +46,8 @@ $optioncss = GETPOST('optionscss', 'alphanohtml');
 $mode = GETPOST('mode', 'aZ09') ? GETPOST('mode', 'aZ09') : 'createform'; // 'createform', 'filters', 'sortorder', 'focus'
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 1c585b01552..5245e60ad67 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -77,8 +77,8 @@ $listoffset = GETPOST('listoffset');
 $listlimit = GETPOST('listlimit') > 0 ?GETPOST('listlimit') : 1000; // To avoid too long dictionaries
 $active = 1;
 
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index 033220d4a15..6ad1cdc6974 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -80,8 +80,8 @@ $actl[1] = img_picto($langs->trans("Activated"), 'switch_on', 'class="size15x"')
 $listoffset = GETPOST('listoffset', 'alpha');
 $listlimit = GETPOST('listlimit', 'alpha') > 0 ?GETPOST('listlimit', 'alpha') : 1000;
 
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/admin/system/modules.php b/htdocs/admin/system/modules.php
index a56ed8c1da3..9e60ff46bd7 100644
--- a/htdocs/admin/system/modules.php
+++ b/htdocs/admin/system/modules.php
@@ -40,8 +40,8 @@ $search_id = GETPOST("search_id", 'alpha');
 $search_version = GETPOST("search_version", 'alpha');
 $search_permission = GETPOST("search_permission", 'alpha');
 
-$sortfield			= GETPOST("sortfield", 'alpha');
-$sortorder			= GETPOST("sortorder", 'alpha');
+$sortfield			= GETPOST('sortfield', 'aZ09comma');
+$sortorder			= GETPOST('sortorder', 'aZ09comma');
 
 if (!$sortfield) {
 	$sortfield = "id";
diff --git a/htdocs/admin/tools/listsessions.php b/htdocs/admin/tools/listsessions.php
index 10a38fb59a1..cc9aaa356bc 100644
--- a/htdocs/admin/tools/listsessions.php
+++ b/htdocs/admin/tools/listsessions.php
@@ -47,8 +47,8 @@ if ($user->socid > 0) {
 }
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index 12b2eec700d..93f62337746 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -47,8 +47,8 @@ $transvalue = GETPOST('transvalue', 'restricthtml');
 $mode = GETPOST('mode', 'aZ09') ? GETPOST('mode', 'aZ09') : 'searchkey';
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/asset/document.php b/htdocs/asset/document.php
index b4ee3a0a175..9d46e9ae0b6 100644
--- a/htdocs/asset/document.php
+++ b/htdocs/asset/document.php
@@ -42,8 +42,8 @@ $confirm = GETPOST('confirm', 'alpha');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/asset/type.php b/htdocs/asset/type.php
index 0bef6b25609..cd802c1c4fd 100644
--- a/htdocs/asset/type.php
+++ b/htdocs/asset/type.php
@@ -47,8 +47,8 @@ $backtopage = GETPOST('backtopage', 'alpha');
 $type = GETPOST('type', 'alpha');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/bom/bom_agenda.php b/htdocs/bom/bom_agenda.php
index 841086399c9..2b9c6f57bbd 100644
--- a/htdocs/bom/bom_agenda.php
+++ b/htdocs/bom/bom_agenda.php
@@ -52,8 +52,8 @@ if (GETPOST('actioncode', 'array')) {
 $search_agenda_label = GETPOST('search_agenda_label');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/bom/bom_document.php b/htdocs/bom/bom_document.php
index c36ac32bb59..64f3cdbfac1 100644
--- a/htdocs/bom/bom_document.php
+++ b/htdocs/bom/bom_document.php
@@ -47,8 +47,8 @@ $ref = GETPOST('ref', 'alpha');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php
index 35e00006c6f..59c101c390d 100644
--- a/htdocs/comm/action/document.php
+++ b/htdocs/comm/action/document.php
@@ -64,8 +64,8 @@ if ($id > 0) {
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index bdbbe74697d..77d2680c222 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -61,8 +61,8 @@ if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS)) {
 
 $newparam = '';
 
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index 62308649834..de961b5517e 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -110,8 +110,8 @@ if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS)) {
 }
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
 	// If $page is not defined, or '' or -1 or if we click on clear filters
diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php
index 5095d5ac65c..8b6119eb294 100644
--- a/htdocs/comm/action/pertype.php
+++ b/htdocs/comm/action/pertype.php
@@ -57,8 +57,8 @@ if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS)) {
 	$filtert = $user->id;
 }
 
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index cc3e63e1610..e2bc5931d66 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -58,8 +58,8 @@ $showbirthday = 0;
 	$filtert = $user->id;
 }*/
 
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php
index c48877681c2..bfef8844ce5 100644
--- a/htdocs/comm/action/rapport/index.php
+++ b/htdocs/comm/action/rapport/index.php
@@ -40,8 +40,8 @@ $year = GETPOST('year', 'int');
 
 $optioncss = GETPOST('optioncss', 'alpha');
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
 	// If $page is not defined, or '' or -1 or if we click on clear filters
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 2fe683f4f8e..90d3ed128f7 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -93,8 +93,8 @@ $action = GETPOST('action', 'aZ09');
 $id = (GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int'));
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/comm/mailing/list.php b/htdocs/comm/mailing/list.php
index 94db62d7b19..be458d41fe3 100644
--- a/htdocs/comm/mailing/list.php
+++ b/htdocs/comm/mailing/list.php
@@ -28,8 +28,8 @@ require_once DOL_DOCUMENT_ROOT.'/comm/mailing/class/mailing.class.php';
 // Load translation files required by the page
 $langs->load("mails");
 
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $optioncss = GETPOST('optioncss', 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php
index 1135dfcf0c2..804fedd623b 100644
--- a/htdocs/comm/propal/document.php
+++ b/htdocs/comm/propal/document.php
@@ -53,8 +53,8 @@ $result = restrictedArea($user, 'propal', $id);
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index fd154cd90b5..b6977940411 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -130,8 +130,8 @@ $mesg = (GETPOST("msg") ? GETPOST("msg") : GETPOST("mesg"));
 
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1 || !empty($search_btn) || !empty($search_remove_btn) || (empty($toselect) && $massaction === '0')) {
 	$page = 0;
diff --git a/htdocs/commande/customer.php b/htdocs/commande/customer.php
index 96efda7c187..e181cc03c6a 100644
--- a/htdocs/commande/customer.php
+++ b/htdocs/commande/customer.php
@@ -46,8 +46,8 @@ if (!$user->rights->facture->creer) {
 $langs->loadLangs(array("companies", "orders"));
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php
index b2b024f686a..684d8e61334 100644
--- a/htdocs/commande/document.php
+++ b/htdocs/commande/document.php
@@ -46,8 +46,8 @@ $ref		= GETPOST('ref');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index d0645ccdc02..8fc93a233c2 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -116,8 +116,8 @@ $diroutputmassaction = $conf->commande->multidir_output[$conf->entity].'/temp/ma
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
 	$page = 0;
diff --git a/htdocs/compta/bank/account_statement_document.php b/htdocs/compta/bank/account_statement_document.php
index f36d455dc74..09cf9709aee 100644
--- a/htdocs/compta/bank/account_statement_document.php
+++ b/htdocs/compta/bank/account_statement_document.php
@@ -53,8 +53,8 @@ if ($user->socid) {
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index 3800edb42ae..c05f0f4530c 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -107,8 +107,8 @@ if (empty($dateop)) {
 }
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 $pageplusone = GETPOST("pageplusone", 'int');
 if ($pageplusone) {
diff --git a/htdocs/compta/bank/document.php b/htdocs/compta/bank/document.php
index 389c8195f37..78d45beadf3 100644
--- a/htdocs/compta/bank/document.php
+++ b/htdocs/compta/bank/document.php
@@ -50,8 +50,8 @@ if ($user->socid) {
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index ea656141639..6815a8d664b 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -79,8 +79,8 @@ if (!$allowed) {
 $diroutputmassaction = $conf->bank->dir_output.'/temp/massgeneration/'.$user->id;
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index 87fd36c498f..3417f05c817 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -78,8 +78,8 @@ if ($user->rights->banque->consolidate && $action == 'dvprev' && !empty($dvid))
 
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 $pageplusone = GETPOST("pageplusone", 'int');
 if ($pageplusone) {
diff --git a/htdocs/compta/bank/various_payment/list.php b/htdocs/compta/bank/various_payment/list.php
index fec2d025c7a..bbec4f23fc6 100644
--- a/htdocs/compta/bank/various_payment/list.php
+++ b/htdocs/compta/bank/various_payment/list.php
@@ -77,8 +77,8 @@ if (empty($search_datev_end)) {
 	$search_datev_end = GETPOST("search_datev_end", 'int');
 }
 
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/compta/cashcontrol/cashcontrol_card.php b/htdocs/compta/cashcontrol/cashcontrol_card.php
index 2f3004ae1d6..149710c975b 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_card.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_card.php
@@ -46,8 +46,8 @@ $smonth = (GETPOSTISSET('closemonth') ?GETPOST('closemonth', 'int') : dol_print_
 $sday = (GETPOSTISSET('closeday') ?GETPOST('closeday', 'int') : dol_print_date($now, "%d"));
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php
index be7c88c0a1a..07c1176b9d2 100644
--- a/htdocs/compta/charges/index.php
+++ b/htdocs/compta/charges/index.php
@@ -62,8 +62,8 @@ if (!$year) {
 $search_account = GETPOST('search_account', 'int');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php
index b39364690a6..bc1d3790280 100644
--- a/htdocs/compta/clients.php
+++ b/htdocs/compta/clients.php
@@ -45,8 +45,8 @@ $langs->load("companies");
 $mode = GETPOST("mode");
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php
index d588b7bff80..8af897378f5 100644
--- a/htdocs/compta/deplacement/index.php
+++ b/htdocs/compta/deplacement/index.php
@@ -38,8 +38,8 @@ if ($user->socid) {
 $result = restrictedArea($user, 'deplacement', '', '');
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/compta/deplacement/list.php b/htdocs/compta/deplacement/list.php
index e7593406ad6..9f92cecc4a7 100644
--- a/htdocs/compta/deplacement/list.php
+++ b/htdocs/compta/deplacement/list.php
@@ -45,8 +45,8 @@ $search_ref = GETPOST('search_ref', 'int');
 $search_name = GETPOST('search_name', 'alpha');
 $search_company = GETPOST('search_company', 'alpha');
 // $search_amount=GETPOST('search_amount','alpha');
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 if (empty($page) || $page == -1) {
diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php
index 2e6ac4b6174..a76332197bc 100644
--- a/htdocs/compta/facture/card-rec.php
+++ b/htdocs/compta/facture/card-rec.php
@@ -71,8 +71,8 @@ $year_date_when = GETPOST('year_date_when');
 $month_date_when = GETPOST('month_date_when');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php
index 89a67e75cb7..6eb05a16922 100644
--- a/htdocs/compta/facture/document.php
+++ b/htdocs/compta/facture/document.php
@@ -50,8 +50,8 @@ $confirm = GETPOST('confirm', 'alpha');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php
index d785ccbce93..a07d95094dd 100644
--- a/htdocs/compta/facture/invoicetemplate_list.php
+++ b/htdocs/compta/facture/invoicetemplate_list.php
@@ -96,8 +96,8 @@ $search_unit_frequency = GETPOST('search_unit_frequency', 'alpha');
 $search_status = GETPOST('search_status', 'int');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 5a0adb02d4a..c244229c5f8 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -147,8 +147,8 @@ if ($option == 'late') {
 $filtre = GETPOST('filtre', 'alpha');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
 	$page = 0;
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index cf0fb079fcb..635727233d3 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -48,7 +48,7 @@ $paymentnum	= GETPOST('num_paiement', 'alpha');
 $socid      = GETPOST('socid', 'int');
 
 $sortfield	= GETPOST('sortfield', 'aZ09comma');
-$sortorder	= GETPOST('sortorder', 'alpha');
+$sortorder	= GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 
 $amounts = array();
diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php
index f4d6c9e2686..d12caf36bbe 100644
--- a/htdocs/compta/paiement/cheque/list.php
+++ b/htdocs/compta/paiement/cheque/list.php
@@ -45,8 +45,8 @@ $search_account = GETPOST('search_account', 'int');
 $search_amount = GETPOST('search_amount', 'alpha');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index c7606daf3a1..3732e76b880 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -71,8 +71,8 @@ $search_amount = GETPOST("search_amount", 'alpha'); // alpha because we must be
 $search_status = GETPOST('search_status', 'intcomma');
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield			= GETPOST("sortfield", 'alpha');
-$sortorder			= GETPOST("sortorder", 'alpha');
+$sortfield			= GETPOST('sortfield', 'aZ09comma');
+$sortorder			= GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 
 if (empty($page) || $page == -1) {
diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php
index 5ac0c07ede7..86f1bcf583c 100644
--- a/htdocs/compta/prelevement/demandes.php
+++ b/htdocs/compta/prelevement/demandes.php
@@ -49,8 +49,8 @@ $search_societe = GETPOST('search_societe', 'alpha');
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) {
 	$page = 0;
diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index 3d05a17611c..342360bd454 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -52,8 +52,8 @@ $date_endyear = GETPOST('date_endyear', 'int');
 $showaccountdetail = GETPOST('showaccountdetail', 'aZ09') ? GETPOST('showaccountdetail', 'aZ09') : 'yes';
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/compta/sociales/document.php b/htdocs/compta/sociales/document.php
index 66800c4d449..6918b2c84ee 100644
--- a/htdocs/compta/sociales/document.php
+++ b/htdocs/compta/sociales/document.php
@@ -47,8 +47,8 @@ $confirm = GETPOST('confirm', 'alpha');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/compta/sociales/list.php b/htdocs/compta/sociales/list.php
index 6dd87372f24..7b6d8db7f18 100644
--- a/htdocs/compta/sociales/list.php
+++ b/htdocs/compta/sociales/list.php
@@ -74,7 +74,7 @@ $search_type = GETPOST('search_type', 'int');
 $search_account				= GETPOST('search_account', 'int');
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield			= GETPOST("sortfield", 'alpha');
+$sortfield			= GETPOST('sortfield', 'aZ09comma');
 $sortorder			= GETPOST("sortorder", 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 
diff --git a/htdocs/compta/sociales/payments.php b/htdocs/compta/sociales/payments.php
index f5bdf0db353..f5cbcc47502 100644
--- a/htdocs/compta/sociales/payments.php
+++ b/htdocs/compta/sociales/payments.php
@@ -50,8 +50,8 @@ $year = GETPOST("year", 'int');
 $search_sc_type = GETPOST('search_sc_type', 'int');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page < 0) {
 	$page = 0;
diff --git a/htdocs/compta/tva/document.php b/htdocs/compta/tva/document.php
index 67de87d0c21..a0573cf2812 100644
--- a/htdocs/compta/tva/document.php
+++ b/htdocs/compta/tva/document.php
@@ -48,8 +48,8 @@ $confirm = GETPOST('confirm', 'alpha');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/compta/tva/list.php b/htdocs/compta/tva/list.php
index 8c12dbfd704..f1731420852 100644
--- a/htdocs/compta/tva/list.php
+++ b/htdocs/compta/tva/list.php
@@ -56,8 +56,8 @@ $search_amount 				= GETPOST('search_amount', 'alpha');
 $search_status = GETPOST('search_status', 'int');
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield					= GETPOST('sortfield', 'alpha');
-$sortorder					= GETPOST('sortorder', 'alpha');
+$sortfield					= GETPOST('sortfield', 'aZ09comma');
+$sortorder					= GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST('page', 'int');
 
 if (empty($page) || $page == -1) {
diff --git a/htdocs/compta/tva/payments.php b/htdocs/compta/tva/payments.php
index 57e70e70a3d..488882c2649 100644
--- a/htdocs/compta/tva/payments.php
+++ b/htdocs/compta/tva/payments.php
@@ -46,8 +46,8 @@ if (!$year && $mode != 'tvaonly') {
 }
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/contact/agenda.php b/htdocs/contact/agenda.php
index 11ca40c83a1..0eed6ba6219 100644
--- a/htdocs/contact/agenda.php
+++ b/htdocs/contact/agenda.php
@@ -88,8 +88,8 @@ if ($user->socid) {
 $result = restrictedArea($user, 'contact', $id, 'socpeople&societe', '', '', 'rowid', 0); // If we create a contact with no company (shared contacts), no check on write permission
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/contact/consumption.php b/htdocs/contact/consumption.php
index 7046c37c9b7..631bf932640 100644
--- a/htdocs/contact/consumption.php
+++ b/htdocs/contact/consumption.php
@@ -47,8 +47,8 @@ $socid = $object->thirdparty->id;
 
 // Sort & Order fields
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/contact/document.php b/htdocs/contact/document.php
index 80a3ba08bc7..3fac8adea15 100644
--- a/htdocs/contact/document.php
+++ b/htdocs/contact/document.php
@@ -51,8 +51,8 @@ if (!empty($canvas)) {
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/contrat/agenda.php b/htdocs/contrat/agenda.php
index eeeccddd671..edb54631786 100644
--- a/htdocs/contrat/agenda.php
+++ b/htdocs/contrat/agenda.php
@@ -57,8 +57,8 @@ if ($user->socid) {
 $result = restrictedArea($user, 'contrat', $id, '');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php
index b4cf2fc1fbf..953fd0002d2 100644
--- a/htdocs/contrat/document.php
+++ b/htdocs/contrat/document.php
@@ -55,8 +55,8 @@ $result = restrictedArea($user, 'contrat', $id);
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index ed980f9e86e..e6446e3585b 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -79,8 +79,8 @@ $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_en
 $optioncss = GETPOST('optioncss', 'alpha');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php
index 31621ba420a..39dfe336a31 100644
--- a/htdocs/contrat/services_list.php
+++ b/htdocs/contrat/services_list.php
@@ -39,8 +39,8 @@ $optioncss = GETPOST('optioncss', 'aZ09');
 
 $massaction = GETPOST('massaction', 'alpha');
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 4ce7d4691a4..2902430bf82 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -916,8 +916,8 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
 	$form = new Form($db);
 
 	$optioncss = GETPOST('optioncss', 'alpha');
-	$sortfield = GETPOST("sortfield", 'alpha');
-	$sortorder = GETPOST("sortorder", 'alpha');
+	$sortfield = GETPOST('sortfield', 'aZ09comma');
+	$sortorder = GETPOST('sortorder', 'aZ09comma');
 	$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 
 	$search_status = GETPOST("search_status", 'int');
diff --git a/htdocs/core/modules/movement/doc/pdf_standard.modules.php b/htdocs/core/modules/movement/doc/pdf_standard.modules.php
index bf06a1b73d2..48483066e5e 100644
--- a/htdocs/core/modules/movement/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/movement/doc/pdf_standard.modules.php
@@ -238,8 +238,8 @@ class pdf_standard extends ModelePDFMovement
 
 		$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 		$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-		$sortfield = GETPOST("sortfield", 'alpha');
-		$sortorder = GETPOST("sortorder", 'alpha');
+		$sortfield = GETPOST('sortfield', 'aZ09comma');
+		$sortorder = GETPOST('sortorder', 'aZ09comma');
 		if (empty($page) || $page == -1) {
 			$page = 0;
 		}     // If $page is not defined, or '' or -1
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index c2480581501..fc208fd9ac3 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -46,8 +46,8 @@ $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'cro
 $id = GETPOST('id', 'int');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/don/list.php b/htdocs/don/list.php
index 0c8f51281a3..d7697dba43d 100644
--- a/htdocs/don/list.php
+++ b/htdocs/don/list.php
@@ -37,8 +37,8 @@ $langs->loadLangs(array("companies", "donations"));
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'sclist';
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/ecm/dir_add_card.php b/htdocs/ecm/dir_add_card.php
index 1416983e3a3..d7de6acc727 100644
--- a/htdocs/ecm/dir_add_card.php
+++ b/htdocs/ecm/dir_add_card.php
@@ -66,8 +66,8 @@ if ($module == 'ecm') {
 }
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/ecm/dir_card.php b/htdocs/ecm/dir_card.php
index 793e199f180..930575d1778 100644
--- a/htdocs/ecm/dir_card.php
+++ b/htdocs/ecm/dir_card.php
@@ -47,8 +47,8 @@ if (empty($module)) {
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/ecm/file_card.php b/htdocs/ecm/file_card.php
index 237f70a0a42..7de02f56083 100644
--- a/htdocs/ecm/file_card.php
+++ b/htdocs/ecm/file_card.php
@@ -46,8 +46,8 @@ if ($user->socid > 0) {
 }
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/ecm/file_note.php b/htdocs/ecm/file_note.php
index 505e432f982..43dcc20e744 100644
--- a/htdocs/ecm/file_note.php
+++ b/htdocs/ecm/file_note.php
@@ -48,8 +48,8 @@ if ($user->socid > 0) {
 }
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php
index 813ee69b6fb..2b68206d70a 100644
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@@ -45,8 +45,8 @@ $section_dir = GETPOST('section_dir', 'alpha');
 $overwritefile = GETPOST('overwritefile', 'int');
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php
index c4ec6afc90b..3b906883c00 100644
--- a/htdocs/ecm/index_auto.php
+++ b/htdocs/ecm/index_auto.php
@@ -52,8 +52,8 @@ $section_dir = GETPOST('section_dir', 'alpha');
 $search_doc_ref = GETPOST('search_doc_ref', 'alpha');
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/ecm/search.php b/htdocs/ecm/search.php
index 9a6c20392a9..42b8efba42f 100644
--- a/htdocs/ecm/search.php
+++ b/htdocs/ecm/search.php
@@ -59,8 +59,8 @@ if (empty($module)) {
 $upload_dir = $conf->ecm->dir_output.'/'.$section;
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/eventorganization/conferenceorbooth_document.php b/htdocs/eventorganization/conferenceorbooth_document.php
index 2b791ea0e6f..742585ffb16 100644
--- a/htdocs/eventorganization/conferenceorbooth_document.php
+++ b/htdocs/eventorganization/conferenceorbooth_document.php
@@ -52,8 +52,8 @@ $project_ref = GETPOST('project_ref', 'alpha');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/expedition/document.php b/htdocs/expedition/document.php
index 1d7ee50e17c..68336e8dbf6 100644
--- a/htdocs/expedition/document.php
+++ b/htdocs/expedition/document.php
@@ -47,8 +47,8 @@ $ref		= GETPOST('ref');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/expensereport/index.php b/htdocs/expensereport/index.php
index d731c4c8c82..504101a1720 100644
--- a/htdocs/expensereport/index.php
+++ b/htdocs/expensereport/index.php
@@ -48,8 +48,8 @@ if ($user->socid) {
 $result = restrictedArea($user, 'expensereport', '', '');
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php
index 0c84552c795..0953d314202 100644
--- a/htdocs/fichinter/card-rec.php
+++ b/htdocs/fichinter/card-rec.php
@@ -68,7 +68,7 @@ if ($page == -1) {
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $offset = $limit * $page;
 
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 if ($sortorder == "") {
 	$sortorder = "DESC";
diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php
index c7e3f609164..d54d5553efb 100644
--- a/htdocs/fourn/commande/document.php
+++ b/htdocs/fourn/commande/document.php
@@ -48,8 +48,8 @@ $confirm = GETPOST('confirm', 'alpha');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/fourn/commande/info.php b/htdocs/fourn/commande/info.php
index 09bf1ab08e6..6c64672ee84 100644
--- a/htdocs/fourn/commande/info.php
+++ b/htdocs/fourn/commande/info.php
@@ -41,8 +41,8 @@ $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 6470dc62bcd..a210970af6a 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -135,8 +135,8 @@ $result = restrictedArea($user, 'fournisseur', $orderid, '', 'commande');
 $diroutputmassaction = $conf->fournisseur->commande->dir_output.'/temp/massgeneration/'.$user->id;
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1 || !empty($search_btn) || !empty($search_remove_btn) || (empty($toselect) && $massaction === '0')) {
 	$page = 0;
diff --git a/htdocs/fourn/contact.php b/htdocs/fourn/contact.php
index cabf726beee..9d6e3abd4cf 100644
--- a/htdocs/fourn/contact.php
+++ b/htdocs/fourn/contact.php
@@ -41,8 +41,8 @@ if ($user->socid > 0) {
 }
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index d94eacdbc8d..34255541c01 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -54,8 +54,8 @@ $result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index e77ae1fea28..0e682351992 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -126,8 +126,8 @@ if ($option == 'late') {
 $filter = GETPOST('filtre', 'alpha');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if ($page == -1 || $page == null || !empty($search_btn) || !empty($search_remove_btn) || (empty($toselect) && $massaction === '0')) {
 	$page = 0;
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index 08a5d2f3c44..33c07c58e99 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -62,8 +62,8 @@ $search_company = GETPOST("search_company", 'alpha');
 $search_payment_num = GETPOST('search_payment_num', 'alpha');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/fourn/paiement/document.php b/htdocs/fourn/paiement/document.php
index a29e9b0713c..e1b0ce6f581 100644
--- a/htdocs/fourn/paiement/document.php
+++ b/htdocs/fourn/paiement/document.php
@@ -55,8 +55,8 @@ $result = restrictedArea($user, $object->element, $object->id, 'paiementfourn',
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/fourn/paiement/list.php b/htdocs/fourn/paiement/list.php
index 45ed0c4776f..0f8f9050755 100644
--- a/htdocs/fourn/paiement/list.php
+++ b/htdocs/fourn/paiement/list.php
@@ -69,8 +69,8 @@ $search_bank_account	= GETPOST('search_bank_account', 'int');
 $search_amount			= GETPOST('search_amount', 'alpha'); // alpha because we must be able to search on '< x'
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield				= GETPOST('sortfield', 'alpha');
-$sortorder				= GETPOST('sortorder', 'alpha');
+$sortfield				= GETPOST('sortfield', 'aZ09comma');
+$sortorder				= GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST('page', 'int');
 
 if (empty($page) || $page == -1) {
diff --git a/htdocs/ftp/index.php b/htdocs/ftp/index.php
index 6a97265b050..bbf01bb4fbe 100644
--- a/htdocs/ftp/index.php
+++ b/htdocs/ftp/index.php
@@ -52,8 +52,8 @@ $upload_dir = $conf->ftp->dir_temp;
 $download_dir = $conf->ftp->dir_temp;
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/holiday/month_report.php b/htdocs/holiday/month_report.php
index 0124d5662f7..9080072220e 100644
--- a/htdocs/holiday/month_report.php
+++ b/htdocs/holiday/month_report.php
@@ -54,7 +54,7 @@ $search_description = GETPOST('search_description', 'alphanohtml');
 
 $limit       = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield   = GETPOST('sortfield', 'aZ09comma');
-$sortorder   = GETPOST('sortorder', 'alpha');
+$sortorder   = GETPOST('sortorder', 'aZ09comma');
 
 if (!$sortfield) {
 	$sortfield = "cp.rowid";
diff --git a/htdocs/hrm/admin/admin_establishment.php b/htdocs/hrm/admin/admin_establishment.php
index 11a34b939a2..bf1886f4bca 100644
--- a/htdocs/hrm/admin/admin_establishment.php
+++ b/htdocs/hrm/admin/admin_establishment.php
@@ -60,8 +60,8 @@ $title = $langs->trans('Establishments');
 llxHeader('', $title, '');
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortorder     = GETPOST("sortorder", 'alpha');
-$sortfield     = GETPOST("sortfield", 'alpha');
+$sortorder     = GETPOST('sortorder', 'aZ09comma');
+$sortfield     = GETPOST('sortfield', 'aZ09comma');
 if (!$sortorder) {
 	$sortorder = "DESC";
 }
diff --git a/htdocs/hrm/establishment/info.php b/htdocs/hrm/establishment/info.php
index 30dbd932dcb..b1f7057f6a5 100644
--- a/htdocs/hrm/establishment/info.php
+++ b/htdocs/hrm/establishment/info.php
@@ -46,8 +46,8 @@ if (GETPOST('actioncode', 'array')) {
 $search_agenda_label = GETPOST('search_agenda_label');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/hrm/evaluation_agenda.php b/htdocs/hrm/evaluation_agenda.php
index 91a0615bc95..87a09043a62 100644
--- a/htdocs/hrm/evaluation_agenda.php
+++ b/htdocs/hrm/evaluation_agenda.php
@@ -58,8 +58,8 @@ if (GETPOST('actioncode', 'array')) {
 $search_agenda_label = GETPOST('search_agenda_label');
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/hrm/evaluation_document.php b/htdocs/hrm/evaluation_document.php
index 7318819644e..215756eff8b 100644
--- a/htdocs/hrm/evaluation_document.php
+++ b/htdocs/hrm/evaluation_document.php
@@ -48,8 +48,8 @@ $ref = GETPOST('ref', 'alpha');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/hrm/job_agenda.php b/htdocs/hrm/job_agenda.php
index d7772763d8d..6bfafcc1269 100644
--- a/htdocs/hrm/job_agenda.php
+++ b/htdocs/hrm/job_agenda.php
@@ -57,8 +57,8 @@ if (GETPOST('actioncode', 'array')) {
 $search_agenda_label = GETPOST('search_agenda_label');
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/hrm/job_document.php b/htdocs/hrm/job_document.php
index a055fbbc325..83745962052 100644
--- a/htdocs/hrm/job_document.php
+++ b/htdocs/hrm/job_document.php
@@ -46,8 +46,8 @@ $ref = GETPOST('ref', 'alpha');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/hrm/position_agenda.php b/htdocs/hrm/position_agenda.php
index b3b68d9bcbc..fda60a29259 100644
--- a/htdocs/hrm/position_agenda.php
+++ b/htdocs/hrm/position_agenda.php
@@ -58,8 +58,8 @@ if (GETPOST('actioncode', 'array')) {
 $search_agenda_label = GETPOST('search_agenda_label');
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/hrm/position_document.php b/htdocs/hrm/position_document.php
index 7a820310ee2..845f846a212 100644
--- a/htdocs/hrm/position_document.php
+++ b/htdocs/hrm/position_document.php
@@ -47,8 +47,8 @@ $ref = GETPOST('ref', 'alpha');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/hrm/skill_agenda.php b/htdocs/hrm/skill_agenda.php
index a352988c297..d73271a4f26 100644
--- a/htdocs/hrm/skill_agenda.php
+++ b/htdocs/hrm/skill_agenda.php
@@ -57,8 +57,8 @@ if (GETPOST('actioncode', 'array')) {
 $search_agenda_label = GETPOST('search_agenda_label');
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/hrm/skill_document.php b/htdocs/hrm/skill_document.php
index 65549dbfe7a..f305ecd1e2e 100644
--- a/htdocs/hrm/skill_document.php
+++ b/htdocs/hrm/skill_document.php
@@ -47,8 +47,8 @@ $ref = GETPOST('ref', 'alpha');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/intracommreport/list.php b/htdocs/intracommreport/list.php
index 6d1952b8786..fa88f6f0456 100644
--- a/htdocs/intracommreport/list.php
+++ b/htdocs/intracommreport/list.php
@@ -45,8 +45,8 @@ $type = GETPOST("type", "int");
 $diroutputmassaction = $conf->product->dir_output.'/temp/massgeneration/'.$user->id;
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = (GETPOST("page", 'int') ?GETPOST("page", 'int') : 0);
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/knowledgemanagement/knowledgerecord_agenda.php b/htdocs/knowledgemanagement/knowledgerecord_agenda.php
index 2779fca570a..81750e720c7 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_agenda.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_agenda.php
@@ -53,8 +53,8 @@ if (GETPOST('actioncode', 'array')) {
 $search_agenda_label = GETPOST('search_agenda_label');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/knowledgemanagement/knowledgerecord_document.php b/htdocs/knowledgemanagement/knowledgerecord_document.php
index 90bb9f736cc..dbffe6aa3da 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_document.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_document.php
@@ -43,8 +43,8 @@ $ref = GETPOST('ref', 'alpha');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/loan/document.php b/htdocs/loan/document.php
index ce63cb248f7..1ed3e644b7f 100644
--- a/htdocs/loan/document.php
+++ b/htdocs/loan/document.php
@@ -47,8 +47,8 @@ $result = restrictedArea($user, 'loan', $id, '', '');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php
index 7fe151b93f7..290a94908c0 100644
--- a/htdocs/margin/customerMargins.php
+++ b/htdocs/margin/customerMargins.php
@@ -129,8 +129,8 @@ if ($socid > 0) {
 	print '</td></tr>';
 }
 
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 if (!$sortorder) {
 	$sortorder = "ASC";
 }
diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php
index 062462be267..93895b01e2f 100644
--- a/htdocs/margin/tabs/productMargins.php
+++ b/htdocs/margin/tabs/productMargins.php
@@ -43,8 +43,8 @@ if (!empty($user->socid)) {
 $object = new Product($db);
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php
index 43e9c87c6e6..c69c0443e28 100644
--- a/htdocs/margin/tabs/thirdpartyMargins.php
+++ b/htdocs/margin/tabs/thirdpartyMargins.php
@@ -35,8 +35,8 @@ if (!empty($user->socid)) {
 }
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/modulebuilder/template/myobject_agenda.php b/htdocs/modulebuilder/template/myobject_agenda.php
index b7d3fcfaa80..5eb4f6e3028 100644
--- a/htdocs/modulebuilder/template/myobject_agenda.php
+++ b/htdocs/modulebuilder/template/myobject_agenda.php
@@ -102,8 +102,8 @@ if (GETPOST('actioncode', 'array')) {
 $search_agenda_label = GETPOST('search_agenda_label');
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/modulebuilder/template/myobject_document.php b/htdocs/modulebuilder/template/myobject_document.php
index e77fec58167..3db0271dd01 100644
--- a/htdocs/modulebuilder/template/myobject_document.php
+++ b/htdocs/modulebuilder/template/myobject_document.php
@@ -92,8 +92,8 @@ $ref = GETPOST('ref', 'alpha');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/mrp/mo_agenda.php b/htdocs/mrp/mo_agenda.php
index 95dab4e62ab..e1b19d87ad0 100644
--- a/htdocs/mrp/mo_agenda.php
+++ b/htdocs/mrp/mo_agenda.php
@@ -55,8 +55,8 @@ if (GETPOST('actioncode', 'array')) {
 $search_agenda_label = GETPOST('search_agenda_label');
 
 $limit 		= GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield	= GETPOST("sortfield", 'alpha');
-$sortorder	= GETPOST("sortorder", 'alpha');
+$sortfield	= GETPOST('sortfield', 'aZ09comma');
+$sortorder	= GETPOST('sortorder', 'aZ09comma');
 $page 		= GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/mrp/mo_document.php b/htdocs/mrp/mo_document.php
index c81ed1f995e..acb5cb3e1c4 100644
--- a/htdocs/mrp/mo_document.php
+++ b/htdocs/mrp/mo_document.php
@@ -44,8 +44,8 @@ $ref = GETPOST('ref', 'alpha');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/mrp/mo_movements.php b/htdocs/mrp/mo_movements.php
index f0fe25eddb6..10e430479cf 100644
--- a/htdocs/mrp/mo_movements.php
+++ b/htdocs/mrp/mo_movements.php
@@ -65,8 +65,8 @@ $search_type_mouvement = GETPOST('search_type_mouvement', 'int');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/multicurrency/multicurrency_rate.php b/htdocs/multicurrency/multicurrency_rate.php
index 2c32e0b03e8..73cff1b4502 100644
--- a/htdocs/multicurrency/multicurrency_rate.php
+++ b/htdocs/multicurrency/multicurrency_rate.php
@@ -55,8 +55,8 @@ $dateinput 			= dol_mktime(0, 0, 0, GETPOST('dateinputmonth', 'int'), GETPOST('d
 $rateinput 			= price2num(GETPOST('rateinput', 'alpha'));
 $optioncss 			= GETPOST('optioncss', 'alpha');
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield 			= GETPOST("sortfield", 'alpha');
-$sortorder 			= GETPOST("sortorder", 'alpha');
+$sortfield 			= GETPOST('sortfield', 'aZ09comma');
+$sortorder 			= GETPOST('sortorder', 'aZ09comma');
 $page = (GETPOST("page", 'int') ?GETPOST("page", 'int') : 0);
 
 if (empty($page) || $page == -1) {
diff --git a/htdocs/partnership/partnership_agenda.php b/htdocs/partnership/partnership_agenda.php
index f154e1b9f5b..4c68a83d4e2 100644
--- a/htdocs/partnership/partnership_agenda.php
+++ b/htdocs/partnership/partnership_agenda.php
@@ -53,8 +53,8 @@ if (GETPOST('actioncode', 'array')) {
 $search_agenda_label = GETPOST('search_agenda_label');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/partnership/partnership_document.php b/htdocs/partnership/partnership_document.php
index 79b7be0057a..f96eb6e58ec 100644
--- a/htdocs/partnership/partnership_document.php
+++ b/htdocs/partnership/partnership_document.php
@@ -43,8 +43,8 @@ $ref = GETPOST('ref', 'alpha');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/product/agenda.php b/htdocs/product/agenda.php
index 815014e259f..40d451653e7 100644
--- a/htdocs/product/agenda.php
+++ b/htdocs/product/agenda.php
@@ -54,8 +54,8 @@ if ($user->socid) {
 }
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index 230f8375538..79ff858ba6e 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -58,8 +58,8 @@ $hookmanager->initHooks(array('productdocuments'));
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index d521f3b5eae..98ab414a8c3 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -80,8 +80,8 @@ if (empty($user->rights->fournisseur->lire)) {
 }
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = (GETPOST("page", 'int') ?GETPOST("page", 'int') : 0);
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 949158289a0..a3ec599dea8 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -94,8 +94,8 @@ if (!empty($conf->variants->enabled) && !empty($conf->global->PRODUIT_ATTRIBUTES
 $diroutputmassaction = $conf->product->dir_output.'/temp/massgeneration/'.$user->id;
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
 	$page = 0;
diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php
index 9028e81a757..707f95d2202 100644
--- a/htdocs/product/popuprop.php
+++ b/htdocs/product/popuprop.php
@@ -44,8 +44,8 @@ if (!empty($user->socid)) {
 }
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 309853a7bb6..4c14add3660 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -1671,8 +1671,8 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 	$prodcustprice = new Productcustomerprice($db);
 
 	$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-	$sortfield = GETPOST("sortfield", 'alpha');
-	$sortorder = GETPOST("sortorder", 'alpha');
+	$sortfield = GETPOST('sortfield', 'aZ09comma');
+	$sortorder = GETPOST('sortorder', 'aZ09comma');
 	$page = (GETPOST("page", 'int') ?GETPOST("page", 'int') : 0);
 	if (empty($page) || $page == -1) {
 		$page = 0;
diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index b0a1ce87ddd..62bfd626f82 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -48,8 +48,8 @@ $tobuy = GETPOST("tobuy");
 $fourn_id = GETPOST("fourn_id", 'int');
 $sbarcode = GETPOST("sbarcode", 'int');
 
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page < 0) {
 	$page = 0;
diff --git a/htdocs/product/reassortlot.php b/htdocs/product/reassortlot.php
index e75d1504267..2bd62b2ce22 100644
--- a/htdocs/product/reassortlot.php
+++ b/htdocs/product/reassortlot.php
@@ -52,8 +52,8 @@ $tobuy = GETPOST("tobuy");
 $fourn_id = GETPOST("fourn_id", 'int');
 $sbarcode = GETPOST("sbarcode", 'int');
 
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page < 0) {
 	$page = 0;
diff --git a/htdocs/product/stats/bom.php b/htdocs/product/stats/bom.php
index 5e4829083f3..d31488812d0 100644
--- a/htdocs/product/stats/bom.php
+++ b/htdocs/product/stats/bom.php
@@ -50,8 +50,8 @@ $option = '';
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php
index abfd329dfa4..9f38f68ee33 100644
--- a/htdocs/product/stats/commande.php
+++ b/htdocs/product/stats/commande.php
@@ -49,8 +49,8 @@ $hookmanager->initHooks(array('productstatsorder'));
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php
index e44619d1b19..0c569d3530c 100644
--- a/htdocs/product/stats/contrat.php
+++ b/htdocs/product/stats/contrat.php
@@ -46,8 +46,8 @@ $hookmanager->initHooks(array('productstatscontract'));
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index 8da6e97f55c..13c6329b34f 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -52,8 +52,8 @@ $showmessage = GETPOST('showmessage');
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php
index d61b6de9491..9db71e92148 100644
--- a/htdocs/product/stats/facture_fournisseur.php
+++ b/htdocs/product/stats/facture_fournisseur.php
@@ -50,8 +50,8 @@ $hookmanager->initHooks(array('productstatssupplierinvoice'));
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/product/stats/mo.php b/htdocs/product/stats/mo.php
index c63034e95a6..693f1fbae03 100644
--- a/htdocs/product/stats/mo.php
+++ b/htdocs/product/stats/mo.php
@@ -46,8 +46,8 @@ $hookmanager->initHooks(array('productstatsmo'));
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index ffa593639b5..18a394559a3 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -54,8 +54,8 @@ $id = GETPOST('id', 'int');
 $socid = GETPOST('socid', 'int');
 $ref = GETPOST('ref', 'alpha');
 
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 if (!$sortfield) {
 	$sortfield = "p.ref";
 }
diff --git a/htdocs/product/stock/movement_card.php b/htdocs/product/stock/movement_card.php
index f9c0778eea4..ebe8f0552ce 100644
--- a/htdocs/product/stock/movement_card.php
+++ b/htdocs/product/stock/movement_card.php
@@ -75,8 +75,8 @@ $search_type_mouvement = GETPOST('search_type_mouvement', 'int');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php
index ed5896ca6cc..f5d74c47c8e 100644
--- a/htdocs/product/stock/movement_list.php
+++ b/htdocs/product/stock/movement_list.php
@@ -86,8 +86,8 @@ $type = GETPOST("type", "int");
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/product/stock/productlot_document.php b/htdocs/product/stock/productlot_document.php
index 4f695f990e4..789b03aa6ce 100644
--- a/htdocs/product/stock/productlot_document.php
+++ b/htdocs/product/stock/productlot_document.php
@@ -58,8 +58,8 @@ $hookmanager->initHooks(array('productlotdocuments'));
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/product/stock/replenishorders.php b/htdocs/product/stock/replenishorders.php
index 91ff0b40fbc..8c2a218b40c 100644
--- a/htdocs/product/stock/replenishorders.php
+++ b/htdocs/product/stock/replenishorders.php
@@ -56,8 +56,8 @@ $search_dateday = GETPOST('search_dateday', 'int');
 $search_date = dol_mktime(0, 0, 0, $search_datemonth, $search_dateday, $search_dateyear);
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 if (!$sortorder) {
 	$sortorder = 'DESC';
 }
diff --git a/htdocs/product/stock/valo.php b/htdocs/product/stock/valo.php
index 7f7f9610d1f..926b0c01634 100644
--- a/htdocs/product/stock/valo.php
+++ b/htdocs/product/stock/valo.php
@@ -36,8 +36,8 @@ $sref = GETPOST("sref", 'alpha');
 $snom = GETPOST("snom", 'alpha');
 $sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 if (!$sortfield) {
 	$sortfield = "e.ref";
 }
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index 32e8fc40381..b743dffbc53 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -77,8 +77,8 @@ $search_project_ref = GETPOST('search_project_ref', 'alpha');
 $search_thirdparty = GETPOST('search_thirdparty', 'alpha');
 $search_declared_progress = GETPOST('search_declared_progress', 'alpha');
 
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 
 $monthofday = GETPOST('addtimemonth');
 $dayofday = GETPOST('addtimeday');
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index f84a7112504..763ecefe650 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -77,8 +77,8 @@ $search_project_ref = GETPOST('search_project_ref', 'alpha');
 $search_thirdparty = GETPOST('search_thirdparty', 'alpha');
 $search_declared_progress = GETPOST('search_declared_progress', 'alpha');
 
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 
 $startdayarray = dol_get_first_day_week($day, $month, $year);
 
diff --git a/htdocs/projet/document.php b/htdocs/projet/document.php
index 1bfbb9aa4a6..9e8d3a6ce8e 100644
--- a/htdocs/projet/document.php
+++ b/htdocs/projet/document.php
@@ -53,8 +53,8 @@ if ($id > 0 || !empty($ref)) {
 
 // Get parameters
 $limit 		= GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield	= GETPOST("sortfield", 'alpha');
-$sortorder	= GETPOST("sortorder", 'alpha');
+$sortfield	= GETPOST('sortfield', 'aZ09comma');
+$sortorder	= GETPOST('sortorder', 'aZ09comma');
 $page		= GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php
index e1f86bcffc9..51e78f23d57 100644
--- a/htdocs/projet/index.php
+++ b/htdocs/projet/index.php
@@ -56,8 +56,8 @@ if (!$user->rights->projet->lire) {
 	accessforbidden();
 }
 
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 
 $max = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
 
diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php
index c60e3324741..155cb261040 100644
--- a/htdocs/projet/tasks/document.php
+++ b/htdocs/projet/tasks/document.php
@@ -46,8 +46,8 @@ $project_ref = GETPOST('project_ref', 'alpha');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 1553c58683f..697969c6060 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -115,8 +115,8 @@ if (!$user->rights->projet->lire) {
 $diroutputmassaction = $conf->projet->dir_output.'/tasks/temp/massgeneration/'.$user->id;
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index f9f3a2aca43..bbf33b620c4 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -82,8 +82,8 @@ if (!$user->rights->projet->lire) {
 }
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/public/members/public_list.php b/htdocs/public/members/public_list.php
index 80e092f2951..4bf2a6b94bf 100644
--- a/htdocs/public/members/public_list.php
+++ b/htdocs/public/members/public_list.php
@@ -92,8 +92,8 @@ function llxFooterVierge()
 }
 
 
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
diff --git a/htdocs/public/ticket/list.php b/htdocs/public/ticket/list.php
index ef16b716db2..8a353eea881 100644
--- a/htdocs/public/ticket/list.php
+++ b/htdocs/public/ticket/list.php
@@ -294,8 +294,8 @@ if ($action == "view_ticketlist") {
 
 		require DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-		$sortfield = GETPOST("sortfield", 'alpha');
-		$sortorder = GETPOST("sortorder", 'alpha');
+		$sortfield = GETPOST('sortfield', 'aZ09comma');
+		$sortorder = GETPOST('sortorder', 'aZ09comma');
 
 		if (!$sortfield) {
 			$sortfield = 't.datec';
diff --git a/htdocs/reception/document.php b/htdocs/reception/document.php
index 9093f645e48..f592dba452a 100644
--- a/htdocs/reception/document.php
+++ b/htdocs/reception/document.php
@@ -47,8 +47,8 @@ $ref		= GETPOST('ref');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/recruitment/recruitmentcandidature_agenda.php b/htdocs/recruitment/recruitmentcandidature_agenda.php
index 79795472b4e..9cc259c21e1 100644
--- a/htdocs/recruitment/recruitmentcandidature_agenda.php
+++ b/htdocs/recruitment/recruitmentcandidature_agenda.php
@@ -81,8 +81,8 @@ if (GETPOST('actioncode', 'array')) {
 $search_agenda_label = GETPOST('search_agenda_label');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/recruitment/recruitmentcandidature_document.php b/htdocs/recruitment/recruitmentcandidature_document.php
index dcd29c88118..792b413b5e4 100644
--- a/htdocs/recruitment/recruitmentcandidature_document.php
+++ b/htdocs/recruitment/recruitmentcandidature_document.php
@@ -71,8 +71,8 @@ $ref = GETPOST('ref', 'alpha');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/recruitment/recruitmentjobposition_agenda.php b/htdocs/recruitment/recruitmentjobposition_agenda.php
index 4c3e642a224..3f9e76d4dcf 100644
--- a/htdocs/recruitment/recruitmentjobposition_agenda.php
+++ b/htdocs/recruitment/recruitmentjobposition_agenda.php
@@ -81,8 +81,8 @@ if (GETPOST('actioncode', 'array')) {
 $search_agenda_label = GETPOST('search_agenda_label');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/recruitment/recruitmentjobposition_document.php b/htdocs/recruitment/recruitmentjobposition_document.php
index 14355aeb0e3..e9615777ade 100644
--- a/htdocs/recruitment/recruitmentjobposition_document.php
+++ b/htdocs/recruitment/recruitmentjobposition_document.php
@@ -71,8 +71,8 @@ $ref = GETPOST('ref', 'alpha');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/resource/agenda.php b/htdocs/resource/agenda.php
index bf300141bc4..363f334a7eb 100644
--- a/htdocs/resource/agenda.php
+++ b/htdocs/resource/agenda.php
@@ -55,8 +55,8 @@ if (GETPOST('actioncode', 'array')) {
 $search_agenda_label = GETPOST('search_agenda_label');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php
index 025ec2fbf70..97d55c7bb33 100644
--- a/htdocs/resource/list.php
+++ b/htdocs/resource/list.php
@@ -38,7 +38,7 @@ $element        = GETPOST('element', 'alpha');
 $element_id     = GETPOST('element_id', 'int');
 $resource_id    = GETPOST('resource_id', 'int');
 
-$sortorder      = GETPOST('sortorder', 'alpha');
+$sortorder      = GETPOST('sortorder', 'aZ09comma');
 $sortfield      = GETPOST('sortfield', 'aZ09comma');
 $optioncss = GETPOST('optioncss', 'alpha');
 
diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index ec59482b345..1aa7093299d 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -52,8 +52,8 @@ if ($user->socid) {
 $result = restrictedArea($user, 'societe', $socid, '&societe');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index d9abbd61c22..596f9b6f3c6 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -47,8 +47,8 @@ if ($socid > 0) {
 
 // Sort & Order fields
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 $optioncss = GETPOST('optioncss', 'alpha');
 
diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php
index 9ce01c64638..707c573f116 100644
--- a/htdocs/societe/document.php
+++ b/htdocs/societe/document.php
@@ -41,8 +41,8 @@ $ref = GETPOST('ref', 'alpha');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index dbb380bd405..da056ec33da 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -111,8 +111,8 @@ $place = GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : '0'; // $place is
 $diroutputmassaction = $conf->societe->dir_output.'/temp/massgeneration/'.$user->id;
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (!$sortorder) {
 	$sortorder = "ASC";
diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php
index 4ed16e948c5..8729ed3b46e 100644
--- a/htdocs/societe/notify/card.php
+++ b/htdocs/societe/notify/card.php
@@ -45,8 +45,8 @@ if ($user->socid) {
 $result = restrictedArea($user, 'societe', '', '');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (!$sortorder) {
 	$sortorder = "DESC";
diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php
index 72246fdf9cb..75818a34f72 100644
--- a/htdocs/societe/price.php
+++ b/htdocs/societe/price.php
@@ -245,8 +245,8 @@ print dol_get_fiche_end();
 if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 	$prodcustprice = new Productcustomerprice($db);
 
-	$sortfield = GETPOST("sortfield", 'alpha');
-	$sortorder = GETPOST("sortorder", 'alpha');
+	$sortfield = GETPOST('sortfield', 'aZ09comma');
+	$sortorder = GETPOST('sortorder', 'aZ09comma');
 	$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 	$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 	if (empty($page) || $page == -1) {
diff --git a/htdocs/societe/societecontact.php b/htdocs/societe/societecontact.php
index d0511d53a1f..82d815f0ac4 100644
--- a/htdocs/societe/societecontact.php
+++ b/htdocs/societe/societecontact.php
@@ -40,8 +40,8 @@ $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (!$sortorder) {
 	$sortorder = "ASC";
diff --git a/htdocs/societe/website.php b/htdocs/societe/website.php
index 17aec6bc5c7..bc93d72d60e 100644
--- a/htdocs/societe/website.php
+++ b/htdocs/societe/website.php
@@ -51,8 +51,8 @@ if ($user->socid) {
 $result = restrictedArea($user, 'societe', $socid, '&societe');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/stripe/charge.php b/htdocs/stripe/charge.php
index c6a07593a04..49db54b444f 100644
--- a/htdocs/stripe/charge.php
+++ b/htdocs/stripe/charge.php
@@ -42,8 +42,8 @@ if ($user->socid) {
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $rowid = GETPOST("rowid", 'alpha');
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/stripe/payout.php b/htdocs/stripe/payout.php
index 75c24ef0561..34b4ea1dc4f 100644
--- a/htdocs/stripe/payout.php
+++ b/htdocs/stripe/payout.php
@@ -42,8 +42,8 @@ if ($user->socid) {
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $rowid = GETPOST("rowid", 'alpha');
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/stripe/transaction.php b/htdocs/stripe/transaction.php
index 0d43c830e8e..6bab8459d18 100644
--- a/htdocs/stripe/transaction.php
+++ b/htdocs/stripe/transaction.php
@@ -42,8 +42,8 @@ if ($user->socid) {
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $rowid = GETPOST("rowid", 'alpha');
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/supplier_proposal/document.php b/htdocs/supplier_proposal/document.php
index 884519a4f9a..fa73ec22fa8 100644
--- a/htdocs/supplier_proposal/document.php
+++ b/htdocs/supplier_proposal/document.php
@@ -52,8 +52,8 @@ $result = restrictedArea($user, 'supplier_proposal', $id);
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index 1a1110fba1c..ad35c8f9914 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -103,8 +103,8 @@ $mesg = (GETPOST("msg") ? GETPOST("msg") : GETPOST("mesg"));
 
 $optioncss = GETPOST('optioncss', 'alpha');
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1 || !empty($search_btn) || !empty($search_remove_btn) || (empty($toselect) && $massaction === '0')) {
 	$page = 0;
diff --git a/htdocs/ticket/document.php b/htdocs/ticket/document.php
index 8f682abee3e..d0c2d0a4a60 100644
--- a/htdocs/ticket/document.php
+++ b/htdocs/ticket/document.php
@@ -45,8 +45,8 @@ $confirm  = GETPOST('confirm', 'alpha');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/user/document.php b/htdocs/user/document.php
index e420c63cfa9..142c44d85fe 100644
--- a/htdocs/user/document.php
+++ b/htdocs/user/document.php
@@ -78,8 +78,8 @@ if ($user->id <> $id && !$canreaduser) {
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php
index 90a65593d31..3337d846f0b 100644
--- a/htdocs/user/notify/card.php
+++ b/htdocs/user/notify/card.php
@@ -41,8 +41,8 @@ $action = GETPOST('action', 'aZ09');
 $actionid = GETPOST('actionid', 'int');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (!$sortorder) {
 	$sortorder = "DESC";
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 1cec795b290..cdadc2c3eba 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -132,8 +132,8 @@ if (GETPOST('refreshsite') || GETPOST('refreshsite_x') || GETPOST('refreshsite.x
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/workstation/workstation_agenda.php b/htdocs/workstation/workstation_agenda.php
index a3204e76459..78140eddd40 100644
--- a/htdocs/workstation/workstation_agenda.php
+++ b/htdocs/workstation/workstation_agenda.php
@@ -52,8 +52,8 @@ if (GETPOST('actioncode', 'array')) {
 $search_agenda_label = GETPOST('search_agenda_label');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/workstation/workstation_document.php b/htdocs/workstation/workstation_document.php
index 22157106154..f52ef1fe796 100644
--- a/htdocs/workstation/workstation_document.php
+++ b/htdocs/workstation/workstation_document.php
@@ -42,8 +42,8 @@ $ref = GETPOST('ref', 'alpha');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;

From a77a2e9bcc4d3c9f48543d3a06996b9ac3b6dd56 Mon Sep 17 00:00:00 2001
From: Gauthier PC portable 024 <gauthier.verdol@atm-consulting.fr>
Date: Thu, 13 Jan 2022 11:39:54 +0100
Subject: [PATCH 071/316] FIX : several adaptations rank => rankorder and langs
 correction for HRM

---
 htdocs/hrm/class/evaluation.class.php       |  2 +-
 htdocs/hrm/class/skill.class.php            |  2 +-
 htdocs/hrm/class/skillrank.class.php        |  4 ++--
 htdocs/hrm/compare.php                      | 14 +++++------
 htdocs/hrm/core/tpl/objectline_view.tpl.php |  2 +-
 htdocs/hrm/evaluation_card.php              | 26 +++++++++------------
 htdocs/hrm/lib/hrm_skillrank.lib.php        |  6 ++---
 htdocs/hrm/skill_tab.php                    |  4 ++--
 htdocs/langs/fr_FR/hrm.lang                 |  2 +-
 9 files changed, 29 insertions(+), 33 deletions(-)

diff --git a/htdocs/hrm/class/evaluation.class.php b/htdocs/hrm/class/evaluation.class.php
index 75dc03cc6f2..58ac7fe3324 100644
--- a/htdocs/hrm/class/evaluation.class.php
+++ b/htdocs/hrm/class/evaluation.class.php
@@ -236,7 +236,7 @@ class Evaluation extends CommonObject
 					$line = new Evaluationline($this->db);
 					$line->fk_evaluation = $resultcreate;
 					$line->fk_skill = $required->fk_skill;
-					$line->required_rank = $required->rank;
+					$line->required_rank = $required->rankorder;
 					$line->fk_rank = 0;
 
 					$res = $line->create($user, $notrigger);
diff --git a/htdocs/hrm/class/skill.class.php b/htdocs/hrm/class/skill.class.php
index ebf568e68fe..d20d34cfd5e 100644
--- a/htdocs/hrm/class/skill.class.php
+++ b/htdocs/hrm/class/skill.class.php
@@ -978,7 +978,7 @@ class Skill extends CommonObject
 		$this->lines = array();
 
 		$objectline = new SkillLine($this->db);
-		$result = $objectline->fetchAll('ASC', 'rank', 0, 0, array('customsql'=>'fk_skill = '.$this->id));
+		$result = $objectline->fetchAll('ASC', 'rankorder', 0, 0, array('customsql'=>'fk_skill = '.$this->id));
 
 		if (is_numeric($result)) {
 			$this->error = $this->error;
diff --git a/htdocs/hrm/class/skillrank.class.php b/htdocs/hrm/class/skillrank.class.php
index a07015ef763..587fc889e0f 100644
--- a/htdocs/hrm/class/skillrank.class.php
+++ b/htdocs/hrm/class/skillrank.class.php
@@ -107,7 +107,7 @@ class SkillRank extends CommonObject
 	public $fields=array(
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
 		'fk_skill' => array('type'=>'integer:Skill:hrm/class/skill.class.php:1', 'label'=>'Skill', 'enabled'=>'1', 'position'=>3, 'notnull'=>1, 'visible'=>1, 'index'=>1,),
-		'rank' => array('type'=>'integer', 'label'=>'Rank', 'enabled'=>'1', 'position'=>4, 'notnull'=>1, 'visible'=>1, 'default' => 0),
+		'rankorder' => array('type'=>'integer', 'label'=>'Rank', 'enabled'=>'1', 'position'=>4, 'notnull'=>1, 'visible'=>1, 'default' => 0),
 		'fk_object' => array('type'=>'integer', 'label'=>'object', 'enabled'=>'1', 'position'=>5, 'notnull'=>1, 'visible'=>0,),
 		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>500, 'notnull'=>1, 'visible'=>-2,),
 		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>'1', 'position'=>501, 'notnull'=>0, 'visible'=>-2,),
@@ -371,7 +371,7 @@ class SkillRank extends CommonObject
 		global $user;
 
 		$this->fk_skill 		= $currentSkill->fk_skill;
-		$this->rank 			= $currentSkill->rank;
+		$this->rankorder 			= $currentSkill->rankorder;
 		$this->fk_object		= $fk_user;
 		$this->date_creation 	= dol_now();
 		$this->fk_user_creat 	= $user->id;
diff --git a/htdocs/hrm/compare.php b/htdocs/hrm/compare.php
index dc641cb6d09..008dd04c161 100644
--- a/htdocs/hrm/compare.php
+++ b/htdocs/hrm/compare.php
@@ -372,7 +372,7 @@ function mergeSkills($TSkill1, $TSkill2)
 	foreach ($TSkill1 as &$sk) {
 			if (empty($Tab[$sk->fk_skill])) $Tab[$sk->fk_skill] = new stdClass;
 
-			$Tab[$sk->fk_skill]->rate1 = $sk->rank;
+			$Tab[$sk->fk_skill]->rate1 = $sk->rankorder;
 			$Tab[$sk->fk_skill]->how_many_max1 = $sk->how_many_max;
 			$Tab[$sk->fk_skill]->label = $sk->label;
 			$Tab[$sk->fk_skill]->description = $sk->description;
@@ -380,7 +380,7 @@ function mergeSkills($TSkill1, $TSkill2)
 
 	foreach ($TSkill2 as &$sk) {
 			if (empty($Tab[$sk->fk_skill])) $Tab[$sk->fk_skill] = new stdClass;
-			$Tab[$sk->fk_skill]->rate2 = $sk->rank;
+			$Tab[$sk->fk_skill]->rate2 = $sk->rankorder;
 			$Tab[$sk->fk_skill]->label = $sk->label;
 			$Tab[$sk->fk_skill]->description = $sk->description;
 			$Tab[$sk->fk_skill]->how_many_max2 = $sk->how_many_max;
@@ -481,7 +481,7 @@ function getSkillForUsers($TUser)
 	if (empty($TUser)) return array();
 
 	$sql = 'SELECT sk.rowid, sk.label, sk.description, sk.skill_type, sr.fk_object, sr.objecttype, sr.fk_skill, ';
-	$sql.= ' MAX(sr.rank) as "rank"';
+	$sql.= ' MAX(sr.rankorder) as "rankorder"';
 	$sql.= ' FROM '.MAIN_DB_PREFIX.'hrm_skill sk';
 	$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'hrm_skillrank sr ON (sk.rowid = sr.fk_skill)';
 	$sql.= " WHERE sr.objecttype = '".SkillRank::SKILLRANK_TYPE_USER."'";
@@ -496,7 +496,7 @@ function getSkillForUsers($TUser)
 		$num = 0;
 		while ($obj = $db->fetch_object($resql) ) {
 			$sql1 = "SELECT count(*) as how_many_max FROM ".MAIN_DB_PREFIX."hrm_skillrank sr";
-			$sql1.=" WHERE sr.rank = ".((int) $obj->rank);
+			$sql1.=" WHERE sr.rankorder = ".((int) $obj->rankorder);
 			$sql1.=" AND sr.objecttype = '".Skillrank::SKILLRANK_TYPE_USER."'";
 			$sql1.=" AND sr.fk_skill = ".((int) $obj->fk_skill);
 			$sql1.=" AND sr.fk_object IN (".$db->sanitize(implode(',', $TUser)).")";
@@ -511,7 +511,7 @@ function getSkillForUsers($TUser)
 			$Tab[$num]->skill_type = $obj->skill_type;
 			$Tab[$num]->fk_object = $obj->fk_object;
 			$Tab[$num]->objectType = SkillRank::SKILLRANK_TYPE_USER;
-			$Tab[$num]->rank = $obj->rank;
+			$Tab[$num]->rankorder = $obj->rankorder;
 			$Tab[$num]->how_many_max = $objMax->how_many_max;
 
 			$num++;
@@ -536,7 +536,7 @@ function getSkillForJob($fk_job)
 	if (empty($fk_job)) return array();
 
 	$sql = 'SELECT sk.rowid, sk.label, sk.description, sk.skill_type, sr.fk_object, sr.objecttype, sr.fk_skill, ';
-	$sql.= ' MAX(sr.rank) as "rank"';
+	$sql.= ' MAX(sr.rankorder) as "rankorder"';
 	$sql.=' FROM '.MAIN_DB_PREFIX.'hrm_skill sk';
 	$sql.='	LEFT JOIN '.MAIN_DB_PREFIX.'hrm_skillrank sr ON (sk.rowid = sr.fk_skill)';
 	$sql.="	WHERE sr.objecttype = '".SkillRank::SKILLRANK_TYPE_JOB."'";
@@ -559,7 +559,7 @@ function getSkillForJob($fk_job)
 			//$Tab[$num]->date_end = ''; //  du poste
 			$Tab[$num]->fk_object = $obj->fk_object;
 			$Tab[$num]->objectType = SkillRank::SKILLRANK_TYPE_JOB;
-			$Tab[$num]->rank = $obj->rank;
+			$Tab[$num]->rankorder = $obj->rankorder;
 			$Tab[$num]->how_many_max = $obj->how_many_max;
 
 			$num++;
diff --git a/htdocs/hrm/core/tpl/objectline_view.tpl.php b/htdocs/hrm/core/tpl/objectline_view.tpl.php
index 9dd0e0099ab..ce436ca604a 100644
--- a/htdocs/hrm/core/tpl/objectline_view.tpl.php
+++ b/htdocs/hrm/core/tpl/objectline_view.tpl.php
@@ -93,7 +93,7 @@ print '</td>';
 <?php
 global $permissiontoadd;
 
-		print displayRankInfos($line->rank, $line->fk_skill, 'TNote', ($this->status == 0 && $permissiontoadd) ? 'edit' : 'view');
+		print displayRankInfos($line->rankorder, $line->fk_skill, 'TNote', ($this->status == 0 && $permissiontoadd) ? 'edit' : 'view');
 
 ?>
 
diff --git a/htdocs/hrm/evaluation_card.php b/htdocs/hrm/evaluation_card.php
index 159e07bf07f..5968613c303 100644
--- a/htdocs/hrm/evaluation_card.php
+++ b/htdocs/hrm/evaluation_card.php
@@ -156,7 +156,7 @@ if (empty($reshook)) {
 		$TNote = GETPOST('TNote', 'array');
 		if (!empty($TNote)) {
 			foreach ($object->lines as $line) {
-				$line->rank = $TNote[$line->fk_skill];
+				$line->rankorder = $TNote[$line->fk_skill];
 				$line->update($user);
 			}
 		}
@@ -172,16 +172,12 @@ if (empty($reshook)) {
 		foreach ($object->lines as $key => $line) {
 			// no reference .. we add the line to use it
 			if (count($SkillrecordsForActiveUser) == 0) {
-				if ($res > 0) {
-					$newSkill = new SkillRank($db);
-					$resCreate = $newSkill->cloneFromCurrentSkill($line, $object->fk_user);
+				$newSkill = new SkillRank($db);
+				$resCreate = $newSkill->cloneFromCurrentSkill($line, $object->fk_user);
 
-					if ($resCreate <= 0) {
-						$errors++;
-						setEventMessage($langs->trans('ErrorCreateUserSkill'), $line->fk_skill);
-					}
-				} else {
-					setEventMessage($langs->trans('NoSkilRankLoaded'));
+				if ($resCreate <= 0) {
+					$errors++;
+					setEventMessage($langs->trans('ErrorCreateUserSkill'), $line->fk_skill);
 				}
 			} else {
 				//check if the skill is present to use it
@@ -198,7 +194,7 @@ if (empty($reshook)) {
 				if ($find) {
 					$updSkill = $SkillrecordsForActiveUser[$k];
 
-					$updSkill->rank = $line->rank;
+					$updSkill->rankorder = $line->rankorder;
 					$updSkill->update($user);
 				} else { // sinon on ajoute la skill
 					$newSkill = new SkillRank($db);
@@ -519,9 +515,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$sql .= '  sk.label as "skilllabel",';
 		$sql .= '  sk.skill_type,';
 		$sql .= '  sk.description,';
-		$sql .= '  ed.rank,';
+		$sql .= '  ed.rankorder,';
 		$sql .= '  ed.required_rank,';
-		$sql .= '  ed.rank as "userRankForSkill",';
+		$sql .= '  ed.rankorder as "userRankForSkill",';
 		$sql .= '  skdet_user.description as "userRankForSkillDesc",';
 		$sql .= '  skdet_required.description as "required_rank_desc"';
 
@@ -529,9 +525,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$sql .= '  LEFT JOIN ' . MAIN_DB_PREFIX . 'hrm_evaluationdet as ed ON  e.rowid = ed.fk_evaluation';
 		$sql .= '  LEFT JOIN ' . MAIN_DB_PREFIX . 'hrm_job as j ON e.fk_job = j.rowid';
 		$sql .= '  LEFT JOIN ' . MAIN_DB_PREFIX . 'hrm_skill as sk ON ed.fk_skill = sk.rowid';
-		$sql .= '  INNER JOIN ' . MAIN_DB_PREFIX . 'hrm_skilldet as skdet_user ON (skdet_user.fk_skill = sk.rowid AND skdet_user.rank = ed.rank)';
+		$sql .= '  INNER JOIN ' . MAIN_DB_PREFIX . 'hrm_skilldet as skdet_user ON (skdet_user.fk_skill = sk.rowid AND skdet_user.rankorder = ed.rankorder)';
 		//$sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "hrm_skillrank as skr ON (j.rowid = skr.fk_object AND skr.fk_skill = ed.fk_skill AND skr.objecttype = 'job')";
-		$sql .= '  LEFT JOIN ' . MAIN_DB_PREFIX . 'hrm_skilldet as skdet_required ON (skdet_required.fk_skill = sk.rowid AND skdet_required.rank = ed.required_rank)';
+		$sql .= '  LEFT JOIN ' . MAIN_DB_PREFIX . 'hrm_skilldet as skdet_required ON (skdet_required.fk_skill = sk.rowid AND skdet_required.rankorder = ed.required_rank)';
 		$sql .= " WHERE e.rowid =" . ((int) $object->id);
 
 		//      echo $sql;
diff --git a/htdocs/hrm/lib/hrm_skillrank.lib.php b/htdocs/hrm/lib/hrm_skillrank.lib.php
index 5872ec6f037..d979e8ca4b7 100644
--- a/htdocs/hrm/lib/hrm_skillrank.lib.php
+++ b/htdocs/hrm/lib/hrm_skillrank.lib.php
@@ -124,13 +124,13 @@ function displayRankInfos($selected_rank, $fk_skill, $inputname = 'TNote', $mode
 	if (is_array($Lines) && !empty($Lines)) {
 		foreach ($Lines as $line) {
 			$MaxNumberSkill = isset($conf->global->HRM_MAXRANK) ? $conf->global->HRM_MAXRANK : Skill::DEFAULT_MAX_RANK_PER_SKILL;
-			if ($line->rank > $MaxNumberSkill) {
+			if ($line->rankorder > $MaxNumberSkill) {
 				continue;
 			}
 
 			$ret .= '<span title="' . $line->description . '" class="radio_js_bloc_number ' . $inputname . '_' . $line->fk_skill;
-			$ret .= $line->rank == $selected_rank ? ' selected' : '';
-			$ret .= '">' . $line->rank . '</span>';
+			$ret .= $line->rankorder == $selected_rank ? ' selected' : '';
+			$ret .= '">' . $line->rankorder . '</span>';
 		}
 
 		if ($mode == 'edit') {
diff --git a/htdocs/hrm/skill_tab.php b/htdocs/hrm/skill_tab.php
index e7c6798bbec..1ed9e370839 100644
--- a/htdocs/hrm/skill_tab.php
+++ b/htdocs/hrm/skill_tab.php
@@ -130,7 +130,7 @@ if (empty($reshook)) {
 				$TSkills = $skill->fetchAll('ASC', 't.rowid', 0, 0, array('customsql' => 'fk_object=' . ((int) $id) . " AND objecttype='" . $db->escape($objecttype) . "' AND fk_skill = " . ((int) $skillId)));
 				if (is_array($TSkills) && !empty($TSkills)) {
 					foreach ($TSkills as $tmpObj) {
-						$tmpObj->rank = $rank;
+						$tmpObj->rankorder = $rank;
 						$tmpObj->update($user);
 					}
 				}
@@ -305,7 +305,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			print '<td>';
 			print $sk->description;
 			print '</td><td class="linecolrank">';
-			print displayRankInfos($skillElement->rank, $skillElement->fk_skill, 'TNote', $objecttype == 'job' && $permissiontoadd ? 'edit' : 'view');
+			print displayRankInfos($skillElement->rankorder, $skillElement->fk_skill, 'TNote', $objecttype == 'job' && $permissiontoadd ? 'edit' : 'view');
 			print '</td>';
 			if ($objecttype != 'user' && $permissiontoadd) {
 				print '<td class="linecoledit"></td>';
diff --git a/htdocs/langs/fr_FR/hrm.lang b/htdocs/langs/fr_FR/hrm.lang
index 2e19df64b98..d47596fe95e 100644
--- a/htdocs/langs/fr_FR/hrm.lang
+++ b/htdocs/langs/fr_FR/hrm.lang
@@ -23,7 +23,7 @@ HrmSetup=Configuration du module GRH
 SkillsManagement=Gestion des compétences
 HRM_MAXRANK=Nombre maximum de niveaux pour classer une compétence
 HRM_DEFAULT_SKILL_DESCRIPTION=Description par défaut des rangs lors de la création de la compétence
-deplacement=Ctrl
+deplacement=Déplacement
 DateEval=Date d'évaluation
 JobCard=Fiche emploi
 JobPosition=Emploi

From cb03f88fbcf344ca80894dc673f8b9b2e4fc55e9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 13 Jan 2022 11:58:10 +0100
Subject: [PATCH 072/316] Fix link

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

diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php
index ab6f0f5e574..93fdd415513 100644
--- a/htdocs/compta/paiement/card.php
+++ b/htdocs/compta/paiement/card.php
@@ -295,7 +295,7 @@ print '</td></tr>';
 if (!empty($conf->banque->enabled)) {
 	if ($object->fk_account > 0) {
 		if ($object->type_code == 'CHQ' && $bankline->fk_bordereau > 0) {
-			dol_include_once('/compta/paiement/cheque/class/remisecheque.class.php');
+			include_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
 			$bordereau = new RemiseCheque($db);
 			$bordereau->fetch($bankline->fk_bordereau);
 

From 55389036d9bace3b19097081b14b59964b756d1b Mon Sep 17 00:00:00 2001
From: Gauthier PC portable 024 <gauthier.verdol@atm-consulting.fr>
Date: Thu, 13 Jan 2022 12:02:05 +0100
Subject: [PATCH 073/316] FIX : perms

---
 htdocs/core/menus/standard/eldy.lib.php | 2 +-
 htdocs/hrm/compare.php                  | 2 +-
 htdocs/hrm/evaluation_card.php          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 58d39fe8aa4..625022e6bbf 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1817,7 +1817,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 					$newmenu->add("/hrm/evaluation_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("Evalutions"), 1, $user->rights->hrm->evaluation->read, '', $mainmenu, 'hrm_sm', 0, '', '', '', img_picto('', 'user', 'class="pictofixedwidth"'));
 					//$newmenu->add("/hrm/evaluation_card.php?mainmenu=hrm&leftmenu=hrm_sm&action=create", $langs->trans("NewEval"), 1, $user->rights->hrm->evaluation->write);
 					//$newmenu->add("/hrm/evaluation_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("List"), 1, $user->rights->hrm->evaluation->read);
-					$newmenu->add("/hrm/compare.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("SkillComparison"), 1, $user->rights->hrm->evaluation->read || $user->rights->hrm->compare->read);
+					$newmenu->add("/hrm/compare.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("SkillComparison"), 1, $user->rights->hrm->evaluation->read || $user->rights->hrm->compare_advance->read);
 				}
 			}
 
diff --git a/htdocs/hrm/compare.php b/htdocs/hrm/compare.php
index 008dd04c161..c8bb01d85e5 100644
--- a/htdocs/hrm/compare.php
+++ b/htdocs/hrm/compare.php
@@ -42,7 +42,7 @@ require_once DOL_DOCUMENT_ROOT . '/hrm/class/evaluation.class.php';
 require_once DOL_DOCUMENT_ROOT . '/hrm/class/position.class.php';
 require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm.lib.php';
 
-$permissiontoread = $user->rights->hrm->evaluation->read || $user->rights->hrm->compare->read;
+$permissiontoread = $user->rights->hrm->evaluation->read || $user->rights->hrm->compare_advance->read;
 $permissiontoadd = 0;
 if (empty($conf->hrm->enabled)) accessforbidden();
 if (!$permissiontoread || ($action === 'create' && !$permissiontoadd)) accessforbidden();
diff --git a/htdocs/hrm/evaluation_card.php b/htdocs/hrm/evaluation_card.php
index 5968613c303..8aeadeaa18c 100644
--- a/htdocs/hrm/evaluation_card.php
+++ b/htdocs/hrm/evaluation_card.php
@@ -82,7 +82,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be includ
 
 $permissiontoread = $user->rights->hrm->evaluation->read;
 $permissiontoadd = $user->rights->hrm->evaluation->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
-$permissiontovalidate = $user->rights->hrm->evaluation->validate;
+$permissiontovalidate = $user->rights->hrm->evaluation_advance->validate;
 $permissiontoClose = $user->rights->hrm->evaluation->write;
 $permissiontodelete = $user->rights->hrm->evaluation->delete/* || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT)*/;
 $permissiondellink = $user->rights->hrm->evaluation->write; // Used by the include of actions_dellink.inc.php

From cc6dd99bf6e998f0e39bab6eb0be09d69acbea2a Mon Sep 17 00:00:00 2001
From: BENKE Charlene <1179011+defrance@users.noreply.github.com>
Date: Thu, 13 Jan 2022 12:20:54 +0100
Subject: [PATCH 074/316] NEW : addMoreActionsButtonsList hook for button in
 list

---
 htdocs/accountancy/bookkeeping/balance.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 0b67327b11c..3c2e8763fe1 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -237,7 +237,7 @@ if ($action != 'export_csv') {
 	print '<input type="hidden" name="page" value="'.$page.'">';
 
 	$parameters = array();
-	$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	$reshook = $hookmanager->executeHooks('addMoreActionsButtonsList', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	if (empty($reshook)) {
 		$button = '<input type="button" id="exportcsvbutton" name="exportcsvbutton" class="butAction" value="'.$langs->trans("Export").' ('.$conf->global->ACCOUNTING_EXPORT_FORMAT.')" />';
 

From c4c43fc9f9dab0a597974f9cfbfd5f214874ceab Mon Sep 17 00:00:00 2001
From: BENKE Charlene <1179011+defrance@users.noreply.github.com>
Date: Thu, 13 Jan 2022 12:22:16 +0100
Subject: [PATCH 075/316] Update list.php

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

diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 8b2ba49d1bc..a90400cfd7a 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -766,7 +766,7 @@ if (count($filter)) {
 }
 
 $parameters = array();
-$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('addMoreActionsButtonsList', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 if (empty($reshook)) {
 	// Button re-export
 	if (!empty($conf->global->ACCOUNTING_REEXPORT)) {

From 05603730ca6ca9bf636a71faa27027e9a0dee670 Mon Sep 17 00:00:00 2001
From: BENKE Charlene <1179011+defrance@users.noreply.github.com>
Date: Thu, 13 Jan 2022 12:22:45 +0100
Subject: [PATCH 076/316] Update listbyaccount.php

---
 htdocs/accountancy/bookkeeping/listbyaccount.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index d73f4228f97..837a372a32d 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -473,7 +473,7 @@ print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 
 $parameters = array();
-$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('addMoreActionsButtonsList', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 if (empty($reshook)) {
 	$newcardbutton = dolGetButtonTitle($langs->trans('ViewFlatList'), '', 'fa fa-list paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/list.php?'.$param);
 	$newcardbutton .= dolGetButtonTitle($langs->trans('GroupByAccountAccounting'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php?'.$param, '', 1, array('morecss' => 'marginleftonly btnTitleSelected'));

From 90829bd255d4ff7b9aea63b6b93d58420f9da8ae Mon Sep 17 00:00:00 2001
From: BENKE Charlene <1179011+defrance@users.noreply.github.com>
Date: Thu, 13 Jan 2022 12:23:14 +0100
Subject: [PATCH 077/316] Update listbysubaccount.php

---
 htdocs/accountancy/bookkeeping/listbysubaccount.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/accountancy/bookkeeping/listbysubaccount.php b/htdocs/accountancy/bookkeeping/listbysubaccount.php
index e529126d8ce..c6fb95d5ab7 100644
--- a/htdocs/accountancy/bookkeeping/listbysubaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbysubaccount.php
@@ -473,7 +473,7 @@ print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 
 $parameters = array();
-$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('addMoreActionsButtonsList', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 if (empty($reshook)) {
 	$newcardbutton = dolGetButtonTitle($langs->trans('ViewFlatList'), '', 'fa fa-list paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/list.php?'.$param);
 	$newcardbutton .= dolGetButtonTitle($langs->trans('GroupByAccountAccounting'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php?'.$param, '', 1, array('morecss' => 'marginleftonly'));

From 52493b60fb343e290b560ead58b53ef8aa65494a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 13 Jan 2022 15:52:41 +0100
Subject: [PATCH 078/316] Fix #yogosha8316

---
 htdocs/core/lib/files.lib.php    |  34 +++++++--
 htdocs/core/lib/security.lib.php | 117 ++++++++++++++++++++++---------
 htdocs/document.php              |   2 +-
 3 files changed, 115 insertions(+), 38 deletions(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index b08e85851d2..c70ea041e0a 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -2270,13 +2270,13 @@ function dol_most_recent_file($dir, $regexfilter = '', $excludefilter = array('(
 
 /**
  * Security check when accessing to a document (used by document.php, viewimage.php and webservices to get documents).
- * TODO Replace code that set $accesallowed by a call to restrictedArea()
+ * TODO Replace code that set $accessallowed by a call to restrictedArea()
  *
  * @param	string	$modulepart			Module of document ('module', 'module_user_temp', 'module_user' or 'module_temp'). Exemple: 'medias', 'invoice', 'logs', 'tax-vat', ...
  * @param	string	$original_file		Relative path with filename, relative to modulepart.
  * @param	string	$entity				Restrict onto entity (0=no restriction)
  * @param  	User	$fuser				User object (forced)
- * @param	string	$refname			Ref of object to check permission for external users (autodetect if not provided)
+ * @param	string	$refname			Ref of object to check permission for external users (autodetect if not provided) or for hierarchy
  * @param   string  $mode               Check permission for 'read' or 'write'
  * @return	mixed						Array with access information : 'accessallowed' & 'sqlprotectagainstexternals' & 'original_file' (as a full path name)
  * @see restrictedArea()
@@ -2423,6 +2423,30 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed = 1;
 		}
 		$original_file = $conf->fournisseur->facture->dir_output.'/'.$original_file;
+	} elseif (($modulepart == 'holiday') && !empty($conf->holiday->dir_output)) {
+		if ($fuser->rights->holiday->{$read} || preg_match('/^specimen/i', $original_file)) {
+			$accessallowed = 1;
+			// If we known $id of holiday, call checkUserAccessToObject to check permission on properties and hierarchy of leave request
+			if ($refname && !preg_match('/^specimen/i', $original_file)) {
+				include_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
+				$tmpholiday = new Holiday($db);
+				$tmpholiday->fetch('', $refname);
+				$accessallowed = checkUserAccessToObject($user, array('holiday'), $tmpholiday, 'holiday', '', '', 'rowid', '');
+			}
+		}
+		$original_file = $conf->holiday->dir_output.'/'.$original_file;
+	} elseif (($modulepart == 'expensereport') && !empty($conf->expensereport->dir_output)) {
+		if ($fuser->rights->expensereport->{$lire} || preg_match('/^specimen/i', $original_file)) {
+			$accessallowed = 1;
+			// If we known $id of expensereport, call checkUserAccessToObject to check permission on properties and hierarchy of expense report
+			if ($refname && !preg_match('/^specimen/i', $original_file)) {
+				include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
+				$tmpexpensereport = new ExpenseReport($db);
+				$tmpexpensereport->fetch('', $refname);
+				$accessallowed = checkUserAccessToObject($user, array('expensereport'), $tmpexpensereport, 'expensereport', '', '', 'rowid', '');
+			}
+		}
+		$original_file = $conf->expensereport->dir_output.'/'.$original_file;
 	} elseif (($modulepart == 'apercuexpensereport') && !empty($conf->expensereport->dir_output)) {
 		// Wrapping pour les apercu supplier invoice
 		if ($fuser->rights->expensereport->{$lire}) {
@@ -2971,9 +2995,9 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 	}
 
 	$ret = array(
-		'accessallowed' => $accessallowed,
-		'sqlprotectagainstexternals'=>$sqlprotectagainstexternals,
-		'original_file'=>$original_file
+		'accessallowed' => ($accessallowed ? 1 : 0),
+		'sqlprotectagainstexternals' => $sqlprotectagainstexternals,
+		'original_file' => $original_file
 	);
 
 	return $ret;
diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index 0b47ec5aeb0..4a20fbf96f2 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -626,24 +626,30 @@ function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $f
 }
 
 /**
- * Check access by user to object is ok.
- * This function is also called by restrictedArea that check before if module is enabled and if permission of user for $action is ok.
+ * Check that access by a given user to an object is ok.
+ * This function is also called by restrictedArea() that check before if module is enabled and if permission of user for $action is ok.
  *
- * @param User			$user					User to check
- * @param array			$featuresarray			Features/modules to check. Example: ('user','service','member','project','task',...)
- * @param int|string	$objectid				Object ID if we want to check a particular record (optional) is linked to a owned thirdparty (optional).
- * @param string		$tableandshare			'TableName&SharedElement' with Tablename is table where object is stored. SharedElement is an optional key to define where to check entity for multicompany modume. Param not used if objectid is null (optional).
- * @param string		$feature2				Feature to check, second level of permission (optional). Can be or check with 'level1|level2'.
- * @param string		$dbt_keyfield			Field name for socid foreign key if not fk_soc. Not used if objectid is null (optional)
- * @param string		$dbt_select				Field name for select if not rowid. Not used if objectid is null (optional)
- * @param string		$parenttableforentity  	Parent table for entity. Example 'fk_website@website'
- * @return	bool								True if user has access, False otherwise
+ * @param 	User				$user					User to check
+ * @param 	array				$featuresarray			Features/modules to check. Example: ('user','service','member','project','task',...)
+ * @param 	int|string|Object	$object					Full object or object ID or list of object id. For example if we want to check a particular record (optional) is linked to a owned thirdparty (optional).
+ * @param 	string				$tableandshare			'TableName&SharedElement' with Tablename is table where object is stored. SharedElement is an optional key to define where to check entity for multicompany modume. Param not used if objectid is null (optional).
+ * @param 	string				$feature2				Feature to check, second level of permission (optional). Can be or check with 'level1|level2'.
+ * @param 	string				$dbt_keyfield			Field name for socid foreign key if not fk_soc. Not used if objectid is null (optional)
+ * @param 	string				$dbt_select				Field name for select if not rowid. Not used if objectid is null (optional)
+ * @param 	string				$parenttableforentity  	Parent table for entity. Example 'fk_website@website'
+ * @return	bool										True if user has access, False otherwise
  * @see restrictedArea()
  */
-function checkUserAccessToObject($user, array $featuresarray, $objectid = 0, $tableandshare = '', $feature2 = '', $dbt_keyfield = '', $dbt_select = 'rowid', $parenttableforentity = '')
+function checkUserAccessToObject($user, array $featuresarray, $object = 0, $tableandshare = '', $feature2 = '', $dbt_keyfield = '', $dbt_select = 'rowid', $parenttableforentity = '')
 {
 	global $db, $conf;
 
+	if (is_object($object)) {
+		$objectid = $object->id;
+	} else {
+		$objectid = $object;		// $objectid can be X or 'X,Y,Z'
+	}
+
 	//dol_syslog("functions.lib:restrictedArea $feature, $objectid, $dbtablename, $feature2, $dbt_socfield, $dbt_select, $isdraft");
 	//print "user_id=".$user->id.", features=".join(',', $featuresarray).", feature2=".$feature2.", objectid=".$objectid;
 	//print ", tableandshare=".$tableandshare.", dbt_socfield=".$dbt_keyfield.", dbt_select=".$dbt_select."<br>";
@@ -669,11 +675,15 @@ function checkUserAccessToObject($user, array $featuresarray, $objectid = 0, $ta
 			$feature = 'projet_task';
 		}
 
+		$checkonentitydone = 0;
+
+		// Array to define rules of checks to do
 		$check = array('adherent', 'banque', 'bom', 'don', 'mrp', 'user', 'usergroup', 'payment', 'payment_supplier', 'product', 'produit', 'service', 'produit|service', 'categorie', 'resource', 'expensereport', 'holiday', 'salaries', 'website'); // Test on entity only (Objects with no link to company)
 		$checksoc = array('societe'); // Test for societe object
 		$checkother = array('contact', 'agenda'); // Test on entity + link to third party on field $dbt_keyfield. Allowed if link is empty (Ex: contacts...).
 		$checkproject = array('projet', 'project'); // Test for project object
 		$checktask = array('projet_task'); // Test for task object
+		$checkhierarchy = array('expensereport', 'holiday');
 		$nocheck = array('barcode', 'stock'); // No test
 		//$checkdefault = 'all other not already defined'; // Test on entity + link to third party on field $dbt_keyfield. Not allowed if link is empty (Ex: invoice, orders...).
 
@@ -714,10 +724,12 @@ function checkUserAccessToObject($user, array $featuresarray, $objectid = 0, $ta
 					$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 				}
 			}
-		} elseif (in_array($feature, $checksoc)) {	// We check feature = checksoc
+			$checkonentitydone = 1;
+		}
+		if (in_array($feature, $checksoc)) {	// We check feature = checksoc
 			// If external user: Check permission for external users
 			if ($user->socid > 0) {
-				if ($user->socid <> $objectid) {
+				if ($user->socid != $objectid) {
 					return false;
 				}
 			} elseif (!empty($conf->societe->enabled) && ($user->rights->societe->lire && empty($user->rights->societe->client->voir))) {
@@ -736,7 +748,10 @@ function checkUserAccessToObject($user, array $featuresarray, $objectid = 0, $ta
 				$sql .= " WHERE s.rowid IN (".$db->sanitize($objectid, 1).")";
 				$sql .= " AND s.entity IN (".getEntity($sharedelement, 1).")";
 			}
-		} elseif (in_array($feature, $checkother)) {	// Test on entity + link to thirdparty. Allowed if link is empty (Ex: contacts...).
+
+			$checkonentitydone = 1;
+		}
+		if (in_array($feature, $checkother)) {	// Test on entity + link to thirdparty. Allowed if link is empty (Ex: contacts...).
 			// If external user: Check permission for external users
 			if ($user->socid > 0) {
 				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
@@ -758,25 +773,19 @@ function checkUserAccessToObject($user, array $featuresarray, $objectid = 0, $ta
 				$sql .= " WHERE dbt.".$dbt_select." IN (".$db->sanitize($objectid, 1).")";
 				$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			}
-			if ($feature == 'agenda') {
-				// Also check owner or attendee for users without allactions->read
-				if ($objectid > 0 && empty($user->rights->agenda->allactions->read)) {
-					require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
-					$action = new ActionComm($db);
-					$action->fetch($objectid);
-					if ($action->authorid != $user->id && $action->userownerid != $user->id && !(array_key_exists($user->id, $action->userassigned))) {
-						return false;
-					}
-				}
-			}
-		} elseif (in_array($feature, $checkproject)) {
+
+			$checkonentitydone = 1;
+		}
+		if (in_array($feature, $checkproject)) {
 			if (!empty($conf->projet->enabled) && empty($user->rights->projet->all->lire)) {
+				$projectid = $objectid;
+
 				include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 				$projectstatic = new Project($db);
 				$tmps = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, 0);
 
 				$tmparray = explode(',', $tmps);
-				if (!in_array($objectid, $tmparray)) {
+				if (!in_array($projectid, $tmparray)) {
 					return false;
 				}
 			} else {
@@ -785,16 +794,21 @@ function checkUserAccessToObject($user, array $featuresarray, $objectid = 0, $ta
 				$sql .= " WHERE dbt.".$dbt_select." IN (".$db->sanitize($objectid, 1).")";
 				$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			}
-		} elseif (in_array($feature, $checktask)) {
+
+			$checkonentitydone = 1;
+		}
+		if (in_array($feature, $checktask)) {
 			if (!empty($conf->projet->enabled) && empty($user->rights->projet->all->lire)) {
 				$task = new Task($db);
 				$task->fetch($objectid);
+				$projectid = $task->fk_project;
 
 				include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 				$projectstatic = new Project($db);
 				$tmps = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, 0);
+
 				$tmparray = explode(',', $tmps);
-				if (!in_array($task->fk_project, $tmparray)) {
+				if (!in_array($projectid, $tmparray)) {
 					return false;
 				}
 			} else {
@@ -803,7 +817,10 @@ function checkUserAccessToObject($user, array $featuresarray, $objectid = 0, $ta
 				$sql .= " WHERE dbt.".$dbt_select." IN (".$db->sanitize($objectid, 1).")";
 				$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			}
-		} elseif (!in_array($feature, $nocheck)) {		// By default (case of $checkdefault), we check on object entity + link to third party on field $dbt_keyfield
+
+			$checkonentitydone = 1;
+		}
+		if (!$checkonentitydone && !in_array($feature, $nocheck)) {		// By default (case of $checkdefault), we check on object entity + link to third party on field $dbt_keyfield
 			// If external user: Check permission for external users
 			if ($user->socid > 0) {
 				if (empty($dbt_keyfield)) {
@@ -845,11 +862,47 @@ function checkUserAccessToObject($user, array $featuresarray, $objectid = 0, $ta
 		}
 		//print $sql;
 
+		// For events, check on users assigned to event
+		if ($feature === 'agenda') {
+			// Also check owner or attendee for users without allactions->read
+			if ($objectid > 0 && empty($user->rights->agenda->allactions->read)) {
+				require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+				$action = new ActionComm($db);
+				$action->fetch($objectid);
+				if ($action->authorid != $user->id && $action->userownerid != $user->id && !(array_key_exists($user->id, $action->userassigned))) {
+					return false;
+				}
+			}
+		}
+
+		// For some object, we also have to check it is in the user hierarchy
+		// Param $object must be the full object and not a simple id to have this test possible.
+		if (in_array($feature, $checkhierarchy) && is_object($object)) {
+			$childids = $user->getAllChildIds(1);
+			$useridtocheck = 0;
+			if ($feature == 'holiday') {
+				$useridtocheck = $object->fk_user;
+				if (!in_array($useridtocheck, $childids)) {
+					return false;
+				}
+				$useridtocheck = $object->fk_validator;
+				if (!in_array($useridtocheck, $childids)) {
+					return false;
+				}
+			}
+			if ($feature == 'expensereport') {
+				$useridtocheck = $object->fk_user_author;
+				if (!in_array($useridtocheck, $childids)) {
+					return false;
+				}
+			}
+		}
+
 		if ($sql) {
 			$resql = $db->query($sql);
 			if ($resql) {
 				$obj = $db->fetch_object($resql);
-				if (!$obj || $obj->nb < count(explode(',', $objectid))) {
+				if (!$obj || $obj->nb < count(explode(',', $objectid))) {	// error if we found 0 or less record than nb of id provided
 					return false;
 				}
 			} else {
diff --git a/htdocs/document.php b/htdocs/document.php
index 2a708ff3334..7498fbb3cf6 100644
--- a/htdocs/document.php
+++ b/htdocs/document.php
@@ -214,7 +214,7 @@ $check_access = dol_check_secure_access_document($modulepart, $original_file, $e
 $accessallowed              = $check_access['accessallowed'];
 $sqlprotectagainstexternals = $check_access['sqlprotectagainstexternals'];
 $fullpath_original_file     = $check_access['original_file']; // $fullpath_original_file is now a full path name
-//var_dump($fullpath_original_file);exit;
+//var_dump($fullpath_original_file.' '.$original_file.' '.$refname.' '.$accessallowed);exit;
 
 if (!empty($hashp)) {
 	$accessallowed = 1; // When using hashp, link is public so we force $accessallowed

From dbce3cbfbe24a0bce6fac341c9a8254c81469e0c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 13 Jan 2022 16:00:39 +0100
Subject: [PATCH 079/316] Clean code

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

diff --git a/htdocs/compta/sociales/list.php b/htdocs/compta/sociales/list.php
index 7b6d8db7f18..53f293704cf 100644
--- a/htdocs/compta/sociales/list.php
+++ b/htdocs/compta/sociales/list.php
@@ -68,7 +68,6 @@ $search_date_limit_endyear = GETPOST('search_date_limit_endyear', 'int');
 $search_date_limit_start = dol_mktime(0, 0, 0, $search_date_limit_startmonth, $search_date_limit_startday, $search_date_limit_startyear);
 $search_date_limit_end = dol_mktime(23, 59, 59, $search_date_limit_endmonth, $search_date_limit_endday, $search_date_limit_endyear);
 $search_project_ref = GETPOST('search_project_ref', 'alpha');
-$search_project = GETPOST('search_project', 'alpha');
 $search_users = GETPOST('search_users');
 $search_type = GETPOST('search_type', 'int');
 $search_account				= GETPOST('search_account', 'int');
@@ -176,7 +175,6 @@ if (empty($reshook)) {
 		$search_date_limit_start = '';
 		$search_date_limit_end = '';
 		$search_project_ref = '';
-		$search_project = '';
 		$search_users = '';
 		$search_type = '';
 		$search_account = '';
@@ -455,7 +453,7 @@ if (!empty($arrayfields['cs.periode']['checked'])) {
 // Filter: Project ref
 if (!empty($arrayfields['p.ref']['checked'])) {
 	print '<td class="liste_titre">';
-	print '<input type="text" class="flat" size="6" name="search_project_ref" value="'.$search_project_ref.'">';
+	print '<input type="text" class="flat" size="6" name="search_project_ref" value="'.dol_escape_htmltag($search_project_ref).'">';
 	print '</td>';
 }
 
@@ -657,7 +655,9 @@ while ($i < min($num, $limit)) {
 	// Type
 	if (!empty($arrayfields['cs.fk_mode_reglement']['checked'])) {
 		print '<td>';
-		if (!empty($obj->payment_code)) print $langs->trans("PaymentTypeShort".$obj->payment_code);
+		if (!empty($obj->payment_code)) {
+			print $langs->trans("PaymentTypeShort".$obj->payment_code);
+		}
 		print '</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;

From 22f6d204a241da914a79d2216ec88ea2205fc1bd Mon Sep 17 00:00:00 2001
From: lvessiller <lvessiller@open-dsi.fr>
Date: Thu, 13 Jan 2022 16:01:23 +0100
Subject: [PATCH 080/316] FIX search by user in supplier order list

---
 htdocs/fourn/commande/list.php | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 7b5fc220357..72333a60d23 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -501,7 +501,7 @@ $help_url = '';
 // llxHeader('',$title,$help_url);
 
 $sql = 'SELECT';
-if ($sall || $search_product_category > 0 || $search_user > 0) $sql = 'SELECT DISTINCT';
+if ($sall || $search_product_category > 0) $sql = 'SELECT DISTINCT';
 $sql .= ' s.rowid as socid, s.nom as name, s.town, s.zip, s.fk_pays, s.client, s.code_client, s.email,';
 $sql .= " typent.code as typent_code,";
 $sql .= " state.code_departement as state_code, state.nom as state_name,";
@@ -531,11 +531,6 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON cf.fk_user_author = u.rowid";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = cf.fk_projet";
 // We'll need this table joined to the select in order to filter by sale
 if ($search_sale > 0 || (!$user->rights->societe->client->voir && !$socid)) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-if ($search_user > 0)
-{
-	$sql .= ", ".MAIN_DB_PREFIX."element_contact as ec";
-	$sql .= ", ".MAIN_DB_PREFIX."c_type_contact as tc";
-}
 $sql .= ' WHERE cf.fk_soc = s.rowid';
 $sql .= ' AND cf.entity IN ('.getEntity('supplier_order').')';
 if ($socid > 0) $sql .= " AND s.rowid = ".$socid;
@@ -561,7 +556,15 @@ if ($search_country) $sql .= " AND s.fk_pays IN (".$db->escape($search_country).
 if ($search_type_thirdparty) $sql .= " AND s.fk_typent IN (".$db->escape($search_type_thirdparty).')';
 if ($search_company) $sql .= natural_search('s.nom', $search_company);
 if ($search_sale > 0) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$db->escape($search_sale);
-if ($search_user > 0) $sql .= " AND ec.fk_c_type_contact = tc.rowid AND tc.element='supplier_order' AND tc.source='internal' AND ec.element_id = cf.rowid AND ec.fk_socpeople = ".$db->escape($search_user);
+if ($search_user > 0) {
+	$sql .= " AND EXISTS (";
+	$sql .= " SELECT ec.rowid ";
+	$sql .= " FROM " . MAIN_DB_PREFIX . "element_contact as ec";
+	$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "c_type_contact as tc ON tc.rowid = ec.fk_c_type_contact";
+	$sql .= " WHERE ec.element_id = cf.rowid AND ec.fk_socpeople = " . $db->escape($search_user);
+	$sql .= " AND tc.element = 'order_supplier' AND tc.source = 'internal'";
+	$sql .= ")";
+}
 if ($search_total_ht != '') $sql .= natural_search('cf.total_ht', $search_total_ht, 1);
 if ($search_total_vat != '') $sql .= natural_search('cf.tva', $search_total_vat, 1);
 if ($search_total_ttc != '') $sql .= natural_search('cf.total_ttc', $search_total_ttc, 1);

From cacff0c2d4565aa2a308b7b83148bf85121ce744 Mon Sep 17 00:00:00 2001
From: lvessiller <lvessiller@open-dsi.fr>
Date: Thu, 13 Jan 2022 16:18:57 +0100
Subject: [PATCH 081/316] FIX cast int for search user

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

diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 72333a60d23..4b2d08f18d8 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -561,7 +561,7 @@ if ($search_user > 0) {
 	$sql .= " SELECT ec.rowid ";
 	$sql .= " FROM " . MAIN_DB_PREFIX . "element_contact as ec";
 	$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "c_type_contact as tc ON tc.rowid = ec.fk_c_type_contact";
-	$sql .= " WHERE ec.element_id = cf.rowid AND ec.fk_socpeople = " . $db->escape($search_user);
+	$sql .= " WHERE ec.element_id = cf.rowid AND ec.fk_socpeople = " . ((int) $search_user);
 	$sql .= " AND tc.element = 'order_supplier' AND tc.source = 'internal'";
 	$sql .= ")";
 }

From 4fe3650736152ca740ede86b69b740582b20d026 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 13 Jan 2022 18:34:15 +0100
Subject: [PATCH 082/316] Fix #hunterf1d1ce3e-ca92-4c7b-b1b8-934e28eaa486

---
 htdocs/compta/sociales/list.php |  2 +-
 test/phpunit/CodingPhpTest.php  | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/htdocs/compta/sociales/list.php b/htdocs/compta/sociales/list.php
index 53f293704cf..8d63e52256e 100644
--- a/htdocs/compta/sociales/list.php
+++ b/htdocs/compta/sociales/list.php
@@ -229,7 +229,7 @@ if (!empty($conf->projet->enabled)) {
 	}
 }
 if (!empty($search_users)) {
-	$sql .= ' AND cs.fk_user IN('.implode(', ', $search_users).')';
+	$sql .= ' AND cs.fk_user IN ('.$db->sanitize(implode(', ', $search_users)).')';
 }
 if (!empty($search_type) && $search_type > 0) {
 	$sql .= ' AND cs.fk_mode_reglement='.((int) $search_type);
diff --git a/test/phpunit/CodingPhpTest.php b/test/phpunit/CodingPhpTest.php
index d24a661a795..597aad1024c 100644
--- a/test/phpunit/CodingPhpTest.php
+++ b/test/phpunit/CodingPhpTest.php
@@ -392,11 +392,12 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
 
 			// Checks with IN
 
-			// Check string 'IN (".xxx' or 'IN (\'.xxx'  with xxx that is not '$this->db->sanitize' and not '$db->sanitize'. It means we forget a db->sanitize when forging sql request.
+			// Check string ' IN (".xxx' or ' IN (\'.xxx'  with xxx that is not '$this->db->sanitize' and not '$db->sanitize'. It means we forget a db->sanitize when forging sql request.
 			$ok=true;
 			$matches=array();
-			preg_match_all('/ IN \([\'"]\s*\.\s*(.........)/i', $filecontent, $matches, PREG_SET_ORDER);
+			preg_match_all('/\s+IN\s*\([\'"]\s*\.\s*(.........)/i', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
+				//var_dump($val);
 				if (!in_array($val[1], array('$db->sani', '$this->db', 'getEntity', 'WON\',\'L', 'self::STA', 'Commande:', 'CommandeF', 'Entrepot:', 'Facture::', 'FactureFo', 'ExpenseRe', 'Societe::', 'Ticket::S'))) {
 					$ok=false;
 					break;
@@ -407,11 +408,12 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
 			$this->assertTrue($ok, 'Found non sanitized string in building of a IN or NOT IN sql request '.$file['relativename'].' - Bad.');
 			//exit;
 
-			// Check string 'IN (\'".xxx'   with xxx that is not '$this->db->sanitize' and not '$db->sanitize'. It means we forget a db->sanitize when forging sql request.
+			// Check string ' IN (\'".xxx'   with xxx that is not '$this->db->sanitize' and not '$db->sanitize'. It means we forget a db->sanitize when forging sql request.
 			$ok=true;
 			$matches=array();
-			preg_match_all('/ IN \(\'"\s*\.\s*(.........)/i', $filecontent, $matches, PREG_SET_ORDER);
+			preg_match_all('/\s+IN\s*\(\'"\s*\.\s*(.........)/i', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
+				//var_dump($val);
 				if (!in_array($val[1], array('$db->sani', '$this->db', 'getEntity', 'WON\',\'L', 'self::STA', 'Commande:', 'CommandeF', 'Entrepot:', 'Facture::', 'FactureFo', 'ExpenseRe', 'Societe::', 'Ticket::S'))) {
 					$ok=false;
 					break;

From b9b45fb50618aa8053961f50bc8604b188d0ea79 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 13 Jan 2022 18:34:15 +0100
Subject: [PATCH 083/316] Fix #hunterf1d1ce3e-ca92-4c7b-b1b8-934e28eaa486

Conflicts:
	test/phpunit/CodingPhpTest.php
---
 htdocs/compta/sociales/list.php |  2 +-
 test/phpunit/CodingPhpTest.php  | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/htdocs/compta/sociales/list.php b/htdocs/compta/sociales/list.php
index ce379774e0a..578c7650846 100644
--- a/htdocs/compta/sociales/list.php
+++ b/htdocs/compta/sociales/list.php
@@ -206,7 +206,7 @@ if (!empty($conf->projet->enabled)) {
 	}
 }
 if (!empty($search_users)) {
-	$sql .= ' AND cs.fk_user IN('.implode(', ', $search_users).')';
+	$sql .= ' AND cs.fk_user IN ('.$db->sanitize(implode(', ', $search_users)).')';
 }
 if (!empty($search_type) && $search_type > 0) {
 	$sql .= ' AND cs.fk_mode_reglement='.$search_type;
diff --git a/test/phpunit/CodingPhpTest.php b/test/phpunit/CodingPhpTest.php
index 9c00cb300c7..723f3853ad7 100644
--- a/test/phpunit/CodingPhpTest.php
+++ b/test/phpunit/CodingPhpTest.php
@@ -328,9 +328,14 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
 			$this->assertTrue($ok, 'Found non escaped string in building of a sql request '.$file['relativename'].': '.$val[0].' - Bad.');
 			//exit;
 
-			// Check string 'IN (".xxx' or 'IN (\'.xxx'  with xxx that is not '$this->db->sanitize' and not '$db->sanitize'. It means we forget a db->sanitize when forging sql request.
-			preg_match_all('/ IN \([\'"]\s*\.\s*(.........)/i', $filecontent, $matches, PREG_SET_ORDER);
+			// Checks with IN
+
+			// Check string ' IN (".xxx' or ' IN (\'.xxx'  with xxx that is not '$this->db->sanitize' and not '$db->sanitize'. It means we forget a db->sanitize when forging sql request.
+			$ok=true;
+			$matches=array();
+			preg_match_all('/\s+IN\s*\([\'"]\s*\.\s*(.........)/i', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
+				//var_dump($val);
 				if (!in_array($val[1], array('$db->sani', '$this->db', 'getEntity', 'WON\',\'L', 'self::STA', 'Commande:', 'CommandeF', 'Entrepot:', 'Facture::', 'FactureFo', 'ExpenseRe', 'Societe::', 'Ticket::S'))) {
 					$ok=false;
 					break;
@@ -341,9 +346,12 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
 			$this->assertTrue($ok, 'Found non sanitized string in building of a IN or NOT IN sql request '.$file['relativename'].' - Bad.');
 			//exit;
 
-			// Check string 'IN (\'".xxx'   with xxx that is not '$this->db->sanitize' and not '$db->sanitize'. It means we forget a db->sanitize when forging sql request.
-			preg_match_all('/ IN \(\'"\s*\.\s*(.........)/i', $filecontent, $matches, PREG_SET_ORDER);
+			// Check string ' IN (\'".xxx'   with xxx that is not '$this->db->sanitize' and not '$db->sanitize'. It means we forget a db->sanitize when forging sql request.
+			$ok=true;
+			$matches=array();
+			preg_match_all('/\s+IN\s*\(\'"\s*\.\s*(.........)/i', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
+				//var_dump($val);
 				if (!in_array($val[1], array('$db->sani', '$this->db', 'getEntity', 'WON\',\'L', 'self::STA', 'Commande:', 'CommandeF', 'Entrepot:', 'Facture::', 'FactureFo', 'ExpenseRe', 'Societe::', 'Ticket::S'))) {
 					$ok=false;
 					break;

From b82b89d5196d5e4dde231a42fa606147c0b733d9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 13 Jan 2022 18:54:46 +0100
Subject: [PATCH 084/316] Prepare 15.0

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

diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index cc9e50ca52f..3b21a9bbf37 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -34,7 +34,7 @@ if (!defined('DOL_APPLICATION_TITLE')) {
 	define('DOL_APPLICATION_TITLE', 'Dolibarr');
 }
 if (!defined('DOL_VERSION')) {
-	define('DOL_VERSION', '15.0.0-beta'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
+	define('DOL_VERSION', '15.0.0'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
 }
 
 if (!defined('EURO')) {

From f35fee00813c91c0110297f59aec62637fea6483 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 13 Jan 2022 18:55:49 +0100
Subject: [PATCH 085/316] Prepare 16 dev

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

diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index cc9e50ca52f..e14322a62e9 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -34,7 +34,7 @@ if (!defined('DOL_APPLICATION_TITLE')) {
 	define('DOL_APPLICATION_TITLE', 'Dolibarr');
 }
 if (!defined('DOL_VERSION')) {
-	define('DOL_VERSION', '15.0.0-beta'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
+	define('DOL_VERSION', '16.0.0-alpha'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
 }
 
 if (!defined('EURO')) {

From 7ccb1c94a15ec94d1cae77b78c9929dcba6ec725 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 13 Jan 2022 19:07:05 +0100
Subject: [PATCH 086/316] Fix var not defined

---
 htdocs/api/class/api_setup.class.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php
index d169c8220ec..15a29c0e18b 100644
--- a/htdocs/api/class/api_setup.class.php
+++ b/htdocs/api/class/api_setup.class.php
@@ -1734,6 +1734,8 @@ class Setup extends DolibarrApi
 	{
 		$list = array();
 
+		$limit = 0;
+
 		$sql = "SELECT e.rowid, e.rowid as ref, e.label, e.address, e.zip, e.town, e.status";
 		$sql .= " FROM ".MAIN_DB_PREFIX."establishment as e";
 		$sql .= " WHERE e.entity IN (".getEntity('establishment').')';

From b6dc7a3f19b91be60a069d485874cd6290666ece Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 13 Jan 2022 19:09:34 +0100
Subject: [PATCH 087/316] Doc

---
 htdocs/accountancy/class/accountingaccount.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php
index a42439b1597..eea1814a708 100644
--- a/htdocs/accountancy/class/accountingaccount.class.php
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@@ -29,6 +29,7 @@
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+
 /**
  * Class to manage accounting accounts
  */
@@ -566,7 +567,7 @@ class AccountingAccount extends CommonObject
 	/**
 	 * Information on record
 	 *
-	 * @param int $id of record
+	 * @param int 	$id 	ID of record
 	 * @return void
 	 */
 	public function info($id)

From dbc2631d6a262250d39b67bd87f44720d56b76dd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 13 Jan 2022 19:19:36 +0100
Subject: [PATCH 088/316] Fix scrutinizer warnings

---
 htdocs/asset/class/asset_type.class.php       |  6 +-----
 htdocs/compta/facture/class/facture.class.php | 21 +++++++++++--------
 .../mailmanspip/class/mailmanspip.class.php   |  4 ++--
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/htdocs/asset/class/asset_type.class.php b/htdocs/asset/class/asset_type.class.php
index 75b3030eac9..be8643e3f20 100644
--- a/htdocs/asset/class/asset_type.class.php
+++ b/htdocs/asset/class/asset_type.class.php
@@ -359,11 +359,7 @@ class AssetType extends CommonObject
 				if (!array_key_exists($obj->rowid, $ret)) {
 					if ($mode < 2) {
 						$assetstatic = new Asset($this->db);
-						if ($mode == 1) {
-							$assetstatic->fetch($obj->rowid, '', '', '', false, false);
-						} else {
-							$assetstatic->fetch($obj->rowid);
-						}
+						$assetstatic->fetch($obj->rowid);
 						$ret[$obj->rowid] = $assetstatic;
 					} else {
 						$ret[$obj->rowid] = $obj->rowid;
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index ea3b7fb6d01..74d08ddef2a 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -5689,22 +5689,25 @@ class FactureLigne extends CommonInvoiceLine
 	}
 
 	/**
-	 * 	Delete line in database
-	 *  TODO Add param User $user and notrigger (see skeleton)
+	 * Delete line in database
 	 *
-	 *	@return	    int		           <0 if KO, >0 if OK
+	 * @param 	User 	$tmpuser    User that deletes
+	 * @param 	bool 	$notrigger  false=launch triggers after, true=disable triggers
+	 * @return 	int		           	<0 if KO, >0 if OK
 	 */
-	public function delete()
+	public function delete($tmpuser = null, $notrigger = false)
 	{
 		global $user;
 
 		$this->db->begin();
 
 		// Call trigger
-		$result = $this->call_trigger('LINEBILL_DELETE', $user);
-		if ($result < 0) {
-			$this->db->rollback();
-			return -1;
+		if (empty($notrigger)) {
+			$result = $this->call_trigger('LINEBILL_DELETE', $user);
+			if ($result < 0) {
+				$this->db->rollback();
+				return -1;
+			}
 		}
 		// End call triggers
 
@@ -5716,7 +5719,7 @@ class FactureLigne extends CommonInvoiceLine
 		}
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."facturedet WHERE rowid = ".((int) $this->rowid);
-		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+
 		if ($this->db->query($sql)) {
 			$this->db->commit();
 			return 1;
diff --git a/htdocs/mailmanspip/class/mailmanspip.class.php b/htdocs/mailmanspip/class/mailmanspip.class.php
index c5ce2292f6a..1f7e8ea6214 100644
--- a/htdocs/mailmanspip/class/mailmanspip.class.php
+++ b/htdocs/mailmanspip/class/mailmanspip.class.php
@@ -278,11 +278,11 @@ class MailmanSpip
 					if ($result) {
 						if ($mydb->num_rows($result)) {
 							// nous avons au moins une reponse
-							$mydb->close($result);
+							$mydb->close();
 							return 1;
 						} else {
 							// nous n'avons pas de reponse => n'existe pas
-							$mydb->close($result);
+							$mydb->close();
 							return 0;
 						}
 					} else {

From 3aea037889559923f73369700437d2e2f6955a97 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 13 Jan 2022 19:41:52 +0100
Subject: [PATCH 089/316] FIX Debug level 3 of accounting account was using
 wront field

---
 .../thirdparty_lettering_customer.php          |  2 +-
 .../class/accountingaccount.class.php          |  4 ++--
 htdocs/accountancy/customer/index.php          |  6 +++---
 htdocs/accountancy/customer/list.php           |  3 ++-
 htdocs/societe/class/societe.class.php         | 18 ++++++++++++++----
 5 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php b/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
index 1ed29cfea27..a563b653ac1 100644
--- a/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
+++ b/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
@@ -157,7 +157,7 @@ $sql = "SELECT bk.rowid, bk.doc_date, bk.doc_type, bk.doc_ref, ";
 $sql .= " bk.subledger_account, bk.numero_compte , bk.label_compte, bk.debit, ";
 $sql .= " bk.credit, bk.montant, bk.sens, bk.code_journal, bk.piece_num, bk.lettering_code";
 $sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as bk";
-$sql .= " WHERE (bk.subledger_account =  '".$db->escape($object->code_compta)."' AND bk.numero_compte = '".$db->escape($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER)."' )";
+$sql .= " WHERE (bk.subledger_account = '".$db->escape($object->code_compta)."' AND bk.numero_compte = '".$db->escape($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER)."' )";
 
 /*
 if (dol_strlen($search_date_start) || dol_strlen($search_date_end)) {
diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php
index eea1814a708..a4dcac8c1ad 100644
--- a/htdocs/accountancy/class/accountingaccount.class.php
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@@ -851,8 +851,8 @@ class AccountingAccount extends CommonObject
 
 			// Level 3 (define $code_t): Search suggested account for this thirdparty (similar code exists in page index.php to make automatic binding)
 			if (!empty($conf->global->ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY)) {
-				if (!empty($buyer->code_compta)) {
-					$code_t = $buyer->code_compta;
+				if (!empty($buyer->code_compta_product)) {
+					$code_t = $buyer->code_compta_product;
 					$suggestedid = $accountingAccount['thirdparty'];
 					$suggestedaccountingaccountfor = 'thridparty';
 				}
diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index b7ec854fd7c..7ce226f99d8 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -153,9 +153,9 @@ if ($action == 'validatehistory') {
 	$sql .= " co.code as country_code, co.label as country_label,";
 	$sql .= " s.tva_intra,";
 	if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
-		$sql .= " spe.accountancy_code_sell as company_code_sell";
+		$sql .= " spe.accountancy_code_sell as company_code_sell";	// accounting code for product but stored on thirdparty
 	} else {
-		$sql .= " s.accountancy_code_sell as company_code_sell";
+		$sql .= " s.accountancy_code_sell as company_code_sell";	// accounting code for product but stored on thirdparty
 	}
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
 	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
@@ -215,7 +215,7 @@ if ($action == 'validatehistory') {
 			$thirdpartystatic->email = $objp->email;
 			$thirdpartystatic->country_code = $objp->country_code;
 			$thirdpartystatic->tva_intra = $objp->tva_intra;
-			$thirdpartystatic->code_compta = $objp->company_code_sell;
+			$thirdpartystatic->code_compta_product = $objp->company_code_sell;		// The accounting account for product stored on thirdparty object (for level3 suggestion)
 
 			$product_static->ref = $objp->product_ref;
 			$product_static->id = $objp->product_id;
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index 582877d3599..56f904e79ef 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -539,13 +539,14 @@ if ($result) {
 		$thirdpartystatic->client = $objp->client;
 		$thirdpartystatic->fournisseur = $objp->fournisseur;
 		$thirdpartystatic->code_client = $objp->code_client;
+		$thirdpartystatic->code_compta = $objp->code_compta_client;		// For backward compatibility
 		$thirdpartystatic->code_compta_client = $objp->code_compta_client;
 		$thirdpartystatic->code_fournisseur = $objp->code_fournisseur;
 		$thirdpartystatic->code_compta_fournisseur = $objp->code_compta_fournisseur;
 		$thirdpartystatic->email = $objp->email;
 		$thirdpartystatic->country_code = $objp->country_code;
 		$thirdpartystatic->tva_intra = $objp->tva_intra;
-		$thirdpartystatic->code_compta_company = $objp->company_code_sell;
+		$thirdpartystatic->code_compta_product = $objp->company_code_sell;		// The accounting account for product stored on thirdparty object (for level3 suggestion)
 
 		$product_static->ref = $objp->product_ref;
 		$product_static->id = $objp->product_id;
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 315bdb9af13..7490fca0265 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -554,13 +554,14 @@ class Societe extends CommonObject
 	 * Accounting code for client
 	 * @var string
 	 */
-	public $code_compta;
+	public $code_compta_client;
 
 	/**
-	 * Accounting code for client
+	 * Duplicate of code_compta_client (for backward compatibility)
 	 * @var string
 	 */
-	public $code_compta_client;
+	public $code_compta;
+
 
 	/**
 	 * Accounting code for customer
@@ -580,6 +581,14 @@ class Societe extends CommonObject
 	 */
 	public $accountancy_code_supplier;
 
+
+	/**
+	 * Accounting code for product (for level 3 of suggestion of prouct accounting account)
+	 * @var string
+	 */
+	public $code_compta_product;
+
+
 	/**
 	 * @var string
 	 * @deprecated Note is split in public and private notes
@@ -1822,7 +1831,8 @@ class Societe extends CommonObject
 				$this->code_client = $obj->code_client;
 				$this->code_fournisseur = $obj->code_fournisseur;
 
-				$this->code_compta = $obj->code_compta;
+				$this->code_compta = $obj->code_compta;			// For backward compatibility
+				$this->code_compta_client = $obj->code_compta;
 				$this->code_compta_fournisseur = $obj->code_compta_fournisseur;
 
 				$this->barcode = $obj->barcode;

From 965703e04af4361c11cacefff40fde6196c33800 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 13 Jan 2022 20:09:40 +0100
Subject: [PATCH 090/316] Fix missing var

---
 htdocs/accountancy/class/bookkeeping.class.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 42fb42b89fa..97f7b98b3b1 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -2114,15 +2114,26 @@ class BookKeepingLine
 	public $montant;
 
 	/**
-	 * @var float Amount
+	 * @var float 	Amount
 	 */
 	public $amount;
 
+	/**
+	 * @var float 	Multicurrency amount
+	 */
+	public $multicurrency_amount;
+
+	/**
+	 * @var float 	Multicurrency code
+	 */
+	public $multicurrency_code;
+
 	/**
 	 * @var string Sens
 	 */
 	public $sens;
 	public $lettering_code;
+	public $date_lettering;
 
 	/**
 	 * @var int ID

From fccddd78054b3d0dcc1f93dd1ddf2699eecb1ec5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 13 Jan 2022 20:11:18 +0100
Subject: [PATCH 091/316] Fix property missing

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

diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 97f7b98b3b1..e96cf9e0997 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -2164,4 +2164,9 @@ class BookKeepingLine
 	 * @var integer|string $date_validation;
 	 */
 	public $date_validation;
+
+	/**
+	 * @var integer|string $date_lim_reglement;
+	 */
+	public $date_lim_reglement;
 }

From cb45f79ab07a155ab24f03a1d6ba8c3f44792431 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 13 Jan 2022 20:16:12 +0100
Subject: [PATCH 092/316] Fix scrutinizer

---
 htdocs/accountancy/supplier/index.php              | 4 ++--
 htdocs/accountancy/supplier/list.php               | 2 +-
 htdocs/bom/lib/bom.lib.php                         | 2 +-
 htdocs/modulebuilder/template/lib/mymodule.lib.php | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php
index 51c9e66cebe..70434a470f1 100644
--- a/htdocs/accountancy/supplier/index.php
+++ b/htdocs/accountancy/supplier/index.php
@@ -211,7 +211,7 @@ if ($action == 'validatehistory') {
 			$thirdpartystatic->email = $objp->email;
 			$thirdpartystatic->country_code = $objp->country_code;
 			$thirdpartystatic->tva_intra = $objp->tva_intra;
-			$thirdpartystatic->code_compta = $objp->company_code_sell;
+			$thirdpartystatic->code_compta_product = $objp->company_code_buy;		// The accounting account for product stored on thirdparty object (for level3 suggestion)
 
 			$product_static->ref = $objp->product_ref;
 			$product_static->id = $objp->product_id;
@@ -230,7 +230,7 @@ if ($action == 'validatehistory') {
 			$facture_static->ref = $objp->ref;
 			$facture_static->id = $objp->facid;
 			$facture_static->type = $objp->ftype;
-			$facture_static->datef = $objp->datef;
+			$facture_static->date = $objp->datef;
 
 			$facture_static_det->id = $objp->rowid;
 			$facture_static_det->total_ht = $objp->total_ht;
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index f88c1dd8ccc..6364ce914c6 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -547,7 +547,7 @@ if ($result) {
 		$thirdpartystatic->email = $objp->email;
 		$thirdpartystatic->country_code = $objp->country_code;
 		$thirdpartystatic->tva_intra = $objp->tva_intra;
-		$thirdpartystatic->code_compta_company = $objp->company_code_buy;
+		$thirdpartystatic->code_compta_product = $objp->company_code_buy;		// The accounting account for product stored on thirdparty object (for level3 suggestion)
 
 		$product_static->ref = $objp->product_ref;
 		$product_static->id = $objp->product_id;
diff --git a/htdocs/bom/lib/bom.lib.php b/htdocs/bom/lib/bom.lib.php
index edd9bd69ef4..805ba304c1d 100644
--- a/htdocs/bom/lib/bom.lib.php
+++ b/htdocs/bom/lib/bom.lib.php
@@ -56,7 +56,7 @@ function bomAdminPrepareHead()
 	//); // to remove a tab
 	complete_head_from_modules($conf, $langs, null, $head, $h, 'bom@mrp');
 
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'bom@mrp', 'remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'bom@mrp', 'remove');
 
 	return $head;
 }
diff --git a/htdocs/modulebuilder/template/lib/mymodule.lib.php b/htdocs/modulebuilder/template/lib/mymodule.lib.php
index 32ae980e946..ab8a647efe4 100644
--- a/htdocs/modulebuilder/template/lib/mymodule.lib.php
+++ b/htdocs/modulebuilder/template/lib/mymodule.lib.php
@@ -62,7 +62,7 @@ function mymoduleAdminPrepareHead()
 	//); // to remove a tab
 	complete_head_from_modules($conf, $langs, null, $head, $h, 'mymodule@mymodule');
 
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'mymodule@mymodule', 'remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'mymodule@mymodule', 'remove');
 
 	return $head;
 }

From f51554fd4d91b9fd7d99bd719706601ff6eed27c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 13 Jan 2022 20:40:42 +0100
Subject: [PATCH 093/316] Fix missing token

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

diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php
index bfef8844ce5..9b3f9a27140 100644
--- a/htdocs/comm/action/rapport/index.php
+++ b/htdocs/comm/action/rapport/index.php
@@ -163,7 +163,7 @@ if ($resql) {
 
 			// Button to build doc
 			print '<td class="center">';
-			print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=builddoc&page='.((int) $page).'&month='.((int) $obj->month).'&year='.((int) $obj->year).'">'.img_picto($langs->trans('BuildDoc'), 'filenew').'</a>';
+			print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=builddoc&token='.newToken().'&page='.((int) $page).'&month='.((int) $obj->month).'&year='.((int) $obj->year).'">'.img_picto($langs->trans('BuildDoc'), 'filenew').'</a>';
 			print '</td>';
 
 			$name = "actions-".$obj->month."-".$obj->year.".pdf";

From 6d1f5e1ef1b457663006be98a140cce77ddf6876 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Thu, 13 Jan 2022 22:29:48 +0100
Subject: [PATCH 094/316] NEW Add possibility to create contract from invoice

---
 htdocs/compta/facture/card.php | 12 ++++++++++++
 htdocs/contrat/card.php        | 15 +++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 99bf843f50b..5d567cd7282 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -128,6 +128,7 @@ $usercanread = $user->rights->facture->lire;
 $usercancreate = $user->rights->facture->creer;
 $usercanissuepayment = $user->rights->facture->paiement;
 $usercandelete = $user->rights->facture->supprimer;
+$usercancreatecontract = $user->rights->contrat->creer;
 $usercanvalidate = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $usercancreate) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->facture->invoice_advance->validate)));
 $usercansend = (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->facture->invoice_advance->send)));
 $usercanreopen = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $usercancreate) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->facture->invoice_advance->reopen)));
@@ -5325,6 +5326,17 @@ if ($action == 'create') {
 				}
 			}
 
+			// Create contract
+			if (!empty($conf->global->CONTRACT_CREATE_FROM_INVOICE)) {
+				if ($conf->contrat->enabled && $object->statut == Facture::STATUS_VALIDATED) {
+					$langs->load("contracts");
+
+					if ($usercancreatecontract) {
+						print '<a class="butAction" href="' . DOL_URL_ROOT . '/contrat/card.php?action=create&amp;origin=' . $object->element . '&amp;originid=' . $object->id . '&amp;socid=' . $object->socid . '">' . $langs->trans('AddContract') . '</a>';
+					}
+				}
+			}
+
 			// Validate
 			if ($object->statut == Facture::STATUS_DRAFT && count($object->lines) > 0 && ((($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_REPLACEMENT || $object->type == Facture::TYPE_DEPOSIT || $object->type == Facture::TYPE_PROFORMA || $object->type == Facture::TYPE_SITUATION) && (!empty($conf->global->FACTURE_ENABLE_NEGATIVE) || $object->total_ttc >= 0)) || ($object->type == Facture::TYPE_CREDIT_NOTE && $object->total_ttc <= 0))) {
 				if ($usercanvalidate) {
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index f77b59a1f49..22047984d34 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -40,6 +40,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/contract/modules_contract.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+if (!empty($conf->facture->enabled) && !empty($conf->global->CONTRACT_CREATE_FROM_INVOICE)) {
+	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+}
 if (!empty($conf->propal->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 }
@@ -248,6 +251,12 @@ if (empty($reshook)) {
 				if ($element == 'propal') {
 					$element = 'comm/propal'; $subelement = 'propal';
 				}
+				if (!empty($conf->global->CONTRACT_CREATE_FROM_INVOICE)) {
+					if ($element == 'invoice' || $element == 'facture') {
+						$element = 'compta/facture';
+						$subelement = 'facture';
+					}
+				}
 
 				$object->origin    = $origin;
 				$object->origin_id = $originid;
@@ -1038,6 +1047,12 @@ if ($action == 'create') {
 			if ($element == 'propal') {
 				$element = 'comm/propal'; $subelement = 'propal';
 			}
+			if (!empty($conf->global->CONTRACT_CREATE_FROM_INVOICE)) {
+				if ($element == 'invoice' || $element == 'facture') {
+					$element = 'compta/facture';
+					$subelement = 'facture';
+				}
+			}
 
 			dol_include_once('/'.$element.'/class/'.$subelement.'.class.php');
 

From e53d9d4320599db356887235440b168e427ff3d0 Mon Sep 17 00:00:00 2001
From: dolibarr95 <24292300+dolibarr95@users.noreply.github.com>
Date: Fri, 14 Jan 2022 08:52:04 +0100
Subject: [PATCH 095/316] Update extrafields.class.php

fix #19739
---
 htdocs/core/class/extrafields.class.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 184b97a3c98..0e23863f1a9 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1947,10 +1947,6 @@ class ExtraFields
 				if (!empty($onlykey) && $onlykey != '@GETPOSTISSET' && $key != $onlykey) {
 					continue;
 				}
-				if (!empty($onlykey) && $onlykey == '@GETPOSTISSET' && !GETPOSTISSET('options_'.$key) && $this->attributes[$object->table_element]['type'][$key] != 'boolean') {
-					//when unticking boolean field, it's not set in POST
-					continue;
-				}
 
 				$key_type = $this->attributes[$object->table_element]['type'][$key];
 				if ($key_type == 'separate') {

From b29438167e2b5958f06eb27af5a0f8f57f5c7fca Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 14 Jan 2022 09:29:16 +0100
Subject: [PATCH 096/316] Changlog

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

diff --git a/ChangeLog b/ChangeLog
index 8c52db8af69..a8211da486a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -138,6 +138,8 @@ NEW: Hidden option API_DISABLE_COMPRESSION is now visible in API setup page.
 NEW: Add hook printUnderHeaderPDFline on invoice PDF templates (can be used for example to add a barcode or more information on header of invoices).
  
 Following changes may create regressions for some external modules, but were necessary to make Dolibarr better:
+* ALL EXTERNAL MODULES THAT WERE NOT CORRECTLY DEVELOPPED WILL NOT WORK ON V15 (All modules that forgot to manage the security token field 
+  into forms will be broken. The security token field is expected since Dolibarr v9 but a lot of external modules did not implement it).
 * Update hook 'printOriginObjectLine', removed check on product type and special code. Need now reshook.
 * Old deprecated module "SimplePOS" has been completely removed. Use module "TakePOS" is you need a Point Of Sale.
 * The method static ActionComm::getActions($db, ...) is no more static. Use $actioncomm->getActions(...) instead (without $db param). 

From b7aa152464bf19658dad51646300b6af15631357 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 14 Jan 2022 09:55:13 +0100
Subject: [PATCH 097/316] Fix trans

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

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index dbc5841e433..94e21f076e3 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -962,15 +962,11 @@ Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu

From 5b3fcc5e43979b1b0789bf81fb8f1b2b59c93056 Mon Sep 17 00:00:00 2001
From: dolibarr95 <24292300+dolibarr95@users.noreply.github.com>
Date: Fri, 14 Jan 2022 10:10:10 +0100
Subject: [PATCH 098/316] Update extrafields.class.php

---
 htdocs/core/class/extrafields.class.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 0e23863f1a9..cb5d60d3066 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1947,6 +1947,10 @@ class ExtraFields
 				if (!empty($onlykey) && $onlykey != '@GETPOSTISSET' && $key != $onlykey) {
 					continue;
 				}
+				
+				if (!empty($onlykey) && $onlykey == '@GETPOSTISSET' && !GETPOSTISSET('options_'.$key) && (! in_array($this->attributes[$object->table_element]['type'][$key], array('boolean', 'chkbxlst')))) {
+					continue;
+				}
 
 				$key_type = $this->attributes[$object->table_element]['type'][$key];
 				if ($key_type == 'separate') {

From 2b64f69def6ae515346c4df2b32495c18433578b Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Fri, 14 Jan 2022 09:12:30 +0000
Subject: [PATCH 099/316] Fixing style errors.

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

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index cb5d60d3066..4c0ec1ff5a5 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1947,7 +1947,7 @@ class ExtraFields
 				if (!empty($onlykey) && $onlykey != '@GETPOSTISSET' && $key != $onlykey) {
 					continue;
 				}
-				
+
 				if (!empty($onlykey) && $onlykey == '@GETPOSTISSET' && !GETPOSTISSET('options_'.$key) && (! in_array($this->attributes[$object->table_element]['type'][$key], array('boolean', 'chkbxlst')))) {
 					continue;
 				}

From 5881e36ba661ec09903d2a3448992e12884e646a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 14 Jan 2022 10:15:46 +0100
Subject: [PATCH 100/316] Code comment

---
 htdocs/main.inc.php   | 2 +-
 htdocs/master.inc.php | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 56f1ce83a72..028ed31a618 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -246,7 +246,7 @@ if (!empty($_SERVER['DOCUMENT_ROOT']) && substr($_SERVER['DOCUMENT_ROOT'], -6) !
 }
 
 
-// Include the conf.php and functions.lib.php. This defined the constants like DOL_DOCUMENT_ROOT, DOL_DATA_ROOT, DOL_URL_ROOT...
+// Include the conf.php and functions.lib.php and security.lib.php. This defined the constants like DOL_DOCUMENT_ROOT, DOL_DATA_ROOT, DOL_URL_ROOT...
 require_once 'filefunc.inc.php';
 
 // If there is a POST parameter to tell to save automatically some POST parameters into cookies, we do it.
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 7a92402224b..aa836842e71 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -32,7 +32,8 @@
  * 				This script reads the conf file, init $lang, $db and and empty $user
  */
 
-// Declaration of variables. May have been already require by main.inc.php. But may not by scripts. So, here the require_once must be kept.
+// Include the conf.php and functions.lib.php and security.lib.php. This defined the constants like DOL_DOCUMENT_ROOT, DOL_DATA_ROOT, DOL_URL_ROOT...
+// This file may have been already required by main.inc.php. But may not by scripts. So, here the require_once must be kept.
 require_once 'filefunc.inc.php';
 
 

From 02fc420c2ab3abb411f645773ea9b29141370877 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 14 Jan 2022 11:37:13 +0100
Subject: [PATCH 101/316] FIX #19817

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

diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 8e1e447ee53..448677002df 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -240,6 +240,7 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
 				if (empty($nocommentremoval)) {
 					$buf = preg_replace('/([,;ERLT\)])\s*--.*$/i', '\1', $buf); //remove comment from a line that not start with -- before add it to the buffer
 				}
+				if ($buffer) $buffer .= ' ';
 				$buffer .= trim($buf);
 			}
 

From 8ace96f495ff8650c495077d681a02c945bebc04 Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Fri, 14 Jan 2022 11:46:31 +0100
Subject: [PATCH 102/316] Fix validate class lang load and test for numeric
 values

---
 htdocs/core/class/commonobject.class.php |  2 +-
 htdocs/core/class/validate.class.php     | 22 ++++++++++++++++++----
 htdocs/langs/en_US/errors.lang           |  1 +
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 029ac6cbfc1..2d5ae6ca78b 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -7595,7 +7595,7 @@ abstract class CommonObject
 			} else { return true; }
 		} elseif (in_array($type, array('double', 'real', 'price'))) {
 			// is numeric
-			if (!$validate->isDuration($fieldValue)) {
+			if (!$validate->isNumeric($fieldValue)) {
 				$this->setFieldError($fieldKey, $validate->error);
 				return false;
 			} else { return true; }
diff --git a/htdocs/core/class/validate.class.php b/htdocs/core/class/validate.class.php
index 389bb708e82..4b500b0ae4c 100644
--- a/htdocs/core/class/validate.class.php
+++ b/htdocs/core/class/validate.class.php
@@ -55,18 +55,17 @@ class Validate
 	{
 		global $langs;
 
-		if ($outputLang) {
+		if (empty($outputLang)) {
 			$this->outputLang = $langs;
 		} else {
 			$this->outputLang = $outputLang;
 		}
 
-		if (!is_object($this->outputLang) || !method_exists($outputLang, 'load')) {
+		if (!is_object($this->outputLang) || !method_exists($this->outputLang, 'load')) {
 			return false;
 		}
 
-		/** @var Translate $outputLang */
-		$outputLang->load('validate');
+		$this->outputLang->loadLangs(array('validate', 'errors'));
 
 		$this->db = $db;
 	}
@@ -229,6 +228,21 @@ class Validate
 		return true;
 	}
 
+	/**
+	 * Check Duration validity
+	 *
+	 * @param mixed $string to validate
+	 * @return boolean Validity is ok or not
+	 */
+	public function isNumeric($string)
+	{
+		if (!is_numeric($string)) {
+			$this->error = $this->outputLang->trans('RequireValidNumeric');
+			return false;
+		}
+		return true;
+	}
+
 	/**
 	 * Check for boolean validity
 	 *
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 7f4ca7b074f..293bf4ad53b 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -315,6 +315,7 @@ RequireAtLeastXString = Requires at least %s character(s)
 RequireXStringMax = Requires %s character(s) max
 RequireAtLeastXDigits = Requires at least %s digit(s)
 RequireXDigitsMax = Requires %s digit(s) max
+RequireValidNumeric = Requires a numeric value
 RequireValidEmail = Email address is not valid
 RequireMaxLength = Length must be less than %s chars
 RequireMinLength = Length must be more than %s char(s)

From a394713f1bb8eda51d7a35c179bf3ee22683df79 Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Fri, 14 Jan 2022 11:51:07 +0100
Subject: [PATCH 103/316] Fix doc comment

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

diff --git a/htdocs/core/class/validate.class.php b/htdocs/core/class/validate.class.php
index 4b500b0ae4c..61251167c21 100644
--- a/htdocs/core/class/validate.class.php
+++ b/htdocs/core/class/validate.class.php
@@ -229,7 +229,7 @@ class Validate
 	}
 
 	/**
-	 * Check Duration validity
+	 * Check numeric validity
 	 *
 	 * @param mixed $string to validate
 	 * @return boolean Validity is ok or not

From f04a07b6a7940d2be8ffa87543be93a52b3c3ef6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 14 Jan 2022 13:42:38 +0100
Subject: [PATCH 104/316] FIX Pb with permission on holiday and expense report

---
 htdocs/expensereport/card.php    | 12 +++-
 htdocs/holiday/card.php          | 95 +++++++++++++++++---------------
 htdocs/holiday/document.php      | 17 ------
 htdocs/holiday/list.php          | 11 +++-
 htdocs/langs/en_US/admin.lang    | 11 ++--
 htdocs/user/class/user.class.php |  4 +-
 6 files changed, 78 insertions(+), 72 deletions(-)

diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 1be72b5b49b..240fdcfb73c 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -120,6 +120,14 @@ if ($object->id > 0) {
 	}
 }
 
+$candelete = 0;
+if (!empty($user->rights->expensereport->supprimer)) {
+	$candelete = 1;
+}
+if ($object->statut == ExpenseReport::STATUS_DRAFT && $user->rights->expensereport->write && in_array($object->fk_user_author, $childids)) {
+	$candelete = 1;
+}
+
 // Security check
 if ($user->socid) {
 	$socid = $user->socid;
@@ -195,7 +203,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	if ($action == 'confirm_delete' && GETPOST("confirm", 'alpha') == "yes" && $id > 0 && $user->rights->expensereport->supprimer) {
+	if ($action == 'confirm_delete' && GETPOST("confirm", 'alpha') == "yes" && $id > 0 && $candelete) {
 		$object = new ExpenseReport($db);
 		$result = $object->fetch($id);
 		$result = $object->delete($user);
@@ -2657,7 +2665,7 @@ if ($action != 'create' && $action != 'edit' && $action != 'editline') {
 	if ($user->rights->expensereport->creer && $user->id == $object->fk_user_author && $object->status < ExpenseReport::STATUS_APPROVED) {
 		// Delete
 		print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&id='.$object->id.'">'.$langs->trans('Delete').'</a></div>';
-	} elseif ($user->rights->expensereport->supprimer && $object->status != ExpenseReport::STATUS_CLOSED) {
+	} elseif ($candelete && $object->status != ExpenseReport::STATUS_CLOSED) {
 		// Delete
 		print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&id='.$object->id.'">'.$langs->trans('Delete').'</a></div>';
 	}
diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index 150a9c0754b..4566a81d202 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -90,13 +90,16 @@ if (($id > 0) || $ref) {
 $hookmanager->initHooks(array('holidaycard', 'globalcard'));
 
 $cancreate = 0;
-
-if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->holiday->writeall_advance)) {
-	$cancreate = 1;
-}
+$cancreateall = 0;
 if (!empty($user->rights->holiday->write) && in_array($fuserid, $childids)) {
 	$cancreate = 1;
 }
+// TODO Remove the writeall_advance and replace it with writeall
+if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->holiday->writeall))
+	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->holiday->writeall_advance))) {
+	$cancreate = 1;
+	$cancreateall = 1;
+}
 
 $candelete = 0;
 if (!empty($user->rights->holiday->delete)) {
@@ -166,23 +169,25 @@ if (empty($reshook)) {
 			$description = trim(GETPOST('description', 'restricthtml'));
 
 			// Check that leave is for a user inside the hierarchy or advanced permission for all is set
-			if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
-				if (empty($user->rights->holiday->write)) {
-					$error++;
-					setEventMessages($langs->trans("NotEnoughPermissions"), null, 'errors');
-				} elseif (!in_array($fuserid, $childids)) {
-					$error++;
-					setEventMessages($langs->trans("UserNotInHierachy"), null, 'errors');
-					$action = 'create';
-				}
-			} else {
-				if (empty($user->rights->holiday->write) && empty($user->rights->holiday->writeall_advance)) {
-					$error++;
-					setEventMessages($langs->trans("NotEnoughPermissions"), null, 'errors');
-				} elseif (empty($user->rights->holiday->writeall_advance) && !in_array($fuserid, $childids)) {
-					$error++;
-					setEventMessages($langs->trans("UserNotInHierachy"), null, 'errors');
-					$action = 'create';
+			if (!$cancreateall) {
+				if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
+					if (empty($user->rights->holiday->write)) {
+						$error++;
+						setEventMessages($langs->trans("NotEnoughPermissions"), null, 'errors');
+					} elseif (!in_array($fuserid, $childids)) {
+						$error++;
+						setEventMessages($langs->trans("UserNotInHierachy"), null, 'errors');
+						$action = 'create';
+					}
+				} else {
+					if (empty($user->rights->holiday->write) && empty($user->rights->holiday->writeall_advance)) {
+						$error++;
+						setEventMessages($langs->trans("NotEnoughPermissions"), null, 'errors');
+					} elseif (empty($user->rights->holiday->writeall_advance) && !in_array($fuserid, $childids)) {
+						$error++;
+						setEventMessages($langs->trans("UserNotInHierachy"), null, 'errors');
+						$action = 'create';
+					}
 				}
 			}
 
@@ -264,7 +269,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	// If update and we are an approver, we can update with another approver
+	// If this is an update and we are an approver, we can update to change the approver
 	if ($action == 'update' && GETPOSTISSET('savevalidator') && !empty($user->rights->holiday->approve)) {
 		$object->fetch($id);
 
@@ -304,10 +309,18 @@ if (empty($reshook)) {
 		}
 
 		// If no right to modify a request
-		if (!$user->rights->holiday->write) {
-			setEventMessages($langs->trans("CantUpdate"), null, 'errors');
-			header('Location: '.$_SERVER["PHP_SELF"].'?action=create');
-			exit;
+		if (!$cancreateall) {
+			if ($cancreate) {
+				if (!in_array($fuserid, $childids)) {
+					setEventMessages($langs->trans("UserNotInHierachy"), null, 'errors');
+					header('Location: '.$_SERVER["PHP_SELF"].'?action=create');
+					exit;
+				}
+			} else {
+				setEventMessages($langs->trans("NotEnoughPermissions"), null, 'errors');
+				header('Location: '.$_SERVER["PHP_SELF"].'?action=create');
+				exit;
+			}
 		}
 
 		$object->fetch($id);
@@ -322,13 +335,13 @@ if (empty($reshook)) {
 				$description = trim(GETPOST('description', 'restricthtml'));
 
 				// If no start date
-				if (empty($_POST['date_debut_'])) {
+				if (!GETPOST('date_debut_')) {
 					header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&error=nodatedebut');
 					exit;
 				}
 
 				// If no end date
-				if (empty($_POST['date_fin_'])) {
+				if (!GETPOST('date_fin_')) {
 					header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&error=nodatefin');
 					exit;
 				}
@@ -379,7 +392,7 @@ if (empty($reshook)) {
 	}
 
 	// If delete of request
-	if ($action == 'confirm_delete' && GETPOST('confirm') == 'yes' && $user->rights->holiday->delete) {
+	if ($action == 'confirm_delete' && GETPOST('confirm') == 'yes' && $candelete) {
 		$error = 0;
 
 		$db->begin();
@@ -388,14 +401,11 @@ if (empty($reshook)) {
 
 		// If this is a rough draft, approved, canceled or refused
 		if ($object->statut == Holiday::STATUS_DRAFT || $object->statut == Holiday::STATUS_CANCELED || $object->statut == Holiday::STATUS_REFUSED) {
-			// Si l'utilisateur à le droit de lire cette demande, il peut la supprimer
-			if ($candelete) {
-				$result = $object->delete($user);
-			} else {
-				$error++;
-				setEventMessages($langs->trans('ErrorCantDeleteCP'), null, 'errors');
-				$action = '';
-			}
+			$result = $object->delete($user);
+		} else {
+			$error++;
+			setEventMessages($langs->trans('BadStatusOfObject'), null, 'errors');
+			$action = '';
 		}
 
 		if (!$error) {
@@ -748,7 +758,7 @@ if (empty($reshook)) {
 
 		// If status pending validation and validator = validator or user, or rights to do for others
 		if (($object->statut == Holiday::STATUS_VALIDATED || $object->statut == Holiday::STATUS_APPROVED) &&
-			(!empty($user->admin) || $user->id == $object->fk_validator || in_array($object->fk_user, $childids) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->holiday->writeall_advance)))) {
+			(!empty($user->admin) || $user->id == $object->fk_validator || in_array($object->fk_user, $childids) || $cancreateall)) {
 			$db->begin();
 
 			$oldstatus = $object->statut;
@@ -981,12 +991,11 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 		print '<tr>';
 		print '<td class="titlefield fieldrequired">'.$langs->trans("User").'</td>';
 		print '<td>';
-
-		if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->holiday->writeall_advance)) {
+		if ($cancreate && !$cancreateall) {
 			print img_picto('', 'user').$form->select_dolusers(($fuserid ? $fuserid : $user->id), 'fuserid', 0, '', 0, 'hierarchyme', '', '0,'.$conf->entity, 0, 0, $morefilter, 0, '', 'minwidth200 maxwidth500');
 			//print '<input type="hidden" name="fuserid" value="'.($fuserid?$fuserid:$user->id).'">';
 		} else {
-			print img_picto('', 'user').$form->select_dolusers(GETPOST('fuserid', 'int') ? GETPOST('fuserid', 'int') : $user->id, 'fuserid', 0, '', 0, '', '', '0,'.$conf->entity, 0, 0, $morefilter, 0, '', 'minwidth200 maxwidth500');
+			print img_picto('', 'user').$form->select_dolusers($fuserid ? $fuserid : $user->id, 'fuserid', 0, '', 0, '', '', '0,'.$conf->entity, 0, 0, $morefilter, 0, '', 'minwidth200 maxwidth500');
 		}
 		print '</td>';
 		print '</tr>';
@@ -1467,9 +1476,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 						}
 					}
 					if ($object->statut == Holiday::STATUS_APPROVED) { // If validated or approved
-						if ($user->id == $object->fk_validator
-							|| in_array($object->fk_user, $childids)
-							|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->holiday->writeall_advance))) {
+						if ($user->id == $object->fk_validator || in_array($object->fk_user, $childids) || $cancreateall) {
 							if (($object->date_debut > dol_now()) || !empty($user->admin)) {
 								print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=cancel&token='.newToken().'" class="butAction">'.$langs->trans("ActionCancelCP").'</a>';
 							} else {
diff --git a/htdocs/holiday/document.php b/htdocs/holiday/document.php
index c4e779efe52..8eb88b1ceae 100644
--- a/htdocs/holiday/document.php
+++ b/htdocs/holiday/document.php
@@ -93,23 +93,6 @@ if (($id > 0) || $ref) {
 	}
 }
 
-/*$cancreate = 0;
-
-if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->holiday->writeall_advance)) {
-	$cancreate = 1;
-}
-if (!empty($user->rights->holiday->write) && in_array($fuserid, $childids)) {
-	$cancreate = 1;
-}
-
-$candelete = 0;
-if (!empty($user->rights->holiday->delete)) {
-	$candelete = 1;
-}
-if ($object->statut == Holiday::STATUS_DRAFT && $user->rights->holiday->write && in_array($object->fk_user, $childids)) {
-	$candelete = 1;
-}
-*/
 
 $upload_dir = $conf->holiday->dir_output.'/'.get_exdir(0, 0, 0, 1, $object, '');
 $modulepart = 'holiday';
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index 56ae2b29323..fc8538b5f58 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -484,9 +484,16 @@ if ($resql) {
 
 		print '<div class="tabsAction">';
 
-		$canedit = (($user->id == $user_id && $user->rights->holiday->write) || ($user->id != $user_id && (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->holiday->writeall_advance))));
+		$cancreate = 0;
+		if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->holiday->writeall))
+			|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->holiday->writeall_advance))) {
+				$cancreate = 1;
+		}
+		if (!empty($user->rights->holiday->write) && in_array($user_id, $childids)) {
+			$cancreate = 1;
+		}
 
-		if ($canedit) {
+		if ($cancreate) {
 			print '<a href="'.DOL_URL_ROOT.'/holiday/card.php?action=create&fuserid='.$user_id.'" class="butAction">'.$langs->trans("AddCP").'</a>';
 		}
 
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index cad22dec392..2e8d847ad11 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -882,12 +882,11 @@ Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
+Permission772=Create/modify expense reports (for you and your subordinates) 
 Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Read stocks
@@ -962,9 +961,9 @@ Permission10005=Delete website content
 Permission20001=Read leave requests (your leave and those of your subordinates)
 Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Approve leave requests
 Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index be1db952aa0..2b284f6878e 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -970,7 +970,9 @@ class User extends CommonObject
 		if (!empty($conf->global->MULTICOMPANY_BACKWARD_COMPATIBILITY)) {
 			$sql .= " AND r.entity IN (0,".(!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) ? "1," : "").$conf->entity.")";
 		} else {
-			$sql .= " AND ur.entity = ".((int) $conf->entity);
+			// On table r=rights_def, the unique key is (id, entity) because id is hard coded into module descriptor and insert during module activation.
+			// So we must include the filter on r.entity on both r and ur.
+			$sql .= " AND r.entity = ".((int) $conf->entity)." AND ur.entity = ".((int) $conf->entity);
 		}
 		$sql .= " AND ur.fk_user= ".((int) $this->id);
 		$sql .= " AND r.perms IS NOT NULL";

From 77c286b7695a8c7b572e81191a00292f3b90c571 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 14 Jan 2022 14:01:50 +0100
Subject: [PATCH 105/316] Fix permission

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

diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index 4566a81d202..70d9c8da54d 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -758,7 +758,7 @@ if (empty($reshook)) {
 
 		// If status pending validation and validator = validator or user, or rights to do for others
 		if (($object->statut == Holiday::STATUS_VALIDATED || $object->statut == Holiday::STATUS_APPROVED) &&
-			(!empty($user->admin) || $user->id == $object->fk_validator || in_array($object->fk_user, $childids) || $cancreateall)) {
+			(!empty($user->admin) || $user->id == $object->fk_validator || $cancreate || $cancreateall)) {
 			$db->begin();
 
 			$oldstatus = $object->statut;
@@ -1466,7 +1466,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 							print '<a href="#" class="butActionRefused classfortooltip" title="'.$langs->trans("NotTheAssignedApprover").'">'.$langs->trans("ActionRefuseCP").'</a>';
 
 							// Button Cancel (because we can't approve)
-							if (in_array($object->fk_user, $childids) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->holiday->writeall_advance))) {
+							if ($cancreate || $cancreateall) {
 								if (($object->date_debut > dol_now()) || !empty($user->admin)) {
 									print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=cancel&token='.newToken().'" class="butAction">'.$langs->trans("ActionCancelCP").'</a>';
 								} else {
@@ -1475,15 +1475,15 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 							}
 						}
 					}
-					if ($object->statut == Holiday::STATUS_APPROVED) { // If validated or approved
-						if ($user->id == $object->fk_validator || in_array($object->fk_user, $childids) || $cancreateall) {
+					if ($object->statut == Holiday::STATUS_APPROVED) { // If validated and approved
+						if ($user->id == $object->fk_validator || $cancreate || $cancreateall) {
 							if (($object->date_debut > dol_now()) || !empty($user->admin)) {
 								print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=cancel&token='.newToken().'" class="butAction">'.$langs->trans("ActionCancelCP").'</a>';
 							} else {
 								print '<a href="#" class="butActionRefused classfortooltip" title="'.$langs->trans("HolidayStarted").'-'.$langs->trans("NotAllowed").'">'.$langs->trans("ActionCancelCP").'</a>';
 							}
 						} else { // I have no rights on the user of the holiday.
-							if (!empty($user->admin)) {	// If current validator can't cancel an approved leave, we allow admin user
+							if (!empty($user->admin)) {	// If current approver can't cancel an approved leave, we allow admin user
 								print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=cancel&token='.newToken().'" class="butAction">'.$langs->trans("ActionCancelCP").'</a>';
 							} else {
 								print '<a href="#" class="butActionRefused classfortooltip" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("ActionCancelCP").'</a>';
@@ -1491,7 +1491,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 						}
 					}
 
-					if ($cancreate && $object->statut == Holiday::STATUS_CANCELED) {
+					if (($cancreate || $cancreateall) && $object->statut == Holiday::STATUS_CANCELED) {
 						print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=backtodraft" class="butAction">'.$langs->trans("SetToDraft").'</a>';
 					}
 					if ($candelete && ($object->statut == Holiday::STATUS_DRAFT || $object->statut == Holiday::STATUS_CANCELED || $object->statut == Holiday::STATUS_REFUSED)) {	// If draft or canceled or refused

From a9c76f2e44097b1b087b66f46f61788d9f029786 Mon Sep 17 00:00:00 2001
From: lvessiller <lvessiller@open-dsi.fr>
Date: Fri, 14 Jan 2022 16:09:30 +0100
Subject: [PATCH 106/316] FIX replace print error with event message when error
 on update line in supplier order

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

diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index c85d1f56c29..fa77765156c 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -792,8 +792,7 @@ if (empty($reshook))
 		{
 			$db->rollback();
 
-			dol_print_error($db, $object->error);
-			exit;
+			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
 

From 3d97888bc57192e8ed2e1b1140e7700f79840921 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 14 Jan 2022 17:46:06 +0100
Subject: [PATCH 107/316] Comment

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 5f945db12ff..e891904e39e 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -807,6 +807,8 @@ function checkVal($out = '', $check = 'alphanohtml', $filter = null, $options =
 				// No need to use a loop here, this step is not to sanitize (this is done at next step, this is to try to save chars, even if they are
 				// using a non coventionnel way to be encoded, to not have them sanitized just after)
 				$out = preg_replace_callback('/&#(x?[0-9][0-9a-f]+;?)/i', 'realCharForNumericEntities', $out);
+				//$out = preg_replace_callback('/&#(x?[0-9][0-9a-f]+;?)/i', function ($m) { return realCharForNumericEntities($m); }, $out);
+
 
 				// Now we remove all remaining HTML entities starting with a number. We don't want such entities.
 				$out = preg_replace('/&#x?[0-9]+/i', '', $out);	// For example if we have j&#x61vascript with an entities without the ; to hide the 'a' of 'javascript'.

From 35a1b06c4496892044b5c72407aba62160a45a19 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 14 Jan 2022 17:48:15 +0100
Subject: [PATCH 108/316] Fix responsive

---
 htdocs/fourn/card.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index fd3ec1fa34f..0a6374b9775 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -531,6 +531,7 @@ if ($object->id > 0) {
 
 		$num = $db->num_rows($query);
 
+		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent lastrecordtable">';
 		print '<tr class="liste_titre'.(($num == 0) ? ' nobottom' : '').'">';
 		print '<td colspan="3">'.$langs->trans("ProductsAndServices").'</td><td class="right">';
@@ -577,6 +578,7 @@ if ($object->id > 0) {
 		}
 
 		print '</table>';
+		print '</div>';
 	}
 
 
@@ -601,6 +603,7 @@ if ($object->id > 0) {
 			$num = $db->num_rows($resql);
 
 			if ($num > 0) {
+				print '<div class="div-table-responsive-no-min">';
 				print '<table class="noborder centpercent lastrecordtable">';
 
 				print '<tr class="liste_titre">';
@@ -638,7 +641,7 @@ if ($object->id > 0) {
 			$db->free($resql);
 
 			if ($num > 0) {
-				print "</table>";
+				print "</table></div>";
 			}
 		} else {
 			dol_print_error($db);
@@ -702,6 +705,7 @@ if ($object->id > 0) {
 			$i = 0;
 
 			if ($num > 0) {
+				print '<div class="div-table-responsive-no-min">';
 				print '<table class="noborder centpercent lastrecordtable">';
 
 				print '<tr class="liste_titre">';
@@ -739,7 +743,7 @@ if ($object->id > 0) {
 			$db->free($resql);
 
 			if ($num > 0) {
-				print "</table>";
+				print "</table></div>";
 			}
 		} else {
 			dol_print_error($db);
@@ -768,6 +772,7 @@ if ($object->id > 0) {
 			$i = 0;
 			$num = $db->num_rows($resql);
 			if ($num > 0) {
+				print '<div class="div-table-responsive-no-min">';
 				print '<table class="noborder centpercent lastrecordtable">';
 
 				print '<tr class="liste_titre">';
@@ -806,7 +811,7 @@ if ($object->id > 0) {
 			}
 			$db->free($resql);
 			if ($num > 0) {
-				print '</table>';
+				print '</table></div>';
 			}
 		} else {
 			dol_print_error($db);

From 57692ba5563f9166e4afc348445f3d52ab37dc56 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 14 Jan 2022 17:51:19 +0100
Subject: [PATCH 109/316] Fix responsive

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

diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 0a6374b9775..80a1dea140b 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -788,7 +788,6 @@ if ($object->id > 0) {
 
 				print '<tr class="oddeven">';
 				print '<td>';
-				print '<a href="facture/card.php?facid='.$obj->rowid.'">';
 				$facturestatic->id = $obj->rowid;
 				$facturestatic->ref = ($obj->ref ? $obj->ref : $obj->rowid);
 				$facturestatic->ref_supplier = $obj->ref_supplier;
@@ -797,7 +796,7 @@ if ($object->id > 0) {
 				$facturestatic->total_ht = $obj->total_ht;
 				$facturestatic->total_tva = $obj->total_tva;
 				$facturestatic->total_ttc = $obj->total_ttc;
-				print $facturestatic->getNomUrl(1);
+				print '<span class="nowraponall">'.$facturestatic->getNomUrl(1).'</span>';
 				print $obj->ref_supplier ? ' - '.$obj->ref_supplier : '';
 				print ($obj->label ? ' - ' : '').dol_trunc($obj->label, 14);
 				print '</td>';

From 3d98d6288954e0a2b551896f79577b55c9e1669d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 14 Jan 2022 18:14:05 +0100
Subject: [PATCH 110/316] Prepare v16

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

diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 3b21a9bbf37..e14322a62e9 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -34,7 +34,7 @@ if (!defined('DOL_APPLICATION_TITLE')) {
 	define('DOL_APPLICATION_TITLE', 'Dolibarr');
 }
 if (!defined('DOL_VERSION')) {
-	define('DOL_VERSION', '15.0.0'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
+	define('DOL_VERSION', '16.0.0-alpha'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
 }
 
 if (!defined('EURO')) {

From 23a9c43d3955fb6216c7b1fc6e2cbfef7b782985 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Fri, 14 Jan 2022 18:23:23 +0100
Subject: [PATCH 111/316] Update card.php

---
 htdocs/intracommreport/card.php | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/htdocs/intracommreport/card.php b/htdocs/intracommreport/card.php
index 4dfc3250014..7f3982f7c13 100644
--- a/htdocs/intracommreport/card.php
+++ b/htdocs/intracommreport/card.php
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
@@ -21,6 +21,18 @@
  *	\ingroup    Intracomm report
  *	\brief      Page to manage intracomm report export
  */
+
+
+/** Terms
+ *	
+ *	DEB = Declaration d'Exchanges de Biens (FR)   =  Declaration of Exchange of Goods (EN)
+ *  DES = Déclaration Européenne de Services (FR) =  European Declaration of Services (EN)
+ *
+ *  INTRACOMM: Douanes françaises (FR) = french customs (EN)  -  https://www.douane.gouv.fr/professionnels/commerce-international/import-export
+ *	
+ */
+
+
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
@@ -29,7 +41,7 @@ require_once DOL_DOCUMENT_ROOT.'/intracommreport/class/intracommreport.class.php
 $langs->loadLangs(array("intracommreport"));
 
 $action = GETPOST('action');
-$exporttype = GETPOSTISSET('exporttype') ? GETPOST('exporttype', 'alphanohtml') : 'deb'; // DEB ou DES
+$exporttype = GETPOSTISSET('exporttype') ? GETPOST('exporttype', 'alphanohtml') : 'deb'; // DEB or DES
 $year = GETPOSTINT('year');
 $month = GETPOSTINT('month');
 $label = (string) GETPOST('label', 'alphanohtml');
@@ -38,7 +50,7 @@ $backtopage = GETPOST('backtopage', 'alpha');
 $declaration = array(
 	"deb" => $langs->trans("DEB"),
 	"des" => $langs->trans("DES"),
-);
+);        
 $typeOfDeclaration = array(
 	"introduction" => $langs->trans("Introduction"),
 	"expedition" => $langs->trans("Expedition"),

From 41f00a8aef6eb7fece9cb6ca92a929d54cb32b85 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Fri, 14 Jan 2022 17:25:59 +0000
Subject: [PATCH 112/316] Fixing style errors.

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

diff --git a/htdocs/intracommreport/card.php b/htdocs/intracommreport/card.php
index 7f3982f7c13..c769b89f9b8 100644
--- a/htdocs/intracommreport/card.php
+++ b/htdocs/intracommreport/card.php
@@ -24,12 +24,12 @@
 
 
 /** Terms
- *	
+ *
  *	DEB = Declaration d'Exchanges de Biens (FR)   =  Declaration of Exchange of Goods (EN)
  *  DES = Déclaration Européenne de Services (FR) =  European Declaration of Services (EN)
  *
  *  INTRACOMM: Douanes françaises (FR) = french customs (EN)  -  https://www.douane.gouv.fr/professionnels/commerce-international/import-export
- *	
+ *
  */
 
 
@@ -50,7 +50,7 @@ $backtopage = GETPOST('backtopage', 'alpha');
 $declaration = array(
 	"deb" => $langs->trans("DEB"),
 	"des" => $langs->trans("DES"),
-);        
+);
 $typeOfDeclaration = array(
 	"introduction" => $langs->trans("Introduction"),
 	"expedition" => $langs->trans("Expedition"),

From 56ef9d3d5137d57dba1c244d2e1dac37982a3239 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Fri, 14 Jan 2022 18:44:49 +0100
Subject: [PATCH 113/316] add CANCEL Button

add CANCEL Button
& add more space for small Touchscreens
---
 htdocs/fourn/facture/paiement.php | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index 33c07c58e99..d65b3010367 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -11,6 +11,7 @@
  * Copyright (C) 2017       Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2018-2020  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2021       Charlene Benke          <charlene@patas-monkey.com>
+ * Copyright (C) 2022       Udo Tamm				<dev@dolibit.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -54,11 +55,11 @@ $day = GETPOST('day', 'int');
 $month = GETPOST('month', 'int');
 $year = GETPOST('year', 'int');
 
-$search_ref = GETPOST("search_ref", "alpha");
-$search_account = GETPOST("search_account", "int");
-$search_paymenttype = GETPOST("search_paymenttype");
-$search_amount = GETPOST("search_amount", 'alpha'); // alpha because we must be able to search on "< x"
-$search_company = GETPOST("search_company", 'alpha');
+$search_ref = GETPOST('search_ref', 'alpha');
+$search_account = GETPOST('search_account', 'int');
+$search_paymenttype = GETPOST('search_paymenttype');
+$search_amount = GETPOST('search_amount', 'alpha'); // alpha because we must be able to search on "< x"
+$search_company = GETPOST('search_company', 'alpha');
 $search_payment_num = GETPOST('search_payment_num', 'alpha');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
@@ -773,10 +774,13 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 				}
 			}
 
-			// Save Button
+			// Save + Cancel Buttons
 			if ($action != 'add_paiement') {
 				print '<br><div class="center"><input type="checkbox" checked name="closepaidinvoices"> '.$langs->trans("ClosePaidInvoicesAutomatically");
-				print '<br><input type="submit" class="button" value="'.$langs->trans('ToMakePayment').'"></div>';
+				print '<p>&nbsp;</p>';
+				print '<br><input type="submit" class="button" value="'.$langs->trans('ToMakePayment').'">';
+				print '<p>&nbsp;</p>';
+				print '<br><input type="button" class="button button-cancel" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)"></div>';
 			}
 
 			// Form to confirm payment

From 8c165aced2bfcf47b7eafc5c41fc87d04eceee70 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 14 Jan 2022 17:48:15 +0100
Subject: [PATCH 114/316] Fix responsive

---
 htdocs/fourn/card.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index fd3ec1fa34f..0a6374b9775 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -531,6 +531,7 @@ if ($object->id > 0) {
 
 		$num = $db->num_rows($query);
 
+		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent lastrecordtable">';
 		print '<tr class="liste_titre'.(($num == 0) ? ' nobottom' : '').'">';
 		print '<td colspan="3">'.$langs->trans("ProductsAndServices").'</td><td class="right">';
@@ -577,6 +578,7 @@ if ($object->id > 0) {
 		}
 
 		print '</table>';
+		print '</div>';
 	}
 
 
@@ -601,6 +603,7 @@ if ($object->id > 0) {
 			$num = $db->num_rows($resql);
 
 			if ($num > 0) {
+				print '<div class="div-table-responsive-no-min">';
 				print '<table class="noborder centpercent lastrecordtable">';
 
 				print '<tr class="liste_titre">';
@@ -638,7 +641,7 @@ if ($object->id > 0) {
 			$db->free($resql);
 
 			if ($num > 0) {
-				print "</table>";
+				print "</table></div>";
 			}
 		} else {
 			dol_print_error($db);
@@ -702,6 +705,7 @@ if ($object->id > 0) {
 			$i = 0;
 
 			if ($num > 0) {
+				print '<div class="div-table-responsive-no-min">';
 				print '<table class="noborder centpercent lastrecordtable">';
 
 				print '<tr class="liste_titre">';
@@ -739,7 +743,7 @@ if ($object->id > 0) {
 			$db->free($resql);
 
 			if ($num > 0) {
-				print "</table>";
+				print "</table></div>";
 			}
 		} else {
 			dol_print_error($db);
@@ -768,6 +772,7 @@ if ($object->id > 0) {
 			$i = 0;
 			$num = $db->num_rows($resql);
 			if ($num > 0) {
+				print '<div class="div-table-responsive-no-min">';
 				print '<table class="noborder centpercent lastrecordtable">';
 
 				print '<tr class="liste_titre">';
@@ -806,7 +811,7 @@ if ($object->id > 0) {
 			}
 			$db->free($resql);
 			if ($num > 0) {
-				print '</table>';
+				print '</table></div>';
 			}
 		} else {
 			dol_print_error($db);

From 22ef83ab67ab9613b9e8c15446ec1927493abcc9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 14 Jan 2022 17:51:19 +0100
Subject: [PATCH 115/316] Fix responsive

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

diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 0a6374b9775..80a1dea140b 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -788,7 +788,6 @@ if ($object->id > 0) {
 
 				print '<tr class="oddeven">';
 				print '<td>';
-				print '<a href="facture/card.php?facid='.$obj->rowid.'">';
 				$facturestatic->id = $obj->rowid;
 				$facturestatic->ref = ($obj->ref ? $obj->ref : $obj->rowid);
 				$facturestatic->ref_supplier = $obj->ref_supplier;
@@ -797,7 +796,7 @@ if ($object->id > 0) {
 				$facturestatic->total_ht = $obj->total_ht;
 				$facturestatic->total_tva = $obj->total_tva;
 				$facturestatic->total_ttc = $obj->total_ttc;
-				print $facturestatic->getNomUrl(1);
+				print '<span class="nowraponall">'.$facturestatic->getNomUrl(1).'</span>';
 				print $obj->ref_supplier ? ' - '.$obj->ref_supplier : '';
 				print ($obj->label ? ' - ' : '').dol_trunc($obj->label, 14);
 				print '</td>';

From 6acf59fe203742ca2f0edb8fc372f3735384765e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 14 Jan 2022 20:26:56 +0100
Subject: [PATCH 116/316] Fix responsive

---
 htdocs/fourn/card.php         | 42 +++++++++++++++++++----------------
 htdocs/fourn/product/list.php |  3 ++-
 2 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 80a1dea140b..77932cf4e3d 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -535,7 +535,7 @@ if ($object->id > 0) {
 		print '<table class="noborder centpercent lastrecordtable">';
 		print '<tr class="liste_titre'.(($num == 0) ? ' nobottom' : '').'">';
 		print '<td colspan="3">'.$langs->trans("ProductsAndServices").'</td><td class="right">';
-		print '<a class="notasortlink" href="'.DOL_URL_ROOT.'/fourn/product/list.php?fourn_id='.$object->id.'">'.$langs->trans("AllProductReferencesOfSupplier").'<span class="badge marginleftonlyshort">'.$object->nbOfProductRefs().'</span>';
+		print '<a class="notasortlink" href="'.DOL_URL_ROOT.'/fourn/product/list.php?fourn_id='.$object->id.'"><span class="hideonsmartphone">'.$langs->trans("AllProductReferencesOfSupplier").'</span><span class="badge marginleftonlyshort">'.$object->nbOfProductRefs().'</span>';
 		print '</a></td></tr>';
 
 		$return = array();
@@ -557,7 +557,7 @@ if ($object->id > 0) {
 				print $productstatic->getNomUrl(1);
 				print '</td>';
 				print '<td>';
-				print $objp->supplier_ref;
+				print dol_escape_htmltag($objp->supplier_ref);
 				print '</td>';
 				print '<td class="maxwidthonsmartphone">';
 				print dol_trunc(dol_htmlentities($objp->label), 30);
@@ -566,7 +566,7 @@ if ($object->id > 0) {
 				print '<td class="right">';
 				//print (isset($objp->unitprice) ? price($objp->unitprice) : '');
 				if (isset($objp->price)) {
-					print price($objp->price);
+					print '<span class="amount">'.price($objp->price).'</span>';
 					if ($objp->quantity > 1) {
 						print ' / ';
 						print $objp->quantity;
@@ -609,7 +609,7 @@ if ($object->id > 0) {
 				print '<tr class="liste_titre">';
 				print '<td colspan="3">';
 				print '<table class="nobordernopadding centpercent"><tr><td>'.$langs->trans("LastSupplierProposals", ($num < $MAXLIST ? "" : $MAXLIST)).'</td>';
-				print '<td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/supplier_proposal/list.php?socid='.$object->id.'">'.$langs->trans("AllPriceRequests").'<span class="badge marginleftonlyshort">'.$num.'</span></td>';
+				print '<td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/supplier_proposal/list.php?socid='.$object->id.'"><span class="hideonsmartphone">'.$langs->trans("AllPriceRequests").'</span><span class="badge marginleftonlyshort">'.$num.'</span></td>';
 				print '<td width="20px" class="right"><a href="'.DOL_URL_ROOT.'/supplier_proposal/stats/index.php?mode=supplier&socid='.$object->id.'">'.img_picto($langs->trans("Statistics"), 'stats').'</a></td>';
 				print '</tr></table>';
 				print '</td></tr>';
@@ -693,7 +693,7 @@ if ($object->id > 0) {
 			$num = $object_count->total;
 		}
 
-		$sql  = "SELECT p.rowid,p.ref, p.date_commande as dc, p.fk_statut, p.total_ht, p.total_tva, p.total_ttc";
+		$sql  = "SELECT p.rowid,p.ref, p.date_commande as date, p.fk_statut, p.total_ht, p.total_tva, p.total_ttc";
 		$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as p";
 		$sql .= " WHERE p.fk_soc = ".((int) $object->id);
 		$sql .= " AND p.entity IN (".getEntity('commande_fournisseur').")";
@@ -709,9 +709,9 @@ if ($object->id > 0) {
 				print '<table class="noborder centpercent lastrecordtable">';
 
 				print '<tr class="liste_titre">';
-				print '<td colspan="3">';
+				print '<td colspan="4">';
 				print '<table class="nobordernopadding" width="100%"><tr><td>'.$langs->trans("LastSupplierOrders", ($num < $MAXLIST ? "" : $MAXLIST)).'</td>';
-				print '<td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/fourn/commande/list.php?socid='.$object->id.'">'.$langs->trans("AllOrders").'<span class="badge marginleftonlyshort">'.$num.'</span></td>';
+				print '<td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/fourn/commande/list.php?socid='.$object->id.'"><span class="hideonsmartphone">'.$langs->trans("AllOrders").'</span><span class="badge marginleftonlyshort">'.$num.'</span></td>';
 				print '<td width="20px" class="right"><a href="'.DOL_URL_ROOT.'/commande/stats/index.php?mode=supplier&socid='.$object->id.'">'.img_picto($langs->trans("Statistics"), 'stats').'</a></td>';
 				print '</tr></table>';
 				print '</td></tr>';
@@ -720,22 +720,23 @@ if ($object->id > 0) {
 			while ($i < $num && $i < $MAXLIST) {
 				$obj = $db->fetch_object($resql);
 
-				print '<tr class="oddeven">';
-				print '<td class="nowrap">';
 				$orderstatic->id = $obj->rowid;
 				$orderstatic->ref = $obj->ref;
 				$orderstatic->total_ht = $obj->total_ht;
 				$orderstatic->total_tva = $obj->total_tva;
 				$orderstatic->total_ttc = $obj->total_ttc;
+				$orderstatic->date = $db->jdate($obj->date);
+
+				print '<tr class="oddeven">';
+				print '<td class="nowraponall">';
 				print $orderstatic->getNomUrl(1);
 				print '</td>';
 				print '<td class="center" width="80">';
-				if ($obj->dc) {
-					print dol_print_date($db->jdate($obj->dc), 'day');
-				} else {
-					print "-";
+				if ($obj->date) {
+					print dol_print_date($orderstatic->date, 'day');
 				}
 				print '</td>';
+				print '<td class="right nowrap"><span class="amount">'.price($orderstatic->total_ttc).'</span></td>';
 				print '<td class="right" class="nowrap">'.$orderstatic->LibStatut($obj->fk_statut, 5).'</td>';
 				print '</tr>';
 				$i++;
@@ -759,7 +760,7 @@ if ($object->id > 0) {
 
 	if ($user->rights->fournisseur->facture->lire) {
 		// TODO move to DAO class
-		$sql = 'SELECT f.rowid, f.libelle as label, f.ref, f.ref_supplier, f.fk_statut, f.datef as df, f.total_ht, f.total_tva, f.total_ttc as amount,f.paye,';
+		$sql = 'SELECT f.rowid, f.libelle as label, f.ref, f.ref_supplier, f.fk_statut, f.datef as df, f.total_ht, f.total_tva, f.total_ttc, f.paye,';
 		$sql .= ' SUM(pf.amount) as am';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as f';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf ON f.rowid=pf.fk_facturefourn';
@@ -777,7 +778,8 @@ if ($object->id > 0) {
 
 				print '<tr class="liste_titre">';
 				print '<td colspan="4">';
-				print '<table class="nobordernopadding" width="100%"><tr><td>'.$langs->trans('LastSuppliersBills', ($num <= $MAXLIST ? "" : $MAXLIST)).'</td><td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->id.'">'.$langs->trans('AllBills').'<span class="badge marginleftonlyshort">'.$num.'</span></td>';
+				print '<table class="nobordernopadding" width="100%"><tr><td>'.$langs->trans('LastSuppliersBills', ($num <= $MAXLIST ? "" : $MAXLIST)).'</td>';
+				print '<td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->id.'"><span class="hideonsmartphone">'.$langs->trans('AllBills').'</span><span class="badge marginleftonlyshort">'.$num.'</span></td>';
 				print '<td width="20px" class="right"><a href="'.DOL_URL_ROOT.'/compta/facture/stats/index.php?mode=supplier&socid='.$object->id.'">'.img_picto($langs->trans("Statistics"), 'stats').'</a></td>';
 				print '</tr></table>';
 				print '</td></tr>';
@@ -786,8 +788,6 @@ if ($object->id > 0) {
 			while ($i < min($num, $MAXLIST)) {
 				$obj = $db->fetch_object($resql);
 
-				print '<tr class="oddeven">';
-				print '<td>';
 				$facturestatic->id = $obj->rowid;
 				$facturestatic->ref = ($obj->ref ? $obj->ref : $obj->rowid);
 				$facturestatic->ref_supplier = $obj->ref_supplier;
@@ -796,12 +796,16 @@ if ($object->id > 0) {
 				$facturestatic->total_ht = $obj->total_ht;
 				$facturestatic->total_tva = $obj->total_tva;
 				$facturestatic->total_ttc = $obj->total_ttc;
+				$facturestatic->date = $db->jdate($obj->df);
+
+				print '<tr class="oddeven">';
+				print '<td class="tdoverflowmax200">';
 				print '<span class="nowraponall">'.$facturestatic->getNomUrl(1).'</span>';
 				print $obj->ref_supplier ? ' - '.$obj->ref_supplier : '';
 				print ($obj->label ? ' - ' : '').dol_trunc($obj->label, 14);
 				print '</td>';
-				print '<td class="center nowrap">'.dol_print_date($db->jdate($obj->df), 'day').'</td>';
-				print '<td class="right nowrap">'.price($obj->amount).'</td>';
+				print '<td class="center nowrap">'.dol_print_date($facturestatic->date, 'day').'</td>';
+				print '<td class="right nowrap"><span class="amount">'.price($facturestatic->total_ttc).'</span></td>';
 				print '<td class="right nowrap">';
 				print $facturestatic->LibStatut($obj->paye, $obj->fk_statut, 5, $obj->am);
 				print '</td>';
diff --git a/htdocs/fourn/product/list.php b/htdocs/fourn/product/list.php
index 9a67c3922f0..a20e586e2ee 100644
--- a/htdocs/fourn/product/list.php
+++ b/htdocs/fourn/product/list.php
@@ -257,6 +257,7 @@ if ($resql) {
 	$trackid = 'prod'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
+	print '<div class="div-table-responsive-no-min">';
 	print '<table class="liste centpercent">';
 
 	// Fields title search
@@ -357,7 +358,7 @@ if ($resql) {
 	}
 	$db->free($resql);
 
-	print "</table>";
+	print "</table></div>";
 
 	print '</form>';
 } else {

From 89869a248583bf8cb58f9f4004e727cfe75e51ef Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Sat, 15 Jan 2022 12:09:36 +0100
Subject: [PATCH 117/316] Fix view after generate export

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

diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php
index d6700cedf04..5f9dc97ba44 100644
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/htdocs/admin/tools/dolibarr_export.php
@@ -400,8 +400,6 @@ print '</td>';
 print '</tr>';
 print '</table>';
 
-print '</td></tr>';
-print '</table>';
 
 
 
@@ -538,6 +536,8 @@ if (!empty($_SESSION["commandbackuptorun"])) {
 
 print "</div> <!-- end div center button -->\n";
 
+print '</td></tr>';
+print '</table>';
 
 print "</div> 	<!-- end div fichehalfleft -->\n";
 

From fe79218571a637c97a72d67eb4e5d29d823ba271 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 15 Jan 2022 12:26:08 +0100
Subject: [PATCH 118/316] Change on column Assigned to on projet and task.

---
 htdocs/core/lib/project.lib.php |  6 ++---
 htdocs/projet/list.php          | 41 +++++++++++++++++++++++++++++++--
 htdocs/projet/tasks.php         |  4 +---
 3 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index e9e06708f7c..4da32edd666 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -844,7 +844,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 					}
 					print '</td>';
 				}*/
-				if (count($arrayfields) > 0 && !empty($arrayfields['c.assigned']['checked'])) {
+				if (count($arrayfields) > 0 && !empty($arrayfields['c.budget_amount']['checked'])) {
 					print '<td class="center">';
 					print price($lines[$i]->budget_amount, 0, $langs, 1, 0, 0, $conf->currency);
 					$total_budget_amount += $lines[$i]->budget_amount;
@@ -856,8 +856,8 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 					print '<td class="center">';
 					foreach (array('internal', 'external') as $source) {
 						$tab = $lines[$i]->liste_contact(-1, $source);
-						$num = count($tab);
-						if (!empty($num)) {
+						$numcontact = count($tab);
+						if (!empty($numcontact)) {
 							foreach ($tab as $contacttask) {
 								//var_dump($contacttask);
 								if ($source == 'internal') {
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 4078afb20c0..5b421abe010 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -198,6 +198,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 // Add non object fields to fields for list
 $arrayfields['s.nom'] = array('label'=>$langs->trans("ThirdParty"), 'checked'=>1, 'position'=>21, 'enabled'=>(empty($conf->societe->enabled) ? 0 : 1));
 $arrayfields['commercial'] = array('label'=>$langs->trans("SaleRepresentativesOfThirdParty"), 'checked'=>0, 'position'=>23);
+$arrayfields['c.assigned'] = array('label'=>$langs->trans("AssignedTo"), 'checked'=>-1, 'position'=>120);
 $arrayfields['opp_weighted_amount'] = array('label'=>$langs->trans('OpportunityWeightedAmountShort'), 'checked'=>0, 'position'=> 116, 'enabled'=>(empty($conf->global->PROJECT_USE_OPPORTUNITIES) ? 0 : 1), 'position'=>106);
 // Force some fields according to search_usage filter...
 if (GETPOST('search_usage_opportunity')) {
@@ -911,7 +912,7 @@ if (!empty($arrayfields['p.public']['checked'])) {
 // Opp status
 if (!empty($arrayfields['p.fk_opp_status']['checked'])) {
 	print '<td class="liste_titre nowrap center">';
-	print $formproject->selectOpportunityStatus('search_opp_status', $search_opp_status, 1, 0, 1, 0, 'maxwidth100');
+	print $formproject->selectOpportunityStatus('search_opp_status', $search_opp_status, 1, 0, 1, 0, 'maxwidth100', 1);
 	print '</td>';
 }
 if (!empty($arrayfields['p.opp_amount']['checked'])) {
@@ -933,6 +934,10 @@ if (!empty($arrayfields['p.budget_amount']['checked'])) {
 	print '<input type="text" class="flat" name="search_budget_amount" size="4" value="'.$search_budget_amount.'">';
 	print '</td>';
 }
+if (!empty($arrayfields['c.assigned']['checked'])) {
+	print '<td class="liste_titre right">';
+	print '</td>';
+}
 if (!empty($arrayfields['p.usage_opportunity']['checked'])) {
 	print '<td class="liste_titre nowrap right">';
 	print $form->selectyesno('search_usage_opportunity', $search_usage_opportunity, 1, false, 1);
@@ -1003,7 +1008,7 @@ if (!empty($arrayfields['p.fk_statut']['checked'])) {
 		$arrayofstatus[$key] = $langs->trans($val);
 	}
 	$arrayofstatus['99'] = $langs->trans("NotClosed").' ('.$langs->trans('Draft').' + '.$langs->trans('Opened').')';
-	print $form->selectarray('search_status', $arrayofstatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', 'minwidth75imp maxwidth150 selectarrowonleft');
+	print $form->selectarray('search_status', $arrayofstatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', 'minwidth75imp maxwidth125 selectarrowonleft');
 	print ajax_combobox('search_status');
 	print '</td>';
 }
@@ -1052,6 +1057,9 @@ if (!empty($arrayfields['opp_weighted_amount']['checked'])) {
 if (!empty($arrayfields['p.budget_amount']['checked'])) {
 	print_liste_field_titre($arrayfields['p.budget_amount']['label'], $_SERVER["PHP_SELF"], 'p.budget_amount', "", $param, '', $sortfield, $sortorder, 'right ');
 }
+if (!empty($arrayfields['c.assigned']['checked'])) {
+	print_liste_field_titre($arrayfields['c.assigned']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'center ', '');
+}
 if (!empty($arrayfields['p.usage_opportunity']['checked'])) {
 	print_liste_field_titre($arrayfields['p.usage_opportunity']['label'], $_SERVER["PHP_SELF"], 'p.usage_opportunity', "", $param, '', $sortfield, $sortorder, 'right ');
 }
@@ -1312,6 +1320,35 @@ while ($i < min($num, $limit)) {
 				$totalarray['pos'][$totalarray['nbfield']] = 'p.budget_amount';
 			}
 		}
+		// Contacts of project
+		if (!empty($arrayfields['c.assigned']['checked'])) {
+			print '<td class="center">';
+			foreach (array('internal', 'external') as $source) {
+				$tab = $object->liste_contact(-1, $source);
+				$numcontact = count($tab);
+				if (!empty($numcontact)) {
+					foreach ($tab as $contactproject) {
+						//var_dump($contacttask);
+						if ($source == 'internal') {
+							$c = new User($db);
+						} else {
+							$c = new Contact($db);
+						}
+						$c->fetch($contactproject['id']);
+						if (!empty($c->photo)) {
+							print $c->getNomUrl(-2).'&nbsp;';
+						} else {
+							if (get_class($c) == 'User') {
+								print $c->getNomUrl(2, '', 0, 0, 24, 1);//.'&nbsp;';
+							} else {
+								print $c->getNomUrl(2);//.'&nbsp;';
+							}
+						}
+					}
+				}
+			}
+			print '</td>';
+		}
 		// Usage opportunity
 		if (!empty($arrayfields['p.usage_opportunity']['checked'])) {
 			print '<td class="right">';
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index e8c938d2156..dc482c1c60c 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -811,9 +811,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 	$linktocreatetask = dolGetButtonTitle($langs->trans('AddTask'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/projet/tasks.php?action=create'.$param.'&backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.$object->id), '', $linktocreatetaskUserRight, $linktocreatetaskParam);
 
 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">';
-	if ($optioncss != '') {
-		print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-	}
+	print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="list">';
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';

From b3b1e8210078d73a347f3aacacd661e7d44c19e6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 15 Jan 2022 12:26:08 +0100
Subject: [PATCH 119/316] Change on column Assigned to on projet and task.

---
 htdocs/core/lib/project.lib.php |  6 ++---
 htdocs/projet/list.php          | 41 +++++++++++++++++++++++++++++++--
 htdocs/projet/tasks.php         |  4 +---
 3 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index e9e06708f7c..4da32edd666 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -844,7 +844,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 					}
 					print '</td>';
 				}*/
-				if (count($arrayfields) > 0 && !empty($arrayfields['c.assigned']['checked'])) {
+				if (count($arrayfields) > 0 && !empty($arrayfields['c.budget_amount']['checked'])) {
 					print '<td class="center">';
 					print price($lines[$i]->budget_amount, 0, $langs, 1, 0, 0, $conf->currency);
 					$total_budget_amount += $lines[$i]->budget_amount;
@@ -856,8 +856,8 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 					print '<td class="center">';
 					foreach (array('internal', 'external') as $source) {
 						$tab = $lines[$i]->liste_contact(-1, $source);
-						$num = count($tab);
-						if (!empty($num)) {
+						$numcontact = count($tab);
+						if (!empty($numcontact)) {
 							foreach ($tab as $contacttask) {
 								//var_dump($contacttask);
 								if ($source == 'internal') {
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 4078afb20c0..5b421abe010 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -198,6 +198,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 // Add non object fields to fields for list
 $arrayfields['s.nom'] = array('label'=>$langs->trans("ThirdParty"), 'checked'=>1, 'position'=>21, 'enabled'=>(empty($conf->societe->enabled) ? 0 : 1));
 $arrayfields['commercial'] = array('label'=>$langs->trans("SaleRepresentativesOfThirdParty"), 'checked'=>0, 'position'=>23);
+$arrayfields['c.assigned'] = array('label'=>$langs->trans("AssignedTo"), 'checked'=>-1, 'position'=>120);
 $arrayfields['opp_weighted_amount'] = array('label'=>$langs->trans('OpportunityWeightedAmountShort'), 'checked'=>0, 'position'=> 116, 'enabled'=>(empty($conf->global->PROJECT_USE_OPPORTUNITIES) ? 0 : 1), 'position'=>106);
 // Force some fields according to search_usage filter...
 if (GETPOST('search_usage_opportunity')) {
@@ -911,7 +912,7 @@ if (!empty($arrayfields['p.public']['checked'])) {
 // Opp status
 if (!empty($arrayfields['p.fk_opp_status']['checked'])) {
 	print '<td class="liste_titre nowrap center">';
-	print $formproject->selectOpportunityStatus('search_opp_status', $search_opp_status, 1, 0, 1, 0, 'maxwidth100');
+	print $formproject->selectOpportunityStatus('search_opp_status', $search_opp_status, 1, 0, 1, 0, 'maxwidth100', 1);
 	print '</td>';
 }
 if (!empty($arrayfields['p.opp_amount']['checked'])) {
@@ -933,6 +934,10 @@ if (!empty($arrayfields['p.budget_amount']['checked'])) {
 	print '<input type="text" class="flat" name="search_budget_amount" size="4" value="'.$search_budget_amount.'">';
 	print '</td>';
 }
+if (!empty($arrayfields['c.assigned']['checked'])) {
+	print '<td class="liste_titre right">';
+	print '</td>';
+}
 if (!empty($arrayfields['p.usage_opportunity']['checked'])) {
 	print '<td class="liste_titre nowrap right">';
 	print $form->selectyesno('search_usage_opportunity', $search_usage_opportunity, 1, false, 1);
@@ -1003,7 +1008,7 @@ if (!empty($arrayfields['p.fk_statut']['checked'])) {
 		$arrayofstatus[$key] = $langs->trans($val);
 	}
 	$arrayofstatus['99'] = $langs->trans("NotClosed").' ('.$langs->trans('Draft').' + '.$langs->trans('Opened').')';
-	print $form->selectarray('search_status', $arrayofstatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', 'minwidth75imp maxwidth150 selectarrowonleft');
+	print $form->selectarray('search_status', $arrayofstatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', 'minwidth75imp maxwidth125 selectarrowonleft');
 	print ajax_combobox('search_status');
 	print '</td>';
 }
@@ -1052,6 +1057,9 @@ if (!empty($arrayfields['opp_weighted_amount']['checked'])) {
 if (!empty($arrayfields['p.budget_amount']['checked'])) {
 	print_liste_field_titre($arrayfields['p.budget_amount']['label'], $_SERVER["PHP_SELF"], 'p.budget_amount', "", $param, '', $sortfield, $sortorder, 'right ');
 }
+if (!empty($arrayfields['c.assigned']['checked'])) {
+	print_liste_field_titre($arrayfields['c.assigned']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'center ', '');
+}
 if (!empty($arrayfields['p.usage_opportunity']['checked'])) {
 	print_liste_field_titre($arrayfields['p.usage_opportunity']['label'], $_SERVER["PHP_SELF"], 'p.usage_opportunity', "", $param, '', $sortfield, $sortorder, 'right ');
 }
@@ -1312,6 +1320,35 @@ while ($i < min($num, $limit)) {
 				$totalarray['pos'][$totalarray['nbfield']] = 'p.budget_amount';
 			}
 		}
+		// Contacts of project
+		if (!empty($arrayfields['c.assigned']['checked'])) {
+			print '<td class="center">';
+			foreach (array('internal', 'external') as $source) {
+				$tab = $object->liste_contact(-1, $source);
+				$numcontact = count($tab);
+				if (!empty($numcontact)) {
+					foreach ($tab as $contactproject) {
+						//var_dump($contacttask);
+						if ($source == 'internal') {
+							$c = new User($db);
+						} else {
+							$c = new Contact($db);
+						}
+						$c->fetch($contactproject['id']);
+						if (!empty($c->photo)) {
+							print $c->getNomUrl(-2).'&nbsp;';
+						} else {
+							if (get_class($c) == 'User') {
+								print $c->getNomUrl(2, '', 0, 0, 24, 1);//.'&nbsp;';
+							} else {
+								print $c->getNomUrl(2);//.'&nbsp;';
+							}
+						}
+					}
+				}
+			}
+			print '</td>';
+		}
 		// Usage opportunity
 		if (!empty($arrayfields['p.usage_opportunity']['checked'])) {
 			print '<td class="right">';
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index e8c938d2156..dc482c1c60c 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -811,9 +811,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 	$linktocreatetask = dolGetButtonTitle($langs->trans('AddTask'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/projet/tasks.php?action=create'.$param.'&backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.$object->id), '', $linktocreatetaskUserRight, $linktocreatetaskParam);
 
 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">';
-	if ($optioncss != '') {
-		print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-	}
+	print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="list">';
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';

From 8cb526492826b4797e77dae6dce6adccd12ec24f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 15 Jan 2022 12:56:19 +0100
Subject: [PATCH 120/316] Fix css

---
 htdocs/contact/class/contact.class.php |  8 +++---
 htdocs/core/lib/project.lib.php        | 34 +++++++-------------------
 htdocs/projet/list.php                 | 12 ++++++---
 3 files changed, 22 insertions(+), 32 deletions(-)

diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index bc3441a6dc2..00cbfc4158a 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -1395,14 +1395,14 @@ class Contact extends CommonObject
 	 *  @param		string		$moreparam					Add more param into URL
 	 *  @param      int     	$save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *	@param		int			$notooltip					1=Disable tooltip
+	 *  @param  	string  	$morecss            		Add more css on link
 	 *	@return		string									String with URL
 	 */
-	public function getNomUrl($withpicto = 0, $option = '', $maxlen = 0, $moreparam = '', $save_lastsearch_value = -1, $notooltip = 0)
+	public function getNomUrl($withpicto = 0, $option = '', $maxlen = 0, $moreparam = '', $save_lastsearch_value = -1, $notooltip = 0, $morecss = '')
 	{
 		global $conf, $langs, $hookmanager;
 
 		$result = ''; $label = '';
-
 		if (!empty($this->photo) && class_exists('Form')) {
 			$label .= '<div class="photointooltip floatright">';
 			$label .= Form::showphoto('contact', $this, 0, 40, 0, 'photoref', 'mini', 0); // Important, we must force height so image will have height tags and if image is inside a tooltip, the tooltip manager can calculate height and position correctly the tooltip.
@@ -1454,7 +1454,7 @@ class Contact extends CommonObject
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-			$linkclose .= ' class="classfortooltip"';
+			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
 
 			/*
 				$hookmanager->initHooks(array('contactdao'));
@@ -1476,7 +1476,7 @@ class Contact extends CommonObject
 		$result .= $linkstart;
 		if ($withpicto) {
 			if ($withpicto == -2) {
-				$result .= '<!-- picto photo user --><span class="nopadding userimg'.($moreparam ? ' '.$moreparam : '').'">'.Form::showphoto('contact', $this, 0, 0, 0, 'userphoto'.($withpicto == -3 ? 'small' : ''), 'mini', 0, 1).'</span>';
+				$result .= '<!-- picto photo user --><span class="nopadding userimg'.($morecss ? ' '.$morecss : '').'">'.Form::showphoto('contact', $this, 0, 0, 0, 'userphoto'.($withpicto == -3 ? 'small' : ''), 'mini', 0, 1).'</span>';
 			} else {
 				$result .= img_object(($notooltip ? '' : $label), ( $this->picto ?  $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
 			}
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 4da32edd666..9b94c301177 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -822,28 +822,6 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 					}
 				}
 
-				// Contacts of tasks. Disabled, because available by default just after
-				/*
-				if (!empty($conf->global->PROJECT_SHOW_CONTACTS_IN_LIST)) {
-					print '<td>';
-					foreach (array('internal', 'external') as $source) {
-						$tab = $lines[$i]->liste_contact(-1, $source);
-						$num = count($tab);
-						if (!empty($num)) {
-							foreach ($tab as $contacttask) {
-								//var_dump($contacttask);
-								if ($source == 'internal') {
-									$c = new User($db);
-								} else {
-									$c = new Contact($db);
-								}
-								$c->fetch($contacttask['id']);
-								print $c->getNomUrl(1).' ('.$contacttask['libelle'].')<br>';
-							}
-						}
-					}
-					print '</td>';
-				}*/
 				if (count($arrayfields) > 0 && !empty($arrayfields['c.budget_amount']['checked'])) {
 					print '<td class="center">';
 					print price($lines[$i]->budget_amount, 0, $langs, 1, 0, 0, $conf->currency);
@@ -854,6 +832,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 				// Contacts of task
 				if (count($arrayfields) > 0 && !empty($arrayfields['c.assigned']['checked'])) {
 					print '<td class="center">';
+					$ifisrt = 1;
 					foreach (array('internal', 'external') as $source) {
 						$tab = $lines[$i]->liste_contact(-1, $source);
 						$numcontact = count($tab);
@@ -867,14 +846,19 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 								}
 								$c->fetch($contacttask['id']);
 								if (!empty($c->photo)) {
-									print $c->getNomUrl(-2).'&nbsp;';
+									if (get_class($c) == 'User') {
+										print $c->getNomUrl(-2, '', 0, 0, 24, 1, '', ($ifisrt ? '' : 'notfirst'));
+									} else {
+										print $c->getNomUrl(-2, '', 0, '', -1, 0, ($ifisrt ? '' : 'notfirst'));
+									}
 								} else {
 									if (get_class($c) == 'User') {
-										print $c->getNomUrl(2, '', 0, 0, 24, 1);//.'&nbsp;';
+										print $c->getNomUrl(2, '', 0, 0, 24, 1, '', ($ifisrt ? '' : 'notfirst'));
 									} else {
-										print $c->getNomUrl(2);//.'&nbsp;';
+										print $c->getNomUrl(2, '', 0, '', -1, 0, ($ifisrt ? '' : 'notfirst'));
 									}
 								}
+								$ifisrt = 0;
 							}
 						}
 					}
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 5b421abe010..6019011956a 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -1323,6 +1323,7 @@ while ($i < min($num, $limit)) {
 		// Contacts of project
 		if (!empty($arrayfields['c.assigned']['checked'])) {
 			print '<td class="center">';
+			$ifisrt = 1;
 			foreach (array('internal', 'external') as $source) {
 				$tab = $object->liste_contact(-1, $source);
 				$numcontact = count($tab);
@@ -1336,14 +1337,19 @@ while ($i < min($num, $limit)) {
 						}
 						$c->fetch($contactproject['id']);
 						if (!empty($c->photo)) {
-							print $c->getNomUrl(-2).'&nbsp;';
+							if (get_class($c) == 'User') {
+								print $c->getNomUrl(-2, '', 0, 0, 24, 1, '', ($ifisrt ? '' : 'notfirst'));
+							} else {
+								print $c->getNomUrl(-2, '', 0, '', -1, 0, ($ifisrt ? '' : 'notfirst'));
+							}
 						} else {
 							if (get_class($c) == 'User') {
-								print $c->getNomUrl(2, '', 0, 0, 24, 1);//.'&nbsp;';
+								print $c->getNomUrl(2, '', 0, 0, 24, 1, '', ($ifisrt ? '' : 'notfirst'));
 							} else {
-								print $c->getNomUrl(2);//.'&nbsp;';
+								print $c->getNomUrl(2, '', 0, '', -1, 0, ($ifisrt ? '' : 'notfirst'));
 							}
 						}
+						$ifisrt = 0;
 					}
 				}
 			}

From 2b19bcef5409a70e9f7247af4cf3eac6f08a6536 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 15 Jan 2022 13:08:15 +0100
Subject: [PATCH 121/316] Fix responsive

---
 htdocs/core/lib/project.lib.php  | 15 ++++++++-------
 htdocs/theme/eldy/global.inc.php |  4 ++++
 htdocs/theme/md/style.css.php    |  8 ++++++--
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 9b94c301177..7f5daf77c4a 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -679,22 +679,23 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 
 				// Title of task
 				if (count($arrayfields) > 0 && !empty($arrayfields['t.label']['checked'])) {
-					print '<td>';
+					$labeltoshow = '';
 					if ($showlineingray) {
-						print '<i>';
+						$labeltoshow .= '<i>';
 					}
 					//else print '<a href="'.DOL_URL_ROOT.'/projet/tasks/task.php?id='.$lines[$i]->id.'&withproject=1">';
 					for ($k = 0; $k < $level; $k++) {
-						print '<div class="marginleftonly">';
+						$labeltoshow .= '<div class="marginleftonly">';
 					}
-					print $lines[$i]->label;
+					$labeltoshow .= dol_escape_htmltag($lines[$i]->label);
 					for ($k = 0; $k < $level; $k++) {
-						print '</div>';
+						$labeltoshow .= '</div>';
 					}
 					if ($showlineingray) {
-						print '</i>';
+						$labeltoshow .= '</i>';
 					}
-					//else print '</a>';
+					print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($labeltoshow).'">';
+					print $labeltoshow;
 					print "</td>\n";
 				}
 
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 3d7ae19e179..3b09b210349 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -381,6 +381,10 @@ a.butStatus {
 	margin: 0 0.45em !important;
 }
 
+span.userimg.notfirst {
+	margin-left: -5px;
+}
+
 /* Used by timesheets */
 span.timesheetalreadyrecorded input {
 	border: none;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 696f3cb83b1..94b81cb91d9 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -568,6 +568,10 @@ a.butStatus {
 	margin: 0 0.45em !important;
 }
 
+span.userimg.notfirst {
+	margin-left: -5px;
+}
+
 /* Used by timesheets */
 span.timesheetalreadyrecorded input {
 	border: none;
@@ -1718,7 +1722,7 @@ select.widthcentpercentminusxx, span.widthcentpercentminusxx:not(.select2-select
 		text-overflow: ellipsis;
 		white-space: nowrap;
 	}
-	
+
 	select {
 		padding-top: 4px;
 		padding-bottom: 5px;
@@ -4463,7 +4467,7 @@ table.titlemodulehelp tr td img.widthpictotitle { width: 80px; }
 
 .dolgraphtitle { margin-top: 6px; margin-bottom: 4px; }
 .dolgraphtitlecssboxes { /* margin: 0px; */ }
-.dolgraphchart canvas { 
+.dolgraphchart canvas {
 	/* width: calc(100% - 20px) !important; */
 }
 .legendColorBox, .legendLabel { border: none !important; }

From 26c54373e89de4ee286bf4263f5dc95936a9f2d4 Mon Sep 17 00:00:00 2001
From: nervo <nervo@nervo.net>
Date: Sat, 15 Jan 2022 19:06:07 +0100
Subject: [PATCH 122/316] Add "addMoreActionsButtons" hook to subscription form

---
 htdocs/adherents/subscription.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index e26db90c4ff..ac2555b4deb 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -1163,9 +1163,13 @@ if ($rowid > 0) {
 		print dol_get_fiche_end();
 
 		print '<div class="center">';
-		print '<input type="submit" class="button" name="add" value="'.$langs->trans("AddSubscription").'">';
-		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-		print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action);
+		if (empty($reshook)) {
+			print '<input type="submit" class="button" name="add" value="'.$langs->trans("AddSubscription").'">';
+			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+			print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
+		}
 		print '</div>';
 
 		print '</form>';

From 8e4c7efed512a23dad0f16611d4bcd6fe43624a0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 15 Jan 2022 20:53:16 +0100
Subject: [PATCH 123/316] Fix do not include file if url not correctly detected

---
 htdocs/main.inc.php | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 9753f4b3d83..f62d1d71585 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1584,12 +1584,17 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 						dol_syslog("Warning: module ".$modcss." declared a css path file into its descriptor that is empty.", LOG_WARNING);
 					}
 					// cssfile is a relative path
-					print '<!-- Includes CSS added by module '.$modcss.' -->'."\n".'<link rel="stylesheet" type="text/css" href="'.dol_buildpath($cssfile, 1);
-					// We add params only if page is not static, because some web server setup does not return content type text/css if url has parameters, so browser cache is not used.
-					if (!preg_match('/\.css$/i', $cssfile)) {
-						print $themeparam;
+					$urlforcss = dol_buildpath($cssfile, 1);
+					if ($urlforcss) {
+						print '<!-- Includes CSS added by module '.$modcss.' -->'."\n".'<link rel="stylesheet" type="text/css" href="'.$urlforcss;
+						// We add params only if page is not static, because some web server setup does not return content type text/css if url has parameters, so browser cache is not used.
+						if (!preg_match('/\.css$/i', $cssfile)) {
+							print $themeparam;
+						}
+						print '">'."\n";
+					} else {
+						dol_syslog("Warning: module ".$modcss." declared a css path file for a file we can't find.", LOG_WARNING);
 					}
-					print '">'."\n";
 				}
 			}
 		}
@@ -1728,7 +1733,12 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 					$filesjs = (array) $filesjs; // To be sure filejs is an array
 					foreach ($filesjs as $jsfile) {
 						// jsfile is a relative path
-						print '<!-- Include JS added by module '.$modjs.'-->'."\n".'<script src="'.dol_buildpath($jsfile, 1).((strpos($jsfile, '?') === false) ? '?' : '&amp;').'lang='.$langs->defaultlang.'"></script>'."\n";
+						$urlforjs = dol_buildpath($jsfile, 1);
+						if ($urlforjs) {
+							print '<!-- Include JS added by module '.$modjs.'-->'."\n".'<script src="'.$urlforjs.((strpos($jsfile, '?') === false) ? '?' : '&amp;').'lang='.$langs->defaultlang.'"></script>'."\n";
+						} else {
+							dol_syslog("Warning: module ".$modjs." declared a js path file for a file we can't find.", LOG_WARNING);
+						}
 					}
 				}
 			}

From 63df7ba0d4bb2392deb3f527900f1a2d6b5639dd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 15 Jan 2022 21:10:33 +0100
Subject: [PATCH 124/316] Clean code

---
 htdocs/install/repair.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php
index d7ebdc74a46..8e4cc851d28 100644
--- a/htdocs/install/repair.php
+++ b/htdocs/install/repair.php
@@ -1082,7 +1082,7 @@ if ($ok && GETPOST('force_disable_of_modules_not_found', 'alpha')) {
 					$constantname = $obj->name; // Name of constant for hook or js or css declaration
 
 					print '<tr><td>';
-					print $constantname;
+					print dol_escape_htmltag($constantname);
 
 					$db->begin();
 
@@ -1106,7 +1106,8 @@ if ($ok && GETPOST('force_disable_of_modules_not_found', 'alpha')) {
 							if ($key == 'css') {
 								$value = $obj->value;
 								$valuearray = json_decode($value);
-								if ($value && count($valuearray) == 0) {
+								if ($value && (!is_array($valuearray) || count($valuearray) == 0)) {
+									$valuearray = array();
 									$valuearray[0] = $value; // If value was not a json array but a string
 								}
 								$reloffile = preg_replace('/^\//', '', $valuearray[0]);
@@ -1117,9 +1118,10 @@ if ($ok && GETPOST('force_disable_of_modules_not_found', 'alpha')) {
 								try {
 									$result = dol_buildpath($reloffile, 0, 2);
 								} catch (Exception $e) {
-									// No catch yet
-									$result = 'found'; // If error, we force lke if we found to avoid any deletion
+									$result = 'found'; // If error, we force like if we found to avoid any deletion
 								}
+							} else {
+								$result = 'found';	//
 							}
 
 							if (!$result) {

From 9cd4bfabff98a9e15297228277e859e7237fa62c Mon Sep 17 00:00:00 2001
From: andreubisquerra <jove@bisquerra.com>
Date: Sat, 15 Jan 2022 21:53:49 +0100
Subject: [PATCH 125/316] Create new line when add ordered product in TakePOS

When TAKEPOS_GROUP_SAME_PRODUCT is enabled in TakePOS and you add product, avoid group it if product is ordered
---
 htdocs/takepos/invoice.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index ec2fd256cfe..2603fef7f2a 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -537,6 +537,7 @@ if ($action == "addline") {
 	if (!empty($conf->global->TAKEPOS_GROUP_SAME_PRODUCT)) {
 		foreach ($invoice->lines as $line) {
 			if ($line->product_ref == $prod->ref) {
+				if ($line->special_code==4) continue; // If this line is sended to printer create new line
 				$result = $invoice->updateline($line->id, $line->desc, $line->subprice, $line->qty + 1, $line->remise_percent, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
 				if ($result < 0) {
 					dol_htmloutput_errors($invoice->error, $invoice->errors, 1);

From 65e77d77958638f4dffc432dd57abad7369dc6c4 Mon Sep 17 00:00:00 2001
From: Randall Mora <50120822+randallmoraes@users.noreply.github.com>
Date: Sat, 15 Jan 2022 15:37:31 -0600
Subject: [PATCH 126/316] Update emailcollector.class.php

Enable to init hook to emailcollectorcard, when docollect is executed by cron task.
---
 htdocs/emailcollector/class/emailcollector.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index 913b7b08a55..bf1ba7b2996 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -2365,7 +2365,7 @@ class EmailCollector extends CommonObject
 						// this code action is hook..... for support this call
 						global $hookmanager;
 
-						if (!is_object($hookmanager)) {
+						if ( ! in_array('emailcollectorcard',$hookmanager->hooks)) {
 							$hookmanager->initHooks(array('emailcollectorcard'));
 						}
 

From 45666e7f0a7005751320abadcc63ef9d856fee01 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sat, 15 Jan 2022 21:45:20 +0000
Subject: [PATCH 127/316] Fixing style errors.

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

diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index bf1ba7b2996..ed3e2afe0de 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -2365,7 +2365,7 @@ class EmailCollector extends CommonObject
 						// this code action is hook..... for support this call
 						global $hookmanager;
 
-						if ( ! in_array('emailcollectorcard',$hookmanager->hooks)) {
+						if ( ! in_array('emailcollectorcard', $hookmanager->hooks)) {
 							$hookmanager->initHooks(array('emailcollectorcard'));
 						}
 

From ea55712d1b7b9c9d9710c6a7151ca0bed7f8651a Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Sat, 15 Jan 2022 23:04:56 +0100
Subject: [PATCH 128/316] Fix missing require class project

---
 htdocs/ticket/messaging.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/ticket/messaging.php b/htdocs/ticket/messaging.php
index 49f15412965..9ee2b627118 100644
--- a/htdocs/ticket/messaging.php
+++ b/htdocs/ticket/messaging.php
@@ -204,6 +204,7 @@ if (!empty($conf->projet->enabled))
 		}
 	} else {
 		if (!empty($object->fk_project)) {
+			require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 			$proj = new Project($db);
 			$proj->fetch($object->fk_project);
 			$morehtmlref .= $proj->getNomUrl(1);

From 1ce7d3ad8b417f4890e02f915cdaf039b863c592 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Sat, 15 Jan 2022 23:26:46 +0100
Subject: [PATCH 129/316] Fix stripe SetupIntent

Klarna not possible for SetupIntent
---
 htdocs/stripe/class/stripe.class.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index a520e83f0ee..18ebce96f8b 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -607,9 +607,6 @@ class Stripe extends CommonObject
 			if (!empty($conf->global->STRIPE_BANCONTACT)) {
 				$paymentmethodtypes[] = "bancontact";
 			}
-			if (!empty($conf->global->STRIPE_KLARNA)) {
-				$paymentmethodtypes[] = "klarna";
-			}
 			if (!empty($conf->global->STRIPE_IDEAL)) {
 				$paymentmethodtypes[] = "ideal";
 			}

From accb0deb295d9858b84ab923d63bf1b3d3ea87ba Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Sun, 16 Jan 2022 00:13:14 +0100
Subject: [PATCH 130/316] New support user_modif in order

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

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index f60a91ae3df..1b525ce9a0b 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -490,7 +490,8 @@ class Commande extends CommonOrder
 		$sql .= " SET ref = '".$this->db->escape($num)."',";
 		$sql .= " fk_statut = ".self::STATUS_VALIDATED.",";
 		$sql .= " date_valid='".$this->db->idate($now)."',";
-		$sql .= " fk_user_valid = ".((int) $user->id);
+		$sql .= " fk_user_valid = ".((int) $user->id)."',";
+		$sql .= " fk_user_modif = ".((int) $user->id);
 		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::valid", LOG_DEBUG);
@@ -620,7 +621,8 @@ class Commande extends CommonOrder
 		$this->db->begin();
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."commande";
-		$sql .= " SET fk_statut = ".self::STATUS_DRAFT;
+		$sql .= " SET fk_statut = ".self::STATUS_DRAFT."',";
+		$sql .= " fk_user_modif = ".((int) $user->id);
 		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		if ($this->db->query($sql)) {
@@ -694,7 +696,8 @@ class Commande extends CommonOrder
 		$this->db->begin();
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'commande';
-		$sql .= ' SET fk_statut='.self::STATUS_VALIDATED.', facture=0';
+		$sql .= ' SET fk_statut='.self::STATUS_VALIDATED.', facture=0,';
+		$sql .= " fk_user_modif = ".((int) $user->id);
 		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::set_reopen", LOG_DEBUG);
@@ -755,7 +758,8 @@ class Commande extends CommonOrder
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
 			$sql .= ' SET fk_statut = '.self::STATUS_CLOSED.',';
 			$sql .= ' fk_user_cloture = '.((int) $user->id).',';
-			$sql .= " date_cloture = '".$this->db->idate($now)."'";
+			$sql .= " date_cloture = '".$this->db->idate($now)."',";
+			$sql .= " fk_user_modif = ".((int) $user->id);
 			$sql .= " WHERE rowid = ".((int) $this->id).' AND fk_statut > '.self::STATUS_DRAFT;
 
 			if ($this->db->query($sql)) {
@@ -803,7 +807,8 @@ class Commande extends CommonOrder
 		$this->db->begin();
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."commande";
-		$sql .= " SET fk_statut = ".self::STATUS_CANCELED;
+		$sql .= " SET fk_statut = ".self::STATUS_CANCELED.",";
+		$sql .= " fk_user_modif = ".((int) $user->id);
 		$sql .= " WHERE rowid = ".((int) $this->id);
 		$sql .= " AND fk_statut = ".self::STATUS_VALIDATED;
 
@@ -1779,7 +1784,7 @@ class Commande extends CommonOrder
 			return -1;
 		}
 
-		$sql = 'SELECT c.rowid, c.entity, c.date_creation, c.ref, c.fk_soc, c.fk_user_author, c.fk_user_valid, c.fk_statut';
+		$sql = 'SELECT c.rowid, c.entity, c.date_creation, c.ref, c.fk_soc, c.fk_user_author, c.fk_user_valid, c.fk_user_modif, c.fk_statut';
 		$sql .= ', c.amount_ht, c.total_ht, c.total_ttc, c.total_tva, c.localtax1 as total_localtax1, c.localtax2 as total_localtax2, c.fk_cond_reglement, c.fk_mode_reglement, c.fk_availability, c.fk_input_reason';
 		$sql .= ', c.fk_account';
 		$sql .= ', c.date_commande, c.date_valid, c.tms';
@@ -1844,6 +1849,7 @@ class Commande extends CommonOrder
 
 				$this->user_author_id = $obj->fk_user_author;
 				$this->user_valid = $obj->fk_user_valid;
+				$this->user_modification = $obj->fk_user_modif;
 				$this->total_ht				= $obj->total_ht;
 				$this->total_tva			= $obj->total_tva;
 				$this->total_localtax1		= $obj->total_localtax1;

From cdbcad9c4fae8703fa5b7704da973274a347743b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 16 Jan 2022 12:51:08 +0100
Subject: [PATCH 131/316] Sync transifex

---
 htdocs/langs/am_ET/admin.lang               |   39 +-
 htdocs/langs/am_ET/companies.lang           |   14 +-
 htdocs/langs/am_ET/errors.lang              |    1 +
 htdocs/langs/am_ET/main.lang                |    2 +
 htdocs/langs/am_ET/other.lang               |    4 +
 htdocs/langs/am_ET/projects.lang            |    1 +
 htdocs/langs/am_ET/withdrawals.lang         |    2 +
 htdocs/langs/ar_DZ/admin.lang               |   39 +-
 htdocs/langs/ar_DZ/companies.lang           |   14 +-
 htdocs/langs/ar_DZ/errors.lang              |    1 +
 htdocs/langs/ar_DZ/main.lang                |    2 +
 htdocs/langs/ar_DZ/other.lang               |    4 +
 htdocs/langs/ar_DZ/projects.lang            |    1 +
 htdocs/langs/ar_DZ/withdrawals.lang         |    2 +
 htdocs/langs/ar_JO/admin.lang               |   39 +-
 htdocs/langs/ar_JO/companies.lang           |   14 +-
 htdocs/langs/ar_JO/errors.lang              |    1 +
 htdocs/langs/ar_JO/main.lang                |    2 +
 htdocs/langs/ar_JO/other.lang               |    4 +
 htdocs/langs/ar_JO/projects.lang            |    1 +
 htdocs/langs/ar_JO/withdrawals.lang         |    2 +
 htdocs/langs/ar_SA/admin.lang               |   39 +-
 htdocs/langs/ar_SA/companies.lang           |   14 +-
 htdocs/langs/ar_SA/errors.lang              |    1 +
 htdocs/langs/ar_SA/main.lang                |    2 +
 htdocs/langs/ar_SA/other.lang               |    4 +
 htdocs/langs/ar_SA/projects.lang            |    1 +
 htdocs/langs/ar_SA/withdrawals.lang         |    2 +
 htdocs/langs/az_AZ/admin.lang               |   39 +-
 htdocs/langs/az_AZ/companies.lang           |   14 +-
 htdocs/langs/az_AZ/errors.lang              |    1 +
 htdocs/langs/az_AZ/main.lang                |    2 +
 htdocs/langs/az_AZ/other.lang               |    4 +
 htdocs/langs/az_AZ/projects.lang            |    1 +
 htdocs/langs/az_AZ/withdrawals.lang         |    2 +
 htdocs/langs/bg_BG/admin.lang               |   39 +-
 htdocs/langs/bg_BG/companies.lang           |   14 +-
 htdocs/langs/bg_BG/errors.lang              |    1 +
 htdocs/langs/bg_BG/main.lang                |    2 +
 htdocs/langs/bg_BG/other.lang               |    4 +
 htdocs/langs/bg_BG/projects.lang            |    1 +
 htdocs/langs/bg_BG/withdrawals.lang         |    2 +
 htdocs/langs/bn_BD/admin.lang               |   39 +-
 htdocs/langs/bn_BD/companies.lang           |   14 +-
 htdocs/langs/bn_BD/errors.lang              |    1 +
 htdocs/langs/bn_BD/main.lang                |    2 +
 htdocs/langs/bn_BD/other.lang               |    4 +
 htdocs/langs/bn_BD/projects.lang            |    1 +
 htdocs/langs/bn_BD/withdrawals.lang         |    2 +
 htdocs/langs/bn_IN/admin.lang               |   39 +-
 htdocs/langs/bn_IN/companies.lang           |   14 +-
 htdocs/langs/bn_IN/errors.lang              |    1 +
 htdocs/langs/bn_IN/main.lang                |    2 +
 htdocs/langs/bn_IN/other.lang               |    4 +
 htdocs/langs/bn_IN/projects.lang            |    1 +
 htdocs/langs/bn_IN/withdrawals.lang         |    2 +
 htdocs/langs/bs_BA/admin.lang               |   39 +-
 htdocs/langs/bs_BA/companies.lang           |   14 +-
 htdocs/langs/bs_BA/errors.lang              |    1 +
 htdocs/langs/bs_BA/main.lang                |    2 +
 htdocs/langs/bs_BA/other.lang               |    4 +
 htdocs/langs/bs_BA/projects.lang            |    1 +
 htdocs/langs/bs_BA/withdrawals.lang         |    2 +
 htdocs/langs/ca_ES/admin.lang               |   39 +-
 htdocs/langs/ca_ES/companies.lang           |   14 +-
 htdocs/langs/ca_ES/errors.lang              |    1 +
 htdocs/langs/ca_ES/main.lang                |    2 +
 htdocs/langs/ca_ES/other.lang               |    4 +
 htdocs/langs/ca_ES/projects.lang            |    1 +
 htdocs/langs/ca_ES/withdrawals.lang         |    2 +
 htdocs/langs/cs_CZ/admin.lang               |   39 +-
 htdocs/langs/cs_CZ/companies.lang           |   14 +-
 htdocs/langs/cs_CZ/errors.lang              |    1 +
 htdocs/langs/cs_CZ/main.lang                |    2 +
 htdocs/langs/cs_CZ/other.lang               |    4 +
 htdocs/langs/cs_CZ/projects.lang            |    1 +
 htdocs/langs/cs_CZ/withdrawals.lang         |    2 +
 htdocs/langs/da_DK/admin.lang               |   39 +-
 htdocs/langs/da_DK/companies.lang           |   14 +-
 htdocs/langs/da_DK/errors.lang              |    1 +
 htdocs/langs/da_DK/main.lang                |    2 +
 htdocs/langs/da_DK/other.lang               |    4 +
 htdocs/langs/da_DK/projects.lang            |    1 +
 htdocs/langs/da_DK/withdrawals.lang         |    2 +
 htdocs/langs/de_AT/admin.lang               |    4 +-
 htdocs/langs/de_CH/admin.lang               |   11 +-
 htdocs/langs/de_CH/companies.lang           |    1 -
 htdocs/langs/de_CH/main.lang                |    3 +
 htdocs/langs/de_CH/other.lang               |    3 +
 htdocs/langs/de_CH/projects.lang            |    2 +
 htdocs/langs/de_DE/accountancy.lang         |    2 +-
 htdocs/langs/de_DE/admin.lang               |   79 +-
 htdocs/langs/de_DE/bills.lang               |    8 +-
 htdocs/langs/de_DE/boxes.lang               |    2 +-
 htdocs/langs/de_DE/categories.lang          |    2 +-
 htdocs/langs/de_DE/companies.lang           |   14 +-
 htdocs/langs/de_DE/errors.lang              |    1 +
 htdocs/langs/de_DE/main.lang                |   22 +-
 htdocs/langs/de_DE/mrp.lang                 |    6 +-
 htdocs/langs/de_DE/orders.lang              |    8 +-
 htdocs/langs/de_DE/other.lang               |   18 +-
 htdocs/langs/de_DE/products.lang            |    2 +-
 htdocs/langs/de_DE/projects.lang            |    1 +
 htdocs/langs/de_DE/users.lang               |    2 +-
 htdocs/langs/de_DE/withdrawals.lang         |    2 +
 htdocs/langs/de_DE/workflow.lang            |   10 +-
 htdocs/langs/el_GR/accountancy.lang         |  146 +-
 htdocs/langs/el_GR/admin.lang               |   67 +-
 htdocs/langs/el_GR/agenda.lang              |   48 +-
 htdocs/langs/el_GR/assets.lang              |    2 +
 htdocs/langs/el_GR/banks.lang               |   34 +-
 htdocs/langs/el_GR/bills.lang               |   88 +-
 htdocs/langs/el_GR/bookmarks.lang           |    4 +-
 htdocs/langs/el_GR/companies.lang           |   14 +-
 htdocs/langs/el_GR/errors.lang              |    1 +
 htdocs/langs/el_GR/main.lang                |    2 +
 htdocs/langs/el_GR/other.lang               |    4 +
 htdocs/langs/el_GR/productbatch.lang        |   44 +-
 htdocs/langs/el_GR/projects.lang            |    1 +
 htdocs/langs/el_GR/withdrawals.lang         |    2 +
 htdocs/langs/en_AE/admin.lang               |    4 +-
 htdocs/langs/en_AU/admin.lang               |    4 +-
 htdocs/langs/en_AU/companies.lang           |    6 +
 htdocs/langs/en_CA/admin.lang               |    4 +-
 htdocs/langs/en_CA/companies.lang           |    6 +
 htdocs/langs/en_GB/admin.lang               |    4 +-
 htdocs/langs/en_GB/companies.lang           |    6 +
 htdocs/langs/en_IN/admin.lang               |    4 +-
 htdocs/langs/en_IN/companies.lang           |    6 +
 htdocs/langs/en_SG/admin.lang               |    4 +-
 htdocs/langs/en_ZA/admin.lang               |    4 +-
 htdocs/langs/es_AR/admin.lang               |    6 +-
 htdocs/langs/es_AR/companies.lang           |    1 -
 htdocs/langs/es_AR/projects.lang            |    2 +
 htdocs/langs/es_BO/admin.lang               |    4 +-
 htdocs/langs/es_CL/admin.lang               |   13 +-
 htdocs/langs/es_CL/companies.lang           |    1 -
 htdocs/langs/es_CL/projects.lang            |    1 +
 htdocs/langs/es_CO/admin.lang               |   17 +-
 htdocs/langs/es_CO/other.lang               |    1 +
 htdocs/langs/es_CO/projects.lang            |    7 +
 htdocs/langs/es_DO/admin.lang               |    4 +-
 htdocs/langs/es_EC/admin.lang               |   12 +-
 htdocs/langs/es_EC/companies.lang           |    1 -
 htdocs/langs/es_EC/other.lang               |    1 +
 htdocs/langs/es_EC/projects.lang            |    3 +
 htdocs/langs/es_ES/accountancy.lang         |    8 +-
 htdocs/langs/es_ES/admin.lang               |   55 +-
 htdocs/langs/es_ES/bookmarks.lang           |    2 +-
 htdocs/langs/es_ES/companies.lang           |   12 +
 htdocs/langs/es_ES/compta.lang              |    6 +-
 htdocs/langs/es_ES/errors.lang              |    3 +-
 htdocs/langs/es_ES/holiday.lang             |    2 +-
 htdocs/langs/es_ES/install.lang             |    2 +-
 htdocs/langs/es_ES/main.lang                |    6 +-
 htdocs/langs/es_ES/modulebuilder.lang       |    2 +-
 htdocs/langs/es_ES/other.lang               |   10 +-
 htdocs/langs/es_ES/productbatch.lang        |    4 +-
 htdocs/langs/es_ES/products.lang            |    8 +-
 htdocs/langs/es_ES/projects.lang            |    3 +-
 htdocs/langs/es_ES/stocks.lang              |   16 +-
 htdocs/langs/es_ES/stripe.lang              |    2 +-
 htdocs/langs/es_ES/withdrawals.lang         |    8 +-
 htdocs/langs/es_GT/admin.lang               |    4 +-
 htdocs/langs/es_HN/admin.lang               |    4 +-
 htdocs/langs/es_MX/admin.lang               |    4 +-
 htdocs/langs/es_MX/companies.lang           |    1 -
 htdocs/langs/es_PA/admin.lang               |    4 +-
 htdocs/langs/es_PE/admin.lang               |    4 +-
 htdocs/langs/es_PE/projects.lang            |    1 +
 htdocs/langs/es_PY/admin.lang               |    4 +-
 htdocs/langs/es_US/admin.lang               |    4 +-
 htdocs/langs/es_UY/admin.lang               |    4 +-
 htdocs/langs/es_VE/admin.lang               |    4 +-
 htdocs/langs/et_EE/admin.lang               |   39 +-
 htdocs/langs/et_EE/companies.lang           |   14 +-
 htdocs/langs/et_EE/errors.lang              |    1 +
 htdocs/langs/et_EE/main.lang                |    2 +
 htdocs/langs/et_EE/other.lang               |    4 +
 htdocs/langs/et_EE/projects.lang            |    1 +
 htdocs/langs/et_EE/withdrawals.lang         |    2 +
 htdocs/langs/eu_ES/admin.lang               |   39 +-
 htdocs/langs/eu_ES/companies.lang           |   14 +-
 htdocs/langs/eu_ES/errors.lang              |    1 +
 htdocs/langs/eu_ES/main.lang                |    2 +
 htdocs/langs/eu_ES/other.lang               |    4 +
 htdocs/langs/eu_ES/projects.lang            |    1 +
 htdocs/langs/eu_ES/withdrawals.lang         |    2 +
 htdocs/langs/fa_IR/admin.lang               |   39 +-
 htdocs/langs/fa_IR/companies.lang           |   14 +-
 htdocs/langs/fa_IR/errors.lang              |    1 +
 htdocs/langs/fa_IR/main.lang                |    2 +
 htdocs/langs/fa_IR/other.lang               |    4 +
 htdocs/langs/fa_IR/projects.lang            |    1 +
 htdocs/langs/fa_IR/withdrawals.lang         |    2 +
 htdocs/langs/fi_FI/admin.lang               |   39 +-
 htdocs/langs/fi_FI/companies.lang           |   14 +-
 htdocs/langs/fi_FI/errors.lang              |    1 +
 htdocs/langs/fi_FI/main.lang                |    2 +
 htdocs/langs/fi_FI/other.lang               |    4 +
 htdocs/langs/fi_FI/projects.lang            |    1 +
 htdocs/langs/fi_FI/withdrawals.lang         |    2 +
 htdocs/langs/fr_BE/admin.lang               |    2 -
 htdocs/langs/fr_CA/admin.lang               |    3 -
 htdocs/langs/fr_CA/projects.lang            |    1 +
 htdocs/langs/fr_CH/admin.lang               |    2 -
 htdocs/langs/fr_CI/admin.lang               |    3 -
 htdocs/langs/fr_CM/admin.lang               |    3 -
 htdocs/langs/fr_FR/admin.lang               |   39 +-
 htdocs/langs/fr_FR/companies.lang           |   12 +
 htdocs/langs/fr_FR/errors.lang              |    1 +
 htdocs/langs/fr_FR/main.lang                |    2 +
 htdocs/langs/fr_FR/other.lang               |    4 +
 htdocs/langs/fr_FR/projects.lang            |    1 +
 htdocs/langs/fr_FR/withdrawals.lang         |    2 +
 htdocs/langs/fr_GA/admin.lang               |    2 -
 htdocs/langs/gl_ES/accountancy.lang         |   10 +-
 htdocs/langs/gl_ES/admin.lang               |   51 +-
 htdocs/langs/gl_ES/boxes.lang               |    2 +-
 htdocs/langs/gl_ES/companies.lang           |   14 +-
 htdocs/langs/gl_ES/errors.lang              |    1 +
 htdocs/langs/gl_ES/main.lang                |    2 +
 htdocs/langs/gl_ES/other.lang               |    4 +
 htdocs/langs/gl_ES/projects.lang            |    1 +
 htdocs/langs/gl_ES/withdrawals.lang         |    2 +
 htdocs/langs/he_IL/admin.lang               |   39 +-
 htdocs/langs/he_IL/companies.lang           |   14 +-
 htdocs/langs/he_IL/errors.lang              |    1 +
 htdocs/langs/he_IL/main.lang                |    2 +
 htdocs/langs/he_IL/other.lang               |    4 +
 htdocs/langs/he_IL/projects.lang            |    1 +
 htdocs/langs/he_IL/withdrawals.lang         |    2 +
 htdocs/langs/hi_IN/admin.lang               |   39 +-
 htdocs/langs/hi_IN/companies.lang           |   14 +-
 htdocs/langs/hi_IN/errors.lang              |    1 +
 htdocs/langs/hi_IN/main.lang                |    2 +
 htdocs/langs/hi_IN/other.lang               |    4 +
 htdocs/langs/hi_IN/projects.lang            |    1 +
 htdocs/langs/hi_IN/withdrawals.lang         |    2 +
 htdocs/langs/hr_HR/admin.lang               |   39 +-
 htdocs/langs/hr_HR/companies.lang           |   14 +-
 htdocs/langs/hr_HR/errors.lang              |    1 +
 htdocs/langs/hr_HR/main.lang                |    2 +
 htdocs/langs/hr_HR/other.lang               |    4 +
 htdocs/langs/hr_HR/projects.lang            |    1 +
 htdocs/langs/hr_HR/withdrawals.lang         |    2 +
 htdocs/langs/hu_HU/admin.lang               |   39 +-
 htdocs/langs/hu_HU/companies.lang           |   14 +-
 htdocs/langs/hu_HU/errors.lang              |    1 +
 htdocs/langs/hu_HU/main.lang                |    2 +
 htdocs/langs/hu_HU/other.lang               |    4 +
 htdocs/langs/hu_HU/projects.lang            |    1 +
 htdocs/langs/hu_HU/withdrawals.lang         |    2 +
 htdocs/langs/id_ID/admin.lang               |   45 +-
 htdocs/langs/id_ID/companies.lang           |   14 +-
 htdocs/langs/id_ID/errors.lang              |    1 +
 htdocs/langs/id_ID/main.lang                |    2 +
 htdocs/langs/id_ID/other.lang               |    4 +
 htdocs/langs/id_ID/projects.lang            |    1 +
 htdocs/langs/id_ID/withdrawals.lang         |    2 +
 htdocs/langs/is_IS/admin.lang               |   39 +-
 htdocs/langs/is_IS/companies.lang           |   14 +-
 htdocs/langs/is_IS/errors.lang              |    1 +
 htdocs/langs/is_IS/main.lang                |    2 +
 htdocs/langs/is_IS/other.lang               |    4 +
 htdocs/langs/is_IS/projects.lang            |    1 +
 htdocs/langs/is_IS/withdrawals.lang         |    2 +
 htdocs/langs/it_CH/admin.lang               |    2 -
 htdocs/langs/it_IT/admin.lang               |   39 +-
 htdocs/langs/it_IT/banks.lang               |   16 +-
 htdocs/langs/it_IT/companies.lang           |   14 +-
 htdocs/langs/it_IT/errors.lang              |    3 +-
 htdocs/langs/it_IT/main.lang                |    2 +
 htdocs/langs/it_IT/other.lang               |    4 +
 htdocs/langs/it_IT/projects.lang            |    1 +
 htdocs/langs/it_IT/withdrawals.lang         |    2 +
 htdocs/langs/ja_JP/accountancy.lang         |   24 +-
 htdocs/langs/ja_JP/admin.lang               |  239 +-
 htdocs/langs/ja_JP/agenda.lang              |    2 +-
 htdocs/langs/ja_JP/bills.lang               |   10 +-
 htdocs/langs/ja_JP/boxes.lang               |    4 +-
 htdocs/langs/ja_JP/cashdesk.lang            |    6 +-
 htdocs/langs/ja_JP/commercial.lang          |    4 +-
 htdocs/langs/ja_JP/companies.lang           |   20 +-
 htdocs/langs/ja_JP/compta.lang              |   54 +-
 htdocs/langs/ja_JP/contracts.lang           |    4 +-
 htdocs/langs/ja_JP/cron.lang                |    2 +-
 htdocs/langs/ja_JP/deliveries.lang          |    2 +-
 htdocs/langs/ja_JP/errors.lang              |    3 +-
 htdocs/langs/ja_JP/exports.lang             |    2 +-
 htdocs/langs/ja_JP/holiday.lang             |    2 +-
 htdocs/langs/ja_JP/install.lang             |    4 +-
 htdocs/langs/ja_JP/intracommreport.lang     |   10 +-
 htdocs/langs/ja_JP/main.lang                |   28 +-
 htdocs/langs/ja_JP/margins.lang             |    4 +-
 htdocs/langs/ja_JP/mrp.lang                 |    4 +-
 htdocs/langs/ja_JP/orders.lang              |   12 +-
 htdocs/langs/ja_JP/other.lang               |    4 +
 htdocs/langs/ja_JP/products.lang            |   14 +-
 htdocs/langs/ja_JP/projects.lang            |    7 +-
 htdocs/langs/ja_JP/stocks.lang              |   34 +-
 htdocs/langs/ja_JP/ticket.lang              |    4 +-
 htdocs/langs/ja_JP/trips.lang               |   24 +-
 htdocs/langs/ja_JP/withdrawals.lang         |    4 +-
 htdocs/langs/ka_GE/admin.lang               |   39 +-
 htdocs/langs/ka_GE/companies.lang           |   14 +-
 htdocs/langs/ka_GE/errors.lang              |    1 +
 htdocs/langs/ka_GE/main.lang                |    2 +
 htdocs/langs/ka_GE/other.lang               |    4 +
 htdocs/langs/ka_GE/projects.lang            |    1 +
 htdocs/langs/ka_GE/withdrawals.lang         |    2 +
 htdocs/langs/kk_KZ/admin.lang               |   39 +-
 htdocs/langs/kk_KZ/companies.lang           |   14 +-
 htdocs/langs/kk_KZ/errors.lang              |    1 +
 htdocs/langs/kk_KZ/main.lang                |    2 +
 htdocs/langs/kk_KZ/other.lang               |    4 +
 htdocs/langs/kk_KZ/projects.lang            |    1 +
 htdocs/langs/kk_KZ/withdrawals.lang         |    2 +
 htdocs/langs/km_KH/admin.lang               |   39 +-
 htdocs/langs/km_KH/companies.lang           |   14 +-
 htdocs/langs/km_KH/errors.lang              |    1 +
 htdocs/langs/km_KH/main.lang                |    2 +
 htdocs/langs/km_KH/other.lang               |    4 +
 htdocs/langs/km_KH/projects.lang            |    1 +
 htdocs/langs/km_KH/withdrawals.lang         |    2 +
 htdocs/langs/kn_IN/admin.lang               |   41 +-
 htdocs/langs/kn_IN/companies.lang           |   14 +-
 htdocs/langs/kn_IN/errors.lang              |    1 +
 htdocs/langs/kn_IN/main.lang                |    2 +
 htdocs/langs/kn_IN/other.lang               |    4 +
 htdocs/langs/kn_IN/projects.lang            |    1 +
 htdocs/langs/kn_IN/withdrawals.lang         |    2 +
 htdocs/langs/ko_KR/admin.lang               |   39 +-
 htdocs/langs/ko_KR/companies.lang           |   14 +-
 htdocs/langs/ko_KR/errors.lang              |    1 +
 htdocs/langs/ko_KR/main.lang                |    2 +
 htdocs/langs/ko_KR/other.lang               |    4 +
 htdocs/langs/ko_KR/projects.lang            |    1 +
 htdocs/langs/ko_KR/withdrawals.lang         |    2 +
 htdocs/langs/lo_LA/admin.lang               |   39 +-
 htdocs/langs/lo_LA/companies.lang           |   14 +-
 htdocs/langs/lo_LA/errors.lang              |    1 +
 htdocs/langs/lo_LA/main.lang                |    2 +
 htdocs/langs/lo_LA/other.lang               |    4 +
 htdocs/langs/lo_LA/projects.lang            |    1 +
 htdocs/langs/lo_LA/withdrawals.lang         |    2 +
 htdocs/langs/lt_LT/admin.lang               |   39 +-
 htdocs/langs/lt_LT/companies.lang           |   14 +-
 htdocs/langs/lt_LT/errors.lang              |    1 +
 htdocs/langs/lt_LT/main.lang                |    2 +
 htdocs/langs/lt_LT/other.lang               |    4 +
 htdocs/langs/lt_LT/projects.lang            |    1 +
 htdocs/langs/lt_LT/withdrawals.lang         |    2 +
 htdocs/langs/lv_LV/admin.lang               |   39 +-
 htdocs/langs/lv_LV/companies.lang           |   12 +
 htdocs/langs/lv_LV/errors.lang              |    1 +
 htdocs/langs/lv_LV/main.lang                |    2 +
 htdocs/langs/lv_LV/other.lang               |    4 +
 htdocs/langs/lv_LV/projects.lang            |    1 +
 htdocs/langs/lv_LV/withdrawals.lang         |    2 +
 htdocs/langs/mk_MK/admin.lang               |   39 +-
 htdocs/langs/mk_MK/companies.lang           |   14 +-
 htdocs/langs/mk_MK/errors.lang              |    1 +
 htdocs/langs/mk_MK/main.lang                |    2 +
 htdocs/langs/mk_MK/other.lang               |    4 +
 htdocs/langs/mk_MK/projects.lang            |    1 +
 htdocs/langs/mk_MK/withdrawals.lang         |    2 +
 htdocs/langs/mn_MN/admin.lang               |   39 +-
 htdocs/langs/mn_MN/companies.lang           |   14 +-
 htdocs/langs/mn_MN/errors.lang              |    1 +
 htdocs/langs/mn_MN/main.lang                |    2 +
 htdocs/langs/mn_MN/other.lang               |    4 +
 htdocs/langs/mn_MN/projects.lang            |    1 +
 htdocs/langs/mn_MN/withdrawals.lang         |    2 +
 htdocs/langs/my_MM/admin.lang               |   39 +-
 htdocs/langs/my_MM/companies.lang           |   14 +-
 htdocs/langs/my_MM/errors.lang              |    1 +
 htdocs/langs/my_MM/main.lang                |    2 +
 htdocs/langs/my_MM/other.lang               |    4 +
 htdocs/langs/my_MM/projects.lang            |    1 +
 htdocs/langs/my_MM/withdrawals.lang         |    2 +
 htdocs/langs/nb_NO/admin.lang               |   39 +-
 htdocs/langs/nb_NO/companies.lang           |   14 +-
 htdocs/langs/nb_NO/errors.lang              |    1 +
 htdocs/langs/nb_NO/main.lang                |    2 +
 htdocs/langs/nb_NO/other.lang               |    4 +
 htdocs/langs/nb_NO/projects.lang            |    1 +
 htdocs/langs/nb_NO/withdrawals.lang         |    2 +
 htdocs/langs/ne_NP/admin.lang               |   39 +-
 htdocs/langs/ne_NP/companies.lang           |   14 +-
 htdocs/langs/ne_NP/errors.lang              |    1 +
 htdocs/langs/ne_NP/main.lang                |    2 +
 htdocs/langs/ne_NP/other.lang               |    4 +
 htdocs/langs/ne_NP/projects.lang            |    1 +
 htdocs/langs/ne_NP/withdrawals.lang         |    2 +
 htdocs/langs/nl_BE/admin.lang               |    2 -
 htdocs/langs/nl_BE/companies.lang           |    1 -
 htdocs/langs/nl_NL/admin.lang               |   39 +-
 htdocs/langs/nl_NL/companies.lang           |   14 +-
 htdocs/langs/nl_NL/errors.lang              |    1 +
 htdocs/langs/nl_NL/main.lang                |    2 +
 htdocs/langs/nl_NL/other.lang               |    4 +
 htdocs/langs/nl_NL/projects.lang            |    1 +
 htdocs/langs/nl_NL/withdrawals.lang         |    2 +
 htdocs/langs/pl_PL/admin.lang               |   39 +-
 htdocs/langs/pl_PL/companies.lang           |   14 +-
 htdocs/langs/pl_PL/errors.lang              |    1 +
 htdocs/langs/pl_PL/main.lang                |    2 +
 htdocs/langs/pl_PL/other.lang               |    4 +
 htdocs/langs/pl_PL/projects.lang            |    1 +
 htdocs/langs/pl_PL/withdrawals.lang         |    2 +
 htdocs/langs/pt_BR/admin.lang               |   14 -
 htdocs/langs/pt_BR/companies.lang           |    4 +
 htdocs/langs/pt_BR/other.lang               |    6 +
 htdocs/langs/pt_BR/projects.lang            |    3 +
 htdocs/langs/pt_BR/withdrawals.lang         |    1 +
 htdocs/langs/pt_PT/admin.lang               |   39 +-
 htdocs/langs/pt_PT/companies.lang           |   14 +-
 htdocs/langs/pt_PT/errors.lang              |    1 +
 htdocs/langs/pt_PT/main.lang                |    2 +
 htdocs/langs/pt_PT/other.lang               |    4 +
 htdocs/langs/pt_PT/projects.lang            |    1 +
 htdocs/langs/pt_PT/withdrawals.lang         |    2 +
 htdocs/langs/ro_RO/accountancy.lang         |    2 +-
 htdocs/langs/ro_RO/admin.lang               |   39 +-
 htdocs/langs/ro_RO/companies.lang           |   12 +
 htdocs/langs/ro_RO/errors.lang              |    1 +
 htdocs/langs/ro_RO/main.lang                |    2 +
 htdocs/langs/ro_RO/other.lang               |    4 +
 htdocs/langs/ro_RO/projects.lang            |    1 +
 htdocs/langs/ro_RO/withdrawals.lang         |    2 +
 htdocs/langs/ru_RU/admin.lang               |   39 +-
 htdocs/langs/ru_RU/companies.lang           |   14 +-
 htdocs/langs/ru_RU/errors.lang              |    1 +
 htdocs/langs/ru_RU/main.lang                |    2 +
 htdocs/langs/ru_RU/other.lang               |    4 +
 htdocs/langs/ru_RU/projects.lang            |    1 +
 htdocs/langs/ru_RU/withdrawals.lang         |    2 +
 htdocs/langs/ru_UA/admin.lang               |    3 -
 htdocs/langs/sk_SK/admin.lang               |   39 +-
 htdocs/langs/sk_SK/companies.lang           |   14 +-
 htdocs/langs/sk_SK/errors.lang              |    1 +
 htdocs/langs/sk_SK/main.lang                |    2 +
 htdocs/langs/sk_SK/other.lang               |    4 +
 htdocs/langs/sk_SK/projects.lang            |    1 +
 htdocs/langs/sk_SK/withdrawals.lang         |    2 +
 htdocs/langs/sl_SI/admin.lang               |   39 +-
 htdocs/langs/sl_SI/companies.lang           |   14 +-
 htdocs/langs/sl_SI/errors.lang              |    1 +
 htdocs/langs/sl_SI/main.lang                |    2 +
 htdocs/langs/sl_SI/other.lang               |    4 +
 htdocs/langs/sl_SI/projects.lang            |    1 +
 htdocs/langs/sl_SI/withdrawals.lang         |    2 +
 htdocs/langs/sq_AL/admin.lang               |   39 +-
 htdocs/langs/sq_AL/companies.lang           |   14 +-
 htdocs/langs/sq_AL/errors.lang              |    1 +
 htdocs/langs/sq_AL/main.lang                |    2 +
 htdocs/langs/sq_AL/other.lang               |    4 +
 htdocs/langs/sq_AL/projects.lang            |    1 +
 htdocs/langs/sq_AL/withdrawals.lang         |    2 +
 htdocs/langs/sr_RS/admin.lang               |   39 +-
 htdocs/langs/sr_RS/companies.lang           |   14 +-
 htdocs/langs/sr_RS/errors.lang              |    1 +
 htdocs/langs/sr_RS/main.lang                |    2 +
 htdocs/langs/sr_RS/other.lang               |    4 +
 htdocs/langs/sr_RS/projects.lang            |    1 +
 htdocs/langs/sr_RS/withdrawals.lang         |    2 +
 htdocs/langs/sv_SE/admin.lang               |   39 +-
 htdocs/langs/sv_SE/companies.lang           |   14 +-
 htdocs/langs/sv_SE/errors.lang              |    1 +
 htdocs/langs/sv_SE/main.lang                |    2 +
 htdocs/langs/sv_SE/other.lang               |    4 +
 htdocs/langs/sv_SE/projects.lang            |    1 +
 htdocs/langs/sv_SE/withdrawals.lang         |    2 +
 htdocs/langs/sw_SW/admin.lang               |   39 +-
 htdocs/langs/sw_SW/companies.lang           |   14 +-
 htdocs/langs/sw_SW/errors.lang              |    1 +
 htdocs/langs/sw_SW/main.lang                |    2 +
 htdocs/langs/sw_SW/other.lang               |    4 +
 htdocs/langs/sw_SW/projects.lang            |    1 +
 htdocs/langs/sw_SW/withdrawals.lang         |    2 +
 htdocs/langs/ta_IN/admin.lang               |   39 +-
 htdocs/langs/ta_IN/companies.lang           |   12 +
 htdocs/langs/ta_IN/errors.lang              |    1 +
 htdocs/langs/ta_IN/main.lang                |    4 +-
 htdocs/langs/ta_IN/other.lang               |    4 +
 htdocs/langs/ta_IN/projects.lang            |    1 +
 htdocs/langs/ta_IN/withdrawals.lang         |    2 +
 htdocs/langs/tg_TJ/admin.lang               |   39 +-
 htdocs/langs/tg_TJ/companies.lang           |   14 +-
 htdocs/langs/tg_TJ/errors.lang              |    1 +
 htdocs/langs/tg_TJ/main.lang                |    2 +
 htdocs/langs/tg_TJ/other.lang               |    4 +
 htdocs/langs/tg_TJ/projects.lang            |    1 +
 htdocs/langs/tg_TJ/withdrawals.lang         |    2 +
 htdocs/langs/th_TH/admin.lang               |   39 +-
 htdocs/langs/th_TH/companies.lang           |   14 +-
 htdocs/langs/th_TH/errors.lang              |    1 +
 htdocs/langs/th_TH/main.lang                |    2 +
 htdocs/langs/th_TH/other.lang               |    4 +
 htdocs/langs/th_TH/projects.lang            |    1 +
 htdocs/langs/th_TH/withdrawals.lang         |    2 +
 htdocs/langs/tr_TR/accountancy.lang         |    2 +-
 htdocs/langs/tr_TR/admin.lang               |   71 +-
 htdocs/langs/tr_TR/bills.lang               |   10 +-
 htdocs/langs/tr_TR/categories.lang          |    4 +-
 htdocs/langs/tr_TR/companies.lang           |   18 +-
 htdocs/langs/tr_TR/errors.lang              |    1 +
 htdocs/langs/tr_TR/intracommreport.lang     |   12 +-
 htdocs/langs/tr_TR/knowledgemanagement.lang |    8 +-
 htdocs/langs/tr_TR/main.lang                |    4 +-
 htdocs/langs/tr_TR/modulebuilder.lang       |    2 +-
 htdocs/langs/tr_TR/other.lang               |    4 +
 htdocs/langs/tr_TR/printing.lang            |    6 +-
 htdocs/langs/tr_TR/projects.lang            |    1 +
 htdocs/langs/tr_TR/propal.lang              |    2 +-
 htdocs/langs/tr_TR/receiptprinter.lang      |    4 +-
 htdocs/langs/tr_TR/users.lang               |   10 +-
 htdocs/langs/tr_TR/withdrawals.lang         |    2 +
 htdocs/langs/uk_UA/admin.lang               |   39 +-
 htdocs/langs/uk_UA/companies.lang           |   14 +-
 htdocs/langs/uk_UA/errors.lang              |    1 +
 htdocs/langs/uk_UA/main.lang                |    2 +
 htdocs/langs/uk_UA/other.lang               |    4 +
 htdocs/langs/uk_UA/projects.lang            |    1 +
 htdocs/langs/uk_UA/withdrawals.lang         |    2 +
 htdocs/langs/ur_PK/accountancy.lang         |  792 ++--
 htdocs/langs/ur_PK/admin.lang               | 4309 +++++++++----------
 htdocs/langs/ur_PK/agenda.lang              |  340 +-
 htdocs/langs/ur_PK/assets.lang              |   68 +-
 htdocs/langs/ur_PK/banks.lang               |  366 +-
 htdocs/langs/ur_PK/bills.lang               | 1198 +++---
 htdocs/langs/ur_PK/blockedlog.lang          |  108 +-
 htdocs/langs/ur_PK/bookmarks.lang           |   38 +-
 htdocs/langs/ur_PK/boxes.lang               |  236 +-
 htdocs/langs/ur_PK/cashdesk.lang            |  270 +-
 htdocs/langs/ur_PK/categories.lang          |  198 +-
 htdocs/langs/ur_PK/commercial.lang          |  160 +-
 htdocs/langs/ur_PK/companies.lang           |  790 ++--
 htdocs/langs/ur_PK/compta.lang              |  598 +--
 htdocs/langs/ur_PK/contracts.lang           |  204 +-
 htdocs/langs/ur_PK/cron.lang                |  162 +-
 htdocs/langs/ur_PK/deliveries.lang          |   62 +-
 htdocs/langs/ur_PK/dict.lang                |  698 +--
 htdocs/langs/ur_PK/donations.lang           |   68 +-
 htdocs/langs/ur_PK/ecm.lang                 |   96 +-
 htdocs/langs/ur_PK/errors.lang              |  643 +--
 htdocs/langs/ur_PK/eventorganization.lang   |  228 +-
 htdocs/langs/ur_PK/exports.lang             |  268 +-
 htdocs/langs/ur_PK/externalsite.lang        |    8 +-
 htdocs/langs/ur_PK/ftp.lang                 |   26 +-
 htdocs/langs/ur_PK/help.lang                |   44 +-
 htdocs/langs/ur_PK/holiday.lang             |  266 +-
 htdocs/langs/ur_PK/hrm.lang                 |  150 +-
 htdocs/langs/ur_PK/install.lang             |  432 +-
 htdocs/langs/ur_PK/interventions.lang       |  134 +-
 htdocs/langs/ur_PK/intracommreport.lang     |   44 +-
 htdocs/langs/ur_PK/knowledgemanagement.lang |   38 +-
 htdocs/langs/ur_PK/languages.lang           |  226 +-
 htdocs/langs/ur_PK/ldap.lang                |   60 +-
 htdocs/langs/ur_PK/link.lang                |   20 +-
 htdocs/langs/ur_PK/loan.lang                |   64 +-
 htdocs/langs/ur_PK/mailmanspip.lang         |   52 +-
 htdocs/langs/ur_PK/mails.lang               |  352 +-
 htdocs/langs/ur_PK/main.lang                | 2256 +++++-----
 htdocs/langs/ur_PK/margins.lang             |   86 +-
 htdocs/langs/ur_PK/members.lang             |  432 +-
 htdocs/langs/ur_PK/modulebuilder.lang       |  292 +-
 htdocs/langs/ur_PK/mrp.lang                 |  218 +-
 htdocs/langs/ur_PK/multicurrency.lang       |   74 +-
 htdocs/langs/ur_PK/oauth.lang               |   60 +-
 htdocs/langs/ur_PK/opensurvey.lang          |  124 +-
 htdocs/langs/ur_PK/orders.lang              |  382 +-
 htdocs/langs/ur_PK/other.lang               |  564 +--
 htdocs/langs/ur_PK/partnership.lang         |  102 +-
 htdocs/langs/ur_PK/paybox.lang              |   58 +-
 htdocs/langs/ur_PK/paypal.lang              |   70 +-
 htdocs/langs/ur_PK/printing.lang            |  106 +-
 htdocs/langs/ur_PK/productbatch.lang        |   84 +-
 htdocs/langs/ur_PK/products.lang            |  782 ++--
 htdocs/langs/ur_PK/projects.lang            |  565 +--
 htdocs/langs/ur_PK/propal.lang              |  190 +-
 htdocs/langs/ur_PK/receiptprinter.lang      |  156 +-
 htdocs/langs/ur_PK/receptions.lang          |  104 +-
 htdocs/langs/ur_PK/recruitment.lang         |   92 +-
 htdocs/langs/ur_PK/resource.lang            |   62 +-
 htdocs/langs/ur_PK/salaries.lang            |   52 +-
 htdocs/langs/ur_PK/sendings.lang            |  138 +-
 htdocs/langs/ur_PK/sms.lang                 |   98 +-
 htdocs/langs/ur_PK/stocks.lang              |  544 +--
 htdocs/langs/ur_PK/stripe.lang              |  140 +-
 htdocs/langs/ur_PK/supplier_proposal.lang   |  114 +-
 htdocs/langs/ur_PK/suppliers.lang           |   96 +-
 htdocs/langs/ur_PK/ticket.lang              |  524 +--
 htdocs/langs/ur_PK/trips.lang               |  298 +-
 htdocs/langs/ur_PK/users.lang               |  246 +-
 htdocs/langs/ur_PK/website.lang             |  290 +-
 htdocs/langs/ur_PK/withdrawals.lang         |  300 +-
 htdocs/langs/ur_PK/workflow.lang            |   44 +-
 htdocs/langs/ur_PK/zapier.lang              |   12 +-
 htdocs/langs/uz_UZ/admin.lang               |   39 +-
 htdocs/langs/uz_UZ/companies.lang           |   14 +-
 htdocs/langs/uz_UZ/errors.lang              |    1 +
 htdocs/langs/uz_UZ/main.lang                |    2 +
 htdocs/langs/uz_UZ/other.lang               |    4 +
 htdocs/langs/uz_UZ/projects.lang            |    1 +
 htdocs/langs/uz_UZ/withdrawals.lang         |    2 +
 htdocs/langs/vi_VN/admin.lang               |   39 +-
 htdocs/langs/vi_VN/companies.lang           |   14 +-
 htdocs/langs/vi_VN/errors.lang              |    1 +
 htdocs/langs/vi_VN/main.lang                |    2 +
 htdocs/langs/vi_VN/other.lang               |    4 +
 htdocs/langs/vi_VN/projects.lang            |    1 +
 htdocs/langs/vi_VN/withdrawals.lang         |    2 +
 htdocs/langs/zh_CN/admin.lang               |   39 +-
 htdocs/langs/zh_CN/companies.lang           |   14 +-
 htdocs/langs/zh_CN/errors.lang              |    1 +
 htdocs/langs/zh_CN/main.lang                |    2 +
 htdocs/langs/zh_CN/other.lang               |    4 +
 htdocs/langs/zh_CN/projects.lang            |    1 +
 htdocs/langs/zh_CN/withdrawals.lang         |    2 +
 htdocs/langs/zh_HK/admin.lang               |   39 +-
 htdocs/langs/zh_HK/companies.lang           |   14 +-
 htdocs/langs/zh_HK/errors.lang              |    1 +
 htdocs/langs/zh_HK/main.lang                |    2 +
 htdocs/langs/zh_HK/other.lang               |    4 +
 htdocs/langs/zh_HK/projects.lang            |    1 +
 htdocs/langs/zh_HK/withdrawals.lang         |    2 +
 htdocs/langs/zh_TW/accountancy.lang         |   56 +-
 htdocs/langs/zh_TW/admin.lang               |  183 +-
 htdocs/langs/zh_TW/banks.lang               |   12 +-
 htdocs/langs/zh_TW/bills.lang               |   22 +-
 htdocs/langs/zh_TW/bookmarks.lang           |    2 +-
 htdocs/langs/zh_TW/cashdesk.lang            |    4 +-
 htdocs/langs/zh_TW/commercial.lang          |    8 +-
 htdocs/langs/zh_TW/companies.lang           |   14 +-
 htdocs/langs/zh_TW/compta.lang              |   56 +-
 htdocs/langs/zh_TW/errors.lang              |    7 +-
 htdocs/langs/zh_TW/eventorganization.lang   |  148 +-
 htdocs/langs/zh_TW/exports.lang             |    4 +-
 htdocs/langs/zh_TW/help.lang                |    2 +-
 htdocs/langs/zh_TW/holiday.lang             |    4 +-
 htdocs/langs/zh_TW/hrm.lang                 |   12 +-
 htdocs/langs/zh_TW/install.lang             |    2 +-
 htdocs/langs/zh_TW/intracommreport.lang     |   10 +-
 htdocs/langs/zh_TW/knowledgemanagement.lang |   32 +-
 htdocs/langs/zh_TW/ldap.lang                |   46 +-
 htdocs/langs/zh_TW/loan.lang                |    2 +-
 htdocs/langs/zh_TW/mails.lang               |    8 +-
 htdocs/langs/zh_TW/main.lang                |   28 +-
 htdocs/langs/zh_TW/members.lang             |  130 +-
 htdocs/langs/zh_TW/modulebuilder.lang       |   54 +-
 htdocs/langs/zh_TW/mrp.lang                 |    6 +-
 htdocs/langs/zh_TW/oauth.lang               |    4 +-
 htdocs/langs/zh_TW/opensurvey.lang          |    4 +-
 htdocs/langs/zh_TW/other.lang               |   10 +-
 htdocs/langs/zh_TW/partnership.lang         |    6 +-
 htdocs/langs/zh_TW/paybox.lang              |    5 +-
 htdocs/langs/zh_TW/paypal.lang              |   66 +-
 htdocs/langs/zh_TW/productbatch.lang        |    8 +-
 htdocs/langs/zh_TW/products.lang            |   26 +-
 htdocs/langs/zh_TW/projects.lang            |   13 +-
 htdocs/langs/zh_TW/propal.lang              |   16 +-
 htdocs/langs/zh_TW/receptions.lang          |   13 +-
 htdocs/langs/zh_TW/salaries.lang            |    5 +-
 htdocs/langs/zh_TW/sendings.lang            |    2 +-
 htdocs/langs/zh_TW/stocks.lang              |   46 +-
 htdocs/langs/zh_TW/stripe.lang              |    2 +-
 htdocs/langs/zh_TW/ticket.lang              |    4 +-
 htdocs/langs/zh_TW/trips.lang               |   10 +-
 htdocs/langs/zh_TW/website.lang             |    4 +-
 htdocs/langs/zh_TW/withdrawals.lang         |   14 +-
 htdocs/langs/zh_TW/workflow.lang            |    6 +-
 htdocs/langs/zh_TW/zapier.lang              |    4 +-
 674 files changed, 15621 insertions(+), 14424 deletions(-)
 delete mode 100644 htdocs/langs/fr_CI/admin.lang
 delete mode 100644 htdocs/langs/fr_CM/admin.lang
 delete mode 100644 htdocs/langs/it_CH/admin.lang
 delete mode 100644 htdocs/langs/ru_UA/admin.lang

diff --git a/htdocs/langs/am_ET/admin.lang b/htdocs/langs/am_ET/admin.lang
index b0e9f37cd36..3971948e5a1 100644
--- a/htdocs/langs/am_ET/admin.lang
+++ b/htdocs/langs/am_ET/admin.lang
@@ -756,7 +756,7 @@ Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
 Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Export transactions and account statements
 Permission116=Transfers between accounts
@@ -893,12 +893,11 @@ Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Read stocks
@@ -962,15 +961,11 @@ Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
@@ -981,9 +976,9 @@ Permission10005=Delete website content
 Permission20001=Read leave requests (your leave and those of your subordinates)
 Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Approve leave requests
 Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
-RecordEvent=Record email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
@@ -2084,7 +2080,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -2130,7 +2126,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+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>
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Missing translation for %s
 NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/am_ET/companies.lang b/htdocs/langs/am_ET/companies.lang
index a561a0f1e9b..7de663ede6d 100644
--- a/htdocs/langs/am_ET/companies.lang
+++ b/htdocs/langs/am_ET/companies.lang
@@ -157,15 +157,15 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
-ProfId1CM=Id. prof. 1 (Registre de Commerce)
-ProfId2CM=Id. prof. 2 (N° Contribuable)
-ProfId3CM=Id. prof. 3 (N° Arrêté de création)
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
 ProfId4CM=-
 ProfId5CM=-
 ProfId6CM=-
-ProfId1ShortCM=Registre de Commerce
-ProfId2ShortCM=N° Contribuable
-ProfId3ShortCM=N° Arrêté de création
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
 ProfId4ShortCM=-
 ProfId5ShortCM=-
 ProfId6ShortCM=-
@@ -381,7 +381,7 @@ VATIntraCheck=Check
 VATIntraCheckDesc=The VAT ID must include the country prefix. The link <b>%s</b> uses the European VAT checker service (VIES) which requires internet access from the Dolibarr server.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commission website
-VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Business entity type
diff --git a/htdocs/langs/am_ET/errors.lang b/htdocs/langs/am_ET/errors.lang
index 7bb0fac3f7b..eabc784e6aa 100644
--- a/htdocs/langs/am_ET/errors.lang
+++ b/htdocs/langs/am_ET/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
 ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
 ErrorIsNotADraft=%s is not a draft
 ErrorExecIdFailed=Can't execute command "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # 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/am_ET/main.lang b/htdocs/langs/am_ET/main.lang
index c59da9aabec..2d850927782 100644
--- a/htdocs/langs/am_ET/main.lang
+++ b/htdocs/langs/am_ET/main.lang
@@ -212,6 +212,8 @@ User=User
 Users=Users
 Group=Group
 Groups=Groups
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=No user group defined
 Password=Password
 PasswordRetype=Retype your password
diff --git a/htdocs/langs/am_ET/other.lang b/htdocs/langs/am_ET/other.lang
index 9bc68dc3678..7b509f60ff7 100644
--- a/htdocs/langs/am_ET/other.lang
+++ b/htdocs/langs/am_ET/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Password encoding
 PermissionsAdd=Permissions added
 PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
+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
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
 SMSSentTo=SMS sent to %s
diff --git a/htdocs/langs/am_ET/projects.lang b/htdocs/langs/am_ET/projects.lang
index 5a2911bac0b..0d9c7ea34c8 100644
--- a/htdocs/langs/am_ET/projects.lang
+++ b/htdocs/langs/am_ET/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
 ProjectTasksWithoutTimeSpent=Project tasks without time spent
 FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+StartDateCannotBeAfterEndDate=End date cannot be before start date
diff --git a/htdocs/langs/am_ET/withdrawals.lang b/htdocs/langs/am_ET/withdrawals.lang
index f5a33b78eee..bda987276b1 100644
--- a/htdocs/langs/am_ET/withdrawals.lang
+++ b/htdocs/langs/am_ET/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
 WithdrawalsLine=Direct debit order line
+CreditTransfer=Credit transfer
 CreditTransferLine=Credit transfer line
 WithdrawalsLines=Direct debit order lines
 CreditTransferLines=Credit transfer lines
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=Classify credited
+ClassDebited=Classify debited
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
 TransMetod=Transmission method
diff --git a/htdocs/langs/ar_DZ/admin.lang b/htdocs/langs/ar_DZ/admin.lang
index b0e9f37cd36..3971948e5a1 100644
--- a/htdocs/langs/ar_DZ/admin.lang
+++ b/htdocs/langs/ar_DZ/admin.lang
@@ -756,7 +756,7 @@ Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
 Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Export transactions and account statements
 Permission116=Transfers between accounts
@@ -893,12 +893,11 @@ Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Read stocks
@@ -962,15 +961,11 @@ Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
@@ -981,9 +976,9 @@ Permission10005=Delete website content
 Permission20001=Read leave requests (your leave and those of your subordinates)
 Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Approve leave requests
 Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
-RecordEvent=Record email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
@@ -2084,7 +2080,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -2130,7 +2126,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+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>
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Missing translation for %s
 NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/ar_DZ/companies.lang b/htdocs/langs/ar_DZ/companies.lang
index bce0a98ea83..7de663ede6d 100644
--- a/htdocs/langs/ar_DZ/companies.lang
+++ b/htdocs/langs/ar_DZ/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Check
 VATIntraCheckDesc=The VAT ID must include the country prefix. The link <b>%s</b> uses the European VAT checker service (VIES) which requires internet access from the Dolibarr server.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commission website
-VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Business entity type
diff --git a/htdocs/langs/ar_DZ/errors.lang b/htdocs/langs/ar_DZ/errors.lang
index 7bb0fac3f7b..eabc784e6aa 100644
--- a/htdocs/langs/ar_DZ/errors.lang
+++ b/htdocs/langs/ar_DZ/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
 ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
 ErrorIsNotADraft=%s is not a draft
 ErrorExecIdFailed=Can't execute command "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # 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/ar_DZ/main.lang b/htdocs/langs/ar_DZ/main.lang
index c59da9aabec..2d850927782 100644
--- a/htdocs/langs/ar_DZ/main.lang
+++ b/htdocs/langs/ar_DZ/main.lang
@@ -212,6 +212,8 @@ User=User
 Users=Users
 Group=Group
 Groups=Groups
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=No user group defined
 Password=Password
 PasswordRetype=Retype your password
diff --git a/htdocs/langs/ar_DZ/other.lang b/htdocs/langs/ar_DZ/other.lang
index 9bc68dc3678..7b509f60ff7 100644
--- a/htdocs/langs/ar_DZ/other.lang
+++ b/htdocs/langs/ar_DZ/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Password encoding
 PermissionsAdd=Permissions added
 PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
+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
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
 SMSSentTo=SMS sent to %s
diff --git a/htdocs/langs/ar_DZ/projects.lang b/htdocs/langs/ar_DZ/projects.lang
index 5a2911bac0b..0d9c7ea34c8 100644
--- a/htdocs/langs/ar_DZ/projects.lang
+++ b/htdocs/langs/ar_DZ/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
 ProjectTasksWithoutTimeSpent=Project tasks without time spent
 FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+StartDateCannotBeAfterEndDate=End date cannot be before start date
diff --git a/htdocs/langs/ar_DZ/withdrawals.lang b/htdocs/langs/ar_DZ/withdrawals.lang
index f5a33b78eee..bda987276b1 100644
--- a/htdocs/langs/ar_DZ/withdrawals.lang
+++ b/htdocs/langs/ar_DZ/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
 WithdrawalsLine=Direct debit order line
+CreditTransfer=Credit transfer
 CreditTransferLine=Credit transfer line
 WithdrawalsLines=Direct debit order lines
 CreditTransferLines=Credit transfer lines
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=Classify credited
+ClassDebited=Classify debited
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
 TransMetod=Transmission method
diff --git a/htdocs/langs/ar_JO/admin.lang b/htdocs/langs/ar_JO/admin.lang
index 9de9c83807c..8f60ac04582 100644
--- a/htdocs/langs/ar_JO/admin.lang
+++ b/htdocs/langs/ar_JO/admin.lang
@@ -756,7 +756,7 @@ Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
 Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Export transactions and account statements
 Permission116=Transfers between accounts
@@ -893,12 +893,11 @@ Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Read stocks
@@ -962,15 +961,11 @@ Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
@@ -981,9 +976,9 @@ Permission10005=Delete website content
 Permission20001=Read leave requests (your leave and those of your subordinates)
 Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Approve leave requests
 Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
-RecordEvent=Record email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
@@ -2084,7 +2080,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -2130,7 +2126,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+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>
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Missing translation for %s
 NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/ar_JO/companies.lang b/htdocs/langs/ar_JO/companies.lang
index a561a0f1e9b..7de663ede6d 100644
--- a/htdocs/langs/ar_JO/companies.lang
+++ b/htdocs/langs/ar_JO/companies.lang
@@ -157,15 +157,15 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
-ProfId1CM=Id. prof. 1 (Registre de Commerce)
-ProfId2CM=Id. prof. 2 (N° Contribuable)
-ProfId3CM=Id. prof. 3 (N° Arrêté de création)
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
 ProfId4CM=-
 ProfId5CM=-
 ProfId6CM=-
-ProfId1ShortCM=Registre de Commerce
-ProfId2ShortCM=N° Contribuable
-ProfId3ShortCM=N° Arrêté de création
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
 ProfId4ShortCM=-
 ProfId5ShortCM=-
 ProfId6ShortCM=-
@@ -381,7 +381,7 @@ VATIntraCheck=Check
 VATIntraCheckDesc=The VAT ID must include the country prefix. The link <b>%s</b> uses the European VAT checker service (VIES) which requires internet access from the Dolibarr server.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commission website
-VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Business entity type
diff --git a/htdocs/langs/ar_JO/errors.lang b/htdocs/langs/ar_JO/errors.lang
index 7bb0fac3f7b..eabc784e6aa 100644
--- a/htdocs/langs/ar_JO/errors.lang
+++ b/htdocs/langs/ar_JO/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
 ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
 ErrorIsNotADraft=%s is not a draft
 ErrorExecIdFailed=Can't execute command "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # 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/ar_JO/main.lang b/htdocs/langs/ar_JO/main.lang
index c59da9aabec..2d850927782 100644
--- a/htdocs/langs/ar_JO/main.lang
+++ b/htdocs/langs/ar_JO/main.lang
@@ -212,6 +212,8 @@ User=User
 Users=Users
 Group=Group
 Groups=Groups
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=No user group defined
 Password=Password
 PasswordRetype=Retype your password
diff --git a/htdocs/langs/ar_JO/other.lang b/htdocs/langs/ar_JO/other.lang
index 9bc68dc3678..7b509f60ff7 100644
--- a/htdocs/langs/ar_JO/other.lang
+++ b/htdocs/langs/ar_JO/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Password encoding
 PermissionsAdd=Permissions added
 PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
+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
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
 SMSSentTo=SMS sent to %s
diff --git a/htdocs/langs/ar_JO/projects.lang b/htdocs/langs/ar_JO/projects.lang
index 5a2911bac0b..0d9c7ea34c8 100644
--- a/htdocs/langs/ar_JO/projects.lang
+++ b/htdocs/langs/ar_JO/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
 ProjectTasksWithoutTimeSpent=Project tasks without time spent
 FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+StartDateCannotBeAfterEndDate=End date cannot be before start date
diff --git a/htdocs/langs/ar_JO/withdrawals.lang b/htdocs/langs/ar_JO/withdrawals.lang
index f5a33b78eee..bda987276b1 100644
--- a/htdocs/langs/ar_JO/withdrawals.lang
+++ b/htdocs/langs/ar_JO/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
 WithdrawalsLine=Direct debit order line
+CreditTransfer=Credit transfer
 CreditTransferLine=Credit transfer line
 WithdrawalsLines=Direct debit order lines
 CreditTransferLines=Credit transfer lines
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=Classify credited
+ClassDebited=Classify debited
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
 TransMetod=Transmission method
diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang
index e11205eeaf1..2fd95615c0c 100644
--- a/htdocs/langs/ar_SA/admin.lang
+++ b/htdocs/langs/ar_SA/admin.lang
@@ -756,7 +756,7 @@ Permission106=sendings التصدير
 Permission109=حذف الإرسال
 Permission111=قراءة الحسابات المالية
 Permission112=إنشاء / تعديل أو حذف ، وقارن المعاملات
-Permission113=الحسابات المالية الإعداد (إنشاء وإدارة فئات)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=صفقات التصدير وكشوفات الحساب
 Permission116=التحويلات بين الحسابات
@@ -893,12 +893,11 @@ Permission701=قراءة التبرعات
 Permission702=إنشاء / تعديل والهبات
 Permission703=حذف التبرعات
 Permission771=قراءة التقارير حساب (لك والمرؤوسين لديك)
-Permission772=إنشاء / تعديل التقارير حساب
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=حذف تقارير المصاريف
-Permission774=قراءة جميع التقارير حساب (حتى للمستخدم لا المرؤوسين)
 Permission775=الموافقة على التقارير حساب
 Permission776=دفع نفقة تقارير
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=تقارير حساب التصدير
 Permission1001=قراءة مخزونات
@@ -962,15 +961,11 @@ Permission2801=استخدام عميل FTP في وضع القراءة (تصفح
 Permission2802=العميل استخدام بروتوكول نقل الملفات في وضع الكتابة (حذف أو تحميل الملفات)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
@@ -981,9 +976,9 @@ Permission10005=Delete website content
 Permission20001=Read leave requests (your leave and those of your subordinates)
 Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
 Permission20003=حذف طلبات الإجازة
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=طلبات الإجازة المشرف (إعداد وتحديث التوازن)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Approve leave requests
 Permission23001=قراءة مهمة مجدولة
 Permission23002=إنشاء / تحديث المجدولة وظيفة
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
-RecordEvent=Record email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
@@ -2084,7 +2080,7 @@ CreateCandidature=Create job application
 FormatZip=الرمز البريدي
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=ساعات الافتتاح
 OpeningHoursDesc=ادخل هنا ساعات الافتتاح لشركتك
 ResourceSetup=Configuration of Resource module
@@ -2130,7 +2126,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+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>
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Missing translation for %s
 NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/ar_SA/companies.lang b/htdocs/langs/ar_SA/companies.lang
index 148af6cf1ec..f1d23eb6216 100644
--- a/htdocs/langs/ar_SA/companies.lang
+++ b/htdocs/langs/ar_SA/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=الهوية المهنية 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=فحص
 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.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=تحقق من معرف ضريبة القيمة المضافة داخل الاتجاد على موقع المفوضية الأوروبية
-VATIntraManualCheck=يمكنك أيضًا التحقق يدويًا على موقع المفوضية الأوروبية <a href="%s" target="_blank"> %s </a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=تحقق غير ممكن. لا يتم توفير خدمة التحقق من قبل الدولة العضو (%s).
 NorProspectNorCustomer=ليس فرصة، ولا عميل
 JuridicalStatus=نوع الكيان التجاري
diff --git a/htdocs/langs/ar_SA/errors.lang b/htdocs/langs/ar_SA/errors.lang
index 248331c4a75..6192948f084 100644
--- a/htdocs/langs/ar_SA/errors.lang
+++ b/htdocs/langs/ar_SA/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
 ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
 ErrorIsNotADraft=%s is not a draft
 ErrorExecIdFailed=Can't execute command "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # 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/ar_SA/main.lang b/htdocs/langs/ar_SA/main.lang
index ad55072ca8f..274db74a867 100644
--- a/htdocs/langs/ar_SA/main.lang
+++ b/htdocs/langs/ar_SA/main.lang
@@ -212,6 +212,8 @@ User=المستعمل
 Users=المستخدمين
 Group=مجموعة
 Groups=المجموعات
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=لم يتم تحديد مجموعة مستخدمين
 Password=كلمة المرور
 PasswordRetype=أعد كتابة كلمة المرور
diff --git a/htdocs/langs/ar_SA/other.lang b/htdocs/langs/ar_SA/other.lang
index 28320c04453..0e8d0ee36a0 100644
--- a/htdocs/langs/ar_SA/other.lang
+++ b/htdocs/langs/ar_SA/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Password encoding
 PermissionsAdd=Permissions added
 PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
+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
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
 SMSSentTo=SMS sent to %s
diff --git a/htdocs/langs/ar_SA/projects.lang b/htdocs/langs/ar_SA/projects.lang
index 1266424391a..2c8dfe4df1c 100644
--- a/htdocs/langs/ar_SA/projects.lang
+++ b/htdocs/langs/ar_SA/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
 ProjectTasksWithoutTimeSpent=Project tasks without time spent
 FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+StartDateCannotBeAfterEndDate=تاريخ نهاية لا يمكن أن يكون قبل تاريخ البدء
diff --git a/htdocs/langs/ar_SA/withdrawals.lang b/htdocs/langs/ar_SA/withdrawals.lang
index 62d7003ea88..4b9a548c683 100644
--- a/htdocs/langs/ar_SA/withdrawals.lang
+++ b/htdocs/langs/ar_SA/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=أمر تحويل رصيد
 LatestBankTransferReceipts=أحدث %s أوامر تحويل الرصيد 
 LastWithdrawalReceipts=أحدث %s ملفات الخصم المباشر 
 WithdrawalsLine=بند أمر الخصم المباشر
+CreditTransfer=تحويل الرصيد
 CreditTransferLine=بند تحويل الرصيد
 WithdrawalsLines=بنود أوامر الخصم المباشر
 CreditTransferLines=بنود تحويل الرصيد
@@ -47,6 +48,7 @@ ThirdPartyBankCode=كود بنك الطرف الثالث
 NoInvoiceCouldBeWithdrawed=لم يتم الخصم من فاتورة بنجاح. تحقق من أن الفواتير موجودة في الشركات التي لديها رقم IBAN صالح وأن IBAN يحتوي على UMR (مرجع تفويض فريد) بالوضع <strong> %s </strong>.
 WithdrawalCantBeCreditedTwice=تم بالفعل تمييز إيصال السحب هذا على أنه مدين ؛ لا يمكن القيام بذلك مرتين ، حيث من المحتمل أن يؤدي ذلك إلى إنشاء مدفوعات وإدخالات بنكية مكررة.
 ClassCredited=تصنيف حساب
+ClassDebited=Classify debited
 ClassCreditedConfirm=هل أنت متأكد من أنك تريد تصنيف إيصال السحب هذا على أنه مقيد في حسابك المصرفي؟
 TransData=تاريخ الإرسال
 TransMetod=طريقة الإرسال
diff --git a/htdocs/langs/az_AZ/admin.lang b/htdocs/langs/az_AZ/admin.lang
index b0e9f37cd36..3971948e5a1 100644
--- a/htdocs/langs/az_AZ/admin.lang
+++ b/htdocs/langs/az_AZ/admin.lang
@@ -756,7 +756,7 @@ Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
 Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Export transactions and account statements
 Permission116=Transfers between accounts
@@ -893,12 +893,11 @@ Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Read stocks
@@ -962,15 +961,11 @@ Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
@@ -981,9 +976,9 @@ Permission10005=Delete website content
 Permission20001=Read leave requests (your leave and those of your subordinates)
 Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Approve leave requests
 Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
-RecordEvent=Record email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
@@ -2084,7 +2080,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -2130,7 +2126,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+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>
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Missing translation for %s
 NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/az_AZ/companies.lang b/htdocs/langs/az_AZ/companies.lang
index bce0a98ea83..7de663ede6d 100644
--- a/htdocs/langs/az_AZ/companies.lang
+++ b/htdocs/langs/az_AZ/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Check
 VATIntraCheckDesc=The VAT ID must include the country prefix. The link <b>%s</b> uses the European VAT checker service (VIES) which requires internet access from the Dolibarr server.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commission website
-VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Business entity type
diff --git a/htdocs/langs/az_AZ/errors.lang b/htdocs/langs/az_AZ/errors.lang
index 7bb0fac3f7b..eabc784e6aa 100644
--- a/htdocs/langs/az_AZ/errors.lang
+++ b/htdocs/langs/az_AZ/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
 ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
 ErrorIsNotADraft=%s is not a draft
 ErrorExecIdFailed=Can't execute command "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # 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/az_AZ/main.lang b/htdocs/langs/az_AZ/main.lang
index c59da9aabec..2d850927782 100644
--- a/htdocs/langs/az_AZ/main.lang
+++ b/htdocs/langs/az_AZ/main.lang
@@ -212,6 +212,8 @@ User=User
 Users=Users
 Group=Group
 Groups=Groups
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=No user group defined
 Password=Password
 PasswordRetype=Retype your password
diff --git a/htdocs/langs/az_AZ/other.lang b/htdocs/langs/az_AZ/other.lang
index 9bc68dc3678..7b509f60ff7 100644
--- a/htdocs/langs/az_AZ/other.lang
+++ b/htdocs/langs/az_AZ/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Password encoding
 PermissionsAdd=Permissions added
 PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
+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
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
 SMSSentTo=SMS sent to %s
diff --git a/htdocs/langs/az_AZ/projects.lang b/htdocs/langs/az_AZ/projects.lang
index 5a2911bac0b..0d9c7ea34c8 100644
--- a/htdocs/langs/az_AZ/projects.lang
+++ b/htdocs/langs/az_AZ/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
 ProjectTasksWithoutTimeSpent=Project tasks without time spent
 FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+StartDateCannotBeAfterEndDate=End date cannot be before start date
diff --git a/htdocs/langs/az_AZ/withdrawals.lang b/htdocs/langs/az_AZ/withdrawals.lang
index f5a33b78eee..bda987276b1 100644
--- a/htdocs/langs/az_AZ/withdrawals.lang
+++ b/htdocs/langs/az_AZ/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
 WithdrawalsLine=Direct debit order line
+CreditTransfer=Credit transfer
 CreditTransferLine=Credit transfer line
 WithdrawalsLines=Direct debit order lines
 CreditTransferLines=Credit transfer lines
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=Classify credited
+ClassDebited=Classify debited
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
 TransMetod=Transmission method
diff --git a/htdocs/langs/bg_BG/admin.lang b/htdocs/langs/bg_BG/admin.lang
index 49f0cbdb1a3..e105187f942 100644
--- a/htdocs/langs/bg_BG/admin.lang
+++ b/htdocs/langs/bg_BG/admin.lang
@@ -756,7 +756,7 @@ Permission106=Експортиране на пратки
 Permission109=Изтриване на пратки
 Permission111=Преглед на финансови сметки
 Permission112=Създаване / променяне / изтриване и сравняване на транзакции
-Permission113=Настройка на финансови сметки (създаване, управление на категории)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Съгласуване на транзакции
 Permission115=Експортиране на транзакции и извлечения по сметка
 Permission116=Прехвърляне между сметки
@@ -893,12 +893,11 @@ Permission701=Преглед на дарения
 Permission702=Създаване / променяне на дарения
 Permission703=Изтриване на дарения
 Permission771=Преглед на разходни отчети (на служителя и неговите подчинени)
-Permission772=Създаване / променяне на разходни отчети
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Изтриване на разходни отчети
-Permission774=Преглед на всички разходни отчети (дори на служители които не са подчинени на служителя)
 Permission775=Одобряване на разходни отчети
 Permission776=Плащане на разходни отчети
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=Експортиране на разходни отчети
 Permission1001=Преглед на наличности
@@ -962,15 +961,11 @@ Permission2801=Използване на FTP клиент в режим на ч
 Permission2802=Използване на FTP клиент в режим на писане (изтриване или качване на файлове)
 Permission3200=Преглед на архивирани събития и пръстови отпечатъци
 Permission3301=Generate new modules
-Permission4001=Преглед на служители
-Permission4002=Създаване на служители
-Permission4003=Изтриване на служители
-Permission4004=Експортиране на служители
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
@@ -981,9 +976,9 @@ Permission10005=Изтриване на съдържание в уебсайт
 Permission20001=Преглед на молби за отпуск (на служителя и неговите подчинени)
 Permission20002=Създаване / променяне на молби за отпуск (на служителя и неговите подчинени)
 Permission20003=Изтриване на молби за отпуск
-Permission20004=Преглед на всички молби за отпуск (дори на служители които не са подчинени на служителя)
-Permission20005=Създаване / променяне на всички молби за отпуск (дори на служители, които не са подчинени на служителя)
-Permission20006=Администриране на молби за отпуск (настройка и актуализиране на баланса)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Одобряване на молби за отпуск
 Permission23001=Преглед на планирани задачи
 Permission23002=Създаване / променяне на планирани задачи
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Искате ли да стартирате кол
 NoNewEmailToProcess=Няма нови имейли (отговарящи на заложените филтри) за обработка
 NothingProcessed=Нищо не е направено
 XEmailsDoneYActionsDone=Открити са %s имейл адреса, %s имейл адреса са успешно обработени (за %s записа / действия)
-RecordEvent=Записване на имейл събитие
-CreateLeadAndThirdParty=Създаване на възможност (и контрагент, ако е необходимо)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 CodeLastResult=Код на последния резултат
 NbOfEmailsInInbox=Брой имейли в директорията източник
 LoadThirdPartyFromName=Зареждане на името на контрагента от %s (само за зареждане)
 LoadThirdPartyFromNameOrCreate=Зареждане на името на контрагента от %s (да се създаде, ако не е намерено)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
@@ -2084,7 +2080,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Код на меню (главно меню)
 ECMAutoTree=Показване на автоматично ECM дърво
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Работно време
 OpeningHoursDesc=Въведете тук редовното работно време на вашата фирма.
 ResourceSetup=Конфигурация на модул Ресурси
@@ -2130,7 +2126,7 @@ LargerThan=По-голям от
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=С GMail акаунт, ако сте активирали валидирането в 2 стъпки е препоръчително да създадете специална втора парола за приложението, вместо да използвате своята парола за акаунта от https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+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>
 EndPointFor=Крайна точка за %s: %s
 DeleteEmailCollector=Изтриване на имейл колекционер
 ConfirmDeleteEmailCollector=Сигурни ли те, че искате да изтриете този колекционер на имейли?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Missing translation for %s
 NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/bg_BG/companies.lang b/htdocs/langs/bg_BG/companies.lang
index 54a6c0bbcd1..465553ffb56 100644
--- a/htdocs/langs/bg_BG/companies.lang
+++ b/htdocs/langs/bg_BG/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Проверяване
 VATIntraCheckDesc=Идентификационния номер по ДДС трябва да включва префикса на държавата. Връзката <b> %s </b> използва услугата на Европейската комисия за проверка на номер по ДДС (VIES), която изисква достъп до интернет извън сървъра на Dolibarr.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Проверяване на вътрешно-общностния идентификационен номер по ДДС в интернет страницата на Европейската Комисия
-VATIntraManualCheck=Може да проверите също така ръчно в интернет страницата на Европейската Комисия: <a href="%s" target="_blank"> %s </a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Проверка не е възможна. Услугата за проверка не се предоставя от държавата-членка (%s).
 NorProspectNorCustomer=Нито потенциален клиент, нито клиент
 JuridicalStatus=Business entity type
diff --git a/htdocs/langs/bg_BG/errors.lang b/htdocs/langs/bg_BG/errors.lang
index 7d19ff8f11a..0969328f231 100644
--- a/htdocs/langs/bg_BG/errors.lang
+++ b/htdocs/langs/bg_BG/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
 ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
 ErrorIsNotADraft=%s is not a draft
 ErrorExecIdFailed=Can't execute command "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Вашата стойност на PHP параметър upload_max_filesize (%s) е по-голяма от стойността на PHP параметър post_max_size (%s). Това не е последователна настройка.
diff --git a/htdocs/langs/bg_BG/main.lang b/htdocs/langs/bg_BG/main.lang
index 795f7dd0103..1cfcc08a9e9 100644
--- a/htdocs/langs/bg_BG/main.lang
+++ b/htdocs/langs/bg_BG/main.lang
@@ -212,6 +212,8 @@ User=Потребител
 Users=Потребители
 Group=Група
 Groups=Групи
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=Няма дефинирана потребителска група
 Password=Парола
 PasswordRetype=Повторете паролата
diff --git a/htdocs/langs/bg_BG/other.lang b/htdocs/langs/bg_BG/other.lang
index ef4ef5552cf..c125bbe8710 100644
--- a/htdocs/langs/bg_BG/other.lang
+++ b/htdocs/langs/bg_BG/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Криптиране на парола
 PermissionsAdd=Правата са добавени
 PermissionsDelete=Правата са премахнати
 YourPasswordMustHaveAtLeastXChars=Вашата парола трябва да съдържа поне <strong>%s</strong> символа
+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
 YourPasswordHasBeenReset=Вашата парола е успешно възстановена.
 ApplicantIpAddress=IP адрес на заявителя
 SMSSentTo=Изпратен е SMS на %s
diff --git a/htdocs/langs/bg_BG/projects.lang b/htdocs/langs/bg_BG/projects.lang
index 90ba19297e4..e94891f1693 100644
--- a/htdocs/langs/bg_BG/projects.lang
+++ b/htdocs/langs/bg_BG/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
 ProjectTasksWithoutTimeSpent=Project tasks without time spent
 FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+StartDateCannotBeAfterEndDate=Крайната дата не може да бъде преди началната дата
diff --git a/htdocs/langs/bg_BG/withdrawals.lang b/htdocs/langs/bg_BG/withdrawals.lang
index ecda23b9f7e..0aaf0633ab7 100644
--- a/htdocs/langs/bg_BG/withdrawals.lang
+++ b/htdocs/langs/bg_BG/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Файлове с директен дебит: %s последни
 WithdrawalsLine=Direct debit order line
+CreditTransfer=Credit transfer
 CreditTransferLine=Credit transfer line
 WithdrawalsLines=Редове за нареждане с директен дебит
 CreditTransferLines=Credit transfer lines
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Банков код на контрагента
 NoInvoiceCouldBeWithdrawed=Няма успешно дебитирани фактури. Проверете дали фактурите са на фирми с валиден IBAN и дали този IBAN има UMR (Unique Mandate Reference) в режим <strong>%s</strong>.
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=Класифициране като 'Кредитирана'
+ClassDebited=Classify debited
 ClassCreditedConfirm=Сигурни ли сте, че искате да класифицирате тази разписка за теглене като кредитирана по вашата банкова сметка?
 TransData=Дата на изпращане
 TransMetod=Метод на изпращане
diff --git a/htdocs/langs/bn_BD/admin.lang b/htdocs/langs/bn_BD/admin.lang
index b0e9f37cd36..3971948e5a1 100644
--- a/htdocs/langs/bn_BD/admin.lang
+++ b/htdocs/langs/bn_BD/admin.lang
@@ -756,7 +756,7 @@ Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
 Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Export transactions and account statements
 Permission116=Transfers between accounts
@@ -893,12 +893,11 @@ Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Read stocks
@@ -962,15 +961,11 @@ Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
@@ -981,9 +976,9 @@ Permission10005=Delete website content
 Permission20001=Read leave requests (your leave and those of your subordinates)
 Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Approve leave requests
 Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
-RecordEvent=Record email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
@@ -2084,7 +2080,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -2130,7 +2126,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+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>
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Missing translation for %s
 NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/bn_BD/companies.lang b/htdocs/langs/bn_BD/companies.lang
index 9be7e0c7f94..cc2c1bed349 100644
--- a/htdocs/langs/bn_BD/companies.lang
+++ b/htdocs/langs/bn_BD/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Check
 VATIntraCheckDesc=The VAT ID must include the country prefix. The link <b>%s</b> uses the European VAT checker service (VIES) which requires internet access from the Dolibarr server.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commission website
-VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Business entity type
diff --git a/htdocs/langs/bn_BD/errors.lang b/htdocs/langs/bn_BD/errors.lang
index 7bb0fac3f7b..eabc784e6aa 100644
--- a/htdocs/langs/bn_BD/errors.lang
+++ b/htdocs/langs/bn_BD/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
 ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
 ErrorIsNotADraft=%s is not a draft
 ErrorExecIdFailed=Can't execute command "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # 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/bn_BD/main.lang b/htdocs/langs/bn_BD/main.lang
index 0b9bfd6df1c..3bb0a52d6b3 100644
--- a/htdocs/langs/bn_BD/main.lang
+++ b/htdocs/langs/bn_BD/main.lang
@@ -212,6 +212,8 @@ User=User
 Users=Users
 Group=Group
 Groups=Groups
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=No user group defined
 Password=Password
 PasswordRetype=Retype your password
diff --git a/htdocs/langs/bn_BD/other.lang b/htdocs/langs/bn_BD/other.lang
index 9bc68dc3678..7b509f60ff7 100644
--- a/htdocs/langs/bn_BD/other.lang
+++ b/htdocs/langs/bn_BD/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Password encoding
 PermissionsAdd=Permissions added
 PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
+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
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
 SMSSentTo=SMS sent to %s
diff --git a/htdocs/langs/bn_BD/projects.lang b/htdocs/langs/bn_BD/projects.lang
index 5a2911bac0b..0d9c7ea34c8 100644
--- a/htdocs/langs/bn_BD/projects.lang
+++ b/htdocs/langs/bn_BD/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
 ProjectTasksWithoutTimeSpent=Project tasks without time spent
 FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+StartDateCannotBeAfterEndDate=End date cannot be before start date
diff --git a/htdocs/langs/bn_BD/withdrawals.lang b/htdocs/langs/bn_BD/withdrawals.lang
index 78a00a36275..4106c74f536 100644
--- a/htdocs/langs/bn_BD/withdrawals.lang
+++ b/htdocs/langs/bn_BD/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
 WithdrawalsLine=Direct debit order line
+CreditTransfer=Credit transfer
 CreditTransferLine=Credit transfer line
 WithdrawalsLines=Direct debit order lines
 CreditTransferLines=Credit transfer lines
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=Classify credited
+ClassDebited=Classify debited
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
 TransMetod=Transmission method
diff --git a/htdocs/langs/bn_IN/admin.lang b/htdocs/langs/bn_IN/admin.lang
index b0e9f37cd36..3971948e5a1 100644
--- a/htdocs/langs/bn_IN/admin.lang
+++ b/htdocs/langs/bn_IN/admin.lang
@@ -756,7 +756,7 @@ Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
 Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Export transactions and account statements
 Permission116=Transfers between accounts
@@ -893,12 +893,11 @@ Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Read stocks
@@ -962,15 +961,11 @@ Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
@@ -981,9 +976,9 @@ Permission10005=Delete website content
 Permission20001=Read leave requests (your leave and those of your subordinates)
 Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Approve leave requests
 Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
-RecordEvent=Record email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
@@ -2084,7 +2080,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -2130,7 +2126,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+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>
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Missing translation for %s
 NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/bn_IN/companies.lang b/htdocs/langs/bn_IN/companies.lang
index bce0a98ea83..7de663ede6d 100644
--- a/htdocs/langs/bn_IN/companies.lang
+++ b/htdocs/langs/bn_IN/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Check
 VATIntraCheckDesc=The VAT ID must include the country prefix. The link <b>%s</b> uses the European VAT checker service (VIES) which requires internet access from the Dolibarr server.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commission website
-VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Business entity type
diff --git a/htdocs/langs/bn_IN/errors.lang b/htdocs/langs/bn_IN/errors.lang
index 7bb0fac3f7b..eabc784e6aa 100644
--- a/htdocs/langs/bn_IN/errors.lang
+++ b/htdocs/langs/bn_IN/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
 ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
 ErrorIsNotADraft=%s is not a draft
 ErrorExecIdFailed=Can't execute command "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # 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/bn_IN/main.lang b/htdocs/langs/bn_IN/main.lang
index c59da9aabec..2d850927782 100644
--- a/htdocs/langs/bn_IN/main.lang
+++ b/htdocs/langs/bn_IN/main.lang
@@ -212,6 +212,8 @@ User=User
 Users=Users
 Group=Group
 Groups=Groups
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=No user group defined
 Password=Password
 PasswordRetype=Retype your password
diff --git a/htdocs/langs/bn_IN/other.lang b/htdocs/langs/bn_IN/other.lang
index 9bc68dc3678..7b509f60ff7 100644
--- a/htdocs/langs/bn_IN/other.lang
+++ b/htdocs/langs/bn_IN/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Password encoding
 PermissionsAdd=Permissions added
 PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
+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
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
 SMSSentTo=SMS sent to %s
diff --git a/htdocs/langs/bn_IN/projects.lang b/htdocs/langs/bn_IN/projects.lang
index 5a2911bac0b..0d9c7ea34c8 100644
--- a/htdocs/langs/bn_IN/projects.lang
+++ b/htdocs/langs/bn_IN/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
 ProjectTasksWithoutTimeSpent=Project tasks without time spent
 FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+StartDateCannotBeAfterEndDate=End date cannot be before start date
diff --git a/htdocs/langs/bn_IN/withdrawals.lang b/htdocs/langs/bn_IN/withdrawals.lang
index f5a33b78eee..bda987276b1 100644
--- a/htdocs/langs/bn_IN/withdrawals.lang
+++ b/htdocs/langs/bn_IN/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
 WithdrawalsLine=Direct debit order line
+CreditTransfer=Credit transfer
 CreditTransferLine=Credit transfer line
 WithdrawalsLines=Direct debit order lines
 CreditTransferLines=Credit transfer lines
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=Classify credited
+ClassDebited=Classify debited
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
 TransMetod=Transmission method
diff --git a/htdocs/langs/bs_BA/admin.lang b/htdocs/langs/bs_BA/admin.lang
index fb83cee004f..adea2378f2f 100644
--- a/htdocs/langs/bs_BA/admin.lang
+++ b/htdocs/langs/bs_BA/admin.lang
@@ -756,7 +756,7 @@ Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
 Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Export transactions and account statements
 Permission116=Transfers between accounts
@@ -893,12 +893,11 @@ Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Read stocks
@@ -962,15 +961,11 @@ Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
@@ -981,9 +976,9 @@ Permission10005=Delete website content
 Permission20001=Read leave requests (your leave and those of your subordinates)
 Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Approve leave requests
 Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
-RecordEvent=Record email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
@@ -2084,7 +2080,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -2130,7 +2126,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+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>
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Missing translation for %s
 NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/bs_BA/companies.lang b/htdocs/langs/bs_BA/companies.lang
index f7ebd56af97..d55125112f1 100644
--- a/htdocs/langs/bs_BA/companies.lang
+++ b/htdocs/langs/bs_BA/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Provjeri
 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.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commission website
-VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Provjera nije moguća. Servis za provjeru nije naveden od stran države članice (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Business entity type
diff --git a/htdocs/langs/bs_BA/errors.lang b/htdocs/langs/bs_BA/errors.lang
index ad1124aeae3..c2fa833e62e 100644
--- a/htdocs/langs/bs_BA/errors.lang
+++ b/htdocs/langs/bs_BA/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
 ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
 ErrorIsNotADraft=%s is not a draft
 ErrorExecIdFailed=Can't execute command "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # 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/bs_BA/main.lang b/htdocs/langs/bs_BA/main.lang
index f4fb2bbc152..6bbe061ed7e 100644
--- a/htdocs/langs/bs_BA/main.lang
+++ b/htdocs/langs/bs_BA/main.lang
@@ -212,6 +212,8 @@ User=Korisnik
 Users=Korisnici
 Group=Grupa
 Groups=Grupe
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=Nije definirana korisnička grupa
 Password=Šifra
 PasswordRetype=Ponovno upišite šifru
diff --git a/htdocs/langs/bs_BA/other.lang b/htdocs/langs/bs_BA/other.lang
index e604efb98f0..993973a6849 100644
--- a/htdocs/langs/bs_BA/other.lang
+++ b/htdocs/langs/bs_BA/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Password encoding
 PermissionsAdd=Permissions added
 PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
+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
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
 SMSSentTo=SMS sent to %s
diff --git a/htdocs/langs/bs_BA/projects.lang b/htdocs/langs/bs_BA/projects.lang
index 8bff7db86ec..7301a6277fc 100644
--- a/htdocs/langs/bs_BA/projects.lang
+++ b/htdocs/langs/bs_BA/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
 ProjectTasksWithoutTimeSpent=Project tasks without time spent
 FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+StartDateCannotBeAfterEndDate=Datum završetka ne može biti prije datuma početka
diff --git a/htdocs/langs/bs_BA/withdrawals.lang b/htdocs/langs/bs_BA/withdrawals.lang
index af78c2f196c..c3386daf3ac 100644
--- a/htdocs/langs/bs_BA/withdrawals.lang
+++ b/htdocs/langs/bs_BA/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
 WithdrawalsLine=Direct debit order line
+CreditTransfer=Credit transfer
 CreditTransferLine=Credit transfer line
 WithdrawalsLines=Direct debit order lines
 CreditTransferLines=Credit transfer lines
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=Označi na potraživanja
+ClassDebited=Classify debited
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
 TransMetod=Transmission method
diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang
index 1e93bbdea77..302fb383700 100644
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -756,7 +756,7 @@ Permission106=Exportar expedicions
 Permission109=Eliminar expedicions
 Permission111=Consultar comptes financers (comptes bancaris, caixes)
 Permission112=Crear/modificar quantitat/eliminar registres bancaris
-Permission113=Configuració de comptes financers (crear i gestionar les categories)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcilia les transaccions
 Permission115=Exporta transaccions i extractes
 Permission116=Captar transferències entre comptes
@@ -893,12 +893,11 @@ Permission701=Consultar donacions
 Permission702=Crear/modificar donacions
 Permission703=Eliminar donacions
 Permission771=Consulta informes de despeses (propis i dels subordinats)
-Permission772=Crear/modificar informe de despeses
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Eliminar els informes de despeses
-Permission774=Consulta tots els informes de despeses (fins i tot per a usuaris no subordinats)
 Permission775=Aprovar els informes de despeses
 Permission776=Pagar informes de despeses
-Permission777=Llegeix els informes de despeses de tothom
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Crea/modifica informes de despeses de tothom
 Permission779=Exportar informes de despeses
 Permission1001=Consulta d'estocs
@@ -962,15 +961,11 @@ Permission2801=Utilitzar el client FTP en mode lectura (només explorar i descar
 Permission2802=Utilitzar el client FTP en mode escriptura (esborrar o pujar arxius)
 Permission3200=Llegiu els esdeveniments arxivats i les empremtes dactilars
 Permission3301=Genera mòduls nous
-Permission4001=Vegeu empleats
-Permission4002=Crea empleats
-Permission4003=Suprimeix els empleats
-Permission4004=Exporta empleats
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
@@ -981,9 +976,9 @@ Permission10005=Suprimeix el contingut del lloc web
 Permission20001=Consulta els dies de lliure disposició (els propis i els dels teus subordinats)
 Permission20002=Crea/modifica els teus dies de lliure disposició (els propis i els dels teus subordinats)
 Permission20003=Elimina les peticions de dies lliures retribuïts
-Permission20004=Consulta totes les sol·licituds de permís (fins i tot dels usuaris no subordinats)
-Permission20005=Crea/modifica sol·licituds de permís per a tothom (fins i tot per a usuaris no subordinats)
-Permission20006=Administra els dies de lliure disposició (configura i actualitza el balanç)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Aproveu sol·licituds de dies lliures
 Permission23001=Consulta les tasques programades
 Permission23002=Crear/Modificar les tasques programades
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Voleu executar ara la recol·lecció d’aquest col
 NoNewEmailToProcess=No hi ha cap correu electrònic nou (filtres coincidents) per a processar
 NothingProcessed=No s'ha fet res
 XEmailsDoneYActionsDone=%s correus electrònics qualificats, %s correus electrònics processats amb èxit (per %s registre / accions realitzades)
-RecordEvent=Registre d'esdeveniments de correu electrònic
-CreateLeadAndThirdParty=Crea Client Potencial (i tercer si és necessari)
-CreateTicketAndThirdParty=Crea un tiquet (i enllaça'l amb un tercer si es va carregar amb una operació anterior)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 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)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 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
 WithDolTrackingIDInMsgId=Missatge enviat des de Dolibarr
@@ -2084,7 +2080,7 @@ CreateCandidature=Crea sol·licitud de feina
 FormatZip=Format Zip
 MainMenuCode=Codi d'entrada del menú (menú principal)
 ECMAutoTree=Mostra l'arbre ECM automàtic
-OperationParamDesc=Definiu els valors a utilitzar per a l'objecte de l'acció, o com extreure valors. Per exemple:<br>objproperty1=SET:el valor a assignar<br>objproperty2=SET:un valor amb substitució de __objproperty1__<br>objproperty3=SETIFEMPTY:valor usat si objproperty3 no ha estat definit<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:El nom de la meva empresa és\\s([^\\s]*)<br><br>Empreu ; com a separador per a extreure o definir diverses propietats alhora.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Horari d'obertura
 OpeningHoursDesc=Introduïu aquí l'horari habitual d'obertura de la vostra empresa.
 ResourceSetup=Configuració del mòdul de recursos
@@ -2130,7 +2126,7 @@ LargerThan=Major que
 IfTrackingIDFoundEventWillBeLinked=Tingueu en compte que si es troba un identificador de seguiment d’un objecte al correu electrònic o si el correu electrònic és una resposta d’un correu electrònic que ja està recollit i enllaçat a un objecte, l’esdeveniment creat s’enllaçarà automàticament a l’objecte relacionat conegut.
 WithGMailYouCanCreateADedicatedPassword=Amb un compte de GMail, si heu activat la validació de dos passos, es recomana crear una segona contrasenya dedicada a l’aplicació en comptes d’utilitzar la contrasenya del vostre compte des de https://myaccount.google.com/.
 EmailCollectorTargetDir=Pot ser un comportament desitjat traslladar el correu electrònic a una altra etiqueta/directori quan s'ha processat correctament. Només heu de definir el nom del directori per a utilitzar aquesta funció (NO utilitzeu caràcters especials en el nom). Tingueu en compte que també heu d'utilitzar un compte d'inici de sessió de lectura/escriptura.
-EmailCollectorLoadThirdPartyHelp=Podeu utilitzar aquesta acció per utilitzar el contingut del correu electrònic per trobar i carregar un tercer existent a la vostra base de dades. El tercer trobat (o creat) s'utilitzarà per seguir les accions que ho necessitin. <br> Per exemple, si voleu crear un tercer amb un nom extret de la cadena "Nom: nom per trobar" al cos, utilitzeu el correu electrònic del remitent com a correu electrònic, podeu configurar el camp del paràmetre així: ^ De: (. *); Nom = EXTRACTE: COS: Nom: \\ s ([^ \\ s] *); client = SET: 2; ' <br>
+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>
 EndPointFor=Punt final per %s: %s
 DeleteEmailCollector=Suprimeix el recollidor de correu electrònic
 ConfirmDeleteEmailCollector=Esteu segur que voleu suprimir aquest recollidor de correu electrònic?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Missing translation for %s
 NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/ca_ES/companies.lang b/htdocs/langs/ca_ES/companies.lang
index 6cb28b88d54..9d5034df19b 100644
--- a/htdocs/langs/ca_ES/companies.lang
+++ b/htdocs/langs/ca_ES/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=CIF/NIF
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Verificar
 VATIntraCheckDesc=L'enllaç <b>%s</b> permet consultar el NIF intracomunitari al servei de control europeu. Es requereix accés a internet per a que el servei funcioni.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Verifica el NIF Intracomunitari a la web de la Comissió Europea
-VATIntraManualCheck=També podeu verificar-ho manualment al lloc web de la Comissió Europea <a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Comprovació impossible. El servei de comprovació no és prestat pel país membre (%s).
 NorProspectNorCustomer=Ni client, ni client potencial
 JuridicalStatus=Tipus d'entitat empresarial
diff --git a/htdocs/langs/ca_ES/errors.lang b/htdocs/langs/ca_ES/errors.lang
index d90aaf280d0..59b51abe81d 100644
--- a/htdocs/langs/ca_ES/errors.lang
+++ b/htdocs/langs/ca_ES/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=El nom del fitxer no pot contenir __COSA__
 ErrorNotInDictionaryPaymentConditions=No es troba al Diccionari de condicions de pagament, modifiqueu-lo.
 ErrorIsNotADraft=%s no és un esborrany
 ErrorExecIdFailed=Can't execute command "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # 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.
diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang
index 02c46aadcf2..d6eeee42f7d 100644
--- a/htdocs/langs/ca_ES/main.lang
+++ b/htdocs/langs/ca_ES/main.lang
@@ -212,6 +212,8 @@ User=Usuari
 Users=Usuaris
 Group=Grup
 Groups=Grups
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=Grup d'usuari no definit
 Password=Contrasenya
 PasswordRetype=Repetir contrasenya
diff --git a/htdocs/langs/ca_ES/other.lang b/htdocs/langs/ca_ES/other.lang
index 628f1964203..b1844407a52 100644
--- a/htdocs/langs/ca_ES/other.lang
+++ b/htdocs/langs/ca_ES/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Codificació de contrasenya
 PermissionsAdd=Permisos afegits
 PermissionsDelete=Permisos eliminats
 YourPasswordMustHaveAtLeastXChars=La teva contrasenya ha de tenir almenys <strong>%s</strong> \ncaràcters
+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
 YourPasswordHasBeenReset=La teva contrasenya s'ha restablert correctament
 ApplicantIpAddress=Adreça IP del sol·licitant
 SMSSentTo=SMS enviat a %s
diff --git a/htdocs/langs/ca_ES/projects.lang b/htdocs/langs/ca_ES/projects.lang
index 0bfa10b6bc7..765f56996b7 100644
--- a/htdocs/langs/ca_ES/projects.lang
+++ b/htdocs/langs/ca_ES/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Nota: els projectes existents a
 SelectLinesOfTimeSpentToInvoice=Seleccioneu les línies de temps que no es facturen i, a continuació, feu una acció massiva "Genera factura" per facturar-les
 ProjectTasksWithoutTimeSpent=Project tasks without time spent
 FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+StartDateCannotBeAfterEndDate=La data de fi no pot ser anterior a la d'inici
diff --git a/htdocs/langs/ca_ES/withdrawals.lang b/htdocs/langs/ca_ES/withdrawals.lang
index 7c62e5afb4f..6c0831a2d30 100644
--- a/htdocs/langs/ca_ES/withdrawals.lang
+++ b/htdocs/langs/ca_ES/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Ordre de transferència bancària
 LatestBankTransferReceipts=Les %s últimes ordres de transferència bancària
 LastWithdrawalReceipts=Últims %s fitxers per a la domiciliació bancària
 WithdrawalsLine=Línia d'ordre de domiciliació
+CreditTransfer=Transferència bancària
 CreditTransferLine=Línia de transferència bancària
 WithdrawalsLines=Línies d'ordre de domiciliació
 CreditTransferLines=Línies de transferència bancària
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Codi bancari de tercers
 NoInvoiceCouldBeWithdrawed=Cap factura s'ha carregat amb èxit. Comproveu que els tercers de les factures tenen un IBAN vàlid i que IBAN té un RUM (Referència de mandat exclusiva) amb mode <strong>%s</strong>.
 WithdrawalCantBeCreditedTwice=Aquesta domiciliació ja està marcada com a cobrada; això no es pot fer dues vegades, ja que això podria generar duplicats de pagaments i entrades bancàries.
 ClassCredited=Classifica com "Abonada"
+ClassDebited=Classify debited
 ClassCreditedConfirm=Esteu segur de voler classificar aquesta domiciliació com abonada al seu compte bancari?
 TransData=Data enviament
 TransMetod=Mètode enviament
diff --git a/htdocs/langs/cs_CZ/admin.lang b/htdocs/langs/cs_CZ/admin.lang
index 3396c81105a..a03135f0814 100644
--- a/htdocs/langs/cs_CZ/admin.lang
+++ b/htdocs/langs/cs_CZ/admin.lang
@@ -756,7 +756,7 @@ Permission106=Exportujte odesílání
 Permission109=Smazat odesílání
 Permission111=Přečtěte si finanční účty
 Permission112=Vytvořit/upravit/smazat a porovnat transakce
-Permission113=Nastavení finančních účtů (vytváření, správa kategorií)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Sladění transakcí
 Permission115=Exportní transakce a výpisy z účtu
 Permission116=Převody mezi účty
@@ -893,12 +893,11 @@ Permission701=Přečtěte si dary
 Permission702=Vytvářejte/upravujte dary
 Permission703=Odstranit dary
 Permission771=Přečtěte si přehledy výdajů (vaše a vaše podřízené)
-Permission772=Vytvářejte/upravujte výkazy výdajů
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Odstraňte přehledy výdajů
-Permission774=Přečtěte si všechny přehledy výdajů (i pro uživatele, kteří nejsou podřízenými)
 Permission775=Schvalovat zprávy o výdajích
 Permission776=Zaplatit vyúčtování výdajů
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=Export výkazů o výdajích
 Permission1001=Přečtěte si zásoby
@@ -962,15 +961,11 @@ Permission2801=Používejte FTP klienta v režimu čtení (pouze procházení a
 Permission2802=Použití FTP klienta v režimu zápisu (mazání nebo odesílání souborů)
 Permission3200=Přečtěte si archivované události a otisky prstů
 Permission3301=Generate new modules
-Permission4001=Viz zaměstnanci
-Permission4002=Vytvářejte zaměstnance
-Permission4003=Smazat zaměstnance
-Permission4004=Exportovat zaměstnance
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
@@ -981,9 +976,9 @@ Permission10005=Smazat obsah webových stránek
 Permission20001=Přečtěte si žádosti o dovolenou (vaše dovolená a vaše podřízené)
 Permission20002=Vytvořte / upravte své žádosti o dovolenou (vaše dovolená a vaše podřízené)
 Permission20003=Smazat žádosti o dovolenou
-Permission20004=Přečtěte si všechny požadavky na dovolenou (i u uživatelů, kteří nejsou podřízeni)
-Permission20005=Vytvářet / upravovat požadavky na dovolenou pro všechny (i pro uživatele, kteří nejsou podřízeni)
-Permission20006=Žádosti admin opuštěné požadavky (setup a aktualizovat bilance)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Schvalovat žádosti o dovolenou
 Permission23001=Čtení naplánovaných úloh
 Permission23002=Vytvoření/aktualizace naplánované úlohy
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Chcete nyní spustit kolekci tohoto sběratele?
 NoNewEmailToProcess=Žádné nové e-maily (odpovídající filtry), které chcete zpracovat
 NothingProcessed=Nic se nestalo
 XEmailsDoneYActionsDone=%s e-maily kvalifikovány, %s úspěšně zpracovány emaily (pro %s záznam / akce provedeny) podle sběratele
-RecordEvent=Nahrávat událost e-mailu
-CreateLeadAndThirdParty=Vytvoření vedení (a případně subjekty)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 CodeLastResult=Výstup posledního kódu
 NbOfEmailsInInbox=Počet e-mailů ve zdrojovém adresáři
 LoadThirdPartyFromName=Načíst vyhledávání subjektem na adrese %s (pouze načíst)
 LoadThirdPartyFromNameOrCreate=Načíst vyhledávání subjektů na adrese %s (vytvořit, pokud nebyly nalezeny)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
@@ -2084,7 +2080,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Vstupní kód nabídky (hlavní menu)
 ECMAutoTree=Zobrazit automatický strom ECM
-OperationParamDesc=Definujte hodnoty, které mají být použity pro objekt akce nebo jak extrahovat hodnoty. Například: <br> objproperty1 = SET: hodnota, která se má nastavit <br> objproperty2 = SET: hodnota s nahrazením __objproperty1__ <br> objproperty3 = SETIFEMPTY: použitá hodnota, pokud objproperty3 ještě není definována<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>Použijte a; char jako oddělovač pro extrahování nebo nastavení několika vlastností.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Otevírací doba
 OpeningHoursDesc=Zadejte zde běžnou pracovní dobu vaší společnosti.
 ResourceSetup=Konfigurace modulu zdrojů
@@ -2130,7 +2126,7 @@ LargerThan=Větší než
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=Pokud jste s účtem GMail povolili ověření ve 2 - dvou krocích, doporučuje se pro aplikaci vytvořit vyhrazené druhé heslo namísto použití hesla pro vlastní účet z adresy https://myaccount.google.com/.
 EmailCollectorTargetDir=Po úspěšném zpracování může být žádoucí chování při přesunu e-mailu do jiné značky/adresáře. Chcete-li tuto funkci použít, stačí zadat název adresáře (NEPOUŽÍVEJTE v názvu speciální znaky). Musíte také použít přihlašovací účet pro čtení a zápis.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+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>
 EndPointFor=Koncový bod pro %s: %s
 DeleteEmailCollector=Smazat sběratele e-mailu
 ConfirmDeleteEmailCollector=Opravdu chcete smazat tohoto sběratele e-mailů?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Missing translation for %s
 NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/cs_CZ/companies.lang b/htdocs/langs/cs_CZ/companies.lang
index 664f07aa430..d9f445c958c 100644
--- a/htdocs/langs/cs_CZ/companies.lang
+++ b/htdocs/langs/cs_CZ/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Kontrola
 VATIntraCheckDesc=Kód DPH ID musí obsahovat předčíslí země. Odkaz <b> %s </b> používá službu European VAT Checker (VIES), která vyžaduje přístup na internet z Dolibarr serveru.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Zkontrolujte ID DPH uvnitř Společenství na webových stránkách Evropské komise
-VATIntraManualCheck=Můžete také zkontrolovat ručně na evropských stránkách <a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Kontrola není možná. Služba není členským státem poskytována (%s).
 NorProspectNorCustomer=Ani cíl, ani zákazník
 JuridicalStatus=Business entity type
diff --git a/htdocs/langs/cs_CZ/errors.lang b/htdocs/langs/cs_CZ/errors.lang
index d40e31bdc18..3185f5fe7ac 100644
--- a/htdocs/langs/cs_CZ/errors.lang
+++ b/htdocs/langs/cs_CZ/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
 ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
 ErrorIsNotADraft=%s is not a draft
 ErrorExecIdFailed=Can't execute command "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Váš parametr PHP upload_max_filesize (%s) je vyšší než parametr PHP post_max_size (%s). Toto není konzistentní nastavení.
diff --git a/htdocs/langs/cs_CZ/main.lang b/htdocs/langs/cs_CZ/main.lang
index f52e6dc9578..6b8b2ce6f07 100644
--- a/htdocs/langs/cs_CZ/main.lang
+++ b/htdocs/langs/cs_CZ/main.lang
@@ -212,6 +212,8 @@ User=Uživatel
 Users=Uživatelé
 Group=Skupina
 Groups=Skupiny
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=Žádná uživatelská skupina není definována
 Password=Heslo
 PasswordRetype=Zadejte znovu heslo
diff --git a/htdocs/langs/cs_CZ/other.lang b/htdocs/langs/cs_CZ/other.lang
index ce616844225..1aa196e21be 100644
--- a/htdocs/langs/cs_CZ/other.lang
+++ b/htdocs/langs/cs_CZ/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Kódování hesla
 PermissionsAdd=Bylo přidáno oprávnění
 PermissionsDelete=Oprávnění byla odstraněna
 YourPasswordMustHaveAtLeastXChars=Vaše heslo musí mít alespoň <strong> %s </strong> znaky
+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
 YourPasswordHasBeenReset=Vaše heslo bylo úspěšně obnoveno
 ApplicantIpAddress=IP adresa žadatele
 SMSSentTo=SMS odeslaná na %s
diff --git a/htdocs/langs/cs_CZ/projects.lang b/htdocs/langs/cs_CZ/projects.lang
index 71e5f2bee1a..614ddbeaca4 100644
--- a/htdocs/langs/cs_CZ/projects.lang
+++ b/htdocs/langs/cs_CZ/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
 ProjectTasksWithoutTimeSpent=Project tasks without time spent
 FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+StartDateCannotBeAfterEndDate=Datum ukončení nemůže být před datem zahájení
diff --git a/htdocs/langs/cs_CZ/withdrawals.lang b/htdocs/langs/cs_CZ/withdrawals.lang
index 0e69065487a..53775d8a6f1 100644
--- a/htdocs/langs/cs_CZ/withdrawals.lang
+++ b/htdocs/langs/cs_CZ/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Příkaz k převodu
 LatestBankTransferReceipts=Poslední příkazy k úhradě %s
 LastWithdrawalReceipts=Poslední %s soubory inkasní
 WithdrawalsLine=Řádek přímého inkasa
+CreditTransfer=Převod peněz
 CreditTransferLine=Řádek na úhradu
 WithdrawalsLines=Řádky výběrů
 CreditTransferLines=Řádky na úhradu
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Kód banky subjektu
 NoInvoiceCouldBeWithdrawed=Žádná faktura nebyla odepsána úspěšně. Zkontrolujte, zda jsou faktury u společností s platným IBAN a zda má IBAN UMR (Unique Mandate Reference) s režimem <strong> %s </strong>.
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=Označit přidání kreditu
+ClassDebited=Classify debited
 ClassCreditedConfirm=Jste si jisti, že chcete zařadit tento výběr příjmu jako připsaný na váš bankovní účet?
 TransData=Datum přenosu
 TransMetod=Způsob přenosu
diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang
index 84aec73bf1c..379f04aa920 100644
--- a/htdocs/langs/da_DK/admin.lang
+++ b/htdocs/langs/da_DK/admin.lang
@@ -756,7 +756,7 @@ Permission106=Eksporter forsendelser
 Permission109=Slet forsendelser
 Permission111=Læs finanskonti
 Permission112=Opret/rediger/slet og sammenlign transaktioner
-Permission113=Opsæt finanskonti (opret, håndter kategorier)
+Permission113=Opret finansielle konti (opret, administrer kategorier af banktransaktioner)
 Permission114=Afstem transaktioner
 Permission115=Eksporttransaktioner og kontoudtog
 Permission116=Overførsler mellem konti
@@ -893,12 +893,11 @@ Permission701=Læs donationer
 Permission702=Opret/rediger donationer
 Permission703=Slet donationer
 Permission771=Læs omkostningsrapporter (din og dine underordnede)
-Permission772=Opret / modificer omkostningsrapporter
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Slet udgiftsrapporter
-Permission774=Læs alle udgiftsrapporter (selv for brugere, der ikke er underordnede)
 Permission775=Godkendelse af udgiftsrapporter
 Permission776=Betalingsomkostningsrapporter
-Permission777=Læs udgiftsrapporter fra alle
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Opret / rediger udgiftsrapporter for alle
 Permission779=Eksportudgiftsrapporter
 Permission1001=Læs bestande
@@ -962,15 +961,11 @@ Permission2801=Brug FTP-klient i læsemodus (kun gennemse og download)
 Permission2802=Brug FTP-klient i skrivefunktion (slet eller upload filer)
 Permission3200=Læs arkiverede begivenheder og fingeraftryk
 Permission3301=Generer nye moduler
-Permission4001=Se medarbejdere
-Permission4002=Opret medarbejdere
-Permission4003=Slet medarbejdere
-Permission4004=Eksporter medarbejdere
-Permission4010=Læs færdigheder/job/stilling
-Permission4011=Opret/ændre færdigheder/job/position
-Permission4012=Slet færdighed/job/stilling
-Permission4020=Læs evaluering
-Permission4021=Opret/ændre evaluering
+Permission4001=Læs færdigheder/job/stilling
+Permission4002=Opret/ændre færdigheder/job/position
+Permission4003=Slet færdighed/job/stilling
+Permission4020=Læs evalueringer
+Permission4021=Create/modify your evaluation
 Permission4022=Valider evaluering
 Permission4023=Slet evaluering
 Permission4030=Se sammenligningsmenu
@@ -981,9 +976,9 @@ Permission10005=Slet webstedsindhold
 Permission20001=Læs tilladelsesforespørgsler (din orlov og dine underordnede)
 Permission20002=Opret / rediger dine anmodninger om orlov (din ferie og dine underordnede)
 Permission20003=Slet permitteringsforespørgsler
-Permission20004=Læs alle orlovs forespørgsler (selv om bruger ikke er underordnede)
-Permission20005=Opret / modtag anmodninger om orlov for alle (selv af bruger ikke underordnede)
-Permission20006=Forladelsesforespørgsler (opsætning og opdateringsbalance)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Godkend orlovsanmodninger
 Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Vil du køre kollektionen for denne samler nu?
 NoNewEmailToProcess=Ingen ny email (matchende filtre), der skal behandles
 NothingProcessed=Intet gjort
 XEmailsDoneYActionsDone=%s e-mails kvalificerede, %s e-mails er behandlet (for %s-registrering / handlinger udført)
-RecordEvent=Optag email-begivenhed
-CreateLeadAndThirdParty=Opret ledelse (og tredjepart om nødvendigt)
-CreateTicketAndThirdParty=Opret billet (og link til tredjepart, hvis den blev indlæst af en tidligere operation)
+RecordEvent=Optag en begivenhed i dagsordenen (med typen E-mail sendt eller modtaget)
+CreateLeadAndThirdParty=Opret et kundeemne (og en tredjepart om nødvendigt)
+CreateTicketAndThirdParty=Opret en opgave (linket til en tredjepart, hvis tredjeparten blev indlæst af en tidligere handling, uden nogen anden tredjepart)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Antal e-mails i kildekataloget
 LoadThirdPartyFromName=Indlæs tredjeparts søgning på %s (kun belastning)
 LoadThirdPartyFromNameOrCreate=Indlæs tredjepartssøgning på %s (opret hvis ikke fundet)
+AttachJoinedDocumentsToObject=Gem vedhæftede filer i objektdokumenter, hvis der findes en ref for et objekt i e-mail-emnet.
 WithDolTrackingID=Besked fra en samtale startet af en første e-mail sendt fra Dolibarr
 WithoutDolTrackingID=Besked fra en samtale startet af en første e-mail, der IKKE blev sendt fra Dolibarr
 WithDolTrackingIDInMsgId=Besked sendt fra Dolibarr
@@ -2084,7 +2080,7 @@ CreateCandidature=Opret jobansøgning
 FormatZip=Postnummer
 MainMenuCode=Menu indtastningskode (hovedmenu)
 ECMAutoTree=Vis automatisk ECM-træ
-OperationParamDesc=Definer de værdier, der skal bruges til genstand for handlingen, eller hvordan man udtrækker værdier. For eksempel:<br>objproperty1=SET:den værdi, der skal indstilles<br>objproperty2=SET:en værdi med udskiftning af __objproperty1__<br>objproperty3=SETIFEMPTY:værdi brugt, hvis objproperty3 ikke allerede er defineret<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>Brug en ; char som separator for at udtrække eller indstille flere egenskaber.
+OperationParamDesc=Definer de regler, der skal bruges til at udtrække eller angive værdier. <br> Eksempel på operationer, der skal udtrække et navn fra e-mailens emne: <br> name=EXTRACT:SUBJECT:Besked fra virksomheden ([^\n] *) <br> eksempel til operationer, der skaber objekter: <br> objproperty1 = SET: værdien til sæt <br> objproperty2 = SET: en værdi inklusive værdi af __objproperty1__ <br> objproperty3 = SETIFEMPTY: værdi anvendes, hvis objproperty3 ikke allerede defineret <br> objproperty4 = EKSTRAKT: HEADER :X-Myheaderkey:\\s*([^\\s]*) <br> options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*) <br> object.objproperty5=EXTRACT:BODY(Mit firmanavn er\\s(Mit firmanavn er\\s: [^\\s]*) <br> <br> Brug en ; char som separator for at udtrække eller indstille flere egenskaber.
 OpeningHours=Åbningstider
 OpeningHoursDesc=Indtast her firmaets almindelige åbningstider.
 ResourceSetup=Konfiguration af ressource modul
@@ -2130,7 +2126,7 @@ LargerThan=Større end
 IfTrackingIDFoundEventWillBeLinked=Bemærk, at hvis et sporings-id for et objekt findes i e-mailen, eller hvis e-mailen er et svar fra en e-mail-område, der er indsamlet og linket til et objekt, vil den oprettede begivenhed automatisk blive linket til det kendte relaterede objekt.
 WithGMailYouCanCreateADedicatedPassword=Hvis du aktiverer valideringen af 2 trin med en GMail konto, anbefales det at oprette en dedikeret anden adgangskode til applikationen i stedet for at bruge dit eget kontos kodeord fra https://myaccount.google.com/.
 EmailCollectorTargetDir=Det kan være en ønsket opførsel at flytte e-mailen til et andet tag/bibliotek, når den blev behandlet med succes. Angiv blot navnet på kataloget her for at bruge denne funktion (Brug IKKE specialtegn i navnet). Bemærk, at du også skal bruge en læse/skrive logind konto.
-EmailCollectorLoadThirdPartyHelp=Du kan bruge denne handling til at bruge e-mail-indholdet til at finde og indlæse en eksisterende tredjepart i din database. Den fundne (eller oprettede) tredjepart vil blive brugt til at følge handlinger, der har brug for det. <br> Hvis du f.eks. vil oprette en tredjepart med et navn, der er ekstraheret en streng 'Name: name to find' fundet i kroppen, skal du bruge afsender-e-mail som e-mail, kan du indstille parameterfeltet således: <br> 'email = HEADER: ^ Fra: (. *); Navn = UDTRÆK: KROPP: Navn: \\ s ([^ \\ s] *); klient = SET: 2; ' <br>
+EmailCollectorLoadThirdPartyHelp=Du kan bruge denne handling til at bruge e-mail-indholdet til at finde og indlæse en eksisterende tredjepart i din database. Den fundne (eller oprettede) tredjepart vil blive brugt til følgende handlinger, der har brug for det. <br> For eksempel, hvis du vil oprette en tredjepart med et navn udtrukket fra en streng 'Navn: navn at finde' til stede i brødteksten, skal du bruge afsenderens e-mail som e-mail, du kan indstille parameterfeltet sådan: <br> 'email= HEADER:^Fra:(.*);navn=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;' <br>
 EndPointFor=Slutpunkt for %s: %s
 DeleteEmailCollector=Slet e-mail-indsamler
 ConfirmDeleteEmailCollector=Er du sikker på, at du vil slette denne e-mail-indsamler?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Manglende oversættelse for %s
 NativeModules=Native moduler
 NoDeployedModulesFoundWithThisSearchCriteria=Ingen moduler fundet til disse søgekriterier
 API_DISABLE_COMPRESSION=Deaktiver komprimering af API-svar
+EachTerminalHasItsOwnCounter=Hver terminal bruger sin egen tæller.
diff --git a/htdocs/langs/da_DK/companies.lang b/htdocs/langs/da_DK/companies.lang
index e95ec705f32..61988ba219c 100644
--- a/htdocs/langs/da_DK/companies.lang
+++ b/htdocs/langs/da_DK/companies.lang
@@ -157,15 +157,15 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
-ProfId1CM=Id. prof. 1 (Registre de Commerce)
-ProfId2CM=Id. prof. 2 (N° Contribuable)
-ProfId3CM=Id. prof. 3 (N° Arrêté de création)
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
 ProfId4CM=-
 ProfId5CM=-
 ProfId6CM=-
-ProfId1ShortCM=Registre de Commerce
-ProfId2ShortCM=N° Contribuable
-ProfId3ShortCM=N° Arrêté de création
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
 ProfId4ShortCM=-
 ProfId5ShortCM=-
 ProfId6ShortCM=-
@@ -381,7 +381,7 @@ VATIntraCheck=Kontrollere
 VATIntraCheckDesc=Moms nummer skal indeholde landets præfiks. Linket <b> %s </b> bruger den europæiske momscheckertjeneste (VIES), det kræver internetadgang fra serveren.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Kontroller moms nummer på EU webside
-VATIntraManualCheck=Du kan også tjekke manuelt på Europa-Kommissionens websted <a href="%s" target="_blank"> %s </a>
+VATIntraManualCheck=Du kan også tjekke manuelt på Europa-Kommissionens websted <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a>
 ErrorVATCheckMS_UNAVAILABLE=Kontrol er ikke muligt. Denne service leveres ikke af medlemsstaten (%s).
 NorProspectNorCustomer=Ikke mulighedder eller kunde
 JuridicalStatus=Forretningsenhedstype
diff --git a/htdocs/langs/da_DK/errors.lang b/htdocs/langs/da_DK/errors.lang
index a1cb962c885..61f5197ab73 100644
--- a/htdocs/langs/da_DK/errors.lang
+++ b/htdocs/langs/da_DK/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=Filens navn kan ikke indeholde __SOMETHING__
 ErrorNotInDictionaryPaymentConditions=Ikke i ordbogen om betalingsbetingelser, bedes du ændre.
 ErrorIsNotADraft=%s er ikke et udkast
 ErrorExecIdFailed=Kan ikke udføre kommandoen "id"
+ErrorBadCharIntoLoginName=Ikke godkendt tegn i login-navnet
 
 # 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.
diff --git a/htdocs/langs/da_DK/main.lang b/htdocs/langs/da_DK/main.lang
index 04799e28eea..a26ccbaf620 100644
--- a/htdocs/langs/da_DK/main.lang
+++ b/htdocs/langs/da_DK/main.lang
@@ -212,6 +212,8 @@ User=Bruger
 Users=Brugere
 Group=Gruppe
 Groups=Grupper
+UserGroup=Brugergruppe
+UserGroups=Brugergrupper
 NoUserGroupDefined=Ingen brugergruppe definéret
 Password=Kodeord
 PasswordRetype=Gentag dit kodeord
diff --git a/htdocs/langs/da_DK/other.lang b/htdocs/langs/da_DK/other.lang
index 5658a4714c1..9518d8764c6 100644
--- a/htdocs/langs/da_DK/other.lang
+++ b/htdocs/langs/da_DK/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Kodeord for kodeord
 PermissionsAdd=Tilladelser tilføjet
 PermissionsDelete=Tilladelser fjernet
 YourPasswordMustHaveAtLeastXChars=Dit kodeord skal have mindst <strong> %s </ strong> tegn
+PasswordNeedAtLeastXUpperCaseChars=Adgangskoden skal have mindst <strong> %s </strong> store bogstaver
+PasswordNeedAtLeastXDigitChars=Adgangskoden skal have mindst <strong> %s </strong> numeriske tegn
+PasswordNeedAtLeastXSpecialChars=Adgangskoden skal mindst have <strong> %s </strong> specielle tegn
+PasswordNeedNoXConsecutiveChars=Adgangskoden må ikke have <strong> %s </strong> fortløbende lignende tegn
 YourPasswordHasBeenReset=Dit kodeord er nulstillet
 ApplicantIpAddress=Ansøgerens IP-adresse
 SMSSentTo=SMS sendt til %s
diff --git a/htdocs/langs/da_DK/projects.lang b/htdocs/langs/da_DK/projects.lang
index 711a58d5354..f0436a75586 100644
--- a/htdocs/langs/da_DK/projects.lang
+++ b/htdocs/langs/da_DK/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Bemærk: eksisterende projekter
 SelectLinesOfTimeSpentToInvoice=Vælg tidslinjer, der ikke er faktureret, og masseforanstaltning "Generer faktura" for at fakturere dem
 ProjectTasksWithoutTimeSpent=Projektopgaver uden brugt tid
 FormForNewLeadDesc=Tak for at udfylde nedenstående formular for at kontakte os. Du kan også sende os en e -mail direkte til <b> %s </b>.
+StartDateCannotBeAfterEndDate=End date cannot be before start date
diff --git a/htdocs/langs/da_DK/withdrawals.lang b/htdocs/langs/da_DK/withdrawals.lang
index 091e52492fa..5f5ab0c61f3 100644
--- a/htdocs/langs/da_DK/withdrawals.lang
+++ b/htdocs/langs/da_DK/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Kredit overførsels ordre
 LatestBankTransferReceipts=Seneste %s kredit overførsels ordrer
 LastWithdrawalReceipts=Seneste %s direkte debit-filer
 WithdrawalsLine=Linje med direkte debitering
+CreditTransfer=Kreditoverførsel
 CreditTransferLine=Kreditoverførsels linje
 WithdrawalsLines=Direkte debitordre
 CreditTransferLines=Kreditoverførsels linjer
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Tredjeparts bankkode
 NoInvoiceCouldBeWithdrawed=Ingen faktura debiteres med succes. Kontroller, at fakturaer er på virksomheder med en gyldig IBAN, og at IBAN har en UMR (Unique Mandate Reference) med tilstanden <strong> %s </ strong>.
 WithdrawalCantBeCreditedTwice=Denne kvittering for tilbagetrækning er allerede markeret som krediteret. dette kan ikke gøres to gange, da dette potentielt kan skabe dobbeltbetalinger og bankindtastninger.
 ClassCredited=Klassificere krediteres
+ClassDebited=Klassificer debiteret
 ClassCreditedConfirm=Er du sikker på at du vil klassificere denne tilbagetrækning modtagelse som krediteres på din bankkonto?
 TransData=Dato Transmission
 TransMetod=Metode Transmission
diff --git a/htdocs/langs/de_AT/admin.lang b/htdocs/langs/de_AT/admin.lang
index 89b7852d748..9376de90964 100644
--- a/htdocs/langs/de_AT/admin.lang
+++ b/htdocs/langs/de_AT/admin.lang
@@ -147,10 +147,10 @@ LDAPFieldFullname=vollständiger Name
 ClickToDialSetup=Click-to-Dial-Moduleinstellungen
 MailToSendShipment=Sendungen
 MailToSendIntervention=Eingriffe
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 MAIN_OPTIMIZEFORCOLORBLINDDesc=Aktiviere diese Option wenn Sie Farbenblind sind, in machen Fällen wird die Farbeinstellung geändert um den Kontrast zu erhöhen.
 WithGMailYouCanCreateADedicatedPassword=Wenn Sie bei einem GMail-Konto die Überprüfung in zwei Schritten aktiviert haben, wird empfohlen, ein dediziertes zweites Kennwort für die Anwendung zu erstellen, anstatt Ihr eigenes Kontokennwort von https://myaccount.google.com/ zu verwenden.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+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>
 EndPointFor=Endpunkt für %s: %s
 DeleteEmailCollector=E-Mail-Sammler löschen
 ConfirmDeleteEmailCollector=Möchten Sie diesen E-Mail-Sammler wirklich löschen?
diff --git a/htdocs/langs/de_CH/admin.lang b/htdocs/langs/de_CH/admin.lang
index 130f44e88e2..be5b7173f04 100644
--- a/htdocs/langs/de_CH/admin.lang
+++ b/htdocs/langs/de_CH/admin.lang
@@ -102,6 +102,7 @@ AddDropDatabase=DROP DATABASE Befehl hinzufügen
 AddDropTable=DROP TABLE Befehl hinzufügen
 IgnoreDuplicateRecords=Fehler durch doppelte Zeilen ignorieren (INSERT IGNORE)
 BoxesDesc=Boxen (Widgets) sind Informationsblöcke, die man für personalisierte Ansichten verwenden kann. Gib bei einer Box an, auf welcher Ansicht Sie erscheinen soll und Klicke auf "Aktivieren" - oder entferne eine Box über das Papierkorbsymbol.
+OnlyActiveElementsAreShown=Nur Elemente aus <a href="%s">aktiven Module</a> werden angezeigt.
 ModulesMarketPlaceDesc=Sie finden weitere Module auf externen Websites
 ModulesDeployDesc=Hier kannst du Module und Apps von Drittanbietern in deine Umgebung einbinden. Dazu braucht es lokale Schreibrechte auf deiner Webserverumgebung. Diese Module erscheinen danach hier im Tab "<strong>%s</strong>"
 ModulesMarketPlaces=Suche externe Module
@@ -221,6 +222,7 @@ HideRefOnPDF=Verstecke Produktnummern
 HideDetailsOnPDF=Verstecke Produktzeilen
 PlaceCustomerAddressToIsoLocation=ISO Position für die Kundenadresse verwenden
 GetSecuredUrl=Holen der berechneten URL
+ButtonHideUnauthorized=Verstecke nicht autorisierte Aktionsschaltflächen auch für interne Benutzer (ansonsten nur grau)
 OldVATRates=Alter MwSt. Satz
 NewVATRates=Neuer MwSt. Satz
 MassConvert=Massenkonvertierung starten
@@ -251,6 +253,7 @@ EraseAllCurrentBarCode=Alle aktuellen Barcode-Werte löschen
 ConfirmEraseAllCurrentBarCode=Wirklich alle aktuellen Barcode-Werte löschen?
 AllBarcodeReset=Alle Barcode-Werte wurden entfernt
 NoBarcodeNumberingTemplateDefined=Mir fehlt ein aktives Barcode - Nummernschema. Das wird im Modul "Barcodes" aktiviert.
+EnableFileCache=Dateicache aktivieren
 ShowDetailsInPDFPageFoot=Mehr Detailinfos in der Fusszeile anzeigen, wie z.B. Firmenadresse, oder Vertreternamen  (Zusätzlich zur Firmennummer, Firmenvermögen und MWST - Nummer).
 NoDetails=Keine weiteren Details in der Fusszeile
 DisplayCompanyManagers=Anzeige der Namen der Geschäftsführung
@@ -325,6 +328,7 @@ Module1520Desc=E-Mail Kampagnendokument erstellen
 Module1780Name=Kategorien/#tags
 Module2000Desc=Ermöglicht die Bearbeitung von Textfeldern mit dem CKEditor (html).
 Module2200Desc=Mathematische Ausdrücke für Preise aktivieren
+Module2300Name=Geplante Aufträge
 Module2300Desc=Geplante Aufgaben (CronJobs, ChronoTable) verwalten.
 Module2400Name=Ereignisse/Termine
 Module2400Desc=Ereignisse verfolgen. Lassen Sie Dolibarr automatische Ereignisse zur Verfolgung protokollieren oder nehmen Sie manuelle Ereignisse oder Besprechungen auf. Dies ist das Hauptmodul für ein gutes Management von Kunden- oder Lieferanten-Beziehungen.
@@ -461,6 +465,7 @@ WatermarkOnDraftProposal=Wasserzeichen auf Angebots-Entwurf (keines, falls leer)
 OrdersNumberingModules=Bestellnumerierungs-Module
 OrdersModelModule=Bestellvorlagenmodule
 WatermarkOnDraftOrders=Wasserzeichen auf Bestellungs-Entwurf (keines, wenn leer)
+ShippableOrderIconInList=In Auftragsliste ein entsprechendes Icon zufügen, wenn die Bestellung versandbereit ist
 InterventionsSetup=Servicemoduleinstellungen
 FreeLegalTextOnInterventions=Freier Rechtstext auf Interventions Dokument
 FicheinterNumberingModules=Intervention Nummerierung Module
@@ -522,6 +527,7 @@ MultiCompanySetup=Multi-Company-Moduleinstellungen
 SuppliersSetup=Modul Lieferanten einrichten
 TestGeoIPResult=Test einer Umwandlung IP -> Land
 TasksNumberingModules=Aufgaben-Nummerierungs-Modul
+MAIN_APPLICATION_TITLE=Erzwinge sichtbaren Anwendungsnamen (Warnung: Setzen Ihres eigenen Namen hier, kann Autofill Login-Funktion abbrechen, wenn Sie DoliDroid Anwendung nutzen)
 NbMajMin=Mindestanzahl Grossbuchstaben
 TemplatePDFExpenseReports=Dokumentvorlagen zur Spesenabrechnung Dokument erstellen
 ExpenseReportsRulesSetup=Modul Spesenabrechnungen (Regeln) einrichten
@@ -570,8 +576,7 @@ NewEmailCollector=Neuer E-Mail - Sammeldienst
 EMailHost=IMAP Server Host
 EmailCollectorConfirmCollectTitle=E-Mail - Sammeldienst Bestätigung
 NoNewEmailToProcess=Ich habe keinen neuen E-Mails (die zu den Filtern passen) abzuarbeiten.
-RecordEvent=E-Mail Ereignisse
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 ResourceSetup=Modul Ressourcen einrichten
 UseSearchToSelectResource=Zeige eine Suchmaske für Ressourcen, statt eine Drop-down - Liste
 DisabledResourceLinkUser=Verknüpfungsmöglichkeit zwischen Ressource und Benutzer unterbinden.
@@ -579,6 +584,6 @@ DisabledResourceLinkContact=Verknüpfungsmöglichkeit zwischen Ressource und Kon
 ConfirmUnactivation=Bestätige das Zurücksetzen des Moduls.
 DebugBar=Debug-Leiste
 ExportSetup=Modul Daten-Export einrichten
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+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>
 FeatureNotAvailableWithReceptionModule=Diese Funktion ist nicht verfügbar, wenn das Modul 'Lieferungen' aktiv ist
 DictionaryProductNature=Produktart
diff --git a/htdocs/langs/de_CH/companies.lang b/htdocs/langs/de_CH/companies.lang
index 72c47a659e6..4917657f146 100644
--- a/htdocs/langs/de_CH/companies.lang
+++ b/htdocs/langs/de_CH/companies.lang
@@ -135,7 +135,6 @@ MyContacts=Meine Kontakte
 ThisUserIsNot=Dieser Benutzer ist weder ein Lead, Kunde, noch Lieferant
 VATIntraCheckDesc=Der Link <b>%s</b> frägt die MWST - Nummer im Europäischen Verzeichnis (VIES) ab. Deshalb muss die MWST Nummer das Länderprefix haben.
 VATIntraCheckableOnEUSite=Innergemeinschaftliche MWST Nummer überprüfen (EU Website)
-VATIntraManualCheck=MWST - Nummer manuell überprüfen lassen: <a href="%s" target="_blank">%s</a>.
 NorProspectNorCustomer=Weder Interessent noch Kunde
 ProspectLevel=Lead-Potenzial
 ContactPrivate=Privat
diff --git a/htdocs/langs/de_CH/main.lang b/htdocs/langs/de_CH/main.lang
index d191fc245bd..be466d08b88 100644
--- a/htdocs/langs/de_CH/main.lang
+++ b/htdocs/langs/de_CH/main.lang
@@ -261,6 +261,7 @@ EditHTMLSource=HTML Quelltext bearbeiten
 ByCountry=Nach Land
 ByMonthYear=Von Monat / Jahr
 AdminTools=Administratorwerkzeuge
+ModulesSystemTools=Module Hilfsprogramme
 MyDashboard=Mein Dashboard
 SelectTargetUser=Wähle den Benutzer / Mitarbeiter
 SaveUploadedFileWithMask=Datei auf dem Server speichern mit dem Namen "<strong>%s</strong>" (oder "%s")
@@ -310,6 +311,7 @@ ConfirmSetToDraft=Bist du sicher, dass du zum Entwurf zurück willst?
 EMailTemplates=E-Mail Vorlagen
 FileNotShared=Die Datei ist nicht öffentlich geteilt.
 LeadOrProject=Lead | Projekt
+LeadsOrProjects=Leads | Projekte
 ListOpenLeads=Offene Leads
 ListOpenProjects=Offene Projekte
 NewLeadOrProject=Neuer Lead / Neues Projekt
@@ -356,6 +358,7 @@ ToApprove=Frei zu geben
 GlobalOpenedElemView=Übersicht
 NoArticlesFoundForTheKeyword=Ich habe für den Begriff '<strong>%s</strong>' nichts finden können...
 NoArticlesFoundForTheCategory=Dieser Kategorie ist nichts zugeordnet...
+ToAcceptRefuse=Zu akzeptieren | ablehnen
 ContactDefault_fichinter=Arbeitseinsatz
 ContactDefault_supplier_proposal=Partnerofferte
 ContactAddedAutomatically=Automatisch generierter Kontakt
diff --git a/htdocs/langs/de_CH/other.lang b/htdocs/langs/de_CH/other.lang
index 38836f47cf9..6ea83c112f1 100644
--- a/htdocs/langs/de_CH/other.lang
+++ b/htdocs/langs/de_CH/other.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - other
 NumberingShort=Nr
+Tools=Hilfsprogramme
+TMenuTools=Hilfsprogramme
 ToolsDesc=Alle Werkzeuge, die nicht in anderen Menüeinträgen enthalten sind, werden hier gruppiert. <br> Alle Werkzeuge können über das linke Menü aufgerufen werden.
 Notify_COMPANY_CREATE=Durch Dritte erstellt
 Notify_COMPANY_SENTBYMAIL=Von Geschäftspartner-Karte gesendete Mails
@@ -29,3 +31,4 @@ WebsiteSetup=Einstellungen des Webseitenmoduls
 WEBSITE_PAGEURL=URL für Seite
 WEBSITE_TITLE=Titel
 WEBSITE_KEYWORDS=Stichworte
+CloseDialog =Schliessen
diff --git a/htdocs/langs/de_CH/projects.lang b/htdocs/langs/de_CH/projects.lang
index 9d6d94b34ca..f9387b0e21e 100644
--- a/htdocs/langs/de_CH/projects.lang
+++ b/htdocs/langs/de_CH/projects.lang
@@ -27,4 +27,6 @@ InputPerDay=Eingang pro Tag
 InputPerWeek=Eingang pro Woche
 ResourceNotAssignedToProject=Zugewiesen zu Projekt
 ResourceNotAssignedToTheTask=Nicht der Aufgabe zugewiesen
+TimeSpentForIntervention=Zeitaufwände
 TimeSpentForInvoice=Zeitaufwände
+NewInter=Neuer Einsatz
diff --git a/htdocs/langs/de_DE/accountancy.lang b/htdocs/langs/de_DE/accountancy.lang
index c7ab200a064..c04ec8771b4 100644
--- a/htdocs/langs/de_DE/accountancy.lang
+++ b/htdocs/langs/de_DE/accountancy.lang
@@ -56,7 +56,7 @@ VueBySubAccountAccounting=Ansicht nach Buchhaltungsunterkonto
 MainAccountForCustomersNotDefined=Standardkonto für Kunden im Setup nicht definiert
 MainAccountForSuppliersNotDefined=Standardkonto für Lieferanten die nicht im Setup definiert sind
 MainAccountForUsersNotDefined=Standardkonto für Benutzer ist im Setup nicht definiert
-MainAccountForVatPaymentNotDefined=Standardkonto für MWSt Zahlungen ist im Setup nicht definiert
+MainAccountForVatPaymentNotDefined=Standardkonto für MwSt.-Zahlungen ist im Setup nicht definiert
 MainAccountForSubscriptionPaymentNotDefined=Standardkonto für wiederkehrende Zahlungen ist im Setup nicht definiert
 
 AccountancyArea=Bereich Buchhaltung
diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang
index 61498cb24ff..37642b232ce 100644
--- a/htdocs/langs/de_DE/admin.lang
+++ b/htdocs/langs/de_DE/admin.lang
@@ -142,7 +142,7 @@ DaylingSavingTime=Sommerzeit (Benutzer)
 CurrentHour=PHP-Zeit (Server)
 CurrentSessionTimeOut=Aktuelles Session-Timeout
 YouCanEditPHPTZ=Um eine andere PHP Zeitzone einzustellen (optional), ist es auch möglich eine Zeile, bspw. "SetEnv TZ Europe/Paris", in der Datei .htaccess hinzuzufügen.
-HoursOnThisPageAreOnServerTZ=Warnung: Im Gegensatz zu anderen Darstellungen, sind Stunden auf dieser Seite nicht in Ihrer lokalen Zeitzone, sondern in der Zeitzone des Servers.
+HoursOnThisPageAreOnServerTZ=Warnung: Im Gegensatz zu anderen Darstellungen sind Uhrzeiten auf dieser Seite nicht in Ihrer lokalen Zeitzone, sondern in der Zeitzone des Servers angegeben.
 Box=Widget
 Boxes=Widgets
 MaxNbOfLinesForBoxes=Maximale Zeilenanzahl in Widgets
@@ -209,8 +209,8 @@ IgnoreDuplicateRecords=Doppelte Zeilen Fehler ignorieren (INSERT IGNORE)
 AutoDetectLang=Automatische Erkennung (Browser-Sprache)
 FeatureDisabledInDemo=Funktion in der Demoversion deaktiviert
 FeatureAvailableOnlyOnStable=Diese Funktion steht nur in offiziellen stabilen Versionen zur Verfügung
-BoxesDesc=Widgets sind Komponenten, die komprimierte Informationen aus aktivierten Modulen anzeigen können. Mit deren Hilfe können individuelle Dashboards / Startseiten zusammengestellt werden.\nUm ein Widget zu aktivieren klicken sie auf "Aktivieren" im Bereich Verfügbare Widgets.\nUm ein Widget zu deaktivieren klicken sie auf den Papierkorb in der entsprechenden Widget-Zeile im Bereich Aktivierte Widgets.
-OnlyActiveElementsAreShown=Nur Elemente aus <a href="%s">aktiven Module</a> werden angezeigt.
+BoxesDesc=Widgets sind Komponenten, die komprimierte Informationen aus aktivierten Modulen anzeigen können. Mit deren Hilfe können individuelle Dashboards/Startseiten zusammengestellt werden.\nUm ein Widget zu aktivieren klicken sie auf "Aktivieren" im Bereich Verfügbare Widgets.\nUm ein Widget zu deaktivieren klicken sie auf den Papierkorb in der entsprechenden Widget-Zeile im Bereich Aktivierte Widgets.
+OnlyActiveElementsAreShown=Es werden nur Einstellungsmöglichkeiten für <a href="%s">aktive Module</a> angezeigt.
 ModulesDesc=Die Module/Anwendungen bestimmen, welche Funktionen in der Software verfügbar sind. Bei einigen Modulen müssen Benutzern nach Aktivierung des Moduls Berechtigungen erteilt werden. Klicken Sie auf die Ein/Aus-Schaltfläche <span class="small valignmiddle"> %s </span> jedes Moduls, um ein Modul/eine Anwendung zu aktivieren oder zu deaktivieren.
 ModulesDesc2=Klicken Sie auf die Radschaltfläche <span class="small valignmiddle"> %s </span>, um das Modul/die Anwendung zu konfigurieren.
 ModulesMarketPlaceDesc=Sie finden weitere Module auf externen Web-Sites...
@@ -380,7 +380,7 @@ SeeWikiForAllTeam=Werfen Sie einen Blick auf die Wiki-Seite für eine vollständ
 UseACacheDelay= Verzögerung für den Export der Cache-Antwort in Sekunden (0 oder leer für kein Caching)
 DisableLinkToHelpCenter=Link " <b> Brauche Hilfe oder Support </b> " auf der Login-Seite ausblenden
 DisableLinkToHelp=Link zur Online-Hilfe "<b>%s</b>" ausblenden
-AddCRIfTooLong=Bitte beachten Sie, dass kein automatischer Zeilenumbruch erfolgt und zu langer Text nicht angezeigt wird. Falls benötigt fügen Sie Zeilenumbrüche bitte manuell ein.
+AddCRIfTooLong=Bitte beachten Sie, dass kein automatischer Zeilenumbruch erfolgt und zu langer Text nicht angezeigt wird. Falls benötigt, fügen Sie Zeilenumbrüche bitte manuell ein.
 ConfirmPurge=Sind Sie sicher, dass Sie diese Bereinigung durchführen möchten?<br> dadurch werden alle Ihre Datendateien dauerhaft gelöscht, ohne dass Sie sie wiederherstellen können (ECM-Dateien, angehängte Dateien....).
 MinLength=Mindestlänge
 LanguageFilesCachedIntoShmopSharedMemory=.lang-Sprachdateien in gemeinsamen Cache geladen
@@ -408,10 +408,10 @@ PDF=PDF
 PDFDesc=Globale Einstellungen für die PDF-Erzeugung
 PDFOtherDesc=PDF-Option spezifisch für einige Module
 PDFAddressForging=Regeln für die Auswahl der Adressen
-HideAnyVATInformationOnPDF=Alle Informationen zu Steuern und MWSt. im generierten PDF ausblenden
+HideAnyVATInformationOnPDF=Alle Informationen zu Steuern/MwSt. im generierten PDF ausblenden
 PDFRulesForSalesTax=Regeln für Umsatzsteuer/MwSt.
 PDFLocaltax=Regeln für %s
-HideLocalTaxOnPDF=Steuersatz %s in der Spalte Verkauf Steuer / Mwst. ausblenden
+HideLocalTaxOnPDF=Steuersatz %s in der Spalte Verkauf Steuer/MwSt. ausblenden
 HideDescOnPDF=Produktbeschreibung ausblenden
 HideRefOnPDF=Artikelnummer nicht anzeigen
 HideDetailsOnPDF=Details in den Produktpositionen ausblenden
@@ -421,7 +421,7 @@ UrlGenerationParameters=Parameter zum Sichern von URLs
 SecurityTokenIsUnique=Verwenden Sie einen eindeutigen Sicherheitsschlüssel für jede URL
 EnterRefToBuildUrl=Geben Sie eine Referenz für das Objekt %s ein
 GetSecuredUrl=URL anzeigen
-ButtonHideUnauthorized=Verstecke nicht autorisierte Aktionsschaltflächen auch für interne Benutzer (ansonsten nur grau)
+ButtonHideUnauthorized=Verstecke nicht autorisierte Aktionsschaltflächen auch für interne Benutzer (sonst nur grau)
 OldVATRates=Alter Umsatzsteuer-Satz
 NewVATRates=Neuer Umsatzsteuer-Satz
 PriceBaseTypeToChange=Ändern Sie den Basispreis definierte nach
@@ -482,7 +482,7 @@ EraseAllCurrentBarCode=alle aktuellen Barcode-Werte löschen
 ConfirmEraseAllCurrentBarCode=Möchten Sie wirklich alle aktuellen Barcode-Werte löschen?
 AllBarcodeReset=alle Barcode-Werte wurden entfernt
 NoBarcodeNumberingTemplateDefined=Im Barcode-Modul wurde kein Numerierungs-Schema aktiviert.
-EnableFileCache=Dateicache aktivieren
+EnableFileCache=Datei-Cache aktivieren
 ShowDetailsInPDFPageFoot=Weitere Details in der PDF-Fußzeile anzeigen (bspw. Firmenadresse / Name des CEOs)
 NoDetails=Keine weiteren Details in der Fußzeile
 DisplayCompanyInfo=Firmenadresse anzeigen
@@ -639,7 +639,7 @@ Module2000Name=FCKeditor
 Module2000Desc=Erweiterter Editor für Textfelder (basierend auf dem CKEditor)
 Module2200Name=Dynamische Preise
 Module2200Desc=Verwenden Sie mathematische Ausdrücke für die automatische Generierung von Preisen.
-Module2300Name=Geplante Aufträge
+Module2300Name=Geplante Aufgaben
 Module2300Desc=Verwaltung geplanter Aufgaben (Cron oder chrono Tabelle)
 Module2400Name=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.
@@ -756,7 +756,7 @@ Permission106=Auslieferungen exportieren
 Permission109=Sendungen löschen
 Permission111=Finanzkonten einsehen
 Permission112=Transaktionen erstellen/ändern/löschen und vergleichen
-Permission113=Einstellungen Finanzkonten (erstellen, Kategorien verwalten)
+Permission113=Finanzkonten einrichten (Kategorien von Banktransaktionen erstellen und verwalten)
 Permission114=Transaktionen ausgleichen
 Permission115=Transaktionen und Kontoauszüge exportieren
 Permission116=Transfers zwischen Konten
@@ -893,12 +893,11 @@ Permission701=Spenden anzeigen
 Permission702=Spenden erstellen/bearbeiten
 Permission703=Spenden löschen
 Permission771=Spesenabrechnungen einsehen (eigene und die der Untergebenen)
-Permission772=Spesenabrechnung erstellen/ändern
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Spesenabrechnung löschen
-Permission774=Spesenabrechnungen einsehen  (Alle Benutzer auch die nicht Untergebenen)
 Permission775=Spesenabrechnung genehmigen
 Permission776=Spesenabrechnung bezahlen
-Permission777=Lesen Sie die Spesenabrechnungen aller
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Spesenabrechnungen aller erstellen / ändern
 Permission779=Spesenabrechnung exportieren
 Permission1001=Warenbestände einsehen
@@ -962,15 +961,11 @@ Permission2801=FTP-Client im Lesemodus nutzen (nur ansehen und herunterladen)
 Permission2802=FTP-Client im Schreibmodus nutzen (Dateien löschen oder hochladen)
 Permission3200=Eingetragene Ereignisse und Fingerprints lesen
 Permission3301=Neues Module erstellen
-Permission4001=Mitarbeiter anzeigen
-Permission4002=Mitarbeiter erstellen
-Permission4003=Mitarbeiter löschen
-Permission4004=Mitarbeiter exportieren
-Permission4010=Kompetenz/Job/Position lesen
-Permission4011=Kompetenz/Job/Position erstellen/ändern
-Permission4012=Kompetenz/Job/Position löschen
-Permission4020=Bewertung lesen
-Permission4021=Bewertung erstellen/ändern
+Permission4001=Kompetenz/Job/Position lesen
+Permission4002=Kompetenz/Job/Position erstellen/ändern
+Permission4003=Kompetenz/Job/Position löschen
+Permission4020=Bewertungen lesen
+Permission4021=Create/modify your evaluation
 Permission4022=Bewertung validieren
 Permission4023=Bewertung löschen
 Permission4030=Siehe Vergleichsmenü
@@ -981,11 +976,11 @@ Permission10005=Inhalt der Website löschen
 Permission20001=Urlaubsanträge einsehen (eigene und die Ihrer Untergeordneten) 
 Permission20002=Urlaubsanträge anlegen/bearbeiten (eigene und die Ihrer Untergeordneten) 
 Permission20003=Lösche Urlaubsanträge
-Permission20004=Alle Urlaubsanträge einsehen (von allen Benutzern einschließlich der nicht Untergebenen)
-Permission20005=Urlaubsanträge anlegen/verändern (von allen Benutzern einschließlich der nicht Untergebenen)
-Permission20006=Urlaubstage Administrieren (Setup- und Aktualisierung)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Urlaubsanträge genehmigen
-Permission23001=Geplante Aufträge anzeigen
+Permission23001=Geplante Aufgaben anzeigen
 Permission23002=Geplante Aufgaben erstellen/bearbeiten
 Permission23003=Geplante Aufgabe(n) löschen
 Permission23004=Geplante Aufgaben ausführen
@@ -1080,7 +1075,7 @@ BackToModuleList=Zurück zur Modulübersicht
 BackToDictionaryList=Zurück zur Wörterbuchübersicht
 TypeOfRevenueStamp=Art der Steuermarke
 VATManagement=MwSt-Verwaltung 
-VATIsUsedDesc=Standardmäßig folgt der Umsatzsteuersatz beim Erstellen von Interessenten, Rechnungen, Aufträgen usw. der aktiven Standardregel: <br> Wenn der Verkäufer nicht der Umsatzsteuer unterliegt, ist die Umsatzsteuer standardmäßig 0. Ende der Regel. <br> Ist das (Land des Verkäufers = Land des Käufers), entspricht die Umsatzsteuer standardmäßig der Umsatzsteuer des Produkts im Land des Verkäufers. Regelende. <br> Wenn der Verkäufer und der Käufer in der Europäischen Gemeinschaft ansässig sind und es sich bei den Waren um transportbezogene Produkte handelt (Spedition, Versand, Fluggesellschaft), beträgt die Standard-Mehrwertsteuer 0. Diese Regel ist abhängig vom Land des Verkäufers - wenden Sie sich bitte an Ihren Buchhalter. Die Mehrwertsteuer ist vom Käufer an die Zollstelle in seinem Land und nicht an den Verkäufer zu entrichten. Regelende. <br> Wenn der Verkäufer und der Käufer beide in der Europäischen Gemeinschaft ansässig sind und der Käufer kein Unternehmen ist (mit einer registrierten innergemeinschaftlichen Umsatzsteuer-Identifikationsnummer), gilt standardmäßig der Umsatzsteuersatz des Landes des Verkäufers. Regelende. <br> Wenn der Verkäufer und der Käufer beide in der Europäischen Gemeinschaft ansässig sind und der Käufer ein Unternehmen ist (mit einer registrierten innergemeinschaftlichen Umsatzsteuer-Identifikationsnummer), beträgt die Umsatzsteuer standardmäßig 0. Regelende. <br> In allen anderen Fällen lautet die vorgeschlagene Standardeinstellung Umsatzsteuer = 0. Regelende.
+VATIsUsedDesc=Standardmäßig folgt der Umsatzsteuersatz beim Erstellen von Interessenten, Rechnungen, Aufträgen usw. der aktiven Standardregel: <br> Wenn der Verkäufer nicht der Umsatzsteuer unterliegt, ist die Umsatzsteuer standardmäßig 0. Ende der Regel. <br> Ist das (Land des Verkäufers = Land des Käufers), entspricht die Umsatzsteuer standardmäßig der Umsatzsteuer des Produkts im Land des Verkäufers. Ende der Regel. <br> Wenn der Verkäufer und der Käufer in der Europäischen Gemeinschaft ansässig sind und es sich bei den Waren um transportbezogene Produkte handelt (Spedition, Versand, Fluggesellschaft), beträgt die Standard-Mehrwertsteuer 0. Diese Regel ist abhängig vom Land des Verkäufers - wenden Sie sich bitte an Ihren Buchhalter. Die Mehrwertsteuer ist vom Käufer an die Zollstelle in seinem Land und nicht an den Verkäufer zu entrichten. Ende der Regel. <br> Wenn der Verkäufer und der Käufer beide in der Europäischen Gemeinschaft ansässig sind und der Käufer kein Unternehmen ist (mit einer registrierten innergemeinschaftlichen Umsatzsteuer-Identifikationsnummer), gilt standardmäßig der Umsatzsteuersatz des Landes des Verkäufers. Ende der Regel. <br> Wenn der Verkäufer und der Käufer beide in der Europäischen Gemeinschaft ansässig sind und der Käufer ein Unternehmen ist (mit einer registrierten innergemeinschaftlichen Umsatzsteuer-Identifikationsnummer), beträgt die Umsatzsteuer standardmäßig 0. Ende der Regel. <br> In allen anderen Fällen lautet die vorgeschlagene Standardeinstellung Umsatzsteuer = 0. Ende der Regel.
 VATIsNotUsedDesc=Die vorgeschlagene USt. ist standardmäßig 0 für alle Fälle wie Stiftungen, Einzelpersonen oder Kleinunternehmen.
 VATIsUsedExampleFR=In Frankreich sind damit Unternehmen oder Organisationen gemeint, die ein echtes Steuersystem haben (vereinfacht oder normal). Ein System, in dem die Mehrwertsteuer deklariert wird.
 VATIsNotUsedExampleFR=In Frankreich bedeutet es, dass keine Umsatzsteuer ausgewiesen wird oder Unternehmen, Organisationen oder Freiberufler, die als Kleinunternehmer tätig sind (Privilegiensteuer), Umsatzsteuern zahlen ohne selbst Umsatzsteuer auszuweisen.  Diese Auswahl zeigt den Hinweis "Umsatzsteuer nicht anwendbar - Artikel-293B des CGI" auf Rechnungen an.
@@ -1210,7 +1205,7 @@ Delays_MAIN_DELAY_MEMBERS=Verspäteter Mitgliedsbeitrag
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Scheckeinreichung nicht erfolgt
 Delays_MAIN_DELAY_EXPENSEREPORTS=zu genehmigende Spesenabrechnung
 Delays_MAIN_DELAY_HOLIDAYS=Zu genehmigende Urlaubsanträge
-SetupDescription1=Bevor Sie mit Dolibarr arbeiten können müssen grundlegende Einstellungen getätigt und Module freigeschalten / konfiguriert werden.
+SetupDescription1=Bevor Sie mit Dolibarr arbeiten können, müssen grundlegende Einstellungen getätigt und Module aktiviert/konfiguriert werden.
 SetupDescription2=Die folgenden zwei Punkte sind obligatorisch:
 SetupDescription3=<a href="%s"> %s -> %s </a> <br> <br> Grundlegende Parameter zum Anpassen des Standardverhaltens Ihrer Anwendung (z. B. für länderbezogene Funktionen).
 SetupDescription4=<a href="%s"> %s -> %s </a> <br> <br> Diese Software ist eine Suite vieler Module/Anwendungen. Die für Ihre Bedürfnisse erforderlichen Module müssen aktiviert und konfiguriert sein. Zusätzliche Menüeinträge werden mit der Aktivierung dieser Module angezeigt.
@@ -1254,7 +1249,7 @@ TriggerAlwaysActive=Trigger in dieser Datei sind unabhängig der Modulkonfigurat
 TriggerActiveAsModuleActive=Trigger in dieser Datei sind durch das übergeordnete Modul <b>%s</b> aktiviert.
 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=Diese Seite erlaubt es alle anderen Parameter einzustellen (überschreiben), die auf anderen Seiten nicht verfügbar sind. Diese sind meist spezielle Parameter für Entwickler oder für die erweiterte Fehlersuche.
+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.
 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
@@ -1297,10 +1292,10 @@ MeteoStdMod=Standart Modus
 MeteoStdModEnabled=Standardmodus aktiviert
 MeteoPercentageMod=Prozentmodus
 MeteoPercentageModEnabled=Prozentmodus aktiviert
-MeteoUseMod=Ancklicken um %s zu verwenden
+MeteoUseMod=Anklicken um %s zu verwenden
 TestLoginToAPI=Testen Sie sich anmelden, um API
 ProxyDesc=Einige Dolibarr-Funktionen benötigen einen Zugang zum Internet. Hier können die Verbindungsparameter festgelegt werden, z.B. ob ein Proxy-Server erforderlich ist.
-ExternalAccess=externer / interner Zugriff
+ExternalAccess=Externer Internet-Zugang
 MAIN_PROXY_USE=Proxy-Server benutzen (ansonsten erfolgt der Zugriff in's Internet direkt)
 MAIN_PROXY_HOST=Proxyservers: IP-Adresse / DNS-Name
 MAIN_PROXY_PORT=Proxyserver: Port
@@ -1450,7 +1445,7 @@ OrdersNumberingModules=Nummernvergabe für Aufträge/Bestellungen
 OrdersModelModule=Dokumentenvorlage(n)
 FreeLegalTextOnOrders=Freier Rechtstext auf Bestellungen
 WatermarkOnDraftOrders=Wasserzeichen auf Bestellentwurf  (leerlassen wenn keines benötigt wird)
-ShippableOrderIconInList=In Auftragsliste ein entsprechendes Icon zufügen, wenn die Bestellung versandbereit ist
+ShippableOrderIconInList=In Auftragsliste ein entsprechendes Icon zufügen, wenn der Auftrag versandbereit ist
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Fragen Sie nach der Ziel-Bankverbindung
 ##### Interventions #####
 InterventionsSetup=Einstellungen Modul Serviceaufträge
@@ -1637,12 +1632,12 @@ CacheByClient=Vom Browser zwischengespeichert
 CompressionOfResources=Komprimierung von HTTP Antworten
 CompressionOfResourcesDesc=Zum Beispiel mit der Apache Anweisung "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=Automatische Erkennung mit den aktuellen Browsern nicht möglich
-DefaultValuesDesc=Hier können Sie den Standardwert definieren, den Sie beim Erstellen eines neuen Datensatzes verwenden möchten, und / oder Standardfilter oder die Sortierreihenfolge beim Auflisten von Datensätzen.
+DefaultValuesDesc=Hier können Sie den Standardwert definieren, den Sie beim Erstellen eines neuen Datensatzes verwenden möchten, und/oder Standardfilter oder die Sortierreihenfolge beim Auflisten von Datensätzen.
 DefaultCreateForm=Vorgabewerte für die Verwendung in Formularen
-DefaultSearchFilters=Standard Suchfilter
+DefaultSearchFilters=Standardsuchfilter
 DefaultSortOrder=Standardsortierreihenfolge
 DefaultFocus=Standardfokusfeld
-DefaultMandatory=Formularfelder die ausgefüllt werden müssen
+DefaultMandatory=Pflichtfelder in Formularen
 ##### Products #####
 ProductSetup=Produktmoduleinstellungen
 ServiceSetup=Modul Leistungen - Einstellungen
@@ -1889,7 +1884,7 @@ DeleteFiscalYear=Buchhaltungs Periode löschen
 ConfirmDeleteFiscalYear=Möchten Sie diese Buchungsperiode wirklich löschen?
 ShowFiscalYear=Zeige Buchhaltungs Periode
 AlwaysEditable=kann immer bearbeitet werden
-MAIN_APPLICATION_TITLE=Erzwinge sichtbaren Anwendungsnamen (Warnung: Setzen Ihres eigenen Namen hier, kann Autofill Login-Funktion abbrechen, wenn Sie DoliDroid Anwendung nutzen)
+MAIN_APPLICATION_TITLE=Erzwinge sichtbaren Anwendungsnamen (Warnung: Setzen Ihres eigenen Namens kann Autofill Login-Funktion abbrechen, wenn Sie DoliDroid Anwendung nutzen)
 NbMajMin=Mindestanzahl Großbuchstaben
 NbNumMin=Mindestanzahl Ziffern
 NbSpeMin=Mindestanzahl Sonderzeichen
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Möchten Sie den Einsammelvorgang für diesen eMail
 NoNewEmailToProcess=Keine neue e-Mail (passende Filter) zum Verarbeiten
 NothingProcessed=Nicht ausgeführt
 XEmailsDoneYActionsDone=%sE-Mail(s) qualifiziert, %s E-Mail(s) erfolgreich verarbeitet (für %s Aufzeichnung(en) / Aktion(en) durchgeführt)
-RecordEvent=eMail-Ereignis aufzeichnen/registrieren
-CreateLeadAndThirdParty=als potentiellen Verkaufskontakt anlegen
-CreateTicketAndThirdParty=Ticket erstellen (und mit einem Dritten verknüpfen, wenn es von einem vorherigen Vorgang geladen wurde)
+RecordEvent=Zeichnen Sie ein Ereignis in der Agenda auf (mit dem Typ der gesendeten oder empfangen E-Mail)
+CreateLeadAndThirdParty=Erstellen Sie einen Lead (und ggf. einen Geschäftspartner)
+CreateTicketAndThirdParty=Ticket erstellen (mit einem Geschäftspartner verknüpft, wenn dieser durch einen vorherigen Vorgang geladen wurde, ansonsten ohne Geschäftspartner)
 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)
+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 
 WithDolTrackingIDInMsgId=Nachricht von Dolibarr gesendet
@@ -2084,7 +2080,7 @@ CreateCandidature=Stellen-Bewerbung erstellen
 FormatZip=Zip
 MainMenuCode=Menüpunktcode (Hauptmenü)
 ECMAutoTree=Automatischen ECM-Baum anzeigen
-OperationParamDesc=Definieren Sie die Werte, die für das Objekt der Aktion verwendet werden sollen, oder wie Werte extrahiert werden sollen. Beispiel: <br> objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Verwenden Sie a; char als Trennzeichen zum Extrahieren oder Festlegen mehrerer Eigenschaften.
+OperationParamDesc=Definieren Sie die Regeln, die zum Extrahieren oder Festlegen von Werten verwendet werden sollen. <br> Beispiel für Operationen, die einen Namen aus dem E-Mail-Betreff extrahieren: <br> name=EXTRACT:SUBJECT:Message_from_company ([^]*) <br> Beispiel für Operationen, die Objekte erstellen:<br>objproperty1=SET:der_zu_setzende_Wert <br>objproperty2=SET:ein_Wert,_der_auch__objproperty1__ enthalten_kann<br>obproperty3=SETIFEMPTY:verwendeter_Wert_wenn_objproperty3_nicht_definiert_ist<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>  object.objproperty5=EXTRACT:BODY:Mein Firmenname ist\\s( [^\\s]*)<br><br> Verwenden Sie ein ; als Trennzeichen, um mehrere Eigenschaften zu extrahieren oder festzulegen.
 OpeningHours=Öffnungszeiten
 OpeningHoursDesc=Geben sie hier die regulären Öffnungszeiten ihres Unternehmens an.
 ResourceSetup=Konfiguration vom Ressourcenmodul
@@ -2130,7 +2126,7 @@ LargerThan=Größer als
 IfTrackingIDFoundEventWillBeLinked=Beachten Sie, dass das erstellte Ereignis automatisch mit dem bekannten verwandten Objekt verknüpft wird, wenn eine Tracking-ID eines Objekts in einer E-Mail gefunden wird oder wenn die E-Mail eine Antwort auf eine E-Mail ist, die bereits gesammelt und mit einem Objekt verknüpft wurde.
 WithGMailYouCanCreateADedicatedPassword=Wenn Sie bei einem GMail-Konto die 2-stufige Validierung aktiviert haben, wird empfohlen, ein spezielles zweites Passwort für die Anwendung zu erstellen, anstatt Ihr eigenes Konto-Passwort von https://myaccount.google.com/. zu verwenden.
 EmailCollectorTargetDir=Es kann ein erwünscht sein, die E-Mail in ein anderes Tag / Verzeichnis zu verschieben, wenn sie erfolgreich verarbeitet wurde. Legen Sie hier einfach den Namen des Verzeichnisses fest, um diese Funktion zu verwenden (verwenden Sie KEINE Sonderzeichen im Namen). Beachten Sie, dass Sie auch ein Lese- / Schreib-Anmeldekonto verwenden müssen.
-EmailCollectorLoadThirdPartyHelp=Mit dieser Aktion können Sie den E-Mail-Inhalt verwenden, um einen vorhandenen Geschäftspartner in Ihrer Datenbank zu finden und zu bearbeiten. Der gefundene (oder neu erstellte) Geschäftspartner wird durch die nachfolgenden Aktionen modifiziert. <br> Wenn Sie beispielsweise aus einer empfangenen E-Mail, in der die Zeichenfolge "Name: Peter Lustig" vorkommt, einen Geschäftspartner erstellen möchten, können Sie seinen Namen und seine E-Mail-Adresse durch das entsprechende Setzen der Parameter aus der E-Mail extrahieren: <br> 'email=HEADER: ^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;' <br>
+EmailCollectorLoadThirdPartyHelp=Mit dieser Aktion können Sie den E-Mail-Inhalt verwenden, um einen vorhandenen Geschäftspartner in Ihrer Datenbank zu finden und zu bearbeiten. Der gefundene (oder neu erstellte) Geschäftspartner wird durch die nachfolgenden Aktionen modifiziert. <br> Wenn Sie beispielsweise aus einer empfangenen E-Mail, in der die Zeichenfolge "Name: Max Mustermann" vorkommt, einen Geschäftspartner erstellen möchten, können Sie seinen Namen und seine E-Mail-Adresse durch das entsprechende Setzen der Parameter aus der E-Mail extrahieren: <br> 'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;' <br>
 EndPointFor=Endpunkt für %s:%s
 DeleteEmailCollector=Lösche eMail-Collector
 ConfirmDeleteEmailCollector=Sind Sie sicher, dass Sie diesen eMail-Collector löschen wollen?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Fehlende Übersetzung für %s
 NativeModules=Native Module
 NoDeployedModulesFoundWithThisSearchCriteria=Keine Module für diese Suchkriterien gefunden
 API_DISABLE_COMPRESSION=Komprimierung von API-Antworten deaktivieren
+EachTerminalHasItsOwnCounter=Jedes Terminal verwendet seinen eigenen Zähler.
diff --git a/htdocs/langs/de_DE/bills.lang b/htdocs/langs/de_DE/bills.lang
index 300ad42378f..f6b00de77ac 100644
--- a/htdocs/langs/de_DE/bills.lang
+++ b/htdocs/langs/de_DE/bills.lang
@@ -84,8 +84,6 @@ PaymentRule=Zahlungsregel
 PaymentMode=Zahlungsart
 DefaultPaymentMode=Standardzahlungsart
 DefaultBankAccount=Standardbankkonto
-PaymentTypeDC=Debit- / Kreditkarte
-PaymentTypePP=PayPal
 IdPaymentMode=Zahlungsart (ID)
 CodePaymentMode=Zahlungsart (Code)
 LabelPaymentMode=Zahlungsart (Label)
@@ -280,6 +278,7 @@ SetMode=Zahlungsart definieren
 SetRevenuStamp=Steuermarke setzen
 Billed=In Rechnung gestellt
 RecurringInvoices=Wiederkehrende Rechnungen
+RecurringInvoice=Wiederkehrende Rechnung
 RepeatableInvoice=Rechnungs-Vorlage
 RepeatableInvoices=Rechnungs-Vorlagen
 Repeatable=Vorlage
@@ -344,7 +343,7 @@ InvoiceNote=Hinweis zur Rechnung
 InvoicePaid=Rechnung bezahlt
 InvoicePaidCompletely=Komplett bezahlt
 InvoicePaidCompletelyHelp=Rechnungen die komplett bezahlt sind. Davon ausgenommen sind Rechnungen, die teilweise bezahlt werden. Verwenden Sie einen Filter für den Rechnungsstatus, um eine Liste aller abgeschlossenen oder nicht abgeschlossenen Rechnungen zu erhalten.
-OrderBilled=Bestellung in Rechnung gestellt
+OrderBilled=Auftrag in Rechnung gestellt
 DonationPaid=Spende bezahlt
 PaymentNumber=ZahlungsNr.
 RemoveDiscount=Rabatt entfernen
@@ -449,6 +448,8 @@ PaymentTypeTRA=Scheck
 PaymentTypeShortTRA=Scheck
 PaymentTypeFAC=Nachnahme
 PaymentTypeShortFAC=Briefträger
+PaymentTypeDC=Debit- / Kreditkarte
+PaymentTypePP=PayPal
 BankDetails=Bankverbindung
 BankCode=Bankleitzahl
 DeskCode=Desk-Code
@@ -604,3 +605,4 @@ SituationTotalProgress=Gesamtfortschritt %d %%
 SearchUnpaidInvoicesWithDueDate=Suche unbezahlte Rechnungen mit Fälligkeitsdatum = %s
 NoPaymentAvailable=Keine Zahlung verfügbar für %s
 PaymentRegisteredAndInvoiceSetToPaid=Zahlung registriert und Rechnung %s auf bezahlt gesetzt
+SendEmailsRemindersOnInvoiceDueDate=Bei unbezahlten Rechnungen per E-Mail erinnern
diff --git a/htdocs/langs/de_DE/boxes.lang b/htdocs/langs/de_DE/boxes.lang
index e6716190fe8..3d91576eb60 100644
--- a/htdocs/langs/de_DE/boxes.lang
+++ b/htdocs/langs/de_DE/boxes.lang
@@ -4,7 +4,7 @@ BoxLoginInformation=Anmeldeinformationen
 BoxLastRssInfos=Informationen RSS Feed
 BoxLastProducts=%s zuletzt bearbeitete Produkte/Leistungen
 BoxProductsAlertStock=Bestandeswarnungen für Produkte
-BoxLastProductsInContract=Zuletzt in Verträgen aufgenomme Produkte/Leistungen (maximal %s)
+BoxLastProductsInContract=Zuletzt in Verträgen aufgenommene Produkte/Leistungen (maximal %s)
 BoxLastSupplierBills=neueste Lieferantenrechnungen
 BoxLastCustomerBills=neueste Kundenrechnungen
 BoxOldestUnpaidCustomerBills=älteste unbezahlte Kundenrechnungen
diff --git a/htdocs/langs/de_DE/categories.lang b/htdocs/langs/de_DE/categories.lang
index 760757212aa..bc54cc2f448 100644
--- a/htdocs/langs/de_DE/categories.lang
+++ b/htdocs/langs/de_DE/categories.lang
@@ -74,7 +74,7 @@ CatProdList=Liste der Produktkategorien
 CatMemberList=Liste der Mitgliederkategorien
 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
+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
 CatContactsLinks=Verknüpfungen zwischen Kontakten/Adressen und Tags/Kategorien
diff --git a/htdocs/langs/de_DE/companies.lang b/htdocs/langs/de_DE/companies.lang
index ff5e08e892d..a058ed34dba 100644
--- a/htdocs/langs/de_DE/companies.lang
+++ b/htdocs/langs/de_DE/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Prüfen
 VATIntraCheckDesc=Die Umsatzsteuer-ID muss das Länderpräfix enthalten. Der Link <b> %s </b> startet eine Anfrage am MwSt-Informationsaustauschsystem (MIAS) der Europäischen Kommission. Hierfür ist ein ein Internetzugang vom Dolibarr-Server erforderlich.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Überprüfungsergebnis des MwSt-Informationsaustauschsystems (MIAS)
-VATIntraManualCheck=Sie können die Überprüfung auch manuell auf der Internetseite der Europäische Kommission durchführen: <a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=Sie können die Überprüfung auch manuell auf der Internetseite der Europäische Kommission durchführen: <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Anfrage nicht möglich. Überprüfungsdienst wird vom Mitgliedsland nicht angeboten (%s).
 NorProspectNorCustomer=kein Interessent / kein Kunde
 JuridicalStatus=Unternehmensform
diff --git a/htdocs/langs/de_DE/errors.lang b/htdocs/langs/de_DE/errors.lang
index 7be2b51060c..78148729281 100644
--- a/htdocs/langs/de_DE/errors.lang
+++ b/htdocs/langs/de_DE/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=Der Dateiname darf nicht __SOMETHING__ enthalten
 ErrorNotInDictionaryPaymentConditions=Nicht im Dictionary der Zahlungsbedingungen, bitte ändern.
 ErrorIsNotADraft=%s ist kein Entwurf
 ErrorExecIdFailed=Befehl "id" kann nicht ausgeführt werden
+ErrorBadCharIntoLoginName=Unzulässiges Zeichen im Login-Namen
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Ihr PHP Parameter upload_max_filesize (%s) ist größer als Parameter post_max_size (%s). Dies ist eine inkonsistente Einstellung.
diff --git a/htdocs/langs/de_DE/main.lang b/htdocs/langs/de_DE/main.lang
index e6a1002a241..686ec747389 100644
--- a/htdocs/langs/de_DE/main.lang
+++ b/htdocs/langs/de_DE/main.lang
@@ -212,6 +212,8 @@ User=Benutzer
 Users=Benutzer
 Group=Gruppe
 Groups=Gruppen
+UserGroup=Benutzergruppe
+UserGroups=Benutzergruppen
 NoUserGroupDefined=Keine Benutzergruppe definiert
 Password=Passwort
 PasswordRetype=Geben Sie das Passwort noch einmal ein
@@ -417,7 +419,7 @@ HT=Netto
 TTC=Brutto
 INCVATONLY=Inkl. USt.
 INCT=Inkl. aller Steuern
-VAT=Umsatzsteuer
+VAT=USt.
 VATIN=IGST
 VATs=Mehrwertsteuern
 VATINs=IGST Steuern
@@ -604,14 +606,14 @@ MonthShort10=Okt
 MonthShort11=Nov
 MonthShort12=Dez
 MonthVeryShort01=J
-MonthVeryShort02=Fr
-MonthVeryShort03=Mo
+MonthVeryShort02=F
+MonthVeryShort03=M
 MonthVeryShort04=A
-MonthVeryShort05=Mo
+MonthVeryShort05=M
 MonthVeryShort06=J
 MonthVeryShort07=J
 MonthVeryShort08=A
-MonthVeryShort09=So
+MonthVeryShort09=S
 MonthVeryShort10=O
 MonthVeryShort11=N
 MonthVeryShort12=D
@@ -805,7 +807,7 @@ LinkToSupplierInvoice=Link zur Lieferantenrechnung
 LinkToContract=Link zum Vertrag
 LinkToIntervention=Link zu Arbeitseinsatz
 LinkToTicket=Link zu Ticket
-LinkToMo=Verknüpfung mit Mo
+LinkToMo=Verknüpfung mit Fertigungsauftrag (MO)
 CreateDraft=Entwurf erstellen
 SetToDraft=Auf Entwurf zurücksetzen
 ClickToEdit=Klicken zum Bearbeiten
@@ -826,7 +828,7 @@ LinkedToSpecificUsers=Mit Kontakt verknüpft
 NoResults=Keine Ergebnisse
 AdminTools=Admin-Tools
 SystemTools=Systemwerkzeuge
-ModulesSystemTools=Module Hilfsprogramme
+ModulesSystemTools=Module Tools
 Test=Testen
 Element=Element
 NoPhotoYet=Noch keine Bilder verfügbar
@@ -937,12 +939,12 @@ FileNotShared=Datei nicht für die Öffentlichkeit freigegeben
 Project=Projekt
 Projects=Projekte
 LeadOrProject=Anfrage | Projekt
-LeadsOrProjects=Leads | Projekte
+LeadsOrProjects=Projekte | Leads
 Lead=Anfrage
 Leads=Anfragen
 ListOpenLeads=Liste offener Leads
 ListOpenProjects=Liste offener Projekte
-NewLeadOrProject=Neuer Lead/Projekt
+NewLeadOrProject=Neues Projekt/neuer Lead
 Rights=Berechtigungen
 LineNb=Zeilennummer
 IncotermLabel=Incoterms
@@ -1082,7 +1084,7 @@ ToApprove=Zu genehmigen
 GlobalOpenedElemView=Globale Ansicht
 NoArticlesFoundForTheKeyword=Kein Artikel zu Schlüssselwort gefunden '<strong>%s</strong>'
 NoArticlesFoundForTheCategory=Kein Artikel für Kategorie gefunden
-ToAcceptRefuse=Zu akzeptieren | ablehnen
+ToAcceptRefuse=Zu akzeptieren | abzulehnen
 ContactDefault_agenda=Ereignis
 ContactDefault_commande=Bestellung
 ContactDefault_contrat=Vertrag
diff --git a/htdocs/langs/de_DE/mrp.lang b/htdocs/langs/de_DE/mrp.lang
index 3d838cb9998..2bea7dd7d6e 100644
--- a/htdocs/langs/de_DE/mrp.lang
+++ b/htdocs/langs/de_DE/mrp.lang
@@ -82,12 +82,12 @@ TotalCost=Gesamtsumme Kosten
 BOMTotalCost=Die Herstellungskosten dieser Stückliste, basierend auf den Kosten jeder Menge und jeden verbrauchten Produktes (nutzt den Selbstkostenpreis wenn er definiert ist, ansonsten den Durchschnittspreis sofern definiert oder den besten Einkaufspreis)
 GoOnTabProductionToProduceFirst=Die Produktion muss begonnen sein, um einen Produktionsauftrag zu schließen (siehe Tab '%s'). Alternativ kann er storniert werden.
 ErrorAVirtualProductCantBeUsedIntoABomOrMo=Ein Satz kann nicht in einer Stückliste oder einem Fertigungsauftrag verwendet werden
-Workstation=Arbeitsstation
-Workstations=Arbeitsplätze
+Workstation=Arbeitsstationen
+Workstations=Arbeitsstationen
 WorkstationsDescription=Verwaltung der Arbeitsstationen
 WorkstationSetup = Arbeitsstationen konfigurieren
 WorkstationSetupPage = Seite zur Einrichtung von Arbeitsstationen
-WorkstationList=Liste Arbeitsplätze
+WorkstationList=Liste Arbeitsstationen
 WorkstationCreate=Neue Arbeitsstation hinzufügen
 ConfirmEnableWorkstation=Möchten Sie die Arbeitsstation <b> %s </b> aktivieren?
 EnableAWorkstation=Eine Arbeitsstation aktivieren
diff --git a/htdocs/langs/de_DE/orders.lang b/htdocs/langs/de_DE/orders.lang
index c732113e6b1..8f11e0397f4 100644
--- a/htdocs/langs/de_DE/orders.lang
+++ b/htdocs/langs/de_DE/orders.lang
@@ -64,7 +64,7 @@ ProductQtyInDraftOrWaitingApproved=Produktmenge in Bestellentwurf oder Bestellun
 MenuOrdersToBill=Bestellverrechnung
 MenuOrdersToBill2=abrechenbare Aufträge
 ShipProduct=Produkt versenden
-CreateOrder=Bestellung erstellen
+CreateOrder=Auftrag erstellen
 RefuseOrder=Bestellung ablehnen
 ApproveOrder=Bestellung genehmigen
 Approve2Order=Genehmige Bestellung (2. Bestätigung)
@@ -74,7 +74,7 @@ DeleteOrder=Bestellung löschen
 CancelOrder=Bestellung stornieren
 OrderReopened= Bestellung %s wieder geöffnet
 AddOrder=Bestellung erstellen
-AddSupplierOrderShort=Bestellung erstellen
+AddSupplierOrderShort=Auftrag erstellen
 AddPurchaseOrder=Lieferantenbestellung erstellen
 AddToDraftOrders=Zu Bestellentwurf hinzufügen
 ShowOrder=Bestellung anzeigen
@@ -88,10 +88,10 @@ LastSupplierOrders=%s neueste Lieferantenbestellungen
 LastModifiedOrders=Zuletzt bearbeitete Bestellungen (maximal %s)
 AllOrders=Alle Bestellungen
 NbOfOrders=Anzahl der Bestellungen
-OrdersStatistics=Bestellstatistik
+OrdersStatistics=Statistik Kundenaufträge
 OrdersStatisticsSuppliers=Statistik Lieferantenbestellungen
 NumberOfOrdersByMonth=Anzahl der Bestellungen pro Monat
-AmountOfOrdersByMonthHT=Gesamtbetrag der Kundenaufträge pro Monat (exkl. Steuern)
+AmountOfOrdersByMonthHT=Gesamtbetrag der Bestellungen pro Monat (exkl. Steuern)
 ListOfOrders=Liste Aufträge
 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.
diff --git a/htdocs/langs/de_DE/other.lang b/htdocs/langs/de_DE/other.lang
index a8cd93c7e42..569325dda82 100644
--- a/htdocs/langs/de_DE/other.lang
+++ b/htdocs/langs/de_DE/other.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - other
 SecurityCode=Sicherheitsschlüssel
 NumberingShort=Nr.
-Tools=Hilfsprogramme
-TMenuTools=Hilfsprogramme
-ToolsDesc=Hier finden Sie weitere Hilfsprogramme, die keinem anderem Menüeintrag zugeordnet werden können.<br>Diese Hilfsprogramme können über das linke Menü aufgerufen werden.
+Tools=Tools
+TMenuTools=Tools
+ToolsDesc=Hier finden Sie weitere Tools (Hilfsprogramme), die keinem anderem Menüeintrag zugeordnet werden können.<br>Diese Tools können über das linke Menü aufgerufen werden.
 Birthday=Geburtstag
 BirthdayAlertOn=Geburtstagserinnerung EIN
 BirthdayAlertOff=Geburtstagserinnerung AUS
@@ -38,8 +38,8 @@ LatestBlogPosts=Neueste Blog-Beiträge
 notiftouser=An Benutzer
 notiftofixedemail=An festgelegte E-Mail-Adresse
 notiftouserandtofixedemail=An Benutzer und an festgelegte E-Mail-Adresse
-Notify_ORDER_VALIDATE=Kundenbestellung freigegeben
-Notify_ORDER_SENTBYMAIL=Kundenbestellung per E-Mail versendet
+Notify_ORDER_VALIDATE=Kundenauftrag freigegeben
+Notify_ORDER_SENTBYMAIL=Kundenauftrag per E-Mail versendet
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Lieferantenbestellung per E-Mail zugestellt
 Notify_ORDER_SUPPLIER_VALIDATE=Lieferantenbestellung bestätigt
 Notify_ORDER_SUPPLIER_APPROVE=Lieferantenbestellung freigegeben
@@ -189,7 +189,7 @@ DolibarrDemo=Dolibarr ERP/CRM-Demo
 StatsByNumberOfUnits=Statistik zu den Totalstückzahlen Produkte/Dienstleistungen
 StatsByNumberOfEntities=Statistik über die Anzahl der verweisenden Entitäten (Anzahl der Rechnungen, Bestellungen etc.)
 NumberOfProposals=Anzahl Angebote
-NumberOfCustomerOrders=Anzahl der Kundenbestellungen
+NumberOfCustomerOrders=Anzahl der Kundenaufträge
 NumberOfCustomerInvoices=Anzahl Kundenrechnungen
 NumberOfSupplierProposals=Anzahl der Lieferantenangebote
 NumberOfSupplierOrders=Anzahl der Lieferantenbestellungen
@@ -197,7 +197,7 @@ NumberOfSupplierInvoices=Anzahl der Lieferantenrechnungen
 NumberOfContracts=Anzahl der Verträge
 NumberOfMos=Anzahl der Fertigungsaufträge
 NumberOfUnitsProposals=Anzahl von Einheiten in Angeboten
-NumberOfUnitsCustomerOrders=Anzahl von Einheiten in Kundenbestellungen
+NumberOfUnitsCustomerOrders=Anzahl von Einheiten in Kundenaufträgen
 NumberOfUnitsCustomerInvoices=Anzahl von Einheiten in Kundenrechnungen
 NumberOfUnitsSupplierProposals=Anzahl von Einheiten in Lieferantenangeboten
 NumberOfUnitsSupplierOrders=Anzahl von Einheiten in Lieferantenbestellungen
@@ -258,6 +258,10 @@ PassEncoding=Kennwort Encoding
 PermissionsAdd=Berechtigungen hinzugefügt
 PermissionsDelete=Berechtigungen entfernt
 YourPasswordMustHaveAtLeastXChars=Ihr Passwort muss mindestens <strong> %s </strong> Zeichen enthalten
+PasswordNeedAtLeastXUpperCaseChars=Das Passwort benötigt mindestens <strong> %s </strong> Großbuchstaben
+PasswordNeedAtLeastXDigitChars=Das Passwort benötigt mindestens <strong> %s </strong> numerische Zeichen
+PasswordNeedAtLeastXSpecialChars=Das Passwort benötigt mindestens <strong> %s </strong> Sonderzeichen
+PasswordNeedNoXConsecutiveChars=Das Passwort darf keine <strong> %s </strong> aufeinanderfolgenden gleichen Zeichen enthalten
 YourPasswordHasBeenReset=Ihr Passwort wurde zurückgesetzt
 ApplicantIpAddress=IP Adresse des Antragstellers
 SMSSentTo=SMS an %s gesendet
diff --git a/htdocs/langs/de_DE/products.lang b/htdocs/langs/de_DE/products.lang
index ee321ad6e24..48b1865416d 100644
--- a/htdocs/langs/de_DE/products.lang
+++ b/htdocs/langs/de_DE/products.lang
@@ -17,7 +17,7 @@ Create=Speichern
 Reference=Nummer
 NewProduct=Neues Produkt
 NewService=Neue Leistung
-ProductVatMassChange=systemweite MwSt-Änderung
+ProductVatMassChange=Systemweite MwSt.-Änderung
 ProductVatMassChangeDesc=Dieses Tool aktualisiert den für <b><u>ALLE</u></b> Produkte und Dienstleistungen definierten Mehrwertsteuersatz!
 MassBarcodeInit=Initialisierung Barcodes
 MassBarcodeInitDesc=Hier können Objekte mit einem Barcode initialisiert werden, die noch keinen haben. Stellen Sie vor Benutzung sicher, dass die Einstellungen des Barcode-Moduls vollständig sind!
diff --git a/htdocs/langs/de_DE/projects.lang b/htdocs/langs/de_DE/projects.lang
index 0b62e8cff55..a9cda09b2c3 100644
--- a/htdocs/langs/de_DE/projects.lang
+++ b/htdocs/langs/de_DE/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Hinweis: Bestehende Projekte mi
 SelectLinesOfTimeSpentToInvoice=Wählen Sie Positionen mit Zeiten aus, die noch nicht in Rechnung gestellt wurden, und führen Sie dann die Massenaktion "Rechnung erstellen" aus, um sie zu berechnen
 ProjectTasksWithoutTimeSpent=Projektaufgaben ohne Zeitaufwand
 FormForNewLeadDesc=Vielen Dank für das Ausfüllen des Formulars, um uns zu kontaktieren. Sie können uns auch direkt eine E-Mail an <b> %s </b> senden.
+StartDateCannotBeAfterEndDate=Enddatum kann nicht vor dem Startdatum liegen
diff --git a/htdocs/langs/de_DE/users.lang b/htdocs/langs/de_DE/users.lang
index aad0578877b..d984d10d932 100644
--- a/htdocs/langs/de_DE/users.lang
+++ b/htdocs/langs/de_DE/users.lang
@@ -36,7 +36,7 @@ SuperAdministrator=Super-Administrator
 SuperAdministratorDesc=Administrator mit allen Rechten
 AdministratorDesc=Administrator
 DefaultRights=Standardberechtigungen
-DefaultRightsDesc=Legen Sie die <u>Standard</u>-Berechtigungen fest, die einem <u>neuen</u> Benutzer automatisch zugewiesen werden. (Um Berechtigungen von bestehenden Benutzern zu ändern, wechseln Sie in die Benutzer-Karte.)
+DefaultRightsDesc=Legen Sie die <u>Standard</u>-Berechtigungen fest, die einem <u>neuen</u> Benutzer automatisch zugewiesen werden. Um Berechtigungen von bestehenden Benutzern zu ändern, wechseln Sie in die Benutzer-Karte.
 DolibarrUsers=Benutzer
 LastName=Nachname
 FirstName=Vorname
diff --git a/htdocs/langs/de_DE/withdrawals.lang b/htdocs/langs/de_DE/withdrawals.lang
index e0cc6c91563..cc3c0e21ee4 100644
--- a/htdocs/langs/de_DE/withdrawals.lang
+++ b/htdocs/langs/de_DE/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Überweisungsauftrag
 LatestBankTransferReceipts=Neueste %s Überweisungsaufträge
 LastWithdrawalReceipts=Letzte %s Abbuchungsbelege
 WithdrawalsLine=Bestellposition für Lastschrift
+CreditTransfer=Überweisung
 CreditTransferLine=Überweisungspositionen
 WithdrawalsLines=Abbuchungszeilen
 CreditTransferLines=Überweisungszeilen
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Geschäftspartner Bankcode
 NoInvoiceCouldBeWithdrawed=Keine Rechnung mit Erfolg eingezogen. Überprüfen Sie, ob die Rechnungen auf Unternehmen mit einer gültigen IBAN Nummer verweisen und die IBAN Nummer eine eindeutige Mandatsreferenz besitzt <strong>%s</strong>.
 WithdrawalCantBeCreditedTwice=Dieser Widerrufsbeleg ist bereits als gutgeschrieben markiert; Dies kann nicht zweimal durchgeführt werden, da dies möglicherweise zu doppelten Zahlungen und Bankeinträgen führen würde.
 ClassCredited=Als eingegangen markieren
+ClassDebited=Abbuchungen klassifizieren
 ClassCreditedConfirm=Möchten Sie diesen Abbuchungsbeleg wirklich als auf Ihrem Konto eingegangen markieren?
 TransData=Überweisungsdatum
 TransMetod=Überweisungsart
diff --git a/htdocs/langs/de_DE/workflow.lang b/htdocs/langs/de_DE/workflow.lang
index 0b5b69e7e38..9464a12aeff 100644
--- a/htdocs/langs/de_DE/workflow.lang
+++ b/htdocs/langs/de_DE/workflow.lang
@@ -6,17 +6,21 @@ ThereIsNoWorkflowToModify=Es sind keine Workflow-Änderungen möglich mit den ak
 descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Erstelle automatisch einen Kundenauftrag, nachdem ein Angebot auf "unterzeichnet" gesetzt wurde. Die neue Bestellung hat dann den selben Wert wie das Angebot.
 descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Erstellt automatisch eine Kundenrechnung, nachdem ein Angebot als "unterzeichnet" markiert wurde. Diese neue Kundenrechnung lautet über den selben Betrag wie das Angebot.
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Erstelle automatisch eine Kundenrechnung, nachdem der Vertrag bestätigt wurde.
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Erstellt automatisch eine Kundenrechnung, nachdem eine Bestellung geschlossen wurde. Die neue Kundenrechnung lautet über den selben Betrag wie die Bestellung.
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Erstellt automatisch eine Kundenrechnung, nachdem ein Kundenauftrag geschlossen wurde. Die erstellte Rechnung lautet über denselben Betrag wie der Auftrag.
 # Autoclassify customer proposal or order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Setzt das  entsprechende Angebot auf "abgerechnet", sofern der Kundenauftrag auf "abgerechnet" gesetzt wurde und sofern der Gesamtbetrag im Kundenauftrag gleich dem im Angebot ist.
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Setzt das verknüpfte Angebot auf "abgerechnet", sofern die Kundenrechnung erstellt wurde und sofern der Rechnungsbetrag identisch zur Angebotsumme ist.
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Kennzeichne die verknüpfte Kundenbestellung(en) als fakturiert ( = in Rechnung gestellt) sofern die Kundenrechnung als geprüft markiert wurde und die Beträge übereinstimmen.
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Kennzeichne den verknüpften Kundenauftrag als fakturiert ( = in Rechnung gestellt) sofern die Kundenrechnung als geprüft markiert wurde und die Beträge übereinstimmen.
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Kennzeichne verknüpfte Kundenaufträge als fakturiert ( = in Rechnung gestellt), sofern die Kundenrechnung als bezahlt markiert wurde und die Beträge übereinstimmen.
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Kennzeichne die verknüpften Aufträge als geliefert wenn die Lieferung erfolgt ist (und die Liefermenge der Bestellmenge entspricht).
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Den zugrundeliegenden Kundenauftrag als versendet kennzeichnen, wenn eine Sendung geschlossen wird (sofern die Gesamtmengen aller zugehörigen Sendungen mit denen des Kundenauftrags übereinstimmen)
-# Autoclassify purchase order
+# Autoclassify purchase proposal
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Setzt das verknüpfte Lieferantenangebot auf "abgerechnet", sofern die Lieferanrenrechnung erstellt wurde und sofern der Rechnungsbetrag identisch zur Angebotsumme ist. 
+# Autoclassify purchase order
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Kennzeichne die verknüpfte Lieferantenbestellung als abgerechnet, wenn die Lieferantenrechnung erstellt wurde und die Gesamtbeträge übereinstimmen.
+descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=Verknüpfte Lieferantenbestellung als eingegangen klassifizieren, wenn ein Wareneingang validiert wird (und wenn die von allen Wareneingängen eingegangene Menge mit der zu aktualisierenden Lieferantenbestellung übereinstimmt)
+descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=Verknüpfte Lieferantenbestellung als eingegangen klassifizieren, wenn ein Wareneingang geschlossen wird (und wenn die von allen Wareneingängen eingegangene Menge mit der zu aktualisierenden Bestellung übereinstimmt)
+# Autoclassify purchase invoice
 descWORKFLOW_BILL_ON_RECEPTION=Klassifizieren Sie Empfänge als "in Rechnung gestellt", wenn eine verknüpfte Lieferantenbestellung validiert wird
 # Autoclose intervention
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Schließen Sie alle mit dem Ticket verknüpften Interaktionen, wenn ein Ticket geschlossen wird
diff --git a/htdocs/langs/el_GR/accountancy.lang b/htdocs/langs/el_GR/accountancy.lang
index a28d0aa57a7..88894c91d3b 100644
--- a/htdocs/langs/el_GR/accountancy.lang
+++ b/htdocs/langs/el_GR/accountancy.lang
@@ -3,15 +3,15 @@ Accountancy=Λογιστική
 Accounting=Λογιστική
 ACCOUNTING_EXPORT_SEPARATORCSV=Διαχωριστής στηλών για το αρχείο που θα εξαχθεί
 ACCOUNTING_EXPORT_DATE=Μορφή ημερομηνίας για το αρχείο που θα εξαχθεί
-ACCOUNTING_EXPORT_PIECE=Export the number of piece
+ACCOUNTING_EXPORT_PIECE=Εξαγωγή του αριθμού του τεμαχίου
 ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Εξαγωγή με καθολικό λογαριασμό
 ACCOUNTING_EXPORT_LABEL=Εξαγωγή ετικέτας
 ACCOUNTING_EXPORT_AMOUNT=Εξαγωγή ποσού
 ACCOUNTING_EXPORT_DEVISE=Εξαγωγή νομίσματος
 Selectformat=Επιλέξτε το φορμάτ του αρχείου
-ACCOUNTING_EXPORT_FORMAT=Select the format for the file
+ACCOUNTING_EXPORT_FORMAT=Επιλέξτε τη μορφή για το αρχείο
 ACCOUNTING_EXPORT_ENDLINE=Επιλέξτε τον τύπο επιστροφής μεταφοράς
-ACCOUNTING_EXPORT_PREFIX_SPEC=Specify the prefix for the file name
+ACCOUNTING_EXPORT_PREFIX_SPEC=Καθορίστε το πρόθεμα για το όνομα του αρχείου
 ThisService=Αυτή η υπηρεσία
 ThisProduct=Αυτό το προϊόν
 DefaultForService=Προεπιλογή για υπηρεσία
@@ -27,7 +27,7 @@ JournalFinancial=Οικονομικά ημερολόγια
 BackToChartofaccounts=Επιστροφή στο διάγραμμα των λογαριασμών
 Chartofaccounts=Διάγραμμα λογαριασμών
 ChartOfSubaccounts=Διάγραμμα μεμονωμένων λογαριασμών
-ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
+ChartOfIndividualAccountsOfSubsidiaryLedger=Σχέδιο μεμονωμένων λογαριασμών του δευτερεύοντος καθολικού
 CurrentDedicatedAccountingAccount=Τρέχον ειδικό λογαριασμό
 AssignDedicatedAccountingAccount=Νέος λογαριασμός προς ανάθεση
 InvoiceLabel=Ετικέτα τιμολογίου
@@ -37,8 +37,8 @@ OtherInfo=Αλλες πληροφορίες
 DeleteCptCategory=Κατάργηση λογαριασμού λογιστικής από την ομάδα
 ConfirmDeleteCptCategory=Είστε βέβαιοι ότι θέλετε να καταργήσετε αυτόν τον λογαριασμό λογιστικής από την ομάδα λογαριασμών λογαριασμού;
 JournalizationInLedgerStatus=Κατάσταση της περιοδικής εγγραφής
-AlreadyInGeneralLedger=Already transferred to accounting journals and ledger
-NotYetInGeneralLedger=Not yet transferred to accouting journals and ledger
+AlreadyInGeneralLedger=Έχει ήδη μεταφερθεί στο λογιστικό ημερολόγιο και στο καθολικό
+NotYetInGeneralLedger=Δεν έχει μεταφερθεί ακόμη στο λογιστικό ημερολόγιο και στο καθολικό
 GroupIsEmptyCheckSetup=Η ομάδα είναι κενή, ελέγξτε τη ρύθμιση της εξατομικευμένης ομάδας λογιστικής
 DetailByAccount=Εμφάνιση λεπτομερειών βάσει λογαριασμού
 AccountWithNonZeroValues=Λογαριασμοί με μη μηδενικές τιμές
@@ -48,10 +48,10 @@ CountriesNotInEEC=Χώρες που δεν βρίσκονται στην ΕΟΚ
 CountriesInEECExceptMe=Χώρες στην ΕΟΚ εκτός από το %s
 CountriesExceptMe=Όλες οι χώρες εκτός από το %s
 AccountantFiles=Εξαγωγή εγγράφων προέλευσης
-ExportAccountingSourceDocHelp=With this tool, you can export the source events (list in CSV and PDFs) that are used to generate your accountancy.
-ExportAccountingSourceDocHelp2=To export your journals, use the menu entry %s - %s.
+ExportAccountingSourceDocHelp=Με αυτό το εργαλείο, μπορείτε να εξαγάγετε τα συμβάντα (λίστα σε CSV και PDF) που χρησιμοποιούνται για τη δημιουργία της λογιστικής σας.
+ExportAccountingSourceDocHelp2=Για να εξαγάγετε τα ημερολόγιά σας, χρησιμοποιήστε το μενού καταχώρηση %s - %s.
 VueByAccountAccounting=Προβολή κατά λογιστικό λογαριασμό
-VueBySubAccountAccounting=View by accounting subaccount
+VueBySubAccountAccounting=Προβολή ανά λογιστικό υπολογαριασμό
 
 MainAccountForCustomersNotDefined=Κύριος λογαριασμός λογιστικής για πελάτες που δεν έχουν οριστεί στη ρύθμιση
 MainAccountForSuppliersNotDefined=Κύριος λογαριασμός λογιστικής για προμηθευτές που δεν καθορίζονται στη ρύθμιση
@@ -66,8 +66,8 @@ AccountancyAreaDescActionOnceBis=Τα επόμενα βήματα θα πρέπ
 AccountancyAreaDescActionFreq=Οι παρακάτω ενέργειες εκτελούνται συνήθως κάθε μήνα, εβδομάδα ή μέρα για πολύ μεγάλες επιχειρήσεις ...
 
 AccountancyAreaDescJournalSetup=STEP %s: Δημιουργήστε ή ελέγξτε το περιεχόμενο της λίστας σας από το μενού %s
-AccountancyAreaDescChartModel=STEP %s: Check that a model of chart of account exists or create one from menu %s
-AccountancyAreaDescChart=STEP %s: Select and|or complete your chart of account from menu %s
+AccountancyAreaDescChartModel=ΒΗΜΑ %s: Ελέγξτε ότι υπάρχει ένα μοντέλο λογαριασμών ή δημιουργήστε ένα από το μενού %s
+AccountancyAreaDescChart=ΒΗΜΑ %s: Επιλέξτε και|ή ολοκληρώστε το λογιστικό σας σχέδιο από το μενού %s
 
 AccountancyAreaDescVat=STEP %s: Καθορίστε λογαριασμούς λογιστικής για κάθε τιμή ΦΠΑ. Για αυτό, χρησιμοποιήστε την καταχώρηση μενού %s.
 AccountancyAreaDescDefault=STEP %s: Καθορίστε προεπιλεγμένους λογαριασμούς λογιστικής. Για αυτό, χρησιμοποιήστε την καταχώρηση μενού %s.
@@ -87,7 +87,7 @@ AccountancyAreaDescAnalyze=STEP %s: Προσθέστε ή επεξεργαστε
 
 AccountancyAreaDescClosePeriod=STEP %s: Κλείστε την περίοδο έτσι δεν μπορούμε να κάνουμε αλλαγές σε ένα μέλλον.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=Ένα υποχρεωτικό βήμα στη ρύθμιση δεν έχει ολοκληρωθεί (το ημερολόγιο κωδικών λογιστικής δεν έχει καθοριστεί για όλους τους τραπεζικούς λογαριασμούς)
 Selectchartofaccounts=Επιλέξτε ενεργό πίνακα λογαριασμών
 ChangeAndLoad=Αλλαγή και φόρτωση
 Addanaccount=Προσθέστε ένα λογιστικό λογαριασμό
@@ -97,8 +97,8 @@ SubledgerAccount=Λογαριασμός χρέωσης
 SubledgerAccountLabel=Ετικέτα λογαριασμού
 ShowAccountingAccount=Εμφάνιση λογαριασμού λογιστικής
 ShowAccountingJournal=Εμφάνιση λογιστικού περιοδικού
-ShowAccountingAccountInLedger=Show accounting account in ledger
-ShowAccountingAccountInJournals=Show accounting account in journals
+ShowAccountingAccountInLedger=Εμφάνιση λογιστικού λογαριασμού στο καθολικό
+ShowAccountingAccountInJournals=Εμφάνιση λογιστικού λογαριασμού στα ημερολόγια
 AccountAccountingSuggest=Λογαριασμός λογιστικής πρότεινε
 MenuDefaultAccounts=Προεπιλεγμένοι λογαριασμοί
 MenuBankAccounts=Τραπεζικοί Λογαριασμοί
@@ -114,15 +114,15 @@ ProductsBinding=Λογαριασμοί προϊόντων
 TransferInAccounting=Μεταφορά στη λογιστική
 RegistrationInAccounting=Εγγραφή στη λογιστική
 Binding=Δεσμευση λογαριασμών
-CustomersVentilation=Δεσμευτικό τιμολόγιο πελατών
+CustomersVentilation=Συνδετικό τιμολόγιο πελατών
 SuppliersVentilation=Δεσμευτικό τιμολόγιο προμηθευτή
 ExpenseReportsVentilation=Αναφορά σύνδεσης εξόδων
 CreateMvts=Δημιουργήστε μία νέα συναλλαγή
 UpdateMvts=Τροποποίηση συναλλαγής
 ValidTransaction=Επικύρωση συναλλαγής
-WriteBookKeeping=Register transactions in accounting
+WriteBookKeeping=Καταχώρηση συναλλαγών στη λογιστική
 Bookkeeping=Καθολικό
-BookkeepingSubAccount=Subledger
+BookkeepingSubAccount=ΥποΚαθολικό
 AccountBalance=Υπόλοιπο λογαριασμού
 ObjectsRef=Αναφορά αντικειμένου προέλευσης
 CAHTF=Συνολικός προμηθευτής αγοράς προ φόρων
@@ -132,7 +132,7 @@ InvoiceLinesDone=Δεσμευμένες γραμμές τιμολογίων
 ExpenseReportLines=Γραμμές εκθέσεων δαπανών που δεσμεύουν
 ExpenseReportLinesDone=Δεσμευμένες αναφορές δαπανών
 IntoAccount=Συνδέστε τη γραμμή με τον λογαριασμό λογιστικής
-TotalForAccount=Total accounting account
+TotalForAccount=Σύνολο λογιστικού λογαριασμού
 
 
 Ventilate=Δένω
@@ -148,7 +148,7 @@ NotVentilatedinAccount=Δεν δεσμεύεται στον λογαριασμό
 XLineSuccessfullyBinded=%s προϊόντα / υπηρεσίες με επιτυχία δεσμεύεται σε λογιστικό λογαριασμό
 XLineFailedToBeBinded=%s προϊόντα / υπηρεσίες δεν δεσμεύονται σε κανένα λογιστικό λογαριασμό
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Μέγιστος αριθμός γραμμών στη λίστα και στη σελίδα δεσμεύσεων (συνιστάται: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Ξεκινήστε τη διαλογή της σελίδας &quot;Δεσμευτική ενέργεια&quot; από τα πιο πρόσφατα στοιχεία
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Ξεκινήστε τη διαλογή της σελίδας &quot;Δεσμευτική πραγματοποίηση&quot; από τα πιο πρόσφατα στοιχεία
 
@@ -159,9 +159,9 @@ ACCOUNTING_LENGTH_AACCOUNT=Μήκος λογαριασμών τρίτου λογ
 ACCOUNTING_MANAGE_ZERO=Να επιτρέπεται η διαχείριση διαφορετικού αριθμού μηδενικών στο τέλος ενός λογαριασμού λογιστικής. Απαιτείται από ορισμένες χώρες (όπως η Ελβετία). Εάν είναι απενεργοποιημένη (προεπιλογή), μπορείτε να ορίσετε τις ακόλουθες δύο παραμέτρους για να ζητήσετε από την εφαρμογή να προσθέσει εικονικά μηδενικά.
 BANK_DISABLE_DIRECT_INPUT=Απενεργοποιήστε την απευθείας εγγραφή συναλλαγής σε τραπεζικό λογαριασμό
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Ενεργοποιήστε το σχέδιο εξαγωγής στο περιοδικό
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, 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
+ACCOUNTANCY_COMBO_FOR_AUX=Ενεργοποίηση σύνθετης λίστας για θυγατρικό λογαριασμό (ενδέχεται να είναι αργή εάν έχετε πολλά τρίτα μέρη, διακοπή της δυνατότητας αναζήτησης σε ένα μέρος της αξίας)
+ACCOUNTING_DATE_START_BINDING=Καθορίστε ημερομηνία έναρξης δεσμεύσεων & μεταφοράς στη λογιστική. Κάτω από αυτή την ημερομηνία, οι συναλλαγές δεν θα μεταφερθούν στο λογιστικό.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Κατά τη μεταφορά λογιστικού, επιλέξτε εμφάνιση περιόδου από προεπιλογή
 
 ACCOUNTING_SELL_JOURNAL=Ημερολόγιο πωλήσεων
 ACCOUNTING_PURCHASE_JOURNAL=Ημερολόγιο αγορών
@@ -181,7 +181,7 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Λογαριασμός λογιστικής αναμ
 DONATION_ACCOUNTINGACCOUNT=Λογαριασμός λογιστικής για την εγγραφή δωρεών
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Λογαριασμός λογιστικής για την εγγραφή συνδρομών
 
-ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Λογιστικός λογαριασμός από προεπιλογή για εγγραφή κατάθεσης πελάτη
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Λογαριασμός λογιστικής από προεπιλογή για τα αγορασμένα προϊόντα (χρησιμοποιείται αν δεν ορίζεται στο φύλλο προϊόντων)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Λογαριασμός από προεπιλογή για τα προϊόντα που αγοράστηκαν στην ΕΟΚ (χρησιμοποιείται αν δεν ορίζεται στο φύλλο προϊόντος)
@@ -202,33 +202,33 @@ Docdate=Ημερομηνία
 Docref=Παραπομπή
 LabelAccount=Ετικέτα λογαριασμού
 LabelOperation=Λειτουργία ετικετών
-Sens=Direction
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
+Sens=Κατεύθυνση
+AccountingDirectionHelp=Για έναν λογιστικό λογαριασμό πελάτη, χρησιμοποιήστε την Πίστωση για να καταγράψετε μια πληρωμή που λάβατε <br> Για έναν λογιστικό λογαριασμό ενός προμηθευτή, χρησιμοποιήστε τη Χρέωση για να καταγράψετε μια πληρωμή που κάνατε
 LetteringCode=Κωδικός γράμματος
 Lettering=Γράμματα
 Codejournal=Ημερολόγιο
 JournalLabel=Ετικέτα περιοδικών
 NumPiece=Αριθμός τεμαχίου
 TransactionNumShort=Αριθ. συναλλαγή
-AccountingCategory=Custom group
-GroupByAccountAccounting=Group by general ledger account
-GroupBySubAccountAccounting=Group by subledger account
+AccountingCategory=Προσαρμοσμένη ομάδα
+GroupByAccountAccounting=Ομαδοποίηση κατά λογαριασμό γενικού καθολικού
+GroupBySubAccountAccounting=Ομαδοποίηση ανά λογαριασμό υποκαθολικού
 AccountingAccountGroupsDesc=Μπορείτε να ορίσετε εδώ ορισμένες ομάδες λογιστικού λογαριασμού. Θα χρησιμοποιηθούν για εξατομικευμένες λογιστικές εκθέσεις.
 ByAccounts=Με λογαριασμούς
 ByPredefinedAccountGroups=Με προκαθορισμένες ομάδες
 ByPersonalizedAccountGroups=Με εξατομικευμένες ομάδες
 ByYear=Με χρόνια
 NotMatch=Δεν έχει οριστεί
-DeleteMvt=Delete some operation lines from accounting
+DeleteMvt=Διαγράψτε ορισμένες γραμμές λειτουργίας από τη λογιστική
 DelMonth=Μήνας προς διαγραφή
 DelYear=Έτος προς διαγραφή
 DelJournal=Ημερολόγιο προς διαγραφή
-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=Αυτό θα διαγράψει όλες τις γραμμές λειτουργίας της λογιστικής για το έτος/μήνα ή/και για ένα συγκεκριμένο ημερολόγιο (απαιτείται τουλάχιστον ένα κριτήριο). Θα πρέπει να επαναχρησιμοποιήσετε τη δυνατότητα '%s' για να επαναφέρετε τη διαγραμμένη εγγραφή στο καθολικό.
+ConfirmDeleteMvtPartial=Αυτό θα διαγράψει τη συναλλαγή από τη λογιστική (όλες οι γραμμές λειτουργίας που σχετίζονται με την ίδια συναλλαγή θα διαγραφούν)
 FinanceJournal=Ημερολόγιο οικονομικών
 ExpenseReportsJournal=Έκθεση εκθέσεων δαπανών
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
+DescJournalOnlyBindedVisible=Αυτή είναι μια προβολή αρχείων που είναι δεσμευμένα σε έναν λογιστικό λογαριασμό και μπορούν να καταγραφούν στα Ημερολόγια και στο Καθολικό.
 VATAccountNotDefined=Δεν έχει οριστεί λογαριασμός για ΦΠΑ
 ThirdpartyAccountNotDefined=Ο λογαριασμός για τρίτους δεν έχει οριστεί
 ProductAccountNotDefined=Λογαριασμός για το προϊόν δεν έχει οριστεί
@@ -246,15 +246,15 @@ DescThirdPartyReport=Συμβουλευτείτε εδώ τη λίστα με τ
 ListAccounts=Λίστα των λογιστικών λογαριασμών
 UnknownAccountForThirdparty=Άγνωστο λογαριασμό τρίτων. Θα χρησιμοποιήσουμε %s
 UnknownAccountForThirdpartyBlocking=Άγνωστο λογαριασμό τρίτων. Σφάλμα αποκλεισμού
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Subledger account not defined or third party or user unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Ο λογαριασμός υποκαθολικού δεν έχει οριστεί ή το τρίτο μέρος ή ο χρήστης είναι άγνωστος. Θα χρησιμοποιήσουμε %s
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Άγνωστο το Tρίτο-Mέρος και λογαριασμός Καθολικού Ημερολογίου δεν έχει οριστεί για την πληρωμή. Θα διατηρήσουμε κενή την τιμή του λογαριασμού.
-ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Subledger account not defined or third party or user unknown. Blocking error.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Ο υποκαθοκικός λογαριασμός δεν έχει οριστεί ή το τρίτο μέρος ή ο χρήστης είναι άγνωστος. Σφάλμα αποκλεισμού.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Ο λογαριασμός λογαριασμού τρίτου μέρους και ο λογαριασμός αναμονής δεν έχουν οριστεί. Σφάλμα αποκλεισμού
 PaymentsNotLinkedToProduct=Πληρωμή που δεν συνδέεται με κανένα προϊόν / υπηρεσία
-OpeningBalance=Opening balance
+OpeningBalance=Άνοιγμα υπολοίπου
 ShowOpeningBalance=Εμφάνιση αρχικού υπολοίπου
 HideOpeningBalance=Κρύψιμο αρχικού υπολοίπου
-ShowSubtotalByGroup=Show subtotal by level
+ShowSubtotalByGroup=Εμφάνιση υποσυνόλου ανά επίπεδο
 
 Pcgtype=Ομάδα του λογαριασμού
 PcgtypeDesc=Η ομάδα λογαριασμού χρησιμοποιείται ως προκαθορισμένα κριτήρια «φίλτρου» και «ομαδοποίησης» για ορισμένες λογιστικές αναφορές. Για παράδειγμα, τα «ΕΙΣΟΔΗΜΑ» ή «ΕΞΟΔΑ» χρησιμοποιούνται ως ομάδες λογιστικών λογαριασμών προϊόντων για τη δημιουργία της αναφοράς εξόδων / εσόδων.
@@ -277,16 +277,16 @@ DescVentilExpenseReport=Συμβουλευτείτε εδώ τον κατάλο
 DescVentilExpenseReportMore=Εάν ρυθμίσετε τον λογαριασμό λογαριασμών σε γραμμές αναφοράς τύπου εξόδων, η εφαρμογή θα είναι σε θέση να κάνει όλη τη δέσμευση μεταξύ των γραμμών αναφοράς δαπανών σας και του λογαριασμού λογιστικής του λογαριασμού σας, με ένα μόνο κλικ με το κουμπί <strong>&quot;%s&quot;</strong> . Εάν ο λογαριασμός δεν έχει οριστεί σε λεξικό τελών ή αν έχετε ακόμα ορισμένες γραμμές που δεν δεσμεύονται σε κανένα λογαριασμό, θα πρέπει να κάνετε μια χειροκίνητη σύνδεση από το μενού &quot; <strong>%s</strong> &quot;.
 DescVentilDoneExpenseReport=Συμβουλευτείτε εδώ τον κατάλογο των γραμμών των εκθέσεων δαπανών και του λογιστικού λογαριασμού τους
 
-Closure=Annual closure
+Closure=Ετήσιο κλείσιμο
 DescClosure=Συμβουλευτείτε εδώ τον αριθμό των κινήσεων ανά μήνα που δεν έχουν επικυρωθεί και τα οικονομικά έτη είναι ήδη ανοιχτά
 OverviewOfMovementsNotValidated=Βήμα 1 / Επισκόπηση των κινήσεων που δεν έχουν επικυρωθεί. (Είναι απαραίτητο να κλείσετε ένα οικονομικό έτος)
-AllMovementsWereRecordedAsValidated=All movements were recorded as validated
-NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
+AllMovementsWereRecordedAsValidated=Όλες οι κινήσεις καταγράφηκαν ως επικυρωμένες
+NotAllMovementsCouldBeRecordedAsValidated=Δεν ήταν δυνατή η καταγραφή όλων των κινήσεων ως επικυρωμένες
 ValidateMovements=Επικυρώστε τις κινήσεις
 DescValidateMovements=Απαγορεύεται οποιαδήποτε τροποποίηση ή διαγραφή γραφής, γράμματος και διαγραφής. Όλες οι καταχωρήσεις για μια άσκηση πρέπει να επικυρωθούν, διαφορετικά το κλείσιμο δεν θα είναι δυνατό
 
 ValidateHistory=Δεσμεύστε αυτόματα
-AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
+AutomaticBindingDone=Ολοκληρώθηκαν οι αυτόματες δεσμεύσεις (%s) - Δεν είναι δυνατή η αυτόματη δέσμευση για κάποιες εγγραφές (%s)
 
 ErrorAccountancyCodeIsAlreadyUse=Σφάλμα, δεν μπορείτε να διαγράψετε αυτόν τον λογιστικό λογαριασμό γιατί χρησιμοποιείται
 MvtNotCorrectlyBalanced=Η κίνηση δεν είναι σωστά ισορροπημένη. Χρέωση = %s | Πιστωτικό = %s
@@ -298,13 +298,13 @@ NoNewRecordSaved=Δεν υπάρχει πλέον ρεκόρ για να κάν
 ListOfProductsWithoutAccountingAccount=Κατάλογος προϊόντων που δεν δεσμεύονται σε κανένα λογιστικό λογαριασμό
 ChangeBinding=Αλλάξτε τη σύνδεση
 Accounted=Πληρώθηκε σε
-NotYetAccounted=Not yet transferred to accounting
+NotYetAccounted=Δεν έχει μεταφερθεί ακόμη στη λογιστική
 ShowTutorial=Εμφάνιση εκπαιδευτικού προγράμματος
 NotReconciled=Δεν ταιριάζουν
-WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
+WarningRecordWithoutSubledgerAreExcluded=Προειδοποίηση, όλες οι λειτουργίες χωρίς καθορισμένο λογαριασμό υποκαθολικού φιλτράρονται και εξαιρούνται από αυτήν την προβολή
 
 ## Admin
-BindingOptions=Binding options
+BindingOptions=Δεσμευτικές επιλογές
 ApplyMassCategories=Εφαρμογή κατηγοριών μάζας
 AddAccountFromBookKeepingWithNoCategories=Διαθέσιμος λογαριασμός που δεν έχει ακόμα εγγραφεί στην εξατομικευμένη ομάδα
 CategoryDeleted=Η κατηγορία για τον λογαριασμό λογιστηρίου έχει καταργηθεί
@@ -329,9 +329,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountanc
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
-NotifiedExportDate=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)
-ConfirmExportFile=Confirmation of the generation of the accounting export file ?
+NotifiedExportDate=Επισήμανση εξαγόμενων γραμμών ως εξαγομένες (δεν θα είναι δυνατή η τροποποίηση των γραμμών)
+NotifiedValidationDate=Επικύρωση των εξαγόμενων καταχωρήσεων (δεν θα είναι δυνατή η τροποποίηση ή η διαγραφή των γραμμών)
+ConfirmExportFile=Επιβεβαίωση δημιουργίας του λογιστικού αρχείου εξαγωγής ;
 ExportDraftJournal=Εξαγωγή σχεδίου περιοδικού
 Modelcsv=Πρότυπο εξαγωγής
 Selectmodelcsv=Επιλέξτε ένα πρότυπο από την εξαγωγή
@@ -339,22 +339,22 @@ Modelcsv_normal=Κλασική εξαγωγή
 Modelcsv_CEGID=Εξαγωγή για CEGID Expert Comptabilité
 Modelcsv_COALA=Εξαγωγή για το Sage Coala
 Modelcsv_bob50=Εξαγωγή για Sage BOB 50
-Modelcsv_ciel=Export for Sage50, Ciel Compta or Compta Evo. (Format XIMPORT)
+Modelcsv_ciel=Εξαγωγή για Sage50, Ciel Compta ή Compta Evo. (Μορφή XIMPORT)
 Modelcsv_quadratus=Εξαγωγή για Quadratus QuadraCompta
 Modelcsv_ebp=Εξαγωγή για EBP
 Modelcsv_cogilog=Εξαγωγή για το Cogilog
-Modelcsv_agiris=Export for Agiris Isacompta
-Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_agiris=Εξαγωγή για Agiris Isacompta
+Modelcsv_LDCompta=Εξαγωγή για LD Compta (v9) (Δοκιμή)
 Modelcsv_LDCompta10=Εξαγωγή για LD Compta (v10 και άνω)
 Modelcsv_openconcerto=Εξαγωγή για OpenConcerto (Test)
 Modelcsv_configurable=Εξαγωγή CSV εξαγωγής
 Modelcsv_FEC=Εξαγωγή FEC
-Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
+Modelcsv_FEC2=Εξαγωγή FEC (Με γραφή δημιουργίας ημερομηνιών/αντιστροφή εγγράφου)
 Modelcsv_Sage50_Swiss=Εξαγωγή για Sage 50 Ελβετία
-Modelcsv_winfic=Export for Winfic - eWinfic - WinSis Compta
-Modelcsv_Gestinumv3=Export for Gestinum (v3)
-Modelcsv_Gestinumv5=Export for Gestinum (v5)
-Modelcsv_charlemagne=Export for Aplim Charlemagne
+Modelcsv_winfic=Εξαγωγή για Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Εξαγωγή για Gestinum (v3)
+Modelcsv_Gestinumv5=Εξαγωγή για Gestinum (v5)
+Modelcsv_charlemagne=Εξαγωγή για το Aplim Charlemagne
 ChartofaccountsId=Λογαριασμός Id
 
 ## Tools - Init accounting account on product / service
@@ -387,8 +387,8 @@ SaleExport=Εξαγωγή πώλησης
 SaleEEC=Πώληση στην ΕΟΚ
 SaleEECWithVAT=Πώληση σε ΕΟΚ με μηδενικό ΦΠΑ, επομένως υποθέτουμε ότι ΔΕΝ είναι ενδοκοινοτική πώληση και ο προτεινόμενος λογαριασμός είναι ο τυπικός λογαριασμός προϊόντος.
 SaleEECWithoutVATNumber=Πώληση σε ΕΟΚ χωρίς ΦΠΑ, αλλά δεν ορίζεται το ΑΦΜ τρίτου μέρους. Εφεδρικός λογαριασμός προϊόντος για τυπικές πωλήσεις. Εάν χρειαστεί, μπορείτε να διορθώσετε το αναγνωριστικό ΦΠΑ τρίτου μέρους ή τον λογαριασμό προϊόντος.
-ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
-ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
+ForbiddenTransactionAlreadyExported=Απαγορευμένο: Η συναλλαγή έχει επικυρωθεί ή/και έχει εξαχθεί.
+ForbiddenTransactionAlreadyValidated=Απαγορευμένο: Η συναλλαγή έχει επικυρωθεί.
 ## Dictionary
 Range=Εύρος λογιστικού λογαριασμού
 Calculated=Υπολογίστηκε
@@ -405,33 +405,33 @@ NoJournalDefined=Δεν έχει οριστεί περιοδικό
 Binded=Γραμμές δεσμευμένες
 ToBind=Γραμμές που δεσμεύουν
 UseMenuToSetBindindManualy=Οι γραμμές που δεν έχουν ακόμη δεσμευτεί, χρησιμοποιήστε το μενού <a href="%s">%s</a> για να κάνετε τη σύνδεση μη αυτόματα
-SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Sorry this module is not compatible with the experimental feature of situation invoices
+SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Λυπούμαστε, αυτή η ενότητα δεν είναι συμβατή με την πειραματική λειτουργία των τιμολογίων κατάστασης
 
 ## Import
 ImportAccountingEntries=Λογιστικές εγγραφές
-ImportAccountingEntriesFECFormat=Accounting entries - FEC format
-FECFormatJournalCode=Code journal (JournalCode)
-FECFormatJournalLabel=Label journal (JournalLib)
-FECFormatEntryNum=Piece number (EcritureNum)
-FECFormatEntryDate=Piece date (EcritureDate)
-FECFormatGeneralAccountNumber=General account number (CompteNum)
-FECFormatGeneralAccountLabel=General account label (CompteLib)
+ImportAccountingEntriesFECFormat=Λογιστικές εγγραφές - Μορφή FEC
+FECFormatJournalCode=Kώδικας ημερολογίου (JournalCode)
+FECFormatJournalLabel=Ετικέτα ημερολογίου (JournalLib)
+FECFormatEntryNum=Αριθμός τεμαχίου (EcritureNum)
+FECFormatEntryDate=Ημερομηνία τεμαχίου (EcritureDate)
+FECFormatGeneralAccountNumber=Γενικός αριθμός λογαριασμού (CompteNum)
+FECFormatGeneralAccountLabel=Γενική ετικέτα λογαριασμού (CompteLib)
 FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
 FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
-FECFormatPieceRef=Piece ref (PieceRef)
-FECFormatPieceDate=Piece date creation (PieceDate)
-FECFormatLabelOperation=Label operation (EcritureLib)
-FECFormatDebit=Debit (Debit)
-FECFormatCredit=Credit (Credit)
+FECFormatPieceRef=Αναφορά τεμαχίου (PieceRef)
+FECFormatPieceDate=Δημιουργία ημερομηνίας τεμαχίου (PieceDate)
+FECFormatLabelOperation=Λειτουργία ετικέτας (EcritureLib)
+FECFormatDebit=Χρεωστική (Χρεωστική)
+FECFormatCredit=Πίστωση (Πίστωση)
 FECFormatReconcilableCode=Reconcilable code (EcritureLet)
 FECFormatReconcilableDate=Reconcilable date (DateLet)
-FECFormatValidateDate=Piece date validated (ValidDate)
-FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
-FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+FECFormatValidateDate=Ημερομηνία επικύρωσης τεμαχίου (ValidDate)
+FECFormatMulticurrencyAmount=Ποσό πολλαπλών νομισμάτων (Montantdevise)
+FECFormatMulticurrencyCode=Κωδικός πολλαπλών νομισμάτων (Idevise)
 
 DateExport=Ημερομηνία εξαγωγής
 WarningReportNotReliable=Προειδοποίηση, αυτή η αναφορά δεν βασίζεται στον Καθολικό, επομένως δεν περιέχει συναλλαγή που τροποποιείται χειροκίνητα στο Ledger. Εάν η περιοδική σας έκδοση είναι ενημερωμένη, η προβολή της λογιστικής είναι πιο ακριβής.
 ExpenseReportJournal=Ενημερωτικό Δελτίο Έκθεσης
 InventoryJournal=Απογραφή Αποθέματος
 
-NAccounts=%s accounts
+NAccounts= %s  λογαριασμός,-οί
diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang
index 54589e772dc..27059397d83 100644
--- a/htdocs/langs/el_GR/admin.lang
+++ b/htdocs/langs/el_GR/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
 BoldRefAndPeriodOnPDF=Bold reference and period in PDF
-BoldLabelOnPDF=Bold label in PDF
+BoldLabelOnPDF=Έντονη ετικέτα σε PDF
 Foundation=Οργανισμός
 Version=Έκδοση
 Publisher=Εκδότης
@@ -39,13 +39,13 @@ UnlockNewSessions=Κατάργηση κλειδώματος σύνδεσης
 YourSession=Η σύνοδος σας
 Sessions=Συνεδρίες χρηστών
 WebUserGroup=Χειριστής/Ομάδα Διακομιστή Web
-PermissionsOnFiles=Permissions on files
-PermissionsOnFilesInWebRoot=Permissions on files in web root directory
-PermissionsOnFile=Permissions on file %s
+PermissionsOnFiles=Δικαιώματα σε αρχεία
+PermissionsOnFilesInWebRoot=Δικαιώματα σε αρχεία στον ριζικό κατάλογο ιστού
+PermissionsOnFile=Δικαιώματα στο αρχείο %s
 NoSessionFound=Η διαμόρφωση της PHP σας φαίνεται να μην επιτρέπει την καταχώρηση των ενεργοποιημένων συνδεγριών. Ο κατάλογος που χρησιμοποιείται για την αποθήκευση των περιόδων σύνδεσης (<b>%s</b>) μπορεί να προστατεύεται (για παράδειγμα, από τα δικαιώματα των λειτουργικών συστημάτων ή από την οδηγία PHP open_basedir).
 DBStoringCharset=Σύνολο χαρακτήρων βάσης δεδομένων για την αποθήκευση δεδομένων
 DBSortingCharset=Σετ χαρακτήρων βάσης δεδομένων για ταξινόμηση δεδομένων
-HostCharset=Host charset
+HostCharset=Σύνολο χαρακτήρων κεντρικού υπολογιστή
 ClientCharset=Σύνολο χαρακτήρων του χρήστη
 ClientSortingCharset=Συγκέντρωση πελατών
 WarningModuleNotActive=Το Module <b>%s</b> πρέπει να ενεργοποιηθεί
@@ -55,19 +55,19 @@ InternalUser=Εσωτερικός χρήστης
 ExternalUser=Εξωτερικός χρήστης
 InternalUsers=Εσωτερικοί χρήστες
 ExternalUsers=Εξωτερικοί χρήστες
-UserInterface=User interface
+UserInterface=Διεπαφή χρήστη
 GUISetup=Εμφάνιση
 SetupArea=Ρύθμιση
 UploadNewTemplate=Μεταφόρτωση νέου(-ων) προτύπου(-ων)
 FormToTestFileUploadForm=Έντυπο για να ελέγξετε το αρχείο μεταφόρτωσης (ανάλογα με τις ρυθμίσεις)
-ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
-ModuleIsEnabled=The module/application <b>%s</b> has been enabled
+ModuleMustBeEnabled=Η ενότητα/εφαρμογή <b> %s </b> πρέπει να είναι ενεργοποιημένη
+ModuleIsEnabled=Η ενότητα/εφαρμογή <b> %s </b> έχει ενεργοποιηθεί
 IfModuleEnabled=Σημείωση: ναι, είναι αποτελεσματική μόνο αν το module <b>%s</b> είναι ενεργοποιημένο
 RemoveLock=Αφαιρέστε/μετονομάστε το αρχείο <b>%s</b>, αν υπάρχει, για να επιτραπεί η χρήση του εργαλείου ενημέρωσης/εγκατάστασης.
 RestoreLock=Επαναφέρετε το  αρχείο <b>%s</b>, με δικαίωμα ανάγνωσης μόνο, για να απενεργοποιηθεί οποιαδήποτε χρήση του εργαλείου ενημέρωσης/εγκατάστασης.
 SecuritySetup=Διαχείριση Ασφάλειας
-PHPSetup=PHP setup
-OSSetup=OS setup
+PHPSetup=Ρύθμιση PHP
+OSSetup=Ρύθμιση λειτουργικού συστήματος
 SecurityFilesDesc=Καθορίστε εδώ τις επιλογές που σχετίζονται με την ασφάλεια σχετικά με τη μεταφόρτωση αρχείων.
 ErrorModuleRequirePHPVersion=Λάθος, αυτή η ενότητα απαιτεί έκδοση PHP %s ή μεγαλύτερη
 ErrorModuleRequireDolibarrVersion=Λάθος, αυτό το module απαιτεί Dolibarr έκδοση %s ή μεγαλύτερη
@@ -77,21 +77,21 @@ Dictionary=Λεξικά
 ErrorReservedTypeSystemSystemAuto=Αξία «system» και «systemauto» για τον τύπο είναι κατοχυρωμένα. Μπορείτε να χρησιμοποιήσετε το «χρήστη» ως αξία για να προσθέσετε το δικό σας μητρώο
 ErrorCodeCantContainZero=Ο κώδικας δεν μπορεί να περιέχει την τιμή 0
 DisableJavascript=Απενεργοποίηση συναρτήσεων JavaScript και Ajax
-DisableJavascriptNote=Note: For test or debug purpose only. For optimization for blind person or text browsers, you may prefer to use the setup on the profile of user
+DisableJavascriptNote=Σημείωση: Μόνο για σκοπούς δοκιμής ή εντοπισμού σφαλμάτων. Για βελτιστοποίηση για τυφλούς ή προγράμματα περιήγησης κειμένου, μπορείτε να προτιμήσετε να χρησιμοποιήσετε τη ρύθμιση στο προφίλ του χρήστη
 UseSearchToSelectCompanyTooltip=Επίσης, αν έχετε ένα μεγάλο αριθμό Πελ./Προμ. (> 100 000), μπορείτε να αυξήσετε την ταχύτητα με τον καθορισμό της σταθερά COMPANY_DONOTSEARCH_ANYWHERE σε 1 στο Setup->Other. Η αναζήτηση στη συνέχεια θα περιορίζεται από την έναρξη της σειράς.
 UseSearchToSelectContactTooltip=Επίσης, αν έχετε ένα μεγάλο αριθμό Πελ./Προμ. (> 100 000), μπορείτε να αυξήσετε την ταχύτητα με τον καθορισμό της σταθερά COMPANY_DONOTSEARCH_ANYWHERE σε 1 στο Setup->Other. Η αναζήτηση στη συνέχεια θα περιορίζεται από την έναρξη της σειράς.
 DelaiedFullListToSelectCompany=Περιμένετε μέχρι να πατηθεί κάποιο πλήκτρο πριν φορτώσετε το περιεχόμενο της λίστας συνδυασμών τρίτων μερών. <br>Αυτό μπορεί να αυξήσει την απόδοση εάν έχετε μεγάλο αριθμό τρίτων, αλλά είναι λιγότερο βολικό.
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
+DelaiedFullListToSelectContact=Περιμένετε μέχρι να πατηθεί ένα πλήκτρο πριν φορτώσετε το περιεχόμενο της σύνθετης λίστας επαφών. <br> Αυτό μπορεί να αυξήσει την απόδοση εάν έχετε μεγάλο αριθμό επαφών, αλλά είναι λιγότερο βολικό.
 NumberOfKeyToSearch=Αριθμός χαρακτήρων που ενεργοποιούν την αναζήτηση: %s
 NumberOfBytes=Αριθμόςαπό Bytes
 SearchString=Αναζήτηση συμβόλων
 NotAvailableWhenAjaxDisabled=Δεν είναι διαθέσιμο όταν η Ajax είναι απενεργοποιημένη
 AllowToSelectProjectFromOtherCompany=Σε έγγραφο τρίτου μέρους, μπορείτε να επιλέξετε ένα έργο που συνδέεται με άλλο τρίτο μέρος
-TimesheetPreventAfterFollowingMonths=Prevent recording time spent after the following number of months
+TimesheetPreventAfterFollowingMonths=Αποτρέψτε τον χρόνο εγγραφής που δαπανάται μετά τον επόμενο αριθμό μηνών
 JavascriptDisabled=Η JavaScript είναι απενεργοποιημένη
 UsePreviewTabs=Χρήση καρτελών προ επισκόπησης
 ShowPreview=Εμφάνιση προ επισκόπησης
-ShowHideDetails=Show-Hide details
+ShowHideDetails=Εμφάνιση-Απόκρυψη λεπτομερειών
 PreviewNotAvailable=Η προ επισκόπηση δεν είναι διαθέσιμη
 ThemeCurrentlyActive=Θεματική Επι του Παρόντος Ενεργή
 MySQLTimeZone=TimeZone MySql (βάση δεδομένων)
@@ -756,7 +756,7 @@ Permission106=Εξαγωγή αποστολών
 Permission109=Διαγραφή αποστολών
 Permission111=Διάβασμα οικονομικών λογαριασμών
 Permission112=Δημιουργία / τροποποίηση / διαγραφή και σύγκριση συναλλαγών
-Permission113=Εγκατάσταση χρηματοοικονομικών λογαριασμών (δημιουργία, διαχείριση κατηγοριών)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Συναλλαγή συναλλαγών
 Permission115=Εξαγωγή συναλλαγών και καταστάσεις λογαριασμών
 Permission116=Μεταφορές μεταξύ λογαριασμών
@@ -893,12 +893,11 @@ Permission701=Διαβάστε τις δωρεές
 Permission702=Δημιουργία / τροποποίηση δωρεές
 Permission703=Διαγραφή δωρεές
 Permission771=Διαβάστε τις αναφορές εξόδων (δικές σας και υφισταμένων)
-Permission772=Δημιουργία/μεταβολή σε αναφορά εξόδων
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Διαγραφή αναφοράς εξόδων
-Permission774=Διαβάστε όλες τις αναφορές δαπανών (ακόμη και για χρήστες που δεν είναι υφιστάμενοι)
 Permission775=Έγκριση σε αναφορές εξόδων
 Permission776=Πληρωμή αναφοράς εξόδων
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=Εξαγωγή αναφοράς εξόδων
 Permission1001=Διαβάστε τα αποθέματα
@@ -962,15 +961,11 @@ Permission2801=Χρησιμοποίησε FTP πελάτη σε λειτουργ
 Permission2802=Χρησιμοποίησε FTP πελάτη σε λειτουργία εγγραφής (διαγραφή ή μεταφόρτωση αρχείων)
 Permission3200=Διαβάστε αρχειακά συμβάντα και δακτυλικά αποτυπώματα
 Permission3301=Generate new modules
-Permission4001=Δείτε τους υπαλλήλους
-Permission4002=Δημιουργήστε υπαλλήλους
-Permission4003=Διαγράψτε τους υπαλλήλους
-Permission4004=Εξαγωγή εργαζομένων
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
@@ -981,9 +976,9 @@ Permission10005=Διαγραφή περιεχομένου ιστότοπου
 Permission20001=Διαβάστε τις αιτήσεις άδειας (η άδειά σας και αυτές των υφισταμένων σας)
 Permission20002=Δημιουργήστε / τροποποιήστε τα αιτήματα άδειας (η άδειά σας και αυτά των υφισταμένων σας)
 Permission20003=Διαγραφή των αιτήσεων άδειας
-Permission20004=Διαβάστε όλα τα αιτήματα άδειας (ακόμη και για χρήστες που δεν έχουν υποτακτικούς)
-Permission20005=Δημιουργία / τροποποίηση αιτήσεων άδειας για όλους (ακόμη και για χρήστες που δεν έχουν υποτακτικούς)
-Permission20006=Αιτήσεις άδειας διαχειριστή (ισορροπία εγκατάστασης και ενημέρωσης)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Έγκριση αιτημάτων άδειας
 Permission23001=Λεπτομέρειες προγραμματισμένης εργασίας
 Permission23002=Δημιουργήστε/ενημερώστε μια προγραμματισμένη εργασία
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Θέλετε να εκτελέσετε τη συλ
 NoNewEmailToProcess=Δεν υπάρχει νέο μήνυμα ηλεκτρονικού ταχυδρομείου (φίλτρα που ταιριάζουν) για επεξεργασία
 NothingProcessed=Τίποτα δεν έγινε
 XEmailsDoneYActionsDone=%s τα κατάλληλα μηνύματα ηλεκτρονικού ταχυδρομείου, τα emails %s υποβλήθηκαν σε επιτυχή επεξεργασία (για %s η εγγραφή / οι ενέργειες έγιναν)
-RecordEvent=Εγγραφή συμβάντος ηλεκτρονικού ταχυδρομείου
-CreateLeadAndThirdParty=Δημιουργία μολύβδου (και τρίτου εάν είναι απαραίτητο)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 CodeLastResult=Τελευταίος κωδικός αποτελέσματος
 NbOfEmailsInInbox=Αριθμός μηνυμάτων ηλεκτρονικού ταχυδρομείου στον κατάλογο προέλευσης
 LoadThirdPartyFromName=Φόρτωση αναζήτησης τρίτου μέρους στο %s (μόνο φόρτωση)
 LoadThirdPartyFromNameOrCreate=Φόρτωση αναζήτησης τρίτου μέρους στο %s (δημιουργία αν δεν βρεθεί)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
@@ -2084,7 +2080,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Κωδικός εισόδου μενού (mainmenu)
 ECMAutoTree=Εμφάνιση αυτόματης δομής ECM
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Ωρες λειτουργίας
 OpeningHoursDesc=Πληκτρολογήστε εδώ τις κανονικές ώρες λειτουργίας της εταιρείας σας.
 ResourceSetup=Διαμόρφωση της ενότητας πόρων
@@ -2130,7 +2126,7 @@ LargerThan=Μεγαλύτερο από
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=Με ένα λογαριασμό GMail, εάν έχετε ενεργοποιήσει την επικύρωση 2 βημάτων, σας συνιστούμε να δημιουργήσετε έναν ειδικό δευτερεύοντα κωδικό πρόσβασης για την εφαρμογή αντί να χρησιμοποιήσετε τη δική σας passsword από https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+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>
 EndPointFor=Σημείο τερματισμού για %s: %s
 DeleteEmailCollector=Διαγραφή συλλέκτη ηλεκτρονικού ταχυδρομείου
 ConfirmDeleteEmailCollector=Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτό το συλλέκτη email;
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Missing translation for %s
 NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/el_GR/agenda.lang b/htdocs/langs/el_GR/agenda.lang
index 657e09993b1..fedbfdde118 100644
--- a/htdocs/langs/el_GR/agenda.lang
+++ b/htdocs/langs/el_GR/agenda.lang
@@ -4,7 +4,7 @@ Actions=Ενέργειες
 Agenda=Ημερολόγιο
 TMenuAgenda=Ημερολόγιο
 Agendas=Ημερολόγια
-LocalAgenda=Default calendar
+LocalAgenda=Προεπιλεγμένο ημερολόγιο
 ActionsOwnedBy=Το γεγονός ανήκει
 ActionsOwnedByShort=Ιδιοκτήτης
 AffectedTo=Ανάθεση σε
@@ -14,13 +14,13 @@ EventsNb=Αριθμός γεγονότων
 ListOfActions=Λίστα γεγονότων
 EventReports=Αναφορές συμβάντων
 Location=Τοποθεσία
-ToUserOfGroup=Event assigned to any user in the group
+ToUserOfGroup=Αντιστοιχισμένο συμβάν σε οποιονδήποτε χρήστη στην ομάδα
 EventOnFullDay=Ολοήμερο Γεγονός
 MenuToDoActions=Όλες οι ημιτελής ενέργειες
 MenuDoneActions=Όλες οι ολοκληρ. ενέργειες
 MenuToDoMyActions=Ημιτελής ενέργειες
 MenuDoneMyActions=Ολοκληρωμένες ενέργειες
-ListOfEvents=List of events (default calendar)
+ListOfEvents=Λίστα συμβάντων (προεπιλεγμένο ημερολόγιο)
 ActionsAskedBy=Ενέργειες που καταχωρήθηκαν από
 ActionsToDoBy=Ενέργειες που ανατέθηκαν σε
 ActionsDoneBy=Ενέργειες που ολοκληρώθηκαν από
@@ -38,7 +38,7 @@ ActionsEvents=Γεγονότα για τα οποία θα δημιουργήσ
 EventRemindersByEmailNotEnabled=Οι υπενθυμίσεις συμβάντων μέσω ηλεκτρονικού ταχυδρομείου δεν ενεργοποιήθηκαν στη ρύθμιση μονάδας %s.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Το τρίτο μέρος %s δημιουργήθηκε
-COMPANY_MODIFYInDolibarr=Third party %s modified
+COMPANY_MODIFYInDolibarr=Τρίτο μέρος %s τροποποιήθηκε
 COMPANY_DELETEInDolibarr=Το τρίτο μέρος %s διαγράφηκε
 ContractValidatedInDolibarr=Συμβόλαιο %s επικυρώθηκε
 CONTRACT_DELETEInDolibarr=Η σύμβαση %s διαγράφηκε
@@ -64,8 +64,8 @@ ShipmentClassifyClosedInDolibarr=Η αποστολή %s ταξινομείται
 ShipmentUnClassifyCloseddInDolibarr=Η αποστολή %s ταξινομήθηκε εκ νέου
 ShipmentBackToDraftInDolibarr=Η αποστολή %s επιστρέφει στην κατάσταση του σχεδίου
 ShipmentDeletedInDolibarr=Η αποστολή %s διαγράφηκε
-ShipmentCanceledInDolibarr=Shipment %s canceled
-ReceptionValidatedInDolibarr=Reception %s validated
+ShipmentCanceledInDolibarr=Η αποστολή %s ακυρώθηκε
+ReceptionValidatedInDolibarr=Η λήψη %s επικυρώθηκε
 OrderCreatedInDolibarr=Παραγγελία %s
 OrderValidatedInDolibarr=Η παραγγελία %s επικυρώθηκε
 OrderDeliveredInDolibarr=Παραγγελία %s κατατάσσεται παραδοτέα
@@ -88,9 +88,9 @@ ProposalDeleted=Η προσφορά διαγράφηκε
 OrderDeleted=Η παραγγελία διαγράφηκε
 InvoiceDeleted=Το τιμολόγιο διαγράφηκε
 DraftInvoiceDeleted=Το πρόχειρο τιμολόγιο διαγράφηκε
-CONTACT_CREATEInDolibarr=Contact %s created
-CONTACT_MODIFYInDolibarr=Contact %s modified
-CONTACT_DELETEInDolibarr=Contact %s deleted
+CONTACT_CREATEInDolibarr=Η επαφή %s δημιουργήθηκε
+CONTACT_MODIFYInDolibarr=Η επαφή %s τροποποιήθηκε
+CONTACT_DELETEInDolibarr=Η επαφή %s διαγράφηκε
 PRODUCT_CREATEInDolibarr=Το προϊόν %s δημιουργήθηκε
 PRODUCT_MODIFYInDolibarr=Το προϊόν %s τροποποιήθηκε
 PRODUCT_DELETEInDolibarr=Το προϊόν %s διαγράφηκε
@@ -118,11 +118,11 @@ BOM_CLOSEInDolibarr=Το BOM είναι απενεργοποιημένο
 BOM_REOPENInDolibarr=Ανοίξτε ξανά το BOM
 BOM_DELETEInDolibarr=Το BOM διαγράφηκε
 MRP_MO_VALIDATEInDolibarr=Το ΜΟ επικυρώθηκε
-MRP_MO_UNVALIDATEInDolibarr=MO set to draft status
+MRP_MO_UNVALIDATEInDolibarr=Το MO ορίστηκε σε πρόχειρη κατάσταση
 MRP_MO_PRODUCEDInDolibarr=Το ΜΟ παράχθηκε
 MRP_MO_DELETEInDolibarr=Το MO διαγράφηκε
-MRP_MO_CANCELInDolibarr=MO canceled
-PAIDInDolibarr=%s paid
+MRP_MO_CANCELInDolibarr=MO ακυρώθηκε
+PAIDInDolibarr=%s πληρώθηκε
 ##### End agenda events #####
 AgendaModelModule=Πρότυπα εγγράφων για συμβάν
 DateActionStart=Ημερομηνία έναρξης
@@ -134,7 +134,7 @@ AgendaUrlOptions4=<b>logint = %s</b> για να περιορίσετε την 
 AgendaUrlOptionsProject=<b>project = __ PROJECT_ID__</b> για να περιορίσετε την έξοδο σε ενέργειες που σχετίζονται με το έργο <b>__PROJECT_ID__</b> .
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype = systemauto</b> για την εξαίρεση αυτόματων συμβάντων.
 AgendaUrlOptionsIncludeHolidays= <b> includeholidays = 1 </b> για να συμπεριλάβετε εκδηλώσεις διακοπών.
-AgendaShowBirthdayEvents=Birthdays of contacts
+AgendaShowBirthdayEvents=Γενέθλια επαφών
 AgendaHideBirthdayEvents=Απόκρυψη γενεθλίων των επαφών
 Busy=Απασχολ.
 ExportDataset_event1=Κατάλογος των εκδηλώσεων
@@ -156,19 +156,19 @@ ActionType=Τύπος συμβάντος
 DateActionBegin=Έναρξη ημερομηνίας του συμβάντος
 ConfirmCloneEvent=Είστε σίγουροι πως θέλετε να κλωνοποιήσετε την εκδήλωση <b>%s</b>;
 RepeatEvent=Επανάληψη συμβάντος
-OnceOnly=Once only
+OnceOnly=Μόνο μία φορά
 EveryWeek=Εβδομαδιαίο
 EveryMonth=Μηνιαίο
 DayOfMonth=Ημέρα του Μήνα
 DayOfWeek=Ημέρα της εβδομάδας
 DateStartPlusOne=Έναρξη ημέρας + 1 ώρα
-SetAllEventsToTodo=Set all events to todo
-SetAllEventsToInProgress=Set all events to in progress
-SetAllEventsToFinished=Set all events to finished
-ReminderTime=Reminder period before the event
-TimeType=Duration type
-ReminderType=Callback type
-AddReminder=Create an automatic reminder notification for this event
-ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Popup Notification
-ActiveByDefault=Enabled by default
+SetAllEventsToTodo=Ρυθμίστε όλα τα συμβάντα για να κάνετε
+SetAllEventsToInProgress=Ορίστε όλα τα συμβάντα σε εξέλιξη
+SetAllEventsToFinished=Ορίστε όλα τα συμβάντα ως ολοκληρωμένα
+ReminderTime=Περίοδος υπενθύμισης πριν από την εκδήλωση
+TimeType=Τύπος διάρκειας
+ReminderType=Τύπος επανάκλησης
+AddReminder=Δημιουργήστε μια αυτόματη ειδοποίηση υπενθύμισης για αυτό το συμβάν
+ErrorReminderActionCommCreation=Σφάλμα κατά τη δημιουργία της ειδοποίησης υπενθύμισης για αυτό το συμβάν
+BrowserPush=Περιήηση αναδυόμενης ειδοποίησης
+ActiveByDefault=Ενεργοποιημένο από προεπιλογή
diff --git a/htdocs/langs/el_GR/assets.lang b/htdocs/langs/el_GR/assets.lang
index 5a6b839608a..028eca8d933 100644
--- a/htdocs/langs/el_GR/assets.lang
+++ b/htdocs/langs/el_GR/assets.lang
@@ -61,5 +61,7 @@ MenuListTypeAssets = Λίστα
 #
 # Module
 #
+Asset=Στοιχείο
 NewAssetType=Νέος τύπος παγίου
 NewAsset=Νέα εγγραφή παγίου
+ConfirmDeleteAsset=Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτό το στοιχείο;
diff --git a/htdocs/langs/el_GR/banks.lang b/htdocs/langs/el_GR/banks.lang
index 970422adbd8..832d2ad4da7 100644
--- a/htdocs/langs/el_GR/banks.lang
+++ b/htdocs/langs/el_GR/banks.lang
@@ -33,13 +33,13 @@ IBAN=IBAN
 BIC=Κωδικός BIC / SWIFT
 SwiftValid=Κωδικός BIC / SWIFT έγκυρος
 SwiftNotValid=Κωδικός BIC / SWIFT μη έγκυρος
-IbanValid=έγκυρο IBAN
+IbanValid=Έγκυρο IBAN
 IbanNotValid=Μη έγκυρο IBAN
 StandingOrders=Direct debit orders
 StandingOrder=Παραγγελία άμεσης χρέωσης
-PaymentByDirectDebit=πληρωμή άμεσης χρέωσης
-PaymentByBankTransfers=πληρωμές μέσω μεταφοράς πιστώσεως
-PaymentByBankTransfer=πληρωμή μέσω μεταφοράς πιστώσεως
+PaymentByDirectDebit=Πληρωμή με άμεση χρέωση
+PaymentByBankTransfers=Πληρωμές μέσω μεταφοράς πιστώσεως
+PaymentByBankTransfer=Πληρωμή μέσω μεταφοράς πιστώσεως
 AccountStatement=Κίνηση Λογαριασμού
 AccountStatementShort=Κίνηση
 AccountStatements=Κινήσεις Λογαριασμού
@@ -108,13 +108,13 @@ SocialContributionPayment=Σίγουρα θέλετε να μαρκάρετε α
 BankTransfer=μεταφορά πιστώσεως
 BankTransfers=μεταφορές πιστώσεως
 MenuBankInternalTransfer=Εσωτερική μεταφορά
-TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
+TransferDesc=Χρησιμοποιήστε εσωτερική μεταφορά για μεταφορά από έναν λογαριασμό σε άλλο, η εφαρμογή θα γράψει δύο εγγραφές: μια χρέωση στον λογαριασμό προέλευσης και μια πίστωση στον λογαριασμό προορισμού. Το ίδιο ποσό, ετικέτα και ημερομηνία θα χρησιμοποιηθούν για αυτήν τη συναλλαγή.
 TransferFrom=Από
 TransferTo=Προς
 TransferFromToDone=Η μεταφορά από <b>%s</b> στον <b>%s</b> του <b>%s</b> %s έχει καταγραφεί.
 CheckTransmitter=Αποστολέας
 ValidateCheckReceipt=Επικύρωση αυτής της απόδειξης παραλαβής επιταγής;
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
+ConfirmValidateCheckReceipt=Είστε βέβαιοι ότι θέλετε να υποβάλετε αυτήν την απόδειξη επιταγής για επικύρωση; Καμία αλλαγή δεν θα είναι δυνατή μετά την επικύρωση.
 DeleteCheckReceipt=Διαγραφή απόδειξης παραλαβής επιταγής;
 ConfirmDeleteCheckReceipt=Είστε σίγουροι πως θέλετε να διαγράψετε αυτή την απόδειξη παραλαβής επιταγής;
 BankChecks=Τραπεζικές Επιταγές
@@ -127,7 +127,7 @@ ConfirmDeleteTransaction=Είστε βέβαιοι ότι θέλετε να δι
 ThisWillAlsoDeleteBankRecord=Αυτό θα διαγράψει επίσης την εισερχόμενη είσοδο στην τράπεζα
 BankMovements=Κινήσεις
 PlannedTransactions=Προγραμματισμένες καταχωρήσεις
-Graph=γραφήματα
+Graph=Γραφήματα
 ExportDataset_banque_1=Τραπεζικές εγγραφές και αποδείξεις κατάθεσης
 ExportDataset_banque_2=Απόδειξη κατάθεσης
 TransactionOnTheOtherAccount=Συναλλαγή σε άλλο λογαριασμό
@@ -141,7 +141,7 @@ AllAccounts=Όλοι οι τραπεζικοί και ταμιακοί λογα
 BackToAccount=Επιστροφή στον λογαριασμό
 ShowAllAccounts=Εμφάνιση Όλων των Λογαριασμών
 FutureTransaction=Μελλοντική συναλλαγή. Δεν μπορεί να συμφιλιωθεί.
-SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
+SelectChequeTransactionAndGenerate=Επιλέξτε/φιλτράρετε τις επιταγές που θα συμπεριληφθούν στην απόδειξη κατάθεσης επιταγών. Στη συνέχεια, κάντε κλικ στο "Δημιουργία".
 InputReceiptNumber=Επιλέξτε την κατάσταση των τραπεζών που συνδέονται με τη διαδικασία συνδιαλλαγής. Χρησιμοποιήστε μια σύντομη αριθμητική τιμή όπως: YYYYMM ή YYYYMMDD
 EventualyAddCategory=Τέλος, καθορίστε μια κατηγορία στην οποία θα ταξινομηθούν οι εγγραφές
 ToConciliate=Για να συμφιλιωθώ;
@@ -165,20 +165,20 @@ VariousPayment=Διάφορες πληρωμές
 VariousPayments=Διάφορες πληρωμές
 ShowVariousPayment=Εμφάνιση διαφόρων πληρωμών
 AddVariousPayment=Προσθήκη διαφόρων πληρωμών
-VariousPaymentId=Miscellaneous payment ID
-VariousPaymentLabel=Miscellaneous payment label
-ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
+VariousPaymentId=Διάφορα ID πληρωμής
+VariousPaymentLabel=Διάφορες ετικέτες πληρωμής
+ConfirmCloneVariousPayment=Επιβεβαιώση του κλώνου μιας διαφορετικής πληρωμής
 SEPAMandate=Εντολές άμεσης χρέωσης
 YourSEPAMandate=Οι εντολές άμεσης χρέωσης σας.
 FindYourSEPAMandate=Αυτή είναι η εντολή ΕΧΠΕ για να εξουσιοδοτήσετε την εταιρεία μας να κάνει άμεση εντολή χρέωσης στην τράπεζά σας. Επιστρέψτε το υπογεγραμμένο (σάρωση του υπογεγραμμένου εγγράφου) ή στείλτε το ταχυδρομικώς η με mail
 AutoReportLastAccountStatement=Συμπληρώστε αυτόματα το πεδίο ' αριθμός τραπεζικού λογαριασμού ' με τον τελευταίο αριθμό τραπεζικής δήλωσης όταν κάνετε τη συμφωνία.
-CashControl=POS cash desk control
-NewCashFence=New cash desk opening or closing
+CashControl=Έλεγχος ταμείου POS
+NewCashFence=Άνοιγμα ή κλείσιμο νέου ταμείου
 BankColorizeMovement=Χρωματισμός κινήσεων
 BankColorizeMovementDesc=Εάν αυτή η λειτουργία είναι ενεργή, μπορείτε να επιλέξετε συγκεκριμένο χρώμα φόντου για χρεωστικές ή πιστωτικές κινήσεις
 BankColorizeMovementName1=Χρώμα φόντου για την κίνηση χρέωσης
 BankColorizeMovementName2=Χρώμα φόντου για την πιστωτική κίνηση
-IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
-NoBankAccountDefined=No bank account defined
-NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
-AlreadyOneBankAccount=Already one bank account defined
+IfYouDontReconcileDisableProperty=Εάν δεν πραγματοποιήσετε τις τραπεζικές συμφωνίες σε ορισμένους τραπεζικούς λογαριασμούς, απενεργοποιήστε την ιδιότητα "%s" σε αυτούς για να καταργήσετε αυτήν την προειδοποίηση.
+NoBankAccountDefined=Δεν έχει οριστεί τραπεζικός λογαριασμός
+NoRecordFoundIBankcAccount=Δεν βρέθηκε κανένα αρχείο σε τραπεζικό λογαριασμό. Συνήθως, αυτό συμβαίνει όταν μια εγγραφή έχει διαγραφεί με χειροκίνητο τρόπο από τη λίστα συναλλαγών στον τραπεζικό λογαριασμό (για παράδειγμα κατά τη διάρκεια συμφωνίας του τραπεζικού λογαριασμού). Άλλος λόγος είναι ότι η πληρωμή καταγράφηκε όταν η ενότητα/εφαρμογή "%s" ήταν απενεργοποιημένη.
+AlreadyOneBankAccount=Έχει ήδη οριστεί ένας τραπεζικός λογαριασμός
diff --git a/htdocs/langs/el_GR/bills.lang b/htdocs/langs/el_GR/bills.lang
index d2623c9279b..6e7606fadb7 100644
--- a/htdocs/langs/el_GR/bills.lang
+++ b/htdocs/langs/el_GR/bills.lang
@@ -55,7 +55,7 @@ CustomerInvoice=Τιμολόγιο Πελάτη
 CustomersInvoices=Τιμολόγια πελατών
 SupplierInvoice=Τιμολόγιο προμηθευτή
 SuppliersInvoices=Τιμολόγια προμηθευτή
-SupplierInvoiceLines=Vendor invoice lines
+SupplierInvoiceLines=Γραμμές τιμολογίων προμηθευτή
 SupplierBill=Τιμολόγιο προμηθευτή
 SupplierBills=Τιμολόγια προμηθευτή
 Payment=Πληρωμή
@@ -82,10 +82,8 @@ PaymentsAlreadyDone=Ιστορικό Πληρωμών
 PaymentsBackAlreadyDone=Οι επιστροφές χρημάτων έχουν γίνει ήδη
 PaymentRule=Κανόνας Πληρωμής
 PaymentMode=Τρόπος πληρωμής
-DefaultPaymentMode=Default Payment Type
-DefaultBankAccount=Default Bank Account
-PaymentTypeDC=Χρεωστική/Πιστωτική κάρτα
-PaymentTypePP=PayPal
+DefaultPaymentMode=Προεπιλεγμένος τύπος πληρωμής
+DefaultBankAccount=Προεπιλεγμένος τραπεζικός λογαριασμός
 IdPaymentMode=Τύπος πληρωμής (id)
 CodePaymentMode=Τύπος πληρωμής (κωδικός)
 LabelPaymentMode=Είδος πληρωμής (ετικέτα)
@@ -120,7 +118,7 @@ ConvertExcessPaidToReduc=Μετατρέψτε το επιπλέον ποσό π
 EnterPaymentReceivedFromCustomer=Εισαγωγή πληρωμής από πελάτη
 EnterPaymentDueToCustomer=Πληρωμή προς προμηθευτή
 DisabledBecauseRemainderToPayIsZero=Ανενεργό λόγο μηδενικού υπολοίπου πληρωμής
-PriceBase=Base price
+PriceBase=Βασική τιμή
 BillStatus=Κατάσταση τιμολογίου
 StatusOfGeneratedInvoices=Κατάσταση δημιουργηθέντων τιμολογίων
 BillStatusDraft=Πρόχειρο (απαιτείται επικύρωση)
@@ -192,7 +190,7 @@ ConfirmClassifyPaidPartiallyReasonDiscount=Το υπόλοιπο που δεν 
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Παραμένουν απλήρωτα <b>(%s %s)</b> έχει μια έκπτωση που χορηγήθηκε επειδή η πληρωμή έγινε πριν από την περίοδο. Δέχομαι να χάσω το ΦΠΑ για την έκπτωση αυτή.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Παραμένουν απλήρωτα <b>(%s %s)</b> έχει μια έκπτωση που χορηγήθηκε επειδή η πληρωμή έγινε πριν από την περίοδο. Έχω την επιστροφή του ΦΠΑ για την έκπτωση αυτή χωρίς πιστωτικό τιμολόγιο.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Κακός πελάτης
-ConfirmClassifyPaidPartiallyReasonBankCharge=Deduction by bank (intermediary bank fees)
+ConfirmClassifyPaidPartiallyReasonBankCharge=Παρακράτηση από τράπεζα (ενδιάμεσες τραπεζικές προμήθειες)
 ConfirmClassifyPaidPartiallyReasonProductReturned=Τα προϊόντα επιστράφηκαν μερικώς
 ConfirmClassifyPaidPartiallyReasonOther=Ποσό εγκαταλελειμμένο για άλλους λόγους
 ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Αυτή η επιλογή είναι δυνατή αν έχουν δοθεί κατάλληλα σχόλια στο τιμολόγιό σας. (Παράδειγμα «Μόνο ο φόρος που αντιστοιχεί στην πράγματι καταβληθείσα τιμή παρέχει δικαίωμα προς έκπτωση»)
@@ -200,7 +198,7 @@ ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=Σε ορισμένες χώρ
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Επιλέξτε αυτή την επιλογή αν οι υπόλοιπες δεν ταιριάζουν
 ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=Ένας <b>κακός πελάτης</b> είναι ένας πελάτης που αρνείται να πληρώσει το χρέος του.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=This choice is used when payment is not complete because some of products were returned
-ConfirmClassifyPaidPartiallyReasonBankChargeDesc=The unpaid amount is <b>intermediary bank fees</b>, deducted directly from the <b>correct amount</b> paid by the Customer.
+ConfirmClassifyPaidPartiallyReasonBankChargeDesc=Το μη καταβληθέν ποσό είναι <b> προμήθειες μεσάζουσας τράπεζας </b> , που αφαιρούνται απευθείας από το <b>σωστό ποσό </b> που κατέβαλε ο Πελάτης.
 ConfirmClassifyPaidPartiallyReasonOtherDesc=Χρησιμοποιήστε αυτήν την επιλογή αν δεν είναι κατάλληλες όλες οι άλλες, για παράδειγμα στην ακόλουθη περίπτωση: <br> - η πληρωμή δεν ολοκληρώθηκε επειδή ορισμένα προϊόντα αποστέλλονται πίσω <br> - το ποσό που ζητήθηκε είναι πολύ σημαντικό επειδή μια έκπτωση ξεχάστηκε <br> Σε όλες τις περιπτώσεις, η υπέρμετρη αξίωση πρέπει να διορθωθεί στο λογιστικό σύστημα δημιουργώντας ένα πιστωτικό σημείωμα.
 ConfirmClassifyAbandonReasonOther=Άλλος
 ConfirmClassifyAbandonReasonOtherDesc=This choice will be used in all other cases. For example because you plan to create a replacing invoice.
@@ -236,24 +234,24 @@ AlreadyPaidBack=Already paid back
 AlreadyPaidNoCreditNotesNoDeposits=Ήδη πληρωμένο (χωρίς πιστώσεις ή καταθέσεις)
 Abandoned=Εγκαταλελειμμένο
 RemainderToPay=Παραμένουν απλήρωτα
-RemainderToPayMulticurrency=Remaining unpaid, original currency
+RemainderToPayMulticurrency=Παραμένει απλήρωτο, αρχικό νόμισμα
 RemainderToTake=Υπόλοιπο ποσό να ληφθεί
-RemainderToTakeMulticurrency=Remaining amount to take, original currency
+RemainderToTakeMulticurrency=Υπολειπόμενο ποσό προς λήψη, αρχικό νόμισμα
 RemainderToPayBack=Remaining amount to refund
-RemainderToPayBackMulticurrency=Remaining amount to refund, original currency
-NegativeIfExcessRefunded=negative if excess refunded
+RemainderToPayBackMulticurrency=Υπόλοιπο ποσό για επιστροφή χρημάτων, αρχικό νόμισμα
+NegativeIfExcessRefunded=αρνητικό εάν επιστραφεί επιπλέον ποσό
 Rest=Εκκρεμής
 AmountExpected=Ποσό που ζητήθηκε
 ExcessReceived=Περίσσεια που λήφθηκε
-ExcessReceivedMulticurrency=Excess received, original currency
-NegativeIfExcessReceived=negative if excess received
+ExcessReceivedMulticurrency=Επιπλέον ποσό που ελήφθη, αρχικό νόμισμα
+NegativeIfExcessReceived=αρνητικό εάν ληφθεί πλεονάζων
 ExcessPaid=Πληρωμή υπέρβασης
-ExcessPaidMulticurrency=Excess paid, original currency
+ExcessPaidMulticurrency=Επιπλέον ποσό πληρωμένο, αρχικό νόμισμα
 EscompteOffered=Discount offered (payment before term)
 EscompteOfferedShort=Έκπτωση
 SendBillRef=Υποβολή των τιμολογίων %s
 SendReminderBillRef=Υποβολή των τιμολογίων %s (υπενθύμιση)
-SendPaymentReceipt=Submission of payment receipt %s
+SendPaymentReceipt=Υποβολή απόδειξης πληρωμής %s
 NoDraftBills=Δεν υπάρχουν προσχέδια
 NoOtherDraftBills=Δεν υπάρχουν άλλα προσχέδια
 NoDraftInvoices=Δεν υπάρχουν προσχέδια τιμολογίων
@@ -269,8 +267,8 @@ DateMaxPayment=Προθεσμία Πληρωμής
 DateInvoice=Ημερομηνία τιμολογίου
 DatePointOfTax=Point of tax
 NoInvoice=Δεν υπάρχει τιμολόγιο
-NoOpenInvoice=No open invoice
-NbOfOpenInvoices=Number of open invoices
+NoOpenInvoice=Χωρίς ανοιχτό τιμολόγιο
+NbOfOpenInvoices=Αριθμός ανοιχτών τιμολογίων
 ClassifyBill=Κατηγοριοποίηση Τιμολογίου
 SupplierBillsToPay=Μη πληρωθέντα τιμολόγια προμηθευτή
 CustomerBillsUnpaid=Ανεξόφλητα τιμολόγια πελάτη
@@ -280,6 +278,7 @@ SetMode=Ορίστε τον τύπο πληρωμής
 SetRevenuStamp=Set revenue stamp
 Billed=Τιμολογημένο
 RecurringInvoices=Επαναλαμβανόμενα τιμολόγια
+RecurringInvoice=Επαναλαμβανόμενο τιμολόγιο
 RepeatableInvoice=Πρότυπο τιμολογίου
 RepeatableInvoices=Πρότυπο τιμολόγιο
 Repeatable=Πρώτυπο
@@ -388,7 +387,7 @@ DateLastGeneration=Ημερομηνία τελευταίας δημιουργί
 DateLastGenerationShort=Ημερομηνία τελευταίας γεν.
 MaxPeriodNumber=Μέγιστη. αριθμός δημιουργίας τιμολογίου
 NbOfGenerationDone=Αριθμός γεννήσεων τιμολογίων που έχουν ήδη γίνει
-NbOfGenerationOfRecordDone=Number of record generation already done
+NbOfGenerationOfRecordDone=Αριθμός δημιουργίας εγγραφών που έχουν ήδη γίνει
 NbOfGenerationDoneShort=Αριθμός γενεάς που έγινε
 MaxGenerationReached=Ο μέγιστος αριθμός γενεών έφτασε
 InvoiceAutoValidate=Αυτόματη επικύρωση τιμολογίων
@@ -429,7 +428,7 @@ PaymentCondition14DENDMONTH=Within 14 days following the end of the month
 FixAmount=Σταθερό ποσό - 1 γραμμή με την ετικέτα '%s'
 VarAmount=Μεταβλητή ποσού (%% tot.)
 VarAmountOneLine=Μεταβλητή ποσότητα (%% tot.) - 1 γραμμή με την ετικέτα &#39;%s&#39;
-VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
+VarAmountAllLines=Μεταβλητό ποσό (%% συνολικά) - όλες οι γραμμές από τις αρχικές
 # PaymentType
 PaymentTypeVIR=Τραπεζική μεταφορά
 PaymentTypeShortVIR=Τραπεζική μεταφορά
@@ -449,6 +448,8 @@ PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Πρόχειρο
 PaymentTypeFAC=Παράγοντας
 PaymentTypeShortFAC=Παράγοντας
+PaymentTypeDC=Χρεωστική/Πιστωτική κάρτα
+PaymentTypePP=PayPal
 BankDetails=Πληροφορίες τράπεζας
 BankCode=Κωδικός τράπεζας
 DeskCode=Κωδικός υποκαταστήματος
@@ -457,8 +458,8 @@ BankAccountNumberKey=Αθροιστικό Checksum
 Residence=Διεύθυνση
 IBANNumber=Αριθμός λογαριασμού IBAN
 IBAN=IBAN
-CustomerIBAN=IBAN of customer
-SupplierIBAN=IBAN of vendor
+CustomerIBAN=IBAN πελάτη
+SupplierIBAN=IBAN προμηθευτή
 BIC=BIC/SWIFT
 BICNumber=Κωδικός BIC / SWIFT
 ExtraInfos=Επιπρόσθετες Πληροφορίες
@@ -466,7 +467,7 @@ RegulatedOn=Ρυθμιζόμενη για
 ChequeNumber=Αριθμός Επιταγής
 ChequeOrTransferNumber=Αρ. Επιταγής/Μεταφοράς
 ChequeBordereau=Check schedule
-ChequeMaker=Check/Transfer sender
+ChequeMaker=Έλεγχος/Μεταφορά αποστολέα
 ChequeBank=Τράπεζα Επιταγής
 CheckBank=Επιταγή
 NetToBePaid=Φόρος προς πληρωμή
@@ -510,16 +511,16 @@ Cash=Μετρητά
 Reported=Με καθυστέρηση
 DisabledBecausePayments=Δεν είναι δυνατόν, δεδομένου ότι υπάρχουν ορισμένες πληρωμές
 CantRemovePaymentWithOneInvoicePaid=Δεν μπορείτε να καταργήσετε τη πληρωμή, δεδομένου ότι υπάρχει τουλάχιστον ένα τιμολόγιο που έχει χαρακτηριστεί σαν πληρωμένο
-CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
-CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
+CantRemovePaymentVATPaid=Δεν είναι δυνατή η κατάργηση της πληρωμής, καθώς η δήλωση ΦΠΑ έχει ταξινομηθεί ως πληρωμένη
+CantRemovePaymentSalaryPaid=Δεν είναι δυνατή η κατάργηση της πληρωμής, καθώς ο μισθός ταξινομήθηκε ως πληρωμένος
 ExpectedToPay=Αναμενόμενη Πληρωμή
 CantRemoveConciliatedPayment=Δεν είναι δυνατή η κατάργηση της κοινής πληρωμής
 PayedByThisPayment=Πληρωθείτε αυτό το ποσό
 ClosePaidInvoicesAutomatically=Ταξινόμηση αυτόματα όλα τα τυποποιημένα, προκαθορισμένα ή αντικαταστατικά τιμολόγια ως &quot;Πληρωμένα&quot; όταν η πληρωμή γίνει εξ ολοκλήρου.
 ClosePaidCreditNotesAutomatically=Ταξινόμηση αυτόματα όλες τις πιστωτικές σημειώσεις ως &quot;Πληρωθεί&quot; όταν η επιστροφή γίνεται εξ ολοκλήρου.
 ClosePaidContributionsAutomatically=Ταξινόμηση αυτόματα όλες τις κοινωνικές ή φορολογικές εισφορές ως &quot;Πληρωθεί&quot; όταν η πληρωμή γίνει εξ ολοκλήρου.
-ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
-ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
+ClosePaidVATAutomatically=Ταξινομήστε αυτόματα τη δήλωση ΦΠΑ ως «Εξοφλημένο» όταν η πληρωμή γίνει εξ ολοκλήρου.
+ClosePaidSalaryAutomatically=Ταξινομήστε αυτόματα τον μισθό ως "Πληρωμένο" όταν η πληρωμή γίνει εξ ολοκλήρου.
 AllCompletelyPayedInvoiceWillBeClosed=Όλα τα τιμολόγια που δεν πληρώνουν υπόλοιπο θα κλείσουν αυτόματα με την κατάσταση &quot;Πληρωμή&quot;.
 ToMakePayment=Πληρωμή
 ToMakePaymentBack=Pay back
@@ -532,10 +533,10 @@ YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice firs
 PDFCrabeDescription=Πρότυπο τιμολόγιο PDF Crabe. Ένα πλήρες πρότυπο τιμολογίου (παλιά εφαρμογή του προτύπου Sponge)
 PDFSpongeDescription=Τιμολόγιο πρότυπο PDF Σφουγγάρι. Ένα πλήρες πρότυπο τιμολογίου
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
-TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
-MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+TerreNumRefModelDesc1=Επιστρέφει τη μορφή %syymm-nnnn για τυπικά τιμολόγια και %syymm-nnnn για πιστωτικές σημειώσεις όπου yy είναι έτος, mm είναι μήνας και nnnn είναι ένας διαδοχικός αριθμός αυτόματης αύξησης χωρίς διακοπή και χωρίς επιστροφή στο 0
+MarsNumRefModelDesc1=Επιστρέφει τη μορφή %syymm-nnnn για τυπικά τιμολόγια, %syymm-nnnn για τιμολόγια αντικατάστασης, %syymm-nnnn για τιμολόγια προκαταβολής και %syymm-nnnn για τιμολόγια αντικατάστασης, %syymm-nnnn για πιστωτικά τιμολόγια όπου yy είναι το έτος,mm ο μήνας και nnnn είναι ένας διαδοχικός αριθμός αυτόματης αύξησης χωρίς διακοπή και χωρίς επιστροφή στο 0
 TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
-CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+CactusNumRefModelDesc1=Αριθμός επιστροφής με τη μορφή %syymm-nnnn για τυπικά τιμολόγια, %syymm-nnnn για πιστωτικά σημειώματα και %syymm-nnnn για τιμολόγια προκαταβολής όπου το yy είναι το έτος,mm ο μήνας και nnnn ένας διαδοχικός αριθμός αυτόματης αύξησης χωρίς διακοπή χωρίς επιστροφή στο 0
 EarlyClosingReason=Πρώιμος λόγος κλεισίματος
 EarlyClosingComment=Πρώιμο σημείωμα κλεισίματος
 ##### Types de contacts #####
@@ -581,9 +582,9 @@ ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually
 ToCreateARecurringInvoiceGeneAuto=Αν χρειαστεί να δημιουργήσετε αυτομάτως τέτοιου είδους τιμολόγια, ζητήστε από τον διαχειριστή σας να ενεργοποιήσει και να ρυθμίσει την ενότητα <strong>%s</strong> . Λάβετε υπόψη ότι και οι δύο μέθοδοι (χειροκίνητες και αυτόματες) μπορούν να χρησιμοποιηθούν χωρίς να υπάρχει κίνδυνος επανάληψης.
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
-CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per selected object)
-BillCreated=%s invoice(s) generated
-BillXCreated=Invoice %s generated
+CreateOneBillByThird=Δημιουργία ενός τιμολογίου ανά τρίτο μέρος (διαφορετικά, ένα τιμολόγιο ανά επιλεγμένο αντικείμενο)
+BillCreated=%s τιμολόγιο(α) δημιουργήθηκε(αν)
+BillXCreated=Δημιουργήθηκε το τιμολόγιο %s
 StatusOfGeneratedDocuments=Κατάσταση δημιουργίας εγγράφων
 DoNotGenerateDoc=Μην δημιουργείτε αρχείο εγγράφων
 AutogenerateDoc=Αυτόματη δημιουργία αρχείου εγγράφου
@@ -594,13 +595,14 @@ AutoFillDateToShort=Ορίστε την ημερομηνία λήξης
 MaxNumberOfGenerationReached=Μέγιστος αριθμός γονιδίων. επιτευχθεί
 BILL_DELETEInDolibarr=Το τιμολόγιο διαγράφηκε
 BILL_SUPPLIER_DELETEInDolibarr=Το τιμολόγιο προμηθευτή διαγράφηκε
-UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
-CustomersInvoicesArea=Customer billing area
-SupplierInvoicesArea=Supplier billing area
-FacParentLine=Invoice Line Parent
-SituationTotalRayToRest=Remainder to pay without taxe
-PDFSituationTitle=Situation n° %d
-SituationTotalProgress=Total progress %d %%
-SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
-NoPaymentAvailable=No payment available for %s
-PaymentRegisteredAndInvoiceSetToPaid=Payment registered and invoice %s set to paid
+UnitPriceXQtyLessDiscount=Τιμή μονάδας x Ποσότητα - Έκπτωση
+CustomersInvoicesArea=Περιοχή χρέωσης πελατών
+SupplierInvoicesArea=Περιοχή χρέωσης προμηθευτή
+FacParentLine=Γραμμή τιμολογίου Μητρική
+SituationTotalRayToRest=Υπενθύμιση πληρωμής χωρίς φόρο
+PDFSituationTitle=Κατάσταση αρ. %d
+SituationTotalProgress=Συνολική πρόοδος %d %%
+SearchUnpaidInvoicesWithDueDate=Αναζήτηση απλήρωτων τιμολογίων με ημερομηνία λήξης = %s
+NoPaymentAvailable=Δεν υπάρχει διαθέσιμη πληρωμή για %s
+PaymentRegisteredAndInvoiceSetToPaid=Η πληρωμή καταχωρήθηκε και το τιμολόγιο %s ορίστηκε ως πληρωμένο
+SendEmailsRemindersOnInvoiceDueDate=Αποστολή υπενθύμισης μέσω email για απλήρωτα τιμολόγια
diff --git a/htdocs/langs/el_GR/bookmarks.lang b/htdocs/langs/el_GR/bookmarks.lang
index b8b96fda769..2b89dbeed64 100644
--- a/htdocs/langs/el_GR/bookmarks.lang
+++ b/htdocs/langs/el_GR/bookmarks.lang
@@ -15,8 +15,8 @@ UrlOrLink=URL
 BehaviourOnClick=Μετάβαση σε
 CreateBookmark=Δημιουργία σελιδοδείκτη
 SetHereATitleForLink=Ορίστε ένα όνομα για το σελιδοδείκτη
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external/absolute link (https://externalurl.com) or an internal/relative link (/mypage.php). You can also use phone like tel:0123456.
+UseAnExternalHttpLinkOrRelativeDolibarrLink=Χρησιμοποιήστε έναν εξωτερικό/απόλυτο σύνδεσμο (https://externalurl.com) ή έναν εσωτερικό/σχετικό σύνδεσμο (/mypage.php). Μπορείτε επίσης να χρησιμοποιήσετε τηλέφωνο όπως τηλ: 0123456.
 ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Επιλέξτε εάν η συνδεδεμένη σελίδα πρέπει να ανοίξει στην τρέχουσα καρτέλα ή σε μια νέα καρτέλα
 BookmarksManagement=Διαχείριση σελιδοδεικτών
 BookmarksMenuShortCut=Ctrl + shift + m
-NoBookmarks=No bookmarks defined
+NoBookmarks=Δεν έχουν οριστεί σελιδοδείκτες
diff --git a/htdocs/langs/el_GR/companies.lang b/htdocs/langs/el_GR/companies.lang
index 5a7e401cb49..5bc2908e9a1 100644
--- a/htdocs/langs/el_GR/companies.lang
+++ b/htdocs/langs/el_GR/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Καθ Id 1 (RUT)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Έλεγχος
 VATIntraCheckDesc=Το αναγνωριστικό ΦΠΑ πρέπει να περιλαμβάνει το πρόθεμα χώρας. Ο σύνδεσμος <b>%s</b> χρησιμοποιεί την ευρωπαϊκή υπηρεσία ελέγχου ΦΠΑ (VIES), η οποία απαιτεί πρόσβαση στο Διαδίκτυο από το διακομιστή Dolibarr.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Ελέγξτε το ενδοκοινοτικό αναγνωριστικό ΦΠΑ στον δικτυακό τόπο της Ευρωπαϊκής Επιτροπής
-VATIntraManualCheck=Μπορείτε επίσης να ελέγξετε χειροκίνητα στον ιστότοπο της Ευρωπαϊκής Επιτροπής <a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Δεν προοπτική, ούτε πελάτης
 JuridicalStatus=Τύπος νομικού προσώπου
diff --git a/htdocs/langs/el_GR/errors.lang b/htdocs/langs/el_GR/errors.lang
index 03164075e4c..0229202606d 100644
--- a/htdocs/langs/el_GR/errors.lang
+++ b/htdocs/langs/el_GR/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
 ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
 ErrorIsNotADraft=%s is not a draft
 ErrorExecIdFailed=Can't execute command "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Η παράμετρος PHP upload_max_filesize (%s) είναι υψηλότερη από την παράμετρο PHP post_max_size (%s). Αυτό δεν είναι μια σταθερή ρύθμιση.
diff --git a/htdocs/langs/el_GR/main.lang b/htdocs/langs/el_GR/main.lang
index 3e561561e0c..0cccaa9741e 100644
--- a/htdocs/langs/el_GR/main.lang
+++ b/htdocs/langs/el_GR/main.lang
@@ -212,6 +212,8 @@ User=Χρήστης
 Users=Χρήστες
 Group=Ομάδα
 Groups=Ομάδες
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=Κανένας χρήστης δεν ορίζεται στην ομάδα
 Password=Συνθηματικό
 PasswordRetype=Επαναπληκτρολόγηση κωδικού
diff --git a/htdocs/langs/el_GR/other.lang b/htdocs/langs/el_GR/other.lang
index d4ddb984f3c..2be932a1d9e 100644
--- a/htdocs/langs/el_GR/other.lang
+++ b/htdocs/langs/el_GR/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Κωδικοποίηση κωδικού πρόσβασης
 PermissionsAdd=Προστέθηκαν δικαιώματα
 PermissionsDelete=Οι άδειες έχουν καταργηθεί
 YourPasswordMustHaveAtLeastXChars=Ο κωδικός πρόσβασής σας πρέπει να έχει τουλάχιστον <strong>%s</strong> χαρακτήρες
+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
 YourPasswordHasBeenReset=Ο κωδικός πρόσβασής σας έχει επαναφερθεί με επιτυχία
 ApplicantIpAddress=Διεύθυνση IP του αιτούντος
 SMSSentTo=Τα SMS αποστέλλονται στο %s
diff --git a/htdocs/langs/el_GR/productbatch.lang b/htdocs/langs/el_GR/productbatch.lang
index 7242cf3832d..490c7345c1b 100644
--- a/htdocs/langs/el_GR/productbatch.lang
+++ b/htdocs/langs/el_GR/productbatch.lang
@@ -1,10 +1,10 @@
 # ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Χρήση παρτίδας/σειριακού αριθμού
-ProductStatusOnBatch=Yes (lot required)
-ProductStatusOnSerial=Yes (unique serial number required)
+ProductStatusOnBatch=Ναι (απαιτείται παρτίδα)
+ProductStatusOnSerial=Ναι (απαιτείται μοναδικός σειριακός αριθμός)
 ProductStatusNotOnBatch=Όχι (δεν χρειάζεται παρτίδα/σειριακός αριθμός)
-ProductStatusOnBatchShort=Lot
-ProductStatusOnSerialShort=Serial
+ProductStatusOnBatchShort=Παρτίδα
+ProductStatusOnSerialShort=Σειριακός Αριθμός
 ProductStatusNotOnBatchShort=Όχι
 Batch=Παρτίδα/Σειριακός αριθμός
 atleast1batchfield=Ημερομηνία προθεσμίας Ανάλωσης ή Πώλησης ή Παρτίδα/Σειριακός αριθμός
@@ -24,22 +24,22 @@ ProductLotSetup=Ρύθμιση του module παρτίδας / σειριακο
 ShowCurrentStockOfLot=Εμφάνιση παρόντος αποθέματος για ζεύγος προϊόν/παρτίδα
 ShowLogOfMovementIfLot=Εμφάνιση αρχείου κινήσεων για ζεύγος προϊόν/παρτίδα
 StockDetailPerBatch=Ανάλυση αποθέματος ανά παρτίδα
-SerialNumberAlreadyInUse=Serial number %s is already used for product %s
-TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-ManageLotMask=Custom mask
-CustomMasks=Option to define a different numbering mask for each product
-BatchLotNumberingModules=Numbering rule for automatic generation of lot number
-BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
-QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
-LifeTime=Life span (in days)
-EndOfLife=End of life
-ManufacturingDate=Manufacturing date
-DestructionDate=Destruction date
-FirstUseDate=First use date
-QCFrequency=Quality control frequency (in days)
-ShowAllLots=Show all lots
-HideLots=Hide lots
+SerialNumberAlreadyInUse=Ο σειριακός αριθμός %s χρησιμοποιείται ήδη για το προϊόν %s
+TooManyQtyForSerialNumber=Μπορείτε να έχετε μόνο ένα προϊόν %s για σειριακό αριθμό %s
+ManageLotMask=Προσαρμοσμένη μάσκα
+CustomMasks=Δυνατότητα ορισμού διαφορετικής μάσκας αρίθμησης για κάθε προϊόν
+BatchLotNumberingModules=Κανόνας αρίθμησης για αυτόματη δημιουργία αριθμού παρτίδας
+BatchSerialNumberingModules=Κανόνας αρίθμησης για αυτόματη δημιουργία σειριακού αριθμού (για προϊόντα με ιδιότητα 1 μοναδικής παρτίδας/σειράς για κάθε προϊόν)
+QtyToAddAfterBarcodeScan=Ποσότητα έως %s για κάθε γραμμωτό κώδικα/παρτίδα/σειριακή σάρωση
+LifeTime=Διάρκεια ζωής (σε ημέρες)
+EndOfLife=Τέλος της ζωής
+ManufacturingDate=Ημερομηνία κατασκευής
+DestructionDate=Ημερομηνία καταστροφής
+FirstUseDate=Ημερομηνία πρώτης χρήσης
+QCFrequency=Συχνότητα ποιοτικού ελέγχου (σε ημέρες)
+ShowAllLots=Εμφάνιση όλων των παρτίδων
+HideLots=Κρύψιμο των παρτίδων
 #Traceability - qc status
-OutOfOrder=Out of order
-InWorkingOrder=In working order
-ToReplace=Replace
+OutOfOrder=Εκτός λειτουργίας
+InWorkingOrder=Σε κατάσταση λειτουργίας
+ToReplace=Αντικατάσταση
diff --git a/htdocs/langs/el_GR/projects.lang b/htdocs/langs/el_GR/projects.lang
index 5ec5795aa29..8fb56b5cf91 100644
--- a/htdocs/langs/el_GR/projects.lang
+++ b/htdocs/langs/el_GR/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
 ProjectTasksWithoutTimeSpent=Project tasks without time spent
 FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+StartDateCannotBeAfterEndDate=Η ημερομηνία λήξης δεν μπορεί να είναι πριν από την ημερομηνία έναρξης
diff --git a/htdocs/langs/el_GR/withdrawals.lang b/htdocs/langs/el_GR/withdrawals.lang
index 7a11d892ef7..c0fbf0b2a1c 100644
--- a/htdocs/langs/el_GR/withdrawals.lang
+++ b/htdocs/langs/el_GR/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Τελευταία αρχεία άμεσης χρέωσης %s
 WithdrawalsLine=Direct debit order line
+CreditTransfer=μεταφορά πιστώσεως
 CreditTransferLine=Credit transfer line
 WithdrawalsLines=Γραμμές εντολής άμεσης χρέωσης
 CreditTransferLines=Credit transfer lines
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Τραπεζικός κωδικός τρίτου μέρους
 NoInvoiceCouldBeWithdrawed=Κανένα τιμολόγιο δεν χρεώθηκε με επιτυχία. Βεβαιωθείτε ότι τα τιμολόγια είναι σε εταιρείες με έγκυρο αριθμό IBAN και ότι ο IBAN έχει UMR (Unique Mandate Reference) με τον τρόπο <strong>%s</strong> .
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=Ταξινομήστε πιστώνεται
+ClassDebited=Classify debited
 ClassCreditedConfirm=Είστε σίγουροι ότι θέλετε να χαρακτηρίσει την παραλαβή ως απόσυρση πιστώνεται στον τραπεζικό σας λογαριασμό;
 TransData=Η ημερομηνία αποστολής
 TransMetod=Μέθοδος αποστολής
diff --git a/htdocs/langs/en_AE/admin.lang b/htdocs/langs/en_AE/admin.lang
index 2e81853353a..a5f92aef8da 100644
--- a/htdocs/langs/en_AE/admin.lang
+++ b/htdocs/langs/en_AE/admin.lang
@@ -1,3 +1,3 @@
 # Dolibarr language file - Source file is en_US - admin
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<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/en_AU/admin.lang b/htdocs/langs/en_AU/admin.lang
index 3955dfbea67..7adbe17281c 100644
--- a/htdocs/langs/en_AU/admin.lang
+++ b/htdocs/langs/en_AU/admin.lang
@@ -4,5 +4,5 @@ NewVATRates=New GST rate
 DictionaryVAT=GST Rates or Sales Tax Rates
 OptionVatMode=GST due
 LinkColor=Colour of links
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<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/en_AU/companies.lang b/htdocs/langs/en_AU/companies.lang
index d744e0b1e87..ea3dd666759 100644
--- a/htdocs/langs/en_AU/companies.lang
+++ b/htdocs/langs/en_AU/companies.lang
@@ -1,2 +1,8 @@
 # Dolibarr language file - Source file is en_US - companies
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
 VATIntraCheck=Cheque
diff --git a/htdocs/langs/en_CA/admin.lang b/htdocs/langs/en_CA/admin.lang
index 52ff6fc221d..ef9654fbaf9 100644
--- a/htdocs/langs/en_CA/admin.lang
+++ b/htdocs/langs/en_CA/admin.lang
@@ -3,5 +3,5 @@ LocalTax1Management=PST Management
 CompanyZip=Postal code
 LDAPFieldZip=Postal code
 FormatZip=Postal code
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<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/en_CA/companies.lang b/htdocs/langs/en_CA/companies.lang
index fb4a2125300..d6aa5f742ba 100644
--- a/htdocs/langs/en_CA/companies.lang
+++ b/htdocs/langs/en_CA/companies.lang
@@ -2,3 +2,9 @@
 Zip=Postal code
 LocalTax1IsUsedES=PST is used
 LocalTax1IsNotUsedES=GST is not used
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
diff --git a/htdocs/langs/en_GB/admin.lang b/htdocs/langs/en_GB/admin.lang
index af585d22440..d185f42b80b 100644
--- a/htdocs/langs/en_GB/admin.lang
+++ b/htdocs/langs/en_GB/admin.lang
@@ -45,5 +45,5 @@ CompanyZip=Postcode
 LDAPFieldZip=Postcode
 GenbarcodeLocation=Barcode generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
 FormatZip=Postcode
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<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/en_GB/companies.lang b/htdocs/langs/en_GB/companies.lang
index 505b39eb102..5b1fc1ce577 100644
--- a/htdocs/langs/en_GB/companies.lang
+++ b/htdocs/langs/en_GB/companies.lang
@@ -1,3 +1,9 @@
 # Dolibarr language file - Source file is en_US - companies
 Zip=Postcode
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
 AccountancyCode=Account
diff --git a/htdocs/langs/en_IN/admin.lang b/htdocs/langs/en_IN/admin.lang
index 85802a769cf..dc3bbbf6c72 100644
--- a/htdocs/langs/en_IN/admin.lang
+++ b/htdocs/langs/en_IN/admin.lang
@@ -14,5 +14,5 @@ ProposalsPDFModules=Quotation documents models
 FreeLegalTextOnProposal=Free text on quotations
 WatermarkOnDraftProposal=Watermark on draft quotations (none if empty)
 MailToSendProposal=Customer quotations
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<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/en_IN/companies.lang b/htdocs/langs/en_IN/companies.lang
index e33ae9aa9ff..1c2c7a6f4fb 100644
--- a/htdocs/langs/en_IN/companies.lang
+++ b/htdocs/langs/en_IN/companies.lang
@@ -1,5 +1,11 @@
 # Dolibarr language file - Source file is en_US - companies
 OverAllProposals=Quotations
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
 ProfId1IN=Prof Id 1 (GSTIN)
 ContactForProposals=Quotation's contact
 NoContactForAnyProposal=This contact is not a contact for any quotation
diff --git a/htdocs/langs/en_SG/admin.lang b/htdocs/langs/en_SG/admin.lang
index 2e81853353a..a5f92aef8da 100644
--- a/htdocs/langs/en_SG/admin.lang
+++ b/htdocs/langs/en_SG/admin.lang
@@ -1,3 +1,3 @@
 # Dolibarr language file - Source file is en_US - admin
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<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/en_ZA/admin.lang b/htdocs/langs/en_ZA/admin.lang
index 2e81853353a..a5f92aef8da 100644
--- a/htdocs/langs/en_ZA/admin.lang
+++ b/htdocs/langs/en_ZA/admin.lang
@@ -1,3 +1,3 @@
 # Dolibarr language file - Source file is en_US - admin
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<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_AR/admin.lang b/htdocs/langs/es_AR/admin.lang
index 218b2d86cf6..a99acf5cbee 100644
--- a/htdocs/langs/es_AR/admin.lang
+++ b/htdocs/langs/es_AR/admin.lang
@@ -586,15 +586,13 @@ EmailcollectorOperations=Operaciones a realizar por coleccionista.
 EmailCollectorConfirmCollectTitle=Correo electrónico recoger confirmación
 EmailCollectorConfirmCollect=¿Quieres ejecutar la colección para este coleccionista ahora?
 NoNewEmailToProcess=No hay correo electrónico nuevo (filtros coincidentes) para procesar
-RecordEvent=Grabar evento de correo electrónico
-CreateLeadAndThirdParty=Crear plomo (y tercero si es necesario)
 CodeLastResult=Último código de resultado
 ECMAutoTree=Mostrar arbol ECM automatico
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 ResourceSetup=Configuración del módulo de recursos
 UseSearchToSelectResource=Use un formulario de búsqueda para elegir un recurso (en lugar de una lista desplegable).
 DisabledResourceLinkUser=Deshabilitar la función para vincular un recurso a los usuarios
 DisabledResourceLinkContact=Deshabilitar función para vincular un recurso a contactos
 ConfirmUnactivation=Confirmar el reinicio del módulo
 OnMobileOnly=Solo en pantalla pequeña (teléfono inteligente)
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+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_AR/companies.lang b/htdocs/langs/es_AR/companies.lang
index a643e7ee06c..1e051e5382c 100644
--- a/htdocs/langs/es_AR/companies.lang
+++ b/htdocs/langs/es_AR/companies.lang
@@ -200,7 +200,6 @@ ThisUserIsNot=Este usuario no es un cliente, cliente potencial o proveedor.
 VATIntraCheck=Cheque
 VATIntraCheckDesc=El ID de IVA debe incluir el prefijo del país. El enlace <b>%s</b> utiliza el servicio de verificación de IVA europeo (VIES) que requiere acceso a Internet desde Dolibarr.
 VATIntraCheckableOnEUSite=Consulte el ID de IVA intracomunitario en el sitio web de la Comisión Europea
-VATIntraManualCheck=También puedes consultar manualmente en el sitio web de la Comisión Europea <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=No es posible comprobar. El servicio de verificación no lo proporciona el estado del miembro (%s).
 NorProspectNorCustomer=Ni cliente ni cliente potencial
 ProspectLevel=Cliente potencia
diff --git a/htdocs/langs/es_AR/projects.lang b/htdocs/langs/es_AR/projects.lang
index a8ae01b6bf8..c4e1e32ddc2 100644
--- a/htdocs/langs/es_AR/projects.lang
+++ b/htdocs/langs/es_AR/projects.lang
@@ -5,3 +5,5 @@ ProjectLabel=Etiqueta de Proyecto
 ProjectsArea=Area de Proyectos
 SharedProject=Todos
 OppStatusPROPO=Propuesta
+NewInter=Nueva intervención
+StartDateCannotBeAfterEndDate=La fecha de finalización no puede ser anterior a la fecha de inicio
diff --git a/htdocs/langs/es_BO/admin.lang b/htdocs/langs/es_BO/admin.lang
index 2e81853353a..a5f92aef8da 100644
--- a/htdocs/langs/es_BO/admin.lang
+++ b/htdocs/langs/es_BO/admin.lang
@@ -1,3 +1,3 @@
 # Dolibarr language file - Source file is en_US - admin
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<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_CL/admin.lang b/htdocs/langs/es_CL/admin.lang
index 770d58b5c11..39c906f17bb 100644
--- a/htdocs/langs/es_CL/admin.lang
+++ b/htdocs/langs/es_CL/admin.lang
@@ -512,7 +512,6 @@ Permission106=Exportar envíos
 Permission109=Eliminar envíos
 Permission111=Leer cuentas financieras
 Permission112=Crear/modificar / eliminar y comparar transacciones
-Permission113=Configurar cuentas financieras (crear, administrar categorías)
 Permission114=Conciliar transacciones
 Permission115=Exportar transacciones y estados de cuenta
 Permission116=Transferencias entre cuentas
@@ -609,9 +608,7 @@ Permission651=Crear / actualizar facturas de materiales
 Permission652=Eliminar listas de materiales
 Permission701=Leer donaciones
 Permission771=Lea los informes de gastos (el suyo y sus subordinados)
-Permission772=Crear/modificar informes de gastos
 Permission773=Eliminar informes de gastos
-Permission774=Lea todos los informes de gastos (incluso para usuarios no subordinados)
 Permission775=Aprobar informes de gastos
 Permission776=Pagar informes de gastos
 Permission779=Informes de gastos de exportación
@@ -653,16 +650,12 @@ Permission2503=Presentar o eliminar documentos
 Permission2515=Configurar directorios de documentos
 Permission2801=Use el cliente FTP en modo de lectura (navegue y descargue solamente)
 Permission2802=Utilice el cliente FTP en modo de escritura (eliminar o cargar archivos)
-Permission4004=Empleados de exportación
 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 a desarrolladores restringidos.
 Permission20001=Lea las solicitudes de licencia (su licencia y las de sus subordinados)
 Permission20002=Cree / modifique sus solicitudes de licencia (su licencia y las de sus subordinados)
 Permission20003=Eliminar solicitudes de permiso
-Permission20004=Lea todas las solicitudes de licencia (incluso del usuario no subordinado)
-Permission20005=Crear / modificar solicitudes de abandono para todos (incluso para usuarios no subordinados)
-Permission20006=Solicitudes de permiso de administrador (configuración y saldo de actualización)
 Permission20007=Aprobar solicitudes de licencia
 Permission23001=Leer trabajo programado
 Permission23002=Crear / actualizar trabajo programado
@@ -1353,14 +1346,12 @@ EmailCollectorConfirmCollectTitle=Correo electrónico recoger confirmación
 EmailCollectorConfirmCollect=¿Quieres ejecutar la colección para este coleccionista ahora?
 NoNewEmailToProcess=No hay correo electrónico nuevo (filtros coincidentes) para procesar
 XEmailsDoneYActionsDone=correos electrónicos %s calificados, correos electrónicos %s procesados con éxito (para %s registro / acciones realizadas)
-RecordEvent=Grabar evento de correo electrónico
-CreateLeadAndThirdParty=Crear plomo (y tercero si es necesario)
 CodeLastResult=Código de resultado más reciente
 NbOfEmailsInInbox=Número de correos electrónicos en el directorio de origen
 LoadThirdPartyFromName=Cargar búsqueda de terceros en %s (solo carga)
 LoadThirdPartyFromNameOrCreate=Cargar búsqueda de terceros en %s (crear si no se encuentra)
 ECMAutoTree=Mostrar arbol ECM automatico
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHoursDesc=Introduzca aquí el horario habitual de apertura de su empresa.
 ResourceSetup=Configuración del módulo de recursos
 UseSearchToSelectResource=Use un formulario de búsqueda para elegir un recurso (en lugar de una lista desplegable).
@@ -1379,7 +1370,7 @@ DebugBar=Barra de debug
 WarningValueHigherSlowsDramaticalyOutput=Advertencia, los valores más altos ralentizan dramáticamente la salida.
 ModuleActivated=El módulo %s está activado y ralentiza la interfaz
 EXPORTS_SHARE_MODELS=Los modelos de exportación se comparten con todos.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+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>
 EndPointFor=Punto final para %s: %s
 DeleteEmailCollector=Eliminar el colector de correo electrónico
 ConfirmDeleteEmailCollector=¿Estás seguro de que deseas eliminar este recopilador de correo electrónico?
diff --git a/htdocs/langs/es_CL/companies.lang b/htdocs/langs/es_CL/companies.lang
index 1f0ce0d284d..2b761b3d04f 100644
--- a/htdocs/langs/es_CL/companies.lang
+++ b/htdocs/langs/es_CL/companies.lang
@@ -149,7 +149,6 @@ EditCompany=Editar empresa
 VATIntraCheck=Cheque
 VATIntraCheckDesc=La identificación del IVA debe incluir el prefijo del país. El enlace <b>%s</b> utiliza el servicio europeo de verificación de IVA (VIES), que requiere acceso a Internet desde el servidor Dolibarr.
 VATIntraCheckableOnEUSite=Compruebe la identificación del IVA intracomunitaria en el sitio web de la Comisión Europea
-VATIntraManualCheck=También puede consultar manualmente en el sitio web de la Comisión Europea <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=No es posible comprobar. El servicio de verificación no proporcionado por el estado miembro  (%s).
 NorProspectNorCustomer=No prospecto, ni cliente
 ProspectLevel=Potencial prospectivo
diff --git a/htdocs/langs/es_CL/projects.lang b/htdocs/langs/es_CL/projects.lang
index d456e3c3ba0..d24822b69ea 100644
--- a/htdocs/langs/es_CL/projects.lang
+++ b/htdocs/langs/es_CL/projects.lang
@@ -155,6 +155,7 @@ RecordsClosed=%s proyecto (s) cerrado
 SendProjectRef=Proyecto de información %s
 ModuleSalaryToDefineHourlyRateMustBeEnabled=El módulo &#39;Salarios&#39; debe estar habilitado para definir la tarifa por hora de los empleados para que el tiempo empleado se valore
 NewTaskRefSuggested=Referencia de tarea ya utilizada, se requiere una nueva referencia de tarea
+TimeSpentForIntervention=Tiempo dedicado
 TimeSpentForInvoice=Tiempo dedicado
 InvoiceGeneratedFromTimeSpent=La factura %s se ha generado desde el tiempo invertido en el proyecto
 UsageBillTimeShort=Uso: Bill time
diff --git a/htdocs/langs/es_CO/admin.lang b/htdocs/langs/es_CO/admin.lang
index 0620f96fd39..1a2035ad8a2 100644
--- a/htdocs/langs/es_CO/admin.lang
+++ b/htdocs/langs/es_CO/admin.lang
@@ -553,7 +553,6 @@ Permission106=Envíos de exportación
 Permission109=Eliminar envíos
 Permission111=Leer cuentas financieras
 Permission112=Crear / modificar / borrar y comparar transacciones
-Permission113=Configurar cuentas financieras (crear, administrar categorías)
 Permission114=Conciliar transacciones
 Permission115=Transacciones de exportación y estados de cuenta
 Permission116=Transferencias entre cuentas
@@ -674,9 +673,7 @@ Permission662=Eliminar orden de fabricación (MO)
 Permission701=Leer donaciones
 Permission702=Crear / modificar donaciones.
 Permission771=Lea los informes de gastos (el suyo y sus subordinados)
-Permission772=Crear / modificar informes de gastos.
 Permission773=Eliminar informes de gastos
-Permission774=Lea todos los informes de gastos (incluso para usuarios no subordinados)
 Permission775=Aprobar informes de gastos.
 Permission776=Informes de gastos de pago
 Permission778=Crear / modificar informes de gastos de todos
@@ -729,10 +726,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)
-Permission4010=Leer habilidad / trabajo / puesto
-Permission4011=Crear / modificar habilidad / trabajo / puesto
-Permission4012=Eliminar habilidad / trabajo / puesto
-Permission4021=Crear / modificar evaluación
 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.
@@ -740,9 +733,6 @@ Permission10005=Eliminar el contenido del sitio web
 Permission20001=Leer solicitudes de licencia (su licencia y las de sus subordinados)
 Permission20002=Crear / modificar sus solicitudes de licencia (su licencia y las de sus subordinados)
 Permission20003=Eliminar solicitudes de permiso
-Permission20004=Lea todas las solicitudes de permiso (incluso de usuarios no subordinados)
-Permission20005=Crear / modificar solicitudes de permisos para todos (incluso de usuarios no subordinados)
-Permission20006=Solicitudes de licencia de administrador (configuración y actualización del saldo)
 Permission20007=Aprobar solicitudes de licencia
 Permission23001=Leer trabajo programado
 Permission23002=Crear / actualizar trabajo programado
@@ -1562,9 +1552,6 @@ EmailCollectorConfirmCollectTitle=Correo electrónico recoger confirmación
 EmailCollectorConfirmCollect=¿Quieres ejecutar la recolección de este recolector ahora?
 NoNewEmailToProcess=No hay correo electrónico nuevo (filtros coincidentes) para procesar
 XEmailsDoneYActionsDone=%s correos electrónicos calificados, %s correos electrónicos procesados correctamente (para %s registro/acciones realizadas)
-RecordEvent=Grabar evento de correo electrónico
-CreateLeadAndThirdParty=Crea principal (y tercero de ser necesario)
-CreateTicketAndThirdParty=Crear ticket (y vincular a un tercero si fue cargado por una operación anterior)
 CodeLastResult=Último código de resultado
 NbOfEmailsInInbox=Número de correos electrónicos en el directorio de origen
 LoadThirdPartyFromName=Cargar búsqueda de terceros en %s (solo cargar)
@@ -1573,7 +1560,7 @@ WithDolTrackingID=Mensaje de una conversación iniciada por un primer correo ele
 WithoutDolTrackingID=Mensaje de una conversación iniciada por un primer correo electrónico NO enviado desde Dolibarr
 MainMenuCode=Código de entrada de menú (menú principal)
 ECMAutoTree=Mostrar árbol ECM automático
-OperationParamDesc=Defina los valores que se utilizarán para el objeto de la acción o cómo extraer los valores. Por ejemplo: <br> objproperty1 = SET: el valor para establecer <br> objproperty2 = SET: un valor con reemplazo de __objproperty1__ <br> objproperty3 = SETIFEMPTY: valor usado si no se ha definido <br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:El nombre de mi compañia es\\s([^\\s]*)<br> <br>Utilice el caracter  ; como separador para extraer o establecer varias propiedades.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Horario de oficina
 OpeningHoursDesc=Introduzca aquí el horario habitual de trabajo/servicio de su empresa.
 ResourceSetup=Configuración del módulo de recursos
@@ -1606,7 +1593,7 @@ ImportSetup=Configuración de la importación del módulo
 InstanceUniqueID=ID único de la instancia
 WithGMailYouCanCreateADedicatedPassword=Si habilitó la validación de 2 pasos con una cuenta de GMail, se recomienda crear una segunda contraseña dedicada para la aplicación en lugar de usar la contraseña de su propia cuenta de https://myaccount.google.com/.
 EmailCollectorTargetDir=Puede ser un comportamiento deseado mover el correo electrónico a otra etiqueta/directorio cuando se procesó correctamente. Simplemente configure el nombre del directorio aquí para usar esta función (NO use caracteres especiales en el nombre). Tenga en cuenta que también debe utilizar una cuenta de inicio de sesión de lectura/escritura.
-EmailCollectorLoadThirdPartyHelp=Puede utilizar esta acción para utilizar el contenido del correo electrónico para buscar y cargar un tercero existente en su base de datos. El tercero encontrado (o creado) se utilizará para las siguientes acciones que lo necesiten. <br> Por ejemplo, si desea crear un tercero con un nombre extraído una cadena 'Nombre: nombre para encontrar' que se encuentra en el cuerpo, use el correo electrónico del remitente como correo electrónico, puede establecer el campo de parámetro de esta manera: <br> 'email = HEADER:^From: (.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;' <br>
+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>
 EndPointFor=Punto final para %s: %s
 DeleteEmailCollector=Eliminar recopilador de correo electrónico
 ConfirmDeleteEmailCollector=¿Está seguro de que desea eliminar este recopilador de correo electrónico?
diff --git a/htdocs/langs/es_CO/other.lang b/htdocs/langs/es_CO/other.lang
index c95f685c6dc..5a4b7bca97f 100644
--- a/htdocs/langs/es_CO/other.lang
+++ b/htdocs/langs/es_CO/other.lang
@@ -199,3 +199,4 @@ PopuProp=Productos / Servicios por popularidad en Propuestas
 PopuCom=Productos / servicios por popularidad en pedidos
 ProductStatistics=Estadísticas de productos / servicios
 NbOfQtyInOrders=Cant. En pedidos
+ConfirmBtnCommonTitle =Confirma tu acción
diff --git a/htdocs/langs/es_CO/projects.lang b/htdocs/langs/es_CO/projects.lang
index a7e9cf03422..4a556806570 100644
--- a/htdocs/langs/es_CO/projects.lang
+++ b/htdocs/langs/es_CO/projects.lang
@@ -98,6 +98,7 @@ NoTasks=No hay tareas para este proyecto.
 LinkedToAnotherCompany=Vinculado a otro tercero
 TaskIsNotAssignedToUser=Tarea no asignada al usuario. Use el botón '<strong> %s </strong>' para asignar la tarea ahora.
 ErrorTimeSpentIsEmpty=El tiempo gastado está vacío
+TimeRecordingRestrictedToNMonthsBack=La grabación de tiempo está restringida a %s meses atrás
 ThisWillAlsoRemoveTasks=Esta acción también eliminará todas las tareas del proyecto (<b> %s </b> tareas en este momento) y todas las entradas de tiempo invertido.
 IfNeedToUseOtherObjectKeepEmpty=Si algunos objetos (factura, pedido, ...), pertenecientes a otro tercero, deben estar vinculados al proyecto a crear, déjelo vacío para que el proyecto sea de múltiples terceros.
 CloneTasks=Tareas de clonacion
@@ -184,13 +185,19 @@ SendProjectRef=Proyecto de información %s
 ModuleSalaryToDefineHourlyRateMustBeEnabled=El módulo 'Salarios' debe estar habilitado para definir la tarifa por hora del empleado para que se valore el tiempo dedicado
 NewTaskRefSuggested=La referencia de tarea ya se usó, se requiere una nueva referencia de tarea
 TimeSpentInvoiced=Tiempo invertido facturado
+TimeSpentForIntervention=Tiempo usado
 TimeSpentForInvoice=Tiempo usado
 ServiceToUseOnLines=Servicio para usar en líneas
 InvoiceGeneratedFromTimeSpent=La factura %s se ha generado a partir del tiempo dedicado al proyecto
+InterventionGeneratedFromTimeSpent=La intervención %s se ha generado a partir del tiempo dedicado al proyecto
 ProjectBillTimeDescription=Verifique si ingresa la hoja de tiempo en las tareas del proyecto Y planea generar factura(s) a partir de la hoja de tiempo para facturar al cliente del proyecto (no verifique si planea crear una factura que no se base en las hojas de tiempo ingresadas). Nota: Para generar factura, vaya a la pestaña 'Tiempo invertido' del proyecto y seleccione las líneas para incluir.
 ProjectFollowOpportunity=Siga la oportunidad
 UsageOpportunity=Uso: oportunidad
 UsageBillTimeShort=Uso: tiempo de facturación
 InvoiceToUse=Proyecto de factura a utilizar
+InterToUse=Proyecto de intervención a utilizar
+NewInter=Nueva intervención
 ProfitIsCalculatedWith=La ganancia se calcula usando
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Nota: los proyectos existentes con todas las tareas en 100%% no se verán afectados: tendrá que cerrarlos manualmente. Esta opción solo afecta a proyectos abiertos.
+ProjectTasksWithoutTimeSpent=Proyecto de tareas sin tiempo invertido
+FormForNewLeadDesc=Gracias por llenar el siguiente formulario para contactarnos. También puede enviarnos un correo electrónico directamente a <b> %s </b>.
diff --git a/htdocs/langs/es_DO/admin.lang b/htdocs/langs/es_DO/admin.lang
index 26f60bd1d13..43a2dbc6cfa 100644
--- a/htdocs/langs/es_DO/admin.lang
+++ b/htdocs/langs/es_DO/admin.lang
@@ -7,5 +7,5 @@ Permission93=Eliminar impuestos e ITBIS
 DictionaryVAT=Tasa de ITBIS (Impuesto sobre ventas en EEUU)
 UnitPriceOfProduct=Precio unitario sin ITBIS de un producto
 OptionVatMode=Opción de carga de ITBIS
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<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_EC/admin.lang b/htdocs/langs/es_EC/admin.lang
index c14b4373f98..d39ca139dde 100644
--- a/htdocs/langs/es_EC/admin.lang
+++ b/htdocs/langs/es_EC/admin.lang
@@ -523,7 +523,6 @@ Permission106=Exportar envíos
 Permission109=Eliminar envíos
 Permission111=Leer cuentas financieras
 Permission112=Crear / modificar / eliminar y comparar transacciones
-Permission113=Configuración de cuentas financieras (crear, administrar categorías)
 Permission114=Conciliar transacciones
 Permission115=Exportar transacciones y estados de cuenta
 Permission116=Transferencias entre cuentas
@@ -625,9 +624,7 @@ Permission652=Eliminar listas de materiales
 Permission701=Leer donaciones
 Permission702=Crear / modificar donaciones
 Permission771=Leer informes de gastos
-Permission772=Crear / modificar informes de gastos
 Permission773=Eliminar informes de gastos
-Permission774=Leer todos los informes de gastos
 Permission775=Aprobar informes de gastos
 Permission776=Pagar los informes de gastos
 Permission779=Exportar informes de gastos
@@ -679,9 +676,6 @@ Permission10003=Crear/modificar contenido del sitio web (código php dinámico).
 Permission20001=Lea las solicitudes de licencia (su licencia y las de sus subordinados)
 Permission20002=Cree / modifique sus solicitudes de licencia (su licencia y las de sus subordinados)
 Permission20003=Solicitudes de licencia / permiso
-Permission20004=Lea todas las solicitudes de permiso.
-Permission20005=Crear / modificar solicitudes de permiso para todos (incluso para usuarios no subordinados)
-Permission20006=Administrar solicitud de licencia / permiso
 Permission20007=Aprobar solicitudes de licencia
 Permission23001=Leer trabajo programado
 Permission23002=Crear / actualizar trabajo programado
@@ -1411,14 +1405,12 @@ EmailCollectorConfirmCollectTitle=Correo electrónico recoger confirmación
 EmailCollectorConfirmCollect=¿Quieres ejecutar la colección para este coleccionista ahora?
 NoNewEmailToProcess=No hay correo electrónico nuevo (filtros coincidentes) para procesar
 XEmailsDoneYActionsDone=%s correos electrónicos calificados, %s correos electrónicos procesados con éxito (para %s registro/acciones realizadas)
-RecordEvent=Grabar evento de correo electrónico
-CreateLeadAndThirdParty=Crear plomo (y tercero si es necesario)
 CodeLastResult=Último código de resultado
 NbOfEmailsInInbox=Número de correos electrónicos en el directorio de origen
 LoadThirdPartyFromName=Cargue la búsqueda de terceros en %s (solo carga)
 LoadThirdPartyFromNameOrCreate=Cargue la búsqueda de terceros en %s (crear si no se encuentra)
 ECMAutoTree=Mostrar arbol ECM automatico
-OperationParamDesc=Defina los valores que se utilizarán para el objeto de la acción o cómo extraer valores. Por ejemplo: <br> objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char como separador para extraer o establecer varias propiedades.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHoursDesc=Ingrese aquí los horarios regulares de su empresa.
 ResourceSetup=Configuración del módulo de recursos
 UseSearchToSelectResource=Use un formulario de búsqueda para elegir un recurso (en lugar de una lista desplegable).
@@ -1444,7 +1436,7 @@ EXPORTS_SHARE_MODELS=Los modelos de exportación se comparten con todos
 ExportSetup=Configuración del módulo Exportar
 InstanceUniqueID=ID único de la instancia
 WithGMailYouCanCreateADedicatedPassword=Con una cuenta de GMail, si habilitó la validación de 2 pasos, se recomienda crear una segunda contraseña dedicada para la aplicación en lugar de usar la contraseña de su propia cuenta de https://myaccount.google.com/.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+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>
 EndPointFor=Punto final para %s: %s
 DeleteEmailCollector=Eliminar recopilador de correo electrónico
 ConfirmDeleteEmailCollector=¿Estás seguro de que deseas eliminar este recopilador de correo electrónico?
diff --git a/htdocs/langs/es_EC/companies.lang b/htdocs/langs/es_EC/companies.lang
index 6b46b175261..2545618c56a 100644
--- a/htdocs/langs/es_EC/companies.lang
+++ b/htdocs/langs/es_EC/companies.lang
@@ -199,7 +199,6 @@ VATIntraCheck=Comprobar
 VATIntraCheckDesc=La identificación del IVA debe incluir el prefijo del país. El enlace <b> %s </b> utiliza el servicio de verificación de IVA europeo (VIES) que requiere acceso a Internet desde el servidor Dolibarr.
 VATIntraCheckURL=Http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Consulte el ID de IVA intracomunitario en el sitio web de la Comisión Europea
-VATIntraManualCheck=También puede consultar manualmente en el sitio web de la Comisión Europea. <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=No es posible el chequeo. El servicio de chequeo no es proporcionado por el estado miembro (%s).
 NorProspectNorCustomer=No prospecto, ni cliente
 ProspectLevel=Prospecto potencial
diff --git a/htdocs/langs/es_EC/other.lang b/htdocs/langs/es_EC/other.lang
index 7d8c9ca8f16..12d22ae617b 100644
--- a/htdocs/langs/es_EC/other.lang
+++ b/htdocs/langs/es_EC/other.lang
@@ -186,3 +186,4 @@ RequestDuration=Duración de la solicitud.
 PopuProp=Productos / Servicios por popularidad en Propuestas
 PopuCom=Productos / Servicios por popularidad en Pedidos
 ProductStatistics=Estadísticas de productos / servicios
+CloseDialog =Cerrado
diff --git a/htdocs/langs/es_EC/projects.lang b/htdocs/langs/es_EC/projects.lang
index bf86ffc8c2f..7085e7a4da2 100644
--- a/htdocs/langs/es_EC/projects.lang
+++ b/htdocs/langs/es_EC/projects.lang
@@ -164,9 +164,12 @@ SendProjectRef=Información del proyecto %s
 ModuleSalaryToDefineHourlyRateMustBeEnabled=El módulo 'Salarios' debe estar habilitado para definir la tarifa por hora de los empleados para tener el tiempo gastado valorizado
 NewTaskRefSuggested=Referencia de tarea ya utilizada, se requiere una nueva referencia de tarea
 TimeSpentInvoiced=Tiempo gastado facturado
+TimeSpentForIntervention=Tiempo usado
 TimeSpentForInvoice=Tiempo usado
 ServiceToUseOnLines=Servicio a utilizar en líneas
 InvoiceGeneratedFromTimeSpent=La factura %s se ha generado a partir del tiempo dedicado al proyecto
 ProjectBillTimeDescription=Verifique si ingresa la hoja de tiempo en las tareas del proyecto Y planea generar factura(s) de la hoja de tiempo para facturar al cliente del proyecto (no verifique si planea crear una factura que no se base en las hojas de tiempo ingresadas). Nota: Para generar la factura, vaya a la pestaña 'Tiempo empleado' del proyecto y seleccione las líneas para incluir.
 UsageBillTimeShort=Uso: Tiempo a facturar
+NewInter=Nueva intervención
 RefTaskParent=Árbitro. Tarea principal
+StartDateCannotBeAfterEndDate=La fecha de finalización no puede ser anterior a la fecha de inicio
diff --git a/htdocs/langs/es_ES/accountancy.lang b/htdocs/langs/es_ES/accountancy.lang
index ca35d513a49..c7751dea89e 100644
--- a/htdocs/langs/es_ES/accountancy.lang
+++ b/htdocs/langs/es_ES/accountancy.lang
@@ -48,7 +48,7 @@ CountriesNotInEEC=Países no incluidos en la CEE
 CountriesInEECExceptMe=Países en la CEE excepto %s
 CountriesExceptMe=Todos los países excepto %s
 AccountantFiles=Exportar documentos de origen
-ExportAccountingSourceDocHelp=With this tool, you can export the source events (list in CSV and PDFs) that are used to generate your accountancy.
+ExportAccountingSourceDocHelp=Con esta herramienta, puede exportar los eventos de origen (lista en CSV y PDF) que se utilizan para generar su contabilidad.
 ExportAccountingSourceDocHelp2=Para exportar sus diarios, use la entrada de menú %s - %s.
 VueByAccountAccounting=Ver por cuenta contable
 VueBySubAccountAccounting=Ver por subcuenta contable
@@ -286,7 +286,7 @@ ValidateMovements=Validar movimientos
 DescValidateMovements=Se prohíbe cualquier modificación o eliminación de registros. Todas las entradas para un ejercicio deben validarse; de lo contrario, no será posible cerrarlo
 
 ValidateHistory=Vincular automáticamente
-AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
+AutomaticBindingDone=Vinculaciones automáticas realizadas (%s) - La vinculación automática no es posible para algunos registros (%s)
 
 ErrorAccountancyCodeIsAlreadyUse=Error, no puede eliminar esta cuenta ya que está siendo usada
 MvtNotCorrectlyBalanced=Asiento contabilizado incorrectamente. Debe=%s. Haber=%s
@@ -387,8 +387,8 @@ 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.
-ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
-ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
+ForbiddenTransactionAlreadyExported=Prohibido: La transacción ha sido validada y / o exportada.
+ForbiddenTransactionAlreadyValidated=Prohibido: la transacción ha sido validada.
 ## Dictionary
 Range=Rango de cuenta contable
 Calculated=Calculado
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index 81067986ec1..97778d04338 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Bold reference and period in PDF
-BoldLabelOnPDF=Bold label in PDF
+BoldRefAndPeriodOnPDF=Referencia y período en negrita en PDF
+BoldLabelOnPDF=Etiqueta en negrita en PDF
 Foundation=Fundación
 Version=Versión
 Publisher=Editor
@@ -355,7 +355,7 @@ LastStableVersion=Última versión estable
 LastActivationDate=Última fecha de activación
 LastActivationAuthor=Último autor de activación
 LastActivationIP=Última IP activa
-LastActivationVersion=Latest activation version
+LastActivationVersion=Última versión de activación
 UpdateServerOffline=Actualizar servidor offline
 WithCounter=Gestionar un contador
 GenericMaskCodes=Puede ingresar cualquier máscara de numeración. En esta máscara, se pueden utilizar las siguientes etiquetas: <br> <b> {000000} </b> corresponde a un número que se incrementará en cada %s. Ingrese tantos ceros como la longitud deseada del contador. El contador se completará con ceros desde la izquierda para tener tantos ceros como la máscara. <br> <b> {000000 + 000} </b> igual que el anterior pero se aplica un desplazamiento correspondiente al número a la derecha del signo + comenzando en el primer %s. <br> <b> {000000 @ x} </b> igual que el anterior pero el contador se restablece a cero cuando se alcanza el mes x (x entre 1 y 12, o 0 para usar los primeros meses del año fiscal definido en su configuración, o 99 para poner a cero todos los meses). Si se usa esta opción y x es 2 o superior, entonces también se requiere la secuencia {yy} {mm} o {yyyy} {mm}. <br> <b> {dd} </b> día (01 a 31). <br> <b> {mm} </b> mes (01 a 12). <br> <b> {yy} </b>, <b> {yyyy} </b> o <b> {y} </b> año sobre 2, 4 o 1 cifras. <br>
@@ -756,7 +756,7 @@ Permission106=Exportar expediciones
 Permission109=Eliminar expediciones
 Permission111=Consultar cuentas financieras (cuentas bancarias, cajas)
 Permission112=Crear/modificar cantidad/eliminar registros bancarios
-Permission113=Configurar cuentas financieras (crear, controlar las categorías)
+Permission113=Configurar cuentas financieras (crear, administrar categorías de transacciones bancarias)
 Permission114=Reconciliar transacciones
 Permission115=Exportar transacciones y extractos
 Permission116=Captar transferencias entre cuentas
@@ -893,12 +893,11 @@ Permission701=Consultar donaciones
 Permission702=Crear/modificar donaciones
 Permission703=Eliminar donaciones
 Permission771=Leer informes de gastos (suyos y subordinados)
-Permission772=Crear/modificar informe de gastos
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Eliminar informe de gastos
-Permission774=Leer todos los informes de gastos (incluidos los no subordinados)
 Permission775=Aprobar informe de gastos
 Permission776=Pagar informe de gastos
-Permission777=Leer los informes de gastos de todos
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Crear/modificar informes de gastos de todos
 Permission779=Exportar informe de gastos
 Permission1001=Consultar stocks
@@ -962,15 +961,11 @@ Permission2801=Utilizar el cliente FTP en modo lectura (sólo explorar y descarg
 Permission2802=Utilizar el cliente FTP en modo escritura (borrar o subir archivos)
 Permission3200=Leer eventos archivados y huellas digitales
 Permission3301=Generar nuevos módulos
-Permission4001=Ver empleados
-Permission4002=Crear empleados
-Permission4003=Eliminar empleados
-Permission4004=Exportar empleados
-Permission4010=Leer habilidad/trabajo/puesto
-Permission4011=Crear/modificar habilidad/trabajo/puesto
-Permission4012=Eliminar habilidad/trabajo/puesto
-Permission4020=Leer evaluación
-Permission4021=Crear/modificar evaluación
+Permission4001=Leer habilidad/trabajo/puesto
+Permission4002=Crear/modificar habilidad/trabajo/puesto
+Permission4003=Eliminar habilidad/trabajo/puesto
+Permission4020=Leer evaluaciones
+Permission4021=Create/modify your evaluation
 Permission4022=Validar evaluación
 Permission4023=Eliminar evaluación
 Permission4030=Ver menú de comparación
@@ -981,9 +976,9 @@ Permission10005=Eliminar contenido del sitio web
 Permission20001=Leer peticiones días líbres (suyos y subordinados)
 Permission20002=Crear/modificar peticiones días libres (suyos y de sus subordinados)
 Permission20003=Eliminar peticiones de días retribuidos
-Permission20004=Leer todas las peticiones de días retribuidos (incluso no subordinados)
-Permission20005=Crear/modificar las peticiones de días retribuidos para todos (incluso no subordinados)
-Permission20006=Administrar días retribuidos (configuración y actualización de balance)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Aprobar solicitudes de días libres
 Permission23001=Consultar Trabajo programado
 Permission23002=Crear/actualizar Trabajo programado
@@ -1712,9 +1707,9 @@ MailingDelay=Segundos de espera después de enviar el mensaje siguiente
 NotificationSetup=Configuración del módulo notificaciones por e-mail
 NotificationEMailFrom=E-Mail emisor (From) de los e-mails enviados a través de notificaciones
 FixedEmailTarget=Destinatario
-NotificationDisableConfirmMessageContact=Hide the list of recipients (subscribed as contact) of notifications into the confirmation message
-NotificationDisableConfirmMessageUser=Hide the list of recipients (subscribed as user) of notifications into the confirmation message
-NotificationDisableConfirmMessageFix=Hide the list of recipients (subscribed as global email) of notifications into the confirmation message
+NotificationDisableConfirmMessageContact=Ocultar la lista de destinatarios (suscritos como contacto) de notificaciones en el mensaje de confirmación
+NotificationDisableConfirmMessageUser=Ocultar la lista de destinatarios (suscritos como usuario) de notificaciones en el mensaje de confirmación
+NotificationDisableConfirmMessageFix=Ocultar la lista de destinatarios (suscritos como correo electrónico global) de notificaciones en el mensaje de confirmación
 ##### Sendings #####
 SendingsSetup=Configuración del módulo de envíos
 SendingsReceiptModel=Modelo de notas de entrega
@@ -1906,7 +1901,7 @@ ExpenseReportsRulesSetup=Configuración del módulo Informes de gastos - Reglas
 ExpenseReportNumberingModules=Módulo de numeración de informes de gastos
 NoModueToManageStockIncrease=No hay activado módulo para gestionar automáticamente el incremento de stock. El incremento de stock se realizará solamente con entrada manual
 YouMayFindNotificationsFeaturesIntoModuleNotification=Puede encontrar opciones para notificaciones de e-mail activando y configurando el módulo  "Notificaciones".
-TemplatesForNotifications=Templates for notifications
+TemplatesForNotifications=Plantillas para notificaciones
 ListOfNotificationsPerUser=Listado de notificaciones automáticas por usuario*
 ListOfNotificationsPerUserOrContact=Listado de posibles notificaciones automáticas (eventos) por usuario* o por contacto**
 ListOfFixedNotifications=Listado de notificaciones automáticas fijas
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=¿Desea ejecutar la recolección de este recolector
 NoNewEmailToProcess=No hay e-mails nuevos (filtros coincidentes) para procesar
 NothingProcessed=Nada hecho
 XEmailsDoneYActionsDone=%s e-mails analizados, %s e-mails procesados ​​con éxito (para %s registro/acciones realizadas)
-RecordEvent=Registro de evento de email
-CreateLeadAndThirdParty=Crear lead (y tercero si es necesario)
-CreateTicketAndThirdParty=Crear ticket (y vincular a un tercero si ha sido cargado en una operación anterior)
+RecordEvent=Registrar un evento en agenda (con tipo Email enviado o recibido)
+CreateLeadAndThirdParty=Crear un cliente potencial (y un tercero si es necesario)
+CreateTicketAndThirdParty=Crear un ticket (vinculado a un tercero si el tercero fue cargado por una operación anterior, sin ningún tercero en caso contrario)
 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)
+AttachJoinedDocumentsToObject=Guarde los archivos adjuntos en documentos de objetos si se encuentra una referencia de un objeto en el tema 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
 WithDolTrackingIDInMsgId=Mensaje enviado desde Dolibarr
@@ -2084,7 +2080,7 @@ CreateCandidature=Crear solicitud de empleo
 FormatZip=Código postal
 MainMenuCode=Código de entrada del menú (menú principal)
 ECMAutoTree=Mostrar arbol automático GED
-OperationParamDesc=Defina valores para usar para la acción, o cómo extraer valores. Por ejemplo: <br> objproperty1=SET:valor a establecer<br>objproperty2=SET:un valor con reemplazo de __objproperty1__<br>objproperty3=SETIFEMPTY:valor utilizado si objproperty3 aún no está definido<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:El nombre de mi empresa es\\s([^\\s]*)<br><br>Utilizar el carácter  ; como separador para extraer o configurar varias propiedades.
+OperationParamDesc=Defina las reglas que se utilizarán para extraer o establecer valores. <br> Ejemplo de operaciones que necesitan extraer un nombre del asunto del correo electrónico: <br> name=EXTRACT:SUBJECT:Mensaje de la empresa([^\n] *) <br>Ejemplo para las operaciones que crean objetos: <br>objproperty1=SET: el valor a establecer <br> objproperty2=SET: un valor incluyendo el valor de __objproperty1__<br>objproperty3=SETIFEMPTY: valor utilizado si objproperty3 no está ya definido <br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:El nombre de mi empresa es\\s( [^\\s]*) <br><br> Use un ; como separador para extraer o establecer varias propiedades.
 OpeningHours=Horario de apertura
 OpeningHoursDesc=Teclea el horario normal de apertura de tu compañía.
 ResourceSetup=Configuración del módulo Recursos
@@ -2130,7 +2126,7 @@ LargerThan=Mayor que
 IfTrackingIDFoundEventWillBeLinked=Tenga en cuenta que si se encuentra un ID de seguimiento de un objeto en un correo electrónico, o si el correo electrónico es una respuesta de un correo electrónico ya recopilado y vinculado a un objeto, el evento creado se vinculará automáticamente al objeto relacionado conocido.
 WithGMailYouCanCreateADedicatedPassword=Con una cuenta de GMail, si habilitó la validación de 2 pasos, se recomienda crear una segunda contraseña dedicada para la aplicación en lugar de usar su propia contraseña de https://myaccount.google.com/.
 EmailCollectorTargetDir=Puede desear mover el e-mail a otra etiqueta/directorio cuando se procesó correctamente. Simplemente configure el nombre del directorio aquí para usar esta función (NO use caracteres especiales en el nombre). Tenga en cuenta que también debe utilizar un login de lectura/escritura.
-EmailCollectorLoadThirdPartyHelp=Puede usar esta acción para utilizar el contenido del e-mail para buscar y cargar un tercero existente en su base de datos. El tercero encontrado (o creado) se utilizará para las siguientes acciones que lo necesiten. <br>Por ejemplo, si desea crear un tercero con un nombre extraído una cadena 'Nombre: nombre para encontrar' que se encuentra en el cuerpo, use el e-mail del remitente como e-mail, puede establecer el campo de esta manera: <br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+EmailCollectorLoadThirdPartyHelp=Puede usar esta acción para usar el contenido del correo electrónico para buscar y cargar un tercero existente en su base de datos. El tercero encontrado (o creado) se utilizará para las siguientes acciones que lo requieran. <br> Por ejemplo, si desea crear un tercero con un nombre extraído de una cadena 'Name: nombre para encontrar' presente en el cuerpo, use el correo electrónico del remitente como correo electrónico, puede configurar el campo del parámetro de esta manera: <br> 'email= HEADER:^De:(.*);Name=EXTRACTO:CUERPO:Name:\\s([^\\s]*);client=SET:2;' <br>
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Eliminar el recolector de e-mail
 ConfirmDeleteEmailCollector=¿Está seguro de que querer eliminar este recolector de e-mail?
@@ -2218,4 +2214,5 @@ PDF_USE_1A=Generar PDF con formato PDF/A-1b
 MissingTranslationForConfKey = Falta traducción para %s
 NativeModules=Módulos nativos
 NoDeployedModulesFoundWithThisSearchCriteria=No se encontraron módulos para estos criterios de búsqueda
-API_DISABLE_COMPRESSION=Disable compression of API responses
+API_DISABLE_COMPRESSION=Deshabilitar la compresión de las respuestas de la API
+EachTerminalHasItsOwnCounter=Cada terminal utiliza su propio contador.
diff --git a/htdocs/langs/es_ES/bookmarks.lang b/htdocs/langs/es_ES/bookmarks.lang
index e8667acad2c..f7bdb2f412e 100644
--- a/htdocs/langs/es_ES/bookmarks.lang
+++ b/htdocs/langs/es_ES/bookmarks.lang
@@ -15,7 +15,7 @@ UrlOrLink=URL
 BehaviourOnClick=Comportamiento al hacer clic en la URL
 CreateBookmark=Crear marcador
 SetHereATitleForLink=Indicar un nombre para el marcador
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external/absolute link (https://externalurl.com) or an internal/relative link (/mypage.php). You can also use phone like tel:0123456.
+UseAnExternalHttpLinkOrRelativeDolibarrLink=Utilice un enlace externo / absoluto (https://externalurl.com) o un enlace interno / relativo (/mypage.php). También puede utilizar un teléfono como tel: 0123456.
 ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Elija si la página enlazada debería abrirse en la pestaña actual o en una nueva pestaña
 BookmarksManagement=Gestión de marcadores
 BookmarksMenuShortCut=Ctrl + shift + m
diff --git a/htdocs/langs/es_ES/companies.lang b/htdocs/langs/es_ES/companies.lang
index 5d02b1040f8..43ba643a63b 100644
--- a/htdocs/langs/es_ES/companies.lang
+++ b/htdocs/langs/es_ES/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=R.U.T.
 ProfId2CO=-
 ProfId3CO=-
diff --git a/htdocs/langs/es_ES/compta.lang b/htdocs/langs/es_ES/compta.lang
index 4cbfda18f75..7211e872229 100644
--- a/htdocs/langs/es_ES/compta.lang
+++ b/htdocs/langs/es_ES/compta.lang
@@ -170,9 +170,9 @@ SeeReportInInputOutputMode=Consulte <b> %sanálisis de pagos%s </b> para obtener
 SeeReportInDueDebtMode=Consulte <b> %sanálisis de documentos registrados %s </b> para un cálculo basado en <b> documentos registrados conocidos </b> incluso si aún no están contabilizados en el Libro Mayor
 SeeReportInBookkeepingMode=Consulte <b> %sanálisis de la tabla de contabilidad %s </b> para obtener un informe basado en <b> Tabla de Libro Mayor </b>
 RulesAmountWithTaxIncluded=- Los importes mostrados son con todos los impuestos incluídos.
-RulesAmountWithTaxExcluded=- Amounts of invoices shown are with all taxes excluded
-RulesResultDue=- It includes all invoices, expenses, VAT, donations, salaries, whether they are paid or not.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries, the date of end of period is used.
-RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT, donations and salaries.
+RulesAmountWithTaxExcluded=- Los montos de las facturas que se muestran son con todos los impuestos excluidos
+RulesResultDue=- Incluye todas las facturas, gastos, IVA, donaciones, sueldos, sean pagados o no. <br>: se basa en la fecha de facturación de las facturas y en la fecha de vencimiento de los gastos o pagos de impuestos. Para los salarios, se utiliza la fecha de finalización del período.
+RulesResultInOut=- Incluye los pagos reales realizados en facturas, gastos, IVA y salarios. <br> - Se basa en las fechas de pago de las facturas, gastos, IVA, donaciones y salarios.
 RulesCADue=- Incluye las facturas vencidas del cliente, ya sean pagadas o no. <br>- Se basa en la fecha de facturación de estas facturas.<br>
 RulesCAIn=- Incluye los pagos efectuados de las facturas a clientes.<br>- Se basa en la fecha de pago de las mismas<br>
 RulesCATotalSaleJournal=Incluye todas las líneas de crédito del diario de ventas.
diff --git a/htdocs/langs/es_ES/errors.lang b/htdocs/langs/es_ES/errors.lang
index 1f3c1387bc1..9448dcff649 100644
--- a/htdocs/langs/es_ES/errors.lang
+++ b/htdocs/langs/es_ES/errors.lang
@@ -111,7 +111,7 @@ ErrorFailedToLoadRSSFile=Error en la recuperación del flujo RSS. Añada la cons
 ErrorForbidden=Acceso denegado.<br>Intenta acceder a una página, área o funcionalidad de un módulo desactivado o sin una sesión autenticada o no permitida a su usuario
 ErrorForbidden2=Los permisos para este usuario pueden ser asignados por el administrador Dolibarr mediante el menú %s-> %s.
 ErrorForbidden3=Dolibarr no parece funcionar en una sesión autentificada. Consulte la documentación de instalación de Dolibarr para saber cómo administrar las autenticaciones (htaccess, mod_auth u otro...).
-ErrorForbidden4=Note: clear your browser cookies to destroy existing sessions for this login.
+ErrorForbidden4=Nota: borre las cookies de su navegador para destruir las sesiones existentes para este inicio de sesión.
 ErrorNoImagickReadimage=La classe imagick_readimage no está presente en esta instalación de PHP. La reseña no está pues disponible. Los administradores pueden desactivar esta pestaña en el menú Configuración - Visualización.
 ErrorRecordAlreadyExists=Registro ya existente
 ErrorLabelAlreadyExists=Esta etiqueta ya existe
@@ -273,6 +273,7 @@ ErrorWrongFileName=El nombre del archivo no puede contener __SOMETHING__
 ErrorNotInDictionaryPaymentConditions=No está en el Diccionario de términos de pago, modifíquelo.
 ErrorIsNotADraft=%s no es un borrador
 ErrorExecIdFailed=No se puede ejecutar el comando "id"
+ErrorBadCharIntoLoginName=Carácter no autorizado en el nombre de inicio de 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.
diff --git a/htdocs/langs/es_ES/holiday.lang b/htdocs/langs/es_ES/holiday.lang
index 7a48684fdd4..bc7b2c0984d 100644
--- a/htdocs/langs/es_ES/holiday.lang
+++ b/htdocs/langs/es_ES/holiday.lang
@@ -134,4 +134,4 @@ HolidaysToApprove=Vacaciones para aprobar
 NobodyHasPermissionToValidateHolidays=Nadie tiene permiso para validar días libres
 HolidayBalanceMonthlyUpdate=Actualización mensual del saldo de vacaciones
 XIsAUsualNonWorkingDay=%s es normalmente un día NO laborable
-ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=Leave request %s must be draft, canceled or refused to be deleted
+ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=La solicitud de abandono %s debe ser borrador, cancelada o rechazada para ser eliminada
diff --git a/htdocs/langs/es_ES/install.lang b/htdocs/langs/es_ES/install.lang
index f449e5d5057..3c85886b605 100644
--- a/htdocs/langs/es_ES/install.lang
+++ b/htdocs/langs/es_ES/install.lang
@@ -21,7 +21,7 @@ ErrorPHPDoesNotSupportCurl=Su PHP no soporta Curl.
 ErrorPHPDoesNotSupportCalendar=Su instalación de PHP no admite extensiones de calendario.
 ErrorPHPDoesNotSupportUTF8=Este PHP no soporta las funciones UTF8. Resuelva el problema antes de instalar Dolibarr ya que no podrá funcionar correctamente.
 ErrorPHPDoesNotSupportIntl=Este PHP no soporta las funciones Intl.
-ErrorPHPDoesNotSupportMbstring=Your PHP installation does not support mbstring functions.
+ErrorPHPDoesNotSupportMbstring=Su instalación de PHP no admite funciones mbstring.
 ErrorPHPDoesNotSupportxDebug=Su instalación de PHP no admite funciones de depuración ampliadas.
 ErrorPHPDoesNotSupport=Su instalación de PHP no soporta las funciones %s.
 ErrorDirDoesNotExists=El directorio <b>%s</b> no existe o no es accesible.
diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang
index 6b7f1d22d23..e26ba150da7 100644
--- a/htdocs/langs/es_ES/main.lang
+++ b/htdocs/langs/es_ES/main.lang
@@ -88,7 +88,7 @@ FileWasNotUploaded=Un archivo ha sido seleccionado para adjuntarlo, pero aún no
 NbOfEntries=Nº de entradas
 GoToWikiHelpPage=Leer la ayuda en línea (es necesario acceso a Internet )
 GoToHelpPage=Consultar la ayuda
-DedicatedPageAvailable=Dedicated help page related to your current screen
+DedicatedPageAvailable=Página de ayuda dedicada relacionada con su pantalla actual
 HomePage=Página de inicio
 RecordSaved=Registro guardado
 RecordDeleted=Registro eliminado
@@ -212,6 +212,8 @@ User=Usuario
 Users=Usuarios
 Group=Grupo
 Groups=Grupos
+UserGroup=Grupo de usuario
+UserGroups=Grupos de Usuarios
 NoUserGroupDefined=No hay definido grupo de usuarios
 Password=Contraseña
 PasswordRetype=Repetir contraseña
@@ -1159,6 +1161,6 @@ Properties=Propiedades
 hasBeenValidated=%s ha sido validado
 ClientTZ=Zona horaria cliente (usuario)
 NotClosedYet=Aún no cerrado
-ClearSignature=Reset signature
+ClearSignature=Restablecer firma
 CanceledHidden=Ocultar cancelado
 CanceledShown=Mostrar cancelado
diff --git a/htdocs/langs/es_ES/modulebuilder.lang b/htdocs/langs/es_ES/modulebuilder.lang
index 08f1527ac24..b88b64d930d 100644
--- a/htdocs/langs/es_ES/modulebuilder.lang
+++ b/htdocs/langs/es_ES/modulebuilder.lang
@@ -98,7 +98,7 @@ MenusDefDescTooltip=Los menús proporcionados por su módulo/aplicación se defi
 DictionariesDefDescTooltip=Los diccionarios proporcionados por su módulo / aplicación se definen en la matriz <strong>$this->diccionarios</strong> en el archivo descriptor del módulo. Puede editar este archivo manualmente o usar el editor incorporado. <br><br> Nota: Una vez definidos (y el módulo reactivado), los diccionarios también son visibles en el área de configuración para los usuarios administradores en %s.
 PermissionsDefDescTooltip=Los permisos proporcionados por su módulo / aplicación se definen en la matriz <strong>$this->rights</strong> en el archivo descriptor del módulo. Puede editar manualmente este archivo o utilizar el editor incrustado. <br><br> Nota: Una vez definidos (y el módulo se haya reactivado), los permisos serán visibles en la configuración de permisos predeterminada %s.
 HooksDefDesc=Defina en la propiedad <b>module_parts ['hooks']</b>, en el descriptor del módulo, el contexto de los hooks que desea administrar (puede encontrar la lista de contextos mediante una búsqueda de '<b>initHooks(</b>'  en el código del core). <br>Edite el archivo hook para agregar el código de sus funciones (las funciones se pueden encontrar mediante una búsqueda de  '<b>executeHooks</b>' en el código del core).
-TriggerDefDesc=Define in the trigger file the code that you want to execute when a business event external to your module is executed (events triggered by other modules).
+TriggerDefDesc=Defina en el archivo de activación el código que desea ejecutar cuando se ejecuta un evento comercial externo a su módulo (eventos activados por otros módulos).
 SeeIDsInUse=Ver IDs en uso en su instalación
 SeeReservedIDsRangeHere=Ver rango de IDs reservados
 ToolkitForDevelopers=Herramientas para desarrolladores de Dolibarr
diff --git a/htdocs/langs/es_ES/other.lang b/htdocs/langs/es_ES/other.lang
index 574e68e0e79..3a21455b045 100644
--- a/htdocs/langs/es_ES/other.lang
+++ b/htdocs/langs/es_ES/other.lang
@@ -35,9 +35,9 @@ OnlyOneFieldForXAxisIsPossible=Actualmente solo es posible 1 campo como X-Axis.
 AtLeastOneMeasureIsRequired=Se requiere al menos 1 campo para medir
 AtLeastOneXAxisIsRequired=Se requiere al menos 1 campo para el eje X
 LatestBlogPosts=Últimas publicaciones de blog
-notiftouser=To users
-notiftofixedemail=To fixed mail
-notiftouserandtofixedemail=To user and fixed mail
+notiftouser=A los usuarios
+notiftofixedemail=Al correo fijo
+notiftouserandtofixedemail=Al usuario y correo fijo
 Notify_ORDER_VALIDATE=Validación pedido de cliente
 Notify_ORDER_SENTBYMAIL=Envío pedido de cliente por e-mail
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Envío pedido a proveedor por e-mail
@@ -258,6 +258,10 @@ PassEncoding=Cifrado de contraseña
 PermissionsAdd=Permisos añadidos
 PermissionsDelete=Permisos eliminados
 YourPasswordMustHaveAtLeastXChars=Su contraseña debe contener al menos <strong>%s</strong>  caracteres
+PasswordNeedAtLeastXUpperCaseChars=La contraseña necesita al menos <strong>%s</strong> caracteres en mayúsculas
+PasswordNeedAtLeastXDigitChars=La contraseña necesita al menos <strong>%s</strong> caracteres numéricos
+PasswordNeedAtLeastXSpecialChars=La contraseña necesita al menos <strong>%s</strong> caracteres especiales
+PasswordNeedNoXConsecutiveChars=La contraseña no debe tener <strong>%s</strong> caracteres similares consecutivos
 YourPasswordHasBeenReset=Su contraseña ha sido restablecida con éxito
 ApplicantIpAddress=Dirección IP del solicitante
 SMSSentTo=SMS enviado a %s
diff --git a/htdocs/langs/es_ES/productbatch.lang b/htdocs/langs/es_ES/productbatch.lang
index d5a7d15e4be..a6281edf01a 100644
--- a/htdocs/langs/es_ES/productbatch.lang
+++ b/htdocs/langs/es_ES/productbatch.lang
@@ -30,7 +30,7 @@ ManageLotMask=Máscara personalizada
 CustomMasks=Opción para definir una máscara de numeración diferente para cada producto
 BatchLotNumberingModules=Regla de numeración para la generación automática de número de lote
 BatchSerialNumberingModules=Regla de numeración para la generación automática de número de serie (para productos con propiedad 1 lote/serie único para cada producto)
-QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
+QtyToAddAfterBarcodeScan=Cantidad a %s para cada código de barras/lote/serie escaneado
 LifeTime=Vida útil (en días)
 EndOfLife=Fin de vida
 ManufacturingDate=Fecha de fabricación
@@ -42,4 +42,4 @@ HideLots=Ocultar lotes
 #Traceability - qc status
 OutOfOrder=Fuera de servicio
 InWorkingOrder=En orden de trabajo
-ToReplace=Replace
+ToReplace=Reemplazar
diff --git a/htdocs/langs/es_ES/products.lang b/htdocs/langs/es_ES/products.lang
index 24462155dfe..4d3ca8f91a9 100644
--- a/htdocs/langs/es_ES/products.lang
+++ b/htdocs/langs/es_ES/products.lang
@@ -402,11 +402,11 @@ AmountUsedToUpdateWAP=Cantidad a utilizar para actualizar el Precio Medio Ponder
 PMPValue=Valor (PMP)
 PMPValueShort=PMP
 mandatoryperiod=Periodos obligatorios
-mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
+mandatoryPeriodNeedTobeSet=Nota: Se debe definir el período (fecha de inicio y finalización)
 mandatoryPeriodNeedTobeSetMsgValidate=Un servicio requiere un período de inicio y finalización
-mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
+mandatoryHelper=Marque esto si desea un mensaje para el usuario al crear/validar una factura, propuesta comercial, orden de venta sin ingresar una fecha de inicio y finalización en las líneas con este servicio. <br> Tenga en cuenta que el mensaje es una advertencia y no un error de bloqueo.
 DefaultBOM=Lista de materiales predeterminada
 DefaultBOMDesc=La lista de materiales predeterminada que se recomienda utilizar para fabricar este producto. Este campo solo se puede establecer si la naturaleza del producto es '%s'.
 Rank=Rango
-SwitchOnSaleStatus=Switch on sale status
-SwitchOnPurchaseStatus=Switch on purchase status
+SwitchOnSaleStatus=Cambiar estado de oferta
+SwitchOnPurchaseStatus=Activar el estado de la compra
diff --git a/htdocs/langs/es_ES/projects.lang b/htdocs/langs/es_ES/projects.lang
index 5d94f8a82c4..4b312f01cd6 100644
--- a/htdocs/langs/es_ES/projects.lang
+++ b/htdocs/langs/es_ES/projects.lang
@@ -37,8 +37,6 @@ OpportunitiesStatusForOpenedProjects=Importe oportunidades de proyectos por esta
 OpportunitiesStatusForProjects=Importe oportunidades de proyectos por estado
 ShowProject=Ver proyecto
 ShowTask=Ver tarea
-ShowCanceled=Mostrar cancelados
-HideCanceled=Ocultar cancelados
 SetProject=Definir proyecto
 NoProject=Ningún proyecto definido
 NbOfProjects=Numero de proyectos
@@ -286,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Nota: los proyectos existentes
 SelectLinesOfTimeSpentToInvoice=Seleccione las líneas de tiempo invertido que no se hayan facturado y, a continuación, realice la acción masiva "Generar factura" para facturarlas.
 ProjectTasksWithoutTimeSpent=Tareas de proyecto sin tiempo invertido
 FormForNewLeadDesc=Gracias por llenar el siguiente formulario para contactarnos. También puede enviarnos un e-mail directamente a <b>%s</b>.
+StartDateCannotBeAfterEndDate=La fecha de finalizacion no puede ser anterior a la fecha de inicio
diff --git a/htdocs/langs/es_ES/stocks.lang b/htdocs/langs/es_ES/stocks.lang
index adc38db21f7..e6b8c861172 100644
--- a/htdocs/langs/es_ES/stocks.lang
+++ b/htdocs/langs/es_ES/stocks.lang
@@ -241,7 +241,7 @@ StockAtDatePastDesc=Puede ver aquí el stock (stock real) en una fecha determina
 StockAtDateFutureDesc=Puede ver aquí el stock (stock virtual) en una fecha determinada en el futuro
 CurrentStock=Stock actual
 InventoryRealQtyHelp=Establezca el valor en 0 para restablecer la cantidad <br> Mantenga el campo vacío o elimine la línea para mantenerlo sin cambios
-UpdateByScaning=Complete real qty by scaning
+UpdateByScaning=Cantidad real completa escaneando
 UpdateByScaningProductBarcode=Actualización por escaneo (código de barras del producto)
 UpdateByScaningLot=Actualización por escaneo (lote | código de barras de serie)
 DisableStockChangeOfSubProduct=Desactive el cambio de stock de todos los subproductos de este Kit durante este movimiento.
@@ -254,20 +254,20 @@ ReOpen=Reabrir
 ConfirmFinish=¿Confirmas el cierre del inventario? Esto generará todos los movimientos de stock para actualizar su stock a la cantidad real que ingresó en el inventario.
 ObjectNotFound=%s no encontrado
 MakeMovementsAndClose=Generar movimientos y cerrar
-AutofillWithExpected=Replace real quantity with expected quantity
+AutofillWithExpected=Reemplazar la cantidad real con la cantidad esperada
 ShowAllBatchByDefault=De forma predeterminada, muestra los detalles del lote en la pestaña "stock" del producto
 CollapseBatchDetailHelp=Puede establecer la visualización predeterminada de los detalles del lote en la configuración del módulo de existencias
 ErrorWrongBarcodemode=Modo de código de barras desconocido
 ProductDoesNotExist=El producto no existe
-ErrorSameBatchNumber=Several record for the batch number were found in the inventory sheet. No way to know which one to increase.
+ErrorSameBatchNumber=Se encontraron varios registros para el número de lote en la hoja de inventario. No hay forma de saber cuál aumentar.
 ProductBatchDoesNotExist=El producto con lote/serie no existe
 ProductBarcodeDoesNotExist=El producto con código de barras no existe
 WarehouseId=ID de almacén
 WarehouseRef=Ref de almacén
 SaveQtyFirst=Guarde primero las cantidades reales inventariadas, antes de solicitar la creación del movimiento de existencias.
 InventoryStartedShort=Pago parcial
-ErrorOnElementsInventory=Operation canceled for the following reason:
-ErrorCantFindCodeInInventory=Can't find the following code in inventory
-QtyWasAddedToTheScannedBarcode=Success !! The quantity was added to all the requested barcode. You can close the Scanner tool.
-StockChangeDisabled=Change on stock disabled
-NoWarehouseDefinedForTerminal=No warehouse defined for terminal
+ErrorOnElementsInventory=Operación cancelada por el siguiente motivo:
+ErrorCantFindCodeInInventory=No puedo encontrar el siguiente código en el inventario
+QtyWasAddedToTheScannedBarcode=Éxito !! La cantidad se agregó a todo el código de barras solicitado. Puede cerrar la herramienta del escáner.
+StockChangeDisabled=Cambio en stock desactivado
+NoWarehouseDefinedForTerminal=Sin almacén definido para terminal
diff --git a/htdocs/langs/es_ES/stripe.lang b/htdocs/langs/es_ES/stripe.lang
index ddbdcdfe317..a3967805873 100644
--- a/htdocs/langs/es_ES/stripe.lang
+++ b/htdocs/langs/es_ES/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Configuración del módulo 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=Ofrezca a sus clientes una página de pago en línea para pagos con tarjetas de crédito / débito a través de <a href="https://www.stripe.com" target="_blank" rel="noopener noreferrer external"> Stripe </a>. Esto se puede utilizar para permitir que sus clientes realicen pagos ad-hoc o para pagos relacionados con un objeto Dolibarr en particular (factura, pedido, ...)
 StripeOrCBDoPayment=Pagar con tarjeta de crédito o Stripe
 FollowingUrlAreAvailableToMakePayments=Las siguientes URL están disponibles para permitir a un cliente efectuar un pago
 PaymentForm=Formulario de pago
diff --git a/htdocs/langs/es_ES/withdrawals.lang b/htdocs/langs/es_ES/withdrawals.lang
index 3b5af3b6977..5352e73d433 100644
--- a/htdocs/langs/es_ES/withdrawals.lang
+++ b/htdocs/langs/es_ES/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Orden de transferencia bancaria
 LatestBankTransferReceipts=Últimas %s órdenes de transferencia bancaria 
 LastWithdrawalReceipts=Últimas %s domiciliaciones
 WithdrawalsLine=Línea de  domiciliación bancaria
+CreditTransfer=Transferencia bancaria
 CreditTransferLine=Línea de transferencia bancaria
 WithdrawalsLines=Lineas de domiciliación
 CreditTransferLines=Líneas de transferencia bancaria
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Código banco del tercero
 NoInvoiceCouldBeWithdrawed=No se ha podido realizar la petición de domiciliación de ninguna factura. Compruebe que los terceros de las facturas relacionadas tienen una cuenta  IBAN válida y dicho IBAN tiene un RUM con modo <strong>%s</strong>.
 WithdrawalCantBeCreditedTwice=Este recibo de retiro ya está marcado como acreditado; esto no se puede hacer dos veces, ya que esto podría generar pagos y entradas bancarias duplicados.
 ClassCredited=Clasificar como "Abonada"
+ClassDebited=Clasificar debitado
 ClassCreditedConfirm=¿Está seguro de querer clasificar esta domiciliación como abonada en su cuenta bancaria?
 TransData=Fecha envío
 TransMetod=Método envío
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=No es posible crear una domiciliación sin importe
 SepaMandate=Mandato SEPA
 SepaMandateShort=Mandato SEPA
 PleaseReturnMandate=Devuelva este formulario de mandato por e-mail a %s o por correo a
-SEPALegalText=By signing this mandate form, you authorize (A) %s to send instructions to your bank to debit your account and (B) your bank to debit your account in accordance with the instructions from %s. As part of your rights, you are entitled to a refund from your bank under the terms and conditions of your agreement with your bank. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
+SEPALegalText=Al firmar este formulario de mandato, usted autoriza a (A) %s a enviar instrucciones a su banco para debitar su cuenta y (B) a su banco para debitar su cuenta de acuerdo con las instrucciones de %s. Como parte de sus derechos, tiene derecho a un reembolso de su banco según los términos y condiciones de su acuerdo con su banco. Sus derechos con respecto al mandato anterior se explican en una declaración que puede obtener de su banco.
 CreditorIdentifier=Identificador Acreedor
 CreditorName=Nombre acreedor
 SEPAFillForm=(B) Rellene todos los campos marcados c *
@@ -150,5 +152,5 @@ ModeWarning=No se ha establecido la opción de modo real, nos detendremos despu
 ErrorCompanyHasDuplicateDefaultBAN=La empresa con id %s tiene más de una cuenta bancaria predeterminada. No hay forma de saber cuál usar.
 ErrorICSmissing=Falta ICS en la cuenta bancaria %s
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=El monto total de la orden de domiciliación bancaria difiere de la suma de líneas
-WarningSomeDirectDebitOrdersAlreadyExists=Warning: There is already some pending Direct Debit orders (%s) requested for an amount of %s
-WarningSomeCreditTransferAlreadyExists=Warning: There is already some pending Credit Transfer (%s) requested for an amount of %s
+WarningSomeDirectDebitOrdersAlreadyExists=Advertencia: ya hay algunas órdenes de domiciliación bancaria pendientes (%s) solicitadas por un monto de %s
+WarningSomeCreditTransferAlreadyExists=Advertencia: ya hay una transferencia de crédito pendiente (%s) solicitada por un monto de %s
diff --git a/htdocs/langs/es_GT/admin.lang b/htdocs/langs/es_GT/admin.lang
index 2e81853353a..a5f92aef8da 100644
--- a/htdocs/langs/es_GT/admin.lang
+++ b/htdocs/langs/es_GT/admin.lang
@@ -1,3 +1,3 @@
 # Dolibarr language file - Source file is en_US - admin
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<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_HN/admin.lang b/htdocs/langs/es_HN/admin.lang
index 2e81853353a..a5f92aef8da 100644
--- a/htdocs/langs/es_HN/admin.lang
+++ b/htdocs/langs/es_HN/admin.lang
@@ -1,3 +1,3 @@
 # Dolibarr language file - Source file is en_US - admin
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<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_MX/admin.lang b/htdocs/langs/es_MX/admin.lang
index b272550ad8c..39054070ad4 100644
--- a/htdocs/langs/es_MX/admin.lang
+++ b/htdocs/langs/es_MX/admin.lang
@@ -272,8 +272,8 @@ AllPublishers=Todos los editores
 AddMenus=Añadir menús
 AddPermissions=Añadir permisos
 CodeLastResult=Último código de resultado
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<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>
 ShowProjectLabel=Etiqueta de proyecto
 TemplateAdded=Plantilla agregada
 MailToSendEventOrganization=Organización de Eventos
diff --git a/htdocs/langs/es_MX/companies.lang b/htdocs/langs/es_MX/companies.lang
index 44b8f4a3db8..fcde353f946 100644
--- a/htdocs/langs/es_MX/companies.lang
+++ b/htdocs/langs/es_MX/companies.lang
@@ -159,7 +159,6 @@ EditCompany=Editar empresa
 ThisUserIsNot=Este usuario no es un cliente potencial, cliente ni proveedor
 VATIntraCheckDesc=El numero de control de IVA intracomunitario debe incluir el prefijo del país. El enlace <b>%s</b> permite consultar al servicio de control de números de IVA intracomunitario (VIES). Se requiere acceso a Internet desde el servidor para que este servicio funcione.
 VATIntraCheckableOnEUSite=Verificar el numero de control de IVA intracomunitario en la web de la Comisión Europea
-VATIntraManualCheck=También puedes verificar manualmente desde el sitio web de la comision europea <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=No es posible realizar la verificación. El servicio de comprobación no es prestado por el país miembro (%s).
 NorProspectNorCustomer=No es cliente potencial, ni cliente
 OthersNotLinkedToThirdParty=Otros, no vinculado a un tercero
diff --git a/htdocs/langs/es_PA/admin.lang b/htdocs/langs/es_PA/admin.lang
index fcddb737ab5..c35da4b698e 100644
--- a/htdocs/langs/es_PA/admin.lang
+++ b/htdocs/langs/es_PA/admin.lang
@@ -1,4 +1,4 @@
 # Dolibarr language file - Source file is en_US - admin
 VersionUnknown=Desconocido
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<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_PE/admin.lang b/htdocs/langs/es_PE/admin.lang
index 62e700b8e5c..4e531b95475 100644
--- a/htdocs/langs/es_PE/admin.lang
+++ b/htdocs/langs/es_PE/admin.lang
@@ -9,5 +9,5 @@ DictionaryVAT=Tasa de IGV o tasa de impuesto a las ventas
 UnitPriceOfProduct=Precio unitario sin IGV de un producto
 OptionVatMode=IGV adeudado
 MailToSendInvoice=Facturas de Clientes
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<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_PE/projects.lang b/htdocs/langs/es_PE/projects.lang
index 16f080acf7c..b4ee4dfb193 100644
--- a/htdocs/langs/es_PE/projects.lang
+++ b/htdocs/langs/es_PE/projects.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - projects
 OppStatusPROPO=Cotización
+NewInter=Nueva intervención
diff --git a/htdocs/langs/es_PY/admin.lang b/htdocs/langs/es_PY/admin.lang
index 2e81853353a..a5f92aef8da 100644
--- a/htdocs/langs/es_PY/admin.lang
+++ b/htdocs/langs/es_PY/admin.lang
@@ -1,3 +1,3 @@
 # Dolibarr language file - Source file is en_US - admin
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<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_US/admin.lang b/htdocs/langs/es_US/admin.lang
index 2e81853353a..a5f92aef8da 100644
--- a/htdocs/langs/es_US/admin.lang
+++ b/htdocs/langs/es_US/admin.lang
@@ -1,3 +1,3 @@
 # Dolibarr language file - Source file is en_US - admin
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<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_UY/admin.lang b/htdocs/langs/es_UY/admin.lang
index 2e81853353a..a5f92aef8da 100644
--- a/htdocs/langs/es_UY/admin.lang
+++ b/htdocs/langs/es_UY/admin.lang
@@ -1,3 +1,3 @@
 # Dolibarr language file - Source file is en_US - admin
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<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_VE/admin.lang b/htdocs/langs/es_VE/admin.lang
index 1d7fb2f3108..15c0b2ab924 100644
--- a/htdocs/langs/es_VE/admin.lang
+++ b/htdocs/langs/es_VE/admin.lang
@@ -30,5 +30,5 @@ WatermarkOnDraftSupplierProposal=Marca de agua en solicitudes de precios a prove
 LDAPMemberObjectClassListExample=Lista de ObjectClass que definen los atributos de un registro (ej: top,inetOrgPerson o top,user for active directory)
 LDAPUserObjectClassListExample=Lista de ObjectClass que definen los atributos de un registro (ej: top,inetOrgPerson o top,user for active directory)
 LDAPContactObjectClassListExample=Lista de objectClass que definen los atributos de un registro (ej: top,inetOrgPerson o top,user for active directory)
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<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/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang
index 330443b1647..5196dff18a8 100644
--- a/htdocs/langs/et_EE/admin.lang
+++ b/htdocs/langs/et_EE/admin.lang
@@ -756,7 +756,7 @@ Permission106=Saatmiste ekspor
 Permission109=Saatmiste kustutamine
 Permission111=Finantskontode vaatamine
 Permission112=Tehingute loomine/muutmine/kustutamine ja võrdlemine
-Permission113=Setup financial accounts (create, manage categories)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Tehingute ja kontosaldode ekspor
 Permission116=Kontode vahelised kanded
@@ -893,12 +893,11 @@ Permission701=Annetuste vaatamine
 Permission702=Annetuste loomine/muutmine
 Permission703=Annetuste kustutamine
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Laojääkide vaatamine
@@ -962,15 +961,11 @@ Permission2801=FTP kliendi kasutamine lugemisrežiimis (ainult sirvimine ja alla
 Permission2802=FTP kliendi kasutamine kirjutusrežiimis (failide kustutamine või üles laadimine)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
@@ -981,9 +976,9 @@ Permission10005=Delete website content
 Permission20001=Read leave requests (your leave and those of your subordinates)
 Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Approve leave requests
 Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
-RecordEvent=Record email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
@@ -2084,7 +2080,7 @@ CreateCandidature=Create job application
 FormatZip=Postiindeks
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -2130,7 +2126,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+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>
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Missing translation for %s
 NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/et_EE/companies.lang b/htdocs/langs/et_EE/companies.lang
index 51c997378d0..88ea94b3e63 100644
--- a/htdocs/langs/et_EE/companies.lang
+++ b/htdocs/langs/et_EE/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Kontrolli
 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.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commission website
-VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Kontrollida pole võimalik. Kontrolli, et liikmesriik (%s) võimaldab teenust kasutada.
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Business entity type
diff --git a/htdocs/langs/et_EE/errors.lang b/htdocs/langs/et_EE/errors.lang
index 092d566aaa4..dea1995b047 100644
--- a/htdocs/langs/et_EE/errors.lang
+++ b/htdocs/langs/et_EE/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
 ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
 ErrorIsNotADraft=%s is not a draft
 ErrorExecIdFailed=Can't execute command "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # 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/et_EE/main.lang b/htdocs/langs/et_EE/main.lang
index fefda2ba50e..2f646ccbe3d 100644
--- a/htdocs/langs/et_EE/main.lang
+++ b/htdocs/langs/et_EE/main.lang
@@ -212,6 +212,8 @@ User=Kasutaja
 Users=Kasutajad
 Group=Rühm
 Groups=Rühmad
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=Ühtki kasutajate gruppi pole määratletud
 Password=Parool
 PasswordRetype=Korda parooli
diff --git a/htdocs/langs/et_EE/other.lang b/htdocs/langs/et_EE/other.lang
index 09a83ca99f2..aa6ec77f705 100644
--- a/htdocs/langs/et_EE/other.lang
+++ b/htdocs/langs/et_EE/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Password encoding
 PermissionsAdd=Permissions added
 PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
+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
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
 SMSSentTo=SMS sent to %s
diff --git a/htdocs/langs/et_EE/projects.lang b/htdocs/langs/et_EE/projects.lang
index 150bb1048c2..4b3def37e57 100644
--- a/htdocs/langs/et_EE/projects.lang
+++ b/htdocs/langs/et_EE/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
 ProjectTasksWithoutTimeSpent=Project tasks without time spent
 FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+StartDateCannotBeAfterEndDate=Lõppkuupäev ei saa olla alguskuupäevast varasem
diff --git a/htdocs/langs/et_EE/withdrawals.lang b/htdocs/langs/et_EE/withdrawals.lang
index b9bc7cdd0e3..d45f81ddee9 100644
--- a/htdocs/langs/et_EE/withdrawals.lang
+++ b/htdocs/langs/et_EE/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
 WithdrawalsLine=Direct debit order line
+CreditTransfer=Credit transfer
 CreditTransferLine=Credit transfer line
 WithdrawalsLines=Direct debit order lines
 CreditTransferLines=Credit transfer lines
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=Määra krediteerituks
+ClassDebited=Classify debited
 ClassCreditedConfirm=Kas oled kindel, et soovid selle väljamakse kviitungi liigitada pangakontole krediteerituks?
 TransData=Saatmise kuupäev
 TransMetod=Saatmise meetod
diff --git a/htdocs/langs/eu_ES/admin.lang b/htdocs/langs/eu_ES/admin.lang
index d65b740ccfa..041c50fe865 100644
--- a/htdocs/langs/eu_ES/admin.lang
+++ b/htdocs/langs/eu_ES/admin.lang
@@ -756,7 +756,7 @@ Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
 Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Export transactions and account statements
 Permission116=Transfers between accounts
@@ -893,12 +893,11 @@ Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Read stocks
@@ -962,15 +961,11 @@ Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
@@ -981,9 +976,9 @@ Permission10005=Delete website content
 Permission20001=Read leave requests (your leave and those of your subordinates)
 Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Approve leave requests
 Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
-RecordEvent=Record email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
@@ -2084,7 +2080,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -2130,7 +2126,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+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>
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Missing translation for %s
 NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/eu_ES/companies.lang b/htdocs/langs/eu_ES/companies.lang
index 160e2e65059..8bfbe52c104 100644
--- a/htdocs/langs/eu_ES/companies.lang
+++ b/htdocs/langs/eu_ES/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Check
 VATIntraCheckDesc=The VAT ID must include the country prefix. The link <b>%s</b> uses the European VAT checker service (VIES) which requires internet access from the Dolibarr server.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commission website
-VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Business entity type
diff --git a/htdocs/langs/eu_ES/errors.lang b/htdocs/langs/eu_ES/errors.lang
index 7bb0fac3f7b..eabc784e6aa 100644
--- a/htdocs/langs/eu_ES/errors.lang
+++ b/htdocs/langs/eu_ES/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
 ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
 ErrorIsNotADraft=%s is not a draft
 ErrorExecIdFailed=Can't execute command "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # 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/eu_ES/main.lang b/htdocs/langs/eu_ES/main.lang
index 00f7f72efb6..939f02c4873 100644
--- a/htdocs/langs/eu_ES/main.lang
+++ b/htdocs/langs/eu_ES/main.lang
@@ -212,6 +212,8 @@ User=Erabiltzailea
 Users=Erabiltzaileak
 Group=Taldea
 Groups=Taldeak
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=No user group defined
 Password=Pasahitza
 PasswordRetype=Retype your password
diff --git a/htdocs/langs/eu_ES/other.lang b/htdocs/langs/eu_ES/other.lang
index 13f1a831513..6875c9c829c 100644
--- a/htdocs/langs/eu_ES/other.lang
+++ b/htdocs/langs/eu_ES/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Password encoding
 PermissionsAdd=Permissions added
 PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
+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
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
 SMSSentTo=SMS sent to %s
diff --git a/htdocs/langs/eu_ES/projects.lang b/htdocs/langs/eu_ES/projects.lang
index 900f5b1acc0..a7affa4a766 100644
--- a/htdocs/langs/eu_ES/projects.lang
+++ b/htdocs/langs/eu_ES/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
 ProjectTasksWithoutTimeSpent=Project tasks without time spent
 FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+StartDateCannotBeAfterEndDate=End date cannot be before start date
diff --git a/htdocs/langs/eu_ES/withdrawals.lang b/htdocs/langs/eu_ES/withdrawals.lang
index f5a33b78eee..bda987276b1 100644
--- a/htdocs/langs/eu_ES/withdrawals.lang
+++ b/htdocs/langs/eu_ES/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
 WithdrawalsLine=Direct debit order line
+CreditTransfer=Credit transfer
 CreditTransferLine=Credit transfer line
 WithdrawalsLines=Direct debit order lines
 CreditTransferLines=Credit transfer lines
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=Classify credited
+ClassDebited=Classify debited
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
 TransMetod=Transmission method
diff --git a/htdocs/langs/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang
index fa58bb95557..85a3a9d1dbd 100644
--- a/htdocs/langs/fa_IR/admin.lang
+++ b/htdocs/langs/fa_IR/admin.lang
@@ -756,7 +756,7 @@ Permission106=صادرکردن ارسال‌ها
 Permission109=حذف ارسال‌ها
 Permission111=ملاحظۀ حساب‌های تجاری
 Permission112=ساخت/ویرایش/حذف و مقایسۀ تراکنش‌ها
-Permission113=برپاسازی حساب‌های تجاری (ساخت و ویرایش دسته‌ها)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=وفق‌دادن تراکنش
 Permission115=صادرکردن تراکنش‌ها و توضیحات حساب‌ها
 Permission116=انتقالات بین حساب‌ها
@@ -893,12 +893,11 @@ Permission701=ملاحظۀ کمک‌های‌مالی
 Permission702=ایجاد/ویرایش کمک‌های‌مالی
 Permission703=حذف کمک‌های‌مالی
 Permission771=ملاحظۀ گزارش‌های هزینه‌ها (مربوط به شما و افراد زیرنظرشما)
-Permission772=ساخت/ویرایش گزارش‌های هزینه
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=حذف گزارش‌های هزینه
-Permission774=ملاحظۀ همۀ گزارش‌های هزینه (حتی مربوط به کاربرانی که زیرنظر شما نیستند)
 Permission775=تائید گزارش‌های هزینه
 Permission776=پرداخت گزارش‌های هزینه
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=صادرکردن گزارش‌های هزینه
 Permission1001=ملاحظۀ موجودی
@@ -962,15 +961,11 @@ Permission2801=استفاده از متقاضی FTP در حالت خواندنی
 Permission2802=استفاده از متقاضی FTP در حالت نوشتنی (حذف یا ارسال فایل)
 Permission3200=خواندن روی‌دادهای بایگانی شده و اثرانگشت‌ها
 Permission3301=Generate new modules
-Permission4001=نمایش کارمندان
-Permission4002=ساخت کارمند
-Permission4003=حذف کارمند
-Permission4004=صادرکردن کارمندان
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
@@ -981,9 +976,9 @@ Permission10005=حذف محتوای وبگاه
 Permission20001=ملاحظۀ درخواست‌های مرخصی (درخواست‌های مرخصی افراد تحت مدیریت شما)
 Permission20002=ساخت/ویرایش درخواست‌های مرخصی شما (شما و افراد تحت نظر شما)
 Permission20003=حذف درخواست‌های مرخصی
-Permission20004=ملاحظۀ همۀ درخواست‌های مرخصی (حتی کاربری که تحت مدیریت شما نیست)
-Permission20005=ساخت/ویرایش درخواست مرخصی همگان (حتی کاربرانی که تحت مدیریت شما نیستند)
-Permission20006=درخواست‌های مرخصی مدیر (تنظیمات و به‌هنگام‌سازی تعادل)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Approve leave requests
 Permission23001=ملاحظۀ وظایف زمان‌بندی‌شده
 Permission23002=ساخت/ویرایش  وظایف زمان‌بندی‌شده
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=آیا می‌خواهید عملیات جمع‌آ
 NoNewEmailToProcess=رایانامۀ جدیدی (با توجه به گزینش‌ها و صافی‌ها) پیدا نشد که پردازش شود
 NothingProcessed=کاری انجام نشد
 XEmailsDoneYActionsDone=%s رایانامه دارای شرایط لازم بود، %s رایانامه با موفقیت پردازش شد ( برای %s مورد ثبت/کنش انجام شد)
-RecordEvent=ثبت رخداد رایانامه
-CreateLeadAndThirdParty=افزودن سرنخ (و شخص سوم در صورت ضرورت)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 CodeLastResult=آخرین کد نتیجه
 NbOfEmailsInInbox=تعداد رایانامه‌های موجود در پوشۀ منبع
 LoadThirdPartyFromName=بارگذاری جستجوی شخص‌سوم روی %s (فقط بارگذاری)
 LoadThirdPartyFromNameOrCreate=بارگذاری جستجوی شخص سوم روی %s (ساختن در صورت عدم یافتن)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
@@ -2084,7 +2080,7 @@ CreateCandidature=Create job application
 FormatZip=کدپستی
 MainMenuCode=کد ورودی فهرست (فهرست اصلی)
 ECMAutoTree=نمایش ساختاردرختی خودکار ECM
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=ساعات کار
 OpeningHoursDesc=ساعات کاری معمول شرکت خود را در این بخش وارد نمائید
 ResourceSetup=پیکربندی واحد منابع
@@ -2130,7 +2126,7 @@ LargerThan=بزرگتر از
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=با یک حساب GMail در صورتی که تائید 2 گامی را انتخاب کرده باشید، پیشنهاد می‌شود یک گذرواژۀ دوم برای استفادۀ برنامه به‌جای گذرواژۀ خودتان برای حساب بسازید. این کار از https://myaccount.google.com/ قابل انجام است.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+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>
 EndPointFor=نقطۀ آخر برای %s : %s
 DeleteEmailCollector=حذف جمع‌آورندۀ رایانامه
 ConfirmDeleteEmailCollector=آیا مطمئن هستید می‌خواهید این جمع‌آورندۀ رایانامه را حذف کنید؟
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Missing translation for %s
 NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/fa_IR/companies.lang b/htdocs/langs/fa_IR/companies.lang
index 5145f102cc5..c7200d15275 100644
--- a/htdocs/langs/fa_IR/companies.lang
+++ b/htdocs/langs/fa_IR/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=شناسۀ کاری 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=چک
 VATIntraCheckDesc=شناسۀ م‌.ب.ا.ا. باید با پیش‌وند کشور بیاید. پیوند <b>%s</b> از خدمات European VAT checker service (VIES) استفاده می‌کند که نیاز به اتصال اینترنتی از سرور Dolibarr دارد
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=بررسی شناسۀ م.ب.ا.ا. داخل جامعه‌ای روی وبگاه کمیسیون اروپا
-VATIntraManualCheck=همچنین می‌توانید به‌طور دستی روی وبگاه کمیسیون اروپا بررسی کنید <a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=بررسی مقدور نبود. خدمات بررسی برای کشور عضو (%s) ارائه نمی‌شود.
 NorProspectNorCustomer=مشتری‌احتمالی نیست/مشتری نیست
 JuridicalStatus=Business entity type
diff --git a/htdocs/langs/fa_IR/errors.lang b/htdocs/langs/fa_IR/errors.lang
index 8f52192aec6..1ae5475c14a 100644
--- a/htdocs/langs/fa_IR/errors.lang
+++ b/htdocs/langs/fa_IR/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
 ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
 ErrorIsNotADraft=%s is not a draft
 ErrorExecIdFailed=Can't execute command "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # 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/fa_IR/main.lang b/htdocs/langs/fa_IR/main.lang
index dcec91f5aa9..989faeb7c9f 100644
--- a/htdocs/langs/fa_IR/main.lang
+++ b/htdocs/langs/fa_IR/main.lang
@@ -212,6 +212,8 @@ User=کاربر
 Users=کاربر
 Group=گروه
 Groups=گروه
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=هیچ گروه‌کاربری تعریف نشده است
 Password=گذرواژه
 PasswordRetype=گذرواژۀ خود را وارد نمائید
diff --git a/htdocs/langs/fa_IR/other.lang b/htdocs/langs/fa_IR/other.lang
index 4ba4294fb3f..761c80e414e 100644
--- a/htdocs/langs/fa_IR/other.lang
+++ b/htdocs/langs/fa_IR/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Password encoding
 PermissionsAdd=Permissions added
 PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
+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
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
 SMSSentTo=SMS sent to %s
diff --git a/htdocs/langs/fa_IR/projects.lang b/htdocs/langs/fa_IR/projects.lang
index 8aa3cb26389..f69e3d36874 100644
--- a/htdocs/langs/fa_IR/projects.lang
+++ b/htdocs/langs/fa_IR/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
 ProjectTasksWithoutTimeSpent=Project tasks without time spent
 FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+StartDateCannotBeAfterEndDate=تاریخ پایان نمی‌تواند قبل از تاریخ شروع باشد
diff --git a/htdocs/langs/fa_IR/withdrawals.lang b/htdocs/langs/fa_IR/withdrawals.lang
index 32d142dd41a..0534914a826 100644
--- a/htdocs/langs/fa_IR/withdrawals.lang
+++ b/htdocs/langs/fa_IR/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=آخرین %s مستند دریافت مستقیم
 WithdrawalsLine=Direct debit order line
+CreditTransfer=Credit transfer
 CreditTransferLine=Credit transfer line
 WithdrawalsLines=Direct debit order lines
 CreditTransferLines=Credit transfer lines
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=طبقه بندی اعتبار
+ClassDebited=Classify debited
 ClassCreditedConfirm=آیا مطمئن هستید که می خواهید برای طبقه بندی این دریافت و برداشت به عنوان در حساب بانکی شما اعتبار؟
 TransData=تاریخ انتقال
 TransMetod=طريقة البث
diff --git a/htdocs/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang
index bef6fa83793..b0a93ad8154 100644
--- a/htdocs/langs/fi_FI/admin.lang
+++ b/htdocs/langs/fi_FI/admin.lang
@@ -756,7 +756,7 @@ Permission106=Export sendings
 Permission109=Poista sendings
 Permission111=Lue tilinpäätös
 Permission112=Luoda / muuttaa / poistaa ja vertailla liiketoimet
-Permission113=Setup financial accounts (create, manage categories)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Vientitoimien ja tiliotteita
 Permission116=Siirrot tilien välillä
@@ -893,12 +893,11 @@ Permission701=Lue lahjoitukset
 Permission702=Luoda / muuttaa lahjoitusten
 Permission703=Poista lahjoitukset
 Permission771=Lue kuluraportit
-Permission772=Luo/Muokkaa kuluraportteja
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Poista kuluraportit
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Hyväksy kuluraportit
 Permission776=Maksa kuluraportit
-Permission777=Lue kaikkien kuluraportit
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Luo / muokkaa kaikkien kuluraportteja
 Permission779=Kuluraporttien vienti
 Permission1001=Lue varastot
@@ -962,15 +961,11 @@ Permission2801=Käytä FTP ohjelmaa lukutilassa (vain selain ja lataukset)
 Permission2802=Käytä FTP ohjelmaa kirjoitustilassa (poista tai päivitä tiedostot)
 Permission3200=Read archived events and fingerprints
 Permission3301=Luo uusia moduuleja
-Permission4001=Selaa työntekijöitä
-Permission4002=Luo työntekijä
-Permission4003=Poista työntekijöitä
-Permission4004=Työntekijän tietojen vienti
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
@@ -981,9 +976,9 @@ Permission10005=Poista verkkosivuston sisältö
 Permission20001=Lue poissaolopyynnöt (omat ja alaisten poissaolot)
 Permission20002=Luo / muokkaa poissaolopyyntöjäsi (omat ja alaisten poissaolot)
 Permission20003=Poista poissaolopyynnöt
-Permission20004=Lue kaikki poissaolopyynnöt (myös käyttäjien, jotka eivät ole alaisiasi)
-Permission20005=Luo / muokkaa kaikkien poissaolopyyntöjä (myös käyttäjien, jotka eivät ole alaisiasi)
-Permission20006=Poissaolopyyntöjen hallinnointi (saldojen määritys ja päivitys)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Hyväksy poissaolopyynnöt
 Permission23001=Selaa ajastetut työt
 Permission23002=Luo/päivitä Ajastettu työ
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Haluatko suorittaa tämän keräilijän kokoelman n
 NoNewEmailToProcess=Ei uutta käsiteltävää sähköpostia (vastaavat suodattimet)
 NothingProcessed=Mitään ei tehty
 XEmailsDoneYActionsDone=%s -sähköpostia hyväksytty, %s sähköpostien käsittely onnistuneesti (%s-tietuetta / tehtävää suoritettu)
-RecordEvent=Tallenna sähköpostitapahtuma
-CreateLeadAndThirdParty=Luo liidi (ja tarvittaessa kolmas osapuoli)
-CreateTicketAndThirdParty=Luo tiketti (ja linkitä kolmanteen osapuoleen, jos se on ladattu edellisellä toiminnolla)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 CodeLastResult=Viimeisin tuloskoodi
 NbOfEmailsInInbox=Lähdehakemistossa olevien sähköpostien määrä
 LoadThirdPartyFromName=Lataa kolmannen osapuolen haku sivustolta %s (vain lataus)
 LoadThirdPartyFromNameOrCreate=Lataa kolmannen osapuolen haku sivustolta %s (luo, jos sitä ei löydy)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Viesti keskustelusta, jonka aloitti ensimmäinen sähköposti, lähetetty Dolibarrista
 WithoutDolTrackingID=Viesti keskustelusta, jonka aloitti ensimmäinen sähköposti, EI lähetetty Dolibarrista
 WithDolTrackingIDInMsgId=Viesti lähetetty Dolibarrista
@@ -2084,7 +2080,7 @@ CreateCandidature=Luo työhakemus
 FormatZip=Postinumero
 MainMenuCode=Valikkokoodi (päävalikko)
 ECMAutoTree=Näytä automaattinen ECM-puu
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Aukioloajat
 OpeningHoursDesc=Yrityksen tavalliset aukioloajat
 ResourceSetup=Resurssimoduulin määritys
@@ -2130,7 +2126,7 @@ LargerThan=Suurempi kuin
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=Jos otit käyttöön kaksivaiheisen vahvistuksen Gmail-tilillä, on suositeltavaa luoda erillinen toinen salasana sovellukselle sen sijaan, että käyttäisit omaa tilin salasanasi osoitteessa https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+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>
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Poista sähköpostin kerääjä
 ConfirmDeleteEmailCollector=Haluatko varmasti poistaa tämän sähköpostin kerääjän?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Missing translation for %s
 NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/fi_FI/companies.lang b/htdocs/langs/fi_FI/companies.lang
index c4d6712e5a0..63acef2de06 100644
--- a/htdocs/langs/fi_FI/companies.lang
+++ b/htdocs/langs/fi_FI/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Professori Id 1 (RUT)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Shekki
 VATIntraCheckDesc=ALV-tunnuksen täytyy sisältää maatunnus. Linkki <b>%s</b> käyttää European VAT checker service (VIES)  - palvelua ja tarvii internet-yhteyden Dolibarr-palvelimeen
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Tarkasta ALV-tunnus E.U: n sivuilta
-VATIntraManualCheck=Voit tehdä tarkastuksen myös käsin E.U: n sivuilla <a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Tarkistaminen ei mahdollista. Jäsenvaltio ei toimita tarkastuspalvelua ( %s).
 NorProspectNorCustomer=Ei mahdollinen asiakas eikä asiakas
 JuridicalStatus=Business entity type
diff --git a/htdocs/langs/fi_FI/errors.lang b/htdocs/langs/fi_FI/errors.lang
index 6a19d689729..9f36b253ddb 100644
--- a/htdocs/langs/fi_FI/errors.lang
+++ b/htdocs/langs/fi_FI/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
 ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
 ErrorIsNotADraft=%s is not a draft
 ErrorExecIdFailed=Can't execute command "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # 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/fi_FI/main.lang b/htdocs/langs/fi_FI/main.lang
index 9668b57d684..8e4a8be635c 100644
--- a/htdocs/langs/fi_FI/main.lang
+++ b/htdocs/langs/fi_FI/main.lang
@@ -212,6 +212,8 @@ User=Käyttäjä
 Users=Käyttäjät
 Group=Ryhmä
 Groups=Ryhmät
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=Käyttäjäryhmää ei ole määritelty
 Password=Salasana
 PasswordRetype=Kirjoitta salasana uudelleen
diff --git a/htdocs/langs/fi_FI/other.lang b/htdocs/langs/fi_FI/other.lang
index 68c84d40182..0e9a031b071 100644
--- a/htdocs/langs/fi_FI/other.lang
+++ b/htdocs/langs/fi_FI/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Password encoding
 PermissionsAdd=Permissions added
 PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
+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
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
 SMSSentTo=SMS sent to %s
diff --git a/htdocs/langs/fi_FI/projects.lang b/htdocs/langs/fi_FI/projects.lang
index ba6bfc4d1f3..686b8058b09 100644
--- a/htdocs/langs/fi_FI/projects.lang
+++ b/htdocs/langs/fi_FI/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
 ProjectTasksWithoutTimeSpent=Project tasks without time spent
 FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+StartDateCannotBeAfterEndDate=End date cannot be before start date
diff --git a/htdocs/langs/fi_FI/withdrawals.lang b/htdocs/langs/fi_FI/withdrawals.lang
index 13b94a2e692..44a397de7ff 100644
--- a/htdocs/langs/fi_FI/withdrawals.lang
+++ b/htdocs/langs/fi_FI/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
 WithdrawalsLine=Direct debit order line
+CreditTransfer=Credit transfer
 CreditTransferLine=Credit transfer line
 WithdrawalsLines=Direct debit order lines
 CreditTransferLines=Credit transfer lines
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=Luokittele hyvitetyksi
+ClassDebited=Classify debited
 ClassCreditedConfirm=Oletko varma, että haluat luokitella tämän vetäytymisen vastaanottamisesta kuin hyvitetty pankkitilisi?
 TransData=Päivämäärä Lähetetty
 TransMetod=Menetelmä Lähetetty
diff --git a/htdocs/langs/fr_BE/admin.lang b/htdocs/langs/fr_BE/admin.lang
index 928c23bfcf1..f3453c451c1 100644
--- a/htdocs/langs/fr_BE/admin.lang
+++ b/htdocs/langs/fr_BE/admin.lang
@@ -17,6 +17,4 @@ IfModuleEnabled=Note: oui ne fonctionne que si le module <b>%s</b> est activé
 Module20Name=Propales
 Module30Name=Factures
 Target=Objectif
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
 Recommended=Recommandée
diff --git a/htdocs/langs/fr_CA/admin.lang b/htdocs/langs/fr_CA/admin.lang
index 5d114baa879..0b561530754 100644
--- a/htdocs/langs/fr_CA/admin.lang
+++ b/htdocs/langs/fr_CA/admin.lang
@@ -111,7 +111,6 @@ Permission171=Lire les déplacements et les dépenses (le vôtre et vos subordon
 Permission771=Lire les rapports de dépenses (le vôtre et vos subordonnés )
 Permission1322=Réouvrir une facture payée
 Permission2414=Exportation d'actions/tâches des autres
-Permission20006=Administration des demandes de congé (balance de configuration et de mise à jour )
 Permission23004=Exécuté Travail planifié
 Permission59001=Consulter les propositions commerciales
 Permission63002=Créer / modifier des ressources
@@ -239,6 +238,4 @@ LandingPage=Page d'atterrissage
 ModuleEnabledAdminMustCheckRights=Le module a été activé. Les autorisations pour les modules activés ont été données uniquement aux utilisateurs administratifs. Vous devrez peut-être accorder des autorisations aux autres utilisateurs ou groupes manuellement si nécessaire.
 BaseCurrency=Monnaie de référence de la société (entrer dans la configuration de l'entreprise pour modifier cela)
 FormatZip=Code postal
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 UseSearchToSelectResource=Utilisez un formulaire de recherche pour choisir une ressource (plutôt qu'une liste déroulante).
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
diff --git a/htdocs/langs/fr_CA/projects.lang b/htdocs/langs/fr_CA/projects.lang
index 2dcbd564066..da20c99be8e 100644
--- a/htdocs/langs/fr_CA/projects.lang
+++ b/htdocs/langs/fr_CA/projects.lang
@@ -101,4 +101,5 @@ IdTaskTime=Id temps de tâche
 OpenedProjectsByThirdparties=Projets ouverts par des tiers
 OppStatusPENDING=Créance
 OppStatusWON=A gagné
+TimeSpentForIntervention=Temps passé
 TimeSpentForInvoice=Temps passé
diff --git a/htdocs/langs/fr_CH/admin.lang b/htdocs/langs/fr_CH/admin.lang
index ae7c4506baf..e03092c0b34 100644
--- a/htdocs/langs/fr_CH/admin.lang
+++ b/htdocs/langs/fr_CH/admin.lang
@@ -3,5 +3,3 @@ Module310Name=Membres
 LDAPMembersSynchro=Membres
 LDAPMembersTypesSynchro=Types de membres
 MailToMember=Membres
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
diff --git a/htdocs/langs/fr_CI/admin.lang b/htdocs/langs/fr_CI/admin.lang
deleted file mode 100644
index 2e81853353a..00000000000
--- a/htdocs/langs/fr_CI/admin.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - admin
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
diff --git a/htdocs/langs/fr_CM/admin.lang b/htdocs/langs/fr_CM/admin.lang
deleted file mode 100644
index 2e81853353a..00000000000
--- a/htdocs/langs/fr_CM/admin.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - admin
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 708e378fc9c..97ce4ebca73 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -756,7 +756,7 @@ Permission106=Exporter les expéditions
 Permission109=Supprimer les expéditions
 Permission111=Consulter les comptes financiers (comptes bancaires, caisses)
 Permission112=Créer/modifier montant/supprimer écritures bancaires
-Permission113=Configurer les comptes financiers (créer, gérer les catégories)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Rapprocher les transactions
 Permission115=Exporter transactions et relevés
 Permission116=Saisir virements entre comptes
@@ -893,12 +893,11 @@ Permission701=Consulter les dons
 Permission702=Créer/modifier les dons
 Permission703=Supprimer les dons
 Permission771=Lire les notes de frais (les vôtres et celle de vos subordonnés)
-Permission772=Créer/modifier les notes de frais
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Supprimer les notes de frais
-Permission774=Lire toutes les notes de frais (même pour les utilisateurs en dehors de ma hierarchie)
 Permission775=Approuver les notes de frais
 Permission776=Payer les notes de frais
-Permission777=Lire les notes de frais de tout le monde
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Créer / modifier les notes de frais de tout le monde
 Permission779=Exporter les notes de frais
 Permission1001=Consulter les stocks
@@ -962,15 +961,11 @@ Permission2801=Utiliser un client FTP en mode lecture (parcours et téléchargem
 Permission2802=Utiliser un client FTP en mode écriture (suppression et envoi de fichiers)
 Permission3200=Lire les événements archivés et leurs empreintes
 Permission3301=Générer de nouveaux modules
-Permission4001=Voir les employés
-Permission4002=Créer/modifier les employés
-Permission4003=Supprimer les employés
-Permission4004=Exporter les employés
-Permission4010=Lire compétence/emploi/poste
-Permission4011=Créer/modifier une compétence/un emploi/un poste
-Permission4012=Supprimer compétence/emploi/poste
-Permission4020=Lire l'évaluation
-Permission4021=Créer/modifier une évaluation
+Permission4001=Lire compétence/emploi/poste
+Permission4002=Créer/modifier une compétence/un emploi/un poste
+Permission4003=Supprimer compétence/emploi/poste
+Permission4020=Lire les évaluations
+Permission4021=Create/modify your evaluation
 Permission4022=Valider l'évaluation
 Permission4023=Supprimer l'évaluation
 Permission4030=Voir menu de comparaison
@@ -981,9 +976,9 @@ Permission10005=Supprimer du contenu de site web
 Permission20001=Lire les demandes de congé (les vôtres et celle de vos subordonnés)
 Permission20002=Créer/modifier vos demandes de congé (les vôtres et celle de vos subordonnés)
 Permission20003=Supprimer les demandes de congé
-Permission20004=Lire toutes les demandes de congé (même celle des utilisateurs non subordonnés)
-Permission20005=Créer/modifier des demandes de congé pour tout le monde (même des utilisateur non subordonnés)
-Permission20006=Administration des demandes de congés (configuration et mise à jour du solde)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Approuver les demandes de congés
 Permission23001=Voir les travaux planifiés
 Permission23002=Créer/Modifier des travaux planifiées
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Voulez-vous exécuter la collecte pour ce collecteu
 NoNewEmailToProcess=Aucun nouvel email (correspondants aux filtres) à traiter
 NothingProcessed=Aucune action faite
 XEmailsDoneYActionsDone=%s e-mails qualifiés, %s e-mails traités avec succès (pour %s enregistrements/actions réalisés)
-RecordEvent=Enregistrer événement email entrant
-CreateLeadAndThirdParty=Créer opportunité (et tiers si nécessaire)
-CreateTicketAndThirdParty=Créer un ticket (avec un lien vers un tiers s'il a été chargé par une opération précédente)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 CodeLastResult=Dernier code de retour
 NbOfEmailsInInbox=Nombre de courriels dans le répertoire source
 LoadThirdPartyFromName=Charger le Tiers en cherchant sur %s (chargement uniquement)
 LoadThirdPartyFromNameOrCreate=Charger le Tiers en cherchant sur %s (créer si non trouvé)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Message d'une conversation initiée par un premier mail envoyé depuis Dolibarr
 WithoutDolTrackingID=Message d'une conversation initiée par un premier e-mail NON envoyé depuis Dolibarr
 WithDolTrackingIDInMsgId=Message envoyé depuis Dolibarr
@@ -2084,7 +2080,7 @@ CreateCandidature=Créer une candidature
 FormatZip=Zip
 MainMenuCode=Code d'entrée du menu (mainmenu)
 ECMAutoTree=Afficher l'arborescence GED automatique
-OperationParamDesc=Définissez les valeurs à utiliser pour l'action, ou comment extraire les valeurs. Par exemple: <br> objproperty1=SET:abc <br> objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<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> Utilisez un caractère ; comme séparateur pour extraire ou définir plusieurs propriétés.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Heures d'ouverture
 OpeningHoursDesc=Entrez ici les heures d'ouverture régulières de votre entreprise.
 ResourceSetup=Configuration du module Ressource
@@ -2130,7 +2126,7 @@ LargerThan=Plus grand que
 IfTrackingIDFoundEventWillBeLinked=Notez que si un ID de suivi d'un objet est trouvé dans le courrier électronique, ou si l'email est une réponse d'un email déjà collecté et lié à un objet, l'événement sera aussi automatiquement lié à l'objet en question.
 WithGMailYouCanCreateADedicatedPassword=Avec un compte GMail, si vous avez activé la validation en 2 étapes, il est recommandé de créer un deuxième mot de passe dédié à l'application, au lieu d'utiliser votre propre mot de passe de compte, à partir de https://myaccount.google.com/.
 EmailCollectorTargetDir=Il peut être souhaitable de déplacer l'e-mail dans un autre tag/répertoire lorsqu'il a été traité avec succès. Définissez simplement une valeur ici pour utiliser cette fonction (N'utilisez PAS de caractères spéciaux dans le nom). Notez que vous devez également utiliser un compte de connexion en lecture/écriture.
-EmailCollectorLoadThirdPartyHelp=Vous pouvez utiliser cette action pour utiliser le contenu de l'e-mail pour rechercher et charger un tiers existant dans votre base de données. Le tiers trouvé (ou créé) sera utilisé pour les actions suivantes qui en ont besoin. <br> Par exemple, si vous souhaitez créer un tiers avec un nom extrait une chaîne 'Nom : nom à trouver' trouvée dans le corps, utilisez l'e-mail de l'expéditeur comme e-mail, vous pouvez définir le champ de paramètre comme ceci : <br> 'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'
+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>
 EndPointFor=Endpoint pour %s: %s
 DeleteEmailCollector=Supprimer le collecteur d'email
 ConfirmDeleteEmailCollector=Êtes-vous sûr de vouloir supprimer ce collecteur d'email ?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Traduction manquante pour %s
 NativeModules=Modules natifs
 NoDeployedModulesFoundWithThisSearchCriteria=Aucun module trouvé pour ces critères de recherche
 API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang
index c30cc60f6d9..f2d25c00507 100644
--- a/htdocs/langs/fr_FR/companies.lang
+++ b/htdocs/langs/fr_FR/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
index d748254892a..ddf7c67ec65 100644
--- a/htdocs/langs/fr_FR/errors.lang
+++ b/htdocs/langs/fr_FR/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=Le nom du fichier ne peut pas contenir __SOMETHING__
 ErrorNotInDictionaryPaymentConditions=Pas dans le dictionnaire des conditions de paiement, veuillez modifier.
 ErrorIsNotADraft=%s n'est pas au statut brouillon
 ErrorExecIdFailed=Impossible d'exécuter la commande "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # 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.
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index 616d65187ae..293d4f9de97 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -212,6 +212,8 @@ User=Utilisateur
 Users=Utilisateurs
 Group=Groupe
 Groups=Groupes
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=Pas de groupe utilisateur défini
 Password=Mot de passe
 PasswordRetype=Retaper le mot de passe
diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang
index c53e6c7ffec..9596adae411 100644
--- a/htdocs/langs/fr_FR/other.lang
+++ b/htdocs/langs/fr_FR/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Codage du mot de passe
 PermissionsAdd=Permissions ajoutés
 PermissionsDelete=Permissions retirées
 YourPasswordMustHaveAtLeastXChars=Votre mot de passe doit avoir au moins <strong> %s </strong> caractères
+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
 YourPasswordHasBeenReset=Votre mot de passe a été réinitialisé avec succès
 ApplicantIpAddress=Adresse IP du demandeur
 SMSSentTo=SMS envoyé à %s
diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang
index b158ed28334..1b3c6ec7662 100644
--- a/htdocs/langs/fr_FR/projects.lang
+++ b/htdocs/langs/fr_FR/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Remarque : les projets existant
 SelectLinesOfTimeSpentToInvoice=Sélectionnez les lignes de temps passé non facturées, puis l'action groupée "Générer la facture" pour les facturer
 ProjectTasksWithoutTimeSpent=Tâches de projet sans temps consommé
 FormForNewLeadDesc=Veuillez remplir ce formulaire de contact ou écrivez un e-mail à <b>%s</b>.
+StartDateCannotBeAfterEndDate=La date de fin ne peux être avant la date de début
diff --git a/htdocs/langs/fr_FR/withdrawals.lang b/htdocs/langs/fr_FR/withdrawals.lang
index ac0c9540f9f..d66b9f47032 100644
--- a/htdocs/langs/fr_FR/withdrawals.lang
+++ b/htdocs/langs/fr_FR/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Ordre de virement
 LatestBankTransferReceipts=Les %s derniers ordres de virement bancaire
 LastWithdrawalReceipts=Les %s derniers bons de prélèvements
 WithdrawalsLine=Ligne d'ordre de prélèvement automatique
+CreditTransfer=Virement bancaire
 CreditTransferLine=Ligne de virement
 WithdrawalsLines=Lignes de prélèvements
 CreditTransferLines=Lignes de virement
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Code banque du tiers
 NoInvoiceCouldBeWithdrawed=Aucune facture traitée avec succès. Vérifiez que les factures sont sur les sociétés avec un BAN par défaut valide et que le BAN a un RUM avec le mode <strong> %s </strong>.
 WithdrawalCantBeCreditedTwice=Le virement est déjà marqué comme étant crédité ; cela ne peut pas être fait deux fois, cela créerait potentiellement des paiements et des saisies bancaires en double.
 ClassCredited=Classer crédité
+ClassDebited=Classify debited
 ClassCreditedConfirm=Êtes-vous sûr de vouloir classer ce bon de prélèvement comme crédité sur votre compte bancaire ?
 TransData=Date de transmission
 TransMetod=Méthode de transmission
diff --git a/htdocs/langs/fr_GA/admin.lang b/htdocs/langs/fr_GA/admin.lang
index 71b13472db4..c090f334335 100644
--- a/htdocs/langs/fr_GA/admin.lang
+++ b/htdocs/langs/fr_GA/admin.lang
@@ -1,5 +1,3 @@
 # Dolibarr language file - Source file is en_US - admin
 Module20Name=Devis
 Module30Name=Factures
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
diff --git a/htdocs/langs/gl_ES/accountancy.lang b/htdocs/langs/gl_ES/accountancy.lang
index 8b0757db905..c17fbb999c3 100644
--- a/htdocs/langs/gl_ES/accountancy.lang
+++ b/htdocs/langs/gl_ES/accountancy.lang
@@ -246,10 +246,10 @@ DescThirdPartyReport=Consulte aquí o listaxe de clientes e provedores e os seus
 ListAccounts=Listaxe de contas contables
 UnknownAccountForThirdparty=Conta contable de terceiro descoñecida, usaremos %s
 UnknownAccountForThirdpartyBlocking=Conta contable de terceiro descoñecida. Erro de bloqueo.
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Conta contable non definida ou descoñecido por terceiros ou usuarios. Vai se usada %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Conta contable non definida ou  terceiros ou usuarios descoñecidos. Vai ser usada %s
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Terceiro descoñecido e conta vinculada non definidos no pago. Manteremos o valor da conta ligada baleiro.
-ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking= Conta contable non definida ou descoñecido por terceiros ou usuarios. Erro de bloqueo
-UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Conta de terceiros descoñecida e conta de espera non definida. Erro de bloqueo
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Conta contable non definida ou terceiros ou usuarios descoñecidos. Erro de bloqueo
+UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Conta de terceiros descoñecida e conta en espera non definida. Erro de bloqueo
 PaymentsNotLinkedToProduct=Pagos non ligados a un produto/servizo
 OpeningBalance=Saldo de apertura
 ShowOpeningBalance=Amosar saldo de apertura
@@ -339,7 +339,7 @@ Modelcsv_normal=Exportación clásica
 Modelcsv_CEGID=Exportar cara a CEGID Expert Comptabilité
 Modelcsv_COALA=Exportar cara a Sage Celoala
 Modelcsv_bob50=Exportar cara a Sage BOB 50
-Modelcsv_ciel=Exportar para Sage50, Ciel Compta ou Compta Evo. (Formato XIMPORT)
+Modelcsv_ciel=Exportar cara a Sage50, Ciel Compta ou Compta Evo. (Formato XIMPORT)
 Modelcsv_quadratus=Exportar cara a Quadratus QuadraCompta
 Modelcsv_ebp=Exportar a EBP
 Modelcsv_cogilog=Exportar a Cogilog
@@ -351,7 +351,7 @@ Modelcsv_configurable=Exportación CSV Configurable
 Modelcsv_FEC=Exportación FEC (Art. L47 A)
 Modelcsv_FEC2=Exportar FEC (con escritura de xeración de datas / documento inverso)
 Modelcsv_Sage50_Swiss=Exportación a Sage 50 Suiza
-Modelcsv_winfic=Exportar para Winfic - eWinfic - WinSis Compta 
+Modelcsv_winfic=Exportar cara a Winfic - eWinfic - WinSis Compta 
 Modelcsv_Gestinumv3=Exportar a Gestinum (v3)
 Modelcsv_Gestinumv5=Exportar para Gestinum (v5) 
 Modelcsv_charlemagne=Exportar para Aplim Charlemagne
diff --git a/htdocs/langs/gl_ES/admin.lang b/htdocs/langs/gl_ES/admin.lang
index 8250bf2e849..de5ae10ff4d 100644
--- a/htdocs/langs/gl_ES/admin.lang
+++ b/htdocs/langs/gl_ES/admin.lang
@@ -378,7 +378,7 @@ UMask=Parámetro UMask de novos ficheiros en Unix/Linux/BSD.
 UMaskExplanation=Este parámetro determina os dereitos dos ficheiros creados no servidor Dolibarr (durante a subida, por exemplo).<br>Este debe ser o valor octal (por exemplo, 0666 significa leitura / escritura para todos).<br>Este parámetro non ten ningún efecto sobre un servidor Windows.
 SeeWikiForAllTeam=Vexa o wiki para mais detalles de todos os actores e da súa organización
 UseACacheDelay= Demora en caché da exportación en segundos (0 o vacio sen caché)
-DisableLinkToHelpCenter=Agocha a ligazón "<b>Necesito axuda ou soporte</b>" na páxina de inicio de sesión 
+DisableLinkToHelpCenter=Agocha a ligazón "<b>Precisa axuda ou soporte</b>" na páxina de inicio de sesión 
 DisableLinkToHelp=Agocha a ligazón de axuda en liña "<b>%s</b>
 AddCRIfTooLong=Non hai liñas de corte automático, de tal xeito que se o texto é longo demais non será amosado nos documentos. Prégase que engada un salto de liña na área de texto se fora preciso
 ConfirmPurge=¿Está certo de querer realizar esta purga?<br>Isto borrará definitivamente todos os datos dos seus ficheiros (área GED, ficheiros axuntados...).
@@ -637,7 +637,7 @@ Module1780Name=Etiquetas/Categorías
 Module1780Desc=Crear etiquetas/categoría (produtos, clientes, provedores, contactos ou membros)
 Module2000Name=Editor WYSIWYG
 Module2000Desc=Permite edictar/formatar campos de texto usando CKEditor (html)
-Module2200Name=Precios dinámicos
+Module2200Name=Prezos dinámicos
 Module2200Desc=Activar o uso de expresións matemáticas para auto xerar prezos
 Module2300Name=Tarefas programadas
 Module2300Desc=Xestión do traballo programado (alias cron ou chrono taboa)
@@ -756,7 +756,7 @@ Permission106=Exportar expedicións
 Permission109=Eliminar expedicións
 Permission111=Consultar contas financieras
 Permission112=Crear/modificar/eliminar e comparar movementos bancarios
-Permission113=Configurar contas financieras (crear, xestionar categorías)
+Permission113=Configurar contas financeiras (crear, xestionar categorías de transaccións bancarias)
 Permission114=Reconciliar transaccións
 Permission115=Exportar transaccións e extractos de conta
 Permission116=Transferencias entre contas
@@ -864,7 +864,7 @@ Permission430=Usa barra de debug
 Permission511=Ler salarios e pagamentos (os seus e subordinados) 
 Permission512=Crear/modificar salarios e pagamentos 
 Permission514=Eliminar salarios e pagamentos
-Permission517=Ler  salarios e pagamentos de todos
+Permission517=Ler salarios e pagamentos de todos
 Permission519=Exportar salarios
 Permission520=Consultar Créditos
 Permission522=Crear/modificar Créditos
@@ -893,12 +893,11 @@ Permission701=Consultar doacións/subvencións
 Permission702=Crear/modificar doacións/subvencións
 Permission703=Eliminar doacións/subvencións
 Permission771=Consultar informes de gastos (seus e subordinados)
-Permission772=Crear/modificar informe de gastos
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Eliminar informe de gastos
-Permission774=Consultar todos os informes de gastos (incluidos os non subordinados)
 Permission775=Aprobar informe de gastos
 Permission776=Pagar informe de gastos
-Permission777=Ler informes de gastos de todos
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Crear/modificar informes de gastos de todos
 Permission779=Exportar informe de gastos
 Permission1001=Consultar stocks
@@ -962,15 +961,11 @@ Permission2801=Utilizar o cliente FTP en modo leitura (só explorar e descargar)
 Permission2802=Utilizar o cliente FTP en modo escritura (borrar ou subir ficheiros)
 Permission3200=Consultar eventos arquivados e huellas dixitais
 Permission3301=Xerar novos módulos
-Permission4001=Ver empregados
-Permission4002=Crear empregados
-Permission4003=Eliminar empregados
-Permission4004=Exportar empregados
-Permission4010=Ler competencia/traballo/posto
-Permission4011=Crear/modificar competencia/traballo/posto
-Permission4012=Eliminar competencia/traballo/posto
-Permission4020=Ler avaliación
-Permission4021=Crear/modificar avaliación
+Permission4001=Ler competencia/traballo/posto
+Permission4002=Crear/modificar competencia/traballo/posto
+Permission4003=Eliminar competencia/traballo/posto
+Permission4020=Ler avaliacións 
+Permission4021=Create/modify your evaluation
 Permission4022=Validar avaliación
 Permission4023=Eliminar avaliación
 Permission4030=Ver menú comparativo 
@@ -981,9 +976,9 @@ Permission10005=Eliminar contido do sitio web
 Permission20001=Consultar peticións días líbres (seus e subordinados)
 Permission20002=Crear/modificar peticións días libres (seus e subordinados)
 Permission20003=Eliminar peticións de días retribuidos
-Permission20004=Consultar todas as peticións de días retribuidos (tamén non subordinados)
-Permission20005=Crear/modificar as peticións de días retribuidos para todos (tamén non subordinados)
-Permission20006=Administrar días retribuidos (configuración e actualización do balance)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Aprobar petición de vacacións
 Permission23001=Consultar. Traballo programado
 Permission23002=Crear/actualizar. Traballo programado
@@ -1289,7 +1284,7 @@ YourPHPDoesNotHaveSSLSupport=Funcións SSL non dispoñibles no seu PHP
 DownloadMoreSkins=Mais temas para descargar
 SimpleNumRefModelDesc=Devolve o número de referencia no formato %s yymm-nnnn onde yy é o ano, mm é o mes e nnnn é un número secuencial de incremento automático sen restablecer
 SimpleNumRefNoDateModelDesc=Devolve o número de referencia no formato %s-nnnn onde nnnn é un número con incremento automático secuencial sen restablecemento
-ShowProfIdInAddress=Amosar identificación profesional con enderezos 
+ShowProfIdInAddress=Amosar identificación profesional con enderezos
 ShowVATIntaInAddress=Ocultar o número de IVE intracomunitario
 TranslationUncomplete=Tradución parcial
 MAIN_DISABLE_METEO=Desactiva as miniaturas meteorolóxicas
@@ -1444,7 +1439,7 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Almacén a utilizar para o pedimento
 ##### Suppliers Orders #####
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Preguntar por conta bancaria a usar no pedimento a provedor
 ##### Orders #####
-SuggestedPaymentModesIfNotDefinedInOrder=Modo de pagos suxerido no pedimento de cliente por defecto se non se define no pedimento
+SuggestedPaymentModesIfNotDefinedInOrder=Modo de pagamentos suxerido no pedimento de cliente por defecto se non se define no pedimento
 OrdersSetup=Configuración da xestión de pedimentos de cliente
 OrdersNumberingModules=Modelos de numeración de pedimentos
 OrdersModelModule=Modelos de documentos de pedimentos
@@ -1916,7 +1911,7 @@ Threshold=Límite
 BackupDumpWizard=Asistente para crear unha copia de seguridade da base de datos
 BackupZipWizard=Asistente para crear unha copia de seguridade do directorio de documentos
 SomethingMakeInstallFromWebNotPossible=A instalación do módulo externo non é posible desde a interface web polo seguinte motivo:
-SomethingMakeInstallFromWebNotPossible2=Por este motivo, o proceso de actualización descrito aquí é un proceso manual que só pode realizar un usuario privilexiado con privilexios o ficheiro <strong>%s</strong> para permitir esta función.
+SomethingMakeInstallFromWebNotPossible2=Por este motivo, o proceso de actualización descrito aquí é un proceso manual que só pode realizar un usuario con permisos
 InstallModuleFromWebHasBeenDisabledByFile=O seu administrador desactivou a instalación do módulo externo desde a aplicación. Debe pedirlle que elimine o ficheiro <strong>%s</strong> para permitir esta función.
 ConfFileMustContainCustom=A instalación ou construción dun módulo externo desde a aplicación precisa gardar os ficheiros do módulo no directorio <strong>%s</strong>. Para que Dolibarr procese este directorio, debe configurar o seu <strong>conf/conf.php</strong> para engadir as dúas liñas directivas: <br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Resalte as liñas da táboa cando pasa o rato por riba
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=¿Quere executar agora a recepcións deste receptor
 NoNewEmailToProcess=Non hai ningún correo electrónico novo (filtros coincidentes) para procesar
 NothingProcessed=Nada feito
 XEmailsDoneYActionsDone=%s correos electrónicos cualificados, %s correos electrónicos procesados ​​correctamente (para %s rexistro/accións feitas)
-RecordEvent=Gravar evento de correo electrónico
-CreateLeadAndThirdParty=Crear cliente potencial (e terceiros se é preciso)
-CreateTicketAndThirdParty=Crear ticket (e ligar a terceiros se foi cargado nunha operación anterior)
+RecordEvent=Gravar un evento na axenda (co tipo de correo electrónico enviado ou recibido)
+CreateLeadAndThirdParty=Crear un cliente potencial (e un terceiro se é preciso)
+CreateTicketAndThirdParty=Crear un ticket (ligado a un terceiro se o terceiro foi cargado por unha operación anterior, sen terceiros do contrario)
 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)
+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
 WithDolTrackingIDInMsgId=Mensaxe enviado desde Dolibarr
@@ -2084,7 +2080,7 @@ CreateCandidature=Crear solicitude de traballo
 FormatZip=Zip
 MainMenuCode=Código de entrada do menú (menú principal)
 ECMAutoTree=Amosar árbore automático GED
-OperationParamDesc=Defina os valores a empregar para o obxecto da acción, ou como extraer valores. Por exemplo: <br> objproperty1=SET: o valor a definir <br>objproperty2=SET:un valor con substitución de __objproperty1__<br>objproperty3=SETIFEMPTY: valor usado se objproperty3 non está xa definido <br> objproperty4 =EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:BODY:([^&#92;n]*)<br> object.objproperty5 = EXTRACT:BODY:O meu nome da empresa é\\s([^\\s]*) <br><br> Use a; char como separador para extraer ou establecer varias propiedades.
+OperationParamDesc=Define as regras a empregar para extraer ou establecer valores. <br> Exemplo de operacións que precisan extraer un nome do asunto do correo electrónico: <br> name=EXTRACT:SUBJECT:Mensaxe da empresa ([^\n] *) <br> Exemplo para operacións que crean obxectos: <br> objproperty1 = SET, o valor a establecer <br> objproperty2 = SET, un valor incluíndo valor de __objproperty1__ <br> objproperty3 = SETIFEMPTY: valor utilizado se objproperty3 se non foi definido <br> objproperty4 = EXTRACT: HEADER :X-Myheaderkey:\\s*([^\\s]*) <br> options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*) <br> object.objproperty5=EXTRACT:BODY:O nome da miña empresa é\\s( [^\\s]*) <br> <br> Use un ; char como separador para extraer ou establecer varias propiedades.
 OpeningHours=Horario de apertura
 OpeningHoursDesc=Introduza aquí o horario habitual da súa empresa.
 ResourceSetup=Configuración do módulo Recursos
@@ -2130,7 +2126,7 @@ LargerThan=Maior que
 IfTrackingIDFoundEventWillBeLinked=Teña conta que se se atopa no correo electrónico un ID de seguimento dun correo electrónico entrante é unha resposta dun correo electrónico xa recollido e ligado a un obxecto, o evento creado ligarase automaticamente co obxecto relacionado coñecido.
 WithGMailYouCanCreateADedicatedPassword=Cunha conta de GMail, se habilitou a validación de 2 pasos, recoméndase crear un segundo contrasinal adicado para a aplicación no lugar de usar a súa propia contrasinal de conta de https://myaccount.google.com/.
 EmailCollectorTargetDir=Pode ser un comportamento desexado mover o correo electrónico a outra etiqueta/directorio cando se procesou con éxito. Simplemente configure o nome do directorio aquí para usar esta función (NON use caracteres especiais no nome). Teña conta que tamén debe usar unha conta de inicio de sesión de lectura/escritura.
-EmailCollectorLoadThirdPartyHelp=Pode usar esta acción e usar o contido do correo electrónico para atopar e cargar un terceiro existente na base de datos. O terceiro atopado (ou creado) usarase para as seguintes accións que o precisan.<br>Por exemplo, se desexa crear un terceiro cun nome extraído nunha cadea "Nome: nome para atopar" atopado no corpo, use o correo electrónico do remitente como correo electrónico, pode establecer o campo do parámetro como este:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+EmailCollectorLoadThirdPartyHelp=Pode usar esta acción para empregar  o contido do correo electrónico e atopar e cargar un terceiro existente na súa base de datos. O terceiro atopado (ou creado) empregarase para seguir as accións que o precisen. <br> Por exemplo, se quere crear un terceiro cun nome extraído dunha cadea 'Nome: nome a procurar' presente no corpo, use o correo electrónico do remitente como correo electrónico, pode establecer o campo do parámetro así: <br> 'email= HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;' <br>
 EndPointFor=Punto final de %s:%s
 DeleteEmailCollector=Eliminar o receptor de correo electrónico
 ConfirmDeleteEmailCollector=¿Está certo de que quere eliminar este receptor de correo electrónico?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Falta a tradución para %s
 NativeModules=Modulos nativos
 NoDeployedModulesFoundWithThisSearchCriteria=Non se atoparon módulos para estes criterios de busca
 API_DISABLE_COMPRESSION=Desactivar a compresión das respostas da API
+EachTerminalHasItsOwnCounter=Cada terminal usa o seu propio contador.
diff --git a/htdocs/langs/gl_ES/boxes.lang b/htdocs/langs/gl_ES/boxes.lang
index 66a10609a87..4f3e0c6580a 100644
--- a/htdocs/langs/gl_ES/boxes.lang
+++ b/htdocs/langs/gl_ES/boxes.lang
@@ -91,7 +91,7 @@ BoxTitleLatestModifiedSupplierOrders=Pedimentos Provedor: últimos %s modificado
 BoxTitleLastModifiedCustomerBills=Facturas Clientes: últimas %s modificadas
 BoxTitleLastModifiedCustomerOrders=Pedimentos Clientes: últimos %s pedimentos modificados
 BoxTitleLastModifiedPropals=Últimos %s orzamentos modificados
-BoxTitleLatestModifiedJobPositions=Últimos %s postos de traballo modificados 
+BoxTitleLatestModifiedJobPositions=Últimos %s postos de traballo modificados
 BoxTitleLatestModifiedCandidatures=Últimas %s solicitudes de traballo modificadas
 ForCustomersInvoices=Facturas a clientes
 ForCustomersOrders=Pedimentos de clientes
diff --git a/htdocs/langs/gl_ES/companies.lang b/htdocs/langs/gl_ES/companies.lang
index 91f5a5eee8a..64d45f649ce 100644
--- a/htdocs/langs/gl_ES/companies.lang
+++ b/htdocs/langs/gl_ES/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Id Prof 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Verificar
 VATIntraCheckDesc=El enlace <b>%s</b> permite consultar no servizo europeo de control de números de IVE intracomunitario (VIES). Requírese acceso a internet dende o servidor Dolibarr para o servizo.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Verificar o CIF/NIF intracomunitario na web da Comisión Europea
-VATIntraManualCheck=Pode tamén verificar manualmente na web da Comisión Europea <a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=Tamén pode comprobar manualmente no sitio web da Comisión Europea<a href="%s" target="_blank" rel="noopener noreferrer"> %s </a>
 ErrorVATCheckMS_UNAVAILABLE=Comprobación imposible. O servizo de comprobación non é fornecido polo Estado membro (%s).
 NorProspectNorCustomer=Nin cliente, nin cliente potencial
 JuridicalStatus=Forma xurídica
diff --git a/htdocs/langs/gl_ES/errors.lang b/htdocs/langs/gl_ES/errors.lang
index ff9628df3c3..ebfe6c04387 100644
--- a/htdocs/langs/gl_ES/errors.lang
+++ b/htdocs/langs/gl_ES/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=O nome do ficheiro non pode conte  __SOMETHING__ nel
 ErrorNotInDictionaryPaymentConditions=Non está no Dicionario de Condicións de Pagamento. Modifíqueo. 
 ErrorIsNotADraft=%s non é un borrador
 ErrorExecIdFailed=Non se pode executar o comando "id" 
+ErrorBadCharIntoLoginName=Carácter non autorizado no nome de inicio de 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.
diff --git a/htdocs/langs/gl_ES/main.lang b/htdocs/langs/gl_ES/main.lang
index 3c2ef870185..cef85a6d8b6 100644
--- a/htdocs/langs/gl_ES/main.lang
+++ b/htdocs/langs/gl_ES/main.lang
@@ -212,6 +212,8 @@ User=Usuario
 Users=Usuarios
 Group=Grupo
 Groups=Grupos
+UserGroup=Grupo de usuarios
+UserGroups=Grupos de usuarios
 NoUserGroupDefined=Non hai definido grupo de usuarios
 Password=Contrasinal
 PasswordRetype=Repetir o teu contrasinal
diff --git a/htdocs/langs/gl_ES/other.lang b/htdocs/langs/gl_ES/other.lang
index d710dd12c68..c2fd86637b0 100644
--- a/htdocs/langs/gl_ES/other.lang
+++ b/htdocs/langs/gl_ES/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Cifrado de contrasinal
 PermissionsAdd=Permisos engadidos
 PermissionsDelete=Permisos eliminados
 YourPasswordMustHaveAtLeastXChars=O seu contrasinal debe ter alo menos <strong>%s</strong>  caracteres
+PasswordNeedAtLeastXUpperCaseChars=O contrasinal precisa polo menos <strong> %s </strong> caracteres en maiúscula
+PasswordNeedAtLeastXDigitChars=O contrasinal precisa polo menos <strong> %s </strong> caracteres numéricos
+PasswordNeedAtLeastXSpecialChars=O contrasinal precisa polo menos <strong> %s </strong> caracteres especiais
+PasswordNeedNoXConsecutiveChars=O contrasinal non debe ter <strong> %s </strong> caracteres consecutivos similares
 YourPasswordHasBeenReset=O seu contrasinal foi restablecido con éxito
 ApplicantIpAddress=Enderezo IP do solicitante
 SMSSentTo=SMS enviado a %s
diff --git a/htdocs/langs/gl_ES/projects.lang b/htdocs/langs/gl_ES/projects.lang
index dcdba12ef7d..80699730335 100644
--- a/htdocs/langs/gl_ES/projects.lang
+++ b/htdocs/langs/gl_ES/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Nota: os proxectos existentes c
 SelectLinesOfTimeSpentToInvoice=Seleccione a liñas de tempo utilizadas que non se facturan e, de seguido, empregue unha acción masiva de "Xerar factura" para facturalas
 ProjectTasksWithoutTimeSpent=Tarefas do proxecto sen tempo empregado 
 FormForNewLeadDesc=Grazas por encher o seguinte formulario para contactar connosco. Tamén pode enviarnos un correo electrónico directamente a <b>%s</b>
+StartDateCannotBeAfterEndDate=A data de finalización non pode ser anterior á data de inicio
diff --git a/htdocs/langs/gl_ES/withdrawals.lang b/htdocs/langs/gl_ES/withdrawals.lang
index 4067dbb58f3..106dbe1da91 100644
--- a/htdocs/langs/gl_ES/withdrawals.lang
+++ b/htdocs/langs/gl_ES/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Orde de transferencia
 LatestBankTransferReceipts=Últimas %s ordes de transferencia
 LastWithdrawalReceipts=Últimos %s ficheiros de ordes de domiciliación
 WithdrawalsLine=Liña de orde de domiciliacións
+CreditTransfer=Transferencia bancaria
 CreditTransferLine=Liña de orde de transferencia
 WithdrawalsLines=Liñas de ordes de domiciliación
 CreditTransferLines=Liñas de ordes de transferencia
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Código banco do terceiro
 NoInvoiceCouldBeWithdrawed=Non foi realizada a domiciliación de ningunha factura correctamente. Comprobe que as facturas son de empresas con IBAN válido e que IBAN ten unha RMU (Referencia de mandato único) co modo <strong>%s</strong>1.
 WithdrawalCantBeCreditedTwice=Este recibo de retirada xa está marcado como abonado; isto non pode facerse dúas veces, xa que isto podería crear pagamentos duplicados e entradas bancarias.
 ClassCredited=Clasificar como "Abonada"
+ClassDebited=Clasificar cargos adebedados
 ClassCreditedConfirm=¿Está certo de querer clasificar esta domiciliación como abonada na súa conta bancaria?
 TransData=Data envío
 TransMetod=Método envío
diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang
index f9674d2f1a5..6d7aeaf35c1 100644
--- a/htdocs/langs/he_IL/admin.lang
+++ b/htdocs/langs/he_IL/admin.lang
@@ -756,7 +756,7 @@ Permission106=Export sendings
 Permission109=מחק sendings
 Permission111=לקרוא דוחות כספיים
 Permission112=צור / לשנות / למחוק ולהשוות עסקאות
-Permission113=Setup financial accounts (create, manage categories)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=ייצוא עסקאות דפי מצב חשבון
 Permission116=העברות בין חשבונות
@@ -893,12 +893,11 @@ Permission701=לקרוא תרומות
 Permission702=צור / לשנות תרומות
 Permission703=מחק תרומות
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=לקרוא מניות
@@ -962,15 +961,11 @@ Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
@@ -981,9 +976,9 @@ Permission10005=Delete website content
 Permission20001=Read leave requests (your leave and those of your subordinates)
 Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Approve leave requests
 Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
-RecordEvent=Record email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
@@ -2084,7 +2080,7 @@ CreateCandidature=Create job application
 FormatZip=רוכסן
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -2130,7 +2126,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+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>
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Missing translation for %s
 NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/he_IL/companies.lang b/htdocs/langs/he_IL/companies.lang
index a8b167570e0..f39e5b1f0a1 100644
--- a/htdocs/langs/he_IL/companies.lang
+++ b/htdocs/langs/he_IL/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Check
 VATIntraCheckDesc=The VAT ID must include the country prefix. The link <b>%s</b> uses the European VAT checker service (VIES) which requires internet access from the Dolibarr server.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commission website
-VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Business entity type
diff --git a/htdocs/langs/he_IL/errors.lang b/htdocs/langs/he_IL/errors.lang
index 7bb0fac3f7b..eabc784e6aa 100644
--- a/htdocs/langs/he_IL/errors.lang
+++ b/htdocs/langs/he_IL/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
 ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
 ErrorIsNotADraft=%s is not a draft
 ErrorExecIdFailed=Can't execute command "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # 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/he_IL/main.lang b/htdocs/langs/he_IL/main.lang
index 9049042c599..d1013d6c705 100644
--- a/htdocs/langs/he_IL/main.lang
+++ b/htdocs/langs/he_IL/main.lang
@@ -212,6 +212,8 @@ User=User
 Users=משתמשים
 Group=Group
 Groups=קבוצות
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=No user group defined
 Password=סיסמה
 PasswordRetype=Retype your password
diff --git a/htdocs/langs/he_IL/other.lang b/htdocs/langs/he_IL/other.lang
index 3227788fdeb..c06945f5087 100644
--- a/htdocs/langs/he_IL/other.lang
+++ b/htdocs/langs/he_IL/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Password encoding
 PermissionsAdd=Permissions added
 PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
+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
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
 SMSSentTo=SMS sent to %s
diff --git a/htdocs/langs/he_IL/projects.lang b/htdocs/langs/he_IL/projects.lang
index 676865c2fd2..7ef9f67b7d7 100644
--- a/htdocs/langs/he_IL/projects.lang
+++ b/htdocs/langs/he_IL/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
 ProjectTasksWithoutTimeSpent=Project tasks without time spent
 FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+StartDateCannotBeAfterEndDate=End date cannot be before start date
diff --git a/htdocs/langs/he_IL/withdrawals.lang b/htdocs/langs/he_IL/withdrawals.lang
index f5a33b78eee..bda987276b1 100644
--- a/htdocs/langs/he_IL/withdrawals.lang
+++ b/htdocs/langs/he_IL/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
 WithdrawalsLine=Direct debit order line
+CreditTransfer=Credit transfer
 CreditTransferLine=Credit transfer line
 WithdrawalsLines=Direct debit order lines
 CreditTransferLines=Credit transfer lines
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=Classify credited
+ClassDebited=Classify debited
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
 TransMetod=Transmission method
diff --git a/htdocs/langs/hi_IN/admin.lang b/htdocs/langs/hi_IN/admin.lang
index 0594f9f5939..433b4f66f70 100644
--- a/htdocs/langs/hi_IN/admin.lang
+++ b/htdocs/langs/hi_IN/admin.lang
@@ -756,7 +756,7 @@ Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
 Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Export transactions and account statements
 Permission116=Transfers between accounts
@@ -893,12 +893,11 @@ Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Read stocks
@@ -962,15 +961,11 @@ Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
@@ -981,9 +976,9 @@ Permission10005=Delete website content
 Permission20001=Read leave requests (your leave and those of your subordinates)
 Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Approve leave requests
 Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
-RecordEvent=Record email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
@@ -2084,7 +2080,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -2130,7 +2126,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+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>
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Missing translation for %s
 NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/hi_IN/companies.lang b/htdocs/langs/hi_IN/companies.lang
index ca4dc7af3d7..735604f81d0 100644
--- a/htdocs/langs/hi_IN/companies.lang
+++ b/htdocs/langs/hi_IN/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Check
 VATIntraCheckDesc=The VAT ID must include the country prefix. The link <b>%s</b> uses the European VAT checker service (VIES) which requires internet access from the Dolibarr server.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commission website
-VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Business entity type
diff --git a/htdocs/langs/hi_IN/errors.lang b/htdocs/langs/hi_IN/errors.lang
index 7bb0fac3f7b..eabc784e6aa 100644
--- a/htdocs/langs/hi_IN/errors.lang
+++ b/htdocs/langs/hi_IN/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
 ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
 ErrorIsNotADraft=%s is not a draft
 ErrorExecIdFailed=Can't execute command "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # 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/hi_IN/main.lang b/htdocs/langs/hi_IN/main.lang
index fd009466950..1378a839481 100644
--- a/htdocs/langs/hi_IN/main.lang
+++ b/htdocs/langs/hi_IN/main.lang
@@ -212,6 +212,8 @@ User=User
 Users=Users
 Group=Group
 Groups=Groups
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=No user group defined
 Password=Password
 PasswordRetype=Retype your password
diff --git a/htdocs/langs/hi_IN/other.lang b/htdocs/langs/hi_IN/other.lang
index 9bc68dc3678..7b509f60ff7 100644
--- a/htdocs/langs/hi_IN/other.lang
+++ b/htdocs/langs/hi_IN/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Password encoding
 PermissionsAdd=Permissions added
 PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
+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
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
 SMSSentTo=SMS sent to %s
diff --git a/htdocs/langs/hi_IN/projects.lang b/htdocs/langs/hi_IN/projects.lang
index 5a2911bac0b..0d9c7ea34c8 100644
--- a/htdocs/langs/hi_IN/projects.lang
+++ b/htdocs/langs/hi_IN/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
 ProjectTasksWithoutTimeSpent=Project tasks without time spent
 FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+StartDateCannotBeAfterEndDate=End date cannot be before start date
diff --git a/htdocs/langs/hi_IN/withdrawals.lang b/htdocs/langs/hi_IN/withdrawals.lang
index f5a33b78eee..bda987276b1 100644
--- a/htdocs/langs/hi_IN/withdrawals.lang
+++ b/htdocs/langs/hi_IN/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
 WithdrawalsLine=Direct debit order line
+CreditTransfer=Credit transfer
 CreditTransferLine=Credit transfer line
 WithdrawalsLines=Direct debit order lines
 CreditTransferLines=Credit transfer lines
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=Classify credited
+ClassDebited=Classify debited
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
 TransMetod=Transmission method
diff --git a/htdocs/langs/hr_HR/admin.lang b/htdocs/langs/hr_HR/admin.lang
index 3630f49e4b2..53563ab2fff 100644
--- a/htdocs/langs/hr_HR/admin.lang
+++ b/htdocs/langs/hr_HR/admin.lang
@@ -756,7 +756,7 @@ Permission106=Izvezi slanja
 Permission109=Obriši slanja
 Permission111=Čitanje financijskih računa
 Permission112=Izradi/izmjeni/obriši i usporedi transakcije
-Permission113=Podešavanje financijskih računa (kreiranje, upravljanje kategorijama)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Izvoz transakcija i izvodi
 Permission116=Prijenos između računa
@@ -893,12 +893,11 @@ Permission701=Čitaj donacije
 Permission702=Izradi/izmjeni donacije
 Permission703=Obriši donacije
 Permission771=Čitaj izvještaje troškova (vaši i vaših podređenih)
-Permission772=Izradi/izmjeni izvještaje troškova
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Obriši izvještaje troškova
-Permission774=Čitaj sve izvještaje troškova (čak i svoje i podređenih)
 Permission775=Odobri izvještaje trška
 Permission776=Isplati izvještaje troškova
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=Izvezi izvještaje troškova
 Permission1001=Čitaj zalihe
@@ -962,15 +961,11 @@ Permission2801=Koristi FTP klijent u načinu čitanja (samo pregled i download)
 Permission2802=Koristi FTP klijent u načinu pisanja (brisanje ili upload)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
@@ -981,9 +976,9 @@ Permission10005=Delete website content
 Permission20001=Read leave requests (your leave and those of your subordinates)
 Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
 Permission20003=Obriši zahtjeve odsutnosti
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin zahtjevi odsutnosti ( podešavanje i saldo ) 
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Approve leave requests
 Permission23001=Pročitaj planirani posao
 Permission23002=Izradi/izmjeni Planirani posao
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
-RecordEvent=Record email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
@@ -2084,7 +2080,7 @@ CreateCandidature=Create job application
 FormatZip=PBR
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -2130,7 +2126,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+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>
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Missing translation for %s
 NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/hr_HR/companies.lang b/htdocs/langs/hr_HR/companies.lang
index 3d400e0921c..a737b20d2a8 100644
--- a/htdocs/langs/hr_HR/companies.lang
+++ b/htdocs/langs/hr_HR/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Ček
 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.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commission website
-VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Provjera nije moguća. Servis za provjeru nije pružena od strane države članice (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Business entity type
diff --git a/htdocs/langs/hr_HR/errors.lang b/htdocs/langs/hr_HR/errors.lang
index 2284d5af0d6..1867517eff5 100644
--- a/htdocs/langs/hr_HR/errors.lang
+++ b/htdocs/langs/hr_HR/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
 ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
 ErrorIsNotADraft=%s is not a draft
 ErrorExecIdFailed=Can't execute command "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # 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/hr_HR/main.lang b/htdocs/langs/hr_HR/main.lang
index 85a69f28b3d..27431f7470f 100644
--- a/htdocs/langs/hr_HR/main.lang
+++ b/htdocs/langs/hr_HR/main.lang
@@ -212,6 +212,8 @@ User=Korisnik
 Users=Korisnici
 Group=Grupa
 Groups=Grupe
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=Grupa korisnika nije izrađena
 Password=Zaporka
 PasswordRetype=Ponovi zaporku
diff --git a/htdocs/langs/hr_HR/other.lang b/htdocs/langs/hr_HR/other.lang
index 085b25468dc..48f0663ef39 100644
--- a/htdocs/langs/hr_HR/other.lang
+++ b/htdocs/langs/hr_HR/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Password encoding
 PermissionsAdd=Permissions added
 PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
+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
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
 SMSSentTo=SMS sent to %s
diff --git a/htdocs/langs/hr_HR/projects.lang b/htdocs/langs/hr_HR/projects.lang
index 5596ce0a219..e609d42b467 100644
--- a/htdocs/langs/hr_HR/projects.lang
+++ b/htdocs/langs/hr_HR/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
 ProjectTasksWithoutTimeSpent=Project tasks without time spent
 FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+StartDateCannotBeAfterEndDate=Datum kraja ne može biti prije datuma početka
diff --git a/htdocs/langs/hr_HR/withdrawals.lang b/htdocs/langs/hr_HR/withdrawals.lang
index 3ccfe1b6615..0974eedc4aa 100644
--- a/htdocs/langs/hr_HR/withdrawals.lang
+++ b/htdocs/langs/hr_HR/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
 WithdrawalsLine=Direct debit order line
+CreditTransfer=Credit transfer
 CreditTransferLine=Credit transfer line
 WithdrawalsLines=Direct debit order lines
 CreditTransferLines=Credit transfer lines
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=Označi kao kreditirano
+ClassDebited=Classify debited
 ClassCreditedConfirm=Jeste li sigurni da želite svrstati račun za isplatu kao knjiženje na svoj bankovni račun ?
 TransData=Datum prijenosa
 TransMetod=Način prijenosa
diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang
index b976a85d64e..87fa2d323ef 100644
--- a/htdocs/langs/hu_HU/admin.lang
+++ b/htdocs/langs/hu_HU/admin.lang
@@ -756,7 +756,7 @@ Permission106=Küldemények exportálása
 Permission109=Törlés küldések
 Permission111=Olvassa el a pénzügyi számlák
 Permission112=Létrehozása / módosítása / törlése, és hasonlítsa össze tranzakciók
-Permission113=Pénzügyi számlák beállítása (kategóriák létrehozása, kezelése)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Tranzakciók összehangolása
 Permission115=Export ügyletek és számlakivonatok
 Permission116=Számlák közötti átcsoportosítás
@@ -893,12 +893,11 @@ Permission701=Olvassa el adományokat
 Permission702=Létrehozza / módosítja adományok
 Permission703=Törlés adományok
 Permission771=Költségjelentések megtekintése (sajátja és beosztottjaié)
-Permission772=Költségjelentések létrehozása / módosítása
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Költségjelentések törlése
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Olvassa készletek
@@ -962,15 +961,11 @@ Permission2801=FTP kliens olvasás módban való használata (csak böngészés
 Permission2802=FTP kliens írási módban való használata (fájlok törlése vagy feltöltése)
 Permission3200=Archivált események és ujjlenyomatok megtekintése
 Permission3301=Generate new modules
-Permission4001=Alkalmazottak megtekintése
-Permission4002=Alkalmazottak létrehozása
-Permission4003=Alkalmazottak törlése
-Permission4004=Alkalmazottak exportálása
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
@@ -981,9 +976,9 @@ Permission10005=Webhely-tartalom törlése
 Permission20001=Szabadság iránti kérelmek megtekintése (Ön és beosztottjai szabadsága)
 Permission20002=Szabadság iránti kérelmek létrehozása / módosítása (Ön és beosztottjai szabadsága)
 Permission20003=Szabadság iránti kérelmek törlése
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Approve leave requests
 Permission23001=Ütemezett feladatok megtekintése
 Permission23002=Ütemezett feladatok létrehozása / frissítése
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
-RecordEvent=Record email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
@@ -2084,7 +2080,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -2130,7 +2126,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+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>
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Missing translation for %s
 NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/hu_HU/companies.lang b/htdocs/langs/hu_HU/companies.lang
index 18bf0ff2550..82c665ef2dc 100644
--- a/htdocs/langs/hu_HU/companies.lang
+++ b/htdocs/langs/hu_HU/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Szakma ID 1 (RUT)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Csekk
 VATIntraCheckDesc=Az ÁFA-azonosítónak tartalmaznia kell az ország előtagot. Az <b> %s </b> link az Európai ÁFA-ellenőrző szolgáltatást (VIES) használja, amely internet-hozzáférést igényel a Dolibarr szerverről.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Ellenőrizze a Közösségen belüli ÁFA-azonosítót az Európai Bizottság weboldalán
-VATIntraManualCheck=Manuálisan ellenőrizheti az Európai Bizottság webhelyén <a href="%s" target="_blank"> %s </a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Ellenőrzés nem lehetséges. A szolgáltatást a tagállam nem teszi lehetővé (%s).
 NorProspectNorCustomer=Nem leendő partner, nem ügyfél
 JuridicalStatus=Business entity type
diff --git a/htdocs/langs/hu_HU/errors.lang b/htdocs/langs/hu_HU/errors.lang
index d4d44df7f86..dbdd337ca3c 100644
--- a/htdocs/langs/hu_HU/errors.lang
+++ b/htdocs/langs/hu_HU/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
 ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
 ErrorIsNotADraft=%s is not a draft
 ErrorExecIdFailed=Can't execute command "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # 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/hu_HU/main.lang b/htdocs/langs/hu_HU/main.lang
index 850a3773ed4..152bbff480c 100644
--- a/htdocs/langs/hu_HU/main.lang
+++ b/htdocs/langs/hu_HU/main.lang
@@ -212,6 +212,8 @@ User=Felhasználó
 Users=Felhasználók
 Group=Csoport
 Groups=Csoportok
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=Nincs felhasználói csoport meghatározva
 Password=Jelszó
 PasswordRetype=Adja meg újra a jelszavát
diff --git a/htdocs/langs/hu_HU/other.lang b/htdocs/langs/hu_HU/other.lang
index dc8c8e31316..36d91090ab1 100644
--- a/htdocs/langs/hu_HU/other.lang
+++ b/htdocs/langs/hu_HU/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Jelszó kódolás
 PermissionsAdd=Engedélyek hozzáadva
 PermissionsDelete=Engedélyek eltávolítva
 YourPasswordMustHaveAtLeastXChars=A jelszónak legalább <strong>%s</strong> karakterből kell állnia
+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
 YourPasswordHasBeenReset=Jelszava sikeresen vissza lett állítva
 ApplicantIpAddress=A pályázó IP címe
 SMSSentTo=SMS elküldve %s-re
diff --git a/htdocs/langs/hu_HU/projects.lang b/htdocs/langs/hu_HU/projects.lang
index f0289205e36..a37db21a5f7 100644
--- a/htdocs/langs/hu_HU/projects.lang
+++ b/htdocs/langs/hu_HU/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
 ProjectTasksWithoutTimeSpent=Projektfeladatok eltöltött idő nélkül\n
 FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+StartDateCannotBeAfterEndDate=A befejezés időpontja nem lehet hamarabb mint a kezdet
diff --git a/htdocs/langs/hu_HU/withdrawals.lang b/htdocs/langs/hu_HU/withdrawals.lang
index 19042ef0983..f1651051352 100644
--- a/htdocs/langs/hu_HU/withdrawals.lang
+++ b/htdocs/langs/hu_HU/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
 WithdrawalsLine=Direct debit order line
+CreditTransfer=Credit transfer
 CreditTransferLine=Credit transfer line
 WithdrawalsLines=Direct debit order lines
 CreditTransferLines=Credit transfer lines
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=Jóváírtan osztályozva
+ClassDebited=Classify debited
 ClassCreditedConfirm=Biztos, hogy jóvírtan akarja osztályozni a visszavonást a bankszámlájáról?
 TransData=Dátum Átviteli
 TransMetod=Átviteli módszer
diff --git a/htdocs/langs/id_ID/admin.lang b/htdocs/langs/id_ID/admin.lang
index 318d3097b4b..ba6b5d05104 100644
--- a/htdocs/langs/id_ID/admin.lang
+++ b/htdocs/langs/id_ID/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Bold reference and period in PDF
-BoldLabelOnPDF=Bold label in PDF
+BoldRefAndPeriodOnPDF=Referensi tebal dan titik dalam PDF
+BoldLabelOnPDF=Label tebal dalam PDF
 Foundation=Yayasan
 Version=Versi
 Publisher=Penerbit
@@ -756,7 +756,7 @@ Permission106=Pengiriman ekspor
 Permission109=Hapus pengiriman
 Permission111=Baca akun keuangan
 Permission112=Buat / modifikasi / hapus dan bandingkan transaksi
-Permission113=Siapkan akun keuangan (buat, kelola kategori)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Rekonsiliasi transaksi
 Permission115=Transaksi ekspor dan laporan akun
 Permission116=Transfer antar akun
@@ -893,12 +893,11 @@ Permission701=Membaca Sumbangan
 Permission702=Membuat/Merubah Sumbangan
 Permission703=Menghapus Sumbangan
 Permission771=Baca laporan pengeluaran (milik Anda dan bawahan Anda)
-Permission772=Buat / ubah laporan pengeluaran
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Hapus laporan pengeluaran
-Permission774=Baca semua laporan pengeluaran (bahkan untuk pengguna bukan bawahan)
 Permission775=Menyetujui laporan pengeluaran
 Permission776=Membayar laporan pengeluaran
-Permission777=Baca laporan pengeluaran semua orang
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Buat / ubah laporan pengeluaran semua orang
 Permission779=Laporan pengeluaran ekspor
 Permission1001=Membaca Stok
@@ -906,7 +905,7 @@ Permission1002=Membuat/Merubah Gudang
 Permission1003=Menghapus Gudang
 Permission1004=Membaca pergerakan stok
 Permission1005=Buat / modifikasi pergerakan stok
-Permission1011=View inventories
+Permission1011=Lihat inventaris
 Permission1012=Create new inventory
 Permission1014=Validate inventory
 Permission1015=Allow to change PMP value for a product
@@ -962,15 +961,11 @@ Permission2801=Gunakan klien FTP dalam mode baca (hanya menjelajah dan mengunduh
 Permission2802=Gunakan klien FTP dalam mode tulis (hapus atau unggah file)
 Permission3200=Baca agenda yang diarsipkan dan sidik jari
 Permission3301=Hasilkan modul baru
-Permission4001=Lihat karyawan
-Permission4002=Buat karyawan
-Permission4003=Hapus karyawan
-Permission4004=Karyawan ekspor
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
@@ -981,9 +976,9 @@ Permission10005=Hapus konten situs web
 Permission20001=Baca permintaan cuti (cuti Anda dan bawahan Anda)
 Permission20002=Buat / modifikasi permintaan cuti Anda (cuti Anda dan bawahan Anda)
 Permission20003=Hapus permintaan cuti
-Permission20004=Baca semua permintaan cuti (bahkan pengguna bukan bawahan)
-Permission20005=Buat / modifikasi permintaan cuti untuk semua orang (bahkan pengguna bukan bawahan)
-Permission20006=Permintaan cuti admin (pengaturan dan perbarui saldo)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Setujui permintaan cuti
 Permission23001=Baca pekerjaan terjadwal
 Permission23002=Buat / perbarui pekerjaan yang Dijadwalkan
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Apakah Anda ingin menjalankan koleksi untuk kolekto
 NoNewEmailToProcess=Tidak ada email baru (filter yang cocok) untuk diproses
 NothingProcessed=Tidak ada yang dilakukan
 XEmailsDoneYActionsDone=email %s memenuhi syarat, email %s berhasil diproses (untuk catatan / tindakan %s dilakukan)
-RecordEvent=Rekam agenda email
-CreateLeadAndThirdParty=Buat timbal (dan pihak ketiga jika perlu)
-CreateTicketAndThirdParty=Buat tiket (dan tautkan ke pihak ketiga jika dimuat oleh operasi sebelumnya)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 CodeLastResult=Kode hasil terbaru
 NbOfEmailsInInbox=Jumlah email dalam direktori sumber
 LoadThirdPartyFromName=Muat pihak ketiga yang mencari di %s (hanya memuat)
 LoadThirdPartyFromNameOrCreate=Muat pencarian pihak ketiga di %s (buat jika tidak ditemukan)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Pesan dari percakapan yang dimulai oleh email pertama yang dikirim dari Dolibarr
 WithoutDolTrackingID=Pesan dari percakapan yang dimulai dengan email pertama TIDAK dikirim dari Dolibarr
 WithDolTrackingIDInMsgId=Pesan dikirim dari Dolibarr
@@ -2084,7 +2080,7 @@ CreateCandidature=Buat lamaran kerja
 FormatZip=Kode Pos
 MainMenuCode=Kode entri menu (mainmenu)
 ECMAutoTree=Tampilkan pohon ECM otomatis
-OperationParamDesc=Tentukan nilai yang akan digunakan untuk objek tindakan, atau cara mengekstrak nilai. Sebagai contoh: <br> objproperty1 = SET: nilai untuk menetapkan<br>objproperty2 = SET: nilai dengan penggantian __objproperty1__<br>objproperty3 = SETIFEMPTY: sudah bukan properti, apakah sudah lebih baik, jika sudah lebih baik, apakah sudah lebih baik jika tidak, apakah sudah, apakah sudah, apakah sudah be ([^ \\ s] *) <br> options_myextrafield1 = EKSTRAK: SUBYEKAN: ([^ & # 92; n] *) <br> object.objproperty5 = EXTRACT: BODY: Nama perusahaan saya adalah s ([^ s] s<br>Gunakan a; char sebagai pemisah untuk mengekstrak atau mengatur beberapa properti.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Jam buka
 OpeningHoursDesc=Masukkan di sini jam buka reguler perusahaan Anda.
 ResourceSetup=Modul Konfigurasi Sumber Daya
@@ -2130,7 +2126,7 @@ LargerThan=lebih besar dari
 IfTrackingIDFoundEventWillBeLinked=Perhatikan bahwa Jika ID pelacakan dari suatu objek ditemukan dalam email, atau jika email adalah jawaban dari email yang sudah dikumpulkan dan ditautkan ke suatu objek, acara yang dibuat akan secara otomatis ditautkan ke objek terkait yang diketahui.
 WithGMailYouCanCreateADedicatedPassword=Dengan akun GMail, jika Anda mengaktifkan validasi 2 langkah, disarankan untuk membuat kata sandi khusus kedua untuk aplikasi alih-alih menggunakan kata sandi akun Anda sendiri dari https://myaccount.google.com/.
 EmailCollectorTargetDir=Ini mungkin merupakan perilaku yang diinginkan untuk memindahkan email ke tag / direktori lain ketika berhasil diproses. Cukup atur nama direktori di sini untuk menggunakan fitur ini (JANGAN menggunakan karakter khusus dalam nama). Perhatikan bahwa Anda juga harus menggunakan akun login baca / tulis.
-EmailCollectorLoadThirdPartyHelp=Anda dapat menggunakan aksi ini untuk menggunakan konten email guna menemukan dan memuat pihak ketiga yang ada di database Anda. Pihak ketiga yang ditemukan (atau dibuat) akan digunakan untuk tindakan selanjutnya yang memerlukannya. <br> Misalnya, jika Anda ingin membuat pihak ketiga dengan nama yang diekstrak dari 'Nama: nama untuk ditemukan' yang ditemukan di badan, gunakan email pengirim sebagai email , Anda dapat mengatur bidang parameter seperti ini: <br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+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>
 EndPointFor=Titik akhir untuk %s: %s
 DeleteEmailCollector=Hapus pengumpul email
 ConfirmDeleteEmailCollector=Anda yakin ingin menghapus pengumpul email ini?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Missing translation for %s
 NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/id_ID/companies.lang b/htdocs/langs/id_ID/companies.lang
index 971f10da4fa..378dfe8a374 100644
--- a/htdocs/langs/id_ID/companies.lang
+++ b/htdocs/langs/id_ID/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Id Prof 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Periksa
 VATIntraCheckDesc=ID PPN harus menyertakan awalan negara. Tautan<b>%s</b>menggunakan layanan pemeriksa PPN Eropa (VIES) yang memerlukan akses internet dari server Dolibarr.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Periksa ID PPN intra-Komunitas di situs web Komisi Eropa
-VATIntraManualCheck=Anda juga dapat memeriksa secara manual di situs web Komisi Eropa <a href="%s" target="_blank"> %s </a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Periksa tidak mungkin. Layanan cek tidak disediakan oleh negara anggota (%s).
 NorProspectNorCustomer=Bukan prospek, bukan pelanggan
 JuridicalStatus=Jenis entitas bisnis
diff --git a/htdocs/langs/id_ID/errors.lang b/htdocs/langs/id_ID/errors.lang
index b9242333a18..e1d11b00ec4 100644
--- a/htdocs/langs/id_ID/errors.lang
+++ b/htdocs/langs/id_ID/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=Nama file tidak boleh memiliki __SOMETHING__ di dalamnya
 ErrorNotInDictionaryPaymentConditions=Tidak ada dalam Kamus Istilah Pembayaran, harap ubah.
 ErrorIsNotADraft=%s is not a draft
 ErrorExecIdFailed=Can't execute command "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Parameter PHP Anda upload_max_filesize (%s) lebih tinggi dari parameter PHP post_max_size (%s). Ini bukan pengaturan yang konsisten.
diff --git a/htdocs/langs/id_ID/main.lang b/htdocs/langs/id_ID/main.lang
index 5dfe19f44c8..23fbd8255cb 100644
--- a/htdocs/langs/id_ID/main.lang
+++ b/htdocs/langs/id_ID/main.lang
@@ -212,6 +212,8 @@ User=Pengguna
 Users=Pengguna
 Group=Kelompok
 Groups=Grup
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=Tidak ada grup pengguna yang ditentukan
 Password=Kata kunci
 PasswordRetype=Ketik ulang kata sandi Anda
diff --git a/htdocs/langs/id_ID/other.lang b/htdocs/langs/id_ID/other.lang
index 7edb0235230..190810660ff 100644
--- a/htdocs/langs/id_ID/other.lang
+++ b/htdocs/langs/id_ID/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Pengodean kata sandi
 PermissionsAdd=Izin ditambahkan
 PermissionsDelete=Izin dihapus
 YourPasswordMustHaveAtLeastXChars=Kata sandi Anda harus memiliki setidaknya<strong>%s </strong> chars
+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
 YourPasswordHasBeenReset=Kata sandi Anda telah berhasil direset
 ApplicantIpAddress=Alamat IP pemohon
 SMSSentTo=SMS dikirim ke %s
diff --git a/htdocs/langs/id_ID/projects.lang b/htdocs/langs/id_ID/projects.lang
index 5f4979504ca..3434f65fb93 100644
--- a/htdocs/langs/id_ID/projects.lang
+++ b/htdocs/langs/id_ID/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Catatan: progres proyek yang ad
 SelectLinesOfTimeSpentToInvoice=Pilih baris waktu yang dihabiskan yang belum ditagih, lalu tindakan massal "Buat Faktur" untuk menagihnya
 ProjectTasksWithoutTimeSpent=Project tasks without time spent
 FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+StartDateCannotBeAfterEndDate=End date cannot be before start date
diff --git a/htdocs/langs/id_ID/withdrawals.lang b/htdocs/langs/id_ID/withdrawals.lang
index 0c83a1cfcd6..38d0b35743f 100644
--- a/htdocs/langs/id_ID/withdrawals.lang
+++ b/htdocs/langs/id_ID/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Pesanan transfer kredit
 LatestBankTransferReceipts=Pesanan transfer kredit %s terbaru
 LastWithdrawalReceipts=File debit langsung %s terbaru
 WithdrawalsLine=Jalur pemesanan debit langsung
+CreditTransfer=Transfer Kredit
 CreditTransferLine=Jalur transfer kredit
 WithdrawalsLines=Jalur pemesanan debit langsung
 CreditTransferLines=Jalur transfer kredit
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Kode bank pihak ketiga
 NoInvoiceCouldBeWithdrawed=Tidak ada faktur yang berhasil didebit. Periksa apakah faktur ada pada perusahaan dengan IBAN yang valid dan bahwa IBAN memiliki UMR (Referensi Mandat Unik) dengan mode<strong>%s </strong>.
 WithdrawalCantBeCreditedTwice=Tanda terima penarikan ini sudah ditandai sebagai dikreditkan; ini tidak dapat dilakukan dua kali, karena ini berpotensi membuat pembayaran duplikat dan entri bank.
 ClassCredited=Klasifikasi dikreditkan
+ClassDebited=Classify debited
 ClassCreditedConfirm=Apakah Anda yakin ingin mengklasifikasikan tanda terima penarikan ini sebagai yang dikreditkan ke rekening bank Anda?
 TransData=Tanggal transmisi
 TransMetod=Metode transmisi
diff --git a/htdocs/langs/is_IS/admin.lang b/htdocs/langs/is_IS/admin.lang
index 6f63af28a06..80888a265af 100644
--- a/htdocs/langs/is_IS/admin.lang
+++ b/htdocs/langs/is_IS/admin.lang
@@ -756,7 +756,7 @@ Permission106=Export sendings
 Permission109=Eyða sendings
 Permission111=Lesa fjárhagslega reikninga
 Permission112=Búa til / breyta / eyða og bera saman viðskipti
-Permission113=Setup financial accounts (create, manage categories)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Útflutningur fundargerðir og reikningur staðhæfing
 Permission116=Millifærslur milli reikninga
@@ -893,12 +893,11 @@ Permission701=Lesa Fjárframlög
 Permission702=Búa til / breyta framlög
 Permission703=Eyða Fjárframlög
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Lesa fiskistofna
@@ -962,15 +961,11 @@ Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
@@ -981,9 +976,9 @@ Permission10005=Delete website content
 Permission20001=Read leave requests (your leave and those of your subordinates)
 Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Approve leave requests
 Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
-RecordEvent=Record email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
@@ -2084,7 +2080,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -2130,7 +2126,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+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>
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Missing translation for %s
 NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/is_IS/companies.lang b/htdocs/langs/is_IS/companies.lang
index 2fad0b55c76..606eb738205 100644
--- a/htdocs/langs/is_IS/companies.lang
+++ b/htdocs/langs/is_IS/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (Rut)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Athuga
 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.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commission website
-VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Athuga ekki hægt. Athugaðu þjónusta er ekki veitt af aðildarríki ( %s ).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Business entity type
diff --git a/htdocs/langs/is_IS/errors.lang b/htdocs/langs/is_IS/errors.lang
index d33c968a527..e91f653c8b4 100644
--- a/htdocs/langs/is_IS/errors.lang
+++ b/htdocs/langs/is_IS/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
 ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
 ErrorIsNotADraft=%s is not a draft
 ErrorExecIdFailed=Can't execute command "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # 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/is_IS/main.lang b/htdocs/langs/is_IS/main.lang
index 6dede82f445..349fa522956 100644
--- a/htdocs/langs/is_IS/main.lang
+++ b/htdocs/langs/is_IS/main.lang
@@ -212,6 +212,8 @@ User=Notandi
 Users=Notendur
 Group=Group
 Groups=Groups
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=No user group defined
 Password=Lykilorð
 PasswordRetype=Sláðu lykilorðið þitt
diff --git a/htdocs/langs/is_IS/other.lang b/htdocs/langs/is_IS/other.lang
index 37387cdfd63..5bccef3d2b8 100644
--- a/htdocs/langs/is_IS/other.lang
+++ b/htdocs/langs/is_IS/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Password encoding
 PermissionsAdd=Permissions added
 PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
+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
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
 SMSSentTo=SMS sent to %s
diff --git a/htdocs/langs/is_IS/projects.lang b/htdocs/langs/is_IS/projects.lang
index 5fbcab00b7e..21c8bc9f7cc 100644
--- a/htdocs/langs/is_IS/projects.lang
+++ b/htdocs/langs/is_IS/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
 ProjectTasksWithoutTimeSpent=Project tasks without time spent
 FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+StartDateCannotBeAfterEndDate=End date cannot be before start date
diff --git a/htdocs/langs/is_IS/withdrawals.lang b/htdocs/langs/is_IS/withdrawals.lang
index 2ae4a8ee461..5feb0d97831 100644
--- a/htdocs/langs/is_IS/withdrawals.lang
+++ b/htdocs/langs/is_IS/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
 WithdrawalsLine=Direct debit order line
+CreditTransfer=Credit transfer
 CreditTransferLine=Credit transfer line
 WithdrawalsLines=Direct debit order lines
 CreditTransferLines=Credit transfer lines
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=Flokka fært
+ClassDebited=Classify debited
 ClassCreditedConfirm=Ertu viss um að þú viljir að flokka þessa afturköllun berst sem lögð á bankareikning þinn?
 TransData=Date Sending
 TransMetod=Aðferð Sending
diff --git a/htdocs/langs/it_CH/admin.lang b/htdocs/langs/it_CH/admin.lang
deleted file mode 100644
index 45f91beee38..00000000000
--- a/htdocs/langs/it_CH/admin.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - admin
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang
index 1bb88ca353a..ee46f92edc2 100644
--- a/htdocs/langs/it_IT/admin.lang
+++ b/htdocs/langs/it_IT/admin.lang
@@ -756,7 +756,7 @@ Permission106=Esporta gli invii
 Permission109=Eliminare spedizioni
 Permission111=Vedere i conti bancari
 Permission112=Creare/modificare/cancellare e confrontare operazioni bancarie
-Permission113=Imposta conti finanziari (crea, gestire le categorie)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Riconciliare transazioni
 Permission115=Operazioni di esportazione ed estratti conto
 Permission116=Trasferimenti tra conti
@@ -893,12 +893,11 @@ Permission701=Vedere donazioni
 Permission702=Creare/modificare donazioni
 Permission703=Eliminare donazioni
 Permission771=Visualizzare le note spese (tue e dei tuoi subordinati)
-Permission772=Creare / modificare le note spese
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Eliminare le note spese
-Permission774=Vedere tutte le note spese (anche per utenti non subordinati)
 Permission775=Approvare le note spese
 Permission776=Pagare le note spese
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=Esporta note spese
 Permission1001=Vedere magazzino
@@ -962,15 +961,11 @@ Permission2801=Client FTP in sola lettura (solo download e navigazione dei file)
 Permission2802=Client FTP in lettura e scrittura (caricamento e eliminazione dei file)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
@@ -981,9 +976,9 @@ Permission10005=Delete website content
 Permission20001=Vedere le richieste di ferie (tue e dei tuoi subordinati)
 Permission20002=Creare / modificare le tue richieste di ferie (le tue ferie e quelle dei tuoi subordinati)
 Permission20003=Eliminare le richieste di ferie
-Permission20004=Vedere tutte le richieste di ferie (anche di utenti non subordinati)
-Permission20005=Creare / modificare richieste di ferie per tutti (anche di utenti non subordinati)
-Permission20006=Amministrazione richieste di ferie/permessi  (impostazione e aggiornamento del bilancio)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Approvare le richieste di ferie
 Permission23001=Leggi lavoro pianificato
 Permission23002=Crea / Aggiorna lavoro pianificato
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
-RecordEvent=Record email event
-CreateLeadAndThirdParty=Crea Opportunità (e Soggetto terzo se necessario)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 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)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
@@ -2084,7 +2080,7 @@ CreateCandidature=Create job application
 FormatZip=CAP
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Definire i valori da utilizzare per l'oggetto dell'azione o come estrarre i valori. Ad esempio: <br> objproperty1=SET: il valore per impostare <br> objproperty2=SET: un valore con la sostituzione di __objproperty1__ <br> objproperty3=SETIFEMPTY: valore usato se objproperty3 non è già pronto <br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*) <br> options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*) <br> object.objproperty5=EXTRACT:BODY: Il nome della mia azienda è\\s([^\\s]*)Usa il carattere ; come separatore per estrarre o impostare diverse proprietà.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Orari di apertura
 OpeningHoursDesc=Inserisci gli orari di apertura regolare della tua azienda.
 ResourceSetup=Configurazione del modulo Risorse
@@ -2130,7 +2126,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=Potrebbe essere un comportamento desiderato spostare l'e-mail in un altro tag / directory quando è stata elaborata correttamente. Basta impostare il nome della directory qui per utilizzare questa funzione (NON usare caratteri speciali nel nome). Si noti che è necessario utilizzare anche un account di accesso in lettura / scrittura.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+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>
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Missing translation for %s
 NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/it_IT/banks.lang b/htdocs/langs/it_IT/banks.lang
index bbed1171cf6..bbab88b91b4 100644
--- a/htdocs/langs/it_IT/banks.lang
+++ b/htdocs/langs/it_IT/banks.lang
@@ -17,7 +17,7 @@ CurrentAccounts=Conti correnti
 SavingAccounts=Conti di risparmio
 ErrorBankLabelAlreadyExists=Etichetta banca già esistente
 BankBalance=Saldo
-BankBalanceBefore=Bilancio precedente
+BankBalanceBefore=Saldo precedente
 BankBalanceAfter=Saldo dopo
 BalanceMinimalAllowed=Saldo minimo consentito
 BalanceMinimalDesired=Saldo minimo voluto
@@ -127,7 +127,7 @@ ConfirmDeleteTransaction=Vuoi davvero eliminare questa transazione?
 ThisWillAlsoDeleteBankRecord=Questa operazione elimina anche le transazioni bancarie generate
 BankMovements=Movimenti
 PlannedTransactions=Transazioni pianificate
-Graph=Graphs
+Graph=Grafici
 ExportDataset_banque_1=Movimenti bancari e di cassa e loro rilevazioni
 ExportDataset_banque_2=Modulo di versamento
 TransactionOnTheOtherAccount=Transazione sull'altro conto
@@ -140,7 +140,7 @@ BankTransactionLine=Transazione bancaria
 AllAccounts=Tutte le banche e le casse
 BackToAccount=Torna al conto
 ShowAllAccounts=Mostra per tutti gli account
-FutureTransaction=Future transaction. Unable to reconcile.
+FutureTransaction=Transazioni futura. Impossibile riconciliare
 SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 InputReceiptNumber=Scegliere l'estratto conto collegato alla conciliazione. Utilizzare un valore numerico ordinabile: AAAAMM o AAAAMMGG
 EventualyAddCategory=Infine, specificare una categoria in cui classificare i record
@@ -165,9 +165,9 @@ VariousPayment=Miscellaneous payment
 VariousPayments=Pagamenti vari
 ShowVariousPayment=Show miscellaneous payment
 AddVariousPayment=Add miscellaneous payment
-VariousPaymentId=Miscellaneous payment ID
-VariousPaymentLabel=Miscellaneous payment label
-ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
+VariousPaymentId=ID pagamento vario
+VariousPaymentLabel=Etichetta pagamento vario
+ConfirmCloneVariousPayment=Conferma la clonazione di un pagamento vario
 SEPAMandate=Mandato SEPA
 YourSEPAMandate=I tuoi mandati SEPA
 FindYourSEPAMandate=Questo è il tuo mandato SEPA che autorizza la nostra azienda ad effettuare un ordine di addebito diretto alla tua banca. Da restituire firmata (scansione del documento firmato) o inviato all'indirizzo email
@@ -179,6 +179,6 @@ BankColorizeMovementDesc=Se questa funzione è abilitata, è possibile scegliere
 BankColorizeMovementName1=Colore di sfondo per il movimento di debito
 BankColorizeMovementName2=Colore di sfondo per il movimento del credito
 IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
-NoBankAccountDefined=No bank account defined
+NoBankAccountDefined=Nessun conto bancario definito
 NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
-AlreadyOneBankAccount=Already one bank account defined
+AlreadyOneBankAccount=È già stato definito un conto bancario
diff --git a/htdocs/langs/it_IT/companies.lang b/htdocs/langs/it_IT/companies.lang
index 1aca7172f6b..ee9968003d8 100644
--- a/htdocs/langs/it_IT/companies.lang
+++ b/htdocs/langs/it_IT/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=Id Professionale 6
+ProfId5CM=Id Professionale 6
+ProfId6CM=Id Professionale 6
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=Id Professionale 6
+ProfId5ShortCM=Id Professionale 6
+ProfId6ShortCM=Id Professionale 6
 ProfId1CO=RUT
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Controllo partita IVA
 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.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commission website
-VATIntraManualCheck=È anche possibile controllare manualmente sul sito della Commissione Europea <a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Non è possibile effettuare il controllo. Servizio non previsto per lo stato membro ( %s).
 NorProspectNorCustomer=Né cliente, né cliente potenziale
 JuridicalStatus=Tipo di entità aziendale
diff --git a/htdocs/langs/it_IT/errors.lang b/htdocs/langs/it_IT/errors.lang
index d294b5dad0d..83c3785e070 100644
--- a/htdocs/langs/it_IT/errors.lang
+++ b/htdocs/langs/it_IT/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
 ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
 ErrorIsNotADraft=%s is not a draft
 ErrorExecIdFailed=Can't execute command "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -285,7 +286,7 @@ WarningPassIsEmpty=Attenzione, il database è accessibile senza password. Questa
 WarningConfFileMustBeReadOnly=Attenzione, il file di configurazione <b>htdocs/conf/conf.php</b> è scrivibile dal server web. Questa è una grave falla di sicurezza! Impostare il file in sola lettura per l'utente utilizzato dal server web. Se si utilizza Windows e il formato FAT per il disco, dovete sapere che tale filesystem non consente la gestione delle autorizzazioni sui file, quindi non può essere completamente sicuro.
 WarningsOnXLines=Warning su <b>%s</b> righe del sorgente
 WarningNoDocumentModelActivated=No model, for document generation, has been activated. A model will be chosen by default until you check your module setup.
-WarningLockFileDoesNotExists=Attenzione, una volta terminato il setup, devi disabilitare gli strumenti di installazione/migrazione aggiungendo il file <b>install.lock</b> nella directory <b>%s</b>. Omettendo la creazione di questo file è un grave riscuio per la sicurezza.
+WarningLockFileDoesNotExists=Attenzione, una volta terminato il setup, devi disabilitare gli strumenti di installazione/migrazione aggiungendo il file <b>install.lock</b> nella directory <b>%s</b>. Omettendo la creazione di questo file è un grave rischio per la sicurezza.
 WarningUntilDirRemoved=Tutti gli avvisi di sicurezza (visibili solo dagli amministratori) rimarranno attivi fintanto che la vulnerabilità è presente (o la costante MAIN_REMOVE_INSTALL_WARNING viene aggiunta in Impostazioni->Altre impostazioni).
 WarningCloseAlways=Attenzione, la chiusura è effettiva anche se il numero degli elementi non coincide fra inizio e fine. Abilitare questa opzione con cautela.
 WarningUsingThisBoxSlowDown=Attenzione: l'uso di questo box rallenterà pesantemente tutte le pagine che lo visualizzano
diff --git a/htdocs/langs/it_IT/main.lang b/htdocs/langs/it_IT/main.lang
index dafd5468ff8..b9ea4aa0c46 100644
--- a/htdocs/langs/it_IT/main.lang
+++ b/htdocs/langs/it_IT/main.lang
@@ -212,6 +212,8 @@ User=Utente
 Users=Utenti
 Group=Gruppo
 Groups=Gruppi
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=Gruppo non definito
 Password=Password
 PasswordRetype=Ridigita la password
diff --git a/htdocs/langs/it_IT/other.lang b/htdocs/langs/it_IT/other.lang
index af55a95028f..f1b5079789f 100644
--- a/htdocs/langs/it_IT/other.lang
+++ b/htdocs/langs/it_IT/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Codifica Password
 PermissionsAdd=Permessi aggiunti
 PermissionsDelete=Permessi rimossi
 YourPasswordMustHaveAtLeastXChars=La tua password deve contenere almeno %scaratteri
+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
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
 SMSSentTo=SMS sent to %s
diff --git a/htdocs/langs/it_IT/projects.lang b/htdocs/langs/it_IT/projects.lang
index 6868a856c27..6bddc691130 100644
--- a/htdocs/langs/it_IT/projects.lang
+++ b/htdocs/langs/it_IT/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
 ProjectTasksWithoutTimeSpent=Project tasks without time spent
 FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+StartDateCannotBeAfterEndDate=La data di fine non può essere precedente a quella di inizio
diff --git a/htdocs/langs/it_IT/withdrawals.lang b/htdocs/langs/it_IT/withdrawals.lang
index f74b7beacf9..e7205d026a7 100644
--- a/htdocs/langs/it_IT/withdrawals.lang
+++ b/htdocs/langs/it_IT/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Ordine di trasferimento del credito
 LatestBankTransferReceipts=Ultimi %s ordini di bonifico 
 LastWithdrawalReceipts=Latest %s direct debit files
 WithdrawalsLine=Riga ordine di addebito diretto
+CreditTransfer=Bonifico bancario
 CreditTransferLine=Linea di trasferimento del credito
 WithdrawalsLines=Direct debit order lines
 CreditTransferLines=Linee di trasferimento del credito
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Codice bancario del Soggetto terzo
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 WithdrawalCantBeCreditedTwice=Questa ricevuta di prelievo è già contrassegnata come accreditata; questa operazione non può essere eseguita due volte, poiché ciò potrebbe creare pagamenti e movimenti bancari duplicati.
 ClassCredited=Classifica come accreditata
+ClassDebited=Classify debited
 ClassCreditedConfirm=Vuoi davvero classificare questa ricevuta di domiciliazione come accreditata sul vostro conto bancario?
 TransData=Data di trasmissione
 TransMetod=Metodo di trasmissione
diff --git a/htdocs/langs/ja_JP/accountancy.lang b/htdocs/langs/ja_JP/accountancy.lang
index d120fd8d837..28d5b7f9cc6 100644
--- a/htdocs/langs/ja_JP/accountancy.lang
+++ b/htdocs/langs/ja_JP/accountancy.lang
@@ -48,7 +48,7 @@ CountriesNotInEEC=EECにない国
 CountriesInEECExceptMe=%sを除くEECの国
 CountriesExceptMe=%sを除くすべての国
 AccountantFiles=ソースドキュメントのエクスポート
-ExportAccountingSourceDocHelp=With this tool, you can export the source events (list in CSV and PDFs) that are used to generate your accountancy.
+ExportAccountingSourceDocHelp=このツールで、会計処理を生成するために使用されるソースイベント（CSVおよびPDFのリスト）をエクスポートできる。
 ExportAccountingSourceDocHelp2=ジャーナルをエクスポートするには、メニューエントリ%s --%sを使用。
 VueByAccountAccounting=会計科目順に表示
 VueBySubAccountAccounting=アカウンティングサブアカウントで表示
@@ -83,7 +83,7 @@ AccountancyAreaDescProd=ステップ%s：製品/サービスの会計科目を
 
 AccountancyAreaDescBind=ステップ%s：既存の%s行と会計科目の間の紐付けが完了していることを確認する。これにより、アプリケーションはワンクリックで元帳のトランザクションを仕訳できるようになる。不足している紐付を完了する。これには、メニューエントリ%sを使用する。
 AccountancyAreaDescWriteRecords=ステップ%s：元帳にトランザクションを書き込む。これを行うには、メニュー<strong> %s </strong>に移動し、ボタン<strong>%s</strong>をクリックする。
-AccountancyAreaDescAnalyze=ステップ%s：既存のトランザクションを追加または編集し、レポートとエクスポートを生成する。
+AccountancyAreaDescAnalyze=ステップ%s：既存のトランザクションを追加または編集し、報告書sとエクスポートを生成する。
 
 AccountancyAreaDescClosePeriod=ステップ%s：期間を閉じて、将来変更できないようにする。
 
@@ -126,11 +126,11 @@ BookkeepingSubAccount=補助元帳
 AccountBalance=勘定残高
 ObjectsRef=ソースオブジェクト参照
 CAHTF=税引前の合計購入ベンダー
-TotalExpenseReport=総経費レポート
+TotalExpenseReport=総経費報告書
 InvoiceLines=紐付けする請求書の行
 InvoiceLinesDone=請求書の境界線
-ExpenseReportLines=紐付けする経費報告書の行
-ExpenseReportLinesDone=経費報告書の境界線
+ExpenseReportLines=紐付けする経費報告書sの行
+ExpenseReportLinesDone=経費報告書sの境界線
 IntoAccount=会計科目との紐付け行
 TotalForAccount=総会計勘定
 
@@ -213,7 +213,7 @@ TransactionNumShort=数トランザクション
 AccountingCategory=カスタムグループ
 GroupByAccountAccounting=総勘定元帳勘定によるグループ化
 GroupBySubAccountAccounting=補助元帳アカウントでグループ化
-AccountingAccountGroupsDesc=ここで、会計科目のいくつかのグループを定義できる。それらは、パーソナライズされた会計レポートに使用される。
+AccountingAccountGroupsDesc=ここで、会計科目のいくつかのグループを定義できる。それらは、パーソナライズされた会計報告書sに使用される。
 ByAccounts=科目別
 ByPredefinedAccountGroups=事前定義されたグループによる
 ByPersonalizedAccountGroups=パーソナライズされたグループによる
@@ -257,7 +257,7 @@ HideOpeningBalance=期首残高を非表示にする
 ShowSubtotalByGroup=レベルごとに小計を表示
 
 Pcgtype=勘定科目のグループ
-PcgtypeDesc=科目のグループは、一部のアカウンティングレポートの事前定義された「フィルタ」および「グループ化」基準として使用される。たとえば、「INCOME」または「EXPENSE」は、費用/収入レポートを作成するための製品の会計科目のグループとして使用される。
+PcgtypeDesc=科目のグループは、一部のアカウンティング報告書sの事前定義された「フィルタ」および「グループ化」基準として使用される。たとえば、「INCOME」または「EXPENSE」は、費用/収入報告書sを作成するための製品の会計科目のグループとして使用される。
 
 Reconcilable=調整可能
 
@@ -272,10 +272,10 @@ ChangeAccount=選択したラインの製品/サービス会計科目を次の
 Vide=-
 DescVentilSupplier=製品会計科目にバインドされている、またはまだバインドされていない仕入先請求書明細のリストをここで参照すること(会計でまだ転送されていないレコードのみが表示される)
 DescVentilDoneSupplier=ベンダーの請求書の行とその会計科目のリストをここで参照すること
-DescVentilTodoExpenseReport=まだ料金会計科目に紐付けされていない経費レポート行を紐付けする
+DescVentilTodoExpenseReport=まだ料金会計科目に紐付けされていない経費報告書行を紐付けする
 DescVentilExpenseReport=手数料会計科目にバインドされている(またはバインドされていない)経費報告行のリストをここで参照すること
 DescVentilExpenseReportMore=経費報告行の種別で会計科目を設定すると、アプリケーションは、ボタン<strong> "%s" </strong>をワンクリックするだけで、経費報告行と勘定科目表の会計科目の間のすべての紐付けを行うことができる。科目が料金辞書に設定されていない場合、または科目に紐付けされていない行がまだある場合は、メニュー「<strong>%s</strong>」から手動で紐付けする必要がある。
-DescVentilDoneExpenseReport=経費報告書の行とその手数料会計科目のリストをここで参照すること
+DescVentilDoneExpenseReport=経費報告書sの行とその手数料会計科目のリストをここで参照すること
 
 Closure=年次閉鎖
 DescClosure=検証されていない月ごとの動きの数とすでに開いている会計年度をここで参照すること
@@ -326,7 +326,7 @@ NumberOfAccountancyEntries=エントリー数
 NumberOfAccountancyMovements=楽章の数
 ACCOUNTING_DISABLE_BINDING_ON_SALES=販売の会計における紐付け力と移転を無効にする(顧客の請求書は会計に考慮されない)
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=購入時の会計における紐付け力と移転を無効にする(ベンダーの請求書は会計で考慮されない)
-ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=経費報告書の会計における紐付け力と移転を無効にする(経費報告書は会計で考慮されない)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=経費報告書sの会計における紐付け力と移転を無効にする(経費報告書sは会計で考慮されない)
 
 ## Export
 NotifiedExportDate=エクスポートされた行にエクスポート済みのフラグを付ける（行の変更はできない）
@@ -385,7 +385,7 @@ AccountRemovedFromGroup=科目がグループから削除された
 SaleLocal=ローカルセール
 SaleExport=エクスポート販売
 SaleEEC=EECでの販売
-SaleEECWithVAT=VATがnullではないEECでの販売。したがって、これは共同体内販売ではなく、提案された科目は標準の製品科目であると想定する。
+SaleEECWithVAT=VATがnullではないEECでの販売。したがって、これは域内販売ではなく、提案された科目は標準の製品科目であると想定する。
 SaleEECWithoutVATNumber=VATなしのEECでの販売 が、取引先のVATIDは定義されていない。標準販売の製品科目にフォールバックする。必要に応じて、取引先または製品科目のVATIDを修正できる。
 ForbiddenTransactionAlreadyExported=禁止：トランザクションが検証済 かつ/または エクスポート済。
 ForbiddenTransactionAlreadyValidated=禁止：トランザクションは検証済。
@@ -430,7 +430,7 @@ FECFormatMulticurrencyAmount=多通貨額 (Montantdevise)
 FECFormatMulticurrencyCode=他通貨 コード (Idevise)
 
 DateExport=日付のエクスポート
-WarningReportNotReliable=警告、このレポートは元帳に基づいていないため、元帳で手動で変更されたトランザクションは含まれていない。仕訳帳化が最新の場合、簿記ビューはより正確。
+WarningReportNotReliable=警告、この報告書は元帳に基づいていないため、元帳で手動で変更されたトランザクションは含まれていない。仕訳帳化が最新の場合、簿記ビューはより正確。
 ExpenseReportJournal=経費報告仕訳帳
 InventoryJournal=目録日記帳
 
diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang
index fc1e333433e..0856a7b5df9 100644
--- a/htdocs/langs/ja_JP/admin.lang
+++ b/htdocs/langs/ja_JP/admin.lang
@@ -95,7 +95,7 @@ ShowHideDetails=詳細を 表示-非表示
 PreviewNotAvailable=プレビューは利用不可
 ThemeCurrentlyActive=現在有効なテーマ
 MySQLTimeZone=MySql(データベース)のタイムゾーン
-TZHasNoEffect=日付は、送信された文字列として保持されているかのように、データベースサーバーによって保存され返される。タイムゾーンは、UNIX_TIMESTAMP関数を使用する場合にのみ有効 (Dolibarrでは不使用を推奨し、そうすると、データ入力後に変更があったとしても、データベースTZの影響を受けなくなる ) 。
+TZHasNoEffect=日付は、提出された文字列として保持されているかのように、データベースサーバーによって保存され返される。タイムゾーンは、UNIX_TIMESTAMP関数を使用する場合にのみ有効 (Dolibarrでは不使用を推奨し、そうすると、データ入力後に変更があったとしても、データベースTZの影響を受けなくなる ) 。
 Space=スペース
 Table=テーブル
 Fields=フィールド
@@ -317,8 +317,8 @@ UserEmail=ユーザのメール
 CompanyEmail=法人のメール
 FeatureNotAvailableOnLinux=システムと同様にUnix上では使用できないが備わっている。ローカルでsendmailプログラムをテストする。
 FixOnTransifex=プロジェクトのオンライン翻訳プラットフォームで翻訳を修正する
-SubmitTranslation=この言語の翻訳が完了していないか、エラーが見つかった場合は、ディレクトリ<b> langs/%s </b>のファイルを編集して、変更をwww.transifex.com/dolibarr-association/dolibarr/ に送信して修正できる。
-SubmitTranslationENUS=この言語の翻訳が完了していないか、エラーが見つかった場合は、ファイルをディレクトリ<b> langs/%s </b>に編集し、変更されたファイルをdolibarr.org/forumに送信するか、開発者の場合は github.com/Dolibarr/dolibarr のPRを使用して修正できる。
+SubmitTranslation=この言語の翻訳が完了していないか、エラーが見つかった場合は、ディレクトリ<b> langs/%s </b>のファイルを編集して、変更をwww.transifex.com/dolibarr-association/dolibarr/ に提出して修正できる。
+SubmitTranslationENUS=この言語の翻訳が完了していないか、エラーが見つかった場合は、ファイルをディレクトリ<b> langs/%s </b>に編集し、変更されたファイルをdolibarr.org/forumに提出するか、開発者の場合は github.com/Dolibarr/dolibarr のPRを使用して修正できる。
 ModuleSetup=モジュールの設定
 ModulesSetup=モジュール/アプリケーションの設定
 ModuleFamilyBase=システム
@@ -375,7 +375,7 @@ DoTestSendHTML=HTMLを送信するテスト
 ErrorCantUseRazIfNoYearInMask=エラー。シーケンス{yy}または{yyyy}がマスクされていない場合、オプション@を使用して毎年カウンターをリセットすることはできない。
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=エラー、シーケンス場合は、@オプションを使用することはできない{YY} {ミリメートル}または{探す} {mmは}マスクではない。
 UMask=のUnix / Linux / BSDのファイルシステム上に新規ファイルのumaskパラメータ。
-UMaskExplanation=このパラメータは、 ( たとえば、アップロード中に ) 、サーバー上でDolibarrによって作成されたファイルは、デフォルトで設定されているアクセス許可を定義することができる。 <br>それは、8進値 ( 例えば、0666が意味するのは全員に対して読取および書込 ) である必要がある。 <br>このパラメータは、Windowsサーバー上では役に立ちません。
+UMaskExplanation=このパラメータは、 ( たとえば、アップロード中に ) 、サーバー上でDolibarrによって作成されたファイルは、デフォルトで設定されているアクセス許可を定義することができる。 <br>それは、8進値 ( 例えば、0666が意味するのは全員に対して読取および書込 ) である必要がある。 <br>このパラメータは、Windowsサーバー上では役に立たない。
 SeeWikiForAllTeam=寄稿者とその組織のリストについては、Wikiページをご覧ください。
 UseACacheDelay= 秒単位でをエクスポート応答をキャッシュするための遅延 ( 0またはキャッシュなしの空の ) 
 DisableLinkToHelpCenter=ログインページのリンク「<b>ヘルプまたはサポートが必要</b>」を非表示にする
@@ -411,7 +411,7 @@ PDFAddressForging=アドレスセクションのルール
 HideAnyVATInformationOnPDF=消費税/ VATに関連するすべての情報を非表示にする
 PDFRulesForSalesTax=消費税/ VATのルール
 PDFLocaltax=%sのルール
-HideLocalTaxOnPDF=列SaleTax / VATで%sレートを非表示にする
+HideLocalTaxOnPDF=消費税 / VATの列で%sレートを非表示
 HideDescOnPDF=製品説明を非表示にする
 HideRefOnPDF=製品のコードを非表示にする
 HideDetailsOnPDF=製品ラインの詳細を非表示
@@ -519,8 +519,8 @@ GoIntoTranslationMenuToChangeThis=このコードのキーの翻訳が見つか
 WarningSettingSortOrder=警告、デフォルトのソート順を設定すると、フィールドが不明なフィールドの場合、リストページに移動するときに技術エラーが発生する可能性がある。このようなエラーが発生した場合は、このページに戻ってデフォルトの並べ替え順序を削除し、デフォルトの動作を復元すること。
 Field=フィールド
 ProductDocumentTemplates=製品ドキュメントを生成するためのドキュメントテンプレート
-FreeLegalTextOnExpenseReports=経費報告書に関する無料の法的テキスト
-WatermarkOnDraftExpenseReports=ドラフト経費報告書の透かし
+FreeLegalTextOnExpenseReports=経費報告書sに関する無料の法的テキスト
+WatermarkOnDraftExpenseReports=ドラフト経費報告書sの透かし
 ProjectIsRequiredOnExpenseReports=プロジェクトは経費報告書を入力するために必須
 PrefillExpenseReportDatesWithCurrentMonth=新規経費報告書の開始日と終了日を当月の開始日と終了日で事前に入力する
 ForceExpenseReportsLineAmountsIncludingTaxesOnly=経費報告書の金額を常に税金と同じ金額で入力するように強制する
@@ -543,7 +543,7 @@ Module1Desc=企業と連絡先の管理 ( 顧客、見込み客... )
 Module2Name=コマーシャル
 Module2Desc=商業管理
 Module10Name=会計 ( 簡略化 ) 
-Module10Desc=データベースの内容に基づく単純な会計レポート ( ジャーナル、売上高 ) 。元帳テーブルを使用しません。
+Module10Desc=データベースの内容に基づく単純な会計報告書s ( ジャーナル、売上高 ) 。元帳テーブルを使用しません。
 Module20Name=提案
 Module20Desc=商業的な提案の管理
 Module22Name=大量の電子メール
@@ -612,8 +612,8 @@ Module400Name=プロジェクトまたは引合
 Module400Desc=プロジェクト、引合/商談 および/または タスクの管理。また、任意の要素 ( 請求、注文、提案、出張など ) をプロジェクトに割り当て、プロジェクトビューから横断ビューを取得することもできる。
 Module410Name=のwebcalendar
 Module410Desc=のwebcalendar統合
-Module500Name=税金と特別経費
-Module500Desc=その他の費用の管理（消費税、社会的または財政的税、配当、...）
+Module500Name=租税および特別経費
+Module500Desc=その他の費用の管理（消費税、社会税または財政税、配当、...）
 Module510Name=給与
 Module510Desc=従業員の支払いを記録および追跡する
 Module520Name=ローン
@@ -625,8 +625,8 @@ Module610Name=製品バリエーション
 Module610Desc=製品バリエーションの作成 ( 色、サイズなど ) 
 Module700Name=寄付
 Module700Desc=寄付金の管理
-Module770Name=経費報告書
-Module770Desc=経費報告書の請求を管理する ( 輸送、食事、... ) 
+Module770Name=経費報告書s
+Module770Desc=経費報告書sの請求を管理する ( 輸送、食事、... ) 
 Module1120Name=仕入先の商業提案
 Module1120Desc=仕入先の商業提案と価格を要求する
 Module1200Name=カマキリ
@@ -718,11 +718,11 @@ Permission34=製品を削除する。
 Permission36=隠された製品を参照すること/管理
 Permission38=製品をエクスポート
 Permission39=最低価格を無視する
-Permission41=プロジェクトとタスクを読む ( 共有プロジェクトと私が連絡しているプロジェクト ) 。割り当てられたタスクで、私または私の階層に費やされた時間を入力することもできる ( タイムシート ) 
+Permission41=プロジェクトとタスクを読込む ( 共有プロジェクトと私が連絡しているプロジェクト ) 。割り当てられたタスクで、私または私の階層に費やされた時間を入力することもできる ( タイムシート ) 
 Permission42=プロジェクトを作成/変更する ( 共有プロジェクトと連絡先のプロジェクト ) 。タスクを作成し、ユーザをプロジェクトとタスクに割り当てることもできる
 Permission44=プロジェクトを削除する ( 共有プロジェクトと連絡先のプロジェクト ) 
 Permission45=プロジェクトをエクスポート
-Permission61=出張を読む
+Permission61=出張を読込む
 Permission62=出張を作成/変更
 Permission64=出張を削除する。
 Permission67=出張をエクスポート
@@ -734,7 +734,7 @@ Permission72=メンバーを作成/変更
 Permission74=メンバーを削除する
 Permission75=メンバーシップの種類を設定する
 Permission76=データをエクスポート
-Permission78=サブスクリプションを読む
+Permission78=サブスクリプションを読込む
 Permission79=サブスクリプションを作成/変更
 Permission81=お客様の注文を読み取る
 Permission82=作成/変更、顧客の注文
@@ -743,51 +743,51 @@ Permission86=お客様の注文を送る
 Permission87=顧客の注文を閉じる
 Permission88=お客様の注文を取り消す
 Permission89=お客様の注文を削除する
-Permission91=社会税または財政税と付加価値税を読む
+Permission91=社会税または財政税と付加価値税を読込む
 Permission92=社会税または財政税と付加価値税を作成/変更する
 Permission93=社会税または財政税と付加価値税を削除する
 Permission94=社会税または財政税をエクスポート
-Permission95=レポートを読む
-Permission101=sendingsを読む
+Permission95=報告書sを読込む
+Permission101=sendingsを読込む
 Permission102=sendingsを作成/変更
 Permission104=sendingsを検証する
 Permission105=メールで送信する
 Permission106=送信録をエクスポート
 Permission109=sendingsを削除する。
-Permission111=金融勘定を読む
+Permission111=金融勘定を読込む
 Permission112=作成/変更/削除して取引を比較する
-Permission113=金融勘定の設定 ( カテゴリの作成、管理 ) 
+Permission113=金融科目の設定（銀行取引のカテゴリの作成、管理）
 Permission114=トランザクションを調整する
 Permission115=取引と口座ステートメントをエクスポート
 Permission116=アカウント間の転送
 Permission117=小切手の発送を管理する
-Permission121=ユーザにリンクされている取引先を読む
+Permission121=ユーザにリンクされている取引先を読込む
 Permission122=ユーザにリンクされている取引先が作成/変更
 Permission125=ユーザにリンクされている取引先を削除する。
 Permission126=取引先をエクスポート
 Permission130=取引先の支払情報を作成/変更する
-Permission141=すべてのプロジェクトとタスクを読む ( 私が連絡先ではない非公開プロジェクトも ) 
+Permission141=すべてのプロジェクトとタスクを読込む ( 私が連絡先ではない非公開プロジェクトも ) 
 Permission142=すべてのプロジェクトとタスクを作成/変更する ( 私が連絡先ではない非公開プロジェクトも ) 
 Permission144=すべてのプロジェクトとタスクを削除する ( 私が連絡していない非公開プロジェクトも削除する ) 
-Permission146=プロバイダを読む
-Permission147=統計を読む
-Permission151=口座振替の支払い注文を読む
+Permission146=プロバイダを読込む
+Permission147=統計を読込む
+Permission151=口座振替の支払い注文を読込む
 Permission152=口座振替の支払い注文を作成/変更する
 Permission153=口座振替の支払い注文の送信/送信
 Permission154=口座振替の支払い注文のクレジット/拒否を記録する
-Permission161=契約/サブスクリプションを読む
+Permission161=契約/サブスクリプションを読込む
 Permission162=契約/サブスクリプションを作成/変更する
 Permission163=契約のサービス/サブスクリプションをアクティブ化する
 Permission164=契約のサービス/サブスクリプションを無効にする
 Permission165=契約/サブスクリプションを削除する
 Permission167=契約をエクスポート
-Permission171=旅行と経費を読む ( あなたとあなたの部下 ) 
+Permission171=旅行と経費を読込む ( あなたとあなたの部下 ) 
 Permission172=旅行と経費を作成/変更する
 Permission173=旅行と経費を削除する
-Permission174=すべての旅行と経費を読む
+Permission174=すべての旅行と経費を読込む
 Permission178=旅行と経費をエクスポート
-Permission180=仕入先を読む
-Permission181=注文書を読む
+Permission180=仕入先を読込む
+Permission181=注文書を読込む
 Permission182=注文書を作成/変更する
 Permission183=注文書を検証する
 Permission184=注文書を承認する
@@ -797,30 +797,30 @@ Permission187=注文書を閉じる
 Permission188=注文書をキャンセルする
 Permission192=線を作成する
 Permission193=線をキャンセルする
-Permission194=帯域幅の線を読む
+Permission194=帯域幅の線を読込む
 Permission202=ADSL接続を作成する
 Permission203=順序接続順序
 Permission204=順序接続
 Permission205=接続を管理する
 Permission206=接続を読み取る
-Permission211=テレフォニーを読む
+Permission211=テレフォニーを読込む
 Permission212=注文明細行
 Permission213=ラインをアクティブにする
 Permission214=設定テレフォニー
 Permission215=設定·プロバイダー
-Permission221=emailingsを読む
+Permission221=emailingsを読込む
 Permission222=作成/変更emailings ( トピック、受信... ) 
 Permission223= ( 送信できる ) emailingsを検証
 Permission229=emailingsを削除する。
 Permission237=受信者と情報を表示する
 Permission238=手動でメールを送信する
 Permission239=検証後または送信後にメーリングを削除する
-Permission241=カテゴリを読む
+Permission241=カテゴリを読込む
 Permission242=カテゴリを作成/変更
 Permission243=カテゴリを削除する。
 Permission244=隠されたカテゴリの内容を参照すること。
-Permission251=他のユーザおよびグループを読む
-PermissionAdvanced251=他のユーザを読む
+Permission251=他のユーザおよびグループを読込む
+PermissionAdvanced251=他のユーザを読込む
 Permission252=他のユーザの読み取り権限を
 Permission253=他のユーザ、グループ、権限を作成/変更する
 PermissionAdvanced253=内部/外部ユーザおよびアクセス許可を作成/変更
@@ -829,20 +829,20 @@ Permission255=他のユーザのパスワードを変更する
 Permission256=他のユーザを削除するか、または無効にする
 Permission262=すべての取引先とそのオブジェクト（ユーザが営業担当者である取引先だけでなく）へのアクセスを拡張する。 <br>外部ユーザには効果的ではない（提案、注文、請求書、契約などについては常に自分自身に限定される）。 <br>プロジェクトには効果的ではない（プロジェクトの権限、可視性、および割り当てに関するルールのみが重要）。
 Permission263=オブジェクトなしで、すべての取引先にアクセスを拡張する（ユーザが営業担当者である取引先だけでなく）。 <br>外部ユーザには効果的ではない（提案、注文、請求書、契約などについては常に自分自身に限定される）。 <br>プロジェクトには効果的ではない（プロジェクトの権限、可視性、および割り当てに関するルールのみが重要）。
-Permission271=CAを読む
+Permission271=CAを読込む
 Permission272=請求書をお読みください
 Permission273=問題の請求書
 Permission281=連絡先をお読みください
 Permission282=の作成/変更連絡先
 Permission283=連絡先を削除
 Permission286=連絡先をエクスポート
-Permission291=関税を読む
+Permission291=関税を読込む
 Permission292=関税のアクセス許可を設定する
 Permission293=顧客の料金を変更する
-Permission300=バーコードを読む
+Permission300=バーコードを読込む
 Permission301=バーコードを作成/変更する
 Permission302=バーコードを削除する
-Permission311=サービスを読む
+Permission311=サービスを読込む
 Permission312=契約にサービス/サブスクリプションを割り当てる
 Permission331=ブックマークを読み込む
 Permission332=ブックマークを作成/変更
@@ -851,12 +851,12 @@ Permission341=独自の読み取りアクセス許可を
 Permission342=自分のユーザ情報を作成/変更
 Permission343=自分のパスワードを変更する
 Permission344=独自のパーミッションを変更する
-Permission351=グループを読む
+Permission351=グループを読込む
 Permission352=グループの読み取りアクセス許可を
 Permission353=グループを作成/変更
 Permission354=グループを削除するか、または無効にする
 Permission358=ユーザをエクスポート
-Permission401=割引を読む
+Permission401=割引を読込む
 Permission402=割引を作成/変更
 Permission403=割引を検証する
 Permission404=割引を削除する。
@@ -866,12 +866,12 @@ Permission512=給与と支払いを作成/変更する
 Permission514=給与と支払いを削除する
 Permission517=全員の給料と支払いを見る
 Permission519=給与をエクスポート
-Permission520=ローンを読む
+Permission520=ローンを読込む
 Permission522=ローンの作成/変更
 Permission524=ローンを削除する
 Permission525=アクセスローン計算機
 Permission527=ローンをエクスポート
-Permission531=サービスを読む
+Permission531=サービスを読込む
 Permission532=サービスを作成/変更
 Permission534=サービスを削除する
 Permission536=隠されたサービスを参照すること/管理
@@ -880,49 +880,48 @@ Permission561=クレジット転送による支払い注文の読み取り
 Permission562=クレジット転送による支払い注文の作成/変更
 Permission563=クレジット転送による支払い注文の送信/送信
 Permission564=借方/貸方振込の拒否を記録する
-Permission601=ステッカーを読む
+Permission601=ステッカーを読込む
 Permission602=ステッカーを作成/変更する
 Permission609=ステッカーを削除する
-Permission650=部品表を読む
+Permission650=部品表を読込む
 Permission651=部品表の作成/更新
 Permission652=部品表を削除する
-Permission660=製造オーダー ( MO ) を読む
+Permission660=製造オーダー ( MO ) を読込む
 Permission661=製造指図 ( MO ) の作成/更新
 Permission662=製造オーダー ( MO ) の削除
-Permission701=寄付を読む
+Permission701=寄付を読込む
 Permission702=寄付を作成/変更
 Permission703=寄付を削除する。
-Permission771=経費報告書を読む ( あなたとあなたの部下 ) 
-Permission772=経費報告書の作成/変更
-Permission773=経費報告書を削除する
-Permission774=すべての経費報告書を読む ( 部下ではないユーザの場合でも ) 
-Permission775=経費報告書を承認する
-Permission776=経費報告書の支払い
-Permission777=みんなの経費報告書を読む
-Permission778=全員の経費報告書を作成/変更する
-Permission779=経費報告書をエクスポート
-Permission1001=株式を読む
+Permission771=経費報告書sを読込む ( あなたとあなたの部下 ) 
+Permission772=Create/modify expense reports (for you and your subordinates)
+Permission773=経費報告書sを削除する
+Permission775=経費報告書sを承認する
+Permission776=経費報告書sの支払い
+Permission777=Read all expense reports (even those of user not subordinates)
+Permission778=全員の経費報告書sを作成/変更する
+Permission779=経費報告書sをエクスポート
+Permission1001=在庫を読込む
 Permission1002=倉庫の作成/変更
 Permission1003=倉庫を削除する
-Permission1004=株式の動きを読む
-Permission1005=株式の動きを作成/変更
+Permission1004=在庫推移を読込む
+Permission1005=在庫推移を作成/変更
 Permission1011=在庫を見る
 Permission1012=新規目録を作成する
 Permission1014=目録を検証する
 Permission1015=製品のPMP値の変更を許可する
 Permission1016=目録を削除
-Permission1101=配達領収書を読む
+Permission1101=配達領収書を読込む
 Permission1102=配達領収書を作成/変更する
 Permission1104=配達領収書を検証する
 Permission1109=領収書を削除する
-Permission1121=サプライヤーの提案を読む
+Permission1121=サプライヤーの提案を読込む
 Permission1122=サプライヤー提案の作成/変更
 Permission1123=サプライヤーの提案を検証する
 Permission1124=サプライヤーの提案を送信する
 Permission1125=サプライヤー提案を削除する
 Permission1126=サプライヤーの価格要求を閉じる
-Permission1181=仕入先を読む
-Permission1182=注文書を読む
+Permission1181=仕入先を読込む
+Permission1182=注文書を読込む
 Permission1183=注文書を作成/変更する
 Permission1184=注文書を検証する
 Permission1185=注文書を承認する
@@ -934,7 +933,7 @@ Permission1190=発注書を承認 ( 2回目の承認 ) する
 Permission1191=サプライヤーの注文とその属性をエクスポート
 Permission1201=エクスポートの結果を得る
 Permission1202=エクスポートを作成/変更
-Permission1231=仕入先の請求書を読む
+Permission1231=仕入先の請求書を読込む
 Permission1232=仕入先の請求書を作成/変更する
 Permission1233=仕入先の請求書を検証する
 Permission1234=仕入先の請求書を削除する
@@ -945,47 +944,43 @@ Permission1251=データベース ( データロード ) に外部データの
 Permission1321=顧客の請求書、属性、および支払いをエクスポート
 Permission1322=支払い済の請求書を再開する
 Permission1421=受注と属性をエクスポート
-Permission1521=ドキュメントを読む
+Permission1521=ドキュメントを読込む
 Permission1522=ドキュメントを削除する
 Permission2401=ユーザアカウントにリンクされているアクション ( イベントまたはタスク ) を読み取る ( イベントの所有者または割り当てられたばかりの場合 ) 
 Permission2402=ユーザアカウントにリンクされたアクション ( イベントまたはタスク ) を作成/変更する ( イベントの所有者の場合 ) 
 Permission2403=ユーザアカウントにリンクされているアクション ( イベントまたはタスク ) を削除する ( イベントの所有者の場合 ) 
-Permission2411=他のアクション ( イベントまたはタスク ) を読む
+Permission2411=他のアクション ( イベントまたはタスク ) を読込む
 Permission2412=他のアクション ( イベントまたはタスク ) を作成/変更
 Permission2413=他のアクション ( イベントまたはタスク ) を削除
 Permission2414=他の人のアクション/タスクをエクスポート
-Permission2501=ドキュメントを読む/ダウンロード
+Permission2501=ドキュメントを読込む/ダウンロード
 Permission2502=ドキュメントをダウンロードする
 Permission2503=書類の提出または削除
 Permission2515=設定のドキュメントディレクトリ
 Permission2801=FTPクライアントを読み取りモードで使用する ( 参照およびダウンロードのみ ) 
 Permission2802=FTPクライアントを書き込みモードで使用する ( ファイルを削除またはアップロードする ) 
-Permission3200=アーカイブされたイベントとフィンガープリントを読む
+Permission3200=アーカイブされたイベントとフィンガープリントを読込む
 Permission3301=新規モジュールを生成する
-Permission4001=従業員を見る
-Permission4002=従業員を作成する
-Permission4003=従業員を削除する
-Permission4004=従業員をエクスポート
-Permission4010=技能/職種/役職を読む
-Permission4011=技能/職種/役職の作成/変更
-Permission4012=技能/職種/役職を削除する
-Permission4020=評価を読む
-Permission4021=評価の作成/変更
+Permission4001=技能/職種/役職を読込む
+Permission4002=技能/職種/役職の作成/変更
+Permission4003=技能/職種/役職を削除する
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=評価を検証する
 Permission4023=評価を削除する
 Permission4030=比較メニューを見る
-Permission10001=ウェブサイトのコンテンツを読む
+Permission10001=ウェブサイトのコンテンツを読込む
 Permission10002=ウェブサイトのコンテンツ ( htmlおよびjavascriptコンテンツ ) を作成/変更する
 Permission10003=Webサイトのコンテンツ ( 動的PHPコード ) を作成/変更する。危険。制限された開発者に予約する必要がある。
 Permission10005=ウェブサイトのコンテンツを削除する
-Permission20001=休暇申請書 ( あなたの休暇と部下の休暇 ) を読む
+Permission20001=休暇申請書 ( あなたの休暇と部下の休暇 ) を読込む
 Permission20002=休暇申請 ( 休暇と部下の休暇 ) を作成/変更する
 Permission20003=休暇申請を削除する
-Permission20004=すべての休暇申請を読む ( 部下ではないユーザも ) 
-Permission20005=すべての人 ( 部下ではないユーザも含む ) の休暇申請を作成/変更する
-Permission20006=休職申請 ( 残高の設定と更新 ) 
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=休暇申請を承認する
-Permission23001=スケジュールされたジョブを読む
+Permission23001=スケジュールされたジョブを読込む
 Permission23002=スケジュールされたジョブの作成/更新
 Permission23003=スケジュールされたジョブを削除する
 Permission23004=スケジュールされたジョブを実行する
@@ -993,9 +988,9 @@ Permission50101=POS ( SimplePOS ) を使用する
 Permission50151=POS ( TakePOS ) を使用する
 Permission50152=販売ラインを編集する
 Permission50153=注文済販売行を編集
-Permission50201=トランザクションを読む
+Permission50201=トランザクションを読込む
 Permission50202=輸入取引
-Permission50330=Zapierのオブジェクトを読む
+Permission50330=Zapierのオブジェクトを読込む
 Permission50331=Zapierのオブジェクトを作成/更新する
 Permission50332=Zapierのオブジェクトを削除する
 Permission50401=製品と請求書を会計アカウントにバインドする
@@ -1004,28 +999,28 @@ Permission50412=元帳での書き込み/編集操作
 Permission50414=元帳の削除操作
 Permission50415=年ごとのすべての操作と元帳の仕訳を削除する
 Permission50418=元帳の操作をエクスポート
-Permission50420=レポートとエクスポートレポート ( 売上高、残高、仕訳帳、元帳 ) 
+Permission50420=報告書sとエクスポート報告書s ( 売上高、残高、仕訳帳、元帳 ) 
 Permission50430=会計期間を定義する。トランザクションを検証し、会計期間を閉じる。
 Permission50440=勘定科目表の管理、会計の設定
-Permission51001=アセットを読む
+Permission51001=アセットを読込む
 Permission51002=アセットの作成/更新
 Permission51003=アセットを削除する
 Permission51005=アセットの種類を設定する
 Permission54001=印刷
-Permission55001=世論調査を読む
+Permission55001=世論調査を読込む
 Permission55002=投票の作成/変更
-Permission59001=売上総利益を読む
+Permission59001=売上総利益を読込む
 Permission59002=売上総利益を定義する
-Permission59003=すべてのユーザ粗利を読む
-Permission63001=リソースを読む
+Permission59003=すべてのユーザ粗利を読込む
+Permission63001=リソースを読込む
 Permission63002=リソースの作成/変更
 Permission63003=リソースを削除する
 Permission63004=リソースを議題イベントにリンクする
 Permission64001=直接印刷を許可する
 Permission67000=領収書の印刷を許可する
-Permission68001=コム内レポートを読む
-Permission68002=コム内レポートの作成/変更
-Permission68004=コム内レポートを削除する
+Permission68001=域内報告書を読込む
+Permission68002=域内報告書の作成/変更
+Permission68004=域内報告書を削除する
 Permission941601=領収書を読んで
 Permission941602=領収書を作成および変更する
 Permission941603=領収書を検証する
@@ -1043,7 +1038,7 @@ DictionaryCurrency=通貨
 DictionaryCivility=敬称
 DictionaryActions=議題イベントの種類
 DictionarySocialContributions=社会税または財政税の種類
-DictionaryVAT=VATレートまたは販売税率
+DictionaryVAT=VAT率または消費税率
 DictionaryRevenueStamp=税印紙の額
 DictionaryPaymentConditions=支払い条件
 DictionaryPaymentModes=支払いモード
@@ -1058,7 +1053,7 @@ DictionaryStaff=就業者数
 DictionaryAvailability=配達遅延
 DictionaryOrderMethods=注文方法
 DictionarySource=提案/受注の起源
-DictionaryAccountancyCategory=レポート用にパーソナライズされたグループ
+DictionaryAccountancyCategory=報告書s用にパーソナライズされたグループ
 DictionaryAccountancysystem=勘定科目表のモデル
 DictionaryAccountancyJournal=会計仕訳帳
 DictionaryEMailTemplates=メールテンプレート
@@ -1071,7 +1066,7 @@ DictionaryHolidayTypes=休暇-休暇の種類
 DictionaryOpportunityStatus=プロジェクト/引合の引合ステータス
 DictionaryExpenseTaxCat=経費報告書-輸送カテゴリ
 DictionaryExpenseTaxRange=経費報告書-輸送カテゴリ別の範囲
-DictionaryTransportMode=Intracom レポート-トランスポートモード
+DictionaryTransportMode=域内報告書-トランスポートモード
 DictionaryBatchStatus=製品ロット/シリアル品質管理ステータス
 TypeOfUnit=ユニットの種類
 SetupSaved=設定が保存されました
@@ -1080,7 +1075,7 @@ BackToModuleList=モジュールリストに戻る
 BackToDictionaryList=辞書リストに戻る
 TypeOfRevenueStamp=税印紙の種類
 VATManagement=消費税管理
-VATIsUsedDesc=見込み客、請求書、注文などを作成するときのデフォルトでは、消費税率はアクティブな標準ルールに従いる。<br>売り手が消費税の対象ではない場合、消費税はデフォルトで0になる。ルールの終了。 <br> ( 販売者の国=購入者の国 ) の場合、デフォルトでは、消費税は販売者の国での製品の消費税と等しくなる。ルールの終わり。 <br>販売者と購入者の両方が欧州共同体にあり、商品が輸送関連製品 ( 運送、配送、航空法人 ) の場合、デフォルトのVATは0。このルールは販売者の国によって異なる。会計士にご相談ください。 VATは、売り手ではなく、買い手が自国の税関に支払う必要がある。ルールの終わり。 <br>売り手と買い手が両方とも欧州共同体にいて、買い手が法人ではない場合 ( コミュニティ内のVAT番号が登録されている場合 ) 、VATはデフォルトで売り手の国のVAT率になる。ルールの終わり。 <br>売り手と買い手の両方が欧州共同体にあり、買い手が法人 ( コミュニティ内のVAT番号が登録されている ) である場合、VATはデフォルトで0。ルールの終わり。 <br>その他の場合、提案されたデフォルトは消費税= 0。ルールの終わり。
+VATIsUsedDesc=見込み客、請求書、注文などを作成するときのデフォルトでは、消費税率はアクティブな標準ルールに従う。<br>売り手が消費税の対象ではない場合、消費税はデフォルトで0になる。ルール終了。 <br> ( 販売者の国=購入者の国 ) の場合、デフォルトでは、消費税は販売者の国での製品の消費税と等しくなる。ルール終了。 <br>販売者と購入者の両方が欧州共同体にあり、商品が輸送関連製品 ( 運送、配送、航空法人 ) の場合、デフォルトのVATは0。このルールは販売者の国によって異なる。会計士に相談すること。 VATは、売り手ではなく、買い手が自国の税関に支払う必要がある。ルール終了。 <br>売り手と買い手が両方とも欧州共同体にいて、買い手が法人ではない場合 ( コミュニティ内のVAT番号が登録されている場合 ) 、VATはデフォルトで売り手の国のVAT率になる。ルール終了。 <br>売り手と買い手の両方が欧州共同体にあり、買い手が法人 ( コミュニティ内のVAT番号が登録されている ) である場合、VATはデフォルトで0。ルール終了。 <br>その他の場合、提案されたデフォルトは消費税= 0。ルール終了。
 VATIsNotUsedDesc=デフォルトでは、提案された消費税は0であり、協会、個人、または中小企業などの場合に使用できる。
 VATIsUsedExampleFR=フランスでは、実際の財政システム ( 簡略化された実際または通常の実際 ) を持っている企業または組織を意味する。 VATが申告されるシステム。
 VATIsNotUsedExampleFR=フランスでは、消費税が申告されていない団体、または零細企業の財政システム ( フランチャイズの消費税 ) を選択し、消費税の申告なしでフランチャイズの消費税を支払った企業、組織、または自由業を意味する。この選択により、請求書に「該当しない消費税-CGIのart-293B」という参照が表示される。
@@ -1109,16 +1104,16 @@ LocalTax2IsUsedDescES=見込み客、請求書、注文などを作成すると
 LocalTax2IsNotUsedDescES=デフォルトでは、提案されたIRPFは0。ルールの終わり。
 LocalTax2IsUsedExampleES=スペインでは、フリーランサーとサービス業の個人事業者とモジュール税制を選択した法人。
 LocalTax2IsNotUsedExampleES=スペインでは、それらはモジュールの税制の対象とならない企業。
-RevenueStampDesc=「税印紙」または「収入印紙」は、請求書ごとの固定税  ( 請求書の金額には依存しません ) 。パーセント税にすることもできるが、税印紙はレポートを提供しないため、パーセント税には2番目または3番目の種別の税を使用する方が適している。この種の税金を使用している国はごくわずか。
+RevenueStampDesc=「税印紙」または「収入印紙」は、請求書ごとの固定税  ( 請求書の金額には依存しない ) 。パーセント税にすることもできるが、税印紙は報告を供しないため、パーセント税には2番目または3番目の種別の税を使用する方が適している。この種の税金を使用している国はごくわずか。
 UseRevenueStamp=税印紙を使用する
 UseRevenueStampExample=税印紙の値は、デフォルトで辞書の設定に定義されている ( %s --%s --%s ) 
-CalcLocaltax=地方税に関するレポート
+CalcLocaltax=地方税に関する報告書s
 CalcLocaltax1=販売-購入
-CalcLocaltax1Desc=地方税レポートは、地方税の売上と地方税の購入の差で計算される
+CalcLocaltax1Desc=地方税報告書sは、地方税の売上と地方税の購入の差で計算される
 CalcLocaltax2=購入
-CalcLocaltax2Desc=地方税レポートは、地方税の購入の合計。
+CalcLocaltax2Desc=地方税報告書sは、地方税の購入の合計。
 CalcLocaltax3=販売
-CalcLocaltax3Desc=地方税レポートは地方税の売上の合計 
+CalcLocaltax3Desc=地方税報告書sは地方税の売上の合計 
 NoLocalTaxXForThisCountry=税金の設定 ( %s --%s --%sを参照 ) によると、あなたの国はそのような種別の税金を使用する必要はない
 LabelUsedByDefault=ない翻訳がコードに見つからない場合、デフォルトで使用されるラベル
 LabelOnDocuments=ドキュメントのラベル
@@ -1328,7 +1323,7 @@ AlphaNumOnlyLowerCharsAndNoSpace=スペースのない英数字と小文字の
 SendmailOptionNotComplete=警告は、一部のLinuxシステムでは、電子メールから電子メールを送信するためには、sendmailの実行設定する必要がある含むオプション-BA ( パラメータmail.force_extra_parameters php.iniファイルに ) 。一部の受信者がメールを受信しない場合は、mail.force_extra_parameters =-BA ) と、このPHPパラメータを編集してみること。
 PathToDocuments=ドキュメントへのパス
 PathDirectory=ディレクトリ
-SendmailOptionMayHurtBuggedMTA=メソッド "PHP mail direct" を使用してメールを送信する機能は、一部の受信メールサーバーによって正しく解析されない可能性のあるメールメッセージを生成する。その結果、バグのあるプラットフォームでホストされているユーザが一部のメールを読むことができなくなる。これは一部のインターネットプロバイダーに当てはまる ( 例：フランスのOrange ) 。これは、DolibarrまたはPHPの問題ではなく、受信メールサーバーの問題。ただし、【設定】-【その他】でオプション MAIN_FIX_FOR_BUGGED_MTA を1で追加し、これを回避するようにDolibarrを変更できる。ただし、SMTP標準を厳密に使用する他のサーバーで問題が発生する可能性がある。もう1つの解決策 ( 推奨 ) は、欠点のない "SMTPソケットライブラリ" メソッドを使用すること。
+SendmailOptionMayHurtBuggedMTA=メソッド "PHP mail direct" を使用してメールを送信する機能は、一部の受信メールサーバーによって正しく解析されない可能性のあるメールメッセージを生成する。その結果、バグのあるプラットフォームでホストされているユーザが一部のメールを読込むことができなくなる。これは一部のインターネットプロバイダーに当てはまる ( 例：フランスのOrange ) 。これは、DolibarrまたはPHPの問題ではなく、受信メールサーバーの問題。ただし、【設定】-【その他】でオプション MAIN_FIX_FOR_BUGGED_MTA を1で追加し、これを回避するようにDolibarrを変更できる。ただし、SMTP標準を厳密に使用する他のサーバーで問題が発生する可能性がある。もう1つの解決策 ( 推奨 ) は、欠点のない "SMTPソケットライブラリ" メソッドを使用すること。
 TranslationSetup=翻訳の設定
 TranslationKeySearch=翻訳キーまたは文字列を検索する
 TranslationOverwriteKey=翻訳文字列を上書きする
@@ -1615,7 +1610,7 @@ LDAPDescMembers=このページでは、Dolibarrメンバーモジュールで
 LDAPDescMembersTypes=このページでは、Dolibarrメンバー種別で見つかった各データのLDAPツリーでLDAP属性名を定義できる。
 LDAPDescValues=値の例は、次のロードされたスキーマを持つ<b>OpenLDAPの</b>ために設計されている<b>。core.schema、cosine.schema、inetorgperson.schema ) 。</b>あなたがthoose値とOpenLDAPを使用する場合は、すべてのthooseスキーマが読み込まれているように、LDAP設定<b>ファイル</b> slapd.conf <b>を</b>変更<b>する</b> 。
 ForANonAnonymousAccess=認証されたアクセスも ( たとえば、書き込みアクセス用 ) 
-PerfDolibarr=パフォーマンスの設定/最適化レポート
+PerfDolibarr=パフォーマンスの設定/最適化報告書
 YouMayFindPerfAdviceHere=このページでは、パフォーマンスに関連するいくつかのチェックまたはアドバイスを提供する。
 NotInstalled=インストールされていない。
 NotSlowedDownByThis=これによって遅くなることはない。
@@ -1741,7 +1736,7 @@ FCKeditorForMail=すべてのメールのWYSIWIG作成/エディション ( 【
 FCKeditorForTicket=チケットのWYSIWIG作成/エディション
 ##### Stock #####
 StockSetup=在庫モジュールの設定
-IfYouUsePointOfSaleCheckModule=デフォルトで提供されているPOSモジュールまたは外部モジュールを使用する場合、この設定はPOSモジュールによって無視される可能性がある。ほとんどのPOSモジュールは、デフォルトで、ここでのオプションに関係なく、請求書をすぐに作成し、在庫を減らすように設計されている。したがって、POSから販売を登録するときに在庫を減らす必要があるかどうかにかかわらず、POSモジュールの設定も確認すること。
+IfYouUsePointOfSaleCheckModule=デフォルトで提供されている販売時点モジュール(POS)または外部モジュールを使用する場合、この設定はPOSモジュールによって無視される可能性がある。ほとんどのPOSモジュールは、デフォルトで、ここでのオプションに関係なく、請求書をすぐに作成し、在庫を減らすように設計されている。したがって、POSから販売を登録するときに在庫を減らす必要があるかどうかにかかわらず、POSモジュールの設定も確認すること。
 ##### Menu #####
 MenuDeleted=メニューを削除
 Menu=メニュー
@@ -1874,9 +1869,9 @@ TestGeoIPResult=変換IPのテスト - &gt;国
 ##### Projects #####
 ProjectsNumberingModules=プロジェクトは、モジュールの番号
 ProjectsSetup=プロジェクトモジュールの設定
-ProjectsModelModule=プロジェクトの報告書ドキュメントモデル
+ProjectsModelModule=プロジェクトの報告書sドキュメントモデル
 TasksNumberingModules=タスク番号付けモジュール
-TaskModelModule=タスクレポートドキュメントモデル
+TaskModelModule=タスク報告書sドキュメントモデル
 UseSearchToSelectProject=キーが押されるまで待ってから、プロジェクトコンボリストのコンテンツをロードすること。 <br>これにより、プロジェクトの数が多い場合にパフォーマンスが向上する可能性があるが、あまり便利ではない。
 ##### ECM (GED) #####
 ##### Fiscal Year #####
@@ -1900,10 +1895,10 @@ SortOrder=並べ替え順序
 Format=フォーマット
 TypePaymentDesc=0：顧客支払い種別、1：仕入先支払い種別、2：顧客とサプライヤーの両方の支払い種別
 IncludePath=インクルードパス ( 変数%sに定義 ) 
-ExpenseReportsSetup=モジュール経費報告書の設定
+ExpenseReportsSetup=モジュール経費報告書sの設定
 TemplatePDFExpenseReports=経費報告書ドキュメントを生成するためのドキュメントテンプレート
-ExpenseReportsRulesSetup=モジュール経費報告書の設定-ルール
-ExpenseReportNumberingModules=経費報告書の番号付けモジュール
+ExpenseReportsRulesSetup=モジュール経費報告書sの設定-ルール
+ExpenseReportNumberingModules=経費報告書sの番号付けモジュール
 NoModueToManageStockIncrease=自動在庫増加を管理できるモジュールはアクティブ化されていない。在庫増加は手動入力のみで行われる。
 YouMayFindNotificationsFeaturesIntoModuleNotification=モジュール「通知」を有効にして構成することにより、電子メール通知のオプションを見つけることができる。
 TemplatesForNotifications=通知用のテンプレート
@@ -1978,8 +1973,8 @@ ByDefaultInList=リストビューにデフォルトで表示
 YouUseLastStableVersion=最新の安定バージョンを使用する
 TitleExampleForMajorRelease=このメジャーリリースを発表するために使用できるメッセージの例 ( Webサイトで自由に使用すること ) 
 TitleExampleForMaintenanceRelease=このメンテナンスリリースを発表するために使用できるメッセージの例 ( Webサイトで自由に使用すること ) 
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP＆CRM%sが利用可能。バージョン%sは、ユーザと開発者の両方に多くの新機能を備えたメジャーリリース。 https://www.dolibarr.orgポータル ( サブディレクトリStableバージョン ) のダウンロードエリアからダウンロードできる。変更の完全なリストについては、<a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog</a>を読むことができる。
-ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP＆CRM%sが利用可能。バージョン%sはメンテナンスバージョンであるため、バグ修正のみが含まれている。すべてのユーザがこのバージョンにアップグレードすることをお勧めする。メンテナンスリリースでは、データベースに新規機能や変更は導入されない。 https://www.dolibarr.orgポータル ( サブディレクトリStableバージョン ) のダウンロードエリアからダウンロードできる。変更の完全なリストについては、<a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog</a>を読むことができる。
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP＆CRM%sが利用可能。バージョン%sは、ユーザと開発者の両方に多くの新機能を備えたメジャーリリース。 https://www.dolibarr.orgポータル ( サブディレクトリStableバージョン ) のダウンロードエリアからダウンロードできる。変更の完全なリストについては、<a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog</a>を読込むことができる。
+ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP＆CRM%sが利用可能。バージョン%sはメンテナンスバージョンであるため、バグ修正のみが含まれている。すべてのユーザがこのバージョンにアップグレードすることをお勧めする。メンテナンスリリースでは、データベースに新規機能や変更は導入されない。 https://www.dolibarr.orgポータル ( サブディレクトリStableバージョン ) のダウンロードエリアからダウンロードできる。変更の完全なリストについては、<a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog</a>を読込むことができる。
 MultiPriceRuleDesc=オプション「製品/サービスごとの価格のいくつかのレベル」が有効になっている場合、製品ごとに異なる価格 ( 価格レベルごとに1つ ) を定義できる。時間を節約するために、ここで、最初のレベルの価格に基づいて各レベルの価格を自動計算するルールを入力できる。したがって、各製品の最初のレベルの価格を入力するだけで済む。このページは時間を節約するように設計されているが、各レベルの価格が最初のレベルに関連している場合にのみ役立つ。ほとんどの場合、このページは無視してかまいない。
 ModelModulesProduct=製品ドキュメントのテンプレート
 WarehouseModelModules=倉庫のドキュメントのテンプレート
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=このコレクターのコレクションを今す
 NoNewEmailToProcess=処理する新規電子メール ( 一致するフィルタ ) はない
 NothingProcessed=何もしていない
 XEmailsDoneYActionsDone=%s電子メールが修飾され、%s電子メールが正常に処理されました ( %sレコード/アクションが実行された場合 ) 
-RecordEvent=メールイベントを記録する
-CreateLeadAndThirdParty=引合 ( および必要に応じて取引先 ) を作成する
-CreateTicketAndThirdParty=チケットを作成する ( 以前の操作でロードされた場合は取引先にリンクする ) 
+RecordEvent=議題にイベントを記録する（送信または受信した電子メールの種類を使用）
+CreateLeadAndThirdParty=リード（および必要なら取引先）を作成する
+CreateTicketAndThirdParty=チケットを作成する（取引先が以前の操作によってロードされた場合は取引先にリンクされ、それ以外の場合は取引先はリンクされない）
 CodeLastResult=最新の結果コード
 NbOfEmailsInInbox=ソースディレクトリ内の電子メールの数
 LoadThirdPartyFromName=%sで検索している取引先をロードする ( ロードのみ ) 
 LoadThirdPartyFromNameOrCreate=%sで検索している取引先をロードする ( 見つからない場合は作成する ) 
+AttachJoinedDocumentsToObject=メールトピックにオブジェクトの参照が見つかった場合は、添付ファイルをオブジェクトドキュメントに保存する。
 WithDolTrackingID=Dolibarrから送信された最初の電子メールによって開始された会話からのメッセージ
 WithoutDolTrackingID=Dolibarrから送信されていない最初の電子メールによって開始された会話からのメッセージ
 WithDolTrackingIDInMsgId=Dolibarrから送信されたメッセージ
@@ -2084,7 +2080,7 @@ CreateCandidature=求人応募を作成する
 FormatZip=郵便番号
 MainMenuCode=メニュー入力コード ( メインメニュー ) 
 ECMAutoTree=自動ECMツリーを表示する
-OperationParamDesc=アクションのオブジェクトに使用する値、または値を抽出する方法を定義する。例:<br>objproperty1=SET:設定する値<br>objproperty2=SET:__ objproperty1__を置き換えた値<br>objproperty3=SETIFEMPTY:objproperty3がまだ定義されていない場合に使用される値<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:私の法人名は\\s([^\\s]*)<br><br>プロパティを抽出または設定するための区切り文字としての 文字 ; を使う。
+OperationParamDesc=値の抽出または設定に使用するルールを定義する。<br>電子メールの件名から名前を抽出する必要がある操作の例:<br>name=EXTRACT:SUBJECT:法人([^\n]*)からのお知らせ<br>オブジェクトを作成する操作の例:<br>objproperty1=SET:設定する値<br>objproperty2=SET:__objproperty1__の値を含む値<br>objproperty3=SETIFEMPTY:objproperty3 が未設定の場合に使われる値<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:法人名は\\s([^\\s]*)<br><br>いくつかのプロパティを抽出または設定するための区切り文字としての文字「;」を使う。
 OpeningHours=営業時間
 OpeningHoursDesc=あなたの法人の通常の営業時間をここに入力すること。
 ResourceSetup=リソースモジュールの構成
@@ -2130,7 +2126,7 @@ LargerThan=より大きい
 IfTrackingIDFoundEventWillBeLinked=オブジェクトの追跡IDが電子メールで見つかった場合、または電子メールがすでに収集されてオブジェクトにリンクされている電子メールの回答である場合、作成されたイベントは既知の関連オブジェクトに自動的にリンクされる。
 WithGMailYouCanCreateADedicatedPassword=Gmailアカウントで、2段階検証を有効にした場合は、https://myaccount.google.com/ での自分のGoogleパスワードを使わないで、アプリケーション専用の2番目のパスワードを作成することを勧める。
 EmailCollectorTargetDir=正常に処理されたときに電子メールを別のタグ/ディレクトリに移動することが望ましい動作である可能性がある。この機能を使用するには、ここでディレクトリの名前を設定するだけ  ( 名前に特殊文字を使用しないこと ) 。読み取り/書き込みログインアカウントも使用する必要があることに注意すること。
-EmailCollectorLoadThirdPartyHelp=このアクションを使用すると、メールコンテンツを使用して、データベース内の既存の取引先を検索してロードできる。見つかった（または作成された）取引先は、それを必要とする次のアクションに使用される。 <br>たとえば、本文にて「Name: 見尽名前」という文字列から抽出した名前を使って取引先名を登録するには、送信者メールをemailと置いて、次のようにパラメータフィールドを設定できる。<br> 'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;' <br>　
+EmailCollectorLoadThirdPartyHelp=このアクションを使用して、電子メールコンテンツを使用して、データベース内の既存の取引先を検索してロードできる。見つかった（または作成された）取引先は、それを必要とするアクションを追跡するために使用される。 <br>たとえば、文字列 'Name: name to find' から抽出された名前で取引先を作成する場合は、送信者の電子メールをemailと置くと、次のようにパラメータフィールドを設定できる。<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;' <br>
 EndPointFor=%sのエンドポイント：%s
 DeleteEmailCollector=メールコレクターを削除する
 ConfirmDeleteEmailCollector=このメールコレクターを削除してもよいか？
@@ -2158,7 +2154,7 @@ TemplateUpdated=テンプレートを更新
 TemplateDeleted=テンプレートが削除されました
 MailToSendEventPush=イベントリマインダーメール
 SwitchThisForABetterSecurity=セキュリティを強化するために、この値を%sに切り替えることをお勧めする
-DictionaryProductNature= 製品の性質
+DictionaryProductNature= 製品目
 CountryIfSpecificToOneCountry=国 ( 特定の国に固有の場合 ) 
 YouMayFindSecurityAdviceHere=ここにセキュリティアドバイザリがある
 ModuleActivatedMayExposeInformation=このPHP拡張機能は、機密データを公開する可能性がある。不要な場合は無効にすること。
@@ -2205,7 +2201,7 @@ DashboardDisableBlockContract=契約のサムネを無効にする
 DashboardDisableBlockTicket=チケットのサムネを無効にする
 DashboardDisableBlockBank=銀行のサムネを無効にする
 DashboardDisableBlockAdherent=メンバーシップのサムネを無効にする
-DashboardDisableBlockExpenseReport=経費報告書のサムネを無効にする
+DashboardDisableBlockExpenseReport=経費報告書sのサムネを無効にする
 DashboardDisableBlockHoliday=葉のサムネを無効にする
 EnabledCondition=フィールドを有効にする条件（有効にしない場合、可視性は常にオフになる）
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=2番目の税金を使用する場合は、最初の消費税も有効にする必要がある
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = %sの翻訳がない
 NativeModules=ネイティブモジュール
 NoDeployedModulesFoundWithThisSearchCriteria=これらの検索条件に対応するモジュールが見つからない
 API_DISABLE_COMPRESSION=API応答の圧縮を無効にする
+EachTerminalHasItsOwnCounter=各端末は独自のカウンターを使用する。
diff --git a/htdocs/langs/ja_JP/agenda.lang b/htdocs/langs/ja_JP/agenda.lang
index a485d5ecf6f..6ee85ac8114 100644
--- a/htdocs/langs/ja_JP/agenda.lang
+++ b/htdocs/langs/ja_JP/agenda.lang
@@ -12,7 +12,7 @@ Event=イベント
 Events=イベント
 EventsNb=イベント数
 ListOfActions=イベントのリスト
-EventReports=イベントレポート
+EventReports=イベント報告書s
 Location=場所
 ToUserOfGroup=グループ内の任意のユーザーに割り当てられたイベント
 EventOnFullDay=一日のイベント
diff --git a/htdocs/langs/ja_JP/bills.lang b/htdocs/langs/ja_JP/bills.lang
index 51adc748e19..02baec060d7 100644
--- a/htdocs/langs/ja_JP/bills.lang
+++ b/htdocs/langs/ja_JP/bills.lang
@@ -76,16 +76,14 @@ ReceivedPayments=受け取った支払
 ReceivedCustomersPayments=顧客から受け取った支払
 PayedSuppliersPayments=仕入先に支払われる支払
 ReceivedCustomersPaymentsToValid=検証するために受信されたお客様の支払
-PaymentsReportsForYear=%sの支払報告書
-PaymentsReports=決済レポート
+PaymentsReportsForYear=%sの支払報告書s
+PaymentsReports=決済報告書s
 PaymentsAlreadyDone=支払は実行済
 PaymentsBackAlreadyDone=払戻は実行済
 PaymentRule=支払ルール
 PaymentMode=支払種別
 DefaultPaymentMode=デフォルト支払種別
 DefaultBankAccount=デフォルト銀行口座
-PaymentTypeDC=デビット/クレジットカード
-PaymentTypePP=PayPal
 IdPaymentMode=支払種別(id)
 CodePaymentMode=支払種別(コード)
 LabelPaymentMode=支払種別(ラベル)
@@ -400,7 +398,7 @@ GeneratedFromTemplate=テンプレート請求書から生成%s
 WarningInvoiceDateInFuture=警告、請求日が現在の日付よりも高くなっている
 WarningInvoiceDateTooFarInFuture=警告、請求日が現在の日付から遠すぎる
 ViewAvailableGlobalDiscounts=利用可能な割引を表示する
-GroupPaymentsByModOnReports=レポートのモードごとのグループ支払
+GroupPaymentsByModOnReports=報告書sのモードごとのグループ支払
 # PaymentConditions
 Statut=ステータス
 PaymentConditionShortRECEP=受領時
@@ -450,6 +448,8 @@ PaymentTypeTRA=銀行為替手形
 PaymentTypeShortTRA=下書き
 PaymentTypeFAC=因子
 PaymentTypeShortFAC=因子
+PaymentTypeDC=デビット/クレジットカード
+PaymentTypePP=PayPal
 BankDetails=銀行の詳細
 BankCode=銀行コード
 DeskCode=支店コード
diff --git a/htdocs/langs/ja_JP/boxes.lang b/htdocs/langs/ja_JP/boxes.lang
index 4577f167c95..d21f5b0d29b 100644
--- a/htdocs/langs/ja_JP/boxes.lang
+++ b/htdocs/langs/ja_JP/boxes.lang
@@ -48,7 +48,7 @@ BoxLastExpiredServices=アクティブな期限切れのサービスを持つ最
 BoxTitleLastActionsToDo=実行する最新の%sアクション
 BoxTitleLastContracts=変更された最新の%s契約
 BoxTitleLastModifiedDonations=変更された最新の%s寄付
-BoxTitleLastModifiedExpenses=変更された最新の%s経費報告書
+BoxTitleLastModifiedExpenses=変更された最新の%s経費報告書s
 BoxTitleLatestModifiedBoms=変更された最新の%sBOM
 BoxTitleLatestModifiedMos=変更された最新の%s製造オーダー
 BoxTitleLastOutstandingBillReached=最大未払い額を超えた顧客
@@ -104,7 +104,7 @@ BoxLastManualEntries=手動またはソースドキュメントなしで入力
 BoxTitleLastManualEntries=%s手動またはソースドキュメントなしで入力された最新のレコード
 NoRecordedManualEntries=会計に手動入力の記録はない
 BoxSuspenseAccount=サスペンスアカウントで会計操作をカウントする
-BoxTitleSuspenseAccount=未割り当て回線の数
+BoxTitleSuspenseAccount=未割り当て行の数
 NumberOfLinesInSuspenseAccount=仮勘定の行数
 SuspenseAccountNotDefined=一時停止アカウントが定義されていない
 BoxLastCustomerShipments=最後の顧客の出荷
diff --git a/htdocs/langs/ja_JP/cashdesk.lang b/htdocs/langs/ja_JP/cashdesk.lang
index a3947c4d92e..0d3a9f4dd31 100644
--- a/htdocs/langs/ja_JP/cashdesk.lang
+++ b/htdocs/langs/ja_JP/cashdesk.lang
@@ -7,7 +7,7 @@ CashDeskBankCheque=銀行口座(チェック)
 CashDeskWarehouse=倉庫
 CashdeskShowServices=販売サービス
 CashDeskProducts=製品
-CashDeskStock=株式
+CashDeskStock=在庫
 CashDeskOn=上の
 CashDeskThirdParty=第三者
 ShoppingCart=ショッピングカート
@@ -104,7 +104,7 @@ StartAParallelSale=新規並行販売を開始する
 SaleStartedAt=%sから販売開始
 ControlCashOpening=POSを開くときに「現金の管理」ポップアップを開く
 CloseCashFence=現金出納帳制御を閉じる
-CashReport=現金レポート
+CashReport=現金報告書
 MainPrinterToUse=使用するメインプリンター
 OrderPrinterToUse=使用するプリンタを注文する
 MainTemplateToUse=使用するメインテンプレート
@@ -133,4 +133,4 @@ SplitSale=分割販売
 PrintWithoutDetailsButton=「詳細なしで印刷」ボタンを追加
 PrintWithoutDetailsLabelDefault=詳細なしで印刷する場合のデフォルトの行ラベル
 PrintWithoutDetails=詳細なしで印刷
-YearNotDefined=Year is not defined
+YearNotDefined=年は未定義
diff --git a/htdocs/langs/ja_JP/commercial.lang b/htdocs/langs/ja_JP/commercial.lang
index 8dd879e6269..9a121c41589 100644
--- a/htdocs/langs/ja_JP/commercial.lang
+++ b/htdocs/langs/ja_JP/commercial.lang
@@ -17,7 +17,7 @@ ActionOnContact=関連連絡先
 TaskRDVWith=%sとの打合せ
 ShowTask=タスクを表示
 ShowAction=イベントを表示
-ActionsReport=イベントレポート
+ActionsReport=イベント報告書
 ThirdPartiesOfSaleRepresentative=営業担当者との取引先
 SaleRepresentativesOfThirdParty=取引先の営業担当者
 SalesRepresentative=営業担当者
@@ -52,7 +52,7 @@ ActionAC_TEL=電話
 ActionAC_FAX=FAX送信
 ActionAC_PROP=メールで提案を送信
 ActionAC_EMAIL=電子メールを送信
-ActionAC_EMAIL_IN=メールの受信
+ActionAC_EMAIL_IN=メールの受付
 ActionAC_RDV=打ち合わせ
 ActionAC_INT=現場での介入
 ActionAC_FAC=メールでの顧客の請求書を送信
diff --git a/htdocs/langs/ja_JP/companies.lang b/htdocs/langs/ja_JP/companies.lang
index a5c96dcc460..18adc3d380e 100644
--- a/htdocs/langs/ja_JP/companies.lang
+++ b/htdocs/langs/ja_JP/companies.lang
@@ -43,10 +43,10 @@ Individual=個人
 ToCreateContactWithSameName=取引先の下にある取引先と同じ情報で連絡先/住所を自動作成。ほとんどの場合、取引先が実在の人物であっても、取引先を作成するだけで十分。
 ParentCompany=親会社
 Subsidiaries=子会社
-ReportByMonth=月次レポート
-ReportByCustomers=顧客ごとのレポート
-ReportByThirdparties=仕入先ごとのレポート
-ReportByQuarter=料金ごとのレポート
+ReportByMonth=月次報告書
+ReportByCustomers=顧客ごとの報告書
+ReportByThirdparties=仕入先ごとの報告書
+ReportByQuarter=料金ごとの報告書
 CivilityCode=敬称コード
 RegisteredOffice=登録事務所
 Lastname=姓
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=プロフID 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
diff --git a/htdocs/langs/ja_JP/compta.lang b/htdocs/langs/ja_JP/compta.lang
index 1bc537f8bc2..8dc912d5ebc 100644
--- a/htdocs/langs/ja_JP/compta.lang
+++ b/htdocs/langs/ja_JP/compta.lang
@@ -168,7 +168,7 @@ AnnualByCompaniesDueDebtMode=収支差額、事前定義されたグループに
 AnnualByCompaniesInputOutputMode=収支差額、事前定義されたグループによる詳細、モード<b>%sIncomes-Expenses%s</b>は<b>現金会計</b>と言える。
 SeeReportInInputOutputMode=元帳未計上によらず、 <b>%s支払の分析%s</b> を参照すること。その対象は <b>記録済支払</b> に基づく計算。
 SeeReportInDueDebtMode=元帳未計上によらず、 <b>%s記録済文書sの分析%s</b> を参照すること。その対象は、既知の <b>記録済文書s </b> に基づく計算。
-SeeReportInBookkeepingMode=<b>%s簿記元帳テーブルの分析%s</b> を参照すること。その対象は、 <b>簿記元帳テーブル</b>基づくレポート。
+SeeReportInBookkeepingMode=<b>%s簿記元帳テーブルの分析%s</b> を参照すること。その対象は、 <b>簿記元帳テーブル</b>基づく報告書。
 RulesAmountWithTaxIncluded=-表示されている金額はすべての税金が含まれている
 RulesAmountWithTaxExcluded=-表示されている請求書の金額は、すべて税抜き
 RulesResultDue=-支払済かどうかにかかわらず、すべての請求書、経費、VAT、寄付、給与が含まれる。 <br>-請求書の請求日と、費用または納税の期限日に基づいている。給与については、期末日を使用する。
@@ -183,31 +183,31 @@ RulesResultBookkeepingPersonalized=パーソナライズされたグループ</b
 SeePageForSetup=設定については、メニュー<a href="%s"> %s</a>を参照すること。
 DepositsAreNotIncluded=-頭金の請求書は含まれていない
 DepositsAreIncluded=-頭金の請求書が含まれている
-LT1ReportByMonth=月ごとの税2レポート
-LT2ReportByMonth=月ごとの税3レポート
+LT1ReportByMonth=月ごとの税2報告書
+LT2ReportByMonth=月ごとの税3報告書
 LT1ReportByCustomers=第三者による税2の報告
 LT2ReportByCustomers=第三者による税3の報告
-LT1ReportByCustomersES=取引先REによるレポート
+LT1ReportByCustomersES=取引先REによる報告書
 LT2ReportByCustomersES=第三者IRPFによる報告
-VATReport=消費税レポート
-VATReportByPeriods=期間別の消費税レポート
-VATReportByMonth=月別の消費税レポート
-VATReportByRates=料金別の消費税レポート
-VATReportByThirdParties=取引先による消費税レポート　
-VATReportByCustomers=顧客別の消費税レポート
+VATReport=消費税報告書
+VATReportByPeriods=期間別の消費税報告書
+VATReportByMonth=月別の消費税報告書
+VATReportByRates=料金別の消費税報告書
+VATReportByThirdParties=取引先による消費税報告書　
+VATReportByCustomers=顧客別の消費税報告書
 VATReportByCustomersInInputOutputMode=収集され支払われた顧客によるVATの報告
 VATReportByQuartersInInputOutputMode=徴収され支払われた税金の消費税率による報告
 VATReportShowByRateDetails=このレートの詳細を表示する
 LT1ReportByQuarters=税率2を報告する
 LT2ReportByQuarters=税率3を報告する
-LT1ReportByQuartersES=RE率によるレポート
-LT2ReportByQuartersES=IRPF率によるレポート
-SeeVATReportInInputOutputMode=標準的な計算については、レポート<b> %sVATcollection%s</b>を参照すること。
-SeeVATReportInDueDebtMode=請求に関するオプションを使用した計算については、debit%s</b>のレポート<b>%sVATを参照すること。
-RulesVATInServices=-サービスの場合、レポートには、支払い日に基づいて実際に受領または支払われた支払いのVATが含まれる。
-RulesVATInProducts=-重要な資産の場合、レポートには支払い日に基づくVATが含まれる。
-RulesVATDueServices=-サービスの場合、レポートには、請求書の日付に基づいた、支払済みかどうかに関係なく、期日が到来した請求書のVATが含まれる。
-RulesVATDueProducts=-重要な資産の場合、レポートには、請求日に基づいた期日請求書のVATが含まれる。
+LT1ReportByQuartersES=RE率による報告書
+LT2ReportByQuartersES=IRPF率による報告書
+SeeVATReportInInputOutputMode=標準的な計算については、報告書<b> %sVATcollection%s</b>を参照すること。
+SeeVATReportInDueDebtMode=請求に関するオプションを使用した計算については、debit%s</b>の報告書<b>%sVATを参照すること。
+RulesVATInServices=-サービスの場合、報告書には、支払い日に基づいて実際に受領または支払われた支払いのVATが含まれる。
+RulesVATInProducts=-重要な資産の場合、報告書には支払い日に基づくVATが含まれる。
+RulesVATDueServices=-サービスの場合、報告書には、請求書の日付に基づいた、支払済みかどうかに関係なく、期日が到来した請求書のVATが含まれる。
+RulesVATDueProducts=-重要な資産の場合、報告書には、請求日に基づいた期日請求書のVATが含まれる。
 OptionVatInfoModuleComptabilite=注：材料の資産については、それがより公正に配信した日付を使用する必要がある。
 ThisIsAnEstimatedValue=これは、最終元帳テーブルではなくビジネスイベントに基づくプレビューであるため、最終結果はこのプレビュー値とは異なる場合がある。
 PercentOfInvoice=%%/請求書
@@ -238,8 +238,8 @@ Mode1=方法1
 Mode2=方法2
 CalculationRuleDesc=合計VATを計算するには、次の2つの方法がある。<br>方法1は、各行のバットを丸めてから合計。 <br>方法2は、各行のすべてのバットを合計してから、結果を丸める。 <br>最終結果は数円異なる場合がある。デフォルトのモードは <b> %s</b> モード。
 CalculationRuleDescSupplier=ベンダーによると、適切な方法を選択して同じ計算ルールを適用し、ベンダーが期待する同じ結果を取得する。
-TurnoverPerProductInCommitmentAccountingNotRelevant=製品ごとに回収済売上高のレポートは利用できない。このレポートは、請求済売上高に対してのみ使用できる。
-TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=売却税率ごとに回収済売上高のレポートは利用できない。このレポートは、請求済売上高に対してのみ使用できる。
+TurnoverPerProductInCommitmentAccountingNotRelevant=製品ごとに回収済売上高の報告書は利用できない。この報告書は、請求済売上高に対してのみ使用できる。
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=売却税率ごとに回収済売上高の報告書は利用できない。この報告書は、請求済売上高に対してのみ使用できる。
 CalculationMode=計算モード
 AccountancyJournal=会計コードジャーナル
 ACCOUNTING_VAT_SOLD_ACCOUNT=販売時のVATのデフォルトの会計アカウント(VATディクショナリの設定で定義されていない場合に使用)
@@ -253,11 +253,11 @@ ConfirmCloneTax=社会税/財政税のクローンを確認する
 ConfirmCloneVAT=VAT宣言のクローンを確認する
 ConfirmCloneSalary=給与のクローンを確認する
 CloneTaxForNextMonth=来月のためにそれをクローンする
-SimpleReport=簡単なレポート
-AddExtraReport=追加レポート(海外および国内の顧客レポートを追加)
+SimpleReport=簡単な報告書
+AddExtraReport=追加報告書s(海外および国内の顧客報告書sを追加)
 OtherCountriesCustomersReport=外国の顧客の報告
 BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=自法人の国コードとは異なるVAT番号の最初の2文字に基づく
-SameCountryCustomersWithVAT=全国の顧客レポート
+SameCountryCustomersWithVAT=全国の顧客報告書
 BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=VAT番号の最初の2文字が、自法人の国コードと同じであることに基づく
 LinkedFichinter=介入へのリンク
 ImportDataset_tax_contrib=社会/財政税
@@ -273,8 +273,8 @@ ClaimedForThisPeriod=期間中請求
 PaidDuringThisPeriod=この期間に支払われた
 PaidDuringThisPeriodDesc=これは、選択した日付範囲内の期末日を持つVAT申告にリンクされたすべての支払いの合計。
 ByVatRate=売却税率
-TurnoverbyVatrate=売上税率での請求済売上高
-TurnoverCollectedbyVatrate=売上税率での回収済売上高
+TurnoverbyVatrate=消費税率別請求高
+TurnoverCollectedbyVatrate=消費税率別回収高
 PurchasebyVatrate=売却税率による購入
 LabelToShow=短縮ラベル
 PurchaseTurnover=購入売上高
@@ -285,8 +285,8 @@ RulesPurchaseTurnoverTotalPurchaseJournal=これには、購入仕訳帳から
 RulesPurchaseTurnoverOfExpenseAccounts=それには、グループEXPENSEでの製品勘定の (借方-貸方) 行が含まれる。
 ReportPurchaseTurnover=請求済購入取引高
 ReportPurchaseTurnoverCollected=回収済購入取引高
-IncludeVarpaysInResults = レポートにさまざまな支払を含める
-IncludeLoansInResults = レポートにローンを含める
+IncludeVarpaysInResults = 報告書sにさまざまな支払を含める
+IncludeLoansInResults = 報告書sにローンを含める
 InvoiceLate30Days = 請求書遅延（> 30日）
 InvoiceLate15Days = 請求書遅延（15〜30日）
 InvoiceLateMinus15Days = 請求書遅延（<15日）
diff --git a/htdocs/langs/ja_JP/contracts.lang b/htdocs/langs/ja_JP/contracts.lang
index 8a55813e756..f0e5c280047 100644
--- a/htdocs/langs/ja_JP/contracts.lang
+++ b/htdocs/langs/ja_JP/contracts.lang
@@ -73,13 +73,13 @@ ServiceStatus=サービスのステータス
 DraftContracts=下書き契約
 CloseRefusedBecauseOneServiceActive=少なくとも1つのオープンサービスがあるため、契約を閉じることはできない
 ActivateAllContracts=すべて契約行をアクティブ化する
-CloseAllContracts=すべて契約回線を閉じる
+CloseAllContracts=すべて契約行を閉じる
 DeleteContractLine=契約の行を削除する
 ConfirmDeleteContractLine=こ契約行を削除してもよいか？
 MoveToAnotherContract=別契約にサービスを移動する。
 ConfirmMoveToAnotherContract=私は、新規ターゲット契約を選びましたし、私はこ契約には、このサービスを移動することを確認する。
 ConfirmMoveToAnotherContractQuestion=このサービスを移動する(同じ取引先の)既存契約を選択するか？
-PaymentRenewContractId=契約回線(番号の%s)を​​更新
+PaymentRenewContractId=契約行(番号%s)を​​更新
 ExpiredSince=有効期限の日付
 NoExpiredServices=失効済アクティブサービス無し
 ListOfServicesToExpireWithDuration=%s日で失効済になるサービスリスト
diff --git a/htdocs/langs/ja_JP/cron.lang b/htdocs/langs/ja_JP/cron.lang
index 3ef0d3a7c88..f6215bfde2a 100644
--- a/htdocs/langs/ja_JP/cron.lang
+++ b/htdocs/langs/ja_JP/cron.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - cron
 # About page
 # Right
-Permission23101 = スケジュールされたジョブを読む
+Permission23101 = スケジュールされたジョブを読込む
 Permission23102 = スケジュールされたジョブの作成/更新
 Permission23103 = スケジュールされたジョブを削除する
 Permission23104 = スケジュールされたジョブを実行する
diff --git a/htdocs/langs/ja_JP/deliveries.lang b/htdocs/langs/ja_JP/deliveries.lang
index 950d219d9cb..0a6356e386b 100644
--- a/htdocs/langs/ja_JP/deliveries.lang
+++ b/htdocs/langs/ja_JP/deliveries.lang
@@ -24,7 +24,7 @@ GoodStatusDeclaration=良好な状態で上記の品物を受け取っている
 Deliverer=配送者：
 Sender=差出人
 Recipient=受領者
-ErrorStockIsNotEnough=在庫が不足
+ErrorStockIsNotEnough=在庫が不十分
 Shippable=発送可能
 NonShippable=発送不可
 ShowShippableStatus=出荷可能なステータスを表示する
diff --git a/htdocs/langs/ja_JP/errors.lang b/htdocs/langs/ja_JP/errors.lang
index 0b3a50c8a0b..13a207c0d0a 100644
--- a/htdocs/langs/ja_JP/errors.lang
+++ b/htdocs/langs/ja_JP/errors.lang
@@ -174,7 +174,7 @@ ErrorPriceExpression24=変数 '%s'は存在するが、値がない
 ErrorPriceExpressionInternal=内部エラー '%s'
 ErrorPriceExpressionUnknown=不明なエラー '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=ソースウェアハウスとターゲットウェアハウスは異なる必要がある
-ErrorTryToMakeMoveOnProductRequiringBatchData=ロット/シリアル情報を必要とする製品 '%s'で、ロット/シリアル情報なしで在庫移動を行おうとするとエラーが発生した
+ErrorTryToMakeMoveOnProductRequiringBatchData=ロット/シリアル情報を必要とする製品 '%s'で、ロット/シリアル情報なしで在庫推移を行おうとするとエラーが発生した
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=記録されたすべての受付は、このアクションを実行する前に、まず確認(承認または拒否)する必要がある
 ErrorCantSetReceptionToTotalDoneWithReceptionDenied=このアクションを実行する前に、記録されたすべての受付を最初に確認(承認)する必要がある
 ErrorGlobalVariableUpdater0=HTTPリクエストがエラー "%s" で失敗した
@@ -273,6 +273,7 @@ ErrorWrongFileName=ファイル名に__SOMETHING__を含めることはできな
 ErrorNotInDictionaryPaymentConditions=支払条件辞書にないので、変更すること。
 ErrorIsNotADraft=%sはドラフトではない
 ErrorExecIdFailed=コマンド「id」を実行できない
+ErrorBadCharIntoLoginName=ログイン名に含まれる不正な文字
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=PHPパラメータ upload_max_filesize(%s)は、PHPパラメータ post_max_size(%s)よりも大きくなっている。これは一貫した設定ではない。
diff --git a/htdocs/langs/ja_JP/exports.lang b/htdocs/langs/ja_JP/exports.lang
index b61dad09fb0..08d9d2203f5 100644
--- a/htdocs/langs/ja_JP/exports.lang
+++ b/htdocs/langs/ja_JP/exports.lang
@@ -49,7 +49,7 @@ LineQty=線の量
 LineTotalHT=除く金額ラインの税金
 LineTotalTTC=ラインのための税の額
 LineTotalVAT=ラインの付加価値税の額
-TypeOfLineServiceOrProduct=回線の種類(0 =製品、1 =サービス)
+TypeOfLineServiceOrProduct=行の種類(0 =製品、1 =サービス)
 FileWithDataToImport=インポートするデータを持つファイル
 FileToImport=インポートするソースファイル
 FileMustHaveOneOfFollowingFormat=インポートするファイルは、次のいずれかの形式である必要がある
diff --git a/htdocs/langs/ja_JP/holiday.lang b/htdocs/langs/ja_JP/holiday.lang
index 2db88fa993e..6b9f0513907 100644
--- a/htdocs/langs/ja_JP/holiday.lang
+++ b/htdocs/langs/ja_JP/holiday.lang
@@ -32,7 +32,7 @@ ErrorEndDateCP=開始日よりも大きい終了日を選択する必要があ
 ErrorSQLCreateCP=作成中にSQLエラーが発生した：
 ErrorIDFicheCP=エラーが発生した。脱退リクエストは存在しない。
 ReturnCP=前のページに戻る
-ErrorUserViewCP=この休暇申請を読むことは許可されていない。
+ErrorUserViewCP=この休暇申請を読込むことは許可されていない。
 InfosWorkflowCP=情報ワークフロー
 RequestByCP=に要求された
 TitreRequestCP=休暇願
diff --git a/htdocs/langs/ja_JP/install.lang b/htdocs/langs/ja_JP/install.lang
index 9797b5de7b1..248c0d1fe6e 100644
--- a/htdocs/langs/ja_JP/install.lang
+++ b/htdocs/langs/ja_JP/install.lang
@@ -165,7 +165,7 @@ MigrationPaymentsNothingToUpdate=これ以上実行すべきことはない
 MigrationPaymentsNothingUpdatable=訂正することができるこれ以上の支払いなし
 MigrationContractsUpdate=契約データの補正
 MigrationContractsNumberToUpdate=更新する%s契約(複数可)
-MigrationContractsLineCreation=契約のref %sの契約回線を作成する。
+MigrationContractsLineCreation=契約参照 %s の契約行を作成する。
 MigrationContractsNothingToUpdate=これ以上実行すべきことsはない
 MigrationContractsFieldDontExist=フィールドfk_factureはもう存在しません。何もすることはありません。
 MigrationContractsEmptyDatesUpdate=契約空の日付の訂正
@@ -188,7 +188,7 @@ MigrationBankTransfertsNothingToUpdate=すべてのリンクが最新のもの
 MigrationShipmentOrderMatching=Sendings領収書の更新
 MigrationDeliveryOrderMatching=配信確認メッセージの更新
 MigrationDeliveryDetail=配信のアップデート
-MigrationStockDetail=製品の在庫の値を更新
+MigrationStockDetail=製品の在庫値を更新
 MigrationMenusDetail=動的メニューのテーブルを更新
 MigrationDeliveryAddress=出荷の配送先住所を更新
 MigrationProjectTaskActors=テーブルllx_projet_task_actorsのデータ移行
diff --git a/htdocs/langs/ja_JP/intracommreport.lang b/htdocs/langs/ja_JP/intracommreport.lang
index 83b8b3f574b..b34291e0d39 100644
--- a/htdocs/langs/ja_JP/intracommreport.lang
+++ b/htdocs/langs/ja_JP/intracommreport.lang
@@ -1,7 +1,7 @@
-Module68000Name = Intracomm レポート
-Module68000Desc = Intracomm レポート管理(フランス語のDEB / DES形式のサポート)
-IntracommReportSetup = Intracommreportモジュールの設定
-IntracommReportAbout = Intracomm レポートについて
+Module68000Name = 域内報告書
+Module68000Desc = 域内報告書管理(フランス語のDEB / DES形式のサポート)
+IntracommReportSetup = 域内報告書モジュールの設定
+IntracommReportAbout = 域内報告書について
 
 # Setup
 INTRACOMMREPORT_NUM_AGREMENT=Numérod'agrément(délivréparleCISD de rattachement)
@@ -14,7 +14,7 @@ INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégoriedeservicesdetype「Fraisdeport」
 INTRACOMMREPORT_NUM_DECLARATION=Numérodedéclarant
 
 # Menu
-MenuIntracommReport=Intracomm レポート
+MenuIntracommReport=域内報告書
 MenuIntracommReportNew=新規宣言
 MenuIntracommReportList=リスト
 
diff --git a/htdocs/langs/ja_JP/main.lang b/htdocs/langs/ja_JP/main.lang
index a713b4e5302..ce1f83fd418 100644
--- a/htdocs/langs/ja_JP/main.lang
+++ b/htdocs/langs/ja_JP/main.lang
@@ -86,7 +86,7 @@ FileTransferComplete=ファイルが正常にアップロードされました
 FilesDeleted=ファイルが正常に削除されました
 FileWasNotUploaded=ファイルが添付ファイルが選択されているが、まだアップロードされませんでした。このために &quot;添付ファイル&quot;をクリックしてください。
 NbOfEntries=エントリー番号
-GoToWikiHelpPage=オンラインヘルプを読む(インターネットアクセスが必要)
+GoToWikiHelpPage=オンラインヘルプを読込む(インターネットアクセスが必要)
 GoToHelpPage=ヘルプを見る
 DedicatedPageAvailable=現在の画面に関連する専用のヘルプページ
 HomePage=ホームページ
@@ -212,6 +212,8 @@ User=ユーザー
 Users=ユーザー
 Group=グループ
 Groups=グループ
+UserGroup=ユーザ・グループ
+UserGroups=ユーザ・グループs
 NoUserGroupDefined=ユーザーグループが定義されていない
 Password=パスワード
 PasswordRetype=パスワードを再入力
@@ -247,7 +249,7 @@ DefaultModel=デフォルトのドキュメントテンプレート
 Action=イベント
 About=約
 Number=数
-NumberByMonth=月ごとの合計レポート
+NumberByMonth=月ごとの合計報告書s
 AmountByMonth=月別量
 Numero=数
 Limit=制限
@@ -289,7 +291,7 @@ DateOperationShort=オペラ。日付
 DateLimit=日付を制限する
 DateRequest=リクエストの日付
 DateProcess=処理日
-DateBuild=日付をビルドレポート
+DateBuild=ビルド日を報告
 DatePayment=支払日
 DateApprove=承認日
 DateApprove2=承認日(2回目の承認)
@@ -417,9 +419,9 @@ HT=税抜
 TTC=税込
 INCVATONLY=Inc. VAT
 INCT=全ての税額を含む
-VAT=売上税
+VAT=消費税
 VATIN=IGST
-VATs=売上税
+VATs=消費税s
 VATINs=IGST税
 LT1=消費税2
 LT1Type=消費税2タイプ
@@ -620,12 +622,12 @@ JoinMainDoc=主ドキュメントを結合
 DateFormatYYYYMM=YYYY-MM
 DateFormatYYYYMMDD=YYYY-MM-DD
 DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH：SS
-ReportName=レポート名
-ReportPeriod=レポート期間
+ReportName=報告書名
+ReportPeriod=報告書期間
 ReportDescription=説明
-Report=レポート
+Report=報告書
 Keyword=キーワード
-Origin=原点
+Origin=原産地
 Legend=凡例
 Fill=字詰め
 Reset=リセット
@@ -888,7 +890,7 @@ Progress=進捗
 ProgressShort=プログラム
 FrontOffice=フロントオフィス
 BackOffice=バックオフィス
-Submit=参加する
+Submit=提出
 View=見る
 Export=Export
 Exports=Exports
@@ -924,7 +926,7 @@ WebSite=ウェブサイト
 WebSites=ウェブサイト
 WebSiteAccounts=ウェブサイトアカウント
 ExpenseReport=経費報告書
-ExpenseReports=経費報告書
+ExpenseReports=経費報告書s
 HR=人事
 HRAndBank=人事と銀行
 AutomaticallyCalculated=自動計算
@@ -1037,7 +1039,7 @@ SearchIntoSupplierProposals=ベンダーの提案
 SearchIntoInterventions=介入
 SearchIntoContracts=契約
 SearchIntoCustomerShipments=顧客の出荷
-SearchIntoExpenseReports=経費報告書
+SearchIntoExpenseReports=経費報告書s
 SearchIntoLeaves=離れる
 SearchIntoTickets=切符売場
 SearchIntoCustomerPayments=顧客の支払い
@@ -1098,7 +1100,7 @@ ContactDefault_ticket=チケット
 ContactAddedAutomatically=連絡先の取引先の役割から追加された連絡先
 More=もっと
 ShowDetails=詳細を表示
-CustomReports=カスタムレポート
+CustomReports=カスタム報告書s
 StatisticsOn=の統計
 SelectYourGraphOptionsFirst=グラフオプションを選択してグラフを作成する
 Measures=対策
diff --git a/htdocs/langs/ja_JP/margins.lang b/htdocs/langs/ja_JP/margins.lang
index e688edfb0ff..65aaf84dfa3 100644
--- a/htdocs/langs/ja_JP/margins.lang
+++ b/htdocs/langs/ja_JP/margins.lang
@@ -37,9 +37,9 @@ CostPrice=原価
 UnitCharges=ユニット料金
 Charges=料金
 AgentContactType=商業代理店の連絡先タイプ
-AgentContactTypeDetails=連絡先/住所ごとの利益レポートに使用される連絡先タイプ(請求書にリンクされている)を定義する。ほとんどの場合、連絡先が請求書で明示的に定義されていない可能性があるため、連絡先の統計の読み取りは信頼できないことに注意すること。
+AgentContactTypeDetails=連絡先/住所ごとの利益報告書に使用される連絡先タイプ(請求書にリンクされている)を定義する。ほとんどの場合、連絡先が請求書で明示的に定義されていない可能性があるため、連絡先の統計の読み取りは信頼できないことに注意すること。
 rateMustBeNumeric=レートは数値でなければなりません
 markRateShouldBeLesserThan100=マーク率は100未満である必要がある
 ShowMarginInfos=利益情報を表示する
 CheckMargins=利益の詳細
-MarginPerSaleRepresentativeWarning=ユーザーあたりの利益のレポートは、取引先と営業担当者の間のリンクを使用して、各営業担当者の利益を計算する。一部の取引先には専任の営業担当者がいない場合や、一部の取引先が複数にリンクされている場合があるため、一部の金額はこのレポートに含まれない場合があり(営業担当者がいない場合)、一部は異なる行に表示される場合がある(営業担当者ごとに) 。
+MarginPerSaleRepresentativeWarning=ユーザーあたりの利益の報告書は、取引先と営業担当者の間のリンクを使用して、各営業担当者の利益を計算する。一部の取引先には専任の営業担当者がいない場合や、一部の取引先が複数にリンクされている場合があるため、一部の金額はこの報告書に含まれない場合があり(営業担当者がいない場合)、一部は異なる行に表示される場合がある(営業担当者ごとに) 。
diff --git a/htdocs/langs/ja_JP/mrp.lang b/htdocs/langs/ja_JP/mrp.lang
index 9d2d822e9e6..550a0d40faf 100644
--- a/htdocs/langs/ja_JP/mrp.lang
+++ b/htdocs/langs/ja_JP/mrp.lang
@@ -14,7 +14,7 @@ BOMsSetup=モジュールBOMの設定
 ListOfBOMs=部品表のリスト - BOM
 ListOfManufacturingOrders=製造注文のリスト
 NewBOM=新規部品表
-ProductBOMHelp=このBOMで作成（または分解）する製品。 <br>注：プロパティ「製品の性質」=「原材料」を持つ製品はこのリストに表示されない。
+ProductBOMHelp=このBOMで作成（または分解）する製品。 <br>注：プロパティ「製品目」=「原材料」を持つ製品はこのリストに表示されない。
 BOMsNumberingModules=BOM番号付けテンプレート
 BOMsModelModule=BOMドキュメントテンプレート
 MOsNumberingModules=MOナンバリングテンプレート
@@ -67,7 +67,7 @@ TheProductXIsAlreadyTheProductToProduce=追加する製品は、すでに生産
 ForAQuantityOf=%sの生産数量について
 ForAQuantityToConsumeOf=%sを分解する数量に対して
 ConfirmValidateMo=この製造指図を検証してよいか？
-ConfirmProductionDesc='%s'をクリックすると、設定された数量の消費および/または生産を検証する。これにより、在庫が更新され、在庫の動きが記録される。
+ConfirmProductionDesc='%s'をクリックすると、設定された数量の消費および/または生産を検証する。これにより、在庫が更新され、在庫推移が記録される。
 ProductionForRef=%sの生産
 AutoCloseMO=消費および生産する数量に達した場合、製造指図を自動的に閉じる
 NoStockChangeOnServices=サービスの在庫変更はない
diff --git a/htdocs/langs/ja_JP/orders.lang b/htdocs/langs/ja_JP/orders.lang
index 0c4da8923cc..8e3fb4c8b70 100644
--- a/htdocs/langs/ja_JP/orders.lang
+++ b/htdocs/langs/ja_JP/orders.lang
@@ -30,7 +30,7 @@ OrdersInProcess=進行中の販売注文
 OrdersToProcess=処理する受注
 SuppliersOrdersToProcess=処理する注文書
 SuppliersOrdersAwaitingReception=受付待ちの注文書
-AwaitingReception=レセプション待ち
+AwaitingReception=受付待ち
 StatusOrderCanceledShort=キャンセル
 StatusOrderDraftShort=下書き
 StatusOrderValidatedShort=検証
@@ -49,8 +49,8 @@ StatusOrderReceivedAllShort=受け取った製品
 StatusOrderCanceled=キャンセル
 StatusOrderDraft=下書き(検証する必要がある)
 StatusOrderValidated=検証
-StatusOrderOnProcess=注文済-スタンバイ受信
-StatusOrderOnProcessWithValidation=注文済-スタンバイ受信または検証
+StatusOrderOnProcess=注文済 - 受付待機
+StatusOrderOnProcessWithValidation=注文済 - 受付または検証を待機
 StatusOrderProcessed=処理
 StatusOrderToBill=請求する
 StatusOrderApproved=承認された
@@ -121,7 +121,7 @@ DispatchSupplierOrder=注文書の受信%s
 FirstApprovalAlreadyDone=最初の承認はすでに行われている
 SecondApprovalAlreadyDone=2回目の承認はすでに完了している
 SupplierOrderReceivedInDolibarr=注文書%sが%sを受け取りた
-SupplierOrderSubmitedInDolibarr=注文書%sが送信された
+SupplierOrderSubmitedInDolibarr=注文書%sが提出された
 SupplierOrderClassifiedBilled=注文書%sセットの請求
 OtherOrders=他の注文
 SupplierOrderValidatedAndApproved=サプライヤーの注文は検証および承認されている：%s
@@ -153,7 +153,7 @@ PDFEdisonDescription=単純な次のモデル
 PDFProformaDescription=完全な 見積請求書 テンプレート
 CreateInvoiceForThisCustomer=請求書注文
 CreateInvoiceForThisSupplier=請求書注文
-CreateInvoiceForThisReceptions=ビルレセプション
+CreateInvoiceForThisReceptions=ビル受付
 NoOrdersToInvoice=請求可能な注文はない
 CloseProcessedOrdersAutomatically=選択したすべての注文を「処理済」に分類する。
 OrderCreation=注文の作成
@@ -166,7 +166,7 @@ OptionToSetOrderBilledNotEnabled=モジュールワークフローのオプシ
 IfValidateInvoiceIsNoOrderStayUnbilled=請求書検証が「いいえ」の場合、請求書が検証されるまで、注文はステータス「未請求」のままになる。
 CloseReceivedSupplierOrdersAutomatically=すべての製品を受け取ったら、注文を自動的にステータス「%s」に閉じる。
 SetShippingMode=配送モードを設定する
-WithReceptionFinished=レセプション終了
+WithReceptionFinished=受付終了
 #### supplier orders status
 StatusSupplierOrderCanceledShort=キャンセル
 StatusSupplierOrderDraftShort=下書き
diff --git a/htdocs/langs/ja_JP/other.lang b/htdocs/langs/ja_JP/other.lang
index caf379d67cb..ee9e58bd046 100644
--- a/htdocs/langs/ja_JP/other.lang
+++ b/htdocs/langs/ja_JP/other.lang
@@ -258,6 +258,10 @@ PassEncoding=パスワードエンコーディング
 PermissionsAdd=追加された権限
 PermissionsDelete=権限が削除された
 YourPasswordMustHaveAtLeastXChars=パスワードには、少なくとも<strong> %s</strong>文字が必要 。
+PasswordNeedAtLeastXUpperCaseChars=パスワードには、少なくとも<strong> %s</strong>大文字が必要
+PasswordNeedAtLeastXDigitChars=パスワードには少なくとも<strong>%s</strong>数値文字が必要
+PasswordNeedAtLeastXSpecialChars=パスワードには、少なくとも<strong> %s</strong>特殊文字が必要
+PasswordNeedNoXConsecutiveChars=パスワードには、<strong> %s</strong>の連続類似文字を含めることはできない
 YourPasswordHasBeenReset=パスワードは正常にリセットされた
 ApplicantIpAddress=申請者のIPアドレス
 SMSSentTo=SMSが%sに送信された
diff --git a/htdocs/langs/ja_JP/products.lang b/htdocs/langs/ja_JP/products.lang
index 0f587090439..a62ad67a29e 100644
--- a/htdocs/langs/ja_JP/products.lang
+++ b/htdocs/langs/ja_JP/products.lang
@@ -48,7 +48,7 @@ LastRecordedProducts=最新の%s記録された製品
 LastRecordedServices=最新の%s記録されたサービス
 CardProduct0=製品
 CardProduct1=サービス
-Stock=株式
+Stock=在庫
 MenuStocks=在庫
 Stocks=製品の在庫と場所(倉庫)
 Movements=動作
@@ -94,7 +94,7 @@ ShowService=サービスを表示
 ProductsAndServicesArea=製品とサービス部門
 ProductsArea=製品部門
 ServicesArea=サービス部門
-ListOfStockMovements=在庫変動のリスト
+ListOfStockMovements=在庫推移のリスト
 BuyingPrice=買価
 PriceForEachProduct=特定の価格の製品
 SupplierCard=仕入先カード
@@ -155,7 +155,7 @@ ServiceNb=サービス＃%s
 ListProductServiceByPopularity=人気による製品/サービスのリスト
 ListProductByPopularity=人気順製品のリスト
 ListServiceByPopularity=人気によるサービスのリスト
-Finished=工業製品
+Finished=製造品
 RowMaterial=最初の材料
 ConfirmCloneProduct=製品またはサービスの複製を作成してもよいか<b>%s </b>？
 CloneContentProduct=製品/サービスのすべての主要な情報を複製する
@@ -174,9 +174,9 @@ CustomCode=税関|商品| HSコード
 CountryOrigin=原産国
 RegionStateOrigin=原産地
 StateOrigin=州|原産地
-Nature=製品の性質（生/製造）
-NatureOfProductShort=製品の性質
-NatureOfProductDesc=原材料または製造製品
+Nature=製品目(原材料/製造品)
+NatureOfProductShort=製品目
+NatureOfProductDesc=原材料または製造品
 ShortLabel=短縮ラベル
 Unit=単位
 p=u.
@@ -406,7 +406,7 @@ mandatoryPeriodNeedTobeSet=注：期間（開始と終了）を定義するこ
 mandatoryPeriodNeedTobeSetMsgValidate=サービスには開始期間と終了期間が必要
 mandatoryHelper=このサービスで、行に開始日と終了日を入力せずに請求書、売買契約提案書、販売注文署を作成/検証する場青、もしユーザーにメッセージが必要な時は、これをチェックする。<br>メッセージは警告であり、ブロッキングエラーではないことに注意。
 DefaultBOM=デフォルトのBOM
-DefaultBOMDesc=この製品の製造に使用が推奨されるデフォルトBOM。このフィールドは、製品の性質が「%s」の場合にのみ設定できる。
+DefaultBOMDesc=この製品の製造に使用が推奨されるデフォルトBOM。このフィールドは、製品目が「%s」の場合にのみ設定できる。
 Rank=ランク
 SwitchOnSaleStatus=販売ステータスをオンにする
 SwitchOnPurchaseStatus=購入ステータスをオンにする
diff --git a/htdocs/langs/ja_JP/projects.lang b/htdocs/langs/ja_JP/projects.lang
index 24752e1227c..e0d06ab67b8 100644
--- a/htdocs/langs/ja_JP/projects.lang
+++ b/htdocs/langs/ja_JP/projects.lang
@@ -99,7 +99,7 @@ ListSupplierInvoicesAssociatedProject=プロジェクトに関連するベンダ
 ListContractAssociatedProject=プロジェクトに関連する契約のリスト
 ListShippingAssociatedProject=プロジェクトに関連する出荷のリスト
 ListFichinterAssociatedProject=プロジェクトに関連する介入のリスト
-ListExpenseReportsAssociatedProject=プロジェクトに関連する経費報告書のリスト
+ListExpenseReportsAssociatedProject=プロジェクトに関連する経費報告書sのリスト
 ListDonationsAssociatedProject=プロジェクトに関連する寄付のリスト
 ListVariousPaymentsAssociatedProject=プロジェクトに関連する雑費のリスト
 ListSalariesAssociatedProject=プロジェクトに関連する給与の支払いのリスト
@@ -185,7 +185,7 @@ LinkToElementShort=へのリンク
 # Documents models
 DocumentModelBeluga=リンクされたオブジェクトの概要のプロジェクトドキュメントテンプレート
 DocumentModelBaleine=タスクのプロジェクトドキュメントテンプレート
-DocumentModelTimeSpent=費やした時間のプロジェクトレポートテンプレート
+DocumentModelTimeSpent=費やした時間のプロジェクト報告書テンプレート
 PlannedWorkload=計画されたワークロード
 PlannedWorkloadShort=ワークロード
 ProjectReferers=関連項目
@@ -257,7 +257,7 @@ TimeSpentInvoiced=請求に費やされた時間
 TimeSpentForIntervention=に費や​​された時間は
 TimeSpentForInvoice=に費や​​された時間は
 OneLinePerUser=ユーザーごとに1行
-ServiceToUseOnLines=回線で利用するサービス
+ServiceToUseOnLines=行で利用するサービス
 InvoiceGeneratedFromTimeSpent=請求書%sは、プロジェクトに費やされた時間から生成された
 InterventionGeneratedFromTimeSpent=出張%sは、プロジェクトに費やされた時間から生成された
 ProjectBillTimeDescription=プロジェクトのタスクにタイムシートを入力し、タイムシートから請求書(s)を生成してプロジェクトの顧客に請求する予定があるかどうかを確認する(入力したタイムシートに基づかない請求書を作成する予定があるかどうかは確認しないこと)。注：請求書を生成するには、プロジェクトの"費やした時間"タブに移動し、含める行を選択する。
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=注：100%%の進行状況に
 SelectLinesOfTimeSpentToInvoice=請求されていない時間の行を選択し、「請求書の生成」を一括して請求する
 ProjectTasksWithoutTimeSpent=プロジェクトタスクで時間をかけないもの
 FormForNewLeadDesc=連絡のため、以下のフォームへの記入に対して謝意を申し上げる。また、<b> %s</b>で直接メール送信することも可能である。
+StartDateCannotBeAfterEndDate=終了日を開始日より前にすることはできない
diff --git a/htdocs/langs/ja_JP/stocks.lang b/htdocs/langs/ja_JP/stocks.lang
index 61e08d9a778..812981fc506 100644
--- a/htdocs/langs/ja_JP/stocks.lang
+++ b/htdocs/langs/ja_JP/stocks.lang
@@ -16,7 +16,7 @@ ValidateSending=出荷を確認する
 CancelSending=発送をキャンセルする
 DeleteSending=貨物を削除する
 Stock=在庫
-Stocks=在庫
+Stocks=在庫s
 MissingStocks=在庫がない
 StockAtDate=日付の在庫
 StockAtDateInPast=過去の日付
@@ -27,11 +27,11 @@ LotSerialList=ロット/シリアルのリスト
 Movements=移動
 ErrorWarehouseRefRequired=倉庫の参照名を指定する必要がある
 ListOfWarehouses=倉庫のリスト
-ListOfStockMovements=在庫変動のリスト
+ListOfStockMovements=在庫推移のリスト
 ListOfInventories=在庫一覧
 MovementId=移動 ID
 StockMovementForId=移動 ID%d
-ListMouvementStockProject=プロジェクトに関連する在庫移動のリスト
+ListMouvementStockProject=プロジェクトに関連する在庫推移のリスト
 StocksArea=倉庫エリア
 AllWarehouses=すべての倉庫
 IncludeEmptyDesiredStock=未定義の希望在庫で負の在庫も含める
@@ -49,8 +49,8 @@ CorrectStock=正しい在庫
 StockTransfer=在庫移転
 TransferStock=在庫移転
 MassStockTransferShort=大量在庫移転
-StockMovement=在庫移動
-StockMovements=在庫移動
+StockMovement=在庫推移
+StockMovements=在庫推移
 NumberOfUnit=ユニット数
 UnitPurchaseValue=購入単価
 StockTooLow=低すぎる在庫
@@ -74,7 +74,7 @@ QtyDispatchedShort=手配済数量
 QtyToDispatchShort=手配する数量
 OrderDispatch=アイテムの領収書
 RuleForStockManagementDecrease=自動在庫減少のルールを選択する(自動減少ルールが有効化されている場合でも、手動減少は常に可能 )
-RuleForStockManagementIncrease=自動在庫増加のルールを選択する(自動増加ルールがアクティブ化されている場合でも、手動の増加は常に可能)
+RuleForStockManagementIncrease=自動在庫増加のルールを選択する(自動増加ルールが有効化されている場合でも、手動の増加は常に可能)
 DeStockOnBill=顧客の請求書/貸方表の検証で実際の在庫を減らす
 DeStockOnValidateOrder=受注の検証時に実在庫を減らす
 DeStockOnShipment=出荷検証で実際の在庫を減らす
@@ -84,9 +84,9 @@ ReStockOnValidateOrder=注文書の承認時に実在庫を増やす
 ReStockOnDispatchOrder=商品の発注書受領後、倉庫への手動発送で実際の在庫を増やす
 StockOnReception=受信の検証で実際の在庫を増やす
 StockOnReceptionOnClosing=受付がクローズに設定されている場合は、実際の在庫を増やす
-OrderStatusNotReadyToDispatch=ご注文はまだないか、またはこれ以上の在庫倉庫の製品の派遣ができるステータスを持っていない。
+OrderStatusNotReadyToDispatch=注文のステータスは、在庫倉庫にある製品の発送を、まだ許可していないか、これ以上許可できない状態。
 StockDiffPhysicTeoric=物理在庫と仮想在庫の違いの説明
-NoPredefinedProductToDispatch=このオブジェクト用に事前定義された製品がない。そうは在庫に派遣する必要はない。
+NoPredefinedProductToDispatch=このオブジェクト用に事前定義された製品なし。よって在庫発送の要なし。
 DispatchVerb=派遣
 StockLimitShort=アラートの制限
 StockLimit=アラートの在庫制限
@@ -111,13 +111,13 @@ SellPriceMin=販売単価
 EstimatedStockValueSellShort=販売価値
 EstimatedStockValueSell=販売価値
 EstimatedStockValueShort=入力在庫価値
-EstimatedStockValue=入力在庫価値
+EstimatedStockValue=入力在庫値
 DeleteAWarehouse=倉庫を削除する。
 ConfirmDeleteWarehouse=倉庫<b>%s </b>を削除してもよろしい か？
-PersonalStock=個人の在庫%s
-ThisWarehouseIsPersonalStock=この倉庫は%s %sの個人的な在庫を表す
-SelectWarehouseForStockDecrease=在庫の減少のために使用する倉庫を選択する
-SelectWarehouseForStockIncrease=在庫の増加に使用する倉庫を選択する。
+PersonalStock=個人在庫%s
+ThisWarehouseIsPersonalStock=この倉庫は%s %sの個人在庫を表す
+SelectWarehouseForStockDecrease=在庫減少のために使用する倉庫を選択
+SelectWarehouseForStockIncrease=在庫増加に使用する倉庫を選択
 NoStockAction=在庫アクションなし
 DesiredStock=希望在庫
 DesiredStockDesc=この在庫量は、補充機能によって在庫を埋めるために使用される値になる。
@@ -149,7 +149,7 @@ MassMovement=マス移動
 SelectProductInAndOutWareHouse=ソース倉庫とターゲット倉庫、製品と数量を選択し、「%s」をクリックする。必要なすべての動きに対してこれが完了したら、「%s」をクリックする。
 RecordMovement=レコード移転
 ReceivingForSameOrder=この注文の領収書
-StockMovementRecorded=記録された在庫移動
+StockMovementRecorded=記録された在庫推移
 RuleForStockAvailability=在庫要件に関する規則
 StockMustBeEnoughForInvoice=在庫レベルは、製品/サービスを請求書に追加するのに十分でなければなりません(自動在庫変更のルールに関係なく、請求書に行を追加するときに現在の実際の在庫に対してチェックが行われる)
 StockMustBeEnoughForOrder=在庫レベルは、注文に製品/サービスを追加するのに十分でなければなりません(自動在庫変更のルールに関係なく、注文にラインを追加するときに現在の実際の在庫でチェックが行われる)
@@ -203,7 +203,7 @@ inventoryWarningProductAlreadyExists=この製品はすでにリストに含ま
 SelectCategory=カテゴリフィルタ
 SelectFournisseur=仕入先フィルタ
 inventoryOnDate=目録
-INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=在庫移動には、(目録検証の日付ではなく) 目録の日付を付ける。
+INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=在庫推移には、(目録検証の日付ではなく) 目録の日付を付ける。
 inventoryChangePMPPermission=製品のPMP値の変更を許可する
 ColumnNewPMP=新規ユニットPMP
 OnlyProdsInStock=在庫のない製品は追加しないこと
@@ -251,7 +251,7 @@ SelectAStockMovementFileToImport=インポートする在庫品移動ファイ
 InfoTemplateImport=アップロードされたファイルは次の形式が必要 (*は必須フィールド)：<br> 元倉庫* | 先倉庫* | 製品* | 数量* | ロット/シリアル番号<br>CSV文字区切は「<b>%s</b>」であること
 LabelOfInventoryMovemement=目録%s
 ReOpen=再開 
-ConfirmFinish=目録の閉鎖を確定するか？これにより、すべての在庫移動が生成され、目録に入力した実数量で在庫が更新される。
+ConfirmFinish=目録の閉鎖を確定するか？これにより、すべての在庫推移が生成され、目録に入力した実数量で在庫が更新される。
 ObjectNotFound=%sが見つからない
 MakeMovementsAndClose=移動を生成して閉じる
 AutofillWithExpected=実際の数量を予想数量に置き換える
@@ -264,7 +264,7 @@ ProductBatchDoesNotExist=バッチ/シリアルの製品は存在しない
 ProductBarcodeDoesNotExist=バーコード付き製品は存在しない
 WarehouseId=倉庫ID
 WarehouseRef=倉庫参照
-SaveQtyFirst=在庫移動の作成を依頼する前に、最初に実際の在庫数量を保存する。
+SaveQtyFirst=在庫推移の作成を依頼する前に、最初に実際の在庫数量を保存する。
 InventoryStartedShort=開始済
 ErrorOnElementsInventory=次の理由により、操作がキャンセルされた。
 ErrorCantFindCodeInInventory=インベントリに次のコードが見つからない
diff --git a/htdocs/langs/ja_JP/ticket.lang b/htdocs/langs/ja_JP/ticket.lang
index 75b9b25eb6f..54a49fc3ab3 100644
--- a/htdocs/langs/ja_JP/ticket.lang
+++ b/htdocs/langs/ja_JP/ticket.lang
@@ -318,7 +318,7 @@ BoxTicketLastXDays=過去%s日ごとの新規チケットの数
 BoxTicketLastXDayswidget = 過去X日間の日ごとの新規チケットの数
 BoxNoTicketLastXDays=過去%s日間に新規チケットなし
 BoxNumberOfTicketByDay=日ごとの新規チケット数
-BoxNewTicketVSClose=Number of tickets versus closed tickets (today)
+BoxNewTicketVSClose=チケット数とクローズドチケット（本日）
 TicketCreatedToday=今日作成されたチケット
 TicketClosedToday=本日終息したチケット
-KMFoundForTicketGroup=質問の回答となるトピックやFAQが見つかった。チケット送信前の確認に感謝する
+KMFoundForTicketGroup=質問の回答となるトピックやFAQが見つかった。チケット提出前の確認に感謝する
diff --git a/htdocs/langs/ja_JP/trips.lang b/htdocs/langs/ja_JP/trips.lang
index a6d142b0006..ff82b6100c3 100644
--- a/htdocs/langs/ja_JP/trips.lang
+++ b/htdocs/langs/ja_JP/trips.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - trips
 ShowExpenseReport=経費報告書を表示する
-Trips=経費報告書
-TripsAndExpenses=経費報告書
-TripsAndExpensesStatistics=経費報告書の統計
+Trips=経費報告書s
+TripsAndExpenses=経費報告書s
+TripsAndExpensesStatistics=経費報告書sの統計
 TripCard=経費通知表
 AddTrip=経費報告書を作成する
-ListOfTrips=経費報告書のリスト
+ListOfTrips=経費報告書sのリスト
 ListOfFees=手数料のリスト
 TypeFees=料金の種類
 ShowTrip=経費報告書を表示する
 NewTrip=新規経費報告書
-LastExpenseReports=最新の%s経費報告書
-AllExpenseReports=すべての経費報告書
+LastExpenseReports=最新の%s経費報告書s
+AllExpenseReports=すべての経費報告書s
 CompanyVisited=訪問した法人/組織
 FeesKilometersOrAmout=金額またはキロメートル
 DeleteTrip=経費報告書を削除する
 ConfirmDeleteTrip=この経費報告書を削除してもよいか？
-ListTripsAndExpenses=経費報告書のリスト
+ListTripsAndExpenses=経費報告書sのリスト
 ListToApprove=承認待ち
 ExpensesArea=経費報告エリア
 ClassifyRefunded=分類「返金済」
@@ -32,7 +32,7 @@ ExpenseReportCanceled=経費報告がキャンセルされた
 ExpenseReportCanceledMessage=経費報告書%sはキャンセルされた。 <br>-ユーザ：%s <br>-キャンセル者：%s <br>-キャンセルの動機：%s <br>ここをクリックして経費報告書: %s を表示
 ExpenseReportPaid=経費報告書が支払われた
 ExpenseReportPaidMessage=経費報告書%sが支払われた。 <br>-ユーザ：%s <br>-支払い者：%s <br>ここをクリックして経費報告書を表示する：%s
-TripId=ID経費レポート
+TripId=ID経費報告書
 AnyOtherInThisListCanValidate=リクエストを検証するために通知される人。
 TripSociete=情報法人
 TripNDF=情報経費報告書
@@ -91,7 +91,7 @@ DATE_SAVE=検証日
 DATE_CANCEL=キャンセル日
 DATE_PAIEMENT=支払期日
 ExpenseReportRef=参照。経費報告書
-ValidateAndSubmit=検証して承認のために送信
+ValidateAndSubmit=検証して承認のために提出
 ValidatedWaitingApproval=検証済(承認待ち)
 NOT_AUTHOR=あなたはこの経費報告書の作成者ではない。操作はキャンセルされた。
 ConfirmRefuseTrip=この経費報告書を拒否してもよいか？
@@ -106,13 +106,13 @@ SaveTrip=経費報告書を検証する
 ConfirmSaveTrip=この経費報告書を検証してもよいか？
 NoTripsToExportCSV=この期間にエクスポートする経費報告書はない。
 ExpenseReportPayment=経費報告書の支払い
-ExpenseReportsToApprove=承認する経費報告書
-ExpenseReportsToPay=支払うべき経費報告書
+ExpenseReportsToApprove=承認する経費報告書s
+ExpenseReportsToPay=支払うべき経費報告書s
 ConfirmCloneExpenseReport=この経費報告書のクローンを作成してもよいか？
 ExpenseReportsIk=マイレージ料金の設定
 ExpenseReportsRules=経費報告規則
 ExpenseReportIkDesc=以前に定義したカテゴリと範囲ごとに、キロメートル費用の計算を変更できる。 <b> d </b>はキロメートル単位の距離 
-ExpenseReportRulesDesc=経費報告書の最大金額ルールを定義できる。これらのルールは、新しい経費が経費レポートに追加されたときに適用される
+ExpenseReportRulesDesc=経費報告書sの最大金額ルールを定義できる。これらのルールは、新しい経費が経費報告書sに追加されたときに適用される
 expenseReportOffset=オフセット
 expenseReportCoef=係数
 expenseReportTotalForFive=<u> d </u> = 5の例
diff --git a/htdocs/langs/ja_JP/withdrawals.lang b/htdocs/langs/ja_JP/withdrawals.lang
index fdfee72fa24..0e89c239fce 100644
--- a/htdocs/langs/ja_JP/withdrawals.lang
+++ b/htdocs/langs/ja_JP/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=クレジット転送注文
 LatestBankTransferReceipts=最新の%sクレジット転送注文
 LastWithdrawalReceipts=最新の%s口座振替ファイル
 WithdrawalsLine=口座振替注文ライン
+CreditTransfer=銀行口座振替
 CreditTransferLine=クレジット転送ライン
 WithdrawalsLines=口座振替注文明細
 CreditTransferLines=クレジット転送ライン
@@ -47,6 +48,7 @@ ThirdPartyBankCode=取引先の銀行コード
 NoInvoiceCouldBeWithdrawed=正常に引き落とされた請求書はない。請求書が有効なIBANを持つ会社のものであり、IBANにモード<strong> %s </strong>のUMR(一意の委任参照)があることを確認すること。
 WithdrawalCantBeCreditedTwice=この出金票はすでに貸方でマークされている。これは、重複した支払いと銀行エントリを作成する可能性があるため、2回実行することは不可。
 ClassCredited=入金分類
+ClassDebited=借方を分類
 ClassCreditedConfirm=あなたの銀行口座に入金、この引落しの領収書を分類してもよいか？
 TransData=日付伝送
 TransMetod=方式伝送
@@ -103,7 +105,7 @@ WithdrawalFile=デビット注文ファイル
 CreditTransferFile=クレジット転送ファイル
 SetToStatusSent=ステータス「ファイル送信済」に設定
 ThisWillAlsoAddPaymentOnInvoice=これはまた、請求書に支払を記録し、支払の残りがnullの場合、それらを「支払済」として分類する
-StatisticsByLineStatus=回線のステータスによる統計
+StatisticsByLineStatus=行のステータスによる統計
 RUM=UMR
 DateRUM=署名日を委任する
 RUMLong=独自のマンデートリファレンス
diff --git a/htdocs/langs/ka_GE/admin.lang b/htdocs/langs/ka_GE/admin.lang
index b0e9f37cd36..3971948e5a1 100644
--- a/htdocs/langs/ka_GE/admin.lang
+++ b/htdocs/langs/ka_GE/admin.lang
@@ -756,7 +756,7 @@ Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
 Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Export transactions and account statements
 Permission116=Transfers between accounts
@@ -893,12 +893,11 @@ Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Read stocks
@@ -962,15 +961,11 @@ Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
@@ -981,9 +976,9 @@ Permission10005=Delete website content
 Permission20001=Read leave requests (your leave and those of your subordinates)
 Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Approve leave requests
 Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
-RecordEvent=Record email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
@@ -2084,7 +2080,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -2130,7 +2126,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+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>
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Missing translation for %s
 NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/ka_GE/companies.lang b/htdocs/langs/ka_GE/companies.lang
index bce0a98ea83..7de663ede6d 100644
--- a/htdocs/langs/ka_GE/companies.lang
+++ b/htdocs/langs/ka_GE/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Check
 VATIntraCheckDesc=The VAT ID must include the country prefix. The link <b>%s</b> uses the European VAT checker service (VIES) which requires internet access from the Dolibarr server.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commission website
-VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Business entity type
diff --git a/htdocs/langs/ka_GE/errors.lang b/htdocs/langs/ka_GE/errors.lang
index 7bb0fac3f7b..eabc784e6aa 100644
--- a/htdocs/langs/ka_GE/errors.lang
+++ b/htdocs/langs/ka_GE/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
 ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
 ErrorIsNotADraft=%s is not a draft
 ErrorExecIdFailed=Can't execute command "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # 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/ka_GE/main.lang b/htdocs/langs/ka_GE/main.lang
index c59da9aabec..2d850927782 100644
--- a/htdocs/langs/ka_GE/main.lang
+++ b/htdocs/langs/ka_GE/main.lang
@@ -212,6 +212,8 @@ User=User
 Users=Users
 Group=Group
 Groups=Groups
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=No user group defined
 Password=Password
 PasswordRetype=Retype your password
diff --git a/htdocs/langs/ka_GE/other.lang b/htdocs/langs/ka_GE/other.lang
index 9bc68dc3678..7b509f60ff7 100644
--- a/htdocs/langs/ka_GE/other.lang
+++ b/htdocs/langs/ka_GE/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Password encoding
 PermissionsAdd=Permissions added
 PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
+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
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
 SMSSentTo=SMS sent to %s
diff --git a/htdocs/langs/ka_GE/projects.lang b/htdocs/langs/ka_GE/projects.lang
index 5a2911bac0b..0d9c7ea34c8 100644
--- a/htdocs/langs/ka_GE/projects.lang
+++ b/htdocs/langs/ka_GE/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
 ProjectTasksWithoutTimeSpent=Project tasks without time spent
 FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+StartDateCannotBeAfterEndDate=End date cannot be before start date
diff --git a/htdocs/langs/ka_GE/withdrawals.lang b/htdocs/langs/ka_GE/withdrawals.lang
index f5a33b78eee..bda987276b1 100644
--- a/htdocs/langs/ka_GE/withdrawals.lang
+++ b/htdocs/langs/ka_GE/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
 WithdrawalsLine=Direct debit order line
+CreditTransfer=Credit transfer
 CreditTransferLine=Credit transfer line
 WithdrawalsLines=Direct debit order lines
 CreditTransferLines=Credit transfer lines
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=Classify credited
+ClassDebited=Classify debited
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
 TransMetod=Transmission method
diff --git a/htdocs/langs/kk_KZ/admin.lang b/htdocs/langs/kk_KZ/admin.lang
index 9802ffb235d..c057668b5f7 100644
--- a/htdocs/langs/kk_KZ/admin.lang
+++ b/htdocs/langs/kk_KZ/admin.lang
@@ -756,7 +756,7 @@ Permission106=Жіберулерді экспорттау
 Permission109=Жіберулерді жою
 Permission111=Қаржылық есептерді оқыңыз
 Permission112=Транзакция жасау/өзгерту/жою және салыстыру
-Permission113=Қаржылық шоттарды орнату (категорияларды құру, басқару)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Мәмілелерді салыстыру
 Permission115=Экспорттық операциялар мен шот бойынша үзінділер
 Permission116=Шоттар арасындағы аударымдар
@@ -893,12 +893,11 @@ Permission701=Қайырымдылықты оқыңыз
 Permission702=Қайырымдылық жасау/өзгерту
 Permission703=Қайырымдылықты жою
 Permission771=Шығыстар туралы есептерді оқыңыз (сіздікі және бағыныштыларыңыз)
-Permission772=Шығындар туралы есептерді жасаңыз/өзгертіңіз
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Шығындар туралы есептерді жою
-Permission774=Барлық шығыстар туралы есептерді оқыңыз (тіпті бағынышты емес пайдаланушылар үшін)
 Permission775=Шығындар есебін бекіту
 Permission776=Шығындар бойынша есептер
-Permission777=Барлығының шығыс есебін оқыңыз
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Барлығының шығыс есебін жасаңыз/өзгертіңіз
 Permission779=Экспорт шығындары туралы есептер
 Permission1001=Акцияларды оқу
@@ -962,15 +961,11 @@ Permission2801=FTP клиентін оқу режимінде қолданыңы
 Permission2802=Жазу режимінде FTP клиентін қолданыңыз (файлдарды жою немесе жүктеу)
 Permission3200=Мұрағатталған оқиғалар мен саусақ іздерін оқыңыз
 Permission3301=Жаңа модульдер құру
-Permission4001=Қызметкерлерді қараңыз
-Permission4002=Қызметкерлерді құру
-Permission4003=Қызметкерлерді жою
-Permission4004=Жұмысшыларды экспорттау
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
@@ -981,9 +976,9 @@ Permission10005=Веб -сайттың мазмұнын жою
 Permission20001=Демалыс туралы өтініштерді оқыңыз (сіздің және қарамағыңыздағы қызметкерлердің демалысы)
 Permission20002=Еңбек демалысы туралы өтініштерді жасаңыз/өзгертіңіз (сіздің және қарамағыңыздағы қызметкерлердің демалысы)
 Permission20003=Демалыс туралы өтініштерді жою
-Permission20004=Барлық демалыс сұрауларын оқыңыз (тіпті бағынышты емес пайдаланушылардың)
-Permission20005=Барлығына демалыс сұрауларын жасаңыз/өзгертіңіз (тіпті бағынышты емес пайдаланушылар үшін де)
-Permission20006=Әкімші кетуге сұраныс (теңгерімді орнату және жаңарту)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Демалыс туралы өтініштерді мақұлдау
 Permission23001=Жоспарланған жұмысты оқу
 Permission23002=Жоспарланған тапсырманы жасаңыз/жаңартыңыз
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Осы коллекционерге арналға
 NoNewEmailToProcess=Өңделетін жаңа электрондық пошта (сәйкес келетін сүзгілер) жоқ
 NothingProcessed=Ештеңе жасалмады
 XEmailsDoneYActionsDone=%s электрондық поштасы жарамды, %s электрондық поштасы сәтті өңделді (%s жазбасы/әрекеттері үшін)
-RecordEvent=Электрондық пошта оқиғасын жазыңыз
-CreateLeadAndThirdParty=Жетекші жасаңыз (және қажет болған жағдайда үшінші тарап)
-CreateTicketAndThirdParty=Билетті жасаңыз (және егер ол алдыңғы операциямен жүктелген болса, үшінші тарапқа сілтеме жасаңыз)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 CodeLastResult=Соңғы нәтиже коды
 NbOfEmailsInInbox=Бастапқы каталогтағы электрондық пошталардың саны
 LoadThirdPartyFromName=%s бойынша іздейтін үшінші тарапты жүктеңіз (тек жүктеу үшін)
 LoadThirdPartyFromNameOrCreate=%s бойынша үшінші тарап іздеуді жүктеңіз (табылмаса жасаңыз)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Dolibarr жіберген бірінші электрондық пошта арқылы басталған сөйлесуден хабар
 WithoutDolTrackingID=Dolibarr жібермеген ЕМЕС бірінші электрондық пошта арқылы басталған сөйлесуден хабар
 WithDolTrackingIDInMsgId=Хабар Долибардан жіберілді
@@ -2084,7 +2080,7 @@ CreateCandidature=Жұмысқа өтініш жасаңыз
 FormatZip=Zip
 MainMenuCode=Мәзірді енгізу коды (негізгі мәзір)
 ECMAutoTree=ECM автоматты ағашын көрсету
-OperationParamDesc=Әрекет объектісі үшін қолданылатын мәндерді немесе мәндерді шығару жолдарын анықтаңыз. Мысалы: <br> objproperty1 = SET: <br> орнататын мән ([^\\ s]*) <br> options_myextrafield1 = EXTRACT: SUBJECT: ([^&#92; n]*) <br> object.objproperty5 = EXTRACT: BODY: Менің компаниямның атауы \\ s ([^\\ s4b2z)*) <br> a пайдаланыңыз; char бірнеше қасиеттерді алу немесе орнату үшін бөлгіш ретінде.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Жұмыс уақыты
 OpeningHoursDesc=Мұнда сіздің компанияңыздың жұмыс уақытын енгізіңіз.
 ResourceSetup=Ресурс модулінің конфигурациясы
@@ -2130,7 +2126,7 @@ LargerThan=Одан үлкен
 IfTrackingIDFoundEventWillBeLinked=Назар аударыңыз, егер электрондық поштада объектінің бақылау идентификаторы табылса немесе электрондық пошта электрондық поштаның жауабы болса, ол жиналып, объектімен байланыстырылған болса, жасалған оқиға белгілі байланысты объектімен автоматты түрде байланыстырылады.
 WithGMailYouCanCreateADedicatedPassword=GMail тіркелгісінде, егер сіз 2 қадамды тексеруді қосқан болсаңыз, https://myaccount.google.com/ сайтынан өзіңіздің есептік жазбаңыздың құпия сөзін пайдаланудың орнына қосымша үшін арнайы екінші құпия сөзді жасау ұсынылады.
 EmailCollectorTargetDir=Сәтті өңделген кезде электрондық поштаны басқа тегке/каталогқа жылжыту қажет мінез болуы мүмкін. Бұл мүмкіндікті пайдалану үшін каталогтың атауын осында орнатыңыз (арнайы таңбаларды атауында қолдануға болмайды). Есіңізде болсын, сіз оқуға/жазуға кіру есептік жазбасын пайдалануыңыз керек.
-EmailCollectorLoadThirdPartyHelp=Сіз бұл әрекетті дерекқордағы бар үшінші тарапты табу және жүктеу үшін электрондық пошта мазмұнын пайдалану үшін пайдалана аласыз. Табылған (немесе құрылған) үшінші тарап қажет әрекеттерді орындау үшін қолданылады. <br> Мысалы, егер сіз денеде табылған 'Name: name to find' жолын шығарып алған үшінші тарап құрғыңыз келсе, жіберуші электрондық поштаны электрондық пошта ретінде қолданыңыз, келесідей параметр өрісін орнатуға болады: <br> 'email = HEADER: ^Кімнен: (.*); Аты = ШЫҒАРУ: ДЕНЕ: Аты: \\ s ([^\\ s]*); клиент = SET: 2; ' <br>
+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>
 EndPointFor=%s үшін соңғы нүкте: %s
 DeleteEmailCollector=Электрондық пошта жинаушысын жою
 ConfirmDeleteEmailCollector=Бұл электрондық пошта жинаушыны шынымен жойғыңыз келе ме?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Missing translation for %s
 NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/kk_KZ/companies.lang b/htdocs/langs/kk_KZ/companies.lang
index 2d3ea7534b1..f162f294328 100644
--- a/htdocs/langs/kk_KZ/companies.lang
+++ b/htdocs/langs/kk_KZ/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Профессор 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Тексеру
 VATIntraCheckDesc=ҚҚС идентификаторы ел префиксін қамтуы тиіс. <b> %s </b> сілтемесі Dolibarr серверінен Интернетке қосылуды қажет ететін Еуропалық ҚҚС тексеру қызметін (VIES) қолданады.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Еуропалық комиссияның веб-сайтынан ҚҚС бойынша Қауымдастық ішіндегі идентификаторды тексеріңіз
-VATIntraManualCheck=Сіз сондай -ақ Еуропалық Комиссияның <a href="%s" target="_blank"> %s </a> веб -сайтынан қолмен тексере аласыз.
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Тексеру мүмкін емес. Тексеру қызметін мүше мемлекет көрсетпейді (%s).
 NorProspectNorCustomer=Болашақ та, клиент те емес
 JuridicalStatus=Шаруашылық субъектісінің түрі
diff --git a/htdocs/langs/kk_KZ/errors.lang b/htdocs/langs/kk_KZ/errors.lang
index e9baf7bb080..e04614b108c 100644
--- a/htdocs/langs/kk_KZ/errors.lang
+++ b/htdocs/langs/kk_KZ/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=Файл атауында __SOMETHING__ болмайды
 ErrorNotInDictionaryPaymentConditions=Төлем шарттары сөздігінде жоқ, өзгертіңіз.
 ErrorIsNotADraft=%s is not a draft
 ErrorExecIdFailed=Can't execute command "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Сіздің PHP параметрі upload_max_filesize (%s) PHP параметрі post_max_size (%s) қарағанда жоғары. Бұл дәйекті орнату емес.
diff --git a/htdocs/langs/kk_KZ/main.lang b/htdocs/langs/kk_KZ/main.lang
index 36d00c38ee1..83448cb7eae 100644
--- a/htdocs/langs/kk_KZ/main.lang
+++ b/htdocs/langs/kk_KZ/main.lang
@@ -212,6 +212,8 @@ User=Қолданушы
 Users=Пайдаланушылар
 Group=Топ
 Groups=Топтар
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=Пайдаланушылар тобы анықталмаған
 Password=Құпия сөз
 PasswordRetype=Құпия сөзді қайта теріңіз
diff --git a/htdocs/langs/kk_KZ/other.lang b/htdocs/langs/kk_KZ/other.lang
index cffb0146c8e..40a359591ea 100644
--- a/htdocs/langs/kk_KZ/other.lang
+++ b/htdocs/langs/kk_KZ/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Құпия сөзді кодтау
 PermissionsAdd=Рұқсаттар қосылды
 PermissionsDelete=Рұқсаттар жойылды
 YourPasswordMustHaveAtLeastXChars=Сіздің құпия сөзіңізде кемінде <strong> %s </strong> таңбалар болуы керек
+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
 YourPasswordHasBeenReset=Құпия сөзіңіз сәтті қалпына келтірілді
 ApplicantIpAddress=Өтініш берушінің IP мекенжайы
 SMSSentTo=%s нөміріне SMS жіберілді
diff --git a/htdocs/langs/kk_KZ/projects.lang b/htdocs/langs/kk_KZ/projects.lang
index c705e08ff93..7ee36127a68 100644
--- a/htdocs/langs/kk_KZ/projects.lang
+++ b/htdocs/langs/kk_KZ/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Ескерту: 100%% барл
 SelectLinesOfTimeSpentToInvoice=Есепке алынбаған уақытты таңдаңыз, содан кейін оларды есепке алу үшін «Шот -фактураны құру» жаппай әрекетін таңдаңыз
 ProjectTasksWithoutTimeSpent=Project tasks without time spent
 FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+StartDateCannotBeAfterEndDate=End date cannot be before start date
diff --git a/htdocs/langs/kk_KZ/withdrawals.lang b/htdocs/langs/kk_KZ/withdrawals.lang
index 7c3c8a5507e..7dcc0230860 100644
--- a/htdocs/langs/kk_KZ/withdrawals.lang
+++ b/htdocs/langs/kk_KZ/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Несие аудару тәртібі
 LatestBankTransferReceipts=%s несие аударымының соңғы тапсырыстары
 LastWithdrawalReceipts=Ең соңғы %s тікелей дебеттік файлдар
 WithdrawalsLine=Тікелей дебеттік тапсырыс желісі
+CreditTransfer=Credit transfer
 CreditTransferLine=Несие аудару желісі
 WithdrawalsLines=Тікелей дебеттік тапсырыс желілері
 CreditTransferLines=Несие аудару желілері
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Үшінші тараптың банк коды
 NoInvoiceCouldBeWithdrawed=Ешқандай шот -фактура сәтті дебеттелмеді. Шот -фактуралар жарамды IBAN бар компанияларда екенін және IBAN <strong> %s </strong> режимі бар UMR (бірегей мандат сілтемесі) бар екенін тексеріңіз.
 WithdrawalCantBeCreditedTwice=Бұл шығыс түбіртегі есептелген деп белгіленді; бұл екі рет жасалуы мүмкін емес, себебі бұл қайталанатын төлемдер мен банктік жазбаларды тудыруы мүмкін.
 ClassCredited=Жіктелген
+ClassDebited=Classify debited
 ClassCreditedConfirm=Сіз бұл шығынды банктік шотыңызға аударылған деп жіктегіңіз келе ме?
 TransData=Берілу күні
 TransMetod=Берілу әдісі
diff --git a/htdocs/langs/km_KH/admin.lang b/htdocs/langs/km_KH/admin.lang
index b0e9f37cd36..3971948e5a1 100644
--- a/htdocs/langs/km_KH/admin.lang
+++ b/htdocs/langs/km_KH/admin.lang
@@ -756,7 +756,7 @@ Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
 Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Export transactions and account statements
 Permission116=Transfers between accounts
@@ -893,12 +893,11 @@ Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Read stocks
@@ -962,15 +961,11 @@ Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
@@ -981,9 +976,9 @@ Permission10005=Delete website content
 Permission20001=Read leave requests (your leave and those of your subordinates)
 Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Approve leave requests
 Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
-RecordEvent=Record email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
@@ -2084,7 +2080,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -2130,7 +2126,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+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>
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Missing translation for %s
 NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/km_KH/companies.lang b/htdocs/langs/km_KH/companies.lang
index bce0a98ea83..7de663ede6d 100644
--- a/htdocs/langs/km_KH/companies.lang
+++ b/htdocs/langs/km_KH/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Check
 VATIntraCheckDesc=The VAT ID must include the country prefix. The link <b>%s</b> uses the European VAT checker service (VIES) which requires internet access from the Dolibarr server.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commission website
-VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Business entity type
diff --git a/htdocs/langs/km_KH/errors.lang b/htdocs/langs/km_KH/errors.lang
index 7bb0fac3f7b..eabc784e6aa 100644
--- a/htdocs/langs/km_KH/errors.lang
+++ b/htdocs/langs/km_KH/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
 ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
 ErrorIsNotADraft=%s is not a draft
 ErrorExecIdFailed=Can't execute command "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # 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/km_KH/main.lang b/htdocs/langs/km_KH/main.lang
index 6c4a67852a5..d069b719b18 100644
--- a/htdocs/langs/km_KH/main.lang
+++ b/htdocs/langs/km_KH/main.lang
@@ -212,6 +212,8 @@ User=User
 Users=Users
 Group=Group
 Groups=Groups
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=No user group defined
 Password=Password
 PasswordRetype=Retype your password
diff --git a/htdocs/langs/km_KH/other.lang b/htdocs/langs/km_KH/other.lang
index 9bc68dc3678..7b509f60ff7 100644
--- a/htdocs/langs/km_KH/other.lang
+++ b/htdocs/langs/km_KH/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Password encoding
 PermissionsAdd=Permissions added
 PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
+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
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
 SMSSentTo=SMS sent to %s
diff --git a/htdocs/langs/km_KH/projects.lang b/htdocs/langs/km_KH/projects.lang
index 5a2911bac0b..0d9c7ea34c8 100644
--- a/htdocs/langs/km_KH/projects.lang
+++ b/htdocs/langs/km_KH/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
 ProjectTasksWithoutTimeSpent=Project tasks without time spent
 FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+StartDateCannotBeAfterEndDate=End date cannot be before start date
diff --git a/htdocs/langs/km_KH/withdrawals.lang b/htdocs/langs/km_KH/withdrawals.lang
index f5a33b78eee..bda987276b1 100644
--- a/htdocs/langs/km_KH/withdrawals.lang
+++ b/htdocs/langs/km_KH/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
 WithdrawalsLine=Direct debit order line
+CreditTransfer=Credit transfer
 CreditTransferLine=Credit transfer line
 WithdrawalsLines=Direct debit order lines
 CreditTransferLines=Credit transfer lines
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=Classify credited
+ClassDebited=Classify debited
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
 TransMetod=Transmission method
diff --git a/htdocs/langs/kn_IN/admin.lang b/htdocs/langs/kn_IN/admin.lang
index e24a4afee94..eeba60f36b6 100644
--- a/htdocs/langs/kn_IN/admin.lang
+++ b/htdocs/langs/kn_IN/admin.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Bold reference and period in PDF
+BoldRefAndPeriodOnPDF=PDF இல் தடித்த குறிப்பு மற்றும் புல்லி
 BoldLabelOnPDF=Bold label in PDF
 Foundation=Foundation
 Version=Version
@@ -756,7 +756,7 @@ Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
 Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Export transactions and account statements
 Permission116=Transfers between accounts
@@ -893,12 +893,11 @@ Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Read stocks
@@ -962,15 +961,11 @@ Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
@@ -981,9 +976,9 @@ Permission10005=Delete website content
 Permission20001=Read leave requests (your leave and those of your subordinates)
 Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Approve leave requests
 Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
-RecordEvent=Record email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
@@ -2084,7 +2080,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -2130,7 +2126,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+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>
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Missing translation for %s
 NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/kn_IN/companies.lang b/htdocs/langs/kn_IN/companies.lang
index 5aa91d2d000..0096c780082 100644
--- a/htdocs/langs/kn_IN/companies.lang
+++ b/htdocs/langs/kn_IN/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=ಪರಿಶೀಲಿಸಿ
 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.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commission website
-VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Business entity type
diff --git a/htdocs/langs/kn_IN/errors.lang b/htdocs/langs/kn_IN/errors.lang
index 7bb0fac3f7b..eabc784e6aa 100644
--- a/htdocs/langs/kn_IN/errors.lang
+++ b/htdocs/langs/kn_IN/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
 ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
 ErrorIsNotADraft=%s is not a draft
 ErrorExecIdFailed=Can't execute command "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # 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/kn_IN/main.lang b/htdocs/langs/kn_IN/main.lang
index 64fc17b1603..ff24fd1b843 100644
--- a/htdocs/langs/kn_IN/main.lang
+++ b/htdocs/langs/kn_IN/main.lang
@@ -212,6 +212,8 @@ User=User
 Users=Users
 Group=Group
 Groups=ಗುಂಪುಗಳು
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=No user group defined
 Password=Password
 PasswordRetype=Retype your password
diff --git a/htdocs/langs/kn_IN/other.lang b/htdocs/langs/kn_IN/other.lang
index a34a0bbffd3..d205431b024 100644
--- a/htdocs/langs/kn_IN/other.lang
+++ b/htdocs/langs/kn_IN/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Password encoding
 PermissionsAdd=Permissions added
 PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
+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
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
 SMSSentTo=SMS sent to %s
diff --git a/htdocs/langs/kn_IN/projects.lang b/htdocs/langs/kn_IN/projects.lang
index 5a2911bac0b..0d9c7ea34c8 100644
--- a/htdocs/langs/kn_IN/projects.lang
+++ b/htdocs/langs/kn_IN/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
 ProjectTasksWithoutTimeSpent=Project tasks without time spent
 FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+StartDateCannotBeAfterEndDate=End date cannot be before start date
diff --git a/htdocs/langs/kn_IN/withdrawals.lang b/htdocs/langs/kn_IN/withdrawals.lang
index f5a33b78eee..bda987276b1 100644
--- a/htdocs/langs/kn_IN/withdrawals.lang
+++ b/htdocs/langs/kn_IN/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
 WithdrawalsLine=Direct debit order line
+CreditTransfer=Credit transfer
 CreditTransferLine=Credit transfer line
 WithdrawalsLines=Direct debit order lines
 CreditTransferLines=Credit transfer lines
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=Classify credited
+ClassDebited=Classify debited
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
 TransMetod=Transmission method
diff --git a/htdocs/langs/ko_KR/admin.lang b/htdocs/langs/ko_KR/admin.lang
index 96aba05b4b5..05e1157450d 100644
--- a/htdocs/langs/ko_KR/admin.lang
+++ b/htdocs/langs/ko_KR/admin.lang
@@ -756,7 +756,7 @@ Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
 Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Export transactions and account statements
 Permission116=Transfers between accounts
@@ -893,12 +893,11 @@ Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Read stocks
@@ -962,15 +961,11 @@ Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
@@ -981,9 +976,9 @@ Permission10005=Delete website content
 Permission20001=Read leave requests (your leave and those of your subordinates)
 Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Approve leave requests
 Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
-RecordEvent=Record email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
@@ -2084,7 +2080,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -2130,7 +2126,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+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>
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Missing translation for %s
 NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/ko_KR/companies.lang b/htdocs/langs/ko_KR/companies.lang
index 3265f1c2c39..7d88a290ce1 100644
--- a/htdocs/langs/ko_KR/companies.lang
+++ b/htdocs/langs/ko_KR/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=프로필 Id 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=검사
 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.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commission website
-VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=확인할 수 없습니다. 수표 서비스는 회원 국가에서 제공하지 않습니다 (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Business entity type
diff --git a/htdocs/langs/ko_KR/errors.lang b/htdocs/langs/ko_KR/errors.lang
index 7bb0fac3f7b..eabc784e6aa 100644
--- a/htdocs/langs/ko_KR/errors.lang
+++ b/htdocs/langs/ko_KR/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
 ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
 ErrorIsNotADraft=%s is not a draft
 ErrorExecIdFailed=Can't execute command "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # 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/ko_KR/main.lang b/htdocs/langs/ko_KR/main.lang
index e0873372d49..c5b9f89230a 100644
--- a/htdocs/langs/ko_KR/main.lang
+++ b/htdocs/langs/ko_KR/main.lang
@@ -212,6 +212,8 @@ User=사용자
 Users=사용자
 Group=그룹
 Groups=그룹
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=사용자 그룹이 정의되지 않았습니다.
 Password=암호
 PasswordRetype=암호를 다시 입력하십시오.
diff --git a/htdocs/langs/ko_KR/other.lang b/htdocs/langs/ko_KR/other.lang
index a3920306cbb..b0e92b32671 100644
--- a/htdocs/langs/ko_KR/other.lang
+++ b/htdocs/langs/ko_KR/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Password encoding
 PermissionsAdd=Permissions added
 PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
+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
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
 SMSSentTo=SMS sent to %s
diff --git a/htdocs/langs/ko_KR/projects.lang b/htdocs/langs/ko_KR/projects.lang
index 683c4a63435..76d5a389d81 100644
--- a/htdocs/langs/ko_KR/projects.lang
+++ b/htdocs/langs/ko_KR/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
 ProjectTasksWithoutTimeSpent=Project tasks without time spent
 FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+StartDateCannotBeAfterEndDate=End date cannot be before start date
diff --git a/htdocs/langs/ko_KR/withdrawals.lang b/htdocs/langs/ko_KR/withdrawals.lang
index 85325d33fdd..942f2366be2 100644
--- a/htdocs/langs/ko_KR/withdrawals.lang
+++ b/htdocs/langs/ko_KR/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
 WithdrawalsLine=Direct debit order line
+CreditTransfer=Credit transfer
 CreditTransferLine=Credit transfer line
 WithdrawalsLines=Direct debit order lines
 CreditTransferLines=Credit transfer lines
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=Classify credited
+ClassDebited=Classify debited
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
 TransMetod=Transmission method
diff --git a/htdocs/langs/lo_LA/admin.lang b/htdocs/langs/lo_LA/admin.lang
index 680d139ece9..c0b6344e3d7 100644
--- a/htdocs/langs/lo_LA/admin.lang
+++ b/htdocs/langs/lo_LA/admin.lang
@@ -756,7 +756,7 @@ Permission106=ການສົ່ງອອກ
 Permission109=ລຶບການສົ່ງ
 Permission111=ອ່ານບັນຊີການເງິນ
 Permission112=ສ້າງ/ດັດແກ້/ລຶບແລະປຽບທຽບທຸລະກໍາ
-Permission113=ຕັ້ງບັນຊີການເງິນ (ສ້າງ, ຈັດການcategoriesວດ)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=ການເຮັດທຸລະກໍາທີ່ສົມເຫດສົມຜົນ
 Permission115=ສົ່ງອອກທຸລະ ກຳ ແລະໃບລາຍງານບັນຊີ
 Permission116=ການໂອນລະຫວ່າງບັນຊີ
@@ -893,12 +893,11 @@ Permission701=ອ່ານການບໍລິຈາກ
 Permission702=ສ້າງ/ແກ້ໄຂການບໍລິຈາກ
 Permission703=ລຶບການບໍລິຈາກອອກ
 Permission771=ອ່ານບົດລາຍງານຄ່າໃຊ້ຈ່າຍ (ຂອງເຈົ້າແລະຜູ້ໃຕ້ບັງຄັບບັນຊາຂອງເຈົ້າ)
-Permission772=ສ້າງ/ດັດແກ້ລາຍງານລາຍຈ່າຍ
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=ລຶບລາຍງານລາຍຈ່າຍ
-Permission774=ອ່ານບົດລາຍງານຄ່າໃຊ້ຈ່າຍທັງ(ົດ (ແມ້ແຕ່ສໍາລັບຜູ້ໃຊ້ບໍ່ແມ່ນຜູ້ໃຕ້ບັງຄັບບັນຊາ)
 Permission775=ອະນຸມັດລາຍງານລາຍຈ່າຍ
 Permission776=ລາຍງານລາຍຈ່າຍ
-Permission777=ອ່ານບົດລາຍງານຄ່າໃຊ້ຈ່າຍຂອງທຸກຄົນ
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=ສ້າງ/ແກ້ໄຂລາຍງານຄ່າໃຊ້ຈ່າຍຂອງທຸກຄົນ
 Permission779=ລາຍງານຄ່າໃຊ້ຈ່າຍໃນການສົ່ງອອກ
 Permission1001=ອ່ານຮຸ້ນ
@@ -962,15 +961,11 @@ Permission2801=ໃຊ້ລູກຄ້າ FTP ຢູ່ໃນໂreadດອ່
 Permission2802=ໃຊ້ລູກຄ້າ FTP ໃນຮູບແບບການຂຽນ (ລຶບຫຼືອັບໂຫຼດໄຟລ)
 Permission3200=ອ່ານເຫດການທີ່ເກັບໄວ້ແລະລາຍນີ້ວມື
 Permission3301=ສ້າງໂມດູນໃ່
-Permission4001=ເບິ່ງພະນັກງານ
-Permission4002=ສ້າງພະນັກງານ
-Permission4003=ລຶບພະນັກງານ
-Permission4004=ພະນັກງານສົ່ງອອກ
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
@@ -981,9 +976,9 @@ Permission10005=ລຶບເນື້ອໃນເວັບໄຊທ
 Permission20001=ອ່ານ ຄຳ ຂໍລາພັກ (ການລາພັກຂອງເຈົ້າແລະຂອງຜູ້ໃຕ້ບັງຄັບບັນຊາຂອງເຈົ້າ)
 Permission20002=ສ້າງ/ດັດແກ້ການຮ້ອງຂໍການລາພັກຂອງເຈົ້າ (ການລາພັກຂອງເຈົ້າແລະຂອງຜູ້ໃຕ້ບັງຄັບບັນຊາຂອງເຈົ້າ)
 Permission20003=ລຶບ ຄຳ ຮ້ອງຂໍການລາພັກ
-Permission20004=ອ່ານຄໍາຮ້ອງຂໍອອກທັງ(ົດ (ແມ້ແຕ່ຜູ້ໃຊ້ບໍ່ແມ່ນຜູ້ໃຕ້ບັງຄັບບັນຊາ)
-Permission20005=ສ້າງ/ປັບປຸງແກ້ໄຂຄໍາຮ້ອງຂໍການອອກຈາກສໍາລັບທຸກຄົນ (ແມ້ແຕ່ຜູ້ໃຊ້ບໍ່ແມ່ນຜູ້ໃຕ້ບັງຄັບບັນຊາ)
-Permission20006=ຄຳ ຮ້ອງຂໍຈາກຜູ້ເບິ່ງແຍງລະບົບ (ການຕັ້ງຄ່າແລະອັບເດດຍອດເງິນ)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=ອະນຸມັດຄໍາຮ້ອງຂໍການລາພັກ
 Permission23001=ອ່ານວຽກທີ່ ກຳ ນົດເວລາໄວ້
 Permission23002=ສ້າງ/ອັບເດດວຽກທີ່ ກຳ ນົດເວລາໄວ້
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=ເຈົ້າຕ້ອງການແລ່ນຊ
 NoNewEmailToProcess=ບໍ່ມີອີເມວໃ(່ (ການກັ່ນຕອງທີ່ກົງກັນ) ເພື່ອປະມວນຜົນ
 NothingProcessed=ບໍ່ມີຫຍັງເຮັດ
 XEmailsDoneYActionsDone=ອີເມລ %s ມີຄຸນສົມບັດ, ອີເມລ %s ປະສົບຜົນສໍາເລັດ (ສໍາລັບບັນທຶກ/ການກະທໍາ %s ສໍາເລັດ)
-RecordEvent=ບັນທຶກເຫດການອີເມລ
-CreateLeadAndThirdParty=ສ້າງຜູ້ນໍາ (ແລະພາກສ່ວນທີສາມຖ້າຈໍາເປັນ)
-CreateTicketAndThirdParty=ສ້າງປີ້ (ແລະເຊື່ອມຕໍ່ຫາພາກສ່ວນທີສາມຖ້າມັນຖືກໂຫຼດໂດຍການ ດຳ ເນີນການຜ່ານມາ)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 CodeLastResult=ລະຫັດຜົນໄດ້ຮັບຫຼ້າສຸດ
 NbOfEmailsInInbox=ຈຳ ນວນອີເມວຢູ່ໃນບັນຊີລາຍຊື່ແຫຼ່ງທີ່ມາ
 LoadThirdPartyFromName=ໂຫຼດການຄົ້ນຫາຈາກພາກສ່ວນທີສາມຢູ່ໃນ %s (ໂຫຼດເທົ່ານັ້ນ)
 LoadThirdPartyFromNameOrCreate=ໂຫຼດການຄົ້ນຫາຈາກພາກສ່ວນທີສາມຢູ່ໃນ %s (ສ້າງຖ້າບໍ່ພົບ)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=ຂໍ້ຄວາມຈາກການສົນທະນາທີ່ລິເລີ່ມໂດຍອີເມວ ທຳ ອິດທີ່ສົ່ງຈາກ Dolibarr
 WithoutDolTrackingID=ຂໍ້ຄວາມຈາກການສົນທະນາທີ່ລິເລີ່ມໂດຍອີເມວ ທຳ ອິດບໍ່ໄດ້ສົ່ງຈາກ Dolibarr
 WithDolTrackingIDInMsgId=ຂໍ້ຄວາມຖືກສົ່ງຈາກ Dolibarr
@@ -2084,7 +2080,7 @@ CreateCandidature=ສ້າງໃບສະjobັກວຽກ
 FormatZip=Zip
 MainMenuCode=ລະຫັດການເຂົ້າເມນູ (ເມນູຫຼັກ)
 ECMAutoTree=ສະແດງຕົ້ນໄມ້ ECM ອັດຕະໂນມັດ
-OperationParamDesc=ກຳ ນົດຄ່າເພື່ອໃຊ້ ສຳ ລັບວັດຖຸຂອງການກະ ທຳ, ຫຼືວິທີການສະກັດເອົາຄ່າຕ່າງ. ຕົວຢ່າງ: <br> objproperty1 = SET: ຄ່າທີ່ຈະກໍານົດ <br> objproperty2 = SET: ຄ່າທີ່ມີການທົດແທນ __objproperty1__ <br> objproperty3 = SETIFEMPTY: ຄ່າທີ່ນໍາໃຊ້ຖ້າ objproperty3 ແລ້ວ = ຫົວຂໍ້ກ່ອນ ໜ້າ ນີ້ບໍ່ມີຜົນກະທົບຕໍ່ໄປເທົ່ານັ້ນ ([^\\ s**) <br> options_myextrafield1 = EXTRACT: SUBJECT: ([^&#92; n]*) <br> object.objproperty5 = EXTRACT: BODY: ຊື່ບໍລິສັດຂອງຂ້ອຍແມ່ນ \\ s ([^\\ s]*) <br> ໃຊ້ a; char ເປັນຕົວແຍກເພື່ອແຍກຫຼືກໍານົດຄຸນສົມບັດຫຼາຍອັນ.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=ເວລາເປີດ
 OpeningHoursDesc=ມາທີ່ນີ້ເວລາເປີດປົກກະຕິຂອງບໍລິສັດຂອງເຈົ້າ.
 ResourceSetup=ການຕັ້ງຄ່າໂມດູນຊັບພະຍາກອນ
@@ -2130,7 +2126,7 @@ LargerThan=ໃຫຍ່ກວ່າ
 IfTrackingIDFoundEventWillBeLinked=ຈື່ໄວ້ວ່າຖ້າພົບເຫັນ ID ຕິດຕາມວັດຖຸເຂົ້າໄປໃນອີເມລ or, ຫຼືຖ້າອີເມລ is ເປັນຄໍາຕອບຂອງອີເມລ collected ທີ່ເກັບກໍາແລະເຊື່ອມໂຍງກັບວັດຖຸ, ເຫດການທີ່ສ້າງຂຶ້ນຈະຖືກເຊື່ອມຕໍ່ໂດຍອັດຕະໂນມັດກັບວັດຖຸທີ່ກ່ຽວຂ້ອງທີ່ຮູ້ຈັກ.
 WithGMailYouCanCreateADedicatedPassword=ດ້ວຍບັນຊີ GMail, ຖ້າເຈົ້າເປີດໃຊ້ການກວດສອບ 2 ຂັ້ນຕອນ, ມັນຖືກແນະນໍາໃຫ້ສ້າງລະຫັດຜ່ານທີສອງສະເພາະສໍາລັບແອັບພລິເຄຊັນແທນການໃຊ້ລະຫັດຜ່ານບັນຊີຂອງເຈົ້າເອງຈາກ https://myaccount.google.com/.
 EmailCollectorTargetDir=ມັນອາດຈະເປັນພຶດຕິກໍາທີ່ຕ້ອງການເພື່ອຍ້າຍອີເມລ into ເຂົ້າໄປໃນແທັກ/ບັນຊີລາຍການອື່ນເມື່ອມັນດໍາເນີນການສໍາເລັດ. ພຽງແຕ່ຕັ້ງຊື່ບັນຊີລາຍການທີ່ນີ້ເພື່ອໃຊ້ຄຸນສົມບັດນີ້ (ຢ່າໃຊ້ຕົວອັກສອນພິເສດຢູ່ໃນຊື່). ຈື່ໄວ້ວ່າເຈົ້າຍັງຕ້ອງໃຊ້ບັນຊີເຂົ້າສູ່ລະບົບອ່ານ/ຂຽນ.
-EmailCollectorLoadThirdPartyHelp=ເຈົ້າສາມາດໃຊ້ການກະ ທຳ ນີ້ເພື່ອໃຊ້ເນື້ອໃນອີເມລ to ເພື່ອຊອກຫາແລະໂຫຼດພາກສ່ວນທີສາມທີ່ມີຢູ່ແລ້ວຢູ່ໃນຖານຂໍ້ມູນຂອງເຈົ້າ. ພາກສ່ວນທີສາມທີ່ພົບ (ຫຼືສ້າງແລ້ວ) ຈະຖືກໃຊ້ເພື່ອປະຕິບັດຕາມສິ່ງທີ່ຕ້ອງການມັນ. <br> ຕົວຢ່າງ, ຖ້າເຈົ້າຕ້ອງການສ້າງພາກສ່ວນທີສາມທີ່ມີຊື່ສະກັດສະຕຣິງ 'ຊື່: ຊື່ເພື່ອຊອກຫາ' ຢູ່ໃນຮ່າງກາຍ, ໃຊ້ອີເມວຜູ້ສົ່ງເປັນອີເມລ you, ເຈົ້າສາມາດກໍານົດຊ່ອງຂໍ້ມູນດັ່ງນີ້: <br> 'email = HEADER: ^ຈາກ: (.*); name = EXTRACT: BODY: ຊື່: \\ ([^\\ s]*); client = SET: 2; ' <br>
+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>
 EndPointFor=ຈຸດສິ້ນສຸດ ສຳ ລັບ %s: %s
 DeleteEmailCollector=ລຶບຜູ້ເກັບອີເມລ
 ConfirmDeleteEmailCollector=ເຈົ້າແນ່ໃຈບໍ່ວ່າເຈົ້າຕ້ອງການລຶບຕົວເກັບອີເມວນີ້?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Missing translation for %s
 NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/lo_LA/companies.lang b/htdocs/langs/lo_LA/companies.lang
index d370807bbe0..4342af5e745 100644
--- a/htdocs/langs/lo_LA/companies.lang
+++ b/htdocs/langs/lo_LA/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T. )
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=ກວດສອບ
 VATIntraCheckDesc=ລະຫັດ VAT ຕ້ອງປະກອບມີ ຄຳ ນຳ ໜ້າ ປະເທດ. ລິ້ງ <b> %s </b> ໃຊ້ບໍລິການກວດ VAT ຂອງເອີຣົບ (VIES) ເຊິ່ງຕ້ອງການການເຂົ້າເຖິງອິນເຕີເນັດຈາກເຊີບເວີ Dolibarr.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=ກວດເບິ່ງລະຫັດ VAT ພາຍໃນຊຸມຊົນຢູ່ໃນເວັບໄຊທ Commission ຂອງຄະນະກໍາມະການເອີຣົບ
-VATIntraManualCheck=ນອກນັ້ນທ່ານຍັງສາມາດກວດເບິ່ງດ້ວຍຕົນເອງຢູ່ໃນເວັບໄຊທ Commission ຂອງຄະນະກໍາມະການເອີຣົບ <a href="%s" target="_blank"> %s </a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=ກວດບໍ່ໄດ້. ການບໍລິການກວດບໍ່ໄດ້ໃຫ້ໂດຍລັດສະມາຊິກ (%s).
 NorProspectNorCustomer=ບໍ່ແມ່ນລູກຄ້າ, ບໍ່ແມ່ນລູກຄ້າ
 JuridicalStatus=ປະເພດຫົວ ໜ່ວຍ ທຸລະກິດ
diff --git a/htdocs/langs/lo_LA/errors.lang b/htdocs/langs/lo_LA/errors.lang
index c9ccd3d6c9b..a09902b95c2 100644
--- a/htdocs/langs/lo_LA/errors.lang
+++ b/htdocs/langs/lo_LA/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=ຊື່ຂອງໄຟລ cannot ບໍ່ສາມາດ
 ErrorNotInDictionaryPaymentConditions=ບໍ່ຢູ່ໃນວັດຈະນານຸກົມເງື່ອນໄຂການຈ່າຍເງິນ, ກະລຸນາແກ້ໄຂ.
 ErrorIsNotADraft=%s is not a draft
 ErrorExecIdFailed=Can't execute command "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=ພາຣາມິເຕີ PHP ຂອງເຈົ້າ upload_max_filesize (%s) ສູງກວ່າພາລາມິເຕີ PHP post_max_size (%s). ອັນນີ້ບໍ່ແມ່ນການຕັ້ງທີ່ສອດຄ່ອງ.
diff --git a/htdocs/langs/lo_LA/main.lang b/htdocs/langs/lo_LA/main.lang
index 797f07385f7..e929be052f5 100644
--- a/htdocs/langs/lo_LA/main.lang
+++ b/htdocs/langs/lo_LA/main.lang
@@ -212,6 +212,8 @@ User=ຜູ້ໃຊ້
 Users=ຜູ້ໃຊ້
 Group=ກຸ່ມ
 Groups=ກຸ່ມ
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=ບໍ່ໄດ້ ກຳ ນົດກຸ່ມຜູ້ໃຊ້
 Password=ລະຫັດຜ່ານ
 PasswordRetype=ພິມລະຫັດຜ່ານຂອງທ່ານຄືນໃ່
diff --git a/htdocs/langs/lo_LA/other.lang b/htdocs/langs/lo_LA/other.lang
index 2c5ac21f1cb..815038a12b8 100644
--- a/htdocs/langs/lo_LA/other.lang
+++ b/htdocs/langs/lo_LA/other.lang
@@ -258,6 +258,10 @@ PassEncoding=ການເຂົ້າລະຫັດລັບ
 PermissionsAdd=ເພີ່ມສິດອະນຸຍາດແລ້ວ
 PermissionsDelete=ລຶບການອະນຸຍາດອອກແລ້ວ
 YourPasswordMustHaveAtLeastXChars=ລະຫັດຜ່ານຂອງທ່ານຕ້ອງມີຕົວອັກສອນຢ່າງ ໜ້ອຍ <strong> %s </strong>
+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
 YourPasswordHasBeenReset=ຣີເຊັດລະຫັດຜ່ານຂອງທ່ານ ສຳ ເລັດແລ້ວ
 ApplicantIpAddress=ທີ່ຢູ່ IP ຂອງຜູ້ສະັກ
 SMSSentTo=ສົ່ງ SMS ຫາ %s
diff --git a/htdocs/langs/lo_LA/projects.lang b/htdocs/langs/lo_LA/projects.lang
index e04f98f3365..d01843a9b6a 100644
--- a/htdocs/langs/lo_LA/projects.lang
+++ b/htdocs/langs/lo_LA/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Noteາຍເຫດ: ໂຄງ
 SelectLinesOfTimeSpentToInvoice=ເລືອກແຖວທີ່ໃຊ້ເວລາທີ່ຍັງບໍ່ໄດ້ຮຽກເກັບເງິນ, ຈາກນັ້ນປະຕິບັດຫຼາຍ bulk ອັນ "ສ້າງໃບແຈ້ງ ໜີ້" ເພື່ອເກັບເງິນເຂົາເຈົ້າ
 ProjectTasksWithoutTimeSpent=Project tasks without time spent
 FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+StartDateCannotBeAfterEndDate=End date cannot be before start date
diff --git a/htdocs/langs/lo_LA/withdrawals.lang b/htdocs/langs/lo_LA/withdrawals.lang
index 9473a88cea0..f00ec20967e 100644
--- a/htdocs/langs/lo_LA/withdrawals.lang
+++ b/htdocs/langs/lo_LA/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=ໃບສັ່ງໂອນເງິນສິນເຊື່
 LatestBankTransferReceipts=ຄຳ ສັ່ງໂອນເງິນ %s ຫຼ້າສຸດ
 LastWithdrawalReceipts=ໄຟລ deb ເດບິດໂດຍກົງ %s ຫຼ້າສຸດ
 WithdrawalsLine=ເສັ້ນຄໍາສັ່ງການຫັກເງິນໂດຍກົງ
+CreditTransfer=Credit transfer
 CreditTransferLine=ສາຍການໂອນສິນເຊື່ອ
 WithdrawalsLines=ເສັ້ນຄໍາສັ່ງການຫັກເງິນໂດຍກົງ
 CreditTransferLines=ສາຍການໂອນສິນເຊື່ອ
@@ -47,6 +48,7 @@ ThirdPartyBankCode=ລະຫັດທະນາຄານພາກສ່ວນທ
 NoInvoiceCouldBeWithdrawed=ບໍ່ມີການຮຽກເກັບເງິນໃບຮຽກເກັບເງິນ ສຳ ເລັດ. ກວດເບິ່ງວ່າໃບຮຽກເກັບເງິນຢູ່ໃນບໍລິສັດທີ່ມີ IBAN ທີ່ຖືກຕ້ອງແລະ IBAN ມີ UMR (ເອກະສານການມອບMandາຍທີ່ເປັນເອກະລັກ) ທີ່ມີຮູບແບບ <strong> %s </strong>.
 WithdrawalCantBeCreditedTwice=ໃບຮັບເງິນການຖອນເງິນນີ້ໄດ້ຖືກmarkedາຍເປັນເງິນໄວ້ແລ້ວ; ອັນນີ້ບໍ່ສາມາດເຮັດໄດ້ສອງເທື່ອ, ອັນນີ້ອາດຈະສ້າງການຊໍາລະຊໍ້າກັນແລະລາຍການທະນາຄານ.
 ClassCredited=ຈັດປະເພດສິນເຊື່ອ
+ClassDebited=Classify debited
 ClassCreditedConfirm=ເຈົ້າແນ່ໃຈບໍ່ວ່າເຈົ້າຕ້ອງການຈັດປະເພດໃບຮັບເງິນຖອນເງິນນີ້ເປັນເງິນໃນບັນຊີທະນາຄານຂອງເຈົ້າ?
 TransData=ວັນທີສົ່ງ
 TransMetod=ວິທີການສົ່ງ
diff --git a/htdocs/langs/lt_LT/admin.lang b/htdocs/langs/lt_LT/admin.lang
index b09c0f6da6c..0b98cc789e0 100644
--- a/htdocs/langs/lt_LT/admin.lang
+++ b/htdocs/langs/lt_LT/admin.lang
@@ -756,7 +756,7 @@ Permission106=Eksportuoti siuntinius
 Permission109=Ištrinti siuntinius
 Permission111=Skaityti finansines ataskaitas
 Permission112=Sukurti/keisti/trinti ir palyginti sandorius/transakcijas
-Permission113=Finansinių sąskaitų nustatymas (sukurti, valdyti kategorijas)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Eksportuoti sandorius/transakcijas ir sąskaitos išrašus
 Permission116=Pervedimai tarp sąskaitų
@@ -893,12 +893,11 @@ Permission701=Skaityti aukas
 Permission702=Sukurti/keisti aukas
 Permission703=Ištrinti aukas
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Sukurti / redaguoti išlaidų ataskaitas
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Ištrinti išlaidų ataskaitas
-Permission774=Skaityti visas išlaidų ataskaitas (net nepalald-iam vartotojui)
 Permission775=Patvirtinti išlaidų ataskaitas
 Permission776=Mokamų išlaidų ataskaitos
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=Eksportuoti išlaidų ataskaitas
 Permission1001=Skaityti atsargas
@@ -962,15 +961,11 @@ Permission2801=Naudokite FTP klientą skaitymo režime (tik naršyti ir parsisi
 Permission2802=Naudokite FTP klientą įrašymo režimu (ištrinti ar įkelti failus)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
@@ -981,9 +976,9 @@ Permission10005=Delete website content
 Permission20001=Read leave requests (your leave and those of your subordinates)
 Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Approve leave requests
 Permission23001=Skaityti planinį darbą
 Permission23002=sukurti / atnaujinti planinį darbą
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
-RecordEvent=Record email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
@@ -2084,7 +2080,7 @@ CreateCandidature=Create job application
 FormatZip=Pašto kodas
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -2130,7 +2126,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+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>
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Missing translation for %s
 NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/lt_LT/companies.lang b/htdocs/langs/lt_LT/companies.lang
index 64443787ffc..1dfa2f95973 100644
--- a/htdocs/langs/lt_LT/companies.lang
+++ b/htdocs/langs/lt_LT/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Prof ID 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Patikrinti
 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.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commission website
-VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Tikrinimas negalimas. Tikrinimo paslauga nėra teikiama valstybės narės (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Business entity type
diff --git a/htdocs/langs/lt_LT/errors.lang b/htdocs/langs/lt_LT/errors.lang
index 6a54447ce78..9559426de52 100644
--- a/htdocs/langs/lt_LT/errors.lang
+++ b/htdocs/langs/lt_LT/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
 ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
 ErrorIsNotADraft=%s is not a draft
 ErrorExecIdFailed=Can't execute command "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # 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/lt_LT/main.lang b/htdocs/langs/lt_LT/main.lang
index 410abfa232a..f53efe84de3 100644
--- a/htdocs/langs/lt_LT/main.lang
+++ b/htdocs/langs/lt_LT/main.lang
@@ -212,6 +212,8 @@ User=Vartotojas
 Users=Vartotojai
 Group=Grupė
 Groups=Grupės
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=Nėra apibrėžtos vartotojų grupės
 Password=Slaptažodis
 PasswordRetype=Pakartokite slaptažodį
diff --git a/htdocs/langs/lt_LT/other.lang b/htdocs/langs/lt_LT/other.lang
index 8b1386873c9..fcb9eed9dfd 100644
--- a/htdocs/langs/lt_LT/other.lang
+++ b/htdocs/langs/lt_LT/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Password encoding
 PermissionsAdd=Permissions added
 PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
+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
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
 SMSSentTo=SMS sent to %s
diff --git a/htdocs/langs/lt_LT/projects.lang b/htdocs/langs/lt_LT/projects.lang
index 8e2946a6279..c71eca6251c 100644
--- a/htdocs/langs/lt_LT/projects.lang
+++ b/htdocs/langs/lt_LT/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
 ProjectTasksWithoutTimeSpent=Project tasks without time spent
 FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+StartDateCannotBeAfterEndDate=Pabaigos data negali būti ankstesnė už pradžios datą
diff --git a/htdocs/langs/lt_LT/withdrawals.lang b/htdocs/langs/lt_LT/withdrawals.lang
index e9ac634ff36..db366dcbd1a 100644
--- a/htdocs/langs/lt_LT/withdrawals.lang
+++ b/htdocs/langs/lt_LT/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
 WithdrawalsLine=Direct debit order line
+CreditTransfer=Credit transfer
 CreditTransferLine=Credit transfer line
 WithdrawalsLines=Direct debit order lines
 CreditTransferLines=Credit transfer lines
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=Priskirti įskaitytas (credited)
+ClassDebited=Classify debited
 ClassCreditedConfirm=Ar tikrai norite priskirti šias išėmimo įplaukas kaip įskaitytas (credited) į Jūsų banko sąskaitą ?
 TransData=Perdavimo data
 TransMetod=Perdavimo būdas
diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang
index 67154b6ab7f..d51bef4fdba 100644
--- a/htdocs/langs/lv_LV/admin.lang
+++ b/htdocs/langs/lv_LV/admin.lang
@@ -756,7 +756,7 @@ Permission106=Eksportēt sūtījumus
 Permission109=Dzēst sūtījumus
 Permission111=Lasīt finanšu kontus
 Permission112=Izveidot/labot/dzēst un salīdzināt darījumus
-Permission113=Iestatīt finanšu kontus (izveidojiet, pārvaldiet sadaļas)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Vienkāršojiet darījumus
 Permission115=Eksportēt darījumus un kontu izrakstus
 Permission116=Pārvietot starp kontiem
@@ -893,12 +893,11 @@ Permission701=Lasīt ziedojumus
 Permission702=Izveidot/mainīt ziedojumus
 Permission703=Dzēst ziedojumus
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Izveidojiet/labojiet izdevumu pārskatus
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Dzēst izdevumu pārskatus
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Apstiprināt izdevumu pārskatus
 Permission776=Apmaksāt izdevumu pārskatus
-Permission777=Lasiet visu izdevumu pārskatus
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Izveidojiet / mainiet visu izdevumu pārskatus
 Permission779=Eksportēt izdevumu atskaites
 Permission1001=Lasīt krājumus
@@ -962,15 +961,11 @@ Permission2801=Lietot FTP klientu lasīšanas režīmā (pārlūko un lejupielā
 Permission2802=Lietot FTP klientu rakstīšanas režīmā (dzēst vai augšupielādēt failus)
 Permission3200=Lasīt arhivētos notikumus un pirkstu nospiedumus
 Permission3301=Ģenerējiet jaunus moduļus
-Permission4001=Skatīt darbiniekus
-Permission4002=Izveidot darbiniekus
-Permission4003=Dzēst darbiniekus
-Permission4004=Eksportēt darbiniekus
-Permission4010=Izlasiet prasmes/darbu/amatu
-Permission4011=Izveidot/mainīt prasmi/darbu/amatu
-Permission4012=Dzēst prasmi/darbu/amatu
-Permission4020=Izlasi vērtējumu
-Permission4021=Izveidot/mainīt novērtējumu
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=Apstipriniet novērtējumu
 Permission4023=Dzēst novērtējumu
 Permission4030=Skatiet salīdzināšanas izvēlni
@@ -981,9 +976,9 @@ Permission10005=Dzēst vietnes saturu
 Permission20001=Lasiet atvaļinājuma pieprasījumus (jūsu atvaļinājumu un jūsu padoto atvaļinājumu)
 Permission20002=Izveidojiet / modificējiet atvaļinājuma pieprasījumus (jūsu atvaļinājumu un jūsu padotajiem)
 Permission20003=Dzēst atvaļinājumu pieprasījumus
-Permission20004=Lasīt visus atvaļinājuma pieprasījumus (pat lietotājs nav pakļauts)
-Permission20005=Izveidot / mainīt atvaļinājumu pieprasījumus visiem (pat lietotājam nav padotajiem)
-Permission20006=Admin leave requests (setup and update balance)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Apstipriniet atvaļinājuma pieprasījumus
 Permission23001=Apskatīt ieplānoto darbu
 Permission23002=Izveidot/atjaunot ieplānoto uzdevumu
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Vai vēlaties savākt šīs kolekcijas kolekciju ta
 NoNewEmailToProcess=Nav apstrādāts jauns e-pasts (atbilstošie filtri)
 NothingProcessed=Nekas nav paveikts
 XEmailsDoneYActionsDone=%s kvalificēti e-pasta ziņojumi, %s veiksmīgi apstrādāti e-pasta ziņojumi (par %s ierakstu / veiktajām darbībām)
-RecordEvent=Ierakstiet e-pasta notikumu
-CreateLeadAndThirdParty=Izveidot vadību (un, ja nepieciešams, trešo personu)
-CreateTicketAndThirdParty=Izveidot biļeti (un saiti uz trešo personu, ja tā ir ielādēta iepriekšējās operācijas laikā)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 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)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 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
 WithDolTrackingIDInMsgId=Ziņojums nosūtīts no Dolibarr
@@ -2084,7 +2080,7 @@ CreateCandidature=Izveidot darba pieteikumu
 FormatZip=Pasta indekss
 MainMenuCode=Izvēlnes ievades kods (mainmenu)
 ECMAutoTree=Rādīt automātisko ECM koku
-OperationParamDesc=Definējiet vērtības, kuras jāizmanto darbības objektam, vai kā iegūt vērtības. Piemēram: <br> objproperty1 = SET: vērtība, kas noteikta <br> objproperty2 = SET: vērtība nomainot __objproperty1__ <br> objproperty3 = SETIFEMPTY: vērtība, ko izmanto, ja objproperty3 jau nav definēts <br> objproperty4 = ekstrakts: HEADER: X-Myheaderkey: \\ s * ([^ \\ s] *) <br> options_myextrafield1 = EKSTRAKTS: PRIEKŠMETS: ([^ & # 92; n] *) <br> object.objproperty5 = EXTRACT: BODY: Mana uzņēmuma nosaukums ir \\ ((^ ^ sf * *) a0342 <br> Izmantojiet a; char kā atdalītājs, lai iegūtu vai iestatītu vairākas īpašības.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Darba laiks
 OpeningHoursDesc=Ievadiet šeit sava uzņēmuma pastāvīgo darba laiku.
 ResourceSetup=Resursu moduļa konfigurēšana
@@ -2130,7 +2126,7 @@ LargerThan=Lielāks nekā
 IfTrackingIDFoundEventWillBeLinked=Ņemiet vērā: ja objekta izsekošanas ID tiek atrasts e-pastā vai ja e-pasts ir atbilde uz e-pastu, kas ir savākts un saistīts ar objektu, izveidotais notikums tiks automātiski saistīts ar zināmo saistīto objektu.
 WithGMailYouCanCreateADedicatedPassword=Izmantojot GMail kontu, ja esat iespējojis 2 soļu validāciju, ieteicams izveidot īpašu lietojumprogrammas otro paroli, nevis izmantot sava konta caurlaides paroli no https://myaccount.google.com/.
 EmailCollectorTargetDir=Vēlama rīcība var būt e-pasta pārvietošana citā tagā / direktorijā, kad tas tika veiksmīgi apstrādāts. Vienkārši šeit iestatiet direktorijas nosaukumu, lai izmantotu šo funkciju (nelietojiet nosaukumā īpašās rakstzīmes). Ņemiet vērā, ka jāizmanto arī lasīšanas / rakstīšanas pieteikšanās konts.
-EmailCollectorLoadThirdPartyHelp=Varat izmantot šo darbību, lai izmantotu e -pasta saturu, lai atrastu un ielādētu esošu trešo personu savā datu bāzē. Atrastā (vai izveidotā) trešā puse tiks izmantota turpmākām darbībām, kurām tā nepieciešama. <br> Piemēram, ja vēlaties izveidot trešo personu ar nosaukumu, kas atrasts virknē “Vārds: vārds, ko atrast”, atrodams pamattekstā, izmantojiet sūtītāja e -pastu kā e -pastu, varat iestatīt parametru lauku šādi: <br> 'email = HEADER: ^No: (.*); Name = EXTRACT: BODY: Name: \\ s ([^\\ s]*); client = SET: 2; ' <br>
+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>
 EndPointFor=Beigu punkts %s: %s
 DeleteEmailCollector=Dzēst e-pasta kolekcionāru
 ConfirmDeleteEmailCollector=Vai tiešām vēlaties dzēst šo e-pasta kolekcionāru?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Trūkst tulkojuma %s
 NativeModules=Vietējie moduļi
 NoDeployedModulesFoundWithThisSearchCriteria=Šiem meklēšanas kritērijiem nav atrasts neviens modulis
 API_DISABLE_COMPRESSION=Atspējot API atbilžu saspiešanu
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/lv_LV/companies.lang b/htdocs/langs/lv_LV/companies.lang
index 92fdcd21529..b24e4a59006 100644
--- a/htdocs/langs/lv_LV/companies.lang
+++ b/htdocs/langs/lv_LV/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Prof ID 1 (RUT)
 ProfId2CO=-
 ProfId3CO=-
diff --git a/htdocs/langs/lv_LV/errors.lang b/htdocs/langs/lv_LV/errors.lang
index 2cf9dbf8f57..e48742d470c 100644
--- a/htdocs/langs/lv_LV/errors.lang
+++ b/htdocs/langs/lv_LV/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=Faila nosaukumā nedrīkst būt __SOMETHING__
 ErrorNotInDictionaryPaymentConditions=Nav Maksājumu nosacījumu vārdnīcā, lūdzu, modificējiet.
 ErrorIsNotADraft=%s nav melnraksts
 ErrorExecIdFailed=Nevar izpildīt komandu "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Jūsu PHP parametrs upload_max_filesize (%s) ir augstāks nekā PHP parametrs post_max_size (%s). Šī nav konsekventa iestatīšana.
diff --git a/htdocs/langs/lv_LV/main.lang b/htdocs/langs/lv_LV/main.lang
index 610f30e7f05..d882716cb76 100644
--- a/htdocs/langs/lv_LV/main.lang
+++ b/htdocs/langs/lv_LV/main.lang
@@ -212,6 +212,8 @@ User=Lietotājs
 Users=Lietotāji
 Group=Grupa
 Groups=Grupas
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=Nav definēta neviena lietotāju grupa
 Password=Parole
 PasswordRetype=PArole atkārtoti
diff --git a/htdocs/langs/lv_LV/other.lang b/htdocs/langs/lv_LV/other.lang
index b5754af5835..1d7dfd87829 100644
--- a/htdocs/langs/lv_LV/other.lang
+++ b/htdocs/langs/lv_LV/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Paroles kodēšana
 PermissionsAdd=Pievienotas atļaujas
 PermissionsDelete=Atļaujas noņemtas
 YourPasswordMustHaveAtLeastXChars=Jūsu parolei ir jāsatur vismaz <strong>%s</strong> simbolus
+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
 YourPasswordHasBeenReset=Jūsu parole ir veiksmīgi atiestatīta
 ApplicantIpAddress=Pieteikuma iesniedzēja IP adrese
 SMSSentTo=SMS nosūtīta uz %s
diff --git a/htdocs/langs/lv_LV/projects.lang b/htdocs/langs/lv_LV/projects.lang
index 677dd5dec6d..0d26e476146 100644
--- a/htdocs/langs/lv_LV/projects.lang
+++ b/htdocs/langs/lv_LV/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Piezīme: esošie projekti ar v
 SelectLinesOfTimeSpentToInvoice=Atlasiet pavadītās laika rindas, kas nav izrakstītas, un pēc tam veiciet lielapjoma darbību “Ģenerēt rēķinu”, lai par tām izrakstītu rēķinus
 ProjectTasksWithoutTimeSpent=Projekta uzdevumi bez pavadīta laika
 FormForNewLeadDesc=Paldies, ka aizpildījāt šo veidlapu, lai sazinātos ar mums. Varat arī nosūtīt mums e-pastu tieši uz <b> %s </b>.
+StartDateCannotBeAfterEndDate=Beigu datums nevar būt pirms sākuma datuma
diff --git a/htdocs/langs/lv_LV/withdrawals.lang b/htdocs/langs/lv_LV/withdrawals.lang
index cee14efe7b7..c1927c42d9c 100644
--- a/htdocs/langs/lv_LV/withdrawals.lang
+++ b/htdocs/langs/lv_LV/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Kredīta pārveduma rīkojums
 LatestBankTransferReceipts=Jaunākie kredīta pārveduma rīkojumi %s
 LastWithdrawalReceipts=Jaunākie %s tiešā debeta faili
 WithdrawalsLine=Tiešā debeta pasūtījuma līnija
+CreditTransfer=Kredīta pārvedums
 CreditTransferLine=Kredīta pārveduma līnija
 WithdrawalsLines=Direct debit order lines
 CreditTransferLines=Kredīta pārveduma līnijas
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Trešās puses bankas kods
 NoInvoiceCouldBeWithdrawed=Netika veiksmīgi norakstīts rēķins. Pārbaudiet, vai rēķini ir norādīti uzĦēmumiem ar derīgu IBAN un IBAN ir UMR (unikālas pilnvaras atsauce) ar režīmu <strong> %s </strong>.
 WithdrawalCantBeCreditedTwice=Šī izņemšanas kvīts jau ir atzīmēta kā ieskaitīta; to nevar izdarīt divreiz, jo tas potenciāli radītu maksājumu un bankas ierakstu dublikātus.
 ClassCredited=Klasificēt kreditēts
+ClassDebited=Classify debited
 ClassCreditedConfirm=Vai tiešām vēlaties klasificēt šo atsaukuma kvīti kā kredītu jūsu bankas kontā?
 TransData=Darījuma datums
 TransMetod=Darījuma veids
diff --git a/htdocs/langs/mk_MK/admin.lang b/htdocs/langs/mk_MK/admin.lang
index 0930898705d..06db8f5766f 100644
--- a/htdocs/langs/mk_MK/admin.lang
+++ b/htdocs/langs/mk_MK/admin.lang
@@ -756,7 +756,7 @@ Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
 Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Export transactions and account statements
 Permission116=Transfers between accounts
@@ -893,12 +893,11 @@ Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Read stocks
@@ -962,15 +961,11 @@ Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
@@ -981,9 +976,9 @@ Permission10005=Delete website content
 Permission20001=Read leave requests (your leave and those of your subordinates)
 Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Approve leave requests
 Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
-RecordEvent=Record email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
@@ -2084,7 +2080,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -2130,7 +2126,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+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>
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Missing translation for %s
 NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/mk_MK/companies.lang b/htdocs/langs/mk_MK/companies.lang
index a998ab8a010..fda7ce0c11b 100644
--- a/htdocs/langs/mk_MK/companies.lang
+++ b/htdocs/langs/mk_MK/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Check
 VATIntraCheckDesc=The VAT ID must include the country prefix. The link <b>%s</b> uses the European VAT checker service (VIES) which requires internet access from the Dolibarr server.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commission website
-VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Business entity type
diff --git a/htdocs/langs/mk_MK/errors.lang b/htdocs/langs/mk_MK/errors.lang
index 7bb0fac3f7b..eabc784e6aa 100644
--- a/htdocs/langs/mk_MK/errors.lang
+++ b/htdocs/langs/mk_MK/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
 ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
 ErrorIsNotADraft=%s is not a draft
 ErrorExecIdFailed=Can't execute command "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # 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/mk_MK/main.lang b/htdocs/langs/mk_MK/main.lang
index e2b1a81319c..8fac298a203 100644
--- a/htdocs/langs/mk_MK/main.lang
+++ b/htdocs/langs/mk_MK/main.lang
@@ -212,6 +212,8 @@ User=User
 Users=Users
 Group=Group
 Groups=Groups
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=No user group defined
 Password=Password
 PasswordRetype=Retype your password
diff --git a/htdocs/langs/mk_MK/other.lang b/htdocs/langs/mk_MK/other.lang
index 9bc68dc3678..7b509f60ff7 100644
--- a/htdocs/langs/mk_MK/other.lang
+++ b/htdocs/langs/mk_MK/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Password encoding
 PermissionsAdd=Permissions added
 PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
+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
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
 SMSSentTo=SMS sent to %s
diff --git a/htdocs/langs/mk_MK/projects.lang b/htdocs/langs/mk_MK/projects.lang
index 5a2911bac0b..0d9c7ea34c8 100644
--- a/htdocs/langs/mk_MK/projects.lang
+++ b/htdocs/langs/mk_MK/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
 ProjectTasksWithoutTimeSpent=Project tasks without time spent
 FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+StartDateCannotBeAfterEndDate=End date cannot be before start date
diff --git a/htdocs/langs/mk_MK/withdrawals.lang b/htdocs/langs/mk_MK/withdrawals.lang
index f5a33b78eee..bda987276b1 100644
--- a/htdocs/langs/mk_MK/withdrawals.lang
+++ b/htdocs/langs/mk_MK/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
 WithdrawalsLine=Direct debit order line
+CreditTransfer=Credit transfer
 CreditTransferLine=Credit transfer line
 WithdrawalsLines=Direct debit order lines
 CreditTransferLines=Credit transfer lines
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=Classify credited
+ClassDebited=Classify debited
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
 TransMetod=Transmission method
diff --git a/htdocs/langs/mn_MN/admin.lang b/htdocs/langs/mn_MN/admin.lang
index b0e9f37cd36..3971948e5a1 100644
--- a/htdocs/langs/mn_MN/admin.lang
+++ b/htdocs/langs/mn_MN/admin.lang
@@ -756,7 +756,7 @@ Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
 Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Export transactions and account statements
 Permission116=Transfers between accounts
@@ -893,12 +893,11 @@ Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Read stocks
@@ -962,15 +961,11 @@ Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
@@ -981,9 +976,9 @@ Permission10005=Delete website content
 Permission20001=Read leave requests (your leave and those of your subordinates)
 Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Approve leave requests
 Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
-RecordEvent=Record email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
@@ -2084,7 +2080,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -2130,7 +2126,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+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>
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Missing translation for %s
 NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/mn_MN/companies.lang b/htdocs/langs/mn_MN/companies.lang
index bce0a98ea83..7de663ede6d 100644
--- a/htdocs/langs/mn_MN/companies.lang
+++ b/htdocs/langs/mn_MN/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Check
 VATIntraCheckDesc=The VAT ID must include the country prefix. The link <b>%s</b> uses the European VAT checker service (VIES) which requires internet access from the Dolibarr server.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commission website
-VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Business entity type
diff --git a/htdocs/langs/mn_MN/errors.lang b/htdocs/langs/mn_MN/errors.lang
index 7bb0fac3f7b..eabc784e6aa 100644
--- a/htdocs/langs/mn_MN/errors.lang
+++ b/htdocs/langs/mn_MN/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
 ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
 ErrorIsNotADraft=%s is not a draft
 ErrorExecIdFailed=Can't execute command "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # 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/mn_MN/main.lang b/htdocs/langs/mn_MN/main.lang
index cd3ed9b1dfb..81646ff6462 100644
--- a/htdocs/langs/mn_MN/main.lang
+++ b/htdocs/langs/mn_MN/main.lang
@@ -212,6 +212,8 @@ User=User
 Users=Users
 Group=Group
 Groups=Groups
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=No user group defined
 Password=Password
 PasswordRetype=Retype your password
diff --git a/htdocs/langs/mn_MN/other.lang b/htdocs/langs/mn_MN/other.lang
index 9bc68dc3678..7b509f60ff7 100644
--- a/htdocs/langs/mn_MN/other.lang
+++ b/htdocs/langs/mn_MN/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Password encoding
 PermissionsAdd=Permissions added
 PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
+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
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
 SMSSentTo=SMS sent to %s
diff --git a/htdocs/langs/mn_MN/projects.lang b/htdocs/langs/mn_MN/projects.lang
index 5a2911bac0b..0d9c7ea34c8 100644
--- a/htdocs/langs/mn_MN/projects.lang
+++ b/htdocs/langs/mn_MN/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
 ProjectTasksWithoutTimeSpent=Project tasks without time spent
 FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+StartDateCannotBeAfterEndDate=End date cannot be before start date
diff --git a/htdocs/langs/mn_MN/withdrawals.lang b/htdocs/langs/mn_MN/withdrawals.lang
index f5a33b78eee..bda987276b1 100644
--- a/htdocs/langs/mn_MN/withdrawals.lang
+++ b/htdocs/langs/mn_MN/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
 WithdrawalsLine=Direct debit order line
+CreditTransfer=Credit transfer
 CreditTransferLine=Credit transfer line
 WithdrawalsLines=Direct debit order lines
 CreditTransferLines=Credit transfer lines
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=Classify credited
+ClassDebited=Classify debited
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
 TransMetod=Transmission method
diff --git a/htdocs/langs/my_MM/admin.lang b/htdocs/langs/my_MM/admin.lang
index b0e9f37cd36..3971948e5a1 100644
--- a/htdocs/langs/my_MM/admin.lang
+++ b/htdocs/langs/my_MM/admin.lang
@@ -756,7 +756,7 @@ Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
 Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Export transactions and account statements
 Permission116=Transfers between accounts
@@ -893,12 +893,11 @@ Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Read stocks
@@ -962,15 +961,11 @@ Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
@@ -981,9 +976,9 @@ Permission10005=Delete website content
 Permission20001=Read leave requests (your leave and those of your subordinates)
 Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Approve leave requests
 Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
-RecordEvent=Record email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
@@ -2084,7 +2080,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -2130,7 +2126,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+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>
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Missing translation for %s
 NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/my_MM/companies.lang b/htdocs/langs/my_MM/companies.lang
index bce0a98ea83..7de663ede6d 100644
--- a/htdocs/langs/my_MM/companies.lang
+++ b/htdocs/langs/my_MM/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Check
 VATIntraCheckDesc=The VAT ID must include the country prefix. The link <b>%s</b> uses the European VAT checker service (VIES) which requires internet access from the Dolibarr server.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commission website
-VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Business entity type
diff --git a/htdocs/langs/my_MM/errors.lang b/htdocs/langs/my_MM/errors.lang
index 7bb0fac3f7b..eabc784e6aa 100644
--- a/htdocs/langs/my_MM/errors.lang
+++ b/htdocs/langs/my_MM/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
 ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
 ErrorIsNotADraft=%s is not a draft
 ErrorExecIdFailed=Can't execute command "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # 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/my_MM/main.lang b/htdocs/langs/my_MM/main.lang
index c59da9aabec..2d850927782 100644
--- a/htdocs/langs/my_MM/main.lang
+++ b/htdocs/langs/my_MM/main.lang
@@ -212,6 +212,8 @@ User=User
 Users=Users
 Group=Group
 Groups=Groups
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=No user group defined
 Password=Password
 PasswordRetype=Retype your password
diff --git a/htdocs/langs/my_MM/other.lang b/htdocs/langs/my_MM/other.lang
index 9bc68dc3678..7b509f60ff7 100644
--- a/htdocs/langs/my_MM/other.lang
+++ b/htdocs/langs/my_MM/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Password encoding
 PermissionsAdd=Permissions added
 PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
+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
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
 SMSSentTo=SMS sent to %s
diff --git a/htdocs/langs/my_MM/projects.lang b/htdocs/langs/my_MM/projects.lang
index 5a2911bac0b..0d9c7ea34c8 100644
--- a/htdocs/langs/my_MM/projects.lang
+++ b/htdocs/langs/my_MM/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
 ProjectTasksWithoutTimeSpent=Project tasks without time spent
 FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+StartDateCannotBeAfterEndDate=End date cannot be before start date
diff --git a/htdocs/langs/my_MM/withdrawals.lang b/htdocs/langs/my_MM/withdrawals.lang
index f5a33b78eee..bda987276b1 100644
--- a/htdocs/langs/my_MM/withdrawals.lang
+++ b/htdocs/langs/my_MM/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
 WithdrawalsLine=Direct debit order line
+CreditTransfer=Credit transfer
 CreditTransferLine=Credit transfer line
 WithdrawalsLines=Direct debit order lines
 CreditTransferLines=Credit transfer lines
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=Classify credited
+ClassDebited=Classify debited
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
 TransMetod=Transmission method
diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang
index 0d213a8d48b..a2b34bc9f72 100644
--- a/htdocs/langs/nb_NO/admin.lang
+++ b/htdocs/langs/nb_NO/admin.lang
@@ -756,7 +756,7 @@ Permission106=Eksporter forsendelser
 Permission109=Slett forsendelser
 Permission111=Vis kontoutdrag
 Permission112=Opprett/endre/slett og sammenligne transaksjoner
-Permission113=Oppsett av finanskontoer (Opprett, håndter kategorier)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Avstem transaksjoner
 Permission115=Eksportere transaksjoner og kontoutdrag
 Permission116=Overføringer mellom konti
@@ -893,12 +893,11 @@ Permission701=Vis donasjoner
 Permission702=Opprett/endre donasjoner
 Permission703=Slett donasjoner
 Permission771=Les utgiftsrapporter (dine og underordnedes)
-Permission772=Oprett/endre utgiftsrapport
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Slett utgiftsrapport
-Permission774=Les alle utgiftsrapporter (alle brukere)
 Permission775=Godkjenn utgiftsrapport
 Permission776=Betal utgift
-Permission777=Les utgiftsrapporter fra alle
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Lag/endre utgiftsrapporter for alle
 Permission779=Eksporter utgiftsrapporter
 Permission1001=Vis beholdning
@@ -962,15 +961,11 @@ Permission2801=Bruk FTP-klient i lesemodus (bla gjennom og laste ned)
 Permission2802=Bruk FTP-klient i skrivemodus (slette eller laste opp filer)
 Permission3200=Les arkiverte hendelser og fingeravtrykk
 Permission3301=Generer nye moduler
-Permission4001=Se ansatte
-Permission4002=Opprett ansatte
-Permission4003=Slett ansatte
-Permission4004=Eksporter ansatte
-Permission4010=Les ferdighet/jobb/stilling
-Permission4011=Opprett/endre ferdigheter/jobb/stilling
-Permission4012=Slett ferdighet/jobb/stilling
-Permission4020=Les evaluering
-Permission4021=Opprette/endre evaluering
+Permission4001=Les ferdighet/jobb/stilling
+Permission4002=Opprett/endre ferdigheter/jobb/stilling
+Permission4003=Slett ferdighet/jobb/stilling
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=Valider evaluering
 Permission4023=Slett evaluering
 Permission4030=Se sammenligningsmeny
@@ -981,9 +976,9 @@ Permission10005=Slett nettstedsinnhold
 Permission20001=Les permitteringsforespørsler (dine og dine underordnedes)
 Permission20002=Opprett/endre permisjonene dine (dine og dine underordnedes)
 Permission20003=Slett ferieforespørsler
-Permission20004=Les alle permisjonsforespørsler (selv om bruker ikke er underordnet)
-Permission20005=Opprett/endre permisjonsforespørsler for alle (selv om bruker ikke er underordnet)
-Permission20006=Administrer ferieforespørsler (oppsett og oppdatering av balanse)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Godkjenn permisjonforespørsler
 Permission23001=Les planlagt oppgave
 Permission23002=Opprett/endre planlagt oppgave
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Vil du kjøre samlingen for denne samleren nå?
 NoNewEmailToProcess=Ingen ny e-post (matchende filtre) å behandle
 NothingProcessed=Ingenting gjort
 XEmailsDoneYActionsDone=%s e-postmeldinger kvalifiserte, %s e-postmeldinger som er vellykket behandlet (for %s-post/handlinger utført)
-RecordEvent=Registrer e-posthendelse
-CreateLeadAndThirdParty=Opprett lead (og tredjepart om nødvendig)
-CreateTicketAndThirdParty=Opprett billett (og lenke til tredjepart hvis den ble lastet inn av en tidligere operasjon)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 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)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 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
 WithDolTrackingIDInMsgId=Melding sendt fra Dolibarr
@@ -2084,7 +2080,7 @@ CreateCandidature=Opprett jobbsøknad
 FormatZip=Postnummer
 MainMenuCode=Meny-oppføringskode (hovedmeny)
 ECMAutoTree=Vis ECM-tre automatisk 
-OperationParamDesc=Definer verdiene som skal brukes til objektet for handlingen, eller hvordan du trekker ut verdier. For eksempel: <br> objproperty1=SET: verdien som skal settes <br> objproperty2=SET: en verdi med erstatning av __objproperty1__ <br> objproperty3=SETIFEMPTY: verdi brukt hvis objproperty3b ikke allerede er definert <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> Bruk semikolon som separator for å trekke ut eller angi flere egenskaper.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Åpningstider
 OpeningHoursDesc=Skriv inn de vanlige åpningstidene for bedriften din.
 ResourceSetup=Konfigurasjon av ressursmodulen
@@ -2130,7 +2126,7 @@ LargerThan=Større enn
 IfTrackingIDFoundEventWillBeLinked=Merk at hvis en sporings-ID for et objekt blir funnet i epost, eller hvis eposten er et svar på en epostadresse som er samlet og koblet til et objekt, blir den opprettede hendelsen automatisk knyttet til det kjente relaterte objektet.
 WithGMailYouCanCreateADedicatedPassword=Med en Gmail-konto, hvis du aktiverte 2-trinns validering, anbefales det å opprette et dedikert annet passord for applikasjonen, i stedet for å bruke ditt eget kontopassord fra https://myaccount.google.com/.
 EmailCollectorTargetDir=Det kan være en ønsket oppførsel å flytte eposten til en annet merke/katalog når den er behandlet. Bare sett navnet på katalogen her for å bruke denne funksjonen (IKKE bruk spesialtegn i navnet). Vær oppmerksom på at du også må bruke en konto med lese-/skrivetillatelse .
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+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>
 EndPointFor=Sluttpunkt for %s: %s
 DeleteEmailCollector=Slett e-postsamler
 ConfirmDeleteEmailCollector=Er du sikker på at du vil slette denne e-postsamleren?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Missing translation for %s
 NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/nb_NO/companies.lang b/htdocs/langs/nb_NO/companies.lang
index eee4b314cc9..d87813fa5ce 100644
--- a/htdocs/langs/nb_NO/companies.lang
+++ b/htdocs/langs/nb_NO/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Prof ID 1 (RUT)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Sjekk
 VATIntraCheckDesc=MVA-ID-en må inneholde landets prefiks. Koblingen <b> %s </b> bruker den europeiske MVA-kontrolltjenesten (VIES) som krever internettilgang fra Dolibarr-serveren.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Sjekk internasjonal MVA-ID på EU-kommisjonens nettsted
-VATIntraManualCheck=Du kan også sjekke manuelt på den Europeiske kommisjonens nettside <a href="%s" target="_blank"> %s </a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Sjekk er ikke tilgjengelig. Tjenesten er ikke tilgjengelig for landet (%s).
 NorProspectNorCustomer=Ikke prospekt, eller kunde
 JuridicalStatus=Forretningsenhetstype
diff --git a/htdocs/langs/nb_NO/errors.lang b/htdocs/langs/nb_NO/errors.lang
index a8524296352..eee4619a3ea 100644
--- a/htdocs/langs/nb_NO/errors.lang
+++ b/htdocs/langs/nb_NO/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
 ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
 ErrorIsNotADraft=%s is not a draft
 ErrorExecIdFailed=Can't execute command "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=PHP-parameteren upload_max_filesize (%s) er høyere enn PHP-parameteren post_max_size (%s). Dette er ikke et konsistent oppsett.
diff --git a/htdocs/langs/nb_NO/main.lang b/htdocs/langs/nb_NO/main.lang
index d13e1952a94..5bdbce0bf79 100644
--- a/htdocs/langs/nb_NO/main.lang
+++ b/htdocs/langs/nb_NO/main.lang
@@ -212,6 +212,8 @@ User=Bruker
 Users=Brukere
 Group=Gruppe
 Groups=Grupper
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=Ingen brukergrupper er definert
 Password=Passord
 PasswordRetype=Gjenta passord
diff --git a/htdocs/langs/nb_NO/other.lang b/htdocs/langs/nb_NO/other.lang
index 0edffb1deb6..8ac37d51f1a 100644
--- a/htdocs/langs/nb_NO/other.lang
+++ b/htdocs/langs/nb_NO/other.lang
@@ -258,6 +258,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
 YourPasswordHasBeenReset=Ditt passord er tilbakestilt
 ApplicantIpAddress=IP-adresse til søkeren
 SMSSentTo=SMS sendt til %s
diff --git a/htdocs/langs/nb_NO/projects.lang b/htdocs/langs/nb_NO/projects.lang
index 042c7abecc8..2936a6696a6 100644
--- a/htdocs/langs/nb_NO/projects.lang
+++ b/htdocs/langs/nb_NO/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Merk: eksisterende prosjekter m
 SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
 ProjectTasksWithoutTimeSpent=Project tasks without time spent
 FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+StartDateCannotBeAfterEndDate=Sluttdato kan ikke være før startdato
diff --git a/htdocs/langs/nb_NO/withdrawals.lang b/htdocs/langs/nb_NO/withdrawals.lang
index 807a806ffd0..c59a984628c 100644
--- a/htdocs/langs/nb_NO/withdrawals.lang
+++ b/htdocs/langs/nb_NO/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Kredittoverføringsordre
 LatestBankTransferReceipts=Siste %s kredittoverføringsordrer
 LastWithdrawalReceipts=Siste %s direktedebetslinjer
 WithdrawalsLine=Ordrelinje for direktedebet
+CreditTransfer=Kredittoverføring
 CreditTransferLine=Kredittoverføringslinje
 WithdrawalsLines=Direktedebiter ordrelinjer
 CreditTransferLines=Kredittoverføringslinjer
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Tredjeparts bankkode
 NoInvoiceCouldBeWithdrawed=Ingen faktura debitert. Kontroller at fakturaer mot selskaper med gyldig standard BAN, og at BAN har en RUM-modus <strong> %s </strong>.
 WithdrawalCantBeCreditedTwice=Denne uttakskvitteringen er allerede merket som kreditert; dette kan ikke gjøres to ganger, da dette potensielt kan skape dupliserte betalinger og bankoppføringer.
 ClassCredited=Klassifiser som kreditert
+ClassDebited=Classify debited
 ClassCreditedConfirm=Er du sikker på at du vil klassifisere tilbakekallingen som kreditert din bankkonto?
 TransData=Dato for overføring
 TransMetod=Metode for overføring
diff --git a/htdocs/langs/ne_NP/admin.lang b/htdocs/langs/ne_NP/admin.lang
index b0e9f37cd36..3971948e5a1 100644
--- a/htdocs/langs/ne_NP/admin.lang
+++ b/htdocs/langs/ne_NP/admin.lang
@@ -756,7 +756,7 @@ Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
 Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Export transactions and account statements
 Permission116=Transfers between accounts
@@ -893,12 +893,11 @@ Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Read stocks
@@ -962,15 +961,11 @@ Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
@@ -981,9 +976,9 @@ Permission10005=Delete website content
 Permission20001=Read leave requests (your leave and those of your subordinates)
 Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Approve leave requests
 Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
-RecordEvent=Record email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
@@ -2084,7 +2080,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -2130,7 +2126,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+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>
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Missing translation for %s
 NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/ne_NP/companies.lang b/htdocs/langs/ne_NP/companies.lang
index bce0a98ea83..7de663ede6d 100644
--- a/htdocs/langs/ne_NP/companies.lang
+++ b/htdocs/langs/ne_NP/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Check
 VATIntraCheckDesc=The VAT ID must include the country prefix. The link <b>%s</b> uses the European VAT checker service (VIES) which requires internet access from the Dolibarr server.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commission website
-VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Business entity type
diff --git a/htdocs/langs/ne_NP/errors.lang b/htdocs/langs/ne_NP/errors.lang
index 7bb0fac3f7b..eabc784e6aa 100644
--- a/htdocs/langs/ne_NP/errors.lang
+++ b/htdocs/langs/ne_NP/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
 ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
 ErrorIsNotADraft=%s is not a draft
 ErrorExecIdFailed=Can't execute command "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # 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/ne_NP/main.lang b/htdocs/langs/ne_NP/main.lang
index c59da9aabec..2d850927782 100644
--- a/htdocs/langs/ne_NP/main.lang
+++ b/htdocs/langs/ne_NP/main.lang
@@ -212,6 +212,8 @@ User=User
 Users=Users
 Group=Group
 Groups=Groups
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=No user group defined
 Password=Password
 PasswordRetype=Retype your password
diff --git a/htdocs/langs/ne_NP/other.lang b/htdocs/langs/ne_NP/other.lang
index 9bc68dc3678..7b509f60ff7 100644
--- a/htdocs/langs/ne_NP/other.lang
+++ b/htdocs/langs/ne_NP/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Password encoding
 PermissionsAdd=Permissions added
 PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
+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
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
 SMSSentTo=SMS sent to %s
diff --git a/htdocs/langs/ne_NP/projects.lang b/htdocs/langs/ne_NP/projects.lang
index 5a2911bac0b..0d9c7ea34c8 100644
--- a/htdocs/langs/ne_NP/projects.lang
+++ b/htdocs/langs/ne_NP/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
 ProjectTasksWithoutTimeSpent=Project tasks without time spent
 FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+StartDateCannotBeAfterEndDate=End date cannot be before start date
diff --git a/htdocs/langs/ne_NP/withdrawals.lang b/htdocs/langs/ne_NP/withdrawals.lang
index f5a33b78eee..bda987276b1 100644
--- a/htdocs/langs/ne_NP/withdrawals.lang
+++ b/htdocs/langs/ne_NP/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
 WithdrawalsLine=Direct debit order line
+CreditTransfer=Credit transfer
 CreditTransferLine=Credit transfer line
 WithdrawalsLines=Direct debit order lines
 CreditTransferLines=Credit transfer lines
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=Classify credited
+ClassDebited=Classify debited
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
 TransMetod=Transmission method
diff --git a/htdocs/langs/nl_BE/admin.lang b/htdocs/langs/nl_BE/admin.lang
index f1e1eaa7f61..54125afc299 100644
--- a/htdocs/langs/nl_BE/admin.lang
+++ b/htdocs/langs/nl_BE/admin.lang
@@ -236,7 +236,5 @@ MailToSendInvoice=Klantfacturen
 MailToSendReception=Ontvangen
 MailToThirdparty=Klant
 AddBoxes=Widgets toevoegen
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 GeneralOptions=Algemene opties
 ExportSetup=Installatie van module Exporteren
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
diff --git a/htdocs/langs/nl_BE/companies.lang b/htdocs/langs/nl_BE/companies.lang
index 83a3bfc2f08..5a83fe04e1c 100644
--- a/htdocs/langs/nl_BE/companies.lang
+++ b/htdocs/langs/nl_BE/companies.lang
@@ -66,7 +66,6 @@ ContactForContracts=Contactpersoon contracten
 ContactForInvoices=Contactpersoon facturen
 NoContactForAnyOrderOrShipments=Dit contact is geen contact voor een bestelling of verzending
 NewContactAddress=Nieuw contact / adres
-VATIntraManualCheck=U kunt ook handmatig controleren op de website van de Europese Commissie <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Controle niet mogelijk. Controledienst wordt niet verleend door lidstaat (%s).
 ContactOthers=Ander
 OthersNotLinkedToThirdParty=Anderen, niet gebonden aan een Klant
diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang
index 919681717e0..daf32190e79 100644
--- a/htdocs/langs/nl_NL/admin.lang
+++ b/htdocs/langs/nl_NL/admin.lang
@@ -756,7 +756,7 @@ Permission106=Export zendingen
 Permission109=Verwijder verzendingen
 Permission111=Bekijk de financiële rekeningen
 Permission112=Creëer / wijzig / verwijder en vergelijk transacties
-Permission113=Stel financiële rekeningen in (creëer, beheer, categoriseer)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Consolideer transacties
 Permission115=Exporteer transacties en rekeningafschriften
 Permission116=Overschrijvingen tussen rekeningen
@@ -893,12 +893,11 @@ Permission701=Bekijk donaties
 Permission702=Creëren / wijzigen donaties
 Permission703=Verwijderen donaties
 Permission771=Declaraties (eigen en ondergeschikten)
-Permission772=Creëer / wijzigen onkostennota's
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Verwijderen onkostennota's
-Permission774=Lees alle onkostennota's (ook voor de gebruiker niet ondergeschikten)
 Permission775=Goedkeuren onkostennota's
 Permission776=Betalen onkostennota's
-Permission777=Lees onkostendeclaraties van iedereen
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Aanmaken/wijzigen onkostendeclaraties van iedereen
 Permission779=Export onkostennota's
 Permission1001=Bekijk voorraden
@@ -962,15 +961,11 @@ Permission2801=Gebruik FTP-client in lees modus (enkel verkennen en downloaden)
 Permission2802=Gebruik FTP-client in schrijf modus (verwijderen of bestanden uploaden)
 Permission3200=Lees gearchiveerde evenementen en vingerafdrukken
 Permission3301=Maak nieuwe modules
-Permission4001=Bekijk medewerkers
-Permission4002=Creëer medewerkers
-Permission4003=Verwijder werknemers
-Permission4004=Export werknemers
-Permission4010=Vaardigheid/baan/positie lezen
-Permission4011=Vaardigheid/baan/positie aanmaken/wijzigen
-Permission4012=Vaardigheid/baan/positie verwijderen
-Permission4020=Evaluatie lezen
-Permission4021=Evaluatie maken/wijzigen
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=Evaluatie valideren
 Permission4023=Evaluatie verwijderen
 Permission4030=Zie vergelijkingsmenu
@@ -981,9 +976,9 @@ Permission10005=Verwijder website-inhoud
 Permission20001=Lees verlofaanvragen (uw verlof en die van uw ondergeschikten)
 Permission20002=Creëer / wijzig uw verlofaanvragen (uw verlof en die van uw ondergeschikten)
 Permission20003=Verlofaanvragen verwijderen
-Permission20004=Alle verlofaanvragen (zelfs van gebruiker, niet ondergeschikten)
-Permission20005=Verlofaanvragen maken / wijzigen voor iedereen (zelfs van gebruikers die geen ondergeschikte zijn)
-Permission20006=Verlofaanvragen beheerder (instellen en saldo bijwerken)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Verlofaanvragen goedkeuren
 Permission23001=Lees geplande taak
 Permission23002=Maak/wijzig geplande taak
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Wil je de collectie voor deze verzamelaar nu runnen
 NoNewEmailToProcess=Geen nieuwe e-mail (overeenkomende filters) om te verwerken
 NothingProcessed=Niets gedaan
 XEmailsDoneYActionsDone=%s e-mails gekwalificeerd, %s e-mails succesvol verwerkt (voor %s record / acties gedaan)
-RecordEvent=E-mail gebeurtenis opnemen
-CreateLeadAndThirdParty=Creëer lead (en relatie indien nodig)
-CreateTicketAndThirdParty=Maak een ticket aan (en link naar een relatie als het door een eerdere bewerking is geladen)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 CodeLastResult=Laatste resultaatcode
 NbOfEmailsInInbox=Aantal e-mails in bronmap
 LoadThirdPartyFromName=Zoeken van derden laden op %s (alleen laden)
 LoadThirdPartyFromNameOrCreate=Zoeken van derden laden op %s (maken indien niet gevonden)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Bericht inzake een gesprek geïnitieerd door een eerste e-mail verzonden vanuit Dolibarr
 WithoutDolTrackingID=Bericht van een gesprek geïnitieerd door een eerste e-mail die NIET is verzonden vanuit Dolibarr
 WithDolTrackingIDInMsgId=Bericht verzonden vanuit Dolibarr
@@ -2084,7 +2080,7 @@ CreateCandidature=Maak een sollicitatie
 FormatZip=Zip
 MainMenuCode=Menu toegangscode (hoofdmenu)
 ECMAutoTree=Toon automatische ECM-structuur
-OperationParamDesc=Definieer de waarden die u wilt gebruiken voor het object van de actie of hoe u waarden kunt extraheren. Bijvoorbeeld:<br>objproperty1 = SET: de waarde om<br>objproperty2 = SET in te stellen: een waarde met vervanging van __objproperty1__<br> objproperty3 = SETIFEMPTY:waarde gebruikt als objproperty3 is niet EX4: a2 = a0: ([^ \\ s] *)<br>options_myextrafield1 = EXTRACT: SUBJECT: ([^ & # 92; n] *) <br> object.objproperty5 = EXTRACT: BODY: Mijn bedrijfsnaam is \\ s ([^ \\ s] *) a0342ff <br> Gebruik het ; char als scheidingsteken om verschillende eigenschappen te extraheren of in te stellen.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Openingstijden
 OpeningHoursDesc=Voer hier de reguliere openingstijden van uw bedrijf in.
 ResourceSetup=Configuratie van bronmodule
@@ -2130,7 +2126,7 @@ LargerThan=Groter dan
 IfTrackingIDFoundEventWillBeLinked=Houd er rekening mee dat als een tracking-ID van een object in e-mail wordt gevonden, of als de e-mail een antwoord is van een e-mail die al is verzameld en aan een object is gekoppeld, de gemaakte gebeurtenis automatisch wordt gekoppeld aan het bekende gerelateerde object.
 WithGMailYouCanCreateADedicatedPassword=Als u bij een GMail-account de validatie in 2 stappen hebt ingeschakeld, wordt aanbevolen om een speciaal tweede wachtwoord voor de toepassing te maken in plaats van uw eigen wachtwoord van https://myaccount.google.com/.
 EmailCollectorTargetDir=Het kan een gewenst gedrag zijn om de e-mail naar een andere tag / directory te verplaatsen wanneer deze met succes is verwerkt. Stel hier gewoon de naam van de map in om deze functie te gebruiken (gebruik GEEN speciale tekens in de naam). Houd er rekening mee dat u ook een inlogaccount voor lezen / schrijven moet gebruiken.
-EmailCollectorLoadThirdPartyHelp=U kunt deze actie gebruiken om de e-mailinhoud te gebruiken om een bestaande derde partij in uw database te zoeken en te laden. De gevonden (of aangemaakte) derde partij wordt gebruikt voor de volgende acties die dit nodig hebben. <br> Als u bijvoorbeeld een derde partij wilt maken met een naam geëxtraheerd een tekenreeks 'Naam: naam te vinden' gevonden in de body, gebruik afzender e-mail als e-mail, u kunt het parameterveld als volgt instellen: <br> 'email=HEADER: ^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;' <br>
+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>
 EndPointFor=Eindpunt voor %s: %s
 DeleteEmailCollector=E-mailverzamelaar verwijderen
 ConfirmDeleteEmailCollector=Weet je zeker dat je deze e-mailverzamelaar wilt verwijderen?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Ontbrekende vertaling voor %s
 NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=Geen modules gevonden voor deze zoekcriteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/nl_NL/companies.lang b/htdocs/langs/nl_NL/companies.lang
index c3ad737bb59..569d6e4f276 100644
--- a/htdocs/langs/nl_NL/companies.lang
+++ b/htdocs/langs/nl_NL/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (RUT)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Controleren
 VATIntraCheckDesc=Het btw-nummer moet het landnummer bevatten. De link <b>%s</b> maakt gebruik van de European VAT checker service (VIES) die internettoegang vanaf de Dolibarr-server vereist.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Controleer het intracommunautaire btw-nummer op de website van de Europese Commissie
-VATIntraManualCheck=U kunt het ook handmatig controleren op de website van de Europese Commissie <a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Controle niet mogelijk. Controleerdienst wordt niet verleend door lidstaat (%s).
 NorProspectNorCustomer=Geen prospect, noch klant
 JuridicalStatus=Soort bedrijf
diff --git a/htdocs/langs/nl_NL/errors.lang b/htdocs/langs/nl_NL/errors.lang
index 4955a9e6b6b..585fa9717fc 100644
--- a/htdocs/langs/nl_NL/errors.lang
+++ b/htdocs/langs/nl_NL/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=De naam van het bestand mag niet __SOMETHING__ bevatten
 ErrorNotInDictionaryPaymentConditions=Niet bekend in de gedefinieerde betaalregelingen, graag wijzigen
 ErrorIsNotADraft=%s is not a draft
 ErrorExecIdFailed=Can't execute command "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Uw PHP-parameter upload_max_filesize (%s) is hoger dan PHP-parameter post_max_size (%s). Dit is geen consistente opstelling.
diff --git a/htdocs/langs/nl_NL/main.lang b/htdocs/langs/nl_NL/main.lang
index 6550bca5b4b..5cbc2aaf8f2 100644
--- a/htdocs/langs/nl_NL/main.lang
+++ b/htdocs/langs/nl_NL/main.lang
@@ -212,6 +212,8 @@ User=Gebruiker
 Users=Gebruikers
 Group=Groep
 Groups=Groepen
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=Geen gebruikersgroep gedefinieerd
 Password=Wachtwoord
 PasswordRetype=Herhaal uw wachtwoord
diff --git a/htdocs/langs/nl_NL/other.lang b/htdocs/langs/nl_NL/other.lang
index 6b5039bd098..9719e3313b4 100644
--- a/htdocs/langs/nl_NL/other.lang
+++ b/htdocs/langs/nl_NL/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Wachtwoord codering
 PermissionsAdd=Rechten toegevoegd
 PermissionsDelete=Rechten verwijderd
 YourPasswordMustHaveAtLeastXChars=Uw wachtwoord moet minimaal <strong>%s</strong> karakters bevatten
+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
 YourPasswordHasBeenReset=Uw wachtwoord is met succes gereset
 ApplicantIpAddress=IP-adres van aanvrager
 SMSSentTo=SMS verzonden naar %s
diff --git a/htdocs/langs/nl_NL/projects.lang b/htdocs/langs/nl_NL/projects.lang
index 539e4c867b1..eb929b7a220 100644
--- a/htdocs/langs/nl_NL/projects.lang
+++ b/htdocs/langs/nl_NL/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Opmerking: de voortgang van bes
 SelectLinesOfTimeSpentToInvoice=Selecteer tijdsregels die niet zijn gefactureerd en vervolgens de bulkactie "Factuur genereren" om ze te factureren
 ProjectTasksWithoutTimeSpent=Project tasks without time spent
 FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+StartDateCannotBeAfterEndDate=Einddatum kan niet vóór startdatum liggen
diff --git a/htdocs/langs/nl_NL/withdrawals.lang b/htdocs/langs/nl_NL/withdrawals.lang
index ff5e6099161..dd8c76e75ee 100644
--- a/htdocs/langs/nl_NL/withdrawals.lang
+++ b/htdocs/langs/nl_NL/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Betalingsopdracht
 LatestBankTransferReceipts=Laatste %s overboekingsopdrachten
 LastWithdrawalReceipts=Laatste %s incassobestanden
 WithdrawalsLine=Incasso-orderregel
+CreditTransfer=Overschrijving
 CreditTransferLine=Overschrijvingsregel
 WithdrawalsLines=Regels voor automatische incasso
 CreditTransferLines=Overschrijvingsregels
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Bankcode van derden
 NoInvoiceCouldBeWithdrawed=Geen factuur afgeschreven. Controleer of de facturen betrekking hebben op bedrijven met een geldige IBAN en dat IBAN een UMR (Unique Mandate Reference) met modus <strong>%s heeft</strong> .
 WithdrawalCantBeCreditedTwice=Dit opnamebewijs is al gemarkeerd als gecrediteerd; dit kan niet twee keer worden gedaan, omdat dit mogelijk dubbele betalingen en bankboekingen zou veroorzaken.
 ClassCredited=Classificeer creditering
+ClassDebited=Classify debited
 ClassCreditedConfirm=Weet u zeker dat u deze intrekkingsontvangst als bijgeschreven op uw bankrekening wilt classificeren?
 TransData=Datum transmissie
 TransMetod=Transmissiewijze
diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang
index 6864f00ab6e..e08f20c0b91 100644
--- a/htdocs/langs/pl_PL/admin.lang
+++ b/htdocs/langs/pl_PL/admin.lang
@@ -756,7 +756,7 @@ Permission106=Eksportuj wysyłki
 Permission109=Usuń wysyłki
 Permission111=Czytaj raporty finansowe
 Permission112=Tworzenie / modyfikacja / usuwanie oraz porównywanie transakcji
-Permission113=Konfiguracja sprawozdań finansowych (tworzenie, zarządzanie kategoriami)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Uzgodnij transakcje
 Permission115=Eksport transakcji oraz oświadczeń obrachunkowych
 Permission116=Przelewy pomiędzy rachunkami
@@ -893,12 +893,11 @@ Permission701=Zobacz darowizny
 Permission702=Tworzenie / modyfikacja darowizn
 Permission703=Usuń darowizny
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Tworzenie/modyfikacja raportów kosztów
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Usuń raporty wydatków
-Permission774=Przeczytaj wszystkie raporty wydatków (nawet dla użytkowników nie podwładni)
 Permission775=Zatwierdzanie raportów wydatków
 Permission776=Zapłać raporty wydatków
-Permission777=Przeczytaj raporty wydatków wszystkich
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Twórz/modyfikuj raporty wydatków dla wszystkich
 Permission779=Eksport raportów kosztów
 Permission1001=Zobacz zasoby
@@ -962,15 +961,11 @@ Permission2801=Użyj klienta FTP w trybie odczytu (tylko przeglądanie i pobiera
 Permission2802=Użyj klienta FTP w trybie zapisu (usuwanie lub przesyłanie plików)
 Permission3200=Czytaj zarchiwizowane wydarzenia i odciski palców
 Permission3301=Wygeneruj nowe moduły
-Permission4001=Zobacz pracowników
-Permission4002=Twórz pracowników
-Permission4003=Usuń pracowników
-Permission4004=Eksportuj pracowników
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
@@ -981,9 +976,9 @@ Permission10005=Usuń zawartość witryny
 Permission20001=Przeczytaj wnioski urlopowe (Twoje i Twoich podwładnych)
 Permission20002=Twórz/modyfikuj swoje wnioski urlopowe (urlop swój i podwładnych)
 Permission20003=Delete leave requests
-Permission20004=Przeczytaj wszystkie wnioski urlopowe (nawet użytkowników, którzy nie są podwładnymi)
-Permission20005=Twórz/modyfikuj wnioski urlopowe dla wszystkich (nawet użytkowników niebędących podwładnymi)
-Permission20006=Admin leave requests (setup and update balance)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Zatwierdź wnioski urlopowe
 Permission23001=Czytaj Zaplanowane zadania
 Permission23002=Tworzenie / aktualizacja Zaplanowanych zadań
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Czy chcesz teraz uruchomić kolekcję dla tego kole
 NoNewEmailToProcess=Brak nowych e-maili (pasujących filtrów) do przetworzenia
 NothingProcessed=Nic nie zostało zrobione
 XEmailsDoneYActionsDone=%s e-maile zakwalifikowane, %s e-maile pomyślnie przetworzone (dla %s rekordu / wykonanych czynności)
-RecordEvent=Nagraj wydarzenie e-mail
-CreateLeadAndThirdParty=Utwórz potencjalnego klienta (i osobę trzecią, jeśli to konieczne)
-CreateTicketAndThirdParty=Utwórz bilet (i link do strony trzeciej, jeśli został załadowany przez poprzednią operację)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 CodeLastResult=Kod najnowszego wyniku
 NbOfEmailsInInbox=Liczba e-maili w katalogu źródłowym
 LoadThirdPartyFromName=Załaduj wyszukiwanie osób trzecich na %s (tylko ładowanie)
 LoadThirdPartyFromNameOrCreate=Załaduj wyszukiwanie osób trzecich na %s (utwórz, jeśli nie znaleziono)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Wiadomość z rozmowy zainicjowanej pierwszym e-mailem wysłanym przez Dolibarr
 WithoutDolTrackingID=Wiadomość z rozmowy zainicjowanej pierwszym e-mailem NIE wysłanym od Dolibarr
 WithDolTrackingIDInMsgId=Wiadomość wysłana przez Dolibarr
@@ -2084,7 +2080,7 @@ CreateCandidature=Utwórz podanie o pracę
 FormatZip=Paczka Zip
 MainMenuCode=Kod wejścia menu (menu główne)
 ECMAutoTree=Pokaż automatyczne drzewo ECM
-OperationParamDesc=Zdefiniuj wartości, które mają być używane dla obiektu akcji, lub sposób wyodrębniania wartości. Na przykład: <br> objproperty1 = SET: wartość do ustawienia <br> objproperty2 = SET: wartość zastępująca __objproperty1__ <br> objproperty3 = SETIFEMPTY: wartość używana, jeśli objproperty3 nie jest jeszcze zdefiniowana a0342 objproperty3: ([^ \\ s] *) <br> options_myextrafield1 = EXTRACT: SUBJECT: ([^ & # 92; n] *) <br> object.objproperty5 = WYCIĄG: BODY: Nazwa mojej firmy to \\ s ([^ \\ s] *) a0342fccfda <br> Użyj a; char jako separator, aby wyodrębnić lub ustawić kilka właściwości.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Godziny otwarcia
 OpeningHoursDesc=Wpisz tutaj regularne godziny otwarcia swojej firmy.
 ResourceSetup=Konfiguracja modułu zasobów
@@ -2130,7 +2126,7 @@ LargerThan=Większy niż
 IfTrackingIDFoundEventWillBeLinked=Zwróć uwagę, że jeśli identyfikator śledzenia obiektu zostanie znaleziony w wiadomości e-mail lub jeśli wiadomość e-mail jest odpowiedzią na wiadomość e-mail, która jest już zebrana i powiązana z obiektem, utworzone zdarzenie zostanie automatycznie połączone ze znanym powiązanym obiektem.
 WithGMailYouCanCreateADedicatedPassword=W przypadku konta Gmail, jeśli włączyłeś weryfikację dwuetapową, zaleca się utworzenie dedykowanego drugiego hasła dla aplikacji zamiast używania własnego hasła do konta ze strony https://myaccount.google.com/.
 EmailCollectorTargetDir=Przeniesienie wiadomości e-mail do innego tagu / katalogu po pomyślnym przetworzeniu może być pożądanym zachowaniem. Po prostu ustaw tutaj nazwę katalogu, aby skorzystać z tej funkcji (NIE używaj znaków specjalnych w nazwie). Pamiętaj, że musisz również użyć konta logowania do odczytu / zapisu.
-EmailCollectorLoadThirdPartyHelp=Możesz użyć tej akcji, aby użyć treści wiadomości e-mail do znalezienia i załadowania istniejącej strony trzeciej w bazie danych. Znaleziona (lub utworzona) strona trzecia będzie używana do wykonywania czynności, które tego wymagają. <br> Na przykład, jeśli chcesz utworzyć osobę trzecią z nazwą wyodrębnioną w treści ciągu „Nazwa: nazwa do znalezienia”, użyj adresu e-mail nadawcy jako adresu e-mail, możesz ustawić pole parametru w następujący sposób: <br> 'email=NAGŁÓWEK: ^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;' <br>
+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>
 EndPointFor=Punkt końcowy dla %s: %s
 DeleteEmailCollector=Usuń moduł zbierający e-maile
 ConfirmDeleteEmailCollector=Czy na pewno chcesz usunąć tego kolektora e-maili?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Missing translation for %s
 NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/pl_PL/companies.lang b/htdocs/langs/pl_PL/companies.lang
index 3ffb0d48f53..256188cc40c 100644
--- a/htdocs/langs/pl_PL/companies.lang
+++ b/htdocs/langs/pl_PL/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (RUT)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Sprawdź
 VATIntraCheckDesc=Identyfikator VAT musi zawierać prefiks kraju. Łącze <b> %s </b> korzysta z usługi europejskiego sprawdzania podatku VAT (VIES), która wymaga dostępu do Internetu z serwera Dolibarr.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do?locale=pl
 VATIntraCheckableOnEUSite=Sprawdź wewnątrzwspólnotowy identyfikator VAT na stronie internetowej Komisji Europejskiej
-VATIntraManualCheck=Możesz również sprawdzić ręcznie na stronie internetowej Komisji Europejskiej <a href="%s" target="_blank"> %s </a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Brak możliwości sprawdzenia. Usługa nie jest dostarczana dla wybranego regionu (%s).
 NorProspectNorCustomer=Ani potencjalny klient, ani potencjalny klient
 JuridicalStatus=Typ podmiotu gospodarczego
diff --git a/htdocs/langs/pl_PL/errors.lang b/htdocs/langs/pl_PL/errors.lang
index de9e4af6814..19d61ab6016 100644
--- a/htdocs/langs/pl_PL/errors.lang
+++ b/htdocs/langs/pl_PL/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=Nazwa pliku nie może zawierać __COŚ__
 ErrorNotInDictionaryPaymentConditions=Nie w Słowniku terminów płatności, zmień.
 ErrorIsNotADraft=%s is not a draft
 ErrorExecIdFailed=Can't execute command "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Twój parametr PHP upload_max_filesize (%s) jest wyższy niż parametr PHP post_max_size (%s). To nie jest spójna konfiguracja.
diff --git a/htdocs/langs/pl_PL/main.lang b/htdocs/langs/pl_PL/main.lang
index 2e09c5adfc3..446196ff79b 100644
--- a/htdocs/langs/pl_PL/main.lang
+++ b/htdocs/langs/pl_PL/main.lang
@@ -212,6 +212,8 @@ User=Użytkownik
 Users=Użytkownicy
 Group=Grupa
 Groups=Grupy
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=Niezdefiniowano grup użytkowników
 Password=Hasło
 PasswordRetype=Powtórz hasło
diff --git a/htdocs/langs/pl_PL/other.lang b/htdocs/langs/pl_PL/other.lang
index b8272839faa..f4c7d85819c 100644
--- a/htdocs/langs/pl_PL/other.lang
+++ b/htdocs/langs/pl_PL/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Kodowanie hasła
 PermissionsAdd=Uprawnienia dodane
 PermissionsDelete=Uprawnienia usunięte
 YourPasswordMustHaveAtLeastXChars=Twoje hasło musi składać się z <strong>%s</strong> znaków
+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
 YourPasswordHasBeenReset=Twoje hasło zostało zresetowane pomyślnie
 ApplicantIpAddress=Adres IP wnioskodawcy
 SMSSentTo=SMS wysłany na numer %s
diff --git a/htdocs/langs/pl_PL/projects.lang b/htdocs/langs/pl_PL/projects.lang
index 090fb575702..7828d33f15c 100644
--- a/htdocs/langs/pl_PL/projects.lang
+++ b/htdocs/langs/pl_PL/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Uwaga: nie będzie to miało wp
 SelectLinesOfTimeSpentToInvoice=Wybierz wiersze spędzonego czasu, które nie zostały rozliczone, a następnie wykonaj zbiorcze działanie „Wygeneruj fakturę”, aby je rozliczyć
 ProjectTasksWithoutTimeSpent=Project tasks without time spent
 FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+StartDateCannotBeAfterEndDate=Data zakończenia nie może być wcześniejsza niż data rozpoczęcia
diff --git a/htdocs/langs/pl_PL/withdrawals.lang b/htdocs/langs/pl_PL/withdrawals.lang
index de1c8a76fda..613a6eb67b7 100644
--- a/htdocs/langs/pl_PL/withdrawals.lang
+++ b/htdocs/langs/pl_PL/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Polecenie przelewu
 LatestBankTransferReceipts=Najnowsze polecenia przelewu %s
 LastWithdrawalReceipts=Najnowsze pliki poleceń zapłaty %s
 WithdrawalsLine=Wiersz polecenia zapłaty
+CreditTransfer=Credit transfer
 CreditTransferLine=Linia polecenia przelewu
 WithdrawalsLines=Wiersze polecenia zapłaty
 CreditTransferLines=Linie polecenia przelewu
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Kod banku zewnętrznego
 NoInvoiceCouldBeWithdrawed=Żadna faktura nie została pobrana pomyślnie. Sprawdź, czy faktury dotyczą firm z prawidłowym IBAN i czy IBAN ma UMR (Unique Mandate Reference) w trybie <strong> %s </strong>.
 WithdrawalCantBeCreditedTwice=To potwierdzenie wypłaty jest już oznaczone jako zaksięgowane; nie można tego zrobić dwa razy, ponieważ mogłoby to potencjalnie spowodować zduplikowane płatności i wpisy bankowe.
 ClassCredited=Klasyfikacja zapisane
+ClassDebited=Classify debited
 ClassCreditedConfirm=Czy na pewno chcesz to wycofanie otrzymania sklasyfikowania jako wpłacone na konto bankowe?
 TransData=Data Transmission
 TransMetod=Tryb transmisji
diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang
index 6e6cb3460ab..685f1e78aa1 100644
--- a/htdocs/langs/pt_BR/admin.lang
+++ b/htdocs/langs/pt_BR/admin.lang
@@ -556,7 +556,6 @@ Permission106=Exportar Envios
 Permission109=Deletar Envios
 Permission111=Ler Contas Financeiras
 Permission112=Criar/Modificar/Deletar e Comparar Transações
-Permission113=Configurar Contas Financeiras (criar, gerenciar categorias)
 Permission115=Exportar Transações e Extratos Bancários
 Permission116=Transferência entre Contas
 Permission117=Gerenciar cheques despachando
@@ -684,12 +683,9 @@ Permission701=Ler Doações
 Permission702=Criar/Modificar Doações
 Permission703=Excluir Doações
 Permission771=Ler relatórios de despesa (o seu e dos seus subordinados)
-Permission772=Criar / modificar relatórios de despesas
 Permission773=Excluir relatórios de despesas
-Permission774=Leia todos os relatórios de despesas (mesmo para o utilizadores Não subordinados)
 Permission775=Aprovar os relatórios de despesas
 Permission776=Relatórios de despesas pagas
-Permission777=Ler relatórios de despesas de todos
 Permission778=Criar / alterar relatórios de despesas de todos
 Permission779=Exportar - Relatórios de despesas
 Permission1001=Ler Estoques
@@ -745,10 +741,6 @@ Permission2801=Usar cliente FTP no modo leitura (somente navegador e baixar)
 Permission2802=Usar cliente FTP no modo escrita (deletar ou upload de arquivos)
 Permission3200=Leia eventos arquivados e impressões digitais
 Permission3301=Gerar novos módulos
-Permission4001=Visualizar funcionários
-Permission4002=Criar funcionários
-Permission4003=Excluir funcionários
-Permission4004=Exportar funcionários
 Permission10001=Leia o conteúdo do site
 Permission10002=Criar / modificar o conteúdo do site (conteúdo em html e javascript)
 Permission10003=Criar / modificar o conteúdo do site (código php dinâmico). Perigoso, deve ser reservado para desenvolvedores restritos.
@@ -756,9 +748,6 @@ Permission10005=Excluir conteúdo do site
 Permission20001=Leia pedidos de licença (sua licença e os de seus subordinados)
 Permission20002=Criar/modificar seus pedidos de licença (sua licença e os de seus subordinados)
 Permission20003=Excluir pedidos de licença
-Permission20004=Leia todos os pedidos de licença (mesmo do usuário não subordinados)
-Permission20005=Criar / modificar pedidos de licença para todos (mesmo do usuário não subordinados)
-Permission20006=Pedidos de licença administrativas (configuração e atualização de balanço)
 Permission20007=Aprovar solicitações de licenças
 Permission23001=Ler Tarefas Agendadas
 Permission23002=Criar/Atualizar Tarefas Agendadas
@@ -1514,9 +1503,6 @@ EmailCollectorConfirmCollectTitle=Confirmação de recebimento de e-mail
 EmailCollectorConfirmCollect=Deseja executar a coleta deste coletor agora?
 NoNewEmailToProcess=Nenhum novo e-mail (filtros correspondentes) para processar
 XEmailsDoneYActionsDone=%s e-mails qualificados, %s e-mails processados com sucesso (para registro %s/ações executadas)
-RecordEvent=Registrar evento de e-mail
-CreateLeadAndThirdParty=Criar lead (e terceiro, se necessário)
-CreateTicketAndThirdParty=Criar ticket (e vincular a terceiros se tiver sido carregado por uma operação anterior)
 CodeLastResult=Código do último resultado
 NbOfEmailsInInbox=Número de e-mails no diretório de origem
 LoadThirdPartyFromName=Carregar pesquisa de terceiros em %s (carregar somente)
diff --git a/htdocs/langs/pt_BR/companies.lang b/htdocs/langs/pt_BR/companies.lang
index 6f0f7830869..57dc62f8d8a 100644
--- a/htdocs/langs/pt_BR/companies.lang
+++ b/htdocs/langs/pt_BR/companies.lang
@@ -27,6 +27,10 @@ Individual=Pessoa física
 ToCreateContactWithSameName=Irá automaticamente criar um contato/endereço com a mesma informação do terceiro. Na maioria dos casos, mesmo que o terceiro seja uma pessoa física, a criação de um único terceiro é suficiente.
 ParentCompany=Matriz
 Subsidiaries=Filiais
+ReportByMonth=Relatório por mês
+ReportByCustomers=Relatório por cliente
+ReportByThirdparties=Relatório por terceiro
+ReportByQuarter=Relatório por taxa
 CivilityCode=Forma de tratamento
 RegisteredOffice=Escritório registrado
 Lastname=Sobrenome
diff --git a/htdocs/langs/pt_BR/other.lang b/htdocs/langs/pt_BR/other.lang
index e6a654c328d..54f498e002d 100644
--- a/htdocs/langs/pt_BR/other.lang
+++ b/htdocs/langs/pt_BR/other.lang
@@ -6,6 +6,8 @@ BirthdayAlertOff=Alerta de aniversário desativado
 PreviousMonthOfInvoice=Mês anterior (número 1-12) da data da fatura
 NextMonthOfInvoice=Mês seguinte (número 1-12) da data da fatura
 TextNextMonthOfInvoice=Mês seguinte (texto) da data da fatura
+PreviousMonth=Mês anterior
+CurrentMonth=Mês atual
 ZipFileGeneratedInto=Arquivo zip gerado em <b> %s </ b>.
 DocFileGeneratedInto=Arquivo doc gerado em <b> %s </ b>.
 JumpToLogin=Desconectado. Vá para a página de login ...
@@ -157,6 +159,7 @@ NewKeyIs=Estas sao as suas novas chaves de acesso
 NewKeyWillBe=Sua nova chave de acesso do software sera
 ClickHereToGoTo=Clickar aqui para ir a %s
 YouMustClickToChange=Voce tem que clickar no seguinte atalho para validar a sua troca de senha
+ConfirmPasswordChange=Confirme a alteração da senha
 ForgetIfNothing=Se voce nao pediu esta mudanca, simplismente esquece deste email. Suas credenciais estao seguras.
 IfAmountHigherThan=Se a quantia mais elevada do que <strong>%s</strong>
 SourcesRepository=Repositório de fontes
@@ -177,7 +180,10 @@ WEBSITE_IMAGEDesc=Caminho relativo da mídia de imagem. Você pode mantê-lo vaz
 LinesToImport=Linhas para importar
 MemoryUsage=Uso de memória
 RequestDuration=Duração do pedido
+ProductsPerPopularity=Produtos / serviços por popularidade
 PopuProp=Produtos / Serviços por popularidade em propostas
 PopuCom=Produtos / Serviços por popularidade em pedidos
 ProductStatistics=Estatísticas de Produtos / Serviços
 NbOfQtyInOrders=Quant. em pedidos
+SelectTheTypeOfObjectToAnalyze=Selecione um objeto para ver suas estatísticas ...
+ConfirmBtnCommonTitle =Confirme sua ação
diff --git a/htdocs/langs/pt_BR/projects.lang b/htdocs/langs/pt_BR/projects.lang
index 775c8f92217..1633cafc962 100644
--- a/htdocs/langs/pt_BR/projects.lang
+++ b/htdocs/langs/pt_BR/projects.lang
@@ -139,6 +139,7 @@ DontHaveTheValidateStatus=O projeto %s deve estar aberto para ser fechado
 ModuleSalaryToDefineHourlyRateMustBeEnabled=Módulo 'Salário' deve estar habilitado para def. taxas hh, para ter o tempo gasto valorizado
 NewTaskRefSuggested=Tarefa ref.  já usada, uma nova tarefa ref. é necessária
 TimeSpentInvoiced=Tempo gasto faturado
+TimeSpentForIntervention=Dispêndio de tempo
 TimeSpentForInvoice=Dispêndio de tempo
 OneLinePerUser=Uma linha por usuário
 ServiceToUseOnLines=Serviço para usar em linhas
@@ -151,6 +152,8 @@ UsageOpportunity=Uso: Oportunidade
 UsageTasks=Uso: Tarefas
 UsageBillTimeShort=Uso: tempo da conta
 InvoiceToUse=Rascunho de fatura a ser usada
+NewInter=Nova Intervenção
 OneLinePerTask=Uma linha por tarefa
 OneLinePerPeriod=Uma linha por período
 RefTaskParent=Ref. Tarefa principal
+StartDateCannotBeAfterEndDate=A data final não pode ser anterior a data de início
diff --git a/htdocs/langs/pt_BR/withdrawals.lang b/htdocs/langs/pt_BR/withdrawals.lang
index c4b3062402a..cf25c68bb59 100644
--- a/htdocs/langs/pt_BR/withdrawals.lang
+++ b/htdocs/langs/pt_BR/withdrawals.lang
@@ -6,6 +6,7 @@ StandingOrderToProcess=A Processar
 WithdrawalsReceipts=Pedidos com Débito direto
 WithdrawalReceipt=Ordem de débito direto
 LastWithdrawalReceipts=Últimos %s arquivos de Débito direto
+CreditTransfer=Transferência de crédito
 WithdrawalsLines=Linhas do pedido para Débito direto
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Ainda não é possível. Retirar o status deve ser definido como 'creditado' antes de declarar rejeitar em linhas específicas.
 NbOfInvoiceToWithdrawWithInfo=Nº. de fatura do cliente com ordens de pagamento por débito direto com informações definidas sobre a conta bancária
diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang
index e0d89910d39..7844eb65a1c 100644
--- a/htdocs/langs/pt_PT/admin.lang
+++ b/htdocs/langs/pt_PT/admin.lang
@@ -756,7 +756,7 @@ Permission106=Exportar envios
 Permission109=Eliminar envios
 Permission111=Consultar contas financeiras (contas bancárias, caixas)
 Permission112=Criar/modificar/eliminar e comparar trasações
-Permission113=Configurar as contas ficnanceiras (criar, gerir categorias)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconciliar transações
 Permission115=Exportar transacções e extractos
 Permission116=Transferências entre contas
@@ -893,12 +893,11 @@ Permission701=Consultar donativos
 Permission702=Criar/modificar donativos
 Permission703=Eliminar donativos
 Permission771=Consultar relatórios de despesas (seus e dos seus subordinados)
-Permission772=Criar/modificar relatórios de despesas
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Eliminar relatórios de despesas
-Permission774=Consultar todos os relatórios de despesa (mesmo para utilizadores que não são subordinados)
 Permission775=Aprovar relatórios de despesas
 Permission776=Pagar relatórios de despesas
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=Exportar relatórios de despesas
 Permission1001=Consultar stocks
@@ -962,15 +961,11 @@ Permission2801=Usar cliente FTP em modo de leitura (listar e descarregar apenas)
 Permission2802=Usar o cliente FTP em modo de escrita (eliminar ou carregar ficheiros)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
@@ -981,9 +976,9 @@ Permission10005=Delete website content
 Permission20001=Read leave requests (your leave and those of your subordinates)
 Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
 Permission20003=Eliminar pedidos de licença
-Permission20004=Consultar todos os pedidos de licença (incluindo os dos utilizadores não são seus subordinados)
-Permission20005=Criar/modificar pedidos de licença de todos (incluindo os dos utilizadores não são seus subordinados)
-Permission20006=Pedidos de licenças do administrador (configuração e atualização do balanço)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Approve leave requests
 Permission23001=Consultar trabalho agendado
 Permission23002=Criar/atualizar trabalho agendado
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 NoNewEmailToProcess=Nenhum novo email (filtros correspondentes) para processar
 NothingProcessed=Nada feito
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
-RecordEvent=Registrar evento de email
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
@@ -2084,7 +2080,7 @@ CreateCandidature=Create job application
 FormatZip=Código postal
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -2130,7 +2126,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+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>
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Missing translation for %s
 NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/pt_PT/companies.lang b/htdocs/langs/pt_PT/companies.lang
index ad7259e5700..de2a743c6fb 100644
--- a/htdocs/langs/pt_PT/companies.lang
+++ b/htdocs/langs/pt_PT/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=ID Prof. 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Verificar
 VATIntraCheckDesc=O ID do IVA deve incluir o prefixo do país. O link <b> %s </b> usa o serviço de verificador de IVA europeu (VIES) que requer acesso à Internet do servidor Dolibarr.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Verifique o ID do IVA intracomunitário no site da Comissão Europeia
-VATIntraManualCheck=Você também pode verificar manualmente no site da Comissão Europeia <a href="%s" target="_blank"> %s </a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Verificação Impossivel. O serviço de verificação não é prestado pelo país membro (%s).
 NorProspectNorCustomer=Não é cliente potencial, nem cliente
 JuridicalStatus=Forma Jurídica
diff --git a/htdocs/langs/pt_PT/errors.lang b/htdocs/langs/pt_PT/errors.lang
index 5d77af113fa..ea17bdebea8 100644
--- a/htdocs/langs/pt_PT/errors.lang
+++ b/htdocs/langs/pt_PT/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
 ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
 ErrorIsNotADraft=%s is not a draft
 ErrorExecIdFailed=Can't execute command "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # 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/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang
index 02ac85cdd53..4dcf47e511a 100644
--- a/htdocs/langs/pt_PT/main.lang
+++ b/htdocs/langs/pt_PT/main.lang
@@ -212,6 +212,8 @@ User=Utilizador
 Users=Utilizadores
 Group=Grupo
 Groups=Grupos
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=Nenhum grupo de utilizador definido
 Password=Senha
 PasswordRetype=Contrassenha
diff --git a/htdocs/langs/pt_PT/other.lang b/htdocs/langs/pt_PT/other.lang
index 722de7fee1c..911d9e56e60 100644
--- a/htdocs/langs/pt_PT/other.lang
+++ b/htdocs/langs/pt_PT/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Codificação de palavra-passe
 PermissionsAdd=Permissões adicionadas
 PermissionsDelete=Permissões removidas
 YourPasswordMustHaveAtLeastXChars=A sua palavra-passe deve ter pelo menos estes caracteres: <strong>%s</strong>
+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
 YourPasswordHasBeenReset=A sua palavra-passe foi reposta com sucesso
 ApplicantIpAddress=Endereço IP do requerente
 SMSSentTo=SMS enviado para %s
diff --git a/htdocs/langs/pt_PT/projects.lang b/htdocs/langs/pt_PT/projects.lang
index ca305970928..7735c551f51 100644
--- a/htdocs/langs/pt_PT/projects.lang
+++ b/htdocs/langs/pt_PT/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
 ProjectTasksWithoutTimeSpent=Project tasks without time spent
 FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+StartDateCannotBeAfterEndDate=A data de fim não pode ser anterior à data de início
diff --git a/htdocs/langs/pt_PT/withdrawals.lang b/htdocs/langs/pt_PT/withdrawals.lang
index 314d8c92750..32fcde46473 100644
--- a/htdocs/langs/pt_PT/withdrawals.lang
+++ b/htdocs/langs/pt_PT/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Últimos arquivos de débito direto %s
 WithdrawalsLine=Direct debit order line
+CreditTransfer=Credit transfer
 CreditTransferLine=Credit transfer line
 WithdrawalsLines=Linhas de ordem de débito direto
 CreditTransferLines=Credit transfer lines
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=Nenhuma fatura debitada com sucesso. Verifique se as faturas estão em empresas com um IBAN válido e se o IBAN tem uma UMR (Unique Mandate Reference) com o modo <strong> %s </ strong>.
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=Classificar como creditado
+ClassDebited=Classify debited
 ClassCreditedConfirm=Tem a certeza que quer classificar este débito direto como creditado na sua conta bancária?
 TransData=Data de Envio
 TransMetod=Método de transmissão
diff --git a/htdocs/langs/ro_RO/accountancy.lang b/htdocs/langs/ro_RO/accountancy.lang
index 21859d9aa35..00f79f1b897 100644
--- a/htdocs/langs/ro_RO/accountancy.lang
+++ b/htdocs/langs/ro_RO/accountancy.lang
@@ -48,7 +48,7 @@ CountriesNotInEEC=Țări care nu se află în CEE
 CountriesInEECExceptMe=Țările din CEE, cu excepția celor din %s
 CountriesExceptMe=Toate țările, cu excepția %s
 AccountantFiles=Export documente sursă
-ExportAccountingSourceDocHelp=With this tool, you can export the source events (list in CSV and PDFs) that are used to generate your accountancy.
+ExportAccountingSourceDocHelp=Cu acest instrument, poți exporta evenimentele sursă (listă în CSV și PDF) care sunt utilizate pentru a genera operaţiunile de contabilitate.
 ExportAccountingSourceDocHelp2=Pentru export jurnale, foloseşte meniul %s - %s.
 VueByAccountAccounting=Vizualizare după contul contabil
 VueBySubAccountAccounting=Vizualizați după subcont contabil
diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang
index 2c9946ea98a..2b6ad8dcb8d 100644
--- a/htdocs/langs/ro_RO/admin.lang
+++ b/htdocs/langs/ro_RO/admin.lang
@@ -756,7 +756,7 @@ Permission106=Export livrări
 Permission109=Şterge livrări
 Permission111=Citeşte conturi financiare
 Permission112=Creare/modificare/ştergere şi comparare tranzacţii
-Permission113=Configurare conturi financiare( creare, gestionare categorii)
+Permission113=Configurare conturi financiare (creare, gestionare categorii de tranzacții bancare)
 Permission114=Reconciliere tranzacții
 Permission115=Export tranzacţii şi declaraţii contabile
 Permission116=Transferuri între conturi
@@ -893,12 +893,11 @@ Permission701=Citeşte donaţii
 Permission702=Creare/modificare donaţii
 Permission703=Ştergere donaţii
 Permission771=Citeşte rapoarte de cheltuieli (ale sale și ale subordonaților săi)
-Permission772=Creare/modificare rapoarte de cheltuieli
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Șterge rapoarte de cheltuieli
-Permission774=Citeşte toate rapoartele de cheltuieli (chiar și pentru utilizatorii care nu sunt subordonații săi)
 Permission775=Aprobă rapoarte de cheltuieli
 Permission776=Plăteşte rapoartele de cheltuieli
-Permission777=Citire rapoarte de cheltuieli ale tuturor
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Creare/modificare rapoarte de cheltuieli pentru toţi
 Permission779=Export rapoarte de cheltuieli
 Permission1001=Citeşte stocuri
@@ -962,15 +961,11 @@ Permission2801=Foloseşte clientul FTP în modul de citire (numai navigare și d
 Permission2802=Foloseşte clientul FTP în modul de scriere (ştergere şi încărcare fişiere)
 Permission3200=Citeşte evenimente arhivate și amprente digitale
 Permission3301=Generare module noi
-Permission4001=Vede angajații
-Permission4002=Creare angajați
-Permission4003=Șterge angajați
-Permission4004=Export angajați
-Permission4010=Citeşte abilitate/job/post
-Permission4011=Creare/modificare abilitate/job/post
-Permission4012=Şterge abilitate/job/post
-Permission4020=Citeşte evaluare
-Permission4021=Creare/modificare evaluare
+Permission4001=Citeşte abilitate/job/post
+Permission4002=Creare/modificare abilitate/job/post
+Permission4003=Şterge abilitate/job/post
+Permission4020=Citeşte evaluări
+Permission4021=Create/modify your evaluation
 Permission4022=Validare evaluare
 Permission4023=Ştergere evaluare
 Permission4030=Vede meniul de comparare
@@ -981,9 +976,9 @@ Permission10005=Șterge conținut site web
 Permission20001=Citeşte cererile de concediu (concediul său și cele ale subordonaților săi)
 Permission20002=Creare/modificare cereri de concediu (concediul său și cele ale subordonaților săi)
 Permission20003=Şterge cererile de concediu
-Permission20004=Citeşte toate cererile de concediu (chiar și pentru utilizatorii care nu-i sunt subordonați)
-Permission20005=Creare/modificare cereri de concediu pentru toată lumea (chiar și pentru utilizatorii care nu-i sunt subordonați)
-Permission20006=Administrare cereri de concediu (configurare şi actualizare balanţă)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Aprobare cereri de concediu
 Permission23001=Citeşte Joburi programate
 Permission23002=Creare/modificare job programat
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Doriți să rulați acum colectarea pentru acest co
 NoNewEmailToProcess=Niciun email de procesat (care sa se potriveasca cu filtrele)
 NothingProcessed=Nu s-a făcut nimic
 XEmailsDoneYActionsDone=%semail-uri calificate, %s email-uri procesate cu succes (pentru %s înregistrări/acţiuni efectuate)
-RecordEvent=Înregistrați evenimentul de email
-CreateLeadAndThirdParty=Creați lead oportunitate (și terț, dacă este necesar)
-CreateTicketAndThirdParty=Creați tichet (și faceți legătura cu un terț dacă a fost încărcat de o operațiune anterioară)
+RecordEvent=Înregistrare eveniment în agendă (de tipul Trimitere email sau Recepţionare email)
+CreateLeadAndThirdParty=Creare lead (şi terţ dacă este cazul)
+CreateTicketAndThirdParty=Creare tichet (legat de un terț, dacă terțul a fost încărcat printr-o operațiune anterioară, fără terț altfel)
 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)
+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
 WithDolTrackingIDInMsgId=Mesaj transmis din sistem
@@ -2084,7 +2080,7 @@ CreateCandidature=Creare aplicare la job
 FormatZip=Zip
 MainMenuCode=Codul de intrare a meniului (meniu principal)
 ECMAutoTree=Afișați arborele ECM automat
-OperationParamDesc=Definiți valorile de utilizat pentru obiectul acțiunii sau modul de extragere a valorilor. De exemplu: <br>objproperty1=SET:valoarea de setat<br>objproperty2=SET:o valoare de înlocuire a __objproperty1__<br>objproperty3=SETIFEMPTY:valoare folosită dacă objproperty3 nu este încă definită<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:Denumirea companiei mele este\\s([^\\s]*)<br><br>Folosește caracterul ; ca separator pentru a extrage sau seta mai multe proprietăți.
+OperationParamDesc=Definire reguli de utilizat pentru a extrage sau a seta valori.<br> Exemplu pentru operațiunile care trebuie să extragă un nume subiectul email-ului: <br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Exemplu pentru operațiuni de creare obiecte:<br>objproperty1=SET:valoarea de setat<br>objproperty2=SET:o valoare care include valoarea __objproperty1__<br>objproperty3=SETIFEMPTY:valoare utilizată dacă objproperty3 nu este deja definit<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>Foloseşte ; ca separator pentru a extrage sau a seta mai multe proprietăți.
 OpeningHours=Program de lucru
 OpeningHoursDesc=Introduceți aici programul de lucru normal ale companiei dvs.
 ResourceSetup=Configurarea modulului Resurse 
@@ -2130,7 +2126,7 @@ LargerThan=Mai mare decât
 IfTrackingIDFoundEventWillBeLinked=Rețineți că, dacă un identificator de urmărire al unui obiect este găsit în e-mail sau dacă e-mailul este un răspuns al unui e-mail colectat și legat de un obiect, evenimentul creat va fi legat automat de obiectul cunoscut.
 WithGMailYouCanCreateADedicatedPassword=Cu un cont GMail, dacă ați activat validarea cu 2 factori, este recomandat să creați o a doua parolă dedicată pentru aplicație, în loc să utilizați propria parolă de la https://myaccount.google.com/.
 EmailCollectorTargetDir=Poate fi de dorit să mutați email-ul într-o altă etichetă/director atunci când a fost procesat cu succes. Trebuie doar să setați numele directorului aici pentru a utiliza această caracteristică (NU folosiți caractere speciale în nume). Rețineți că, de asemenea, trebuie să utilizați un cont de autentificare pentru citire/scriere.
-EmailCollectorLoadThirdPartyHelp=Puteți utiliza această acțiune pentru a folosi conținutul emailului pentru a găsi și încărca un terț în baza de date. Terțul găsit (sau creat) va fi utilizat pentru următoarele acțiuni necesare.<br> De exemplu, dacă doreşti să creezi un terț cu un nume extras dintr-un șir 'Nume: nume căutat' găsit în conţinut, utilizează email-ul expeditorului ca email, poți seta câmpul parametru astfel:<br> 'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+EmailCollectorLoadThirdPartyHelp=Poţi folosi această acțiune pentru a utiliza conținutul email-ului pentru a găsi și încărca un terţ existent în baza de date. Terțul găsit (sau creat) va fi folosit pentru următoarele acțiuni care depind de el.<br> De exemplu, dacă vrei să creezi un terț cu un nume extras dintr-un șir 'Nume: nume de căutat' prezent în conţinut, utilizează adresa de email a expeditorului, poţi seta câmpul parametru astfel:<br> 'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
 EndPointFor=End point pentru %s:%s
 DeleteEmailCollector=Şterge colectorul de email-uri
 ConfirmDeleteEmailCollector=Eşti sigur că vrei să ştergi acest colector de email-uri?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Lipseşte traducerea pentru %s
 NativeModules=Module native
 NoDeployedModulesFoundWithThisSearchCriteria=Nu s-au găsit module pentru acest criteriu de căutare
 API_DISABLE_COMPRESSION=Dezactivare compresie răspunsuri API
+EachTerminalHasItsOwnCounter=Fiecare terminal foloseşte propriul contor.
diff --git a/htdocs/langs/ro_RO/companies.lang b/htdocs/langs/ro_RO/companies.lang
index e727b9321db..145b639f3eb 100644
--- a/htdocs/langs/ro_RO/companies.lang
+++ b/htdocs/langs/ro_RO/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Prof. Id 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
diff --git a/htdocs/langs/ro_RO/errors.lang b/htdocs/langs/ro_RO/errors.lang
index 7c27df1c580..019dc6717ea 100644
--- a/htdocs/langs/ro_RO/errors.lang
+++ b/htdocs/langs/ro_RO/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=Numele fișierului nu poate să conțină _SOMETHING_ în el
 ErrorNotInDictionaryPaymentConditions=Nu se află în dicționarul Condiții de plată, vă rugăm să modificați.
 ErrorIsNotADraft=%s nu este o schiţă
 ErrorExecIdFailed=Nu se poate executa comanda "id"
+ErrorBadCharIntoLoginName=Caracter nepermis în numele de utilizator
 
 # 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ă.
diff --git a/htdocs/langs/ro_RO/main.lang b/htdocs/langs/ro_RO/main.lang
index 4a27ace9873..f66b50ed06a 100644
--- a/htdocs/langs/ro_RO/main.lang
+++ b/htdocs/langs/ro_RO/main.lang
@@ -212,6 +212,8 @@ User=Utilizator
 Users=Utilizatori
 Group=Grup
 Groups=Grupuri
+UserGroup=Grup utilizator
+UserGroups=Grupuri utilizator
 NoUserGroupDefined=Niciun grup de utilizatori definit
 Password=Parola
 PasswordRetype=Repetă parola
diff --git a/htdocs/langs/ro_RO/other.lang b/htdocs/langs/ro_RO/other.lang
index ce0240b8315..80b0cb1c90a 100644
--- a/htdocs/langs/ro_RO/other.lang
+++ b/htdocs/langs/ro_RO/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Codarea parolei
 PermissionsAdd=Au fost adăugate permisiuni
 PermissionsDelete=Permisiunile au fost eliminate
 YourPasswordMustHaveAtLeastXChars=Parola ta trebuie să aibă cel puțin <strong>%s</strong> caractere
+PasswordNeedAtLeastXUpperCaseChars=Parola trebuie să conţină cel puțin <strong>%s</strong> caractere majuscule
+PasswordNeedAtLeastXDigitChars=Parola trebuie să conţină cel puțin <strong>%s</strong> caractere numerice
+PasswordNeedAtLeastXSpecialChars=Parola trebuie să conţină cel puțin <strong>%s</strong> caractere speciale
+PasswordNeedNoXConsecutiveChars=Parola nu trebuie să aibă <strong>%s</strong> caractere similare consecutive
 YourPasswordHasBeenReset=Parola ta a fost resetată cu succes
 ApplicantIpAddress=Adresa IP a solicitantului
 SMSSentTo=SMS trimis la %s
diff --git a/htdocs/langs/ro_RO/projects.lang b/htdocs/langs/ro_RO/projects.lang
index 4220887db1f..2d222f5ac78 100644
--- a/htdocs/langs/ro_RO/projects.lang
+++ b/htdocs/langs/ro_RO/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Notă: proiectele existente cu
 SelectLinesOfTimeSpentToInvoice=Selectează linii de timp consumat care nu sunt facturate, apoi iniţiază acțiunea în bloc "Generare factură" pentru a le factura
 ProjectTasksWithoutTimeSpent=Task-uri proiect fără timp consumat
 FormForNewLeadDesc=Vă mulțumim că aţi completat formularul pentru a ne contacta. De asemenea, ne puteți trimite un email direct la <b>%s</b>.
+StartDateCannotBeAfterEndDate=Data de sfârşit nu poate fi înaintea datei de început
diff --git a/htdocs/langs/ro_RO/withdrawals.lang b/htdocs/langs/ro_RO/withdrawals.lang
index f7990437fe4..68137b5531e 100644
--- a/htdocs/langs/ro_RO/withdrawals.lang
+++ b/htdocs/langs/ro_RO/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Ordin de transfer de credit
 LatestBankTransferReceipts=Ultimile %s ordine de transfer de credit
 LastWithdrawalReceipts=Ultimele%s fișiere de debit direct
 WithdrawalsLine=Linie ordin de direct debit
+CreditTransfer=Transfer credit
 CreditTransferLine=Linie transfer de credit
 WithdrawalsLines=Linii de ordine de debitare directă
 CreditTransferLines=Linii transfer de credit
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Cod bancar terț
 NoInvoiceCouldBeWithdrawed=Nici o factură nu a fost debitată cu succes. Verificați dacă facturile sunt pe companiile cu un IBAN valabil și că IBAN are un UMR (referință unică de mandat) cu modul <strong> %s </strong>.
 WithdrawalCantBeCreditedTwice=Această chitanță de retragere este deja marcată ca fiind creditată; acest lucru nu se poate face de două ori, deoarece acest lucru ar putea crea plăți și înregistrări bancare duplicate.
 ClassCredited=Clasifică creditat
+ClassDebited=Clasifică debitat
 ClassCreditedConfirm=Sunteţi sigur că doriţi sa clasificaţi această retragere ca creditată în contul tău bancar?
 TransData=Data transmiterii
 TransMetod=Metodă de transmitere
diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang
index cae44583071..b800bb1350d 100644
--- a/htdocs/langs/ru_RU/admin.lang
+++ b/htdocs/langs/ru_RU/admin.lang
@@ -756,7 +756,7 @@ Permission106=Экспортировать отправки
 Permission109=Удалить отправки
 Permission111=Читать финансовую отчетность
 Permission112=Создать/изменить/удалить и сравнить сделки
-Permission113=Настройка финансовых счетов (создание, изменение категорий)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Сверить транзакции
 Permission115=Экспорт операций и выписок со счета
 Permission116=Перераспределение средств между счетами
@@ -893,12 +893,11 @@ Permission701=Просмотр пожертвований
 Permission702=Создание/изменение пожертвований
 Permission703=Удаление пожертвований
 Permission771=Прочитайте отчеты о расходах (ваши и ваши подчиненные)
-Permission772=Создание/изменение отчётов о затратах
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Удаление отчётов о затратах
-Permission774=Просмотр всех отчётов о затратах (даже для неподчинённых пользователей)
 Permission775=Утвердить отчёты о расходах
 Permission776=Оплата отчётов о затратах
-Permission777=Читайте отчеты о расходах всех
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Создавать/изменять отчеты о расходах для всех
 Permission779=Экспорт отчётов о затратах
 Permission1001=Просмотр запасов
@@ -962,15 +961,11 @@ Permission2801=Использовать FTP  клиент в режиме тол
 Permission2802=Использовать FTP клиент в режиме записи (удаление или выгрузка файлов)
 Permission3200=Просмотреть архивированные события
 Permission3301=Создавать новые модули
-Permission4001=Смотреть сотрудников
-Permission4002=Создать сотрудников
-Permission4003=Удалить сотрудников
-Permission4004=Экспорт сотрудников
-Permission4010=Прочитать навык / работу / должность
-Permission4011=Создать / изменить навык / работу / должность
-Permission4012=Удалить навык / работу / должность
-Permission4020=Прочитать оценку
-Permission4021=Создать / изменить оценку
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Читать оценки
+Permission4021=Create/modify your evaluation
 Permission4022=Подтвердить оценку
 Permission4023=Удалить оценку
 Permission4030=См. Меню сравнения
@@ -981,9 +976,9 @@ Permission10005=Удалить контент сайта
 Permission20001=Просмотр запросов на отпуск (ваш отпуск и ваших подчиненных)
 Permission20002=Создайте/измените ваши запросы на отпуск (ваш отпуск и отпуск ваших подчиненных)
 Permission20003=Удалить заявления на отпуск
-Permission20004=Читайте все запросы на отпуск (даже пользователь не подчиняется)
-Permission20005=Создавать/изменять запросы на отпуск для всех (даже для пользователей, не подчиненных)
-Permission20006=Запросы на отпуск для партнеров (настройка и обновление баланса)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Утвердить запросы на отпуск
 Permission23001=Просмотр Запланированных задач
 Permission23002=Создать/обновить Запланированную задачу
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Вы хотите запустить коллекц
 NoNewEmailToProcess=Нет новых писем (соответствующие фильтры) для обработки
 NothingProcessed=Ничего не было выполнено
 XEmailsDoneYActionsDone=Письма %s квалифицированы, электронные письма %s успешно обработаны (для записи %s / выполненных действий)
-RecordEvent=Записать событие электронной почты
-CreateLeadAndThirdParty=Создайте лида (и стороннюю организацию, если необходимо)
-CreateTicketAndThirdParty=Создать тикет (и ссылку на третье лицо, если он был загружен предыдущей операцией)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 CodeLastResult=Последний код результата
 NbOfEmailsInInbox=Количество писем в исходном каталоге
 LoadThirdPartyFromName=Загрузить сторонний поиск на %s (только загрузка)
 LoadThirdPartyFromNameOrCreate=Загрузите сторонний поиск на %s (создайте, если не найден)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Сообщение из беседы, инициированной первым письмом, отправленным от Dolibarr
 WithoutDolTrackingID=Сообщение из беседы, инициированной первым электронным письмом, НЕ отправленным от Dolibarr
 WithDolTrackingIDInMsgId=Сообщение отправлено из Dolibarr
@@ -2084,7 +2080,7 @@ CreateCandidature=Создать заявление о приеме на раб
 FormatZip=Индекс
 MainMenuCode=Код входа в меню (главное меню)
 ECMAutoTree=Показать автоматическое дерево ECM
-OperationParamDesc=Определите значения, которые будут использоваться для объекта действия, или способы извлечения значений. Например:<br>objproperty1=SET: значение, которое нужно установить<br>objproperty2=SET: значение с заменой __objproperty1__<br>objproperty3=SETIFEMPTY: значение, используемое, если objproperty3: еще не определено<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:Название моей компании\\s([^\\s]*)<br><br>Использовать ; char в качестве разделителя для извлечения или установки нескольких свойств.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Часы работы
 OpeningHoursDesc=Введите здесь обычные часы работы вашей компании.
 ResourceSetup=Конфигурация  модуля Ресурсов
@@ -2130,7 +2126,7 @@ LargerThan=Больше, чем
 IfTrackingIDFoundEventWillBeLinked=Обратите внимание, что если идентификатор отслеживания объекта найден в электронном письме или если электронное письмо является ответом на электронную почту, которую собирают и связывают с объектом, созданное событие будет автоматически связано с известным связанным объектом.
 WithGMailYouCanCreateADedicatedPassword=В учетной записи GMail, если вы включили двухэтапную проверку, рекомендуется создать специальный второй пароль для приложения вместо использования пароля своей учетной записи с https://myaccount.google.com/.
 EmailCollectorTargetDir=Может оказаться желательным переместить электронное письмо в другой тег / каталог, когда оно было успешно обработано. Просто укажите здесь имя каталога, чтобы использовать эту функцию (НЕ используйте в имени специальные символы). Обратите внимание, что вы также должны использовать учетную запись для входа в систему для чтения / записи.
-EmailCollectorLoadThirdPartyHelp=Вы можете использовать это действие, чтобы использовать содержимое электронной почты для поиска и загрузки существующей третьей стороны в вашу базу данных. Найденное (или созданное) третье лицо будет использовано для следующих действий, которые в нем нуждаются. <br> Например, если вы хотите создать третью сторону с именем, извлеченным из строки «Имя: имя для поиска», найденной в теле, используйте электронную почту отправителя в качестве электронной почты, вы можете установить поле параметра следующим образом: <br> 'email = HEADER: ^ От: (. *); Name = EXTRACT: BODY: Name: \\ s ([^ \\ s] *); client = SET: 2; ' <br>
+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>
 EndPointFor=Конечная точка для %s: %s
 DeleteEmailCollector=Удалить сборщик электронной почты
 ConfirmDeleteEmailCollector=Вы уверены, что хотите удалить этот сборщик электронной почты?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Отсутствует перевод для %s
 NativeModules=Родные модули
 NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/ru_RU/companies.lang b/htdocs/langs/ru_RU/companies.lang
index 44129d49609..aeab0651951 100644
--- a/htdocs/langs/ru_RU/companies.lang
+++ b/htdocs/langs/ru_RU/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Проф Id 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Проверить
 VATIntraCheckDesc=ID НДС должен включать префикс страны. Ссылка <b>%s</b> использует европейскую службу проверки НДС (VIES), для которой требуется доступ в Интернет с сервера Dolibarr.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Проверьте ID НДС на веб-сайте Европейской комиссии
-VATIntraManualCheck=Вы также можете проверить его вручную на сайте Европейской Комиссии <a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Проверка невозможна. Сервис проверки не предоставляется государством-членом ЕС (%s).
 NorProspectNorCustomer=Ни лид, ни клиент
 JuridicalStatus=Тип хозяйствующего субъекта
diff --git a/htdocs/langs/ru_RU/errors.lang b/htdocs/langs/ru_RU/errors.lang
index ad8c86fc923..1b6cd56b68f 100644
--- a/htdocs/langs/ru_RU/errors.lang
+++ b/htdocs/langs/ru_RU/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=Имя файла не может содержать __SOMETH
 ErrorNotInDictionaryPaymentConditions=Нет в Словаре условий оплаты, пожалуйста, измените.
 ErrorIsNotADraft=%s это не черновик
 ErrorExecIdFailed=Can't execute command "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Ваш параметр PHP upload_max_filesize (%s) выше, чем параметр PHP post_max_size (%s). Это непоследовательная установка.
diff --git a/htdocs/langs/ru_RU/main.lang b/htdocs/langs/ru_RU/main.lang
index 950d4549890..bf508d11dc8 100644
--- a/htdocs/langs/ru_RU/main.lang
+++ b/htdocs/langs/ru_RU/main.lang
@@ -212,6 +212,8 @@ User=Пользователь
 Users=Пользователи
 Group=Группа
 Groups=Группы
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=Не задана группа для пользователя
 Password=Пароль
 PasswordRetype=Повторите ваш пароль
diff --git a/htdocs/langs/ru_RU/other.lang b/htdocs/langs/ru_RU/other.lang
index 6fe731da0d2..40585d03afd 100644
--- a/htdocs/langs/ru_RU/other.lang
+++ b/htdocs/langs/ru_RU/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Кодировка пароля
 PermissionsAdd=Разрешения добавлены
 PermissionsDelete=Разрешения удалены
 YourPasswordMustHaveAtLeastXChars=Ваш пароль должен содержать не менее <strong>%s</strong> символов.
+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
 YourPasswordHasBeenReset=Ваш пароль был успешно сброшен
 ApplicantIpAddress=IP-адрес заявителя
 SMSSentTo=SMS отправлено на %s
diff --git a/htdocs/langs/ru_RU/projects.lang b/htdocs/langs/ru_RU/projects.lang
index 7e4da6aca38..860d58fb678 100644
--- a/htdocs/langs/ru_RU/projects.lang
+++ b/htdocs/langs/ru_RU/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Примечание: суще
 SelectLinesOfTimeSpentToInvoice=Выберите строки затраченного времени, за которые не выставлены счета, затем выполните массовое действие "Сгенерировать счет-фактуру", чтобы выставить их.
 ProjectTasksWithoutTimeSpent=Задачи проекта без затрат времени
 FormForNewLeadDesc=Спасибо, заполните следующую форму, чтобы связаться с нами. Вы также можете отправить нам электронное письмо прямо на адрес <b>%s</b>.
+StartDateCannotBeAfterEndDate=Дата окончания не может быть раньше даты начала
diff --git a/htdocs/langs/ru_RU/withdrawals.lang b/htdocs/langs/ru_RU/withdrawals.lang
index 90c0b3cbe8b..69c5ee6602b 100644
--- a/htdocs/langs/ru_RU/withdrawals.lang
+++ b/htdocs/langs/ru_RU/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Распоряжение о переводе кредита
 LatestBankTransferReceipts=Последние заказы на кредитный перевод %s
 LastWithdrawalReceipts=Последние файлы прямого дебета %s
 WithdrawalsLine=Строка ордера на прямой дебет
+CreditTransfer=Credit transfer
 CreditTransferLine=Кредитная переводная линия
 WithdrawalsLines=Строки распоряжения о прямом дебетовании
 CreditTransferLines=Кредитные переводные линии
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Код стороннего банка
 NoInvoiceCouldBeWithdrawed=Счет-фактура не списана успешно. Убедитесь, что счета выставлены на компании с действующим IBAN и что IBAN имеет UMR (уникальный мандат) с режимом <strong> %s </strong>.
 WithdrawalCantBeCreditedTwice=Эта квитанция о снятии средств уже помечена как зачисленная; это нельзя сделать дважды, так как это потенциально может привести к дублированию платежей и банковских операций.
 ClassCredited=Классифицировать зачисленных
+ClassDebited=Classify debited
 ClassCreditedConfirm=Вы уверены, что хотите классифицировать это изъятие   как кредит на вашем счету в банке?
 TransData=Дата передачи
 TransMetod=Метод передачи
diff --git a/htdocs/langs/ru_UA/admin.lang b/htdocs/langs/ru_UA/admin.lang
deleted file mode 100644
index 2e81853353a..00000000000
--- a/htdocs/langs/ru_UA/admin.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - admin
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
diff --git a/htdocs/langs/sk_SK/admin.lang b/htdocs/langs/sk_SK/admin.lang
index c07309ddc2e..8d1d457f641 100644
--- a/htdocs/langs/sk_SK/admin.lang
+++ b/htdocs/langs/sk_SK/admin.lang
@@ -756,7 +756,7 @@ Permission106=Export sendings
 Permission109=Odstrániť sendings
 Permission111=Prečítajte finančných účtov
 Permission112=Vytvoriť / upraviť / zmazať a porovnať transakcie
-Permission113=Nastavenie finančných účtov (vytvárať, spravovať kategórie)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Vývozných transakcií, a výpisy z účtov
 Permission116=Prevody medzi účtami
@@ -893,12 +893,11 @@ Permission701=Prečítajte si dary
 Permission702=Vytvoriť / upraviť dary
 Permission703=Odstrániť dary
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Prečítajte si zásoby
@@ -962,15 +961,11 @@ Permission2801=Pomocou FTP klienta v režime čítania (prezerať a sťahovať i
 Permission2802=Pomocou FTP klienta v režime zápisu (odstrániť alebo vkladať)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
@@ -981,9 +976,9 @@ Permission10005=Delete website content
 Permission20001=Read leave requests (your leave and those of your subordinates)
 Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Approve leave requests
 Permission23001=Ukázať naplánovanú úlohu
 Permission23002=Vytvoriť / upraviť naplánovanú úlohu
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
-RecordEvent=Record email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
@@ -2084,7 +2080,7 @@ CreateCandidature=Create job application
 FormatZip=Zips
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -2130,7 +2126,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+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>
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Missing translation for %s
 NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/sk_SK/companies.lang b/htdocs/langs/sk_SK/companies.lang
index 5780a270015..f8dadfa8cfe 100644
--- a/htdocs/langs/sk_SK/companies.lang
+++ b/htdocs/langs/sk_SK/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (RUT)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ 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.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commission website
-VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Skontrolujte, nie je možné. Skontrolujte, služba nie je poskytovaná členským štátom (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Business entity type
diff --git a/htdocs/langs/sk_SK/errors.lang b/htdocs/langs/sk_SK/errors.lang
index 10178acd41a..a0bbae8b8bf 100644
--- a/htdocs/langs/sk_SK/errors.lang
+++ b/htdocs/langs/sk_SK/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
 ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
 ErrorIsNotADraft=%s is not a draft
 ErrorExecIdFailed=Can't execute command "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # 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/sk_SK/main.lang b/htdocs/langs/sk_SK/main.lang
index 8fb22bf4ebe..ee1c88d1326 100644
--- a/htdocs/langs/sk_SK/main.lang
+++ b/htdocs/langs/sk_SK/main.lang
@@ -212,6 +212,8 @@ User=Užívateľ
 Users=Užívatelia
 Group=Skupina
 Groups=Skupiny
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=Nie je definovaná skupina užívateľov
 Password=Heslo
 PasswordRetype=Zadajte znovu heslo
diff --git a/htdocs/langs/sk_SK/other.lang b/htdocs/langs/sk_SK/other.lang
index 3a63c33ab58..cabe1096ec7 100644
--- a/htdocs/langs/sk_SK/other.lang
+++ b/htdocs/langs/sk_SK/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Password encoding
 PermissionsAdd=Permissions added
 PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
+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
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
 SMSSentTo=SMS sent to %s
diff --git a/htdocs/langs/sk_SK/projects.lang b/htdocs/langs/sk_SK/projects.lang
index a6de18dc0ba..9c9aad52dc3 100644
--- a/htdocs/langs/sk_SK/projects.lang
+++ b/htdocs/langs/sk_SK/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
 ProjectTasksWithoutTimeSpent=Project tasks without time spent
 FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+StartDateCannotBeAfterEndDate=Dátum ukončenia nemôže byť pred dátumom začatia
diff --git a/htdocs/langs/sk_SK/withdrawals.lang b/htdocs/langs/sk_SK/withdrawals.lang
index 5f0aaf2ff58..61d034894b5 100644
--- a/htdocs/langs/sk_SK/withdrawals.lang
+++ b/htdocs/langs/sk_SK/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Najnovšie %s dokumenty bezhotovostných platieb
 WithdrawalsLine=Direct debit order line
+CreditTransfer=Credit transfer
 CreditTransferLine=Credit transfer line
 WithdrawalsLines=Riadky inkaso objednávok
 CreditTransferLines=Credit transfer lines
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=Klasifikovať pripísaná
+ClassDebited=Classify debited
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
 TransMetod=Transmission method
diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang
index 0facdea7cdb..231e2d99291 100644
--- a/htdocs/langs/sl_SI/admin.lang
+++ b/htdocs/langs/sl_SI/admin.lang
@@ -756,7 +756,7 @@ Permission106=Izvoz pošiljk
 Permission109=Brisanje pošiljk
 Permission111=Branje finančnih postavk
 Permission112=Kreiranje/spreminjanje/brisanje in primerjava transakcij
-Permission113=Nastavitve finančnih kontov (kreiranje, upravljanje kategorij)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Izvoz transakcij in računovodskih izkazov
 Permission116=Transfer med računi
@@ -893,12 +893,11 @@ Permission701=Branje donacij
 Permission702=Kreiranje/spreminjanje donacij
 Permission703=Delete donacij
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Kreiranje/spreminjanje stroškovnih poročil
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Brisanje stroškovnih poročil
-Permission774=Branje vseh stroškovnih poročil (tudi za nepodrejene)
 Permission775=Odobritev stroškovnih poročil
 Permission776=Plačilo stroškovnih poročil
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=Izvoz stroškovnih poročil
 Permission1001=Branje zalog
@@ -962,15 +961,11 @@ Permission2801=Uporaba FTP klienta samo za branje (samo brskanje in prenašanje)
 Permission2802=Uporaba FTP klienta za pisanje (brisanje ali nalaganje datotek)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
@@ -981,9 +976,9 @@ Permission10005=Delete website content
 Permission20001=Read leave requests (your leave and those of your subordinates)
 Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
 Permission20003=Brisanje zahtevkov za dopust
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Administriranje zahtevkov za dopust (nastavitve in posodobitev stanja)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Approve leave requests
 Permission23001=Preberi načrtovano delo
 Permission23002=Ustvari/posodobi načrtovano delo
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
-RecordEvent=Record email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
@@ -2084,7 +2080,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -2130,7 +2126,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+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>
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Missing translation for %s
 NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/sl_SI/companies.lang b/htdocs/langs/sl_SI/companies.lang
index 2a5bf9d1a10..6b689d59b9c 100644
--- a/htdocs/langs/sl_SI/companies.lang
+++ b/htdocs/langs/sl_SI/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL==
 ProfId4CL==
 ProfId5CL==
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO==
 ProfId2CO==
 ProfId3CO==
@@ -369,7 +381,7 @@ 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.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commission website
-VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <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
diff --git a/htdocs/langs/sl_SI/errors.lang b/htdocs/langs/sl_SI/errors.lang
index 39dd7145a4c..3f9a76f753b 100644
--- a/htdocs/langs/sl_SI/errors.lang
+++ b/htdocs/langs/sl_SI/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
 ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
 ErrorIsNotADraft=%s is not a draft
 ErrorExecIdFailed=Can't execute command "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # 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/sl_SI/main.lang b/htdocs/langs/sl_SI/main.lang
index dd69a8923d9..9633b6caa9b 100644
--- a/htdocs/langs/sl_SI/main.lang
+++ b/htdocs/langs/sl_SI/main.lang
@@ -212,6 +212,8 @@ User=Uporabnik
 Users=Uporabniki
 Group=Skupina
 Groups=Skupine
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=Nobena skupina uporabnikov ni definirana
 Password=Geslo
 PasswordRetype=Ponoven vnos gesla
diff --git a/htdocs/langs/sl_SI/other.lang b/htdocs/langs/sl_SI/other.lang
index da9972089d4..764a76c6c4c 100644
--- a/htdocs/langs/sl_SI/other.lang
+++ b/htdocs/langs/sl_SI/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Password encoding
 PermissionsAdd=Permissions added
 PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
+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
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
 SMSSentTo=SMS sent to %s
diff --git a/htdocs/langs/sl_SI/projects.lang b/htdocs/langs/sl_SI/projects.lang
index 1884ae89f81..7dce2e1815d 100644
--- a/htdocs/langs/sl_SI/projects.lang
+++ b/htdocs/langs/sl_SI/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
 ProjectTasksWithoutTimeSpent=Project tasks without time spent
 FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+StartDateCannotBeAfterEndDate=End date cannot be before start date
diff --git a/htdocs/langs/sl_SI/withdrawals.lang b/htdocs/langs/sl_SI/withdrawals.lang
index 8e249416da4..55f7143afcb 100644
--- a/htdocs/langs/sl_SI/withdrawals.lang
+++ b/htdocs/langs/sl_SI/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
 WithdrawalsLine=Direct debit order line
+CreditTransfer=Credit transfer
 CreditTransferLine=Credit transfer line
 WithdrawalsLines=Direct debit order lines
 CreditTransferLines=Credit transfer lines
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=Označi kot prejeto
+ClassDebited=Classify debited
 ClassCreditedConfirm=Ali zares želite to potrdilo o nakazilu označiti kot »v dobro« na vašem bančnem računu ?
 TransData=Datum prenosa
 TransMetod=Metoda prenosa
diff --git a/htdocs/langs/sq_AL/admin.lang b/htdocs/langs/sq_AL/admin.lang
index e0f043a0b0a..4c1fc92e29b 100644
--- a/htdocs/langs/sq_AL/admin.lang
+++ b/htdocs/langs/sq_AL/admin.lang
@@ -756,7 +756,7 @@ Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
 Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Export transactions and account statements
 Permission116=Transfers between accounts
@@ -893,12 +893,11 @@ Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Read stocks
@@ -962,15 +961,11 @@ Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
@@ -981,9 +976,9 @@ Permission10005=Delete website content
 Permission20001=Read leave requests (your leave and those of your subordinates)
 Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Approve leave requests
 Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
-RecordEvent=Record email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
@@ -2084,7 +2080,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -2130,7 +2126,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+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>
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Missing translation for %s
 NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/sq_AL/companies.lang b/htdocs/langs/sq_AL/companies.lang
index 35e138142ac..74ba7e4a819 100644
--- a/htdocs/langs/sq_AL/companies.lang
+++ b/htdocs/langs/sq_AL/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Check
 VATIntraCheckDesc=The VAT ID must include the country prefix. The link <b>%s</b> uses the European VAT checker service (VIES) which requires internet access from the Dolibarr server.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commission website
-VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Business entity type
diff --git a/htdocs/langs/sq_AL/errors.lang b/htdocs/langs/sq_AL/errors.lang
index 7bb0fac3f7b..eabc784e6aa 100644
--- a/htdocs/langs/sq_AL/errors.lang
+++ b/htdocs/langs/sq_AL/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
 ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
 ErrorIsNotADraft=%s is not a draft
 ErrorExecIdFailed=Can't execute command "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # 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/sq_AL/main.lang b/htdocs/langs/sq_AL/main.lang
index f7abb175fb3..ffad3cdd5c6 100644
--- a/htdocs/langs/sq_AL/main.lang
+++ b/htdocs/langs/sq_AL/main.lang
@@ -212,6 +212,8 @@ User=User
 Users=Users
 Group=Group
 Groups=Groups
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=No user group defined
 Password=Fjalëkalimi
 PasswordRetype=Retype your password
diff --git a/htdocs/langs/sq_AL/other.lang b/htdocs/langs/sq_AL/other.lang
index 34a479ceafa..87977779117 100644
--- a/htdocs/langs/sq_AL/other.lang
+++ b/htdocs/langs/sq_AL/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Password encoding
 PermissionsAdd=Permissions added
 PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
+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
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
 SMSSentTo=SMS sent to %s
diff --git a/htdocs/langs/sq_AL/projects.lang b/htdocs/langs/sq_AL/projects.lang
index 632ce803a62..edf3df924f6 100644
--- a/htdocs/langs/sq_AL/projects.lang
+++ b/htdocs/langs/sq_AL/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
 ProjectTasksWithoutTimeSpent=Project tasks without time spent
 FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+StartDateCannotBeAfterEndDate=End date cannot be before start date
diff --git a/htdocs/langs/sq_AL/withdrawals.lang b/htdocs/langs/sq_AL/withdrawals.lang
index d602e4a96c4..1b18584b316 100644
--- a/htdocs/langs/sq_AL/withdrawals.lang
+++ b/htdocs/langs/sq_AL/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
 WithdrawalsLine=Direct debit order line
+CreditTransfer=Credit transfer
 CreditTransferLine=Credit transfer line
 WithdrawalsLines=Direct debit order lines
 CreditTransferLines=Credit transfer lines
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=Classify credited
+ClassDebited=Classify debited
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
 TransMetod=Transmission method
diff --git a/htdocs/langs/sr_RS/admin.lang b/htdocs/langs/sr_RS/admin.lang
index 8fab9df109a..1467aaa2f49 100644
--- a/htdocs/langs/sr_RS/admin.lang
+++ b/htdocs/langs/sr_RS/admin.lang
@@ -756,7 +756,7 @@ Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
 Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Export transactions and account statements
 Permission116=Transfers between accounts
@@ -893,12 +893,11 @@ Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
 Permission771=Pročitaj troškove (Vaše i Vašeg tima)
-Permission772=Create/modify expense reports
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Read stocks
@@ -962,15 +961,11 @@ Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
@@ -981,9 +976,9 @@ Permission10005=Delete website content
 Permission20001=Read leave requests (your leave and those of your subordinates)
 Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
 Permission20003=Obriši zahteve za odsustvo
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Podešavanja zahteva za odsustvo (podešavanja i ažuriranje stanja)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Approve leave requests
 Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
-RecordEvent=Record email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
@@ -2084,7 +2080,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -2130,7 +2126,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+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>
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Missing translation for %s
 NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/sr_RS/companies.lang b/htdocs/langs/sr_RS/companies.lang
index eeb380e7a65..f0833945290 100644
--- a/htdocs/langs/sr_RS/companies.lang
+++ b/htdocs/langs/sr_RS/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Proveri
 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.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commission website
-VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Provera nije moguća. Servis nije dostupan za datu državu (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Business entity type
diff --git a/htdocs/langs/sr_RS/errors.lang b/htdocs/langs/sr_RS/errors.lang
index a9af9979748..9f749b63643 100644
--- a/htdocs/langs/sr_RS/errors.lang
+++ b/htdocs/langs/sr_RS/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
 ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
 ErrorIsNotADraft=%s is not a draft
 ErrorExecIdFailed=Can't execute command "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # 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/sr_RS/main.lang b/htdocs/langs/sr_RS/main.lang
index 81d92c01e54..93c6129c492 100644
--- a/htdocs/langs/sr_RS/main.lang
+++ b/htdocs/langs/sr_RS/main.lang
@@ -212,6 +212,8 @@ User=Korisnik
 Users=Korisnici
 Group=Grupa
 Groups=Grupe
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=Korisnička grupa nije definisana
 Password=Lozinka
 PasswordRetype=Ponovo unesi lozinku
diff --git a/htdocs/langs/sr_RS/other.lang b/htdocs/langs/sr_RS/other.lang
index 5719b9f94d4..d0f857f07d4 100644
--- a/htdocs/langs/sr_RS/other.lang
+++ b/htdocs/langs/sr_RS/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Password encoding
 PermissionsAdd=Permissions added
 PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
+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
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
 SMSSentTo=SMS sent to %s
diff --git a/htdocs/langs/sr_RS/projects.lang b/htdocs/langs/sr_RS/projects.lang
index 8cb16e61fe2..9967b06dbc2 100644
--- a/htdocs/langs/sr_RS/projects.lang
+++ b/htdocs/langs/sr_RS/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
 ProjectTasksWithoutTimeSpent=Project tasks without time spent
 FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+StartDateCannotBeAfterEndDate=Kraj ne može biti pre početka
diff --git a/htdocs/langs/sr_RS/withdrawals.lang b/htdocs/langs/sr_RS/withdrawals.lang
index 810f79f913a..e1c4acc6a8b 100644
--- a/htdocs/langs/sr_RS/withdrawals.lang
+++ b/htdocs/langs/sr_RS/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
 WithdrawalsLine=Direct debit order line
+CreditTransfer=Credit transfer
 CreditTransferLine=Credit transfer line
 WithdrawalsLines=Direct debit order lines
 CreditTransferLines=Credit transfer lines
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=Označi kreditirano
+ClassDebited=Classify debited
 ClassCreditedConfirm=Da li ste sigurni da želite da označite ovaj račun podizanja kao kreditiran na Vašem bankovnom računu ?
 TransData=Datum prenosa
 TransMetod=Način prenosa
diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang
index f03b03c2617..ad46f5de669 100644
--- a/htdocs/langs/sv_SE/admin.lang
+++ b/htdocs/langs/sv_SE/admin.lang
@@ -756,7 +756,7 @@ Permission106=Exportsend
 Permission109=Ta bort sendings
 Permission111=Läs finansiella räkenskaper
 Permission112=Skapa / ändra / radera och jämför transaktioner
-Permission113=Ställ upp finansiella konton (skapa, handha kategorier)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Förena transaktioner
 Permission115=Exporttransaktioner och kontoutdrag
 Permission116=Överföringar mellan konton
@@ -893,12 +893,11 @@ Permission701=Läs donationer
 Permission702=Skapa / ändra donationer
 Permission703=Ta bort donationer
 Permission771=Läs utgiftsrapporter (din och dina underordnade)
-Permission772=Skapa / ändra utgiftsrapporter
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Radera räkningar
-Permission774=Läs alla utgiftsrapporter (även för användare som inte underordnade)
 Permission775=Godkänn räkningar
 Permission776=Betala räkningar
-Permission777=Läs alla utgiftsrapporter
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Skapa / modifiera utgiftsrapporter för alla
 Permission779=Export räkningar
 Permission1001=Läs lager
@@ -962,15 +961,11 @@ Permission2801=Använd FTP-klient i läsläge (bläddra och ladda endast)
 Permission2802=Använd FTP-klient i skrivläge (radera eller ladda upp filer)
 Permission3200=Läs arkiverade händelser och fingeravtryck
 Permission3301=Skapa nya moduler
-Permission4001=Se anställda
-Permission4002=Skapa anställda
-Permission4003=Ta bort anställda
-Permission4004=Exportera anställda
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
@@ -981,9 +976,9 @@ Permission10005=Ta bort webbplatsinnehåll
 Permission20001=Läs ledighetsförfrågningar (din ledighet och dina underordnade)
 Permission20002=Skapa / ändra dina förfrågningar (din ledighet och dina underordnade)
 Permission20003=Radera ledighets förfrågningar
-Permission20004=Läs alla lämnar förfrågningar (även om användare inte är underordnade)
-Permission20005=Skapa / ändra ledighetsbegäran för alla (även av användare som inte är underordnade)
-Permission20006=Admins ledighetsansökan (upprätta och uppdatera balanser)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Godkänn ledighetsförfrågningar
 Permission23001=Läs Planerad jobb
 Permission23002=Skapa / uppdatera Schemalagt jobb
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Vill du springa samlingen för den här samlaren nu
 NoNewEmailToProcess=Ingen ny email (matchande filter) att bearbeta
 NothingProcessed=Inget gjort
 XEmailsDoneYActionsDone=%s e-postadresser kvalificerade, %s e-postmeddelanden som bearbetats framgångsrikt (för %s-post / åtgärder gjorda)
-RecordEvent=Spela in e-post händelse
-CreateLeadAndThirdParty=Skapa ledning (och tredje part om det behövs)
-CreateTicketAndThirdParty=Skapa biljett (och länka till tredje part om den laddades av en tidigare operation)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 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)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Meddelande från en konversation initierad av ett första e-postmeddelande skickat från Dolibarr
 WithoutDolTrackingID=Meddelande från en konversation initierad av ett första e-postmeddelande som INTE skickades från Dolibarr
 WithDolTrackingIDInMsgId=Meddelande skickat från Dolibarr
@@ -2084,7 +2080,7 @@ CreateCandidature=Skapa jobbansökan
 FormatZip=Zip
 MainMenuCode=Menyinmatningskod (huvudmeny)
 ECMAutoTree=Visa automatiskt ECM-träd
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Öppettider
 OpeningHoursDesc=Ange här företagets vanliga öppettider.
 ResourceSetup=Konfiguration av resursmodulen
@@ -2130,7 +2126,7 @@ LargerThan=Större än
 IfTrackingIDFoundEventWillBeLinked=Observera att om ett spårnings-ID för ett objekt hittas i e-post, eller om e-postmeddelandet är ett svar på ett e-postområde som samlas in och länkas till ett objekt, kommer den skapade händelsen automatiskt att länkas till det kända relaterade objektet.
 WithGMailYouCanCreateADedicatedPassword=Med ett GMail-konto, om du aktiverade valet av 2 steg, rekommenderas att du skapar ett dedikerat andra lösenord för programmet istället för att använda ditt eget lösenordsord från https://myaccount.google.com/.
 EmailCollectorTargetDir=Det kan vara ett önskat beteende att flytta e-postmeddelandet till en annan tagg / katalog när den bearbetades framgångsrikt. Ange bara namnet på katalogen här för att använda den här funktionen (Använd INTE specialtecken i namnet). Observera att du också måste använda ett inloggningskonto för läs / skriv.
-EmailCollectorLoadThirdPartyHelp=Du kan använda den här åtgärden för att använda e-postinnehållet för att hitta och ladda en befintlig tredje part i din databas. Den hittade (eller skapade) tredje parten kommer att användas för följande åtgärder som behöver det. <br> Om du till exempel vill skapa en tredje part med ett namn extraherat en sträng 'Namn: namn att hitta' hittat i kroppen, använd avsändarens e-post som e-post, kan du ställa in parametervältet så här: <br> 'e-post = HEADER: ^ Från: (. *); Namn = EXTRAKT: BODY: Namn: \\ s ([^ \\ s] *); klient = SET: 2; ' <br>
+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>
 EndPointFor=Slutpunkt för %s: %s
 DeleteEmailCollector=Ta bort e-postsamlare
 ConfirmDeleteEmailCollector=Är du säker på att du vill ta bort denna e-postsamlare?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Missing translation for %s
 NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/sv_SE/companies.lang b/htdocs/langs/sv_SE/companies.lang
index 52c48d36e0f..9e3193919f7 100644
--- a/htdocs/langs/sv_SE/companies.lang
+++ b/htdocs/langs/sv_SE/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (RUT)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Kontrollera
 VATIntraCheckDesc=Moms-ID måste innehålla land prefix. Länken <b> %s </b> använder den europeiska mervärdesskattjänsten (VIES) som kräver internetåtkomst från Dolibarr-servern.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Kontrollera momsnumret inom gemenskapen på Europeiska kommissionens webbplats
-VATIntraManualCheck=Du kan också kontrollera manuellt på Europeiska kommissionens webbplats <a href="%s" target="_blank"> %s </a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Kontroll inte möjlig. Kontrollera om tjänsten tillhandahålls av medlemsstaten (%s).
 NorProspectNorCustomer=Inte utsikter, eller kund
 JuridicalStatus=Typ av affärsenhet
diff --git a/htdocs/langs/sv_SE/errors.lang b/htdocs/langs/sv_SE/errors.lang
index bf03346299d..065595d1b4c 100644
--- a/htdocs/langs/sv_SE/errors.lang
+++ b/htdocs/langs/sv_SE/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=Filens namn kan inte innehålla __SOMETHING__
 ErrorNotInDictionaryPaymentConditions=Inte i ordningen för betalningsvillkor, ändra.
 ErrorIsNotADraft=%s is not a draft
 ErrorExecIdFailed=Can't execute command "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # 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.
diff --git a/htdocs/langs/sv_SE/main.lang b/htdocs/langs/sv_SE/main.lang
index dc61dfed4b2..3ab6e851b6d 100644
--- a/htdocs/langs/sv_SE/main.lang
+++ b/htdocs/langs/sv_SE/main.lang
@@ -212,6 +212,8 @@ User=Användare
 Users=Användare
 Group=Grupp
 Groups=Grupper
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=Ingen användargrupp är definerad
 Password=Lösenord
 PasswordRetype=Ange ditt lösenord
diff --git a/htdocs/langs/sv_SE/other.lang b/htdocs/langs/sv_SE/other.lang
index 98e16ff7e9f..f7ea3aedcb0 100644
--- a/htdocs/langs/sv_SE/other.lang
+++ b/htdocs/langs/sv_SE/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Lösenordskodning
 PermissionsAdd=Tillstånd tillagda
 PermissionsDelete=Tillstånden har tagits bort
 YourPasswordMustHaveAtLeastXChars=Ditt lösenord måste ha minst <strong> %s </strong> chars
+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
 YourPasswordHasBeenReset=Ditt lösenord har återställts framgångsrikt
 ApplicantIpAddress=Sökandens IP-adress
 SMSSentTo=SMS skickat till %s
diff --git a/htdocs/langs/sv_SE/projects.lang b/htdocs/langs/sv_SE/projects.lang
index 04e2b5e2412..bb97259695c 100644
--- a/htdocs/langs/sv_SE/projects.lang
+++ b/htdocs/langs/sv_SE/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Obs: befintliga projekt med all
 SelectLinesOfTimeSpentToInvoice=Välj rader med tid som inte har fakturerats och sedan massåtgärden "Generera faktura" för att fakturera dem
 ProjectTasksWithoutTimeSpent=Project tasks without time spent
 FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+StartDateCannotBeAfterEndDate=Slutdatum kan inte vara före startdatum
diff --git a/htdocs/langs/sv_SE/withdrawals.lang b/htdocs/langs/sv_SE/withdrawals.lang
index 14cf7e1d3b1..ce1586583eb 100644
--- a/htdocs/langs/sv_SE/withdrawals.lang
+++ b/htdocs/langs/sv_SE/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Kreditöverföringsorder
 LatestBankTransferReceipts=Senaste %s kreditöverföringsorder
 LastWithdrawalReceipts=Senaste %s direkt debit-filer
 WithdrawalsLine=Direkt debiteringsorder
+CreditTransfer=Kreditöverföring
 CreditTransferLine=Kreditöverföringslinje
 WithdrawalsLines=Direktbetalningsorder
 CreditTransferLines=Kreditöverföringslinjer
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Tredjeparts bankkod
 NoInvoiceCouldBeWithdrawed=Ingen faktura debiteras framgångsrikt. Kontrollera att fakturor är på företag med en giltig IBAN och att IBAN har en UMR (Unique Mandate Reference) med läget <strong> %s </strong>.
 WithdrawalCantBeCreditedTwice=Detta uttagskvitto är redan markerat som krediterat. detta kan inte göras två gånger, eftersom detta potentiellt skulle kunna skapa dubbla betalningar och bankposter.
 ClassCredited=Märk krediterad
+ClassDebited=Classify debited
 ClassCreditedConfirm=Är du säker på att du vill märka detta tillbakadragande mottagande som krediteras på ditt bankkonto?
 TransData=Datum Transmission
 TransMetod=Metod Transmission
diff --git a/htdocs/langs/sw_SW/admin.lang b/htdocs/langs/sw_SW/admin.lang
index b0e9f37cd36..3971948e5a1 100644
--- a/htdocs/langs/sw_SW/admin.lang
+++ b/htdocs/langs/sw_SW/admin.lang
@@ -756,7 +756,7 @@ Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
 Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Export transactions and account statements
 Permission116=Transfers between accounts
@@ -893,12 +893,11 @@ Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Read stocks
@@ -962,15 +961,11 @@ Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
@@ -981,9 +976,9 @@ Permission10005=Delete website content
 Permission20001=Read leave requests (your leave and those of your subordinates)
 Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Approve leave requests
 Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
-RecordEvent=Record email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
@@ -2084,7 +2080,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -2130,7 +2126,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+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>
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Missing translation for %s
 NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/sw_SW/companies.lang b/htdocs/langs/sw_SW/companies.lang
index bce0a98ea83..7de663ede6d 100644
--- a/htdocs/langs/sw_SW/companies.lang
+++ b/htdocs/langs/sw_SW/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Check
 VATIntraCheckDesc=The VAT ID must include the country prefix. The link <b>%s</b> uses the European VAT checker service (VIES) which requires internet access from the Dolibarr server.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commission website
-VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Business entity type
diff --git a/htdocs/langs/sw_SW/errors.lang b/htdocs/langs/sw_SW/errors.lang
index 7bb0fac3f7b..eabc784e6aa 100644
--- a/htdocs/langs/sw_SW/errors.lang
+++ b/htdocs/langs/sw_SW/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
 ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
 ErrorIsNotADraft=%s is not a draft
 ErrorExecIdFailed=Can't execute command "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # 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/sw_SW/main.lang b/htdocs/langs/sw_SW/main.lang
index c59da9aabec..2d850927782 100644
--- a/htdocs/langs/sw_SW/main.lang
+++ b/htdocs/langs/sw_SW/main.lang
@@ -212,6 +212,8 @@ User=User
 Users=Users
 Group=Group
 Groups=Groups
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=No user group defined
 Password=Password
 PasswordRetype=Retype your password
diff --git a/htdocs/langs/sw_SW/other.lang b/htdocs/langs/sw_SW/other.lang
index 9bc68dc3678..7b509f60ff7 100644
--- a/htdocs/langs/sw_SW/other.lang
+++ b/htdocs/langs/sw_SW/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Password encoding
 PermissionsAdd=Permissions added
 PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
+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
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
 SMSSentTo=SMS sent to %s
diff --git a/htdocs/langs/sw_SW/projects.lang b/htdocs/langs/sw_SW/projects.lang
index 5a2911bac0b..0d9c7ea34c8 100644
--- a/htdocs/langs/sw_SW/projects.lang
+++ b/htdocs/langs/sw_SW/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
 ProjectTasksWithoutTimeSpent=Project tasks without time spent
 FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+StartDateCannotBeAfterEndDate=End date cannot be before start date
diff --git a/htdocs/langs/sw_SW/withdrawals.lang b/htdocs/langs/sw_SW/withdrawals.lang
index f5a33b78eee..bda987276b1 100644
--- a/htdocs/langs/sw_SW/withdrawals.lang
+++ b/htdocs/langs/sw_SW/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
 WithdrawalsLine=Direct debit order line
+CreditTransfer=Credit transfer
 CreditTransferLine=Credit transfer line
 WithdrawalsLines=Direct debit order lines
 CreditTransferLines=Credit transfer lines
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=Classify credited
+ClassDebited=Classify debited
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
 TransMetod=Transmission method
diff --git a/htdocs/langs/ta_IN/admin.lang b/htdocs/langs/ta_IN/admin.lang
index 2f54b648e42..77b8da1b660 100644
--- a/htdocs/langs/ta_IN/admin.lang
+++ b/htdocs/langs/ta_IN/admin.lang
@@ -756,7 +756,7 @@ Permission106=ஏற்றுமதி அனுப்புதல்
 Permission109=அனுப்புதல்களை நீக்கு
 Permission111=நிதிக் கணக்குகளைப் படிக்கவும்
 Permission112=பரிவர்த்தனைகளை உருவாக்கவும்/மாற்றவும்/நீக்கவும் மற்றும் ஒப்பிடவும்
-Permission113=நிதிக் கணக்குகளை அமைத்தல் (வகைகளை உருவாக்குதல், நிர்வகித்தல்)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=பரிவர்த்தனைகளை சரிசெய்யவும்
 Permission115=பரிவர்த்தனைகள் மற்றும் கணக்கு அறிக்கைகளை ஏற்றுமதி செய்யவும்
 Permission116=கணக்குகளுக்கு இடையே பரிமாற்றங்கள்
@@ -893,12 +893,11 @@ Permission701=நன்கொடைகளைப் படியுங்கள
 Permission702=நன்கொடைகளை உருவாக்கவும்/மாற்றவும்
 Permission703=நன்கொடைகளை நீக்கவும்
 Permission771=செலவு அறிக்கைகளைப் படிக்கவும் (உங்களுடையது மற்றும் உங்கள் துணை அதிகாரிகள்)
-Permission772=செலவு அறிக்கைகளை உருவாக்கவும்/மாற்றவும்
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=செலவு அறிக்கைகளை நீக்கவும்
-Permission774=அனைத்து செலவு அறிக்கைகளையும் படிக்கவும் (பயனர்கள் அல்லாதவர்களுக்கும் கூட)
 Permission775=செலவு அறிக்கைகளை அங்கீகரிக்கவும்
 Permission776=செலவு அறிக்கைகளை செலுத்துங்கள்
-Permission777=அனைவரின் செலவு அறிக்கைகளையும் படிக்கவும்
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=ஒவ்வொருவரின் செலவு அறிக்கைகளை உருவாக்கவும்/மாற்றவும்
 Permission779=ஏற்றுமதி செலவு அறிக்கைகள்
 Permission1001=பங்குகளைப் படிக்கவும்
@@ -962,15 +961,11 @@ Permission2801=FTP கிளையண்டை வாசிப்பு மு
 Permission2802=FTP கிளையண்டை எழுதும் பயன்முறையில் பயன்படுத்தவும் (கோப்புகளை நீக்கவும் அல்லது பதிவேற்றவும்)
 Permission3200=காப்பகப்படுத்தப்பட்ட நிகழ்வுகள் மற்றும் கைரேகைகளைப் படிக்கவும்
 Permission3301=புதிய தொகுதிகளை உருவாக்கவும்
-Permission4001=பணியாளர்களைப் பார்க்கவும்
-Permission4002=பணியாளர்களை உருவாக்குங்கள்
-Permission4003=பணியாளர்களை நீக்கவும்
-Permission4004=ஏற்றுமதி ஊழியர்கள்
-Permission4010=திறன்/வேலை/பதவியைப் படிக்கவும்
-Permission4011=திறன்/வேலை/நிலையை உருவாக்குதல்/மாற்றுதல்
-Permission4012=திறமை/வேலை/பதவியை நீக்கவும்
-Permission4020=மதிப்பீட்டைப் படிக்கவும்
-Permission4021=மதிப்பீட்டை உருவாக்கவும்/மாற்றவும்
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=மதிப்பீட்டைச் சரிபார்க்கவும்
 Permission4023=மதிப்பீட்டை நீக்கு
 Permission4030=ஒப்பீட்டு மெனுவைப் பார்க்கவும்
@@ -981,9 +976,9 @@ Permission10005=இணையதள உள்ளடக்கத்தை நீ
 Permission20001=விடுப்புக் கோரிக்கைகளைப் படிக்கவும் (உங்கள் விடுப்பு மற்றும் உங்கள் துணை அதிகாரிகளின் விடுப்பு)
 Permission20002=உங்கள் விடுப்புக் கோரிக்கைகளை உருவாக்கவும்/மாற்றவும் (உங்கள் விடுப்பு மற்றும் உங்கள் துணை அதிகாரிகளின் விடுப்பு)
 Permission20003=விடுப்பு கோரிக்கைகளை நீக்கவும்
-Permission20004=அனைத்து விடுப்புக் கோரிக்கைகளையும் படிக்கவும் (பயனர்கள் துணையில்லாதவர்கள் கூட)
-Permission20005=அனைவருக்கும் விடுப்பு கோரிக்கைகளை உருவாக்கவும்/மாற்றவும் (பயனர்கள் துணையில்லாதவர்கள் கூட)
-Permission20006=நிர்வாகி விடுப்பு கோரிக்கைகள் (அமைவு மற்றும் புதுப்பிப்பு இருப்பு)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=விடுப்பு கோரிக்கைகளை அங்கீகரிக்கவும்
 Permission23001=திட்டமிடப்பட்ட வேலையைப் படியுங்கள்
 Permission23002=திட்டமிடப்பட்ட வேலையை உருவாக்கவும்/புதுப்பிக்கவும்
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=இந்த சேகரிப்பாளரு
 NoNewEmailToProcess=செயலாக்க புதிய மின்னஞ்சல் (பொருந்தும் வடிப்பான்கள்) இல்லை
 NothingProcessed=எதுவும் செய்யவில்லை
 XEmailsDoneYActionsDone=%s மின்னஞ்சல்கள் தகுதிபெற்றன, %s மின்னஞ்சல்கள் வெற்றிகரமாகச் செயலாக்கப்பட்டன (%s பதிவு/செயல்களுக்கு)
-RecordEvent=மின்னஞ்சல் நிகழ்வை பதிவு செய்யவும்
-CreateLeadAndThirdParty=முன்னணி உருவாக்கவும் (தேவைப்பட்டால் மூன்றாம் தரப்பு)
-CreateTicketAndThirdParty=டிக்கெட்டை உருவாக்கவும் (முந்தைய செயல்பாட்டின் மூலம் அது ஏற்றப்பட்டிருந்தால் மூன்றாம் தரப்பினருடன் இணைக்கவும்)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 CodeLastResult=சமீபத்திய முடிவு குறியீடு
 NbOfEmailsInInbox=மூல கோப்பகத்தில் உள்ள மின்னஞ்சல்களின் எண்ணிக்கை
 LoadThirdPartyFromName=%s இல் மூன்றாம் தரப்பு தேடலை ஏற்றவும் (ஏற்றம் மட்டும்)
 LoadThirdPartyFromNameOrCreate=%s இல் மூன்றாம் தரப்பு தேடலை ஏற்றவும் (கண்டுபிடிக்கவில்லை என்றால் உருவாக்கவும்)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Dolibarr இலிருந்து அனுப்பப்பட்ட முதல் மின்னஞ்சலின் மூலம் தொடங்கப்பட்ட உரையாடலில் இருந்து வந்த செய்தி
 WithoutDolTrackingID=Dolibarr இலிருந்து அனுப்பப்படாத முதல் மின்னஞ்சலால் தொடங்கப்பட்ட உரையாடலில் இருந்து வந்த செய்தி
 WithDolTrackingIDInMsgId=Dolibarrல் இருந்து செய்தி அனுப்பப்பட்டது
@@ -2084,7 +2080,7 @@ CreateCandidature=வேலை விண்ணப்பத்தை உருவ
 FormatZip=ஜிப்
 MainMenuCode=மெனு நுழைவு குறியீடு (முதன்மை மெனு)
 ECMAutoTree=தானியங்கி ECM மரத்தைக் காட்டு
-OperationParamDesc=செயலின் பொருளுக்குப் பயன்படுத்த வேண்டிய மதிப்புகள் அல்லது மதிப்புகளை எவ்வாறு பிரித்தெடுப்பது என்பதை வரையறுக்கவும். உதாரணமாக: <br> objproperty1 = அமைக்கவும்: தொகுப்பு <br> objproperty2 = அமைக்க மதிப்பு: தலைப்பு: எக்ஸ்-Myheaderkey: objproperty3 ஏற்கனவே <br> objproperty4 = பிரித்தெடுத்தல் வரையறுக்கப்படவில்லை இதைப் பயன்படுத்தக் மதிப்பு: __objproperty1__ <br> objproperty3 = SETIFEMPTY பதிலாக்கத்தைக் கொண்டு ஒரு மதிப்பு \\ ங்கள் * ([^\\s]*) <br> options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*) <br> object.objproperty5=EXTRACT:BODY:எனது நிறுவனத்தின் பெயர்\\s*cc4f) <br> பயன்படுத்தவும் a ; பல பண்புகளை பிரித்தெடுக்க அல்லது அமைக்க பிரிப்பானாக கரி.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=தொடக்க நேரம்
 OpeningHoursDesc=உங்கள் நிறுவனத்தின் வழக்கமான திறந்திருக்கும் நேரத்தை இங்கே உள்ளிடவும்.
 ResourceSetup=வள தொகுதியின் கட்டமைப்பு
@@ -2130,7 +2126,7 @@ LargerThan=விட பெரிய
 IfTrackingIDFoundEventWillBeLinked=ஒரு பொருளின் கண்காணிப்பு ஐடி மின்னஞ்சலில் காணப்பட்டாலோ அல்லது அந்த மின்னஞ்சல் ஒரு மின்னஞ்சலின் பதில் சேகரிக்கப்பட்டு ஒரு பொருளுடன் இணைக்கப்பட்டாலோ, உருவாக்கப்பட்ட நிகழ்வு தானாகவே தெரிந்த தொடர்புடைய பொருளுடன் இணைக்கப்படும் என்பதை நினைவில் கொள்ளவும்.
 WithGMailYouCanCreateADedicatedPassword=ஜிமெயில் கணக்கின் மூலம், 2 படிநிலை சரிபார்ப்பை நீங்கள் இயக்கியிருந்தால், https://myaccount.google.com/ இலிருந்து உங்கள் சொந்த கணக்கு கடவுச்சொல்லைப் பயன்படுத்துவதற்குப் பதிலாக, பயன்பாட்டிற்கான பிரத்யேக இரண்டாவது கடவுச்சொல்லை உருவாக்க பரிந்துரைக்கப்படுகிறது.
 EmailCollectorTargetDir=மின்னஞ்சலை வெற்றிகரமாகச் செயலாக்கும்போது அதை மற்றொரு குறிச்சொல்/கோப்பகத்திற்கு நகர்த்துவது விரும்பத்தக்க செயலாக இருக்கலாம். இந்த அம்சத்தைப் பயன்படுத்த, கோப்பகத்தின் பெயரை இங்கே அமைக்கவும் (பெயரில் சிறப்பு எழுத்துக்களைப் பயன்படுத்த வேண்டாம்). நீங்கள் படிக்க/எழுத உள்நுழைவு கணக்கையும் பயன்படுத்த வேண்டும் என்பதை நினைவில் கொள்ளவும்.
-EmailCollectorLoadThirdPartyHelp=உங்கள் தரவுத்தளத்தில் ஏற்கனவே உள்ள மூன்றாம் தரப்பைக் கண்டறிந்து ஏற்றுவதற்கு மின்னஞ்சல் உள்ளடக்கத்தைப் பயன்படுத்த இந்தச் செயலைப் பயன்படுத்தலாம். கண்டுபிடிக்கப்பட்ட (அல்லது உருவாக்கப்பட்ட) மூன்றாம் தரப்பு தேவைப்படும் பின்வரும் செயல்களுக்குப் பயன்படுத்தப்படும். <br> எடுத்துக்காட்டாக, உடலில் காணப்படும் 'பெயர்: கண்டுபிடிக்க வேண்டிய பெயர்' என்ற சரத்தைப் பிரித்தெடுக்கப்பட்ட பெயருடன் மூன்றாம் தரப்பை நீங்கள் உருவாக்க விரும்பினால், அனுப்புநர் மின்னஞ்சலை மின்னஞ்சலாகப் பயன்படுத்தவும், நீங்கள் அளவுரு புலத்தை இப்படி அமைக்கலாம்: <br> 'email=HEADER: ^From:(.*);பெயர்=புறம்:உடல்:பெயர்:\\s([^\\s]*);client=SET:2;' <br>
+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>
 EndPointFor=%s க்கான முடிவுப் புள்ளி : %s
 DeleteEmailCollector=மின்னஞ்சல் சேகரிப்பாளரை நீக்கு
 ConfirmDeleteEmailCollector=இந்த மின்னஞ்சல் சேகரிப்பாளரை நிச்சயமாக நீக்க விரும்புகிறீர்களா?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = %sக்கான மொழிபெயர்ப
 NativeModules=சொந்த தொகுதிகள்
 NoDeployedModulesFoundWithThisSearchCriteria=இந்தத் தேடல் அளவுகோல்களுக்கான தொகுதிகள் எதுவும் இல்லை
 API_DISABLE_COMPRESSION=API பதில்களின் சுருக்கத்தை முடக்கு
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/ta_IN/companies.lang b/htdocs/langs/ta_IN/companies.lang
index c663928d2c0..446b7ae95ba 100644
--- a/htdocs/langs/ta_IN/companies.lang
+++ b/htdocs/langs/ta_IN/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=பேராசிரியர் ஐடி 1 (ஆர்.யு.டி.)
 ProfId2CO=-
 ProfId3CO=-
diff --git a/htdocs/langs/ta_IN/errors.lang b/htdocs/langs/ta_IN/errors.lang
index 5793254f7b5..ed0ade790d8 100644
--- a/htdocs/langs/ta_IN/errors.lang
+++ b/htdocs/langs/ta_IN/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=கோப்பின் பெயரில் __சம்த
 ErrorNotInDictionaryPaymentConditions=கட்டண விதிமுறைகள் அகராதியில் இல்லை, தயவுசெய்து மாற்றவும்.
 ErrorIsNotADraft=%s ஒரு வரைவு அல்ல
 ErrorExecIdFailed="id" கட்டளையை இயக்க முடியவில்லை
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=உங்கள் PHP அளவுரு upload_max_filesize (%s) PHP அளவுரு post_max_size (%s) ஐ விட அதிகமாக உள்ளது. இது ஒரு நிலையான அமைப்பு அல்ல.
diff --git a/htdocs/langs/ta_IN/main.lang b/htdocs/langs/ta_IN/main.lang
index f703f005da6..f95493447e9 100644
--- a/htdocs/langs/ta_IN/main.lang
+++ b/htdocs/langs/ta_IN/main.lang
@@ -4,7 +4,7 @@ DIRECTION=ltr
 # msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader)
 # stsongstdlight or cid0cs are for simplified Chinese
 # To read Chinese pdf with Linux: sudo apt-get install poppler-data
-FONTFORPDF=freemono
+FONTFORPDF=freeserif
 FONTSIZEFORPDF=10
 SeparatorDecimal=.
 SeparatorThousand=,
@@ -212,6 +212,8 @@ User=பயனர்
 Users=பயனர்கள்
 Group=குழு
 Groups=குழுக்கள்
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=பயனர் குழு வரையறுக்கப்படவில்லை
 Password=கடவுச்சொல்
 PasswordRetype=உங்கள் கடவுச்சொல்லை மீண்டும் தட்டச்சு செய்யவும்
diff --git a/htdocs/langs/ta_IN/other.lang b/htdocs/langs/ta_IN/other.lang
index 410d8f6c22b..8f84eeaee80 100644
--- a/htdocs/langs/ta_IN/other.lang
+++ b/htdocs/langs/ta_IN/other.lang
@@ -258,6 +258,10 @@ PassEncoding=கடவுச்சொல் குறியாக்கம்
 PermissionsAdd=அனுமதிகள் சேர்க்கப்பட்டன
 PermissionsDelete=அனுமதிகள் அகற்றப்பட்டன
 YourPasswordMustHaveAtLeastXChars=உங்கள் கடவுச்சொல்லில் குறைந்தது <strong> %s </strong> எழுத்துகள் இருக்க வேண்டும்
+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
 YourPasswordHasBeenReset=உங்கள் கடவுச்சொல் வெற்றிகரமாக மீட்டமைக்கப்பட்டது
 ApplicantIpAddress=விண்ணப்பதாரரின் ஐபி முகவரி
 SMSSentTo=%s க்கு SMS அனுப்பப்பட்டது
diff --git a/htdocs/langs/ta_IN/projects.lang b/htdocs/langs/ta_IN/projects.lang
index 613f3769c7d..10eedc997a0 100644
--- a/htdocs/langs/ta_IN/projects.lang
+++ b/htdocs/langs/ta_IN/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=குறிப்பு: 100%%
 SelectLinesOfTimeSpentToInvoice=கட்டணம் செலுத்தப்படாத நேரத்தைத் தேர்ந்தெடுத்து, அவற்றை பில் செய்ய மொத்த நடவடிக்கை "இன்வாய்ஸை உருவாக்கு"
 ProjectTasksWithoutTimeSpent=நேரத்தை செலவழிக்காமல் திட்ட பணிகள்
 FormForNewLeadDesc=எங்களை தொடர்பு கொள்ள பின்வரும் படிவத்தை நிரப்பியதற்கு நன்றி. நீங்கள் எங்களுக்கு நேரடியாக <b> %s </b> க்கு மின்னஞ்சல் அனுப்பலாம்.
+StartDateCannotBeAfterEndDate=End date cannot be before start date
diff --git a/htdocs/langs/ta_IN/withdrawals.lang b/htdocs/langs/ta_IN/withdrawals.lang
index 16113afaa45..75c7a5fb563 100644
--- a/htdocs/langs/ta_IN/withdrawals.lang
+++ b/htdocs/langs/ta_IN/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=கடன் பரிமாற்ற உத்தரவு
 LatestBankTransferReceipts=சமீபத்திய %s கடன் பரிமாற்ற ஆர்டர்கள்
 LastWithdrawalReceipts=சமீபத்திய %s நேரடி டெபிட் கோப்புகள்
 WithdrawalsLine=நேரடி டெபிட் ஆர்டர் லைன்
+CreditTransfer=Credit transfer
 CreditTransferLine=கடன் பரிமாற்ற வரி
 WithdrawalsLines=நேரடி டெபிட் ஆர்டர் கோடுகள்
 CreditTransferLines=கடன் பரிமாற்ற வரிகள்
@@ -47,6 +48,7 @@ ThirdPartyBankCode=மூன்றாம் தரப்பு வங்கி
 NoInvoiceCouldBeWithdrawed=இன்வாய்ஸ் எதுவும் டெபிட் செய்யப்படவில்லை. இன்வாய்ஸ்கள் செல்லுபடியாகும் IBAN உள்ள நிறுவனங்களில் உள்ளதா என்பதையும், <strong> %s </strong> பயன்முறையுடன் IBAN UMR (தனிப்பட்ட ஆணைக் குறிப்பு) உள்ளதா என்பதையும் சரிபார்க்கவும்.
 WithdrawalCantBeCreditedTwice=இந்த திரும்பப் பெறும் ரசீது ஏற்கனவே வரவு வைக்கப்பட்டதாகக் குறிக்கப்பட்டுள்ளது; இதை இரண்டு முறை செய்ய முடியாது, ஏனெனில் இது நகல் பணம் மற்றும் வங்கி உள்ளீடுகளை உருவாக்கும்.
 ClassCredited=வகைப்படுத்து வரவு
+ClassDebited=Classify debited
 ClassCreditedConfirm=இந்த திரும்பப் பெறும் ரசீதை உங்கள் வங்கிக் கணக்கில் கிரெடிட் செய்யப்பட்டதாக நிச்சயமாக வகைப்படுத்த விரும்புகிறீர்களா?
 TransData=பரிமாற்ற தேதி
 TransMetod=பரிமாற்ற முறை
diff --git a/htdocs/langs/tg_TJ/admin.lang b/htdocs/langs/tg_TJ/admin.lang
index 411eb74ac8d..56aa688f8f1 100644
--- a/htdocs/langs/tg_TJ/admin.lang
+++ b/htdocs/langs/tg_TJ/admin.lang
@@ -756,7 +756,7 @@ Permission106=Паёмҳои содиротӣ
 Permission109=Паёмҳоро нест кунед
 Permission111=Ҳисобҳои молиявиро хонед
 Permission112=Транзаксияҳоро эҷод/тағир диҳед/нест кунед ва муқоиса кунед
-Permission113=Танзими ҳисобҳои молиявӣ (эҷод, идора кардани категорияҳо)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Муомилоти оштӣ
 Permission115=Амалиётҳои содиротӣ ва изҳороти суратҳисоб
 Permission116=Интиқоли байни ҳисобҳо
@@ -893,12 +893,11 @@ Permission701=Хайрияҳоро хонед
 Permission702=Эҷод/тағир додани хайрияҳо
 Permission703=Хайрияҳоро нест кунед
 Permission771=Ҳисоботи хароҷотро хонед (шумо ва зердастонатон)
-Permission772=Ҳисоботи хароҷотро эҷод/тағир диҳед
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Ҳисоботи хароҷотро нест кунед
-Permission774=Ҳама ҳисоботи хароҷотро хонед (ҳатто барои корбароне, ки тобеъ нестанд)
 Permission775=Ҳисоботи хароҷотро тасдиқ кунед
 Permission776=Ҳисоботи хароҷотро пардохт кунед
-Permission777=Ҳисоботи хароҷоти ҳамаро хонед
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Ҳисоботи хароҷоти ҳамаро эҷод/тағир диҳед
 Permission779=Ҳисоботи хароҷоти содирот
 Permission1001=Захираҳоро хонед
@@ -962,15 +961,11 @@ Permission2801=Мизоҷи FTP -ро дар ҳолати хондан исти
 Permission2802=Мизоҷи FTP -ро дар ҳолати навиштан истифода баред (нест кардан ё бор кардани файлҳо)
 Permission3200=Воқеаҳои бойгонишуда ва изҳои ангуштро хонед
 Permission3301=Модулҳои нав эҷод кунед
-Permission4001=Ба кормандон нигаред
-Permission4002=Эҷоди кормандон
-Permission4003=Кормандонро нест кунед
-Permission4004=Кормандони содирот
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
@@ -981,9 +976,9 @@ Permission10005=Мундариҷаи вебсайтро нест кунед
 Permission20001=Дархостҳои рухсатиро хонед (рухсатии шумо ва рухсатии зердастонатон)
 Permission20002=Дархости рухсатии худро эҷод/тағир диҳед (рухсатии шумо ва рухсатии зердастонатон)
 Permission20003=Дархостҳои рухсатиро нест кунед
-Permission20004=Ҳама дархостҳои рухсатиро хонед (ҳатто корбароне, ки тобеъ нестанд)
-Permission20005=Барои ҳама дархостҳои рухсатӣ эҷод/тағир диҳед (ҳатто корбароне, ки тобеъ нестанд)
-Permission20006=Дархостҳои тарк кардани администратор (танзим ва навсозии тавозун)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Дархостҳои рухсатиро тасдиқ кунед
 Permission23001=Кори банақшагирифтаро хонед
 Permission23002=Эҷод/навсозии кори ба нақша гирифташуда
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Оё мехоҳед, ки ҳозир коллекс
 NoNewEmailToProcess=Барои коркарди почтаи нав (филтрҳои мувофиқ) нест
 NothingProcessed=Ҳеҷ коре накардааст
 XEmailsDoneYActionsDone=%s мактубҳои мувофиқ, %s бомуваффақият коркард карда шуданд (барои сабт/амалҳои %s)
-RecordEvent=Ҳодисаи почтаи электрониро сабт кунед
-CreateLeadAndThirdParty=Пешво эҷод кунед (ва агар лозим бошад, тарафи сеюм)
-CreateTicketAndThirdParty=Эҷоди чипта (ва истинод ба тарафи сеюм, агар он бо амалиёти қаблӣ бор карда шуда бошад)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 CodeLastResult=Рамзи натиҷаҳои охирин
 NbOfEmailsInInbox=Шумораи мактубҳо дар феҳристи манбаъҳо
 LoadThirdPartyFromName=Ҷустуҷӯи тарафи сеюмро дар %s бор кунед (танҳо бор)
 LoadThirdPartyFromNameOrCreate=Ҷустуҷӯи тарафи сеюмро дар %s бор кунед (эҷод кунед, агар наёбад)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Паём аз сӯҳбате, ки бо аввалин почтаи электронӣ аз Dolibarr фиристода шудааст
 WithoutDolTrackingID=Паём аз сӯҳбате, ки бо почтаи аввал оғоз шудааст, аз Dolibarr фиристода нашудааст
 WithDolTrackingIDInMsgId=Паём аз Dolibarr фиристода шудааст
@@ -2084,7 +2080,7 @@ CreateCandidature=Эҷоди аризаи корӣ
 FormatZip=Zip
 MainMenuCode=Рамзи вуруд ба меню (менюи асосӣ)
 ECMAutoTree=Нишон додани дарахти автоматии ECM
-OperationParamDesc=Арзишҳоро барои объекти амал ё тарзи истихроҷи арзишҳо муайян кунед. Масалан: <br> objproperty1 = SET: арзиш барои гузоштани <br> objproperty2 = SET: арзиш бо иваз кардани __objproperty1__ <br> objproperty3 = SETIFdaPTpro2 a93 ([^\\ s]*) <br> options_myextrafield1 = ИСТИСНО: МАВЗӮ: ([^&#92; n]*) <br> object.objproperty5 = EXTRACT: BODY: Номи ширкати ман \\ s ([^\\ s4b2f) a) <br> Истифодаи a; char ҳамчун ҷудокунанда барои истихроҷ ё гузоштани якчанд хосият.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Соатҳои корӣ
 OpeningHoursDesc=Дар ин ҷо соатҳои кории муқаррарии ширкати худро ворид кунед.
 ResourceSetup=Танзимоти модули захираҳо
@@ -2130,7 +2126,7 @@ LargerThan=Калонтар аз
 IfTrackingIDFoundEventWillBeLinked=Дар хотир доред, ки агар дар почтаи электронӣ ID -и пайгирии объект пайдо шуда бошад ё агар ин почтаи электронӣ ҷавоби почтаи электронӣ бошад ва он ба ягон объект пайваст карда шуда бошад, ҳодисаи офаридашуда ба таври худкор ба объекти марбутаи алоқаманд пайваст карда мешавад.
 WithGMailYouCanCreateADedicatedPassword=Бо ҳисоби GMail, агар шумо тасдиқи 2 қадамро фаъол карда бошед, тавсия дода мешавад, ки ба ҷои истифодаи пароли ҳисоби шахсии худ аз https://myaccount.google.com/ гузарвожаи махсуси дуюмро барои барнома эҷод кунед.
 EmailCollectorTargetDir=Ҳангоми бомуваффақият коркард кардани почтаи электронӣ ба дигар тег/директория метавонад рафтори дилхоҳ бошад. Барои истифодаи ин хусусият танҳо номи феҳристро таъин кунед (Ба ном аломатҳои махсусро истифода Набаред). Дар хотир доред, ки шумо инчунин бояд ҳисоби воридшавӣ/навиштанро истифода баред.
-EmailCollectorLoadThirdPartyHelp=Шумо метавонед ин амалро барои мундариҷаи почтаи электронӣ барои дарёфт ва бор кардани як шахси сеюми мавҷуда дар пойгоҳи худ истифода баред. Тарафи сеюми ёфтшуда (ё сохташуда) барои амалҳои зерин, ки ба он ниёз доранд, истифода мешавад. <br> Масалан, агар шумо хоҳед, ки як шахси сеюмро бо номи сатри "Ном: ном барои ёфтан" дар бадан ёфтшуда эҷод кунед, почтаи ирсолкунандаро ҳамчун почтаи электронӣ истифода баред, шумо метавонед майдони параметрро чунин танзим кунед: <br> 'email = HEADER: ^Аз: (.*); Ном = ИСТИРОҲ: БАДАН: Ном: \\ с ([^\\ s]*); муштарӣ = SET: 2; ' <br>
+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>
 EndPointFor=Нуқтаи ниҳоӣ барои %s: %s
 DeleteEmailCollector=Коллекторҳои почтаи электрониро нест кунед
 ConfirmDeleteEmailCollector=Шумо мутмаин ҳастед, ки ин коллектори почтаи электрониро нест кардан мехоҳед?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Missing translation for %s
 NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/tg_TJ/companies.lang b/htdocs/langs/tg_TJ/companies.lang
index 1047ecca42a..756174c002a 100644
--- a/htdocs/langs/tg_TJ/companies.lang
+++ b/htdocs/langs/tg_TJ/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Профессор 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Санҷед
 VATIntraCheckDesc=ID ААИ бояд префикси кишварро дар бар гирад. Истиноди <b> %s </b> аз хидмати Аврупо оид ба андоз аз арзиши иловашуда (VIES) истифода мебарад, ки дастрасии интернетро аз сервери Dolibarr талаб мекунад.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Дар вебсайти Комиссияи Аврупо шиносномаи андоз аз арзиши иловашударо дар дохили ҷомеа санҷед
-VATIntraManualCheck=Шумо инчунин метавонед дар сайти Комиссияи Аврупо <a href="%s" target="_blank"> %s </a> дастӣ тафтиш кунед
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Санҷиш имконнопазир аст. Хидмати чекро давлати узв таъмин намекунад (%s).
 NorProspectNorCustomer=На дурнамо, на муштарӣ
 JuridicalStatus=Навъи субъекти соҳибкорӣ
diff --git a/htdocs/langs/tg_TJ/errors.lang b/htdocs/langs/tg_TJ/errors.lang
index de09df186ee..a9447cabe90 100644
--- a/htdocs/langs/tg_TJ/errors.lang
+++ b/htdocs/langs/tg_TJ/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=Номи файл наметавонад дар он __SOMETH
 ErrorNotInDictionaryPaymentConditions=Дар луғати шартҳои пардохт нест, лутфан тағир диҳед.
 ErrorIsNotADraft=%s is not a draft
 ErrorExecIdFailed=Can't execute command "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Параметри PHP -и шумо upload_max_filesize (%s) аз параметрҳои PHP post_max_size (%s) баландтар аст. Ин танзимоти пайдарпай нест.
diff --git a/htdocs/langs/tg_TJ/main.lang b/htdocs/langs/tg_TJ/main.lang
index f213d304844..470a718cd60 100644
--- a/htdocs/langs/tg_TJ/main.lang
+++ b/htdocs/langs/tg_TJ/main.lang
@@ -212,6 +212,8 @@ User=Истифодабаранда
 Users=Истифодабарандагон
 Group=Гурӯҳ
 Groups=Гурӯҳҳо
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=Ягон гурӯҳи корбарон муайян нашудааст
 Password=Рамз
 PasswordRetype=Пароли худро дубора ворид кунед
diff --git a/htdocs/langs/tg_TJ/other.lang b/htdocs/langs/tg_TJ/other.lang
index 7dc4656789f..05bca74085d 100644
--- a/htdocs/langs/tg_TJ/other.lang
+++ b/htdocs/langs/tg_TJ/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Рамзгузории парол
 PermissionsAdd=Иҷозатҳо илова карда шуданд
 PermissionsDelete=Иҷозатҳо хориҷ карда шуданд
 YourPasswordMustHaveAtLeastXChars=Пароли шумо бояд ҳадди аққал <strong> %s </strong> аломат дошта бошад
+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
 YourPasswordHasBeenReset=Пароли шумо бомуваффақият барқарор карда шуд
 ApplicantIpAddress=Суроғаи IP -и довталаб
 SMSSentTo=SMS ба %s фиристода шуд
diff --git a/htdocs/langs/tg_TJ/projects.lang b/htdocs/langs/tg_TJ/projects.lang
index 753cf6e61be..c74382a2d35 100644
--- a/htdocs/langs/tg_TJ/projects.lang
+++ b/htdocs/langs/tg_TJ/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Эзоҳ: лоиҳаҳои ма
 SelectLinesOfTimeSpentToInvoice=Хатҳои вақти сарфшударо ҳисоб накунед, пас амали оммавии "Ҳисобнома -фактура" -ро барои ҳисоб кардани онҳо интихоб кунед
 ProjectTasksWithoutTimeSpent=Project tasks without time spent
 FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+StartDateCannotBeAfterEndDate=End date cannot be before start date
diff --git a/htdocs/langs/tg_TJ/withdrawals.lang b/htdocs/langs/tg_TJ/withdrawals.lang
index 98c2a344954..99a56d0c634 100644
--- a/htdocs/langs/tg_TJ/withdrawals.lang
+++ b/htdocs/langs/tg_TJ/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Тартиби интиқоли қарз
 LatestBankTransferReceipts=Охирин фармоишҳои интиқоли қарзии %s
 LastWithdrawalReceipts=Охирин файлҳои %s
 WithdrawalsLine=Хати фармоиши дебети мустақим
+CreditTransfer=Credit transfer
 CreditTransferLine=Хатти интиқоли қарз
 WithdrawalsLines=Хатҳои фармоиши дебети мустақим
 CreditTransferLines=Хатҳои интиқоли қарз
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Рамзи бонкии шахсони сеюм
 NoInvoiceCouldBeWithdrawed=Ҳисобнома -фактура муваффақ нашуд. Санҷед, ки фактураҳо дар ширкатҳои дорои IBAN -и эътибор доранд ва IBAN дорои UMR (истинод ба мандати беназир) бо режими <strong> %s </strong> мебошад.
 WithdrawalCantBeCreditedTwice=Ин квитансияи бозпас гирифтан аллакай ҳамчун ҳисоб карда шудааст; ин корро ду маротиба иҷро кардан мумкин нест, зеро ин эҳтимолан метавонад пардохтҳои такрорӣ ва сабтҳои бонкиро эҷод кунад.
 ClassCredited=Тасниф карда шудааст
+ClassDebited=Classify debited
 ClassCreditedConfirm=Шумо мутмаин ҳастед, ки ин квитансияро дар суратҳисоби бонкии худ тасниф кардан мехоҳед?
 TransData=Санаи интиқол
 TransMetod=Усули интиқол
diff --git a/htdocs/langs/th_TH/admin.lang b/htdocs/langs/th_TH/admin.lang
index 0982b6d0edd..6333b23ba53 100644
--- a/htdocs/langs/th_TH/admin.lang
+++ b/htdocs/langs/th_TH/admin.lang
@@ -756,7 +756,7 @@ Permission106=ตอบรับการส่งออก
 Permission109=ลบตอบรับ
 Permission111=อ่านบัญชีการเงิน
 Permission112=สร้าง / แก้ไข / ลบและเปรียบเทียบการทำธุรกรรม
-Permission113=การตั้งค่าบัญชีการเงิน (สร้างจัดการหมวดหมู่)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=การทำธุรกรรมการส่งออกและงบบัญชี
 Permission116=โอนเงินระหว่างบัญชี
@@ -893,12 +893,11 @@ Permission701=อ่านบริจาค
 Permission702=สร้าง / แก้ไขการบริจาค
 Permission703=ลบบริจาค
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=สร้าง / แก้ไขรายงานค่าใช้จ่าย
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=ลบรายงานค่าใช้จ่าย
-Permission774=อ่านรายงานค่าใช้จ่ายทั้งหมด (แม้จะไม่ได้สำหรับผู้ใช้ผู้ใต้บังคับบัญชา)
 Permission775=อนุมัติรายงานค่าใช้จ่าย
 Permission776=จ่ายรายงานค่าใช้จ่าย
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=รายงานค่าใช้จ่ายส่งออก
 Permission1001=อ่านหุ้น
@@ -962,15 +961,11 @@ Permission2801=ใช้โปรแกรม FTP ในโหมดอ่าน
 Permission2802=ใช้โปรแกรม FTP ในโหมดเขียน (ลบหรืออัปโหลดไฟล์)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
@@ -981,9 +976,9 @@ Permission10005=Delete website content
 Permission20001=Read leave requests (your leave and those of your subordinates)
 Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
 Permission20003=ลบออกจากการร้องขอ
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=ธุรการร้องขอลา (การติดตั้งและการปรับปรุงความสมดุล)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Approve leave requests
 Permission23001=อ่านงานที่กำหนดเวลาไว้
 Permission23002=สร้าง / การปรับปรุงกำหนดเวลางาน
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
-RecordEvent=Record email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
@@ -2084,7 +2080,7 @@ CreateCandidature=Create job application
 FormatZip=ไปรษณีย์
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -2130,7 +2126,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+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>
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Missing translation for %s
 NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/th_TH/companies.lang b/htdocs/langs/th_TH/companies.lang
index 3c502c2b6e2..b0595b818de 100644
--- a/htdocs/langs/th_TH/companies.lang
+++ b/htdocs/langs/th_TH/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=ศหมายเลข 1 (RUT)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=ตรวจสอบ
 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.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commission website
-VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=ตรวจสอบไม่ได้ บริการตรวจสอบไม่ได้ให้โดยรัฐสมาชิก (% s)
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Business entity type
diff --git a/htdocs/langs/th_TH/errors.lang b/htdocs/langs/th_TH/errors.lang
index 9c2c8c5061d..20500c3ae4b 100644
--- a/htdocs/langs/th_TH/errors.lang
+++ b/htdocs/langs/th_TH/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
 ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
 ErrorIsNotADraft=%s is not a draft
 ErrorExecIdFailed=Can't execute command "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # 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/th_TH/main.lang b/htdocs/langs/th_TH/main.lang
index 259ac036a03..ac7fce2ff2a 100644
--- a/htdocs/langs/th_TH/main.lang
+++ b/htdocs/langs/th_TH/main.lang
@@ -212,6 +212,8 @@ User=ผู้ใช้งาน
 Users=ผู้ใช้
 Group=กลุ่ม
 Groups=กลุ่ม
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=ไม่มีกลุ่มผู้ใช้ที่กำหนดไว้
 Password=รหัสผ่าน
 PasswordRetype=พิมพ์รหัสผ่านของคุณ
diff --git a/htdocs/langs/th_TH/other.lang b/htdocs/langs/th_TH/other.lang
index d2e0b972e26..78e16b1da28 100644
--- a/htdocs/langs/th_TH/other.lang
+++ b/htdocs/langs/th_TH/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Password encoding
 PermissionsAdd=Permissions added
 PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
+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
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
 SMSSentTo=SMS sent to %s
diff --git a/htdocs/langs/th_TH/projects.lang b/htdocs/langs/th_TH/projects.lang
index 299fc542581..0c3b122f3a8 100644
--- a/htdocs/langs/th_TH/projects.lang
+++ b/htdocs/langs/th_TH/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
 ProjectTasksWithoutTimeSpent=Project tasks without time spent
 FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+StartDateCannotBeAfterEndDate=วันที่สิ้นสุดไม่สามารถก่อนวันเริ่มต้น
diff --git a/htdocs/langs/th_TH/withdrawals.lang b/htdocs/langs/th_TH/withdrawals.lang
index 0113ddb108a..871ec4eab79 100644
--- a/htdocs/langs/th_TH/withdrawals.lang
+++ b/htdocs/langs/th_TH/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
 WithdrawalsLine=Direct debit order line
+CreditTransfer=Credit transfer
 CreditTransferLine=Credit transfer line
 WithdrawalsLines=Direct debit order lines
 CreditTransferLines=Credit transfer lines
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=จำแนกเครดิต
+ClassDebited=Classify debited
 ClassCreditedConfirm=คุณแน่ใจว่าคุณต้องการที่จะจำแนกได้รับการถอนนี้เป็นเครดิตในบัญชีธนาคารของคุณ?
 TransData=วันที่ส่ง
 TransMetod=วิธีการส่ง
diff --git a/htdocs/langs/tr_TR/accountancy.lang b/htdocs/langs/tr_TR/accountancy.lang
index 6077ff01350..e80213cdfac 100644
--- a/htdocs/langs/tr_TR/accountancy.lang
+++ b/htdocs/langs/tr_TR/accountancy.lang
@@ -396,7 +396,7 @@ Formula=Formül
 
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Kurulumun bazı zorunlu adımları tamamlanmadı, lütfen onları tamamlayın.
-ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
+ErrorNoAccountingCategoryForThisCountry=%s ülkesi için muhasebe hesap grubu yok (Giriş - Ayarlar - Sözlükler kısmına bakın)
 ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
 ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
 ExportNotSupported=Ayarlanan dışa aktarım biçimi bu sayfada desteklenmiyor
diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang
index c7779492606..7ff32df0afa 100644
--- a/htdocs/langs/tr_TR/admin.lang
+++ b/htdocs/langs/tr_TR/admin.lang
@@ -378,8 +378,8 @@ UMask=Unix/Linux/BSD dosya sisteminde yeni dosyalar için Umask parametresi.
 UMaskExplanation=Bu parametre Dolibarr tarafından sunucuda oluşturulan dosyaların izinlerini varsayılan olarak tanımlamanıza (örneğin yükleme sırasında) izin verir.<br>Bu sekizli değer olmalıdır (örneğin, 0666 herkes için okuma ve yazma anlamına gelir).<br>Bu parametre Windows sunucusunda kullanılmaz.
 SeeWikiForAllTeam=Katkıda bulunanlar ve kuruluşlarının bir listesi için Wiki sayfasına göz atın
 UseACacheDelay= Saniye olarak önbellek aktarması tepki gecikmesi (hiç önbellek yoksa 0 ya da boş)
-DisableLinkToHelpCenter=Hide the link "<b>Need help or support</b>" on the login page
-DisableLinkToHelp=Hide the link to the online help "<b>%s</b>"
+DisableLinkToHelpCenter=Oturum açma sayfasında "<b>Yardım ya da destek gerekli</b>" bağlantısını gizle
+DisableLinkToHelp=Çevrimiçi yardım "<b>%s</b>" bağlantısını gizle
 AddCRIfTooLong=Otomatik metin kaydırma özelliği olmadığı çok uzun metinlerdeki taşmalar belgeler üzerinde gösterilmeyecektir. Lütfen gerekirse metin alanına satır başı ekleyin.
 ConfirmPurge=Bu temizleme işlemini çalıştırmak istediğinizden emin misiniz?<br>Bu işlem tüm veri dosyalarınızı bir daha geri alınamayacak şekilde kalıcı olarak silecektir (ECM dosyaları, ekli dosyalar…).
 MinLength=Enaz uzunluk
@@ -573,7 +573,7 @@ Module53Desc=Hizmet Yönetimi
 Module54Name=Sözleşmeler/Abonelikler
 Module54Desc=Sözleşmelerin yönetimi (hizmetler veya yinelenen abonelikler)
 Module55Name=Barkodlar
-Module55Desc=Barcode or QR code management
+Module55Desc=Barkod veya QR kod yönetimi
 Module56Name=Kredi transferiyle ödeme
 Module56Desc=Kredi Transferi siparişleri ile tedarikçilerin ödemelerinin yönetimi. Avrupa ülkeleri için SEPA dosyası oluşturmayı içerir.
 Module57Name=Otomatik Ödeme ile Ödemeler
@@ -756,7 +756,7 @@ Permission106=Gönderilenleri dışa aktar
 Permission109=Gönderilenleri sil
 Permission111=Finansal tabloları oku
 Permission112=İşlem oluştur/düzenle/sil ve karşılaştır
-Permission113=Mali hesapları ayarla (kategoriler oluştur, yönet)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Uzlaştırma işlemleri
 Permission115=İşlemleri ve hesap tablolarını dışa aktar
 Permission116=Hesaplar arasında aktarım
@@ -893,12 +893,11 @@ Permission701=Bağış oluştur/değiştir
 Permission702=Bağış sil
 Permission703=Bağış sil
 Permission771=Gider raporlarını oku (kendinin veya astlarının)
-Permission772=Gider raporu oluştur/değiştir
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Gider raporu sil
-Permission774=Bütün gider raporlarını oku (emrinde olmayanlarınkini de)
 Permission775=Gider raporu onayla
 Permission776=Ödeme gider raporu
-Permission777=Herkesin gider raporlarını okuyun
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Herkesin gider raporlarını oluşturun/değiştirin
 Permission779=Gider raporlarını dışa aktar
 Permission1001=Stok oku
@@ -962,15 +961,11 @@ Permission2801=Okuma modunda FTP istemcisi kullan (yalnızca tara ve indir)
 Permission2802=Yazma modunda FTP istemcisi kullan (sil ya da dosya yükle)
 Permission3200=Arşivlenmiş olayları ve parmak izlerini okuyun
 Permission3301=Yeni modüller oluşturun
-Permission4001=Çalışanları gör
-Permission4002=Çalışan oluştur
-Permission4003=Çalışan sil
-Permission4004=Çalışanları dışa aktar
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
@@ -981,9 +976,9 @@ Permission10005=Web sitesi içeriğini silin
 Permission20001=İzin taleplerini okuyun (izniniz ve astlarınızın izinleri)
 Permission20002=İzin isteklerinizi oluşturun/değiştirin (izinleriniz ve astlarınızın izinleri)
 Permission20003=İzin isteği sil
-Permission20004=Tüm izin isteklerini okuyun (ast olmayan kullanıcıların bile)
-Permission20005=Herkes için izin istekleri oluşturun/değiştirin (ast olmayan kullanıcılar için bile)
-Permission20006=Yönetici izin istekleri (ayarla ve bakiye güncelle)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=İzin isteklerini onaylayın
 Permission23001=Planlı iş oku
 Permission23002=Planlı iş oluştur/güncelle
@@ -1023,9 +1018,9 @@ Permission63003=Kaynak sil
 Permission63004=Gündem etkinliklerine kaynak bağlantıla
 Permission64001=Doğrudan yazdırmaya izin ver
 Permission67000=Makbuzların yazdırılmasına izin ver
-Permission68001=Şirket içi raporu okuyun
-Permission68002=Şirket içi rapor oluştur/değiştir
-Permission68004=Topluluk içi raporu sil
+Permission68001=Dahili iletişim raporunu okuyun
+Permission68002=Dahili iletişim raporu oluştur/değiştir
+Permission68004=Dahili iletişim raporunu sil
 Permission941601=Makbuzları oku
 Permission941602=Makbuz oluşturma ve değiştirme
 Permission941603=Makbuzları doğrula
@@ -1044,7 +1039,7 @@ DictionaryCivility=Onursal unvanlar
 DictionaryActions=Gündem etkinlik türleri
 DictionarySocialContributions=Sosyal veya mali vergi türleri
 DictionaryVAT=KDV Oranları veya Satış Vergisi Oranları
-DictionaryRevenueStamp=Damga vergisi tutarları
+DictionaryRevenueStamp=Damga pulu tutarları
 DictionaryPaymentConditions=Ödeme Koşulları
 DictionaryPaymentModes=Ödeme Türleri
 DictionaryTypeContact=Kişi/Adres türleri
@@ -1071,14 +1066,14 @@ DictionaryHolidayTypes=Leave - Types of leave
 DictionaryOpportunityStatus=Proje/potansiyel müşteri için potansiyel müşteri durumu
 DictionaryExpenseTaxCat=Gider raporu - Ulaşım kategorileri
 DictionaryExpenseTaxRange=Gider raporu - Ulaşım kategorisine göre menzil
-DictionaryTransportMode=Intracomm raporu - Taşıma modu
+DictionaryTransportMode=Dahili iletişim raporu - Taşıma modu
 DictionaryBatchStatus=Product lot/serial Quality Control status
 TypeOfUnit=Ünite türü
 SetupSaved=Kurulum kaydedildi
 SetupNotSaved=Kurulum kaydedilmedi
 BackToModuleList=Modül listesine dön
-BackToDictionaryList=Tanımlar listesine dön
-TypeOfRevenueStamp=Damga vergisi türü
+BackToDictionaryList=Sözlük listesine dön
+TypeOfRevenueStamp=Damga pulu türü
 VATManagement=Satış Vergisi Yönetimi
 VATIsUsedDesc=Potansiyel müşteriler, faturalar, siparişler vb. oluştururken KDV oranı varsayılan olarak aktif standart kuralı izler:<br>Eğer satıcı taraf vergiye tabi değilse KDV oranı 0 olacaktır. Kuralın sonu.<br>Eğer satıcı ve alıcının ülkesi aynı ise (satıcı ülkesi=alıcı ülkesi), KDV oranı varsayılan olarak ürünün satıcı ülkesindeki KDV oranına eşittir. Kuralın sonu.<br>Hem satıcı hem de alıcı taraf Avrupa Topluluğu'nda yer alıyorsa ve mallar taşımayla ilgili (taşıma, nakliye, havayolu) ürünler ise varsayılan KDV 0 olacaktır. Bu kural satıcının ülkesine bağlıdır - lütfen muhasebecinize danışın. KDV alıcı tarafından satıcıya değil, ülkesindeki gümrük idaresine ödenmelidir. Kuralın sonu.<br>Hem satıcı hem de alıcı taraf Avrupa Topluluğu'nda yer alıyorsa ve alıcı taraf bir şirket değil ise (kayıtlı bir Topluluk içi Vergi numarasına sahip), KDV oranı varsayılan olarak satıcının ülkesinin KDV oranına eşit olacaktır. Kuralın sonu.<br>Hem satıcı hem de alıcı taraf Avrupa Topluluğu'nda yer alıyorsa ve alıcı taraf bir şirketse (kayıtlı bir Topluluk içi Vergi numarasına sahip), KDV oranı varsayılan olarak 0 olacaktır. Kuralın sonu.<br>Bunların dışındaki durumlarda KDV oranı için önerilen varsayılan değer 0'dır. Kuralın sonu.
 VATIsNotUsedDesc=Dernekler, şahıslar veya küçük şirketler söz konusu olduğunda varsayılan olarak önerilen KDV oranı 0 olacaktır.
@@ -1110,8 +1105,8 @@ LocalTax2IsNotUsedDescES=Varsayılan olarak önerilen IRPF 0. Kural sonu.
 LocalTax2IsUsedExampleES=İspanya'da, hizmet işleri yapan serbest meslek sahipleri ve bağımsız uzmanlar ile bu vergi sistemini seçen firmalardır.
 LocalTax2IsNotUsedExampleES=İspanya'da bunlar, modüllerin vergi sistemine tabi olmayan işletmelerdir.
 RevenueStampDesc="Vergi pulu" veya "gelir pulu", fatura başına sabit bir vergidir (Fatura miktarına bağlı değildir). Yüzde vergi de olabilir, ancak ikinci veya üçüncü vergi türünü kullanmak yüzde vergiler için daha iyidir çünkü vergi pulları herhangi bir raporlama sağlamaz. Yalnızca birkaç ülke bu tür vergileri kullanır.
-UseRevenueStamp=Vergi damgası kullanın
-UseRevenueStampExample=Vergi damgasının değeri varsayılan olarak sözlük ayarlarında tanımlanır (%s - %s - %s)
+UseRevenueStamp=Vergi pulu kullanın
+UseRevenueStampExample=Vergi pulunun değeri varsayılan olarak sözlük ayarlarında tanımlanır (%s - %s - %s)
 CalcLocaltax=Yerel vergi raporları
 CalcLocaltax1=Satışlar - Alışlar
 CalcLocaltax1Desc=Yerel Vergi raporları, yerel satış vergileri ile yerel alış vergileri farkı olarak hesaplanır
@@ -1189,7 +1184,7 @@ DoNotSuggestPaymentMode=Önerme
 NoActiveBankAccountDefined=Tanımlı etkin banka hesabı yok
 OwnerOfBankAccount=Banka hesabı sahibi %s
 BankModuleNotActive=Banka hesapları modülü etkin değil
-ShowBugTrackLink=Show the link "<strong>%s</strong>"
+ShowBugTrackLink="<strong>%s</strong>" bağlantısını göster
 ShowBugTrackLinkDesc=Keep empty to not display this link, use value 'github' for the link to the Dolibarr project or define directly an url 'https://...'
 Alerts=Uyarılar
 DelaysOfToleranceBeforeWarning=Bir uyarı işaretini görüntülemeden önceki ek mühlet:
@@ -1220,7 +1215,7 @@ SetupDescription3b=Basic parameters used to customize the default behavior of yo
 SetupDescription4b=This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
 AuditedSecurityEvents=Denetlenen güvenlik olayları
 NoSecurityEventsAreAduited=Hiçbir güvenlik olayı denetlenmez. Bunları %s menüsünden etkinleştirebilirsiniz
-Audit=Security events
+Audit=Güvenlik Etkinlikleri
 InfoDolibarr=Dolibarr Bilgileri
 InfoBrowser=Tarayıcı Bilgileri
 InfoOS=İşletim Sistemi Bilgileri
@@ -1990,8 +1985,8 @@ AllPublishers=Bütün yayıncılar
 UnknownPublishers=Bilinmeyen yayıncılar
 AddRemoveTabs=Sekme ekle ya da sil
 AddDataTables=Nesne tabloları ekle
-AddDictionaries=Tanım tabloları ekleyin
-AddData=Nesne veya tanım verileri ekle
+AddDictionaries=Sözlük tabloları ekleyin
+AddData=Nesne veya sözlük verileri ekle
 AddBoxes=Ekran etiketi ekle
 AddSheduledJobs=Planlı görev ekle
 AddHooks=Kanca ekle
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Bu koleksiyoncu için koleksiyonu şimdi çalışt
 NoNewEmailToProcess=İşlenecek yeni e-posta (eşleşen filtreler) yok
 NothingProcessed=Hiçbir şey yapılmadı
 XEmailsDoneYActionsDone=%s e-postası uygun, %s e-postası başarıyla işlendi (%s kaydı/yapılan eylem için)
-RecordEvent=E-posta olayını kaydet
-CreateLeadAndThirdParty=Aday oluştur (ve gerekirse cari)
-CreateTicketAndThirdParty=Bilet oluşturun (ve önceki bir işlemle yüklenmişse cariye bağlantı verin)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 CodeLastResult=En son sonuç kodu
 NbOfEmailsInInbox=Kaynak dizindeki e-postaların sayısı
 LoadThirdPartyFromName=%s üzerinde cari aramasını yükle (yalnızca yükle)
 LoadThirdPartyFromNameOrCreate=%s üzerinde cari aramasını yükle (bulunamazsa oluşturun)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Dolibarr'dan gönderilen ilk e-postayla başlatılan bir görüşmeden gelen mesaj
 WithoutDolTrackingID=Dolibarr'dan GÖNDERİLMEYEN ilk e-posta ile başlatılan bir görüşmeden gelen mesaj
 WithDolTrackingIDInMsgId=Dolibarr'dan gönderilen mesaj
@@ -2084,7 +2080,7 @@ CreateCandidature=İş başvurusu oluştur
 FormatZip=Posta Kodu
 MainMenuCode=Menü giriş kodu (ana menü)
 ECMAutoTree=Otomatik ECM ağacını göster
-OperationParamDesc=Eylemin nesnesi için kullanılacak değerleri veya değerlerin nasıl çıkarılacağını tanımlayın. Örneğin:<br>objproperty1=SET: ayarlanacak değer <br>objproperty2=SET:__objproperty1__ yerine geçen bir değer <br>objproperty3=SETIFEMPTY:objproperty3 önceden tanımlanmamışsa kullanılan değer <br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br> object.objproperty5=EXTRACT:BODY:Şirket adı\\s([^\\s]*)<br><br> a kullanın; Birkaç özelliği ayıklamak veya ayarlamak için ayırıcı olarak karakter.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Açılış saatleri
 OpeningHoursDesc=Buraya firmanızın normal çalışma saatlerini girin.
 ResourceSetup=Kaynak modülünün yapılandırılması
@@ -2130,7 +2126,7 @@ LargerThan=Şundan daha büyük
 IfTrackingIDFoundEventWillBeLinked=Bir nesnenin izleme kimliği e-postada bulunursa veya e-posta bir e-postanın hemen toplanan ve bir nesneye bağlanan bir cevabıysa, oluşturulan olayın otomatik olarak bilinen ilgili nesneye bağlanacağını unutmayın.
 WithGMailYouCanCreateADedicatedPassword=Bir GMail hesabıyla, 2 adımlı doğrulamayı etkinleştirdiyseniz, https://myaccount.google.com/ adresinden kendi hesap şifrenizi kullanmak yerine uygulama için özel bir ikinci şifre oluşturmanız önerilir.
 EmailCollectorTargetDir=Başarıyla işlendiğinde e-postayı başka bir etikete/dizine taşımak istenen bir davranış olabilir. Bu özelliği kullanmak için burada dizinin adını ayarlamanız yeterlidir (isimde özel karakterler KULLANMAYIN). Ayrıca bir okuma/yazma oturum açma hesabı kullanmanız gerektiğini unutmayın.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+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>
 EndPointFor=%s için bitiş noktası: %s
 DeleteEmailCollector=E-posta toplayıcıyı sil
 ConfirmDeleteEmailCollector=Bu e-posta toplayıcıyı silmek istediğinizden emin misiniz?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Missing translation for %s
 NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/tr_TR/bills.lang b/htdocs/langs/tr_TR/bills.lang
index 79b13d534ef..3ae226491c7 100644
--- a/htdocs/langs/tr_TR/bills.lang
+++ b/htdocs/langs/tr_TR/bills.lang
@@ -84,8 +84,6 @@ PaymentRule=Ödeme kuralı
 PaymentMode=Ödeme Türü
 DefaultPaymentMode=Varsayılan Ödeme Türü
 DefaultBankAccount=Varsayılan Banka Hesabı
-PaymentTypeDC=Banka/Kredi Kartı
-PaymentTypePP=PayPal
 IdPaymentMode=Ödeme Türü (id)
 CodePaymentMode=Ödeme Türü (kod)
 LabelPaymentMode=Ödeme Türü (etiket)
@@ -266,7 +264,7 @@ RelatedCommercialProposals=İlgili teklifler
 RelatedRecurringCustomerInvoices=İlişkili yinelenen müşteri faturaları
 MenuToValid=Doğrulanacak
 DateMaxPayment=Ödeme vadesi
-DateInvoice=Fatura tarihi
+DateInvoice=Fatura Tarihi
 DatePointOfTax=Vergi noktası
 NoInvoice=Fatura yok
 NoOpenInvoice=No open invoice
@@ -280,6 +278,7 @@ SetMode=Ödeme Türünü Ayarla
 SetRevenuStamp=Damga pulu ayarı
 Billed=Faturalanmış
 RecurringInvoices=Yinelenen faturalar
+RecurringInvoice=Recurring invoice
 RepeatableInvoice=Fatura şablonu
 RepeatableInvoices=Fatura şablonları
 Repeatable=Şablon
@@ -449,6 +448,8 @@ PaymentTypeTRA=Banka ödeme emri
 PaymentTypeShortTRA=Ödeme emri
 PaymentTypeFAC=Faktör
 PaymentTypeShortFAC=Faktör
+PaymentTypeDC=Banka/Kredi Kartı
+PaymentTypePP=PayPal
 BankDetails=Banka ayrıntıları
 BankCode=Banka kodu
 DeskCode=Şube kodu
@@ -525,7 +526,7 @@ ToMakePayment=Öde
 ToMakePaymentBack=Geri öde
 ListOfYourUnpaidInvoices=Ödenmemiş fatura listesi
 NoteListOfYourUnpaidInvoices=Not: Bu liste, satış temsilcisi olarak bağlı olduğunuz üçüncü partilere ait faturaları içerir.
-RevenueStamp=Tax stamp
+RevenueStamp=Damga pulu
 YouMustCreateInvoiceFromThird=Bu seçenek yalnızca üçüncü partinin "Müşteri" sekmesinden bir fatura oluştururken kullanılabilir
 YouMustCreateInvoiceFromSupplierThird=Bu seçenek yalnızca üçüncü partinin "Tedarikçi" sekmesinden bir fatura oluştururken kullanılabilir
 YouMustCreateStandardInvoiceFirstDesc=Yeni bir fatura şablonu oluşturmak için önce bir standart fatura oluşturmalı ve onu "şablona" dönüştürmelisiniz
@@ -604,3 +605,4 @@ SituationTotalProgress=Total progress %d %%
 SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
 NoPaymentAvailable=No payment available for %s
 PaymentRegisteredAndInvoiceSetToPaid=Payment registered and invoice %s set to paid
+SendEmailsRemindersOnInvoiceDueDate=Send reminder by email for unpaid invoices
diff --git a/htdocs/langs/tr_TR/categories.lang b/htdocs/langs/tr_TR/categories.lang
index ad38b93b093..6ff23b98f79 100644
--- a/htdocs/langs/tr_TR/categories.lang
+++ b/htdocs/langs/tr_TR/categories.lang
@@ -3,7 +3,7 @@ Rubrique=Etiket/Kategori
 Rubriques=Etiketler/Kategoriler
 RubriquesTransactions=İşlem Etiketleri/Kategorileri
 categories=etiketler/kategoriler
-NoCategoryYet=No tag/category of this type has been created
+NoCategoryYet=Bu türde oluşturulmuş etiket/kategori yok
 In=İçinde
 AddIn=Eklenti
 modify=değiştir
@@ -16,7 +16,7 @@ MembersCategoriesArea=Member tags/categories area
 ContactsCategoriesArea=Contact tags/categories area
 AccountsCategoriesArea=Bank account tags/categories area
 ProjectsCategoriesArea=Project tags/categories area
-UsersCategoriesArea=User tags/categories area
+UsersCategoriesArea=Kullanıcı etiketleri/kategorileri alanı
 SubCats=Alt kategoriler
 CatList= Etiketler/kategoriler listesi
 CatListAll=List of tags/categories (all types)
diff --git a/htdocs/langs/tr_TR/companies.lang b/htdocs/langs/tr_TR/companies.lang
index 7f32f4844a2..8ba4746193d 100644
--- a/htdocs/langs/tr_TR/companies.lang
+++ b/htdocs/langs/tr_TR/companies.lang
@@ -71,7 +71,7 @@ Call=Ara
 Chat=Sohbet
 PhonePro=İş telefonu
 PhonePerso=Dahili numarası
-PhoneMobile=Cep telefonu
+PhoneMobile=Cep Telefonu
 No_Email=Toplu e-postaları reddet
 Fax=Faks
 Zip=Posta Kodu
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (RUT)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,10 +381,10 @@ VATIntraCheck=Denetle
 VATIntraCheckDesc=Bu Vergi Numarası ülke önekini içermelidir. <b>%s</b> linki, Dolibarr sunucusundan internet erişimi gerektiren Avrupa KDV kontrol hizmetini (VIES) kullanır.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Avrupa Komisyonu web sitesinden topluluk içi Vergi Numarasını kontrol edin
-VATIntraManualCheck=Avrupa Komisyonu'nun <a href="%s" target="_blank">%s</a> web adresinden de manuel olarak kontrol edebilirsiniz
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Denetlemiyor. Denetim hizmeti üye ülke (%s) tarafından sağlanmıyor.
 NorProspectNorCustomer=Ne aday ne de müşteri
-JuridicalStatus=Business entity type
+JuridicalStatus=Ticari varlık türü
 Workforce=Workforce
 Staff=Çalışan sayısı
 ProspectLevelShort=Potansiyel
diff --git a/htdocs/langs/tr_TR/errors.lang b/htdocs/langs/tr_TR/errors.lang
index ca459be5be9..bab7e754151 100644
--- a/htdocs/langs/tr_TR/errors.lang
+++ b/htdocs/langs/tr_TR/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
 ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
 ErrorIsNotADraft=%s is not a draft
 ErrorExecIdFailed=Can't execute command "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=PHP'nizdeki upload_max_filesize (%s) parametresi, post_max_size (%s) PHP parametresinden daha yüksek. Bu tutarlı bir kurulum değil.
diff --git a/htdocs/langs/tr_TR/intracommreport.lang b/htdocs/langs/tr_TR/intracommreport.lang
index 69850cd0bf0..4302a378571 100644
--- a/htdocs/langs/tr_TR/intracommreport.lang
+++ b/htdocs/langs/tr_TR/intracommreport.lang
@@ -1,7 +1,7 @@
-Module68000Name = Intracomm report
-Module68000Desc = Intracomm report management (Support for French DEB/DES format)
-IntracommReportSetup = Intracommreport module setup
-IntracommReportAbout = About intracommreport
+Module68000Name = Dahili iletişim raporu
+Module68000Desc = Dahili iletişim raporu yönetimi (Fransız DEB/DES formatı desteği)
+IntracommReportSetup = Dahili iletişim raporu modül ayarları
+IntracommReportAbout = Dahili iletişim raporu hakkında
 
 # Setup
 INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
@@ -14,7 +14,7 @@ INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
 INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
 
 # Menu
-MenuIntracommReport=Intracomm report
+MenuIntracommReport=Dahili iletişim raporu
 MenuIntracommReportNew=New declaration
 MenuIntracommReportList=Liste
 
@@ -32,7 +32,7 @@ IntracommReportTitle=Preparation of an XML file in ProDouane format
 # List
 IntracommReportList=List of generated declarations
 IntracommReportNumber=Numero of declaration
-IntracommReportPeriod=Period of nalysis
+IntracommReportPeriod=Period of analysis
 IntracommReportTypeDeclaration=Type of declaration
 IntracommReportDownload=download XML file
 
diff --git a/htdocs/langs/tr_TR/knowledgemanagement.lang b/htdocs/langs/tr_TR/knowledgemanagement.lang
index 5987c658f5b..2783bbcd6dd 100644
--- a/htdocs/langs/tr_TR/knowledgemanagement.lang
+++ b/htdocs/langs/tr_TR/knowledgemanagement.lang
@@ -18,16 +18,16 @@
 #
 
 # Module label 'ModuleKnowledgeManagementName'
-ModuleKnowledgeManagementName = Knowledge Management System
+ModuleKnowledgeManagementName = Bilgi Yönetim Sistemi
 # Module description 'ModuleKnowledgeManagementDesc'
-ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+ModuleKnowledgeManagementDesc=Bir Bilgi Yönetimi (BY) veya Yardım-Masası tabanını yönetin
 
 #
 # Admin page
 #
-KnowledgeManagementSetup = Knowledge Management System setup
+KnowledgeManagementSetup = Bilgi Yönetim Sistemi Kurulumu
 Settings = Ayarlar
-KnowledgeManagementSetupPage = Knowledge Management System setup page
+KnowledgeManagementSetupPage = Bilgi Yönetim Sistemi Kurulum Sayfası
 
 
 #
diff --git a/htdocs/langs/tr_TR/main.lang b/htdocs/langs/tr_TR/main.lang
index 0fab6a4861b..f9a71e2c878 100644
--- a/htdocs/langs/tr_TR/main.lang
+++ b/htdocs/langs/tr_TR/main.lang
@@ -212,6 +212,8 @@ User=Kullanıcı
 Users=Kullanıcılar
 Group=Grup
 Groups=Gruplar
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=Tanımlı kullanıcı grubu yok
 Password=Parola
 PasswordRetype=Parolanızı yeniden yazın
@@ -272,7 +274,7 @@ DateReference=Referans tarihi
 DateStart=Başlangıç tarihi
 DateEnd=Bitiş tarihi
 DateCreation=Oluşturma tarihi
-DateCreationShort=Oluşt. tarihi
+DateCreationShort=Oluşturulma tarihi
 IPCreation=Creation IP
 DateModification=Değiştirme tarihi
 DateModificationShort=Değiş. tarihi
diff --git a/htdocs/langs/tr_TR/modulebuilder.lang b/htdocs/langs/tr_TR/modulebuilder.lang
index c84a590621b..8a7a9583310 100644
--- a/htdocs/langs/tr_TR/modulebuilder.lang
+++ b/htdocs/langs/tr_TR/modulebuilder.lang
@@ -92,7 +92,7 @@ SearchAllDesc=Is the field used to make a search from the quick search tool? (Ex
 SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
 LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
 MenusDefDesc=Modülünüz tarafından sunulan menüleri burada tanımlayın
-DictionariesDefDesc=Define here the dictionaries provided by your module
+DictionariesDefDesc=Modülünüz tarafından sağlanan sözlükleri burada tanımlayın
 PermissionsDefDesc=Define here the new permissions provided by your module
 MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
 DictionariesDefDescTooltip=The dictionaries provided by your module/application are defined into the array <strong>$this->dictionaries</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), dictionaries are also visible into the setup area to administrator users on %s.
diff --git a/htdocs/langs/tr_TR/other.lang b/htdocs/langs/tr_TR/other.lang
index bd0c1f9aef5..492da87d74e 100644
--- a/htdocs/langs/tr_TR/other.lang
+++ b/htdocs/langs/tr_TR/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Şifre kodlama
 PermissionsAdd=İzinler eklendi
 PermissionsDelete=İzinler kaldırıldı
 YourPasswordMustHaveAtLeastXChars=Şifreniz en az <strong>%s</strong> karakter içermelidir
+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
 YourPasswordHasBeenReset=Şifreniz başarılı bir şekilde sıfırlandı
 ApplicantIpAddress=Başvuru sahibinin IP adresi
 SMSSentTo=SMS şuna gönderildi: %s
diff --git a/htdocs/langs/tr_TR/printing.lang b/htdocs/langs/tr_TR/printing.lang
index c2b3fce7394..3c76f79ce4f 100644
--- a/htdocs/langs/tr_TR/printing.lang
+++ b/htdocs/langs/tr_TR/printing.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - printing
 Module64000Name=One click Printing
-Module64000Desc=Enable One click Printing System
+Module64000Desc=Tek Tıkla Yazdırma Sistemini Etkinleştir
 PrintingSetup=Setup of One click Printing System
 PrintingDesc=This module adds a Print button to various modules to allow documents to be printed directly to a printer with no need to open the document into another application.
-MenuDirectPrinting=One click Printing jobs
-DirectPrint=One click Print
+MenuDirectPrinting=Tek Tıkla Yazdırma işleri
+DirectPrint=Tek Tıkla Yazdırma
 PrintingDriverDesc=Yazıcı sürücüsü değişkenlerinin ayarları
 ListDrivers=Sürücü listesi
 PrintTestDesc=Yazıcı Listesi
diff --git a/htdocs/langs/tr_TR/projects.lang b/htdocs/langs/tr_TR/projects.lang
index b562e99f382..a16e26f8bb1 100644
--- a/htdocs/langs/tr_TR/projects.lang
+++ b/htdocs/langs/tr_TR/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
 ProjectTasksWithoutTimeSpent=Project tasks without time spent
 FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+StartDateCannotBeAfterEndDate=Bitiş tarihi başlama tarihinden önce olamaz
diff --git a/htdocs/langs/tr_TR/propal.lang b/htdocs/langs/tr_TR/propal.lang
index 0ba8dd91140..a5d294ec373 100644
--- a/htdocs/langs/tr_TR/propal.lang
+++ b/htdocs/langs/tr_TR/propal.lang
@@ -44,7 +44,7 @@ ListOfProposals=Teklif listesi
 ActionsOnPropal=Teklifteki etkinlikler
 RefProposal=Teklif ref
 SendPropalByMail=Teklifi e-posta ile gönder
-DatePropal=Teklif tarihi
+DatePropal=Teklif Tarihi
 DateEndPropal=Teklif son geçerlilik tarihi
 ValidityDuration=Geçerlilik süresi
 SetAcceptedRefused=Kabul edildi/reddedildi ayarla
diff --git a/htdocs/langs/tr_TR/receiptprinter.lang b/htdocs/langs/tr_TR/receiptprinter.lang
index ba94839c094..9addf56fb2c 100644
--- a/htdocs/langs/tr_TR/receiptprinter.lang
+++ b/htdocs/langs/tr_TR/receiptprinter.lang
@@ -54,9 +54,9 @@ DOL_DOUBLE_WIDTH=Double width size
 DOL_DEFAULT_HEIGHT_WIDTH=Default height and width size
 DOL_UNDERLINE=Enable underline
 DOL_UNDERLINE_DISABLED=Disable underline
-DOL_BEEP=Beed sound
+DOL_BEEP=Beep sound
 DOL_PRINT_TEXT=Print text
-DateInvoiceWithTime=Invoice date and time
+DateInvoiceWithTime=Fatura tarihi ve saati
 YearInvoice=Invoice year
 DOL_VALUE_MONTH_LETTERS=Invoice month in letters
 DOL_VALUE_MONTH=Invoice month
diff --git a/htdocs/langs/tr_TR/users.lang b/htdocs/langs/tr_TR/users.lang
index 78a44dfe08c..c6fbe54dcde 100644
--- a/htdocs/langs/tr_TR/users.lang
+++ b/htdocs/langs/tr_TR/users.lang
@@ -97,8 +97,8 @@ LoginToCreate=Oluşturulacak kullanıcı adı
 NameToCreate=Oluşturulacak Üçüncü Parti Adı
 YourRole=Sizin rolünüz
 YourQuotaOfUsersIsReached=Aktif kullanıcı kotanıza ulaşıldı!
-NbOfUsers=Number of users
-NbOfPermissions=Number of permissions
+NbOfUsers=Kullanıcı sayısı
+NbOfPermissions=İzin sayısı
 DontDowngradeSuperAdmin=Yalnızca bir SuperAdmin, bir SuperAdmin’inin derecesini düşürebilir
 HierarchicalResponsible=Yönetici
 HierarchicView=Sıradüzeni Görünümü
@@ -112,11 +112,11 @@ DisabledInMonoUserMode=Bakım modunda devre dışıdır
 UserAccountancyCode=Kullanıcı muhasebe kodu
 UserLogoff=Kullanıcı çıkış yaptı
 UserLogged=Kullanıcı giriş yaptı
-DateOfEmployment=Employment date
-DateEmployment=Employment
+DateOfEmployment=Çalışma Tarihi
+DateEmployment=Çalışma
 DateEmploymentstart=İşe Başlama Tarihi
 DateEmploymentEnd=İşi Bırakma Tarihi
-RangeOfLoginValidity=Access validity date range
+RangeOfLoginValidity=Erişim geçerliliği tarih aralığı
 CantDisableYourself=Kendi kullanıcı kaydınızı devre dışı bırakamazsınız
 ForceUserExpenseValidator=Gider raporu doğrulayıcısını zorla
 ForceUserHolidayValidator=İzin isteği doğrulayıcısını zorla
diff --git a/htdocs/langs/tr_TR/withdrawals.lang b/htdocs/langs/tr_TR/withdrawals.lang
index 953a2a22fa6..3dd5b4b9b3a 100644
--- a/htdocs/langs/tr_TR/withdrawals.lang
+++ b/htdocs/langs/tr_TR/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Son %s otomatik ödeme dosyaları
 WithdrawalsLine=Direct debit order line
+CreditTransfer=Credit transfer
 CreditTransferLine=Credit transfer line
 WithdrawalsLines=Otomatik ödeme talimatı satırları
 CreditTransferLines=Credit transfer lines
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Üçüncü parti banka kodu
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=Alacak olarak sınıflandır
+ClassDebited=Classify debited
 ClassCreditedConfirm=Bu para çekme makbuzunu bankanıza alacak olarak sınıflandırmak istediğinizden emin misiniz?
 TransData=Havale tarihi
 TransMetod=Havale yöntemi
diff --git a/htdocs/langs/uk_UA/admin.lang b/htdocs/langs/uk_UA/admin.lang
index 285a9a00257..d4c6acdca46 100644
--- a/htdocs/langs/uk_UA/admin.lang
+++ b/htdocs/langs/uk_UA/admin.lang
@@ -756,7 +756,7 @@ Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
 Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Export transactions and account statements
 Permission116=Transfers between accounts
@@ -893,12 +893,11 @@ Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Read stocks
@@ -962,15 +961,11 @@ Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
@@ -981,9 +976,9 @@ Permission10005=Delete website content
 Permission20001=Read leave requests (your leave and those of your subordinates)
 Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Approve leave requests
 Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
-RecordEvent=Record email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
@@ -2084,7 +2080,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -2130,7 +2126,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+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>
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Missing translation for %s
 NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/uk_UA/companies.lang b/htdocs/langs/uk_UA/companies.lang
index 7eaeb6c4346..7abc1832bca 100644
--- a/htdocs/langs/uk_UA/companies.lang
+++ b/htdocs/langs/uk_UA/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Чек
 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.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commission website
-VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Business entity type
diff --git a/htdocs/langs/uk_UA/errors.lang b/htdocs/langs/uk_UA/errors.lang
index 7bb0fac3f7b..eabc784e6aa 100644
--- a/htdocs/langs/uk_UA/errors.lang
+++ b/htdocs/langs/uk_UA/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
 ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
 ErrorIsNotADraft=%s is not a draft
 ErrorExecIdFailed=Can't execute command "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # 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/uk_UA/main.lang b/htdocs/langs/uk_UA/main.lang
index a2779ebb6a2..ba1fc97659e 100644
--- a/htdocs/langs/uk_UA/main.lang
+++ b/htdocs/langs/uk_UA/main.lang
@@ -212,6 +212,8 @@ User=User
 Users=Users
 Group=Group
 Groups=Groups
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=No user group defined
 Password=Пароль
 PasswordRetype=Retype your password
diff --git a/htdocs/langs/uk_UA/other.lang b/htdocs/langs/uk_UA/other.lang
index 3bbdc1488f5..d42e491c187 100644
--- a/htdocs/langs/uk_UA/other.lang
+++ b/htdocs/langs/uk_UA/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Password encoding
 PermissionsAdd=Permissions added
 PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
+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
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
 SMSSentTo=SMS sent to %s
diff --git a/htdocs/langs/uk_UA/projects.lang b/htdocs/langs/uk_UA/projects.lang
index 71993ebb094..34853ec418f 100644
--- a/htdocs/langs/uk_UA/projects.lang
+++ b/htdocs/langs/uk_UA/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
 ProjectTasksWithoutTimeSpent=Project tasks without time spent
 FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+StartDateCannotBeAfterEndDate=End date cannot be before start date
diff --git a/htdocs/langs/uk_UA/withdrawals.lang b/htdocs/langs/uk_UA/withdrawals.lang
index fac7df03234..1af2f477108 100644
--- a/htdocs/langs/uk_UA/withdrawals.lang
+++ b/htdocs/langs/uk_UA/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
 WithdrawalsLine=Direct debit order line
+CreditTransfer=Credit transfer
 CreditTransferLine=Credit transfer line
 WithdrawalsLines=Direct debit order lines
 CreditTransferLines=Credit transfer lines
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=Classify credited
+ClassDebited=Classify debited
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
 TransMetod=Transmission method
diff --git a/htdocs/langs/ur_PK/accountancy.lang b/htdocs/langs/ur_PK/accountancy.lang
index 8bc4b54a090..b3b1b7daf08 100644
--- a/htdocs/langs/ur_PK/accountancy.lang
+++ b/htdocs/langs/ur_PK/accountancy.lang
@@ -1,437 +1,437 @@
 # Dolibarr language file - en_US - Accountancy (Double entries)
-Accountancy=Accountancy
-Accounting=Accounting
-ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
-ACCOUNTING_EXPORT_DATE=Date format for export file
-ACCOUNTING_EXPORT_PIECE=Export the number of piece
-ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account
-ACCOUNTING_EXPORT_LABEL=Export label
-ACCOUNTING_EXPORT_AMOUNT=Export amount
-ACCOUNTING_EXPORT_DEVISE=Export currency
-Selectformat=Select the format for the file
-ACCOUNTING_EXPORT_FORMAT=Select the format for the file
-ACCOUNTING_EXPORT_ENDLINE=Select the carriage return type
-ACCOUNTING_EXPORT_PREFIX_SPEC=Specify the prefix for the file name
-ThisService=This service
-ThisProduct=This product
-DefaultForService=Default for service
-DefaultForProduct=Default for product
-ProductForThisThirdparty=Product for this thirdparty
-ServiceForThisThirdparty=Service for this thirdparty
-CantSuggest=Can't suggest
-AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
-ConfigAccountingExpert=Configuration of the module accounting (double entry)
-Journalization=Journalization
-Journals=Journals
-JournalFinancial=Financial journals
-BackToChartofaccounts=Return chart of accounts
-Chartofaccounts=Chart of accounts
-ChartOfSubaccounts=Chart of individual accounts
-ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
-CurrentDedicatedAccountingAccount=Current dedicated account
-AssignDedicatedAccountingAccount=New account to assign
-InvoiceLabel=Invoice label
-OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
-OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
-OtherInfo=Other information
-DeleteCptCategory=Remove accounting account from group
-ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
-JournalizationInLedgerStatus=Status of journalization
-AlreadyInGeneralLedger=Already transferred to accounting journals and ledger
-NotYetInGeneralLedger=Not yet transferred to accouting journals and ledger
-GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
-DetailByAccount=Show detail by account
-AccountWithNonZeroValues=Accounts with non-zero values
-ListOfAccounts=List of accounts
-CountriesInEEC=Countries in EEC
-CountriesNotInEEC=Countries not in EEC
-CountriesInEECExceptMe=Countries in EEC except %s
-CountriesExceptMe=All countries except %s
-AccountantFiles=Export source documents
-ExportAccountingSourceDocHelp=With this tool, you can export the source events (list in CSV and PDFs) that are used to generate your accountancy.
-ExportAccountingSourceDocHelp2=To export your journals, use the menu entry %s - %s.
-VueByAccountAccounting=View by accounting account
-VueBySubAccountAccounting=View by accounting subaccount
+Accountancy=اکاؤنٹنسی
+Accounting=حساب کتاب
+ACCOUNTING_EXPORT_SEPARATORCSV=برآمد فائل کے لیے کالم الگ کرنے والا
+ACCOUNTING_EXPORT_DATE=برآمد فائل کے لیے تاریخ کی شکل
+ACCOUNTING_EXPORT_PIECE=ٹکڑے کی تعداد برآمد کریں۔
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=عالمی اکاؤنٹ کے ساتھ برآمد کریں۔
+ACCOUNTING_EXPORT_LABEL=ایکسپورٹ لیبل
+ACCOUNTING_EXPORT_AMOUNT=برآمد کی رقم
+ACCOUNTING_EXPORT_DEVISE=کرنسی برآمد کریں۔
+Selectformat=فائل کے لیے فارمیٹ منتخب کریں۔
+ACCOUNTING_EXPORT_FORMAT=فائل کے لیے فارمیٹ منتخب کریں۔
+ACCOUNTING_EXPORT_ENDLINE=گاڑی کی واپسی کی قسم منتخب کریں۔
+ACCOUNTING_EXPORT_PREFIX_SPEC=فائل کے نام کے لیے سابقہ کی وضاحت کریں۔
+ThisService=یہ سروس
+ThisProduct=یہ مصنوعات
+DefaultForService=سروس کے لیے ڈیفالٹ
+DefaultForProduct=پروڈکٹ کے لیے ڈیفالٹ
+ProductForThisThirdparty=اس تھرڈ پارٹی کے لیے پروڈکٹ
+ServiceForThisThirdparty=اس تھرڈ پارٹی کے لیے سروس
+CantSuggest=تجویز نہیں کر سکتے
+AccountancySetupDoneFromAccountancyMenu=اکاؤنٹنسی کا زیادہ تر سیٹ اپ مینو %s سے کیا جاتا ہے
+ConfigAccountingExpert=ماڈیول اکاؤنٹنگ کی ترتیب (ڈبل اندراج)
+Journalization=جرنلائزیشن
+Journals=روزنامچے
+JournalFinancial=مالیاتی جریدے
+BackToChartofaccounts=کھاتوں کا ریٹرن چارٹ
+Chartofaccounts=کھاتوں کا چارٹ
+ChartOfSubaccounts=انفرادی کھاتوں کا چارٹ
+ChartOfIndividualAccountsOfSubsidiaryLedger=ذیلی لیجر کے انفرادی کھاتوں کا چارٹ
+CurrentDedicatedAccountingAccount=موجودہ وقف اکاؤنٹ
+AssignDedicatedAccountingAccount=تفویض کرنے کے لیے نیا اکاؤنٹ
+InvoiceLabel=انوائس لیبل
+OverviewOfAmountOfLinesNotBound=لائنوں کی مقدار کا جائزہ اکاؤنٹنگ اکاؤنٹ کے پابند نہیں ہے۔
+OverviewOfAmountOfLinesBound=اکاؤنٹنگ اکاؤنٹ میں پہلے سے ہی پابند لائنوں کی مقدار کا جائزہ
+OtherInfo=دوسری معلومات
+DeleteCptCategory=اکاؤنٹنگ اکاؤنٹ کو گروپ سے ہٹا دیں۔
+ConfirmDeleteCptCategory=کیا آپ واقعی اس اکاؤنٹنگ اکاؤنٹ کو اکاؤنٹنگ اکاؤنٹنگ گروپ سے ہٹانا چاہتے ہیں؟
+JournalizationInLedgerStatus=جرنلائزیشن کی حیثیت
+AlreadyInGeneralLedger=پہلے ہی اکاؤنٹنگ جرنلز اور لیجر میں منتقل کر دیا گیا ہے۔
+NotYetInGeneralLedger=ابھی تک اکاؤٹنگ جرنلز اور لیجر میں منتقل نہیں کیا گیا ہے۔
+GroupIsEmptyCheckSetup=گروپ خالی ہے، ذاتی اکاؤنٹنگ گروپ کا سیٹ اپ چیک کریں۔
+DetailByAccount=اکاؤنٹ کے حساب سے تفصیل دکھائیں۔
+AccountWithNonZeroValues=غیر صفر اقدار والے اکاؤنٹس
+ListOfAccounts=اکاؤنٹس کی فہرست
+CountriesInEEC=ای ای سی میں ممالک
+CountriesNotInEEC=وہ ممالک جو EEC میں نہیں ہیں۔
+CountriesInEECExceptMe=ای ای سی میں شامل ممالک سوائے %s کے
+CountriesExceptMe=%s کے علاوہ تمام ممالک
+AccountantFiles=ماخذ کی دستاویزات برآمد کریں۔
+ExportAccountingSourceDocHelp=اس ٹول کے ساتھ، آپ ان سورس ایونٹس کو ایکسپورٹ کر سکتے ہیں (CSV اور PDFs میں فہرست) جو آپ کی اکاؤنٹنسی بنانے کے لیے استعمال ہوتے ہیں۔
+ExportAccountingSourceDocHelp2=اپنے جریدے برآمد کرنے کے لیے، مینو اندراج %s - %s استعمال کریں۔
+VueByAccountAccounting=حساب کتاب کے حساب سے دیکھیں
+VueBySubAccountAccounting=اکاؤنٹنگ ذیلی اکاؤنٹ کے ذریعہ دیکھیں
 
-MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
-MainAccountForUsersNotDefined=Main accounting account for users not defined in setup
-MainAccountForVatPaymentNotDefined=Main accounting account for VAT payment not defined in setup
-MainAccountForSubscriptionPaymentNotDefined=Main accounting account for subscription payment not defined in setup
+MainAccountForCustomersNotDefined=صارفین کے لیے مین اکاؤنٹنگ اکاؤنٹ سیٹ اپ میں بیان نہیں کیا گیا ہے۔
+MainAccountForSuppliersNotDefined=وینڈرز کے لیے مین اکاؤنٹنگ اکاؤنٹ سیٹ اپ میں بیان نہیں کیا گیا ہے۔
+MainAccountForUsersNotDefined=صارفین کے لیے مرکزی اکاؤنٹنگ اکاؤنٹ سیٹ اپ میں بیان نہیں کیا گیا ہے۔
+MainAccountForVatPaymentNotDefined=VAT ادائیگی کے لیے مرکزی اکاؤنٹنگ اکاؤنٹ سیٹ اپ میں بیان نہیں کیا گیا ہے۔
+MainAccountForSubscriptionPaymentNotDefined=رکنیت کی ادائیگی کے لیے مرکزی اکاؤنٹنگ اکاؤنٹ سیٹ اپ میں بیان نہیں کیا گیا ہے۔
 
-AccountancyArea=Accounting area
-AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
-AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
-AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyArea=اکاؤنٹنگ ایریا
+AccountancyAreaDescIntro=اکاؤنٹنسی ماڈیول کا استعمال کئی مراحل میں کیا جاتا ہے:
+AccountancyAreaDescActionOnce=درج ذیل اعمال عام طور پر صرف ایک بار، یا سال میں ایک بار کیے جاتے ہیں...
+AccountancyAreaDescActionOnceBis=جرنلائزیشن کرتے وقت آپ کو صحیح ڈیفالٹ اکاؤنٹنگ اکاؤنٹ تجویز کرکے مستقبل میں آپ کا وقت بچانے کے لیے اگلے اقدامات کیے جائیں (جرائد اور جنرل لیجر میں ریکارڈ لکھنا)
+AccountancyAreaDescActionFreq=درج ذیل کارروائیاں عام طور پر بہت بڑی کمپنیوں کے لیے ہر مہینے، ہفتے یا دن کی جاتی ہیں...
 
-AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
-AccountancyAreaDescChartModel=STEP %s: Check that a model of chart of account exists or create one from menu %s
-AccountancyAreaDescChart=STEP %s: Select and|or complete your chart of account from menu %s
+AccountancyAreaDescJournalSetup=STEP %s: مینو %s سے اپنے جریدے کی فہرست کا مواد بنائیں یا چیک کریں۔
+AccountancyAreaDescChartModel=STEP %s: چیک کریں کہ اکاؤنٹ کے چارٹ کا ماڈل موجود ہے یا مینو سے ایک بنائیں %s
+AccountancyAreaDescChart=STEP %s: منتخب کریں اور|یا اپنے اکاؤنٹ کا چارٹ مینو %s سے مکمل کریں
 
-AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
-AccountancyAreaDescDefault=STEP %s: Define default accounting accounts. For this, use the menu entry %s.
-AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
-AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expenses (miscellaneous taxes). For this, use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Define default accounting accounts for donation. For this, use the menu entry %s.
-AccountancyAreaDescSubscription=STEP %s: Define default accounting accounts for member subscription. For this, use the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Define mandatory default account and default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
-AccountancyAreaDescBank=STEP %s: Define accounting accounts and journal code for each bank and financial accounts. For this, use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+AccountancyAreaDescVat=STEP %s: ہر VAT کی شرح کے لیے اکاؤنٹنگ اکاؤنٹس کی وضاحت کریں۔ اس کے لیے مینو انٹری %s استعمال کریں۔
+AccountancyAreaDescDefault=STEP %s: پہلے سے طے شدہ اکاؤنٹنگ اکاؤنٹس کی وضاحت کریں۔ اس کے لیے مینو انٹری %s استعمال کریں۔
+AccountancyAreaDescExpenseReport=STEP %s: ہر قسم کے اخراجات کی رپورٹ کے لیے ڈیفالٹ اکاؤنٹنگ اکاؤنٹس کی وضاحت کریں۔ اس کے لیے مینو انٹری %s استعمال کریں۔
+AccountancyAreaDescSal=STEP %s: تنخواہوں کی ادائیگی کے لیے پہلے سے طے شدہ اکاؤنٹنگ اکاؤنٹس کی وضاحت کریں۔ اس کے لیے مینو انٹری %s استعمال کریں۔
+AccountancyAreaDescContrib=STEP %s: خصوصی اخراجات (متفرق ٹیکس) کے لیے پہلے سے طے شدہ اکاؤنٹنگ اکاؤنٹس کی وضاحت کریں۔ اس کے لیے مینو انٹری %s استعمال کریں۔
+AccountancyAreaDescDonation=STEP %s: عطیہ کے لیے ڈیفالٹ اکاؤنٹنگ اکاؤنٹس کی وضاحت کریں۔ اس کے لیے مینو انٹری %s استعمال کریں۔
+AccountancyAreaDescSubscription=STEP %s: ممبر سبسکرپشن کے لیے ڈیفالٹ اکاؤنٹنگ اکاؤنٹس کی وضاحت کریں۔ اس کے لیے مینو انٹری %s استعمال کریں۔
+AccountancyAreaDescMisc=STEP %s: متفرق لین دین کے لیے لازمی ڈیفالٹ اکاؤنٹ اور ڈیفالٹ اکاؤنٹنگ اکاؤنٹس کی وضاحت کریں۔ اس کے لیے مینو انٹری %s استعمال کریں۔
+AccountancyAreaDescLoan=STEP %s: قرضوں کے لیے پہلے سے طے شدہ اکاؤنٹنگ اکاؤنٹس کی وضاحت کریں۔ اس کے لیے مینو انٹری %s استعمال کریں۔
+AccountancyAreaDescBank=STEP %s: ہر بینک اور مالیاتی کھاتوں کے لیے اکاؤنٹنگ اکاؤنٹس اور جرنل کوڈ کی وضاحت کریں۔ اس کے لیے مینو انٹری %s استعمال کریں۔
+AccountancyAreaDescProd=STEP %s: اپنی مصنوعات/سروسز پر اکاؤنٹنگ اکاؤنٹس کی وضاحت کریں۔ اس کے لیے مینو انٹری %s استعمال کریں۔
 
-AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
-AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
+AccountancyAreaDescBind=STEP %s: موجودہ %s لائنوں کے درمیان بائنڈنگ کو چیک کریں اور اکاؤنٹنگ اکاؤنٹ مکمل ہو گیا ہے، لہذا ایپلیکیشن ایک کلک میں لیجر میں لین دین کو جرنلائز کر سکے گی۔ مکمل گمشدہ پابندیاں۔ اس کے لیے مینو انٹری %s استعمال کریں۔
+AccountancyAreaDescWriteRecords=STEP %s: لیجر میں لین دین لکھیں۔ اس کے لیے، مینو میں جائیں <strong> %s </strong>، اور بٹن پر کلک کریں <strong> %s a0a65d07z.
+AccountancyAreaDescAnalyze=STEP %s: موجودہ لین دین کو شامل کریں یا ان میں ترمیم کریں اور رپورٹیں اور برآمدات بنائیں۔
 
-AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
+AccountancyAreaDescClosePeriod=STEP %s: مدت بند کریں تاکہ ہم مستقبل میں ترمیم نہ کر سکیں۔
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
-Selectchartofaccounts=Select active chart of accounts
-ChangeAndLoad=Change and load
-Addanaccount=Add an accounting account
-AccountAccounting=Accounting account
-AccountAccountingShort=Account
-SubledgerAccount=Subledger account
-SubledgerAccountLabel=Subledger account label
-ShowAccountingAccount=Show accounting account
-ShowAccountingJournal=Show accounting journal
-ShowAccountingAccountInLedger=Show accounting account in ledger
-ShowAccountingAccountInJournals=Show accounting account in journals
-AccountAccountingSuggest=Accounting account suggested
-MenuDefaultAccounts=Default accounts
-MenuBankAccounts=Bank accounts
-MenuVatAccounts=Vat accounts
-MenuTaxAccounts=Tax accounts
-MenuExpenseReportAccounts=Expense report accounts
-MenuLoanAccounts=Loan accounts
-MenuProductsAccounts=Product accounts
-MenuClosureAccounts=Closure accounts
-MenuAccountancyClosure=Closure
-MenuAccountancyValidationMovements=Validate movements
-ProductsBinding=Products accounts
-TransferInAccounting=Transfer in accounting
-RegistrationInAccounting=Registration in accounting
-Binding=Binding to accounts
-CustomersVentilation=Customer invoice binding
-SuppliersVentilation=Vendor invoice binding
-ExpenseReportsVentilation=Expense report binding
-CreateMvts=Create new transaction
-UpdateMvts=Modification of a transaction
-ValidTransaction=Validate transaction
-WriteBookKeeping=Register transactions in accounting
-Bookkeeping=Ledger
-BookkeepingSubAccount=Subledger
-AccountBalance=Account balance
-ObjectsRef=Source object ref
-CAHTF=Total purchase vendor before tax
-TotalExpenseReport=Total expense report
-InvoiceLines=Lines of invoices to bind
-InvoiceLinesDone=Bound lines of invoices
-ExpenseReportLines=Lines of expense reports to bind
-ExpenseReportLinesDone=Bound lines of expense reports
-IntoAccount=Bind line with the accounting account
-TotalForAccount=Total accounting account
+TheJournalCodeIsNotDefinedOnSomeBankAccount=سیٹ اپ میں ایک لازمی مرحلہ مکمل نہیں ہوا ہے (اکاؤنٹنگ کوڈ جرنل تمام بینک اکاؤنٹس کے لیے متعین نہیں ہے)
+Selectchartofaccounts=اکاؤنٹس کا فعال چارٹ منتخب کریں۔
+ChangeAndLoad=تبدیل کریں اور لوڈ کریں۔
+Addanaccount=اکاؤنٹنگ اکاؤنٹ شامل کریں۔
+AccountAccounting=حساب کتاب
+AccountAccountingShort=کھاتہ
+SubledgerAccount=سبلیجر اکاؤنٹ
+SubledgerAccountLabel=سبلیجر اکاؤنٹ کا لیبل
+ShowAccountingAccount=حساب کتاب دکھائیں۔
+ShowAccountingJournal=اکاؤنٹنگ جرنل دکھائیں۔
+ShowAccountingAccountInLedger=لیجر میں حساب کتاب دکھائیں۔
+ShowAccountingAccountInJournals=جرائد میں حساب کتاب دکھائیں۔
+AccountAccountingSuggest=اکاؤنٹنگ اکاؤنٹ تجویز کیا گیا۔
+MenuDefaultAccounts=ڈیفالٹ اکاؤنٹس
+MenuBankAccounts=بینک اکاؤنٹ
+MenuVatAccounts=واٹ اکاؤنٹس
+MenuTaxAccounts=ٹیکس اکاؤنٹس
+MenuExpenseReportAccounts=اخراجات کی رپورٹ اکاؤنٹس
+MenuLoanAccounts=قرض کے اکاؤنٹس
+MenuProductsAccounts=پروڈکٹ اکاؤنٹس
+MenuClosureAccounts=بند کرنے والے اکاؤنٹس
+MenuAccountancyClosure=بندش
+MenuAccountancyValidationMovements=نقل و حرکت کی توثیق کریں۔
+ProductsBinding=مصنوعات کے اکاؤنٹس
+TransferInAccounting=اکاؤنٹنگ میں منتقلی
+RegistrationInAccounting=اکاؤنٹنگ میں رجسٹریشن
+Binding=اکاؤنٹس کا پابند
+CustomersVentilation=کسٹمر انوائس بائنڈنگ
+SuppliersVentilation=وینڈر انوائس بائنڈنگ
+ExpenseReportsVentilation=اخراجات کی رپورٹ کا پابند
+CreateMvts=نیا لین دین بنائیں
+UpdateMvts=لین دین میں ترمیم
+ValidTransaction=لین دین کی توثیق کریں۔
+WriteBookKeeping=اکاؤنٹنگ میں لین دین کو رجسٹر کریں۔
+Bookkeeping=لیجر
+BookkeepingSubAccount=ذیلی
+AccountBalance=اکاؤنٹ بیلنس
+ObjectsRef=ماخذ آبجیکٹ ریف
+CAHTF=ٹیکس سے پہلے کل خرید فروش
+TotalExpenseReport=کل اخراجات کی رپورٹ
+InvoiceLines=پابند کرنے کے لیے رسیدوں کی لائنیں۔
+InvoiceLinesDone=رسیدوں کی پابند لائنیں۔
+ExpenseReportLines=پابند کرنے کے لئے اخراجات کی رپورٹوں کی لائنیں
+ExpenseReportLinesDone=اخراجات کی رپورٹوں کی پابند لائنیں۔
+IntoAccount=اکاؤنٹنگ اکاؤنٹ کے ساتھ لائن باندھیں۔
+TotalForAccount=کل حساب کتاب
 
 
-Ventilate=Bind
-LineId=Id line
-Processing=Processing
-EndProcessing=Process terminated.
-SelectedLines=Selected lines
-Lineofinvoice=Line of invoice
-LineOfExpenseReport=Line of expense report
-NoAccountSelected=No accounting account selected
-VentilatedinAccount=Binded successfully to the accounting account
-NotVentilatedinAccount=Not bound to the accounting account
-XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
-XLineFailedToBeBinded=%s products/services were not bound to any accounting account
+Ventilate=باندھنا
+LineId=آئی ڈی لائن
+Processing=پروسیسنگ
+EndProcessing=عمل ختم ہو گیا۔
+SelectedLines=منتخب لائنیں
+Lineofinvoice=انوائس کی لائن
+LineOfExpenseReport=اخراجات کی رپورٹ کی لائن
+NoAccountSelected=کوئی اکاؤنٹنگ اکاؤنٹ منتخب نہیں کیا گیا۔
+VentilatedinAccount=اکاؤنٹنگ اکاؤنٹ میں کامیابی کے ساتھ پابند ہو گیا۔
+NotVentilatedinAccount=حساب کتاب کا پابند نہیں۔
+XLineSuccessfullyBinded=%s مصنوعات/خدمات کامیابی کے ساتھ اکاؤنٹنگ اکاؤنٹ سے منسلک
+XLineFailedToBeBinded=%s مصنوعات/خدمات کسی بھی اکاؤنٹنگ اکاؤنٹ کے پابند نہیں تھے
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=فہرست اور پابند صفحہ پر لائنوں کی زیادہ سے زیادہ تعداد (تجویز کردہ: 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=تازہ ترین عناصر کے ذریعے صفحہ "بائنڈنگ ٹو ڈو" کی چھانٹی شروع کریں۔
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=تازہ ترین عناصر کے ذریعہ صفحہ "بائنڈنگ مکمل" کی چھانٹی شروع کریں۔
 
-ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third-party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
-ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of an accounting account. Needed by some countries (like Switzerland). If set to off (default), you can set the following two parameters to ask the application to add virtual zeros.
-BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
-ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, 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_LENGTH_DESCRIPTION=x حروف کے بعد فہرستوں میں مصنوعات اور خدمات کی تفصیل کو چھوٹا کریں (بہترین = 50)
+ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=x حروف کے بعد فہرستوں میں مصنوعات اور خدمات کے اکاؤنٹ کی تفصیل کا فارم چھوٹا کریں (بہترین = 50)
+ACCOUNTING_LENGTH_GACCOUNT=عام اکاؤنٹنگ اکاؤنٹس کی لمبائی (اگر آپ یہاں قیمت 6 پر سیٹ کرتے ہیں، تو اکاؤنٹ '706' اسکرین پر '706000' کی طرح ظاہر ہوگا)
+ACCOUNTING_LENGTH_AACCOUNT=فریق ثالث کے اکاؤنٹنگ اکاؤنٹس کی لمبائی (اگر آپ یہاں قیمت 6 پر سیٹ کرتے ہیں، تو اکاؤنٹ '401' اسکرین پر '401000' کی طرح ظاہر ہوگا)
+ACCOUNTING_MANAGE_ZERO=اکاؤنٹنگ اکاؤنٹ کے آخر میں زیرو کی مختلف تعداد کا نظم کرنے کی اجازت دیں۔ کچھ ممالک (جیسے سوئٹزرلینڈ) کی ضرورت ہے۔ اگر آف (پہلے سے طے شدہ) پر سیٹ ہے، تو آپ ایپلیکیشن کو ورچوئل زیرو شامل کرنے کے لیے کہنے کے لیے درج ذیل دو پیرامیٹرز سیٹ کر سکتے ہیں۔
+BANK_DISABLE_DIRECT_INPUT=بینک اکاؤنٹ میں لین دین کی براہ راست ریکارڈنگ کو غیر فعال کریں۔
+ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=جرنل پر ڈرافٹ ایکسپورٹ کو فعال کریں۔
+ACCOUNTANCY_COMBO_FOR_AUX=ذیلی اکاؤنٹ کے لیے کومبو لسٹ کو فعال کریں (اگر آپ کے پاس بہت سارے فریق ثالث ہیں تو سست ہو سکتے ہیں، قدر کے کسی حصے پر تلاش کرنے کی صلاحیت کو توڑ دیں)
+ACCOUNTING_DATE_START_BINDING=اکاؤنٹنسی میں بائنڈنگ اور ٹرانسفر شروع کرنے کے لیے تاریخ کی وضاحت کریں۔ اس تاریخ کے نیچے، لین دین کو اکاؤنٹنگ میں منتقل نہیں کیا جائے گا۔
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=اکاؤنٹنسی ٹرانسفر پر، ڈیفالٹ کے مطابق مدت شو کو منتخب کریں۔
 
-ACCOUNTING_SELL_JOURNAL=Sell journal
-ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
-ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
-ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
-ACCOUNTING_SOCIAL_JOURNAL=Social journal
-ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
+ACCOUNTING_SELL_JOURNAL=جریدہ فروخت کریں۔
+ACCOUNTING_PURCHASE_JOURNAL=جریدہ خریدیں۔
+ACCOUNTING_MISCELLANEOUS_JOURNAL=متفرق جریدہ
+ACCOUNTING_EXPENSEREPORT_JOURNAL=اخراجات کی رپورٹ جرنل
+ACCOUNTING_SOCIAL_JOURNAL=سماجی جریدہ
+ACCOUNTING_HAS_NEW_JOURNAL=نیا جریدہ ہے۔
 
-ACCOUNTING_RESULT_PROFIT=Result accounting account (Profit)
-ACCOUNTING_RESULT_LOSS=Result accounting account (Loss)
-ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Journal of closure
+ACCOUNTING_RESULT_PROFIT=نتیجہ اکاؤنٹنگ اکاؤنٹ (منافع)
+ACCOUNTING_RESULT_LOSS=نتیجہ اکاؤنٹنگ اکاؤنٹ (نقصان)
+ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=بندش کا جریدہ
 
-ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transitional bank transfer
-TransitionalAccount=Transitional bank transfer account
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=عبوری بینک ٹرانسفر کا اکاؤنٹنگ اکاؤنٹ
+TransitionalAccount=عبوری بینک ٹرانسفر اکاؤنٹ
 
-ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
-DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
-ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
+ACCOUNTING_ACCOUNT_SUSPENSE=انتظار کا حساب کتاب
+DONATION_ACCOUNTINGACCOUNT=عطیات کو رجسٹر کرنے کے لیے اکاؤنٹنگ اکاؤنٹ
+ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=سبسکرپشنز کو رجسٹر کرنے کے لیے اکاؤنٹنگ اکاؤنٹ
 
-ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=کسٹمر ڈپازٹ کو رجسٹر کرنے کے لیے بطور ڈیفالٹ اکاؤنٹنگ اکاؤنٹ
 
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=خریدی گئی مصنوعات کے لیے بطور ڈیفالٹ اکاؤنٹنگ اکاؤنٹ (اگر پروڈکٹ شیٹ میں وضاحت نہ کی گئی ہو تو استعمال کیا جاتا ہے)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=EEC میں خریدی گئی مصنوعات کے لیے بطور ڈیفالٹ اکاؤنٹنگ اکاؤنٹ (اگر پروڈکٹ شیٹ میں وضاحت نہ کی گئی ہو تو استعمال کیا جاتا ہے)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=خریدی گئی اور EEC سے درآمد شدہ مصنوعات کے لیے بطور ڈیفالٹ اکاؤنٹنگ اکاؤنٹ (اگر پروڈکٹ شیٹ میں وضاحت نہ کی گئی ہو تو استعمال کیا جاتا ہے)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=فروخت شدہ مصنوعات کے لیے بطور ڈیفالٹ اکاؤنٹنگ اکاؤنٹ (اگر پروڈکٹ شیٹ میں وضاحت نہ کی گئی ہو تو استعمال کیا جاتا ہے)
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=EEC میں فروخت ہونے والی مصنوعات کے لیے بطور ڈیفالٹ اکاؤنٹنگ اکاؤنٹ (اگر پروڈکٹ شیٹ میں اس کی وضاحت نہ کی گئی ہو تو استعمال کیا جاتا ہے)
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=EEC سے باہر فروخت اور برآمد کی جانے والی مصنوعات کے لیے بطور ڈیفالٹ اکاؤنٹنگ اکاؤنٹ (اگر پروڈکٹ شیٹ میں وضاحت نہ کی گئی ہو تو استعمال کیا جاتا ہے)
 
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Accounting account by default for the services sold in EEC (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Accounting account by default for the services sold and exported out of EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=خریدی گئی خدمات کے لیے بطور ڈیفالٹ اکاؤنٹنگ اکاؤنٹ (اگر سروس شیٹ میں وضاحت نہ کی گئی ہو تو استعمال کیا جاتا ہے)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=EEC میں خریدی گئی خدمات کے لیے بطور ڈیفالٹ اکاؤنٹنگ اکاؤنٹ (اگر سروس شیٹ میں وضاحت نہ کی گئی ہو تو استعمال کیا جاتا ہے)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=خریدی گئی اور EEC سے درآمد شدہ خدمات کے لیے بطور ڈیفالٹ اکاؤنٹنگ اکاؤنٹ (اگر سروس شیٹ میں وضاحت نہ کی گئی ہو تو استعمال کیا جاتا ہے)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=فروخت شدہ خدمات کے لیے بطور ڈیفالٹ اکاؤنٹنگ اکاؤنٹ (اگر سروس شیٹ میں وضاحت نہ کی گئی ہو تو استعمال کیا جاتا ہے)
+ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=EEC میں فروخت کی جانے والی خدمات کے لیے بطور ڈیفالٹ اکاؤنٹنگ اکاؤنٹ (اگر سروس شیٹ میں وضاحت نہ کی گئی ہو تو استعمال کیا جاتا ہے)
+ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=EEC سے فروخت اور برآمد کی جانے والی خدمات کے لیے بطور ڈیفالٹ اکاؤنٹنگ اکاؤنٹ (اگر سروس شیٹ میں وضاحت نہ کی گئی ہو تو استعمال کیا جاتا ہے)
 
-Doctype=Type of document
-Docdate=Date
-Docref=Reference
-LabelAccount=Label account
-LabelOperation=Label operation
-Sens=Direction
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
-LetteringCode=Lettering code
-Lettering=Lettering
-Codejournal=Journal
-JournalLabel=Journal label
-NumPiece=Piece number
-TransactionNumShort=Num. transaction
-AccountingCategory=Custom group
-GroupByAccountAccounting=Group by general ledger account
-GroupBySubAccountAccounting=Group by subledger account
-AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
-ByAccounts=By accounts
-ByPredefinedAccountGroups=By predefined groups
-ByPersonalizedAccountGroups=By personalized groups
-ByYear=By year
-NotMatch=Not Set
-DeleteMvt=Delete some operation lines from accounting
-DelMonth=Month to delete
-DelYear=Year to delete
-DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
-FinanceJournal=Finance journal
-ExpenseReportsJournal=Expense reports journal
-DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
-VATAccountNotDefined=Account for VAT not defined
-ThirdpartyAccountNotDefined=Account for third party not defined
-ProductAccountNotDefined=Account for product not defined
-FeeAccountNotDefined=Account for fee not defined
-BankAccountNotDefined=Account for bank not defined
-CustomerInvoicePayment=Payment of invoice customer
-ThirdPartyAccount=Third-party account
-NewAccountingMvt=New transaction
-NumMvts=Numero of transaction
-ListeMvts=List of movements
-ErrorDebitCredit=Debit and Credit cannot have a value at the same time
-AddCompteFromBK=Add accounting accounts to the group
-ReportThirdParty=List third-party account
-DescThirdPartyReport=Consult here the list of third-party customers and vendors and their accounting accounts
-ListAccounts=List of the accounting accounts
-UnknownAccountForThirdparty=Unknown third-party account. We will use %s
-UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Subledger account not defined or third party or user unknown. We will use %s
-ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unknown and subledger not defined on the payment. We will keep the subledger account value empty.
-ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Subledger account not defined or third party or user unknown. Blocking error.
-UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
-PaymentsNotLinkedToProduct=Payment not linked to any product / service
-OpeningBalance=Opening balance
-ShowOpeningBalance=Show opening balance
-HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by level
+Doctype=دستاویز کی قسم
+Docdate=تاریخ
+Docref=حوالہ
+LabelAccount=لیبل اکاؤنٹ
+LabelOperation=لیبل آپریشن
+Sens=سمت
+AccountingDirectionHelp=کسی صارف کے اکاؤنٹنگ اکاؤنٹ کے لیے، آپ کو موصول ہونے والی ادائیگی کو ریکارڈ کرنے کے لیے کریڈٹ کا استعمال کریں
+LetteringCode=لیٹرنگ کوڈ
+Lettering=حروف تہجی
+Codejournal=جرنل
+JournalLabel=جرنل لیبل
+NumPiece=ٹکڑا نمبر
+TransactionNumShort=نمبر لین دین
+AccountingCategory=حسب ضرورت گروپ
+GroupByAccountAccounting=عام لیجر اکاؤنٹ کے لحاظ سے گروپ کریں۔
+GroupBySubAccountAccounting=سبلیجر اکاؤنٹ کے لحاظ سے گروپ کریں۔
+AccountingAccountGroupsDesc=آپ یہاں اکاؤنٹنگ اکاؤنٹ کے کچھ گروپس کی وضاحت کر سکتے ہیں۔ وہ ذاتی اکاؤنٹنگ رپورٹس کے لیے استعمال کیے جائیں گے۔
+ByAccounts=حسابات سے
+ByPredefinedAccountGroups=پہلے سے طے شدہ گروپوں کے ذریعے
+ByPersonalizedAccountGroups=ذاتی نوعیت کے گروپوں کے ذریعے
+ByYear=سال کے حساب سے
+NotMatch=سیٹ نہیں ہے
+DeleteMvt=اکاؤنٹنگ سے کچھ آپریشن لائنوں کو حذف کریں۔
+DelMonth=حذف کرنے کا مہینہ
+DelYear=حذف کرنے کا سال
+DelJournal=حذف کرنے کے لیے جرنل
+ConfirmDeleteMvt=یہ سال/ماہ اور/یا کسی مخصوص جریدے کے لیے اکاؤنٹنگ کی تمام آپریشن لائنوں کو حذف کر دے گا (کم از کم ایک معیار درکار ہے)۔ حذف شدہ ریکارڈ کو لیجر میں واپس لانے کے لیے آپ کو '%s' فیچر کو دوبارہ استعمال کرنا ہوگا۔
+ConfirmDeleteMvtPartial=یہ اکاؤنٹنگ سے لین دین کو حذف کر دے گا (اسی لین دین سے متعلق تمام آپریشن لائنوں کو حذف کر دیا جائے گا)
+FinanceJournal=فنانس جرنل
+ExpenseReportsJournal=اخراجات کی رپورٹ کا جریدہ
+DescFinanceJournal=فنانس جرنل بشمول بینک اکاؤنٹ کے ذریعے ادائیگیوں کی تمام اقسام
+DescJournalOnlyBindedVisible=یہ ریکارڈ کا ایک منظر ہے جو اکاؤنٹنگ اکاؤنٹ کے پابند ہیں اور اسے جرنلز اور لیجر میں ریکارڈ کیا جا سکتا ہے۔
+VATAccountNotDefined=VAT کے لیے اکاؤنٹ کی وضاحت نہیں کی گئی ہے۔
+ThirdpartyAccountNotDefined=تیسرے فریق کے اکاؤنٹ کی وضاحت نہیں کی گئی ہے۔
+ProductAccountNotDefined=پروڈکٹ کے اکاؤنٹ کی وضاحت نہیں کی گئی ہے۔
+FeeAccountNotDefined=فیس کے اکاؤنٹ کی وضاحت نہیں کی گئی ہے۔
+BankAccountNotDefined=بینک کے لیے اکاؤنٹ کی وضاحت نہیں کی گئی ہے۔
+CustomerInvoicePayment=انوائس کسٹمر کی ادائیگی
+ThirdPartyAccount=تھرڈ پارٹی اکاؤنٹ
+NewAccountingMvt=نیا لین دین
+NumMvts=لین دین کی تعداد
+ListeMvts=تحریکوں کی فہرست
+ErrorDebitCredit=ڈیبٹ اور کریڈٹ کی ایک ہی وقت میں قدر نہیں ہو سکتی
+AddCompteFromBK=گروپ میں اکاؤنٹنگ اکاؤنٹس شامل کریں۔
+ReportThirdParty=تیسرے فریق کے اکاؤنٹ کی فہرست بنائیں
+DescThirdPartyReport=یہاں تیسرے فریق کے صارفین اور دکانداروں کی فہرست اور ان کے اکاؤنٹنگ اکاؤنٹس سے مشورہ کریں۔
+ListAccounts=اکاؤنٹنگ اکاؤنٹس کی فہرست
+UnknownAccountForThirdparty=نامعلوم تھرڈ پارٹی اکاؤنٹ۔ ہم %s استعمال کریں گے۔
+UnknownAccountForThirdpartyBlocking=نامعلوم تھرڈ پارٹی اکاؤنٹ۔ مسدود کرنے کی خرابی۔
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Subledger اکاؤنٹ کی وضاحت نہیں کی گئی ہے یا فریق ثالث یا صارف نامعلوم ہے۔ ہم %s استعمال کریں گے۔
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=فریق ثالث نامعلوم اور ادائیگی پر متعین نہیں ہے۔ ہم ذیلی اکاؤنٹ کی قیمت کو خالی رکھیں گے۔
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Subledger اکاؤنٹ کی وضاحت نہیں کی گئی ہے یا فریق ثالث یا صارف نامعلوم ہے۔ مسدود کرنے کی خرابی۔
+UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=نامعلوم تھرڈ پارٹی اکاؤنٹ اور ویٹنگ اکاؤنٹ کی وضاحت نہیں کی گئی ہے۔ مسدود کرنے کی خرابی۔
+PaymentsNotLinkedToProduct=ادائیگی کسی پروڈکٹ/سروس سے منسلک نہیں ہے۔
+OpeningBalance=اوپننگ بیلنس
+ShowOpeningBalance=اوپننگ بیلنس دکھائیں۔
+HideOpeningBalance=اوپننگ بیلنس چھپائیں۔
+ShowSubtotalByGroup=سطح کے لحاظ سے ذیلی کل دکھائیں۔
 
-Pcgtype=Group of account
-PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
+Pcgtype=اکاؤنٹ کا گروپ
+PcgtypeDesc=اکاؤنٹ کے گروپ کو کچھ اکاؤنٹنگ رپورٹس کے لیے پہلے سے طے شدہ 'فلٹر' اور 'گروپنگ' کے معیار کے طور پر استعمال کیا جاتا ہے۔ مثال کے طور پر، 'انکم' یا 'خرچ' کو اخراجات/آمدنی کی رپورٹ بنانے کے لیے مصنوعات کے اکاؤنٹنگ اکاؤنٹس کے لیے بطور گروپ استعمال کیا جاتا ہے۔
 
-Reconcilable=Reconcilable
+Reconcilable=قابلِ مصالحت
 
-TotalVente=Total turnover before tax
-TotalMarge=Total sales margin
+TotalVente=ٹیکس سے پہلے کل کاروبار
+TotalMarge=فروخت کا کل مارجن
 
-DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
-DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still have some lines not bound to an account, you will have to make a manual binding from the menu "<strong>%s</strong>".
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
-DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
-ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
+DescVentilCustomer=پروڈکٹ اکاؤنٹنگ اکاؤنٹ سے منسلک (یا نہیں) کسٹمر انوائس لائنوں کی فہرست یہاں دیکھیں
+DescVentilMore=زیادہ تر معاملات میں، اگر آپ پہلے سے طے شدہ مصنوعات یا خدمات استعمال کرتے ہیں اور آپ پروڈکٹ/سروس کارڈ پر اکاؤنٹ نمبر سیٹ کرتے ہیں، تو ایپلیکیشن آپ کے انوائس لائنوں اور آپ کے اکاؤنٹس کے چارٹ کے اکاؤنٹنگ اکاؤنٹ کے درمیان تمام پابندیاں لگانے کے قابل ہو جائے گی۔ بٹن کے ساتھ ایک کلک <strong> "%s" </strong> ۔ اگر اکاؤنٹ کو پروڈکٹ/سروس کارڈز پر سیٹ نہیں کیا گیا تھا یا اگر آپ کے پاس اب بھی کچھ لائنیں ہیں جو اکاؤنٹ سے منسلک نہیں ہیں، تو آپ کو مینو "<strong> %s </strong>" مینو سے دستی بائنڈنگ کرنا ہوگی۔
+DescVentilDoneCustomer=یہاں انوائس کے صارفین کی لائنوں کی فہرست اور ان کے پروڈکٹ اکاؤنٹنگ اکاؤنٹ سے مشورہ کریں۔
+DescVentilTodoCustomer=انوائس لائنوں کو باندھیں جو پہلے سے پروڈکٹ اکاؤنٹنگ اکاؤنٹ کے ساتھ پابند نہیں ہیں۔
+ChangeAccount=درج ذیل اکاؤنٹنگ اکاؤنٹ کے ساتھ منتخب لائنوں کے لیے پروڈکٹ/سروس اکاؤنٹنگ اکاؤنٹ تبدیل کریں:
 Vide=-
-DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account (only record not already transfered in accountancy are visible)
-DescVentilDoneSupplier=Consult here the list of the lines of vendor invoices and their accounting account
-DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
-DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
-DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
-DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
+DescVentilSupplier=یہاں وینڈر انوائس لائنوں کی فہرست سے مشورہ کریں جو کسی پروڈکٹ اکاؤنٹنگ اکاؤنٹ سے منسلک ہیں یا ابھی تک پابند نہیں ہیں (صرف اکاؤنٹنسی میں پہلے سے منتقل نہیں کیا گیا ریکارڈ نظر آتا ہے)
+DescVentilDoneSupplier=یہاں وینڈر انوائس کی لائنوں کی فہرست اور ان کے اکاؤنٹنگ اکاؤنٹ سے مشورہ کریں۔
+DescVentilTodoExpenseReport=اخراجات کی رپورٹ لائنوں کو باندھیں جو فیس اکاؤنٹنگ اکاؤنٹ کے ساتھ پہلے سے پابند نہیں ہیں۔
+DescVentilExpenseReport=فیس اکاؤنٹنگ اکاؤنٹ سے منسلک (یا نہیں) اخراجات کی رپورٹ لائنوں کی فہرست یہاں دیکھیں
+DescVentilExpenseReportMore=اگر آپ اکاؤنٹنگ اکاؤنٹ کو اخراجات کی رپورٹ لائنوں کی قسم پر ترتیب دیتے ہیں، تو ایپلیکیشن آپ کے اخراجات کی رپورٹ لائنوں اور آپ کے اکاؤنٹس کے چارٹ کے اکاؤنٹنگ اکاؤنٹ کے درمیان تمام پابندیاں کرنے کے قابل ہو جائے گی، بٹن <strong> "%s" a0a65d0919 کے ساتھ صرف ایک کلک میں۔ اگر اکاؤنٹ فیس لغت پر سیٹ نہیں کیا گیا تھا یا اگر آپ کے پاس اب بھی کچھ لائنیں ہیں جو کسی اکاؤنٹ سے منسلک نہیں ہیں، تو آپ کو مینو "<strong> %s </strong>" مینو سے دستی بائنڈنگ کرنا ہوگی۔
+DescVentilDoneExpenseReport=یہاں اخراجات کی رپورٹوں کی فہرست اور ان کے فیس اکاؤنٹنگ اکاؤنٹ سے مشورہ کریں۔
 
-Closure=Annual closure
-DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
-OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
-AllMovementsWereRecordedAsValidated=All movements were recorded as validated
-NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
-ValidateMovements=Validate movements
-DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
+Closure=سالانہ بندش
+DescClosure=یہاں ماہ کے لحاظ سے نقل و حرکت کی تعداد سے مشورہ کریں جن کی توثیق نہیں ہوئی اور مالی سال پہلے ہی کھلے ہیں۔
+OverviewOfMovementsNotValidated=مرحلہ 1/ نقل و حرکت کا جائزہ درست نہیں ہے۔ (مالی سال بند کرنا ضروری ہے)
+AllMovementsWereRecordedAsValidated=تمام نقل و حرکت کو توثیق کے طور پر ریکارڈ کیا گیا تھا۔
+NotAllMovementsCouldBeRecordedAsValidated=تمام حرکات کو توثیق کے طور پر ریکارڈ نہیں کیا جا سکتا
+ValidateMovements=نقل و حرکت کی توثیق کریں۔
+DescValidateMovements=تحریر، حروف اور حذف میں کسی قسم کی ترمیم یا حذف ممنوع ہو گا۔ مشق کے لیے تمام اندراجات کی توثیق ہونی چاہیے ورنہ بند کرنا ممکن نہیں ہوگا۔
 
-ValidateHistory=Bind Automatically
-AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
+ValidateHistory=خودکار طور پر باندھیں۔
+AutomaticBindingDone=خودکار بائنڈنگ ہو گئی (%s) - کچھ ریکارڈ کے لیے خودکار بائنڈنگ ممکن نہیں ہے (%s)
 
-ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
-Balancing=Balancing
-FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the Ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
-NoNewRecordSaved=No more record to journalize
-ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
-ChangeBinding=Change the binding
-Accounted=Accounted in ledger
-NotYetAccounted=Not yet transferred to accounting
-ShowTutorial=Show Tutorial
-NotReconciled=Not reconciled
-WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
+ErrorAccountancyCodeIsAlreadyUse=خرابی، آپ اس اکاؤنٹنگ اکاؤنٹ کو حذف نہیں کر سکتے کیونکہ یہ استعمال کیا گیا ہے۔
+MvtNotCorrectlyBalanced=نقل و حرکت درست طریقے سے متوازن نہیں ہے۔ ڈیبٹ = %s | کریڈٹ = %s
+Balancing=توازن
+FicheVentilation=بائنڈنگ کارڈ
+GeneralLedgerIsWritten=لین دین لیجر میں لکھا جاتا ہے۔
+GeneralLedgerSomeRecordWasNotRecorded=کچھ لین دین کو جرنلائز نہیں کیا جا سکا۔ اگر کوئی اور غلطی کا پیغام نہیں ہے، تو شاید اس کی وجہ یہ ہے کہ وہ پہلے ہی جرنلائز ہو چکے تھے۔
+NoNewRecordSaved=جرنلائز کرنے کے لیے مزید کوئی ریکارڈ نہیں۔
+ListOfProductsWithoutAccountingAccount=پروڈکٹس کی فہرست کسی اکاؤنٹنگ اکاؤنٹ کے پابند نہیں ہے۔
+ChangeBinding=بائنڈنگ کو تبدیل کریں۔
+Accounted=لیجر میں حساب
+NotYetAccounted=ابھی تک اکاؤنٹنگ میں منتقل نہیں ہوا ہے۔
+ShowTutorial=ٹیوٹوریل دکھائیں۔
+NotReconciled=صلح نہیں ہوئی۔
+WarningRecordWithoutSubledgerAreExcluded=انتباہ، سبلیجر اکاؤنٹ کے بغیر تمام آپریشنز کو فلٹر کیا گیا ہے اور اس منظر سے خارج کر دیا گیا ہے۔
 
 ## Admin
-BindingOptions=Binding options
-ApplyMassCategories=Apply mass categories
-AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
-CategoryDeleted=Category for the accounting account has been removed
-AccountingJournals=Accounting journals
-AccountingJournal=Accounting journal
-NewAccountingJournal=New accounting journal
-ShowAccountingJournal=Show accounting journal
-NatureOfJournal=Nature of Journal
-AccountingJournalType1=Miscellaneous operations
-AccountingJournalType2=Sales
-AccountingJournalType3=Purchases
-AccountingJournalType4=Bank
-AccountingJournalType5=Expenses report
-AccountingJournalType8=Inventory
-AccountingJournalType9=Has-new
-ErrorAccountingJournalIsAlreadyUse=This journal is already use
-AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
-NumberOfAccountancyEntries=Number of entries
-NumberOfAccountancyMovements=Number of movements
-ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
-ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
-ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
+BindingOptions=بائنڈنگ کے اختیارات
+ApplyMassCategories=بڑے پیمانے پر زمرہ جات کا اطلاق کریں۔
+AddAccountFromBookKeepingWithNoCategories=دستیاب اکاؤنٹ ابھی تک ذاتی نوعیت کے گروپ میں نہیں ہے۔
+CategoryDeleted=اکاؤنٹنگ اکاؤنٹ کے زمرے کو ہٹا دیا گیا ہے۔
+AccountingJournals=اکاؤنٹنگ جرائد
+AccountingJournal=اکاؤنٹنگ جرنل
+NewAccountingJournal=نیا اکاؤنٹنگ جریدہ
+ShowAccountingJournal=اکاؤنٹنگ جرنل دکھائیں۔
+NatureOfJournal=جرنل کی نوعیت
+AccountingJournalType1=متفرق آپریشنز
+AccountingJournalType2=سیلز
+AccountingJournalType3=خریداری
+AccountingJournalType4=بینک
+AccountingJournalType5=اخراجات کی رپورٹ
+AccountingJournalType8=انوینٹری
+AccountingJournalType9=نیا ہے۔
+ErrorAccountingJournalIsAlreadyUse=یہ جریدہ پہلے ہی استعمال میں ہے۔
+AccountingAccountForSalesTaxAreDefinedInto=نوٹ: سیلز ٹیکس کے اکاؤنٹنگ اکاؤنٹ کی وضاحت مینو میں <b> %s </b> - <b> %s a097fz0 a09784a میں کی گئی ہے۔
+NumberOfAccountancyEntries=اندراجات کی تعداد
+NumberOfAccountancyMovements=نقل و حرکت کی تعداد
+ACCOUNTING_DISABLE_BINDING_ON_SALES=سیلز پر اکاؤنٹنسی میں بائنڈنگ اور ٹرانسفر کو غیر فعال کریں (کسٹمر انوائس کو اکاؤنٹنگ میں مدنظر نہیں رکھا جائے گا)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=خریداری پر اکاؤنٹنسی میں بائنڈنگ اور ٹرانسفر کو غیر فعال کریں (وینڈر انوائس کو اکاؤنٹنگ میں مدنظر نہیں رکھا جائے گا)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=اخراجات کی رپورٹوں پر اکاؤنٹنسی میں بائنڈنگ اور ٹرانسفر کو غیر فعال کریں (اکاؤنٹنگ میں اخراجات کی رپورٹوں کو مدنظر نہیں رکھا جائے گا)
 
 ## 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)
-ConfirmExportFile=Confirmation of the generation of the accounting export file ?
-ExportDraftJournal=Export draft journal
-Modelcsv=Model of export
-Selectmodelcsv=Select a model of export
-Modelcsv_normal=Classic export
-Modelcsv_CEGID=Export for CEGID Expert Comptabilité
-Modelcsv_COALA=Export for Sage Coala
-Modelcsv_bob50=Export for Sage BOB 50
-Modelcsv_ciel=Export for Sage50, Ciel Compta or Compta Evo. (Format XIMPORT)
-Modelcsv_quadratus=Export for Quadratus QuadraCompta
-Modelcsv_ebp=Export for EBP
-Modelcsv_cogilog=Export for Cogilog
-Modelcsv_agiris=Export for Agiris Isacompta
-Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
-Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
-Modelcsv_openconcerto=Export for OpenConcerto (Test)
-Modelcsv_configurable=Export CSV Configurable
-Modelcsv_FEC=Export FEC
-Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
-Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
-Modelcsv_winfic=Export for Winfic - eWinfic - WinSis Compta
-Modelcsv_Gestinumv3=Export for Gestinum (v3)
-Modelcsv_Gestinumv5=Export for Gestinum (v5)
-Modelcsv_charlemagne=Export for Aplim Charlemagne
-ChartofaccountsId=Chart of accounts Id
+NotifiedExportDate=برآمد شدہ لائنوں کو ایکسپورٹ کے طور پر جھنڈا لگائیں (لائنوں میں ترمیم ممکن نہیں ہوگی)
+NotifiedValidationDate=برآمد شدہ اندراجات کی توثیق کریں (لائنوں میں ترمیم یا حذف کرنا ممکن نہیں ہوگا)
+ConfirmExportFile=اکاؤنٹنگ برآمد فائل کی نسل کی تصدیق؟
+ExportDraftJournal=ڈرافٹ جرنل برآمد کریں۔
+Modelcsv=ایکسپورٹ کا ماڈل
+Selectmodelcsv=برآمد کا ایک ماڈل منتخب کریں۔
+Modelcsv_normal=کلاسیکی برآمد
+Modelcsv_CEGID=CEGID ماہر Comptabilité کے لیے برآمد کریں۔
+Modelcsv_COALA=سیج کولا کے لیے برآمد کریں۔
+Modelcsv_bob50=سیج BOB 50 کے لیے برآمد کریں۔
+Modelcsv_ciel=Sage50، Ciel Compta یا Compta Evo کے لیے برآمد کریں۔ (فارمیٹ XIMPORT)
+Modelcsv_quadratus=Quadratus QuadraCompta کے لیے برآمد کریں۔
+Modelcsv_ebp=EBP کے لیے برآمد کریں۔
+Modelcsv_cogilog=Cogilog کے لیے برآمد کریں۔
+Modelcsv_agiris=Agiris Isacompta کے لیے برآمد کریں۔
+Modelcsv_LDCompta=LD Compta (v9) (ٹیسٹ) کے لیے برآمد کریں
+Modelcsv_LDCompta10=LD Compta (v10 اور اعلی) کے لیے برآمد کریں
+Modelcsv_openconcerto=OpenConcerto کے لیے برآمد کریں (ٹیسٹ)
+Modelcsv_configurable=CSV قابل ترتیب برآمد کریں۔
+Modelcsv_FEC=ایف ای سی برآمد کریں۔
+Modelcsv_FEC2=ایف ای سی برآمد کریں (تاریخ جنریشن تحریر/دستاویز الٹ کے ساتھ)
+Modelcsv_Sage50_Swiss=سیج 50 سوئٹزرلینڈ کے لیے برآمد کریں۔
+Modelcsv_winfic=Winfic - eWinfic - WinSis Compta کے لیے برآمد کریں۔
+Modelcsv_Gestinumv3=Gestinum کے لیے برآمد کریں (v3)
+Modelcsv_Gestinumv5=Gestinum کے لیے برآمد کریں (v5)
+Modelcsv_charlemagne=Aplim Charlemagne کے لیے برآمد کریں۔
+ChartofaccountsId=اکاؤنٹس کی شناخت کا چارٹ
 
 ## Tools - Init accounting account on product / service
-InitAccountancy=Init accountancy
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
-DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
-DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
-Options=Options
-OptionModeProductSell=Mode sales
-OptionModeProductSellIntra=Mode sales exported in EEC
-OptionModeProductSellExport=Mode sales exported in other countries
-OptionModeProductBuy=Mode purchases
-OptionModeProductBuyIntra=Mode purchases imported in EEC
-OptionModeProductBuyExport=Mode purchased imported from other countries
-OptionModeProductSellDesc=Show all products with accounting account for sales.
-OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
-OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
-OptionModeProductBuyDesc=Show all products with accounting account for purchases.
-OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
-OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
-CleanFixHistory=Remove accounting code from lines that not exists into charts of account
-CleanHistory=Reset all bindings for selected year
-PredefinedGroups=Predefined groups
-WithoutValidAccount=Without valid dedicated account
-WithValidAccount=With valid dedicated account
-ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
-AccountRemovedFromGroup=Account removed from group
-SaleLocal=Local sale
-SaleExport=Export sale
-SaleEEC=Sale in EEC
-SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
-SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
-ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
-ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
+InitAccountancy=اکاؤنٹنسی شروع کریں۔
+InitAccountancyDesc=اس صفحہ کو ان مصنوعات اور خدمات پر اکاؤنٹنگ اکاؤنٹ شروع کرنے کے لیے استعمال کیا جا سکتا ہے جن میں سیلز اور خریداریوں کے لیے اکاؤنٹنگ اکاؤنٹ کی وضاحت نہیں کی گئی ہے۔
+DefaultBindingDesc=اس صفحہ کو پہلے سے طے شدہ اکاؤنٹ سیٹ کرنے کے لیے استعمال کیا جا سکتا ہے تاکہ ادائیگی کی تنخواہوں، عطیہ، ٹیکسوں اور وٹ کے بارے میں لین دین کے ریکارڈ کو جوڑنے کے لیے استعمال کیا جا سکے جب کوئی مخصوص اکاؤنٹنگ اکاؤنٹ پہلے سے سیٹ نہ ہو۔
+DefaultClosureDesc=یہ صفحہ اکاؤنٹنگ بند کرنے کے لیے استعمال ہونے والے پیرامیٹرز کو سیٹ کرنے کے لیے استعمال کیا جا سکتا ہے۔
+Options=اختیارات
+OptionModeProductSell=موڈ سیلز
+OptionModeProductSellIntra=موڈ سیلز EEC میں برآمد کیا گیا۔
+OptionModeProductSellExport=موڈ کی فروخت دوسرے ممالک میں برآمد کی جاتی ہے۔
+OptionModeProductBuy=موڈ خریداری
+OptionModeProductBuyIntra=EEC میں درآمد شدہ موڈ خریداری
+OptionModeProductBuyExport=موڈ دوسرے ممالک سے درآمد شدہ خریدا
+OptionModeProductSellDesc=فروخت کے لیے اکاؤنٹنگ اکاؤنٹ کے ساتھ تمام مصنوعات دکھائیں۔
+OptionModeProductSellIntraDesc=ای ای سی میں فروخت کے لیے اکاؤنٹنگ اکاؤنٹ والی تمام مصنوعات دکھائیں۔
+OptionModeProductSellExportDesc=دیگر غیر ملکی فروخت کے لیے اکاؤنٹنگ اکاؤنٹ کے ساتھ تمام مصنوعات دکھائیں۔
+OptionModeProductBuyDesc=خریداری کے لیے اکاؤنٹنگ اکاؤنٹ کے ساتھ تمام پروڈکٹس دکھائیں۔
+OptionModeProductBuyIntraDesc=EEC میں خریداریوں کے لیے اکاؤنٹنگ اکاؤنٹ والے تمام پروڈکٹس دکھائیں۔
+OptionModeProductBuyExportDesc=دیگر غیر ملکی خریداریوں کے لیے اکاؤنٹنگ اکاؤنٹ کے ساتھ تمام پروڈکٹس دکھائیں۔
+CleanFixHistory=اکاؤنٹنگ کوڈ کو ان لائنوں سے ہٹا دیں جو اکاؤنٹ کے چارٹ میں موجود نہیں ہیں۔
+CleanHistory=منتخب سال کے لیے تمام پابندیاں دوبارہ ترتیب دیں۔
+PredefinedGroups=پہلے سے طے شدہ گروپس
+WithoutValidAccount=درست وقف اکاؤنٹ کے بغیر
+WithValidAccount=درست وقف اکاؤنٹ کے ساتھ
+ValueNotIntoChartOfAccount=اکاؤنٹنگ اکاؤنٹ کی یہ قیمت اکاؤنٹ کے چارٹ میں موجود نہیں ہے۔
+AccountRemovedFromGroup=اکاؤنٹ گروپ سے ہٹا دیا گیا۔
+SaleLocal=مقامی فروخت
+SaleExport=برآمد کی فروخت
+SaleEEC=ای ای سی میں فروخت
+SaleEECWithVAT=VAT کے ساتھ EEC میں فروخت کالعدم نہیں، لہذا ہم سمجھتے ہیں کہ یہ انٹرا کمیونٹری سیل نہیں ہے اور تجویز کردہ اکاؤنٹ معیاری پروڈکٹ اکاؤنٹ ہے۔
+SaleEECWithoutVATNumber=بغیر VAT کے EEC میں فروخت لیکن تیسرے فریق کی VAT ID کی وضاحت نہیں کی گئی ہے۔ ہم معیاری فروخت کے لیے پروڈکٹ اکاؤنٹ پر فال بیک کرتے ہیں۔ اگر ضرورت ہو تو آپ فریق ثالث کی VAT ID یا پروڈکٹ اکاؤنٹ کو ٹھیک کر سکتے ہیں۔
+ForbiddenTransactionAlreadyExported=ممنوع: لین دین کی توثیق اور/یا برآمد کی گئی ہے۔
+ForbiddenTransactionAlreadyValidated=ممنوع: لین دین کی توثیق کر دی گئی ہے۔
 ## Dictionary
-Range=Range of accounting account
-Calculated=Calculated
-Formula=Formula
+Range=اکاؤنٹنگ اکاؤنٹ کی حد
+Calculated=حساب لگایا
+Formula=فارمولا
 
 ## Error
-SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
-ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
-ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
-ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
-ExportNotSupported=The export format setuped is not supported into this page
-BookeppingLineAlreayExists=Lines already existing into bookkeeping
-NoJournalDefined=No journal defined
-Binded=Lines bound
-ToBind=Lines to bind
-UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to make the binding manually
-SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Sorry this module is not compatible with the experimental feature of situation invoices
+SomeMandatoryStepsOfSetupWereNotDone=سیٹ اپ کے کچھ لازمی اقدامات نہیں کیے گئے، براہ کرم انہیں مکمل کریں۔
+ErrorNoAccountingCategoryForThisCountry=ملک %s کے لیے کوئی اکاؤنٹنگ اکاؤنٹ گروپ دستیاب نہیں (دیکھیں ہوم - سیٹ اپ - ڈکشنریز)
+ErrorInvoiceContainsLinesNotYetBounded=آپ انوائس کی کچھ لائنوں کو جرنلائز کرنے کی کوشش کرتے ہیں <strong> %s </strong>، لیکن کچھ دوسری لائنیں ابھی تک اکاؤنٹنگ اکاؤنٹ کے پابند نہیں ہیں۔ اس انوائس کے لیے تمام انوائس لائنوں کی جرنلائزیشن سے انکار کر دیا گیا ہے۔
+ErrorInvoiceContainsLinesNotYetBoundedShort=انوائس پر کچھ لائنیں اکاؤنٹنگ اکاؤنٹ کے پابند نہیں ہیں۔
+ExportNotSupported=ایکسپورٹ فارمیٹ سیٹ اپ اس صفحہ میں تعاون یافتہ نہیں ہے۔
+BookeppingLineAlreayExists=بک کیپنگ میں لائنیں پہلے سے موجود ہیں۔
+NoJournalDefined=کسی جریدے کی وضاحت نہیں کی گئی۔
+Binded=لکیریں جڑی ہوئی ہیں۔
+ToBind=باندھنے کے لیے لکیریں۔
+UseMenuToSetBindindManualy=لائنیں ابھی تک پابند نہیں ہیں، دستی طور پر بائنڈنگ بنانے کے لیے مینو <a href="%s"> %s </a> استعمال کریں۔
+SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=معذرت کے ساتھ یہ ماڈیول حالات کی رسیدوں کی تجرباتی خصوصیت سے مطابقت نہیں رکھتا
 
 ## Import
-ImportAccountingEntries=Accounting entries
-ImportAccountingEntriesFECFormat=Accounting entries - FEC format
-FECFormatJournalCode=Code journal (JournalCode)
-FECFormatJournalLabel=Label journal (JournalLib)
-FECFormatEntryNum=Piece number (EcritureNum)
-FECFormatEntryDate=Piece date (EcritureDate)
-FECFormatGeneralAccountNumber=General account number (CompteNum)
-FECFormatGeneralAccountLabel=General account label (CompteLib)
-FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
-FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
-FECFormatPieceRef=Piece ref (PieceRef)
-FECFormatPieceDate=Piece date creation (PieceDate)
-FECFormatLabelOperation=Label operation (EcritureLib)
-FECFormatDebit=Debit (Debit)
-FECFormatCredit=Credit (Credit)
-FECFormatReconcilableCode=Reconcilable code (EcritureLet)
-FECFormatReconcilableDate=Reconcilable date (DateLet)
-FECFormatValidateDate=Piece date validated (ValidDate)
-FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
-FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+ImportAccountingEntries=اکاؤنٹنگ اندراجات
+ImportAccountingEntriesFECFormat=اکاؤنٹنگ اندراجات - FEC فارمیٹ
+FECFormatJournalCode=کوڈ جرنل (جرنل کوڈ)
+FECFormatJournalLabel=لیبل جرنل (JournalLib)
+FECFormatEntryNum=ٹکڑا نمبر (EcritureNum)
+FECFormatEntryDate=ٹکڑا تاریخ (EcritureDate)
+FECFormatGeneralAccountNumber=جنرل اکاؤنٹ نمبر (CompteNum)
+FECFormatGeneralAccountLabel=جنرل اکاؤنٹ لیبل (CompteLib)
+FECFormatSubledgerAccountNumber=سبلیجر اکاؤنٹ نمبر (CompAuxNum)
+FECFormatSubledgerAccountLabel=سبلیجر اکاؤنٹ نمبر (CompAuxLib)
+FECFormatPieceRef=پیس ریف (پیس ریف)
+FECFormatPieceDate=ٹکڑا تاریخ تخلیق (PieceDate)
+FECFormatLabelOperation=لیبل آپریشن (EcritureLib)
+FECFormatDebit=ڈیبٹ (ڈیبٹ)
+FECFormatCredit=کریڈٹ (کریڈٹ)
+FECFormatReconcilableCode=قابل مصالحت کوڈ (EcritureLet)
+FECFormatReconcilableDate=قابل تجدید تاریخ (DateLet)
+FECFormatValidateDate=ٹکڑا کی توثیق کی تاریخ (درست تاریخ)
+FECFormatMulticurrencyAmount=ملٹی کرنسی کی رقم (Montantdevise)
+FECFormatMulticurrencyCode=ملٹی کرنسی کوڈ (آئیڈیوائز)
 
-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
+DateExport=تاریخ برآمد
+WarningReportNotReliable=انتباہ، یہ رپورٹ لیجر پر مبنی نہیں ہے، لہذا اس میں لیجر میں دستی طور پر ترمیم شدہ لین دین شامل نہیں ہے۔ اگر آپ کی جرنلائزیشن اپ ٹو ڈیٹ ہے، تو بک کیپنگ کا نظریہ زیادہ درست ہے۔
+ExpenseReportJournal=اخراجات کی رپورٹ جرنل
+InventoryJournal=انوینٹری جرنل
 
-NAccounts=%s accounts
+NAccounts=%s اکاؤنٹس
diff --git a/htdocs/langs/ur_PK/admin.lang b/htdocs/langs/ur_PK/admin.lang
index b0e9f37cd36..c74265952bb 100644
--- a/htdocs/langs/ur_PK/admin.lang
+++ b/htdocs/langs/ur_PK/admin.lang
@@ -1,2221 +1,2218 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Bold reference and period in PDF
-BoldLabelOnPDF=Bold label in PDF
-Foundation=Foundation
-Version=Version
-Publisher=Publisher
-VersionProgram=Version program
-VersionLastInstall=Initial install version
-VersionLastUpgrade=Latest version upgrade
-VersionExperimental=Experimental
-VersionDevelopment=Development
-VersionUnknown=Unknown
-VersionRecommanded=Recommended
-FileCheck=Fileset Integrity Checks
-FileCheckDesc=This tool allows you to check the integrity of files and the setup of your application, comparing each file with the official one. The value of some setup constants may also be checked. You can use this tool to determine if any files have been modified (e.g by a hacker).
-FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
-FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files have been added.
-FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
-GlobalChecksum=Global checksum
-MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
-LocalSignature=Embedded local signature (less reliable)
-RemoteSignature=Remote distant signature (more reliable)
-FilesMissing=Missing Files
-FilesUpdated=Updated Files
-FilesModified=Modified Files
-FilesAdded=Added Files
-FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when the application is installed from an official package
-XmlNotFound=Xml Integrity File of application not found
-SessionId=Session ID
-SessionSaveHandler=Handler to save sessions
-SessionSavePath=Session save location
-PurgeSessions=Purge of sessions
-ConfirmPurgeSessions=Do you really want to purge all sessions? This will disconnect every user (except yourself).
-NoSessionListWithThisHandler=Save session handler configured in your PHP does not allow listing all running sessions.
-LockNewSessions=Lock new connections
-ConfirmLockNewSessions=Are you sure you want to restrict any new Dolibarr connection to yourself? Only user <b>%s</b> will be able to connect after that.
-UnlockNewSessions=Remove connection lock
-YourSession=Your session
-Sessions=Users Sessions
-WebUserGroup=Web server user/group
-PermissionsOnFiles=Permissions on files
-PermissionsOnFilesInWebRoot=Permissions on files in web root directory
-PermissionsOnFile=Permissions on file %s
-NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
-DBStoringCharset=Database charset to store data
-DBSortingCharset=Database charset to sort data
-HostCharset=Host charset
-ClientCharset=Client charset
-ClientSortingCharset=Client collation
-WarningModuleNotActive=Module <b>%s</b> must be enabled
-WarningOnlyPermissionOfActivatedModules=Only permissions related to activated modules are shown here. You can activate other modules in the Home->Setup->Modules page.
-DolibarrSetup=Dolibarr install or upgrade
-InternalUser=Internal user
-ExternalUser=External user
-InternalUsers=Internal users
-ExternalUsers=External users
-UserInterface=User interface
-GUISetup=Display
-SetupArea=Setup
-UploadNewTemplate=Upload new template(s)
-FormToTestFileUploadForm=Form to test file upload (according to setup)
-ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
-ModuleIsEnabled=The module/application <b>%s</b> has been enabled
-IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
-RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
-RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
-SecuritySetup=Security setup
-PHPSetup=PHP setup
-OSSetup=OS setup
-SecurityFilesDesc=Define here options related to security about uploading files.
-ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
-ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
-ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> is not supported.
-DictionarySetup=Dictionary setup
-Dictionary=Dictionaries
-ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
-ErrorCodeCantContainZero=Code can't contain value 0
-DisableJavascript=Disable JavaScript and Ajax functions
-DisableJavascriptNote=Note: For test or debug purpose only. For optimization for blind person or text browsers, you may prefer to use the setup on the profile of user
-UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
-NumberOfKeyToSearch=Number of characters to trigger search: %s
-NumberOfBytes=Number of Bytes
-SearchString=Search string
-NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
-AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
-TimesheetPreventAfterFollowingMonths=Prevent recording time spent after the following number of months
-JavascriptDisabled=JavaScript disabled
-UsePreviewTabs=Use preview tabs
-ShowPreview=Show preview
-ShowHideDetails=Show-Hide details
-PreviewNotAvailable=Preview not available
-ThemeCurrentlyActive=Theme currently active
-MySQLTimeZone=TimeZone MySql (database)
-TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
-Space=Space
-Table=Table
-Fields=Fields
-Index=Index
-Mask=Mask
-NextValue=Next value
-NextValueForInvoices=Next value (invoices)
-NextValueForCreditNotes=Next value (credit notes)
-NextValueForDeposit=Next value (down payment)
-NextValueForReplacements=Next value (replacements)
-MustBeLowerThanPHPLimit=Note: your PHP configuration currently limits the maximum filesize for upload to <b>%s</b> %s, irrespective of the value of this parameter
-NoMaxSizeByPHPLimit=Note: No limit is set in your PHP configuration
-MaxSizeForUploadedFiles=Maximum size for uploaded files (0 to disallow any upload)
-UseCaptchaCode=Use graphical code (CAPTCHA) on login page
-AntiVirusCommand=Full path to antivirus command
-AntiVirusCommandExample=Example for ClamAv Daemon (require clamav-daemon): /usr/bin/clamdscan<br>Example for ClamWin (very very slow): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
-AntiVirusParam= More parameters on command line
-AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
-ComptaSetup=Accounting module setup
-UserSetup=User management setup
-MultiCurrencySetup=Multi-currency setup
-MenuLimits=Limits and accuracy
-MenuIdParent=Parent menu ID
-DetailMenuIdParent=ID of parent menu (empty for a top menu)
-ParentID=Parent ID
-DetailPosition=Sort number to define menu position
-AllMenus=All
-NotConfigured=Module/Application not configured
-Active=Active
-SetupShort=Setup
-OtherOptions=Other options
-OtherSetup=Other Setup
-CurrentValueSeparatorDecimal=Decimal separator
-CurrentValueSeparatorThousand=Thousand separator
-Destination=Destination
-IdModule=Module ID
-IdPermissions=Permissions ID
-LanguageBrowserParameter=Parameter %s
-LocalisationDolibarrParameters=Localization parameters
-ClientHour=Client time (user)
-OSTZ=Server OS Time Zone
-PHPTZ=PHP server Time Zone
-DaylingSavingTime=Daylight saving time
-CurrentHour=PHP Time (server)
-CurrentSessionTimeOut=Current session timeout
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a .htaccess file with a line like this "SetEnv TZ Europe/Paris"
-HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but of the timezone of the server.
-Box=Widget
-Boxes=Widgets
-MaxNbOfLinesForBoxes=Max. number of lines for widgets
-AllWidgetsWereEnabled=All available widgets are enabled
-PositionByDefault=Default order
-Position=Position
-MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
-MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.<br>Some modules add menu entries (in menu <b>All</b> mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module.
-MenuForUsers=Menu for users
-LangFile=.lang file
-Language_en_US_es_MX_etc=Language (en_US, es_MX, ...)
-System=System
-SystemInfo=System information
-SystemToolsArea=System tools area
-SystemToolsAreaDesc=This area provides administration functions. Use the menu to choose the required feature.
-Purge=Purge
-PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
-PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete log and temporary files (no risk of losing data)
-PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
-PurgeRunNow=Purge now
-PurgeNothingToDelete=No directory or files to delete.
-PurgeNDirectoriesDeleted=<b>%s</b> files or directories deleted.
-PurgeNDirectoriesFailed=Failed to delete <b>%s</b> files or directories.
-PurgeAuditEvents=Purge all security events
-ConfirmPurgeAuditEvents=Are you sure you want to purge all security events? All security logs will be deleted, no other data will be removed.
-GenerateBackup=Generate backup
-Backup=Backup
-Restore=Restore
-RunCommandSummary=Backup has been launched with the following command
-BackupResult=Backup result
-BackupFileSuccessfullyCreated=Backup file successfully generated
-YouCanDownloadBackupFile=The generated file can now be downloaded
-NoBackupFileAvailable=No backup files available.
-ExportMethod=Export method
-ImportMethod=Import method
-ToBuildBackupFileClickHere=To build a backup file, click <a href="%s">here</a>.
-ImportMySqlDesc=To import a MySQL backup file, you may use phpMyAdmin via your hosting or use the mysql command from the Command line.<br>For example:
-ImportPostgreSqlDesc=To import a backup file, you must use pg_restore command from command line:
+BoldRefAndPeriodOnPDF=پی ڈی ایف میں بولڈ حوالہ اور مدت
+BoldLabelOnPDF=پی ڈی ایف میں بولڈ لیبل
+Foundation=فاؤنڈیشن
+Version=ورژن
+Publisher=پبلشر
+VersionProgram=ورژن پروگرام
+VersionLastInstall=ابتدائی انسٹال ورژن
+VersionLastUpgrade=تازہ ترین ورژن اپ گریڈ
+VersionExperimental=تجرباتی
+VersionDevelopment=ترقی
+VersionUnknown=نامعلوم
+VersionRecommanded=تجویز کردہ
+FileCheck=فائل سیٹ انٹیگریٹی چیک کرتا ہے۔
+FileCheckDesc=یہ ٹول آپ کو ہر فائل کا آفیشل فائل سے موازنہ کرتے ہوئے فائلوں کی سالمیت اور آپ کی ایپلیکیشن کے سیٹ اپ کو چیک کرنے کی اجازت دیتا ہے۔ کچھ سیٹ اپ کنسٹینٹس کی قدر بھی چیک کی جا سکتی ہے۔ آپ اس ٹول کا استعمال اس بات کا تعین کرنے کے لیے کر سکتے ہیں کہ آیا کسی فائل میں ترمیم کی گئی ہے (جیسے ہیکر کے ذریعے)۔
+FileIntegrityIsStrictlyConformedWithReference=فائلوں کی سالمیت حوالہ کے ساتھ سختی سے مطابقت رکھتی ہے۔
+FileIntegrityIsOkButFilesWereAdded=فائلوں کی سالمیت کی جانچ گزر چکی ہے، تاہم کچھ نئی فائلیں شامل کی گئی ہیں۔
+FileIntegritySomeFilesWereRemovedOrModified=فائلوں کی سالمیت کی جانچ ناکام ہوگئی ہے۔ کچھ فائلوں میں ترمیم، ہٹایا یا شامل کیا گیا تھا۔
+GlobalChecksum=عالمی چیکسم
+MakeIntegrityAnalysisFrom=سے درخواست فائلوں کی سالمیت کا تجزیہ کریں۔
+LocalSignature=ایمبیڈڈ مقامی دستخط (کم قابل اعتماد)
+RemoteSignature=دور دراز کے دستخط (زیادہ قابل اعتماد)
+FilesMissing=مسنگ فائلز
+FilesUpdated=اپ ڈیٹ شدہ فائلیں۔
+FilesModified=ترمیم شدہ فائلیں۔
+FilesAdded=فائلیں شامل کی گئیں۔
+FileCheckDolibarr=ایپلی کیشن فائلوں کی سالمیت کی جانچ کریں۔
+AvailableOnlyOnPackagedVersions=سالمیت کی جانچ کے لیے مقامی فائل صرف اس وقت دستیاب ہوتی ہے جب ایپلیکیشن کسی آفیشل پیکج سے انسٹال ہو۔
+XmlNotFound=درخواست کی XML انٹیگریٹی فائل نہیں ملی
+SessionId=سیشن ID
+SessionSaveHandler=سیشن کو بچانے کے لیے ہینڈلر
+SessionSavePath=سیشن محفوظ کریں مقام
+PurgeSessions=سیشنوں کو صاف کرنا
+ConfirmPurgeSessions=کیا آپ واقعی تمام سیشنز کو صاف کرنا چاہتے ہیں؟ یہ ہر صارف (سوائے اپنے آپ کو) منقطع کر دے گا۔
+NoSessionListWithThisHandler=آپ کے پی ایچ پی میں تشکیل شدہ سیشن ہینڈلر کو محفوظ کریں تمام چلنے والے سیشنوں کی فہرست کی اجازت نہیں دیتا ہے۔
+LockNewSessions=نئے کنکشن لاک کریں۔
+ConfirmLockNewSessions=کیا آپ واقعی کسی بھی نئے Dolibarr کنکشن کو اپنے تک محدود کرنا چاہتے ہیں؟ اس کے بعد صرف صارف <b> %s </b> رابطہ کر سکے گا۔
+UnlockNewSessions=کنکشن لاک کو ہٹا دیں۔
+YourSession=آپ کا سیشن
+Sessions=صارفین کے سیشنز
+WebUserGroup=ویب سرور صارف/گروپ
+PermissionsOnFiles=فائلوں پر اجازت
+PermissionsOnFilesInWebRoot=ویب روٹ ڈائرکٹری میں فائلوں پر اجازت
+PermissionsOnFile=فائل %s پر اجازتیں۔
+NoSessionFound=ایسا لگتا ہے کہ آپ کی پی ایچ پی ترتیب فعال سیشنز کی فہرست سازی کی اجازت نہیں دیتی ہے۔ سیشنز کو محفوظ کرنے کے لیے استعمال ہونے والی ڈائرکٹری ( <b> %s </b> ) محفوظ ہو سکتی ہے (مثال کے طور پر OS کی اجازتوں کے ذریعے یا PHP کی ہدایت کے ذریعے open_basedir)۔
+DBStoringCharset=ڈیٹا کو ذخیرہ کرنے کے لیے ڈیٹا بیس کا چارسیٹ
+DBSortingCharset=ڈیٹا کو ترتیب دینے کے لیے ڈیٹا بیس کا چارسیٹ
+HostCharset=میزبان چارسیٹ
+ClientCharset=کلائنٹ چارسیٹ
+ClientSortingCharset=کلائنٹ کولیشن
+WarningModuleNotActive=ماڈیول <b> %s </b> فعال ہونا ضروری ہے
+WarningOnlyPermissionOfActivatedModules=یہاں صرف فعال ماڈیولز سے متعلق اجازتیں دکھائی گئی ہیں۔ آپ ہوم-> سیٹ اپ-> ماڈیولز صفحہ میں دوسرے ماڈیولز کو چالو کر سکتے ہیں۔
+DolibarrSetup=Dolibarr انسٹال یا اپ گریڈ کریں۔
+InternalUser=اندرونی صارف
+ExternalUser=بیرونی صارف
+InternalUsers=اندرونی صارفین
+ExternalUsers=بیرونی صارفین
+UserInterface=یوزر انٹرفیس
+GUISetup=ڈسپلے
+SetupArea=سیٹ اپ
+UploadNewTemplate=نئی ٹیمپلیٹ اپ لوڈ کریں
+FormToTestFileUploadForm=فائل اپ لوڈ کی جانچ کے لیے فارم (سیٹ اپ کے مطابق)
+ModuleMustBeEnabled=ماڈیول/ایپلی کیشن <b> %s </b> فعال ہونا ضروری ہے
+ModuleIsEnabled=ماڈیول/ایپلی کیشن <b> %s </b> کو فعال کر دیا گیا ہے۔
+IfModuleEnabled=نوٹ: ہاں صرف اس صورت میں مؤثر ہے جب ماڈیول <b> %s </b> فعال ہو
+RemoveLock=فائل کو ہٹائیں/اس کا نام تبدیل کریں
+RestoreLock=اپ ڈیٹ/انسٹال ٹول کے مزید کسی بھی استعمال کو غیر فعال کرنے کے لیے، فائل کو بحال کریں
+SecuritySetup=سیکیورٹی سیٹ اپ
+PHPSetup=پی ایچ پی سیٹ اپ
+OSSetup=OS سیٹ اپ
+SecurityFilesDesc=فائلوں کو اپ لوڈ کرنے کے بارے میں سیکورٹی سے متعلق یہاں اختیارات کی وضاحت کریں۔
+ErrorModuleRequirePHPVersion=خرابی، اس ماڈیول کے لیے پی ایچ پی ورژن %s یا اس سے زیادہ کی ضرورت ہے
+ErrorModuleRequireDolibarrVersion=خرابی، اس ماڈیول کو Dolibarr ورژن %s یا اس سے اوپر کی ضرورت ہے
+ErrorDecimalLargerThanAreForbidden=خرابی، <b> %s </b> سے زیادہ درستگی تعاون یافتہ نہیں ہے۔
+DictionarySetup=ڈکشنری سیٹ اپ
+Dictionary=لغتیں
+ErrorReservedTypeSystemSystemAuto=قسم کے لیے 'system' اور 'systemauto' کی قدر محفوظ ہے۔ آپ اپنا ریکارڈ شامل کرنے کے لیے 'صارف' کو بطور قدر استعمال کر سکتے ہیں۔
+ErrorCodeCantContainZero=کوڈ میں قدر 0 نہیں ہو سکتی
+DisableJavascript=جاوا اسکرپٹ اور ایجیکس فنکشنز کو غیر فعال کریں۔
+DisableJavascriptNote=نوٹ: صرف ٹیسٹ یا ڈیبگ مقصد کے لیے۔ نابینا افراد یا ٹیکسٹ براؤزرز کے لیے اصلاح کے لیے، آپ صارف کے پروفائل پر سیٹ اپ استعمال کرنے کو ترجیح دے سکتے ہیں۔
+UseSearchToSelectCompanyTooltip=اس کے علاوہ اگر آپ کے پاس تیسرے فریق (> 100 000) کی ایک بڑی تعداد ہے، تو آپ سیٹ اپ-> دیگر میں مستقل COMPANY_DONOTSEARCH_ANYWHERE کو 1 پر سیٹ کرکے رفتار بڑھا سکتے ہیں۔ تلاش پھر سٹرنگ کے آغاز تک محدود ہو جائے گی۔
+UseSearchToSelectContactTooltip=اس کے علاوہ اگر آپ کے پاس تیسرے فریق (> 100 000) کی بڑی تعداد ہے، تو آپ سیٹ اپ-> دیگر میں مسلسل CONTACT_DONOTSEARCH_ANYWHERE کو 1 پر سیٹ کرکے رفتار بڑھا سکتے ہیں۔ تلاش پھر سٹرنگ کے آغاز تک محدود ہو جائے گی۔
+DelaiedFullListToSelectCompany=تھرڈ پارٹیز کومبو لسٹ کا مواد لوڈ کرنے سے پہلے ایک کلید دبانے تک انتظار کریں۔ <br> اگر آپ کے پاس تیسرے فریق کی بڑی تعداد ہے تو یہ کارکردگی میں اضافہ کر سکتا ہے، لیکن یہ کم آسان ہے۔
+DelaiedFullListToSelectContact=رابطہ کامبو لسٹ کا مواد لوڈ کرنے سے پہلے ایک کلید دبانے تک انتظار کریں۔ <br> اگر آپ کے پاس بہت زیادہ رابطے ہیں تو یہ کارکردگی کو بڑھا سکتا ہے، لیکن یہ کم آسان ہے۔
+NumberOfKeyToSearch=تلاش کو متحرک کرنے کے لیے حروف کی تعداد: %s
+NumberOfBytes=بائٹس کی تعداد
+SearchString=تلاش کی تار
+NotAvailableWhenAjaxDisabled=Ajax کے غیر فعال ہونے پر دستیاب نہیں ہے۔
+AllowToSelectProjectFromOtherCompany=تیسرے فریق کی دستاویز پر، کسی دوسرے تیسرے فریق سے منسلک پروجیکٹ کا انتخاب کر سکتے ہیں۔
+TimesheetPreventAfterFollowingMonths=درج ذیل مہینوں کے بعد گزارے گئے ریکارڈنگ کے وقت کو روکیں۔
+JavascriptDisabled=جاوا اسکرپٹ غیر فعال ہے۔
+UsePreviewTabs=پیش نظارہ ٹیبز استعمال کریں۔
+ShowPreview=پیش نظارہ دکھائیں۔
+ShowHideDetails=تفصیلات دکھائیں-چھپائیں۔
+PreviewNotAvailable=پیش نظارہ دستیاب نہیں ہے۔
+ThemeCurrentlyActive=تھیم فی الحال فعال ہے۔
+MySQLTimeZone=ٹائم زون MySql (ڈیٹا بیس)
+TZHasNoEffect=تاریخوں کو ڈیٹا بیس سرور کے ذریعہ ذخیرہ کیا جاتا ہے اور واپس کیا جاتا ہے گویا وہ جمع کردہ سٹرنگ کے طور پر رکھی گئی ہیں۔ ٹائم زون کا اثر صرف اس وقت ہوتا ہے جب UNIX_TIMESTAMP فنکشن استعمال کیا جائے (جو Dolibarr کو استعمال نہیں کرنا چاہیے، اس لیے ڈیٹا بیس TZ کا کوئی اثر نہیں ہونا چاہیے، چاہے ڈیٹا داخل کرنے کے بعد تبدیل ہو جائے)۔
+Space=خلا
+Table=ٹیبل
+Fields=فیلڈز
+Index=انڈیکس
+Mask=ماسک
+NextValue=اگلی قیمت
+NextValueForInvoices=اگلی قیمت (انوائسز)
+NextValueForCreditNotes=اگلی قیمت (کریڈٹ نوٹس)
+NextValueForDeposit=اگلی قیمت (نیچے ادائیگی)
+NextValueForReplacements=اگلی قدر (متبادل)
+MustBeLowerThanPHPLimit=نوٹ: آپ کی PHP کنفیگریشن فی الحال <b> %s </b> %s پر اپ لوڈ کرنے کے لیے زیادہ سے زیادہ فائل سائز کو محدود کرتی ہے، اس پیرامیٹر کی قدر سے قطع نظر
+NoMaxSizeByPHPLimit=نوٹ: آپ کی پی ایچ پی کی ترتیب میں کوئی حد مقرر نہیں ہے۔
+MaxSizeForUploadedFiles=اپ لوڈ کردہ فائلوں کے لیے زیادہ سے زیادہ سائز (0 کسی بھی اپ لوڈ کی اجازت نہ دینے کے لیے)
+UseCaptchaCode=لاگ ان پیج پر گرافیکل کوڈ (کیپچا) استعمال کریں۔
+AntiVirusCommand=اینٹی وائرس کمانڈ کا مکمل راستہ
+AntiVirusCommandExample=ClamAv ڈیمون کی مثال (کلاماو ڈیمون کی ضرورت ہے): /usr/bin/clamdscan <br> کلیم ون کی مثال (بہت سست): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
+AntiVirusParam= کمانڈ لائن پر مزید پیرامیٹرز
+AntiVirusParamExample=ClamAv ڈیمون کے لئے مثال: --fdpass <br> ClamWin کے لئے مثال: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+ComptaSetup=اکاؤنٹنگ ماڈیول سیٹ اپ
+UserSetup=یوزر مینجمنٹ سیٹ اپ
+MultiCurrencySetup=ملٹی کرنسی سیٹ اپ
+MenuLimits=حدود اور درستگی
+MenuIdParent=پیرنٹ مینو ID
+DetailMenuIdParent=پیرنٹ مینو کی ID (ٹاپ مینو کے لیے خالی)
+ParentID=والدین کی شناخت
+DetailPosition=مینو پوزیشن کی وضاحت کے لیے نمبر ترتیب دیں۔
+AllMenus=تمام
+NotConfigured=ماڈیول/ایپلی کیشن کنفیگر نہیں ہے۔
+Active=فعال
+SetupShort=سیٹ اپ
+OtherOptions=دوسرے اختیارات
+OtherSetup=دیگر سیٹ اپ
+CurrentValueSeparatorDecimal=اعشاریہ الگ کرنے والا
+CurrentValueSeparatorThousand=ہزار الگ کرنے والا
+Destination=منزل
+IdModule=ماڈیول ID
+IdPermissions=اجازتوں کی شناخت
+LanguageBrowserParameter=پیرامیٹر %s
+LocalisationDolibarrParameters=لوکلائزیشن کے پیرامیٹرز
+ClientHour=کلائنٹ کا وقت (صارف)
+OSTZ=سرور OS ٹائم زون
+PHPTZ=پی ایچ پی سرور ٹائم زون
+DaylingSavingTime=دن کی روشنی کی بچت کا وقت
+CurrentHour=پی ایچ پی ٹائم (سرور)
+CurrentSessionTimeOut=موجودہ سیشن کا ٹائم آؤٹ
+YouCanEditPHPTZ=ایک مختلف پی ایچ پی ٹائم زون سیٹ کرنے کے لیے (ضروری نہیں)، آپ .htaccess فائل کو "SetEnv TZ Europe/Paris" جیسی لائن کے ساتھ شامل کرنے کی کوشش کر سکتے ہیں۔
+HoursOnThisPageAreOnServerTZ=وارننگ، دوسری اسکرینوں کے برعکس، اس صفحہ پر گھنٹے آپ کے مقامی ٹائم زون میں نہیں ہیں، بلکہ سرور کے ٹائم زون میں ہیں۔
+Box=ویجیٹ
+Boxes=وجیٹس
+MaxNbOfLinesForBoxes=زیادہ سے زیادہ ویجٹ کے لیے لائنوں کی تعداد
+AllWidgetsWereEnabled=تمام دستیاب وجیٹس فعال ہیں۔
+PositionByDefault=پہلے سے طے شدہ آرڈر
+Position=پوزیشن
+MenusDesc=مینو مینیجر دو مینو بارز (افقی اور عمودی) کا مواد سیٹ کرتے ہیں۔
+MenusEditorDesc=مینو ایڈیٹر آپ کو اپنی مرضی کے مینو اندراجات کی وضاحت کرنے کی اجازت دیتا ہے۔ عدم استحکام اور مستقل طور پر ناقابل رسائی مینو اندراجات سے بچنے کے لیے اسے احتیاط سے استعمال کریں۔ <br> کچھ ماڈیولز مینو اندراجات شامل کرتے ہیں (مینو میں <b> All </b> زیادہ تر)۔ اگر آپ غلطی سے ان میں سے کچھ اندراجات کو ہٹا دیتے ہیں، تو آپ ماڈیول کو غیر فعال اور دوبارہ فعال کر کے انہیں بحال کر سکتے ہیں۔
+MenuForUsers=صارفین کے لیے مینو
+LangFile=.lang فائل
+Language_en_US_es_MX_etc=زبان (en_US, es_MX, ...)
+System=سسٹم
+SystemInfo=سسٹم کی معلومات
+SystemToolsArea=سسٹم ٹولز ایریا
+SystemToolsAreaDesc=یہ علاقہ انتظامیہ کے افعال فراہم کرتا ہے۔ مطلوبہ خصوصیت کو منتخب کرنے کے لیے مینو کا استعمال کریں۔
+Purge=صاف کرنا
+PurgeAreaDesc=یہ صفحہ آپ کو Dolibarr (عارضی فائلیں یا <b> %s </b> ڈائرکٹری میں موجود تمام فائلیں) کی تخلیق یا ذخیرہ کردہ تمام فائلوں کو حذف کرنے کی اجازت دیتا ہے۔ اس خصوصیت کا استعمال عام طور پر ضروری نہیں ہے۔ یہ ان صارفین کے لیے ایک کام کے طور پر فراہم کیا گیا ہے جن کے ڈولیبار کو ایک ایسے فراہم کنندہ کے ذریعے میزبانی کی گئی ہے جو ویب سرور کے ذریعے تیار کردہ فائلوں کو حذف کرنے کی اجازت نہیں دیتا ہے۔
+PurgeDeleteLogFile=لاگ فائلوں کو حذف کریں، بشمول <b> %s </b> Syslog ماڈیول کے لیے بیان کردہ (ڈیٹا کھونے کا کوئی خطرہ نہیں)
+PurgeDeleteTemporaryFiles=تمام لاگ اور عارضی فائلوں کو حذف کریں (ڈیٹا کھونے کا کوئی خطرہ نہیں)۔ پیرامیٹر 'tempfilesold'، 'logfiles' یا دونوں 'tempfilesold+logfiles' ہو سکتا ہے۔ نوٹ: عارضی فائلوں کو حذف کرنا صرف اس صورت میں کیا جاتا ہے جب عارضی ڈائریکٹری 24 گھنٹے سے زیادہ پہلے بنائی گئی ہو۔
+PurgeDeleteTemporaryFilesShort=لاگ اور عارضی فائلوں کو حذف کریں (ڈیٹا کھونے کا کوئی خطرہ نہیں)
+PurgeDeleteAllFilesInDocumentsDir=ڈائریکٹری میں موجود تمام فائلوں کو حذف کریں: <b> %s </b> ۔ <br> یہ عناصر سے متعلق تمام تیار کردہ دستاویزات (تیسرے فریق، انوائسز وغیرہ...)، ECM ماڈیول میں اپ لوڈ کردہ فائلیں، ڈیٹا بیس بیک اپ ڈمپ اور عارضی فائلوں کو حذف کر دے گا۔
+PurgeRunNow=ابھی صاف کریں۔
+PurgeNothingToDelete=حذف کرنے کے لیے کوئی ڈائریکٹری یا فائلیں نہیں ہیں۔
+PurgeNDirectoriesDeleted= <b> %s </b> فائلیں یا ڈائریکٹریز حذف کردی گئیں۔
+PurgeNDirectoriesFailed=<b> %s </b> فائلوں یا ڈائریکٹریز کو حذف کرنے میں ناکام۔
+PurgeAuditEvents=تمام حفاظتی واقعات کو صاف کریں۔
+ConfirmPurgeAuditEvents=کیا آپ واقعی تمام سیکیورٹی ایونٹس کو صاف کرنا چاہتے ہیں؟ تمام سیکورٹی لاگز کو حذف کر دیا جائے گا، کوئی دوسرا ڈیٹا نہیں ہٹایا جائے گا۔
+GenerateBackup=بیک اپ بنائیں
+Backup=بیک اپ
+Restore=بحال کریں۔
+RunCommandSummary=بیک اپ کو درج ذیل کمانڈ کے ساتھ لانچ کیا گیا ہے۔
+BackupResult=بیک اپ نتیجہ
+BackupFileSuccessfullyCreated=بیک اپ فائل کامیابی کے ساتھ تیار ہو گئی۔
+YouCanDownloadBackupFile=تیار کردہ فائل کو اب ڈاؤن لوڈ کیا جا سکتا ہے۔
+NoBackupFileAvailable=کوئی بیک اپ فائلیں دستیاب نہیں ہیں۔
+ExportMethod=برآمد کا طریقہ
+ImportMethod=درآمد کا طریقہ
+ToBuildBackupFileClickHere=بیک اپ فائل بنانے کے لیے، <a href="%s"> یہاں </a> پر کلک کریں۔
+ImportMySqlDesc=MySQL بیک اپ فائل درآمد کرنے کے لیے، آپ اپنی ہوسٹنگ کے ذریعے phpMyAdmin استعمال کر سکتے ہیں یا کمانڈ لائن سے mysql کمانڈ استعمال کر سکتے ہیں۔ <br> مثال کے طور پر:
+ImportPostgreSqlDesc=بیک اپ فائل درآمد کرنے کے لیے، آپ کو کمانڈ لائن سے pg_restore کمانڈ استعمال کرنا ہوگی۔
 ImportMySqlCommand=%s %s < mybackupfile.sql
 ImportPostgreSqlCommand=%s %s mybackupfile.sql
-FileNameToGenerate=Filename for backup:
-Compression=Compression
-CommandsToDisableForeignKeysForImport=Command to disable foreign keys on import
-CommandsToDisableForeignKeysForImportWarning=Mandatory if you want to be able to restore your sql dump later
-ExportCompatibility=Compatibility of generated export file
-ExportUseMySQLQuickParameter=Use the --quick parameter
-ExportUseMySQLQuickParameterHelp=The '--quick' parameter helps limit RAM consumption for large tables.
-MySqlExportParameters=MySQL export parameters
-PostgreSqlExportParameters= PostgreSQL export parameters
-UseTransactionnalMode=Use transactional mode
-FullPathToMysqldumpCommand=Full path to mysqldump command
-FullPathToPostgreSQLdumpCommand=Full path to pg_dump command
-AddDropDatabase=Add DROP DATABASE command
-AddDropTable=Add DROP TABLE command
-ExportStructure=Structure
-NameColumn=Name columns
-ExtendedInsert=Extended INSERT
-NoLockBeforeInsert=No lock commands around INSERT
-DelayedInsert=Delayed insert
-EncodeBinariesInHexa=Encode binary data in hexadecimal
-IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
-AutoDetectLang=Autodetect (browser language)
-FeatureDisabledInDemo=Feature disabled in demo
-FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
-OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button <span class="small valignmiddle">%s</span> of each module to enable or disable a module/application.
-ModulesDesc2=Click the wheel button <span class="small valignmiddle">%s</span> to configure the module/application.
-ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
-ModulesMarketPlaces=Find external app/modules
-ModulesDevelopYourModule=Develop your own app/modules
-ModulesDevelopDesc=You may also develop your own module or find a partner to develop one for you.
-DOLISTOREdescriptionLong=Instead of switching on <a href="https://www.dolistore.com">www.dolistore.com</a> web site to find an external module, you can use this embedded tool that will perform the search on the external market place for you (may be slow, need an internet access)...
-NewModule=New module
-FreeModule=Free
-CompatibleUpTo=Compatible with version %s
-NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s - Max %s).
-CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
-SeeInMarkerPlace=See in Market place
-SeeSetupOfModule=See setup of module %s
-SetOptionTo=Set option <b>%s</b> to %s
-Updated=Updated
-AchatTelechargement=Buy / Download
-GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
-DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
-DoliPartnersDesc=List of companies providing custom-developed modules or features.<br>Note: since Dolibarr is an open source application, <i>anyone</i> experienced in PHP programming should be able to develop a module.
-WebSiteDesc=External websites for more add-on (non-core) modules...
-DevelopYourModuleDesc=Some solutions to develop your own module...
+FileNameToGenerate=بیک اپ کے لیے فائل کا نام:
+Compression=کمپریشن
+CommandsToDisableForeignKeysForImport=درآمد پر غیر ملکی کلیدوں کو غیر فعال کرنے کا حکم
+CommandsToDisableForeignKeysForImportWarning=لازمی ہے اگر آپ بعد میں اپنے ایس کیو ایل ڈمپ کو بحال کرنے کے قابل ہونا چاہتے ہیں۔
+ExportCompatibility=تیار کردہ برآمد فائل کی مطابقت
+ExportUseMySQLQuickParameter=--quick پیرامیٹر استعمال کریں۔
+ExportUseMySQLQuickParameterHelp='--quick' پیرامیٹر بڑی میزوں کے لیے RAM کی کھپت کو محدود کرنے میں مدد کرتا ہے۔
+MySqlExportParameters=MySQL برآمدی پیرامیٹرز
+PostgreSqlExportParameters= PostgreSQL برآمدی پیرامیٹرز
+UseTransactionnalMode=لین دین کا موڈ استعمال کریں۔
+FullPathToMysqldumpCommand=mysqldump کمانڈ کا مکمل راستہ
+FullPathToPostgreSQLdumpCommand=pg_dump کمانڈ کا مکمل راستہ
+AddDropDatabase=ڈراپ ڈیٹا بیس کمانڈ شامل کریں۔
+AddDropTable=ڈراپ ٹیبل کمانڈ شامل کریں۔
+ExportStructure=ساخت
+NameColumn=کالموں کو نام دیں۔
+ExtendedInsert=توسیعی INSERT
+NoLockBeforeInsert=INSERT کے ارد گرد کوئی لاک کمانڈ نہیں ہے۔
+DelayedInsert=تاخیر سے داخل کرنا
+EncodeBinariesInHexa=بائنری ڈیٹا کو ہیکساڈیسیمل میں انکوڈ کریں۔
+IgnoreDuplicateRecords=ڈپلیکیٹ ریکارڈ کی غلطیوں کو نظر انداز کریں (INSERT IGNORE)
+AutoDetectLang=آٹو ڈیٹیکٹ (براؤزر کی زبان)
+FeatureDisabledInDemo=ڈیمو میں خصوصیت غیر فعال ہے۔
+FeatureAvailableOnlyOnStable=خصوصیت صرف سرکاری مستحکم ورژن پر دستیاب ہے۔
+BoxesDesc=وجیٹس وہ اجزاء ہوتے ہیں جو کچھ معلومات دکھاتے ہیں جنہیں آپ کچھ صفحات کو ذاتی بنانے کے لیے شامل کر سکتے ہیں۔ آپ ٹارگٹ پیج کو منتخب کرکے اور 'ایکٹیویٹ' پر کلک کرکے، یا اسے غیر فعال کرنے کے لیے کوڑے دان پر کلک کرکے ویجیٹ کو دکھانے یا نہ دکھانے کے درمیان انتخاب کرسکتے ہیں۔
+OnlyActiveElementsAreShown=صرف <a href="%s"> فعال ماڈیولز </a> کے عناصر دکھائے گئے ہیں۔
+ModulesDesc=ماڈیولز/ایپلی کیشنز اس بات کا تعین کرتے ہیں کہ سافٹ ویئر میں کون سی خصوصیات دستیاب ہیں۔ کچھ ماڈیولز کو ماڈیول کو چالو کرنے کے بعد صارفین کو اجازت دینے کی ضرورت ہوتی ہے۔ کسی ماڈیول/ایپلی کیشن کو فعال یا غیر فعال کرنے کے لیے ہر ماڈیول کے آن/آف بٹن <span class="small valignmiddle"> %s </span> پر کلک کریں۔
+ModulesDesc2=ماڈیول/ایپلی کیشن کو ترتیب دینے کے لیے وہیل بٹن <span class="small valignmiddle"> %s </span> پر کلک کریں۔
+ModulesMarketPlaceDesc=آپ انٹرنیٹ پر بیرونی ویب سائٹس پر ڈاؤن لوڈ کرنے کے لیے مزید ماڈیولز تلاش کر سکتے ہیں...
+ModulesDeployDesc=اگر آپ کے فائل سسٹم پر اجازتیں اس کی اجازت دیتی ہیں، تو آپ اس ٹول کو ایک بیرونی ماڈیول تعینات کرنے کے لیے استعمال کر سکتے ہیں۔ اس کے بعد ماڈیول <strong> %s </strong> ٹیب پر نظر آئے گا۔
+ModulesMarketPlaces=بیرونی ایپ/ماڈیولز تلاش کریں۔
+ModulesDevelopYourModule=اپنی خود کی ایپ/ماڈیول تیار کریں۔
+ModulesDevelopDesc=آپ اپنا ماڈیول بھی تیار کر سکتے ہیں یا آپ کے لیے تیار کرنے کے لیے کوئی پارٹنر تلاش کر سکتے ہیں۔
+DOLISTOREdescriptionLong=بیرونی ماڈیول تلاش کرنے کے لیے <a href="https://www.dolistore.com"> www.dolistore.com </a> ویب سائٹ پر سوئچ کرنے کے بجائے، آپ اس ایمبیڈڈ ٹول کا استعمال کر سکتے ہیں جو آپ کے لیے بیرونی بازار کی جگہ پر تلاش کرے گا (سست ہو سکتا ہے، انٹرنیٹ تک رسائی کی ضرورت ہے)...
+NewModule=نیا ماڈیول
+FreeModule=مفت
+CompatibleUpTo=ورژن %s کے ساتھ ہم آہنگ
+NotCompatible=یہ ماڈیول آپ کے Dolibarr %s (Min %s - Max %s) کے ساتھ مطابقت نہیں رکھتا۔
+CompatibleAfterUpdate=اس ماڈیول کو آپ کے Dolibarr %s (Min %s - زیادہ سے زیادہ %s) میں اپ ڈیٹ کی ضرورت ہے۔
+SeeInMarkerPlace=بازار میں دیکھیں
+SeeSetupOfModule=ماڈیول %s کا سیٹ اپ دیکھیں
+SetOptionTo=آپشن <b> %s </b> کو %s پر سیٹ کریں
+Updated=اپ ڈیٹ
+AchatTelechargement=خریدیں / ڈاؤن لوڈ کریں۔
+GoModuleSetupArea=ایک نیا ماڈیول تعینات/انسٹال کرنے کے لیے، ماڈیول سیٹ اپ ایریا پر جائیں: <a href="%s"> %s </a> ۔
+DoliStoreDesc=DoliStore، Dolibarr ERP/CRM بیرونی ماڈیولز کے لیے آفیشل مارکیٹ پلیس
+DoliPartnersDesc=اپنی مرضی کے مطابق تیار کردہ ماڈیولز یا خصوصیات فراہم کرنے والی کمپنیوں کی فہرست۔ <br> نوٹ: چونکہ Dolibarr ایک اوپن سورس ایپلی کیشن ہے، <i> کوئی بھی </i> جو PHP پروگرامنگ میں تجربہ کار ہے ماڈیول تیار کرنے کے قابل ہونا چاہیے۔
+WebSiteDesc=مزید ایڈ آن (نان کور) ماڈیولز کے لیے بیرونی ویب سائٹس...
+DevelopYourModuleDesc=اپنے ماڈیول کو تیار کرنے کے لیے کچھ حل...
 URL=URL
-RelativeURL=Relative URL
-BoxesAvailable=Widgets available
-BoxesActivated=Widgets activated
-ActivateOn=Activate on
-ActiveOn=Activated on
-ActivatableOn=Activatable on
-SourceFile=Source file
-AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
-Required=Required
-UsedOnlyWithTypeOption=Used by some agenda option only
-Security=Security
-Passwords=Passwords
-DoNotStoreClearPassword=Encrypt passwords stored in database (NOT as plain-text). It is strongly recommended to activate this option.
-MainDbPasswordFileConfEncrypted=Encrypt database password stored in conf.php. It is strongly recommended to activate this option.
-InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
-InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
-ProtectAndEncryptPdfFiles=Protect generated PDF files. This is NOT recommended as it breaks bulk PDF generation.
-ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature makes building of a global merged PDFs not working.
-Feature=Feature
-DolibarrLicense=License
-Developpers=Developers/contributors
-OfficialWebSite=Dolibarr official web site
-OfficialWebSiteLocal=Local web site (%s)
-OfficialWiki=Dolibarr documentation / Wiki
-OfficialDemo=Dolibarr online demo
-OfficialMarketPlace=Official market place for external modules/addons
-OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
-ReferencedPreferredPartners=Preferred Partners
-OtherResources=Other resources
-ExternalResources=External Resources
-SocialNetworks=Social Networks
-SocialNetworkId=Social Network ID
-ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank" rel="noopener noreferrer">%s</a></b>
-ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank" rel="noopener noreferrer">%s</a></b>
-HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
-HelpCenterDesc2=Some of these resources are only available in <b>english</b>.
-CurrentMenuHandler=Current menu handler
-MeasuringUnit=Measuring unit
-LeftMargin=Left margin
-TopMargin=Top margin
-PaperSize=Paper type
-Orientation=Orientation
-SpaceX=Space X
-SpaceY=Space Y
-FontSize=Font size
-Content=Content
-ContentForLines=Content to display for each product or service (from variable __LINES__ of Content)
-NoticePeriod=Notice period
-NewByMonth=New by month
-Emails=Emails
-EMailsSetup=Emails setup
-EMailsDesc=This page allows you to set parameters or options for email sending.
-EmailSenderProfiles=Emails sender profiles
-EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
-MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (default value in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (default value in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix-like systems)
-MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix-like systems)
-MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (default value in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used for error returns emails (fields 'Errors-To' in emails sent)
-MAIN_MAIL_AUTOCOPY_TO= Copy (Bcc) all sent emails to
-MAIN_DISABLE_ALL_MAILS=Disable all email sending (for test purposes or demos)
-MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
-MAIN_MAIL_ENABLED_USER_DEST_SELECT=Suggest emails of employees (if defined) into the list of predefined recipient when writing a new email
-MAIN_MAIL_SENDMODE=Email sending method
-MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
-MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
-MAIN_MAIL_EMAIL_TLS=Use TLS (SSL) encryption
-MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
-MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
-MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
-MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
-MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
-MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Private key for dkim signing
-MAIN_DISABLE_ALL_SMS=Disable all SMS sending (for test purposes or demos)
-MAIN_SMS_SENDMODE=Method to use to send SMS
-MAIN_MAIL_SMS_FROM=Default sender phone number for SMS sending
-MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email or Company email)
-UserEmail=User email
-CompanyEmail=Company Email
-FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally.
-FixOnTransifex=Fix the translation on the online translation platform of project
-SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
-ModuleSetup=Module setup
-ModulesSetup=Modules/Application setup
-ModuleFamilyBase=System
-ModuleFamilyCrm=Customer Relationship Management (CRM)
-ModuleFamilySrm=Vendor Relationship Management (VRM)
-ModuleFamilyProducts=Product Management (PM)
-ModuleFamilyHr=Human Resource Management (HR)
-ModuleFamilyProjects=Projects/Collaborative work
-ModuleFamilyOther=Other
-ModuleFamilyTechnic=Multi-modules tools
-ModuleFamilyExperimental=Experimental modules
-ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
-ModuleFamilyECM=Electronic Content Management (ECM)
-ModuleFamilyPortal=Websites and other frontal application
-ModuleFamilyInterface=Interfaces with external systems
-MenuHandlers=Menu handlers
-MenuAdmin=Menu editor
-DoNotUseInProduction=Do not use in production
-ThisIsProcessToFollow=Upgrade procedure:
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
-StepNb=Step %s
-FindPackageFromWebSite=Find a package that provides the features you need (for example on the official web site %s).
-DownloadPackageFromWebSite=Download package (for example from the official web site %s).
-UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack/unzip the packaged files into the server directory dedicated to external modules:<br><b>%s</b>
-SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going to the page setup modules: <a href="%s">%s</a>.
-NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
-InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
-InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
-YouCanSubmitFile=You can upload the .zip file of module package from here:
-CurrentVersion=Dolibarr current version
-CallUpdatePage=Browse to the page that updates the database structure and data: %s.
-LastStableVersion=Latest stable version
-LastActivationDate=Latest activation date
-LastActivationAuthor=Latest activation author
-LastActivationIP=Latest activation IP
-LastActivationVersion=Latest activation version
-UpdateServerOffline=Update server offline
-WithCounter=Manage a counter
-GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
-GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
-GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
-GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
-GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN0701-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
-GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
-ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
-ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
-DoTestServerAvailability=Test server connectivity
-DoTestSend=Test sending
-DoTestSendHTML=Test sending HTML
-ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
-ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
-UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
-UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
-SeeWikiForAllTeam=Take a look at the Wiki page for a list of contributors and their organization
-UseACacheDelay= Delay for caching export response in seconds (0 or empty for no cache)
-DisableLinkToHelpCenter=Hide the link "<b>Need help or support</b>" on the login page
-DisableLinkToHelp=Hide the link to the online help "<b>%s</b>"
-AddCRIfTooLong=There is no automatic text wrapping, text that is too long will not display on documents. Please add carriage returns in the text area if needed.
-ConfirmPurge=Are you sure you want to execute this purge?<br>This will permanently delete all your data files with no way to restore them (ECM files, attached files...).
-MinLength=Minimum length
-LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory
-LanguageFile=Language file
-ExamplesWithCurrentSetup=Examples with current configuration
-ListOfDirectories=List of OpenDocument templates directories
-ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
-NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
-ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
-FollowingSubstitutionKeysCanBeUsed=<br>To know how to create your odt document templates, before storing them in those directories, read wiki documentation:
+RelativeURL=متعلقہ URL
+BoxesAvailable=وجیٹس دستیاب ہیں۔
+BoxesActivated=وجیٹس چالو ہو گئے۔
+ActivateOn=چالو کریں۔
+ActiveOn=کو چالو کیا گیا۔
+ActivatableOn=چالو کرنے کے قابل
+SourceFile=بنیادی فائل
+AvailableOnlyIfJavascriptAndAjaxNotDisabled=صرف اس صورت میں دستیاب ہے جب JavaScript غیر فعال نہ ہو۔
+Required=درکار ہے۔
+UsedOnlyWithTypeOption=صرف کچھ ایجنڈا آپشن کے ذریعہ استعمال کیا جاتا ہے۔
+Security=سیکورٹی
+Passwords=پاس ورڈز
+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:"c... </b> <br> by <br> <b> $dolibarr_main_db_pass="%s"؛ </b>
+ProtectAndEncryptPdfFiles=تیار کردہ پی ڈی ایف فائلوں کی حفاظت کریں۔ اس کی سفارش نہیں کی جاتی ہے کیونکہ یہ پی ڈی ایف کی بڑی تعداد کو توڑ دیتا ہے۔
+ProtectAndEncryptPdfFilesDesc=پی ڈی ایف دستاویز کا تحفظ اسے کسی بھی پی ڈی ایف براؤزر کے ساتھ پڑھنے اور پرنٹ کرنے کے لیے دستیاب رکھتا ہے۔ تاہم، اب ترمیم اور نقل ممکن نہیں ہے۔ نوٹ کریں کہ اس خصوصیت کو استعمال کرنے سے عالمی ضم شدہ PDFs کی تعمیر کام نہیں کر رہی ہے۔
+Feature=فیچر
+DolibarrLicense=لائسنس
+Developpers=ڈویلپرز / تعاون کنندگان
+OfficialWebSite=Dolibarr سرکاری ویب سائٹ
+OfficialWebSiteLocal=مقامی ویب سائٹ (%s)
+OfficialWiki=Dolibarr دستاویزات / Wiki
+OfficialDemo=Dolibarr آن لائن ڈیمو
+OfficialMarketPlace=بیرونی ماڈیولز/ایڈونز کے لیے آفیشل مارکیٹ پلیس
+OfficialWebHostingService=حوالہ شدہ ویب ہوسٹنگ سروسز (کلاؤڈ ہوسٹنگ)
+ReferencedPreferredPartners=ترجیحی شراکت دار
+OtherResources=دیگر وسائل
+ExternalResources=بیرونی وسائل
+SocialNetworks=سوشل نیٹ ورک
+SocialNetworkId=سوشل نیٹ ورک ID
+ForDocumentationSeeWiki=صارف یا ڈویلپر دستاویزات (دستاویز، اکثر پوچھے گئے سوالات...)، <br> پر ایک نظر ڈالیں Dolibarr Wiki: <br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> a0ecb2ecz87f4087f4087f49bz0
+ForAnswersSeeForum=کسی بھی دوسرے سوال/مدد کے لیے، آپ Dolibarr فورم استعمال کر سکتے ہیں: <br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a> a09f714a
+HelpCenterDesc1=Dolibarr کے ساتھ مدد اور مدد حاصل کرنے کے لیے کچھ وسائل یہ ہیں۔
+HelpCenterDesc2=ان میں سے کچھ وسائل صرف <b> انگریزی </b> میں دستیاب ہیں۔
+CurrentMenuHandler=موجودہ مینو ہینڈلر
+MeasuringUnit=پیمائش کرنے والا یونٹ
+LeftMargin=بائیں مارجن
+TopMargin=اوپر مارجن
+PaperSize=کاغذ کی قسم
+Orientation=واقفیت
+SpaceX=اسپیس ایکس
+SpaceY=خلائی Y
+FontSize=حرف کا سائز
+Content=مواد
+ContentForLines=ہر پروڈکٹ یا سروس کے لیے ڈسپلے کرنے کے لیے مواد (مواد کے متغیر __LINES__ سے)
+NoticePeriod=نوٹس کی مدت
+NewByMonth=ماہ کے لحاظ سے نیا
+Emails=ای میلز
+EMailsSetup=ای میلز کا سیٹ اپ
+EMailsDesc=یہ صفحہ آپ کو ای میل بھیجنے کے لیے پیرامیٹرز یا اختیارات سیٹ کرنے کی اجازت دیتا ہے۔
+EmailSenderProfiles=ای میل بھیجنے والے پروفائلز
+EMailsSenderProfileDesc=آپ اس حصے کو خالی رکھ سکتے ہیں۔ اگر آپ یہاں کچھ ای میلز درج کرتے ہیں، تو وہ ممکنہ ارسال کنندگان کی فہرست میں شامل کر دی جائیں گی جب آپ نیا ای میل لکھیں گے۔
+MAIN_MAIL_SMTP_PORT=SMTP/SMTPS پورٹ (php.ini میں پہلے سے طے شدہ قدر: <b> %s </b> )
+MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS میزبان (php.ini میں پہلے سے طے شدہ قدر: <b> %s </b> )
+MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS پورٹ (یونکس جیسے سسٹمز پر پی ایچ پی میں بیان نہیں کیا گیا)
+MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS میزبان (یونکس جیسے سسٹمز پر پی ایچ پی میں بیان نہیں کیا گیا)
+MAIN_MAIL_EMAIL_FROM=خودکار ای میلز کے لیے بھیجنے والا ای میل (php.ini میں ڈیفالٹ ویلیو: <b> %s </b> )
+MAIN_MAIL_ERRORS_TO=غلطی کے لیے استعمال ہونے والی ای میل ای میلز واپس کرتی ہے (بھیجے گئے ای میلز میں فیلڈز 'Errors-To')
+MAIN_MAIL_AUTOCOPY_TO= تمام بھیجی گئی ای میلز کو کاپی (Bcc) کریں۔
+MAIN_DISABLE_ALL_MAILS=تمام ای میل بھیجنے کو غیر فعال کریں (ٹیسٹ کے مقاصد یا ڈیمو کے لیے)
+MAIN_MAIL_FORCE_SENDTO=تمام ای میلز کو بھیجیں (حقیقی وصول کنندگان کے بجائے، آزمائشی مقاصد کے لیے)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=نیا ای میل لکھتے وقت پہلے سے طے شدہ وصول کنندہ کی فہرست میں ملازمین کی ای میلز (اگر وضاحت کی گئی ہو) تجویز کریں۔
+MAIN_MAIL_SENDMODE=ای میل بھیجنے کا طریقہ
+MAIN_MAIL_SMTPS_ID=SMTP ID (اگر سرور بھیجنے کے لیے تصدیق کی ضرورت ہو)
+MAIN_MAIL_SMTPS_PW=SMTP پاس ورڈ (اگر سرور بھیجنے کے لیے تصدیق کی ضرورت ہے)
+MAIN_MAIL_EMAIL_TLS=TLS (SSL) انکرپشن استعمال کریں۔
+MAIN_MAIL_EMAIL_STARTTLS=TLS (STARTTLS) انکرپشن استعمال کریں۔
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=les سرٹیفکیٹس کو خودکار دستخطوں کی اجازت دیں۔
+MAIN_MAIL_EMAIL_DKIM_ENABLED=ای میل دستخط بنانے کے لیے DKIM استعمال کریں۔
+MAIN_MAIL_EMAIL_DKIM_DOMAIN=dkim کے ساتھ استعمال کے لیے ای میل ڈومین
+MAIN_MAIL_EMAIL_DKIM_SELECTOR=dkim سلیکٹر کا نام
+MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=dkim پر دستخط کرنے کے لیے نجی کلید
+MAIN_DISABLE_ALL_SMS=تمام ایس ایم ایس بھیجنے کو غیر فعال کریں (ٹیسٹ کے مقاصد یا ڈیمو کے لیے)
+MAIN_SMS_SENDMODE=SMS بھیجنے کے لیے استعمال کرنے کا طریقہ
+MAIN_MAIL_SMS_FROM=ایس ایم ایس بھیجنے کے لیے ڈیفالٹ بھیجنے والے کا فون نمبر
+MAIN_MAIL_DEFAULT_FROMTYPE=دستی بھیجنے کے لیے ڈیفالٹ بھیجنے والا ای میل (صارف کا ای میل یا کمپنی کا ای میل)
+UserEmail=صارف کا ای میل
+CompanyEmail=کمپنی کا ای میل
+FeatureNotAvailableOnLinux=فیچر یونکس جیسے سسٹمز پر دستیاب نہیں ہے۔ مقامی طور پر اپنے بھیجے گئے میل پروگرام کی جانچ کریں۔
+FixOnTransifex=پروجیکٹ کے آن لائن ترجمہ پلیٹ فارم پر ترجمہ کو درست کریں۔
+SubmitTranslation=اگر اس زبان کا ترجمہ مکمل نہیں ہے یا آپ کو غلطیاں نظر آتی ہیں، تو آپ ڈائرکٹری میں فائلوں میں ترمیم کر کے اسے درست کر سکتے ہیں
+SubmitTranslationENUS=اگر اس زبان کا ترجمہ مکمل نہیں ہے یا آپ کو غلطیاں نظر آتی ہیں، تو آپ فائلوں کو ڈائرکٹری <b> langs/%s </b> میں ترمیم کر کے اسے درست کر سکتے ہیں اور ترمیم شدہ فائلیں dolibarr.org/forum پر جمع کر سکتے ہیں یا، اگر آپ gPR کے ساتھ ہیں .com/Dolibarr/dolibarr
+ModuleSetup=ماڈیول سیٹ اپ
+ModulesSetup=ماڈیولز/ایپلیکیشن سیٹ اپ
+ModuleFamilyBase=سسٹم
+ModuleFamilyCrm=کسٹمر ریلیشن شپ مینجمنٹ (CRM)
+ModuleFamilySrm=وینڈر ریلیشنشپ مینجمنٹ (VRM)
+ModuleFamilyProducts=پروڈکٹ مینجمنٹ (PM)
+ModuleFamilyHr=ہیومن ریسورس مینجمنٹ (HR)
+ModuleFamilyProjects=پروجیکٹس/باہمی تعاون کا کام
+ModuleFamilyOther=دیگر
+ModuleFamilyTechnic=ملٹی ماڈیول ٹولز
+ModuleFamilyExperimental=تجرباتی ماڈیولز
+ModuleFamilyFinancial=مالیاتی ماڈیولز (اکاؤنٹنگ/ٹریژری)
+ModuleFamilyECM=الیکٹرانک مواد کا انتظام (ECM)
+ModuleFamilyPortal=ویب سائٹس اور دیگر فرنٹل ایپلیکیشن
+ModuleFamilyInterface=بیرونی نظاموں کے ساتھ انٹرفیس
+MenuHandlers=مینو ہینڈلرز
+MenuAdmin=مینو ایڈیٹر
+DoNotUseInProduction=پیداوار میں استعمال نہ کریں۔
+ThisIsProcessToFollow=اپ گریڈ کا طریقہ کار:
+ThisIsAlternativeProcessToFollow=یہ دستی طور پر کارروائی کرنے کے لیے ایک متبادل سیٹ اپ ہے:
+StepNb=مرحلہ %s
+FindPackageFromWebSite=ایک ایسا پیکیج تلاش کریں جو آپ کو مطلوبہ خصوصیات فراہم کرتا ہو (مثال کے طور پر سرکاری ویب سائٹ %s پر)۔
+DownloadPackageFromWebSite=پیکیج ڈاؤن لوڈ کریں (مثال کے طور پر سرکاری ویب سائٹ %s سے)۔
+UnpackPackageInDolibarrRoot=پیک شدہ فائلوں کو اپنی ڈولیبر سرور ڈائرکٹری میں کھولیں/ان زپ کریں: <b> %s </b>
+UnpackPackageInModulesRoot=بیرونی ماڈیول کو تعینات کرنے/انسٹال کرنے کے لیے، پیک شدہ فائلوں کو بیرونی ماڈیولز کے لیے وقف سرور ڈائرکٹری میں کھولیں/ان زپ کریں: <br> <b> %s a09a4b78010
+SetupIsReadyForUse=ماڈیول کی تعیناتی ختم ہو گئی ہے۔ تاہم آپ کو صفحہ سیٹ اپ ماڈیولز: <a href="%s"> %s </a> پر جا کر اپنی درخواست میں ماڈیول کو فعال اور سیٹ اپ کرنا ہوگا۔
+NotExistsDirect=متبادل روٹ ڈائرکٹری موجودہ ڈائرکٹری سے متعین نہیں ہے۔ <br>
+InfDirAlt=ورژن 3 کے بعد سے، متبادل روٹ ڈائریکٹری کی وضاحت ممکن ہے۔ یہ آپ کو ایک وقف شدہ ڈائرکٹری، پلگ ان اور حسب ضرورت ٹیمپلیٹس میں ذخیرہ کرنے کی اجازت دیتا ہے۔ <br> بس Dolibarr کے روٹ پر ایک ڈائرکٹری بنائیں (جیسے: کسٹم)۔ <br>
+InfDirExample= <br> پھر فائل <strong> دیں conf.php </strong> <br> $ dolibarr_main_url_root_alt = '/ اپنی مرضی کے مطابق' <br> $ dolibarr_main_document_root_alt = '/ راہ / / dolibarr / htdocs / اپنی مرضی کی' <br> ان لائنوں کے ساتھ "#" تبصرہ کر رہے ہیں تو، انہیں فعال کرنے کے لیے اس کا اعلان ، صرف "#" کریکٹر کو ہٹا کر غیر تبصرہ کریں۔
+YouCanSubmitFile=آپ ماڈیول پیکج کی زپ فائل یہاں سے اپ لوڈ کر سکتے ہیں:
+CurrentVersion=Dolibarr موجودہ ورژن
+CallUpdatePage=اس صفحہ پر براؤز کریں جو ڈیٹا بیس کی ساخت اور ڈیٹا کو اپ ڈیٹ کرتا ہے: %s۔
+LastStableVersion=تازہ ترین مستحکم ورژن
+LastActivationDate=تازہ ترین ایکٹیویشن کی تاریخ
+LastActivationAuthor=تازہ ترین ایکٹیویشن مصنف
+LastActivationIP=تازہ ترین ایکٹیویشن آئی پی
+LastActivationVersion=ایکٹیویشن کا تازہ ترین ورژن
+UpdateServerOffline=سرور کو آف لائن اپ ڈیٹ کریں۔
+WithCounter=کاؤنٹر کا انتظام کریں۔
+GenericMaskCodes=آپ کوئی بھی نمبرنگ ماسک درج کر سکتے ہیں۔ اس ماسک میں، درج ذیل ٹیگز استعمال کیے جا سکتے ہیں: <br> <b> {000000} </b> ایک ایسے نمبر سے مطابقت رکھتا ہے جسے ہر %s پر بڑھایا جائے گا۔ کاؤنٹر کی مطلوبہ لمبائی کے طور پر زیادہ سے زیادہ صفر درج کریں۔ کاؤنٹر کو بائیں طرف سے زیرو سے مکمل کیا جائے گا تاکہ ماسک جتنے زیرو ہوں۔ <br> <b> {000000+000} </b> پچھلے والے جیسا ہی ہے لیکن + نشان کے دائیں جانب نمبر کے مطابق ایک آفسیٹ پہلے a0ecb2ecz847 سے شروع ہوتا ہے۔ <br> <b> {000000@x} </b> پچھلے والے جیسا ہی ہے لیکن جب مہینہ x تک پہنچ جاتا ہے تو کاؤنٹر صفر پر ری سیٹ ہو جاتا ہے (x 1 اور 12 کے درمیان، یا 0 آپ کے سال کے ابتدائی مہینوں کو کنفیگر کرنے کے لیے، یا 9 کے ابتدائی مہینوں کو استعمال کرنے کے لیے ہر ماہ صفر پر ری سیٹ کریں)۔ اگر یہ اختیار استعمال کیا جاتا ہے اور x 2 یا اس سے زیادہ ہے، تو ترتیب {yy}{mm} یا {yyyy}{mm} بھی ضروری ہے۔ <br> <b> {dd} </b> دن (01 سے 31)۔ <br> <b> {mm} </b> مہینہ (01 سے 12)۔ <br> <b> {yy} </b> , <b> {yyyy} </b> یا a0aee8336587 سال سے زیادہ کا نمبر <br>
+GenericMaskCodes2= <b> {cccc} </b> n حروف پر کلائنٹ کا کوڈ گاہک کے لیے وقف یہ کاؤنٹر عالمی کاؤنٹر کے ساتھ ہی دوبارہ ترتیب دیا جاتا ہے۔ <br> <b> {tttt} </b> n حروف پر تیسری پارٹی کی قسم کا کوڈ (مینیو دیکھیں ہوم - سیٹ اپ - ڈکشنری - تھرڈ پارٹیز کی اقسام)۔ اگر آپ یہ ٹیگ شامل کرتے ہیں، تو کاؤنٹر ہر قسم کے تیسرے فریق کے لیے مختلف ہوگا۔ <br>
+GenericMaskCodes3=ماسک میں باقی تمام کردار برقرار رہیں گے۔ <br> خالی جگہوں کی اجازت نہیں ہے۔ <br>
+GenericMaskCodes3EAN=ماسک میں باقی تمام حروف برقرار رہیں گے (سوائے * یا ? EAN13 میں 13ویں پوزیشن پر)۔ <br> خالی جگہوں کی اجازت نہیں ہے۔ <br> EAN13 میں، 13ویں پوزیشن میں آخری } کے بعد آخری حرف * یا ؟ . اسے کیلکولیٹڈ کلید سے بدل دیا جائے گا۔ <br>
+GenericMaskCodes4a= <u> تیسری پارٹی TheCompany کی 99th %s پر مثال، تاریخ 2007-01-31 کے ساتھ: </u> <br>
+GenericMaskCodes4b= <u> تیسری پارٹی کی مثال جو 01-03-2007 کو بنائی گئی: </u> <br>
+GenericMaskCodes4c= <u> 2007-03-01 کو تخلیق کردہ پروڈکٹ کی مثال: </u> <br>
+GenericMaskCodes5= <b> ABC {YY} {میٹر} - {000000} </b> دے گا <b> ABC0701-000099 </b> <br> <b> {0000 + 100 @ 1} -ZZZ / {DD} / XXX </b> دے گا <b> 0199-ZZZ / 31 / XXX </b> <br> <b> IN{yy}{mm}-{0000}-{t} </b> دے گا <b> IN0701-0099-A a09a4b739f17f17f17f8z0 کے لئے کوڈ کی قسم' کے ساتھ 'کوڈ' کے ساتھ اسکرپٹ کے قابل ہے
+GenericNumRefModelDesc=ایک متعین ماسک کے مطابق حسب ضرورت نمبر لوٹاتا ہے۔
+ServerAvailableOnIPOrPort=سرور <b> <b> %s </b> پورٹ <b> %s a09a4b739f17f80 پر دستیاب ہے۔
+ServerNotAvailableOnIPOrPort=پورٹ <b> <b> %s </b> پر سرور دستیاب نہیں ہے <b> %s a09a4b739f178
+DoTestServerAvailability=سرور کنیکٹیویٹی کی جانچ کریں۔
+DoTestSend=ٹیسٹ بھیجنا
+DoTestSendHTML=HTML بھیجنے کی جانچ کریں۔
+ErrorCantUseRazIfNoYearInMask=خرابی، اگر ترتیب {yy} یا {yyyy} ماسک میں نہیں ہے تو ہر سال کاؤنٹر کو دوبارہ ترتیب دینے کے لیے @ آپشن کا استعمال نہیں کر سکتے۔
+ErrorCantUseRazInStartedYearIfNoYearMonthInMask=خرابی، اگر ترتیب {yy}{mm} یا {yyyy}{mm} ماسک میں نہیں ہے تو @ آپشن استعمال نہیں کر سکتے۔
+UMask=Unix/Linux/BSD/Mac فائل سسٹم پر نئی فائلوں کے لیے UMask پیرامیٹر۔
+UMaskExplanation=یہ پیرامیٹر آپ کو سرور پر Dolibarr کی طرف سے بنائی گئی فائلوں پر بطور ڈیفالٹ سیٹ اجازتوں کی وضاحت کرنے کی اجازت دیتا ہے (مثال کے طور پر اپ لوڈ کے دوران)۔ <br> یہ آکٹل قدر ہونی چاہیے (مثال کے طور پر، 0666 کا مطلب ہے سب کے لیے پڑھنا اور لکھنا)۔ <br> یہ پیرامیٹر ونڈوز سرور پر بیکار ہے۔
+SeeWikiForAllTeam=شراکت داروں اور ان کی تنظیم کی فہرست کے لیے وکی صفحہ پر ایک نظر ڈالیں۔
+UseACacheDelay= ایکسپورٹ رسپانس کو سیکنڈ میں کیش کرنے میں تاخیر (0 یا بغیر کیشے کے خالی)
+DisableLinkToHelpCenter=لاگ ان پیج پر لنک کو چھپائیں "<b> مدد کی ضرورت ہے یا </b>"
+DisableLinkToHelp=آن لائن مدد کا لنک چھپائیں "<b> %s </b>"
+AddCRIfTooLong=کوئی خودکار ٹیکسٹ ریپنگ نہیں ہے، بہت لمبا متن دستاویزات پر ظاہر نہیں ہوگا۔ اگر ضرورت ہو تو ٹیکسٹ ایریا میں کیریج ریٹرن شامل کریں۔
+ConfirmPurge=کیا آپ واقعی اس پرج کو انجام دینا چاہتے ہیں؟ <br> یہ آپ کی تمام ڈیٹا فائلوں کو مستقل طور پر حذف کر دے گا جس کو بحال کرنے کا کوئی طریقہ نہیں ہے (ECM فائلیں، منسلک فائلیں...)
+MinLength=کم از کم لمبائی
+LanguageFilesCachedIntoShmopSharedMemory=فائلیں .lang مشترکہ میموری میں بھری ہوئی ہیں۔
+LanguageFile=زبان کی فائل
+ExamplesWithCurrentSetup=موجودہ ترتیب کے ساتھ مثالیں۔
+ListOfDirectories=OpenDocument ٹیمپلیٹس ڈائریکٹریز کی فہرست
+ListOfDirectoriesForModelGenODT=OpenDocument فارمیٹ کے ساتھ ٹیمپلیٹس فائلوں پر مشتمل ڈائریکٹریز کی فہرست۔ <br> <br> یہاں ڈائریکٹریز کا پورا راستہ رکھیں۔ <br> eah ڈائریکٹری کے درمیان کیریج ریٹرن شامل کریں۔ <br> GED ماڈیول کی ڈائرکٹری شامل کرنے کے لیے، یہاں شامل کریں <b> DOL_DATA_ROOT/ecm/yourdirectoryname </b> ۔ <br> <br> ان ڈائرکٹریز میں فائلوں کا اختتام <b> .odt </b> یا <b> .ods a09fzb74a.
+NumberOfModelFilesFound=ان ڈائریکٹریوں میں پائی جانے والی ODT/ODS ٹیمپلیٹ فائلوں کی تعداد
+ExampleOfDirectoriesForModelGen=نحو کی مثالیں: <br> c:\\myapp\\mydocumentdir\\mysubdir <br> /home/myapp/mydocumentdir/mysubdir <br> DOL_DATA_ROOT/Mydocumentdir
+FollowingSubstitutionKeysCanBeUsed= <br> اپنے odt دستاویز کے سانچوں کو بنانے کا طریقہ جاننے کے لیے، ان ڈائریکٹریوں میں ذخیرہ کرنے سے پہلے، ویکی دستاویزات پڑھیں:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
-FirstnameNamePosition=Position of Name/Lastname
-DescWeather=The following images will be shown on the dashboard when the number of late actions reach the following values:
-KeyForWebServicesAccess=Key to use Web Services (parameter "dolibarrkey" in webservices)
-TestSubmitForm=Input test form
-ThisForceAlsoTheme=Using this menu manager will also use its own theme whatever the user choice. Also this menu manager specialized for smartphones does not work on all smartphone. Use another menu manager if you experience problems with yours.
-ThemeDir=Skins directory
-ConnectionTimeout=Connection timeout
-ResponseTimeout=Response timeout
-SmsTestMessage=Test message from __PHONEFROM__ to __PHONETO__
-ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this feature.
-SecurityToken=Key to secure URLs
-NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
+FirstnameNamePosition=نام/آخری نام کی پوزیشن
+DescWeather=درج ذیل تصاویر ڈیش بورڈ پر دکھائی جائیں گی جب دیر سے ہونے والی کارروائیوں کی تعداد درج ذیل اقدار تک پہنچ جائے گی۔
+KeyForWebServicesAccess=ویب سروسز استعمال کرنے کی کلید (ویب سروسز میں پیرامیٹر "ڈولیبارکی")
+TestSubmitForm=ان پٹ ٹیسٹ فارم
+ThisForceAlsoTheme=اس مینو مینیجر کو استعمال کرنے سے اس کی اپنی تھیم بھی استعمال ہو گی جو بھی صارف کی پسند ہے۔ اس کے علاوہ اسمارٹ فونز کے لیے مخصوص یہ مینو مینیجر تمام اسمارٹ فونز پر کام نہیں کرتا ہے۔ اگر آپ کو اپنے مینو مینیجر کے ساتھ مسائل کا سامنا ہے تو دوسرا مینو مینیجر استعمال کریں۔
+ThemeDir=کھالوں کی ڈائرکٹری
+ConnectionTimeout=رابطے کا وقت ختم
+ResponseTimeout=جواب کا ٹائم آؤٹ
+SmsTestMessage=ٹیسٹ پیغام __PHONEFROM__ سے __PHONETO__ تک
+ModuleMustBeEnabledFirst=اگر آپ کو اس خصوصیت کی ضرورت ہو تو پہلے ماڈیول <b> %s </b> کو فعال کرنا ضروری ہے۔
+SecurityToken=یو آر ایل کو محفوظ کرنے کی کلید
+NoSmsEngine=کوئی SMS بھیجنے والا مینیجر دستیاب نہیں ہے۔ ایس ایم ایس بھیجنے والا مینیجر ڈیفالٹ ڈسٹری بیوشن کے ساتھ انسٹال نہیں ہوتا ہے کیونکہ وہ کسی بیرونی وینڈر پر منحصر ہوتا ہے، لیکن آپ کو کچھ %s پر مل سکتے ہیں۔
 PDF=PDF
-PDFDesc=Global options for PDF generation
-PDFOtherDesc=PDF Option specific to some modules
-PDFAddressForging=Rules for address section
-HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
-PDFRulesForSalesTax=Rules for Sales Tax / VAT
-PDFLocaltax=Rules for %s
-HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
-HideDescOnPDF=Hide products description
-HideRefOnPDF=Hide products ref.
-HideDetailsOnPDF=Hide product lines details
-PlaceCustomerAddressToIsoLocation=Use french standard position (La Poste) for customer address position
-Library=Library
-UrlGenerationParameters=Parameters to secure URLs
-SecurityTokenIsUnique=Use a unique securekey parameter for each URL
-EnterRefToBuildUrl=Enter reference for object %s
-GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
-OldVATRates=Old VAT rate
-NewVATRates=New VAT rate
-PriceBaseTypeToChange=Modify on prices with base reference value defined on
-MassConvert=Launch bulk conversion
-PriceFormatInCurrentLanguage=Price Format In Current Language
-String=String
-String1Line=String (1 line)
-TextLong=Long text
-TextLongNLines=Long text (n lines)
-HtmlText=Html text
-Int=Integer
-Float=Float
-DateAndTime=Date and hour
-Unique=Unique
-Boolean=Boolean (one checkbox)
-ExtrafieldPhone = Phone
-ExtrafieldPrice = Price
-ExtrafieldMail = Email
-ExtrafieldUrl = Url
-ExtrafieldSelect = Select list
-ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator (not a field)
-ExtrafieldPassword=Password
-ExtrafieldRadio=Radio buttons (one choice only)
-ExtrafieldCheckBox=Checkboxes
-ExtrafieldCheckBoxFromList=Checkboxes from table
-ExtrafieldLink=Link to an object
-ComputedFormula=Computed field
-ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
-Computedpersistent=Store computed field
-ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
-ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored without encryption (field must be only hidden with star on screen).<br>Set  'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retrieve original value)
-ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
-ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
-ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
-LibraryToBuildPDF=Library used for PDF generation
-LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
-SMS=SMS
-LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
-RefreshPhoneLink=Refresh link
-LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone number to test)
-KeepEmptyToUseDefault=Keep empty to use default value
-KeepThisEmptyInMostCases=In most cases, you can keep this field empy.
-DefaultLink=Default link
-SetAsDefault=Set as default
-ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
-ExternalModule=External module
-InstalledInto=Installed into directory %s
-BarcodeInitForThirdparties=Mass barcode init for third-parties
-BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
-CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
-InitEmptyBarCode=Init value for next %s empty records
-EraseAllCurrentBarCode=Erase all current barcode values
-ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values?
-AllBarcodeReset=All barcode values have been removed
-NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled in the Barcode module setup.
-EnableFileCache=Enable file cache
-ShowDetailsInPDFPageFoot=Add more details into footer, such as company address or manager names (in addition to professional ids, company capital and VAT number).
-NoDetails=No additional details in footer
-DisplayCompanyInfo=Display company address
-DisplayCompanyManagers=Display manager names
-DisplayCompanyInfoAndManagers=Display company address and manager names
-EnableAndSetupModuleCron=If you want to have this recurring invoice generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template using the *Create* button. Note that even if you enabled automatic generation, you can still safely launch manual generation. Generation of duplicates for the same period is not possible.
-ModuleCompanyCodeCustomerAquarium=%s followed by customer code for a customer accounting code
-ModuleCompanyCodeSupplierAquarium=%s followed by vendor code for a vendor accounting code
-ModuleCompanyCodePanicum=Return an empty accounting code.
-ModuleCompanyCodeDigitaria=Returns a compound accounting code according to the name of the third party. The code consists of a prefix that can be defined in the first position followed by the number of characters defined in the third party code.
-ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by the number of characters: %s for the customer accounting code.
-ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
-Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
-UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
-WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
-WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
-WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
-WarningPHPMailD=Also, it is therefore recommended to change the sending method of e-mails to the value "SMTP". If you really want to keep the default "PHP" method to send emails, just ignore this warning, or remove it by setting the MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP constant to 1 in Home - Setup - Other.
-WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
-ActualMailSPFRecordFound=Actual SPF record found : %s
-ClickToShowDescription=Click to show description
-DependsOn=This module needs the module(s)
-RequiredBy=This module is required by module(s)
-TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
-PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
-EnableDefaultValues=Enable customization of default values
-EnableOverwriteTranslation=Enable usage of overwritten translation
-GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
-WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
-Field=Field
-ProductDocumentTemplates=Document templates to generate product document
-FreeLegalTextOnExpenseReports=Free legal text on expense reports
-WatermarkOnDraftExpenseReports=Watermark on draft expense reports
-ProjectIsRequiredOnExpenseReports=The project is mandatory for entering an expense report
-PrefillExpenseReportDatesWithCurrentMonth=Pre-fill start and end dates of new expense report with start and end dates of the current month
-ForceExpenseReportsLineAmountsIncludingTaxesOnly=Force the entry of expense report amounts always in amount with taxes
-AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
-FilesAttachedToEmail=Attach file
-SendEmailsReminders=Send agenda reminders by emails
-davDescription=Setup a WebDAV server
-DAVSetup=Setup of module DAV
-DAV_ALLOW_PRIVATE_DIR=Enable the generic private directory (WebDAV dedicated directory named "private" - login required)
-DAV_ALLOW_PRIVATE_DIRTooltip=The generic private directory is a WebDAV directory anybody can access with its application login/pass.
-DAV_ALLOW_PUBLIC_DIR=Enable the generic public directory (WebDAV dedicated directory named "public" - no login required)
-DAV_ALLOW_PUBLIC_DIRTooltip=The generic public directory is a WebDAV directory anybody can access (in read and write mode), with no authorization required (login/password account).
-DAV_ALLOW_ECM_DIR=Enable the DMS/ECM private directory (root directory of the DMS/ECM module - login required)
-DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploaded when using the DMS/ECM module. Similarly as access from the web interface, you will need a valid login/password with adecuate permissions to access it.
+PDFDesc=پی ڈی ایف نسل کے لیے عالمی اختیارات
+PDFOtherDesc=کچھ ماڈیولز کے لیے مخصوص پی ڈی ایف آپشن
+PDFAddressForging=ایڈریس سیکشن کے قواعد
+HideAnyVATInformationOnPDF=سیلز ٹیکس / VAT سے متعلق تمام معلومات چھپائیں۔
+PDFRulesForSalesTax=سیلز ٹیکس / VAT کے قواعد
+PDFLocaltax=%s کے قواعد
+HideLocalTaxOnPDF=کالم سیل ٹیکس / VAT میں %s کی شرح چھپائیں
+HideDescOnPDF=مصنوعات کی تفصیل چھپائیں۔
+HideRefOnPDF=مصنوعات کا حوالہ چھپائیں۔
+HideDetailsOnPDF=پروڈکٹ لائنز کی تفصیلات چھپائیں۔
+PlaceCustomerAddressToIsoLocation=کسٹمر ایڈریس پوزیشن کے لیے فرانسیسی معیاری پوزیشن (لا پوسٹ) کا استعمال کریں۔
+Library=کتب خانہ
+UrlGenerationParameters=URLs کو محفوظ کرنے کے لیے پیرامیٹر
+SecurityTokenIsUnique=ہر یو آر ایل کے لیے ایک منفرد سیکیورکی پیرامیٹر استعمال کریں۔
+EnterRefToBuildUrl=آبجیکٹ %s کے لیے حوالہ درج کریں۔
+GetSecuredUrl=حسابی یو آر ایل حاصل کریں۔
+ButtonHideUnauthorized=اندرونی صارفین کے لیے بھی غیر مجاز ایکشن بٹن چھپائیں (بصورت دیگر صرف خاکستری)
+OldVATRates=VAT کی پرانی شرح
+NewVATRates=VAT کی نئی شرح
+PriceBaseTypeToChange=پر بیان کردہ بنیادی حوالہ قدر کے ساتھ قیمتوں میں ترمیم کریں۔
+MassConvert=بلک تبادلوں کا آغاز کریں۔
+PriceFormatInCurrentLanguage=موجودہ زبان میں قیمت کی شکل
+String=تار
+String1Line=سٹرنگ (1 لائن)
+TextLong=لمبا متن
+TextLongNLines=لمبا متن (n لائنز)
+HtmlText=ایچ ٹی ایم ایل متن
+Int=انٹیجر
+Float=تیرنا
+DateAndTime=تاریخ اور گھنٹہ
+Unique=منفرد
+Boolean=بولین (ایک چیک باکس)
+ExtrafieldPhone = فون
+ExtrafieldPrice = قیمت
+ExtrafieldMail = ای میل
+ExtrafieldUrl = یو آر ایل
+ExtrafieldSelect = فہرست منتخب کریں۔
+ExtrafieldSelectList = ٹیبل سے منتخب کریں۔
+ExtrafieldSeparator=الگ کرنے والا (فیلڈ نہیں)
+ExtrafieldPassword=پاس ورڈ
+ExtrafieldRadio=ریڈیو بٹن (صرف ایک انتخاب)
+ExtrafieldCheckBox=چیک باکسز
+ExtrafieldCheckBoxFromList=میز سے چیک باکسز
+ExtrafieldLink=کسی چیز سے لنک کریں۔
+ComputedFormula=شمار شدہ فیلڈ
+ComputedFormulaDesc=ڈائنامک کمپیوٹیڈ ویلیو حاصل کرنے کے لیے آپ یہاں آبجیکٹ کی دیگر خصوصیات یا کسی بھی پی ایچ پی کوڈنگ کا استعمال کرتے ہوئے ایک فارمولا درج کر سکتے ہیں۔ آپ کسی بھی پی ایچ پی کے موافق فارمولے استعمال کر سکتے ہیں بشمول "؟" حالت آپریٹر، اور مندرجہ ذیل عالمی آبجیکٹ: <strong> $db، $conf، $langs، $mysoc، $user، $object </strong> ۔ <br> <strong> انتباہ </strong> : $object کی صرف کچھ خصوصیات دستیاب ہوسکتی ہیں۔ اگر آپ کو ایسی پراپرٹیز کی ضرورت ہے جو لوڈ نہیں ہوئی ہے، تو بس اپنے آپ کو اپنے فارمولے میں آبجیکٹ لائیں جیسا کہ دوسری مثال میں ہے۔ <br> کمپیوٹیڈ فیلڈ کا استعمال کرنے کا مطلب ہے کہ آپ انٹرفیس سے اپنی کوئی قدر درج نہیں کر سکتے۔ اس کے علاوہ، اگر نحو کی خرابی ہے تو، فارمولہ کچھ بھی نہیں لوٹا سکتا ہے۔ <br> <br> فارمولے کی مثال: <br> $object->id < 10 ? round($object-> id / 2, 2): ($object->id + 2 * $user->, oct (subject)) ) <br> <br> آبجیکٹ کو دوبارہ لوڈ کرنے کی مثال >rowid: $object->id)) > 0))؟ $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1' <br> <br> آبجیکٹ اور اس کے بنیادی آبجیکٹ کو زبردستی لوڈ کرنے کے فارمولے کی دوسری مثال ((a031b$dskf=f$d9b0$bload )) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'پیرنٹ پروجیکٹ نہیں ملا'
+Computedpersistent=حسابی فیلڈ اسٹور کریں۔
+ComputedpersistentDesc=کمپیوٹ شدہ اضافی فیلڈز کو ڈیٹا بیس میں اسٹور کیا جائے گا، تاہم، اس فیلڈ کی آبجیکٹ کو تبدیل کرنے پر ہی قدر کی دوبارہ گنتی کی جائے گی۔ اگر کمپیوٹنگ فیلڈ دیگر اشیاء یا عالمی ڈیٹا پر منحصر ہے تو یہ قدر غلط ہو سکتی ہے!!
+ExtrafieldParamHelpPassword=اس فیلڈ کو خالی چھوڑنے کا مطلب ہے کہ اس قدر کو بغیر خفیہ کاری کے محفوظ کیا جائے گا (فیلڈ صرف اسکرین پر ستارے کے ساتھ چھپا ہوا ہونا چاہیے)۔ <br> ڈیٹا بیس میں پاس ورڈ کو محفوظ کرنے کے لیے ڈیفالٹ انکرپشن رول کو استعمال کرنے کے لیے 'آٹو' سیٹ کریں (پھر ویلیو ریڈ صرف ہیش ہوگی، اصل قدر کو بازیافت کرنے کا کوئی طریقہ نہیں)
+ExtrafieldParamHelpselect=اقدار کی فہرست شکل کلید کے ساتھ لائنوں کا ہونا لازمی ہے، قدر (جہاں چابی نہیں ہو سکتا '0') مثال کے <br> <br>: <br> 1، VALUE1 <br> 2، VALUE2 <br> code3، value3 <br> ... <br> <br> ہے کرنے کے لئے فہرست ایک اور اعزازی وصف فہرست پر منحصر: <br> 1، VALUE1 | options_ <i> parent_list_code </i>: parent_key <br> 2، VALUE2 | options_ <i> parent_list_code </i>: parent_key <br> <br> واسطے ایک اور فہرست کے لحاظ فہرست ہے کرنا: <br> 1، VALUE1 | <i> parent_list_code </i> :parent_key <br> 2,value2| <i> parent_list_code </i> :parent_key
+ExtrafieldParamHelpcheckbox=اقدار کی فہرست فارمیٹ کلید کے ساتھ لائنوں میں ہونی چاہیے، ویلیو (جہاں کلید '0' نہیں ہو سکتی) <br> <br> مثال کے طور پر: <br> 1,value1 <br> <br> a0342fda19bz0 2,342fdavalue...
+ExtrafieldParamHelpradio=اقدار کی فہرست فارمیٹ کلید کے ساتھ لائنوں میں ہونی چاہیے، ویلیو (جہاں کلید '0' نہیں ہو سکتی) <br> <br> مثال کے طور پر: <br> 1,value1 <br> <br> a0342fda19bz0 2,342fdavalue...
+ExtrafieldParamHelpsellist=table_name: label_field: اقدار کی فہرست نحو <br> ایک میز سے آتا id_field :: filtersql <br> مثال: c_typent: libelle: ID :: filtersql <br> <br> - id_field necessarly ایک بنیادی INT چابی <br> ہے - filtersql ایک SQL شرط ہے. صرف ایکٹیو ویلیو <br> ظاہر کرنے کے لیے یہ ایک سادہ ٹیسٹ (مثلاً فعال=1) ہو سکتا ہے آپ فلٹر میں $ID$ بھی استعمال کر سکتے ہیں جو کہ موجودہ آبجیکٹ <br> کی موجودہ آئی ڈی ہے فلٹر میں SELECT استعمال کرنے کے لیے مطلوبہ لفظ $SEL$ کا استعمال کریں۔ بائی پاس اینٹی انجکشن تحفظ. <br> اگر آپ ایکسٹرا فیلڈز پر فلٹر کرنا چاہتے ہیں تو نحو کا استعمال کریں extra.fieldcode=... (جہاں فیلڈ کوڈ ایکسٹرا فیلڈ کا کوڈ ہوتا ہے) <br> <br> ایک اور تکمیلی وصف کی فہرست پر منحصر فہرست رکھنے کے لیے: <br> <i> parent_list_code </i> | parent_column: |: فلٹر <br> c_typent: libelle: ID parent_column <i> parent_list_code </i> ایک اور فہرست کے لحاظ فہرست حاصل کرنے کے لیے فلٹر <br> <br>
+ExtrafieldParamHelpchkbxlst=اقدار کی فہرست ایک ٹیبل سے آتی ہے فلٹر ڈائن میں $ID$ بھی استعمال کر سکتے ہیں موجودہ آبجیکٹ <br> کی موجودہ آئی ڈی ہے extrafield کا کوڈ) <br> <br> ایک اور اعزازی وصف فہرست پر منحصر فہرست حاصل کرنے کے لیے: <br> c_typent: libelle: ID: options_ <i> parent_list_code </i> | parent_column: فلٹر <br> <br> ایک اور فہرست کے لحاظ فہرست حاصل کرنے کے لیے: <br> c_typent: libelle:id: <i> parent_list_code </i> |parent_column:filter
+ExtrafieldParamHelplink=پیرامیٹرز کا ہونا ضروری ہے ObjectName:Classpath <br> نحو: ObjectName:Classpath
+ExtrafieldParamHelpSeparator=ایک سادہ سیپریٹر کے لیے خالی رکھیں اسٹیٹس کو ہر صارف کے سیشن کے لیے رکھا جاتا ہے)
+LibraryToBuildPDF=لائبریری PDF جنریشن کے لیے استعمال ہوتی ہے۔
+LocalTaxDesc=کچھ ممالک ہر انوائس لائن پر دو یا تین ٹیکس لگا سکتے ہیں۔ اگر ایسا ہے تو، دوسرے اور تیسرے ٹیکس اور اس کی شرح کے لیے قسم کا انتخاب کریں۔ ممکنہ قسمیں ہیں: <br> 1: مقامی ٹیکس بغیر ویٹ کے مصنوعات اور خدمات پر لاگو ہوتا ہے (لوکل ٹیکس بغیر ٹیکس کے رقم پر لگایا جاتا ہے) <br> 2: مصنوعات اور خدمات پر لوکل ٹیکس لاگو ہوتا ہے بشمول وٹ (لوکل ٹیکس کا حساب رقم + اہم ٹیکس پر ہوتا ہے) <br> مقامی ٹیکس بغیر ویٹ کے مصنوعات پر لاگو ہوتا ہے (لوکل ٹیکس بغیر ٹیکس کے رقم پر لگایا جاتا ہے) <br> 4: مصنوعات پر لوکل ٹیکس لاگو ہوتا ہے بشمول vat (لوکل ٹیکس کا حساب رقم + مین وٹ پر ہوتا ہے) <br> 5: بغیر وٹ کے خدمات پر لوکل ٹیکس لاگو ہوتا ہے (لوکلٹیکس بغیر ٹیکس کے رقم پر) <br> 6: لوکل ٹیکس کا اطلاق وٹ سمیت خدمات پر ہوتا ہے (مقامی ٹیکس کا حساب رقم + ٹیکس پر ہوتا ہے)
+SMS=پیغام
+LinkToTestClickToDial=صارف <strong> %s </strong> کے لیے ClickToDial url کی جانچ کرنے کے لیے ایک لنک دکھانے کے لیے کال کرنے کے لیے ایک فون نمبر درج کریں۔
+RefreshPhoneLink=لنک ریفریش کریں۔
+LinkToTest=صارف <strong> %s </strong> کے لیے قابل کلک لنک تیار کیا گیا (ٹیسٹ کرنے کے لیے فون نمبر پر کلک کریں)
+KeepEmptyToUseDefault=ڈیفالٹ قدر استعمال کرنے کے لیے خالی رکھیں
+KeepThisEmptyInMostCases=زیادہ تر معاملات میں، آپ اس فیلڈ کو خالی رکھ سکتے ہیں۔
+DefaultLink=پہلے سے طے شدہ لنک
+SetAsDefault=ڈیفالٹ کے طور پر مقرر
+ValueOverwrittenByUserSetup=انتباہ، یہ قدر صارف کے مخصوص سیٹ اپ کے ذریعے اوور رائٹ ہو سکتی ہے (ہر صارف اپنا کلک ٹوڈیل یو آر ایل سیٹ کر سکتا ہے)
+ExternalModule=بیرونی ماڈیول
+InstalledInto=ڈائرکٹری %s میں انسٹال ہے۔
+BarcodeInitForThirdparties=فریق ثالث کے لیے بڑے پیمانے پر بارکوڈ init
+BarcodeInitForProductsOrServices=بڑے پیمانے پر بارکوڈ شروع کریں یا مصنوعات یا خدمات کے لیے دوبارہ ترتیب دیں۔
+CurrentlyNWithoutBarCode=فی الحال، آپ کے پاس <strong> %s </strong> ریکارڈ ہے
+InitEmptyBarCode=اگلے %s خالی ریکارڈز کے لیے ابتدائی قدر
+EraseAllCurrentBarCode=تمام موجودہ بارکوڈ اقدار کو مٹا دیں۔
+ConfirmEraseAllCurrentBarCode=کیا آپ واقعی بارکوڈ کی تمام موجودہ اقدار کو مٹانا چاہتے ہیں؟
+AllBarcodeReset=بارکوڈ کی تمام اقدار کو ہٹا دیا گیا ہے۔
+NoBarcodeNumberingTemplateDefined=بارکوڈ ماڈیول سیٹ اپ میں نمبرنگ بارکوڈ ٹیمپلیٹ فعال نہیں ہے۔
+EnableFileCache=فائل کیشے کو فعال کریں۔
+ShowDetailsInPDFPageFoot=فوٹر میں مزید تفصیلات شامل کریں، جیسے کمپنی کا پتہ یا مینیجر کے نام (پیشہ ورانہ آئی ڈی، کمپنی کیپٹل اور VAT نمبر کے علاوہ)۔
+NoDetails=فوٹر میں کوئی اضافی تفصیلات نہیں ہیں۔
+DisplayCompanyInfo=کمپنی کا پتہ دکھائیں۔
+DisplayCompanyManagers=مینیجر کے نام ڈسپلے کریں۔
+DisplayCompanyInfoAndManagers=کمپنی کا پتہ اور مینیجر کے نام دکھائیں۔
+EnableAndSetupModuleCron=اگر آپ یہ بار بار چلنے والی رسید خود بخود تیار کرنا چاہتے ہیں تو ماڈیول *%s* کو فعال اور درست طریقے سے سیٹ اپ کرنا ضروری ہے۔ بصورت دیگر، *تخلیق* بٹن کا استعمال کرتے ہوئے اس ٹیمپلیٹ سے رسیدوں کی تخلیق دستی طور پر کی جانی چاہیے۔ نوٹ کریں کہ اگر آپ نے خودکار جنریشن کو فعال کیا ہے، تب بھی آپ محفوظ طریقے سے مینوئل جنریشن شروع کر سکتے ہیں۔ اسی مدت کے لیے نقل تیار کرنا ممکن نہیں ہے۔
+ModuleCompanyCodeCustomerAquarium=%s کے بعد کسٹمر اکاؤنٹنگ کوڈ کے لیے کسٹمر کوڈ آتا ہے۔
+ModuleCompanyCodeSupplierAquarium=%s کے بعد وینڈر اکاؤنٹنگ کوڈ کے لیے وینڈر کوڈ
+ModuleCompanyCodePanicum=ایک خالی اکاؤنٹنگ کوڈ واپس کریں۔
+ModuleCompanyCodeDigitaria=تیسرے فریق کے نام کے مطابق ایک کمپاؤنڈ اکاؤنٹنگ کوڈ لوٹاتا ہے۔ کوڈ ایک سابقہ پر مشتمل ہوتا ہے جسے پہلی پوزیشن میں بیان کیا جا سکتا ہے اس کے بعد فریق ثالث کے کوڈ میں بیان کردہ حروف کی تعداد۔
+ModuleCompanyCodeCustomerDigitaria=%s کے بعد حروف کی تعداد کے لحاظ سے کٹا ہوا کسٹمر کا نام: کسٹمر اکاؤنٹنگ کوڈ کے لیے %s۔
+ModuleCompanyCodeSupplierDigitaria=%s اس کے بعد حروف کی تعداد کے لحاظ سے کٹا ہوا سپلائر کا نام: سپلائر اکاؤنٹنگ کوڈ کے لیے %s۔
+Use3StepsApproval=پہلے سے طے شدہ طور پر، خریداری کے آرڈرز کو 2 مختلف صارفین کے ذریعے تخلیق اور منظور کرنے کی ضرورت ہے (ایک قدم/صارف تخلیق کرنے کے لیے اور ایک قدم/صارف کو منظور کرنے کے لیے۔ نوٹ کریں کہ اگر صارف کے پاس تخلیق اور منظوری دونوں کی اجازت ہے، تو ایک قدم/صارف کافی ہوگا) . آپ اس اختیار کے ساتھ تیسرا مرحلہ/صارف کی منظوری متعارف کرانے کے لیے کہہ سکتے ہیں، اگر رقم وقف شدہ قدر سے زیادہ ہے (لہذا 3 مراحل ضروری ہوں گے: 1=توثیق، 2=پہلی منظوری اور 3=دوسری منظوری اگر رقم کافی ہے)۔ <br> اسے خالی پر سیٹ کریں اگر ایک منظوری (2 قدم) کافی ہے، اسے بہت کم قیمت (0.1) پر سیٹ کریں اگر دوسری منظوری (3 مراحل) کی ہمیشہ ضرورت ہو۔
+UseDoubleApproval=جب رقم (بغیر ٹیکس) سے زیادہ ہو تو 3 مراحل کی منظوری کا استعمال کریں...
+WarningPHPMail=انتباہ: ایپلیکیشن سے ای میلز بھیجنے کا سیٹ اپ ڈیفالٹ عام سیٹ اپ استعمال کر رہا ہے۔ کئی وجوہات کی بنا پر ڈیفالٹ سیٹ اپ کے بجائے اپنے ای میل سروس پرووائیڈر کا ای میل سرور استعمال کرنے کے لیے آؤٹ گوئنگ ای میلز کو سیٹ اپ کرنا اکثر بہتر ہوتا ہے:
+WarningPHPMailA=- ای میل سروس فراہم کنندہ کے سرور کا استعمال آپ کے ای میل کی قابل اعتمادیت کو بڑھاتا ہے، لہذا یہ سپیم کے طور پر نشان زد کیے بغیر ڈیلیوریبلٹی کو بڑھاتا ہے۔
+WarningPHPMailB=- کچھ ای میل سروس فراہم کرنے والے (جیسے Yahoo) آپ کو اپنے سرور کے بجائے کسی دوسرے سرور سے ای میل بھیجنے کی اجازت نہیں دیتے ہیں۔ آپ کا موجودہ سیٹ اپ ای میل بھیجنے کے لیے ایپلیکیشن کے سرور کا استعمال کرتا ہے نہ کہ آپ کے ای میل فراہم کنندہ کا سرور، اس لیے کچھ وصول کنندگان (جو پابندی والے DMARC پروٹوکول کے ساتھ مطابقت رکھتا ہے) آپ کے ای میل فراہم کنندہ سے پوچھیں گے کہ کیا وہ آپ کی ای میل اور کچھ ای میل فراہم کنندگان کو قبول کر سکتے ہیں۔ (جیسے Yahoo) "نہیں" میں جواب دے سکتا ہے کیونکہ سرور ان کا نہیں ہے، اس لیے آپ کی بھیجی گئی ای میلز میں سے کچھ کو ڈیلیوری کے لیے قبول نہیں کیا جا سکتا ہے (اپنے ای میل فراہم کنندہ کے بھیجنے کے کوٹے سے بھی محتاط رہیں)۔
+WarningPHPMailC=- ای میلز بھیجنے کے لیے آپ کے اپنے ای میل سروس پرووائیڈر کے SMTP سرور کا استعمال کرنا بھی دلچسپ ہے اس لیے ایپلی کیشن سے بھیجی گئی تمام ای میلز آپ کے میل باکس کی "بھیجی گئی" ڈائرکٹری میں بھی محفوظ ہو جائیں گی۔
+WarningPHPMailD=نیز، اس لیے ای میل بھیجنے کے طریقے کو "SMTP" کی قدر میں تبدیل کرنے کی سفارش کی جاتی ہے۔ اگر آپ واقعی ای میلز بھیجنے کے لیے پہلے سے طے شدہ "PHP" طریقہ کو برقرار رکھنا چاہتے ہیں، تو صرف اس انتباہ کو نظر انداز کریں، یا ہوم - سیٹ اپ - دیگر میں MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP مستقل کو 1 پر سیٹ کرکے اسے ہٹا دیں۔
+WarningPHPMail2=اگر آپ کے ای میل SMTP فراہم کنندہ کو ای میل کلائنٹ کو کچھ IP پتوں تک محدود کرنے کی ضرورت ہے (بہت کم)، یہ آپ کی ERP CRM درخواست کے لیے میل صارف ایجنٹ (MUA) کا IP پتہ ہے: <strong> %s </strong>۔
+WarningPHPMailSPF=اگر آپ کے بھیجنے والے کے ای میل ایڈریس میں موجود ڈومین کا نام SPF ریکارڈ کے ذریعے محفوظ ہے (اپنے ڈومین نام کے رجسٹرار سے پوچھیں)، تو آپ کو اپنے ڈومین کے DNS کے SPF ریکارڈ میں درج ذیل آئی پیز کو شامل کرنا ہوگا: <strong> %s a0a65d071f6f6fz0.
+ActualMailSPFRecordFound=اصل SPF ریکارڈ ملا: %s
+ClickToShowDescription=تفصیل دکھانے کے لیے کلک کریں۔
+DependsOn=اس ماڈیول کو ماڈیول کی ضرورت ہے
+RequiredBy=یہ ماڈیول ماڈیول (زبانوں) کو درکار ہے
+TheKeyIsTheNameOfHtmlField=یہ HTML فیلڈ کا نام ہے۔ کسی فیلڈ کا کلیدی نام حاصل کرنے کے لیے HTML صفحہ کے مواد کو پڑھنے کے لیے تکنیکی علم کی ضرورت ہوتی ہے۔
+PageUrlForDefaultValues=آپ کو صفحہ کے URL کا رشتہ دار راستہ درج کرنا ہوگا۔ اگر آپ URL میں پیرامیٹرز کو شامل کرتے ہیں، تو ڈیفالٹ قدریں مؤثر ہوں گی اگر تمام پیرامیٹرز ایک ہی قدر پر سیٹ ہوں۔
+PageUrlForDefaultValuesCreate= <br> مثال: <br> ایک نیا فریق ثالث بنانے کے لیے، یہ ہے <strong> %s </strong> ۔ <br> کسٹم ڈائرکٹری میں نصب بیرونی ماڈیولز کے URL کے لیے، "کسٹم/" شامل نہ کریں، اس لیے <strong> mymodule/mypage.php </strong> جیسا راستہ استعمال کریں نہ کہ custom/mymodule/mypage.php۔ <br> اگر آپ صرف اس صورت میں ڈیفالٹ قدر چاہتے ہیں جب url میں کچھ پیرامیٹر ہو تو آپ <strong> %s </strong> استعمال کرسکتے ہیں۔
+PageUrlForDefaultValuesList= <br> مثال: <br> تیسرے فریقوں کی فہرست والے صفحہ کے لیے، یہ <strong> %s </strong> ہے۔ <br> کسٹم ڈائرکٹری میں نصب بیرونی ماڈیولز کے URL کے لیے، "کسٹم/" شامل نہ کریں اس لیے <strong> mymodule/mypagelist.php </strong> جیسا راستہ استعمال کریں نہ کہ custom/mymodule/mypage.list. <br> اگر آپ صرف اس صورت میں ڈیفالٹ قدر چاہتے ہیں جب url میں کچھ پیرامیٹر ہو تو آپ <strong> %s </strong> استعمال کرسکتے ہیں۔
+AlsoDefaultValuesAreEffectiveForActionCreate=یہ بھی نوٹ کریں کہ فارم بنانے کے لیے پہلے سے طے شدہ اقدار کو اوور رائٹنگ کرنا صرف ان صفحات کے لیے کام کرتا ہے جو درست طریقے سے ڈیزائن کیے گئے تھے (لہذا پیرامیٹر ایکشن = تخلیق یا پیش کریں...)
+EnableDefaultValues=ڈیفالٹ اقدار کی حسب ضرورت کو فعال کریں۔
+EnableOverwriteTranslation=اوور رائٹ ترجمہ کے استعمال کو فعال کریں۔
+GoIntoTranslationMenuToChangeThis=اس کوڈ والی کلید کا ترجمہ ملا ہے۔ اس قدر کو تبدیل کرنے کے لیے، آپ کو Home-Setup-translation سے اس میں ترمیم کرنا ہوگی۔
+WarningSettingSortOrder=تنبیہ، پہلے سے طے شدہ ترتیب ترتیب دینے کے نتیجے میں فہرست کے صفحہ پر جاتے وقت تکنیکی خرابی ہو سکتی ہے اگر فیلڈ ایک نامعلوم فیلڈ ہے۔ اگر آپ کو ایسی غلطی کا سامنا کرنا پڑتا ہے تو، پہلے سے طے شدہ ترتیب کو ہٹانے اور پہلے سے طے شدہ رویے کو بحال کرنے کے لیے اس صفحہ پر واپس آئیں۔
+Field=میدان
+ProductDocumentTemplates=پروڈکٹ کی دستاویز تیار کرنے کے لیے دستاویزی ٹیمپلیٹس
+FreeLegalTextOnExpenseReports=اخراجات کی رپورٹوں پر مفت قانونی متن
+WatermarkOnDraftExpenseReports=ڈرافٹ اخراجات کی رپورٹوں پر واٹر مارک
+ProjectIsRequiredOnExpenseReports=اخراجات کی رپورٹ درج کرنے کے لیے پروجیکٹ لازمی ہے۔
+PrefillExpenseReportDatesWithCurrentMonth=موجودہ مہینے کی شروع اور اختتامی تاریخوں کے ساتھ نئے اخراجات کی رپورٹ کے آغاز اور اختتامی تاریخوں کو پہلے سے پُر کریں۔
+ForceExpenseReportsLineAmountsIncludingTaxesOnly=اخراجات کی رپورٹ کی رقم کو ہمیشہ ٹیکس کے ساتھ رقم میں داخل کرنے پر مجبور کریں۔
+AttachMainDocByDefault=اگر آپ بنیادی دستاویز کو بطور ڈیفالٹ ای میل کے ساتھ منسلک کرنا چاہتے ہیں تو اسے 1 پر سیٹ کریں (اگر قابل اطلاق ہو)
+FilesAttachedToEmail=فائل منسلک
+SendEmailsReminders=ای میلز کے ذریعے ایجنڈے کی یاددہانی بھیجیں۔
+davDescription=WebDAV سرور سیٹ اپ کریں۔
+DAVSetup=ماڈیول DAV کا سیٹ اپ
+DAV_ALLOW_PRIVATE_DIR=عام پرائیویٹ ڈائرکٹری کو فعال کریں (ویب ڈی اے وی ڈیڈیکیٹڈ ڈائرکٹری جس کا نام "پرائیویٹ" ہے - لاگ ان درکار ہے)
+DAV_ALLOW_PRIVATE_DIRTooltip=عام پرائیویٹ ڈائرکٹری ایک WebDAV ڈائرکٹری ہے جس تک کوئی بھی اس کے ایپلیکیشن لاگ ان/پاس سے رسائی حاصل کرسکتا ہے۔
+DAV_ALLOW_PUBLIC_DIR=عام پبلک ڈائرکٹری کو فعال کریں (ویب ڈی اے وی کی سرشار ڈائریکٹری جس کا نام "عوامی" ہے - لاگ ان کی ضرورت نہیں ہے)
+DAV_ALLOW_PUBLIC_DIRTooltip=عام پبلک ڈائرکٹری ایک WebDAV ڈائرکٹری ہے جو کوئی بھی رسائی کر سکتا ہے (پڑھنے اور لکھنے کے موڈ میں)، بغیر کسی اجازت کے (لاگ ان/پاس ورڈ اکاؤنٹ)۔
+DAV_ALLOW_ECM_DIR=DMS/ECM نجی ڈائریکٹری کو فعال کریں (DMS/ECM ماڈیول کی روٹ ڈائرکٹری - لاگ ان درکار ہے)
+DAV_ALLOW_ECM_DIRTooltip=روٹ ڈائرکٹری جہاں DMS/ECM ماڈیول استعمال کرتے وقت تمام فائلیں دستی طور پر اپ لوڈ کی جاتی ہیں۔ اسی طرح ویب انٹرفیس سے رسائی کے طور پر، آپ کو اس تک رسائی کے لیے مناسب اجازت کے ساتھ ایک درست لاگ ان/پاس ورڈ کی ضرورت ہوگی۔
 # Modules
-Module0Name=Users & Groups
-Module0Desc=Users / Employees and Groups management
-Module1Name=Third Parties
-Module1Desc=Companies and contacts management (customers, prospects...)
-Module2Name=Commercial
-Module2Desc=Commercial management
-Module10Name=Accounting (simplified)
-Module10Desc=Simple accounting reports (journals, turnover) based on database content. Does not use any ledger table.
-Module20Name=Proposals
-Module20Desc=Commercial proposal management
-Module22Name=Mass Emailings
-Module22Desc=Manage bulk emailing
-Module23Name=Energy
-Module23Desc=Monitoring the consumption of energies
-Module25Name=Sales Orders
-Module25Desc=Sales order management
-Module30Name=Invoices
-Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
-Module40Name=Vendors
-Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
-Module42Name=Debug Logs
-Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
-Module43Name=Debug Bar
-Module43Desc=A tool for developper adding a debug bar in your browser.
-Module49Name=Editors
-Module49Desc=Editor management
-Module50Name=Products
-Module50Desc=Management of Products
-Module51Name=Mass mailings
-Module51Desc=Mass paper mailing management
-Module52Name=Stocks
-Module52Desc=Stock management
-Module53Name=Services
-Module53Desc=Management of Services
-Module54Name=Contracts/Subscriptions
-Module54Desc=Management of contracts (services or recurring subscriptions)
-Module55Name=Barcodes
-Module55Desc=Barcode or QR code management
-Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Payments by Direct Debit
-Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
-Module58Name=ClickToDial
-Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
-Module60Name=Stickers
-Module60Desc=Management of stickers
-Module70Name=Interventions
-Module70Desc=Intervention management
-Module75Name=Expense and trip notes
-Module75Desc=Expense and trip notes management
-Module80Name=Shipments
-Module80Desc=Shipments and delivery note management
-Module85Name=Banks & Cash
-Module85Desc=Management of bank or cash accounts
-Module100Name=External Site
-Module100Desc=Add a link to an external website as a main menu icon. Website is shown in a frame under the top menu.
-Module105Name=Mailman and SPIP
-Module105Desc=Mailman or SPIP interface for member module
-Module200Name=LDAP
-Module200Desc=LDAP directory synchronization
-Module210Name=PostNuke
-Module210Desc=PostNuke integration
-Module240Name=Data exports
-Module240Desc=Tool to export Dolibarr data (with assistance)
-Module250Name=Data imports
-Module250Desc=Tool to import data into Dolibarr (with assistance)
-Module310Name=Members
-Module310Desc=Foundation members management
-Module320Name=RSS Feed
-Module320Desc=Add a RSS feed to Dolibarr pages
-Module330Name=Bookmarks & Shortcuts
-Module330Desc=Create shortcuts, always accessible, to the internal or external pages to which you frequently access
-Module400Name=Projects or Leads
-Module400Desc=Management of projects, leads/opportunities and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
-Module410Name=Webcalendar
-Module410Desc=Webcalendar integration
-Module500Name=Taxes & Special Expenses
-Module500Desc=Management of other expenses (sales taxes, social or fiscal taxes, dividends, ...)
-Module510Name=Salaries
-Module510Desc=Record and track employee payments
-Module520Name=Loans
-Module520Desc=Management of loans
-Module600Name=Notifications on business event
-Module600Desc=Send email notifications triggered by a business event: per user (setup defined on each user), per third-party contacts (setup defined on each third party) or by specific emails
-Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda.
-Module610Name=Product Variants
-Module610Desc=Creation of product variants (color, size etc.)
-Module700Name=Donations
-Module700Desc=Donation management
-Module770Name=Expense Reports
-Module770Desc=Manage expense reports claims (transportation, meal, ...)
-Module1120Name=Vendor Commercial Proposals
-Module1120Desc=Request vendor commercial proposal and prices
-Module1200Name=Mantis
-Module1200Desc=Mantis integration
-Module1520Name=Document Generation
-Module1520Desc=Mass email document generation
-Module1780Name=Tags/Categories
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
-Module2000Name=WYSIWYG editor
-Module2000Desc=Allow text fields to be edited/formatted using CKEditor (html)
-Module2200Name=Dynamic Prices
-Module2200Desc=Use maths expressions for auto-generation of prices
-Module2300Name=Scheduled jobs
-Module2300Desc=Scheduled jobs management (alias cron or chrono table)
-Module2400Name=Events/Agenda
-Module2400Desc=Track events. Log automatic events for tracking purposes or record manual events or meetings. This is the principal module for good Customer or Vendor Relationship Management.
-Module2500Name=DMS / ECM
-Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
-Module2600Name=API/Web services (SOAP server)
-Module2600Desc=Enable the Dolibarr SOAP server providing API services
-Module2610Name=API/Web services (REST server)
-Module2610Desc=Enable the Dolibarr REST server providing API services
-Module2660Name=Call WebServices (SOAP client)
-Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Only Purchase orders are currently supported.)
+Module0Name=صارفین اور گروپس
+Module0Desc=صارفین / ملازمین اور گروپوں کا انتظام
+Module1Name=تیسرے فریقوں
+Module1Desc=کمپنیاں اور رابطوں کا انتظام (گاہک، امکانات...)
+Module2Name=کمرشل
+Module2Desc=کمرشل مینجمنٹ
+Module10Name=اکاؤنٹنگ (آسان)
+Module10Desc=ڈیٹا بیس کے مواد پر مبنی سادہ اکاؤنٹنگ رپورٹس (جرائد، کاروبار)۔ کوئی لیجر ٹیبل استعمال نہیں کرتا ہے۔
+Module20Name=تجاویز
+Module20Desc=تجارتی تجویز کا انتظام
+Module22Name=بڑے پیمانے پر ای میلز
+Module22Desc=بلک ای میل کا نظم کریں۔
+Module23Name=توانائی
+Module23Desc=توانائی کی کھپت کی نگرانی
+Module25Name=سیلز آرڈرز
+Module25Desc=سیلز آرڈر مینجمنٹ
+Module30Name=رسیدیں
+Module30Desc=صارفین کے لیے رسیدوں اور کریڈٹ نوٹوں کا انتظام۔ سپلائرز کے لیے رسیدوں اور کریڈٹ نوٹوں کا انتظام
+Module40Name=فروش
+Module40Desc=وینڈرز اور پرچیز مینجمنٹ (پرچیز آرڈرز اور سپلائر انوائس کی بلنگ)
+Module42Name=ڈیبگ لاگز
+Module42Desc=لاگنگ کی سہولیات (فائل، syslog، ...) اس طرح کے لاگز تکنیکی/ڈیبگ مقاصد کے لیے ہیں۔
+Module43Name=ڈیبگ بار
+Module43Desc=آپ کے براؤزر میں ڈیبگ بار شامل کرنے والے ڈویلپر کے لیے ایک ٹول۔
+Module49Name=ایڈیٹرز
+Module49Desc=ایڈیٹر مینجمنٹ
+Module50Name=مصنوعات
+Module50Desc=مصنوعات کا انتظام
+Module51Name=بڑے پیمانے پر میلنگز
+Module51Desc=ماس پیپر میلنگ کا انتظام
+Module52Name=اسٹاکس
+Module52Desc=اسٹاک مینجمنٹ
+Module53Name=خدمات
+Module53Desc=خدمات کا انتظام
+Module54Name=معاہدے/سبسکرپشنز
+Module54Desc=معاہدوں کا انتظام (خدمات یا بار بار چلنے والی سبسکرپشنز)
+Module55Name=بارکوڈز
+Module55Desc=بارکوڈ یا کیو آر کوڈ کا انتظام
+Module56Name=کریڈٹ ٹرانسفر کے ذریعے ادائیگی
+Module56Desc=کریڈٹ ٹرانسفر آرڈرز کے ذریعے سپلائرز کی ادائیگی کا انتظام۔ اس میں یورپی ممالک کے لیے SEPA فائل کی جنریشن شامل ہے۔
+Module57Name=براہ راست ڈیبٹ کے ذریعے ادائیگیاں
+Module57Desc=ڈائریکٹ ڈیبٹ آرڈرز کا انتظام۔ اس میں یورپی ممالک کے لیے SEPA فائل کی جنریشن شامل ہے۔
+Module58Name=کلک ٹو ڈائل
+Module58Desc=ClickToDial سسٹم کا انضمام (Asterisk, ...)
+Module60Name=اسٹیکرز
+Module60Desc=اسٹیکرز کا انتظام
+Module70Name=مداخلتیں
+Module70Desc=مداخلت کا انتظام
+Module75Name=اخراجات اور سفر کے نوٹ
+Module75Desc=اخراجات اور سفر کے نوٹس کا انتظام
+Module80Name=شپمنٹس
+Module80Desc=ترسیل اور ترسیل کے نوٹ کا انتظام
+Module85Name=بینک اور کیش
+Module85Desc=بینک یا نقد کھاتوں کا انتظام
+Module100Name=بیرونی سائٹ
+Module100Desc=مین مینو آئیکن کے طور پر کسی بیرونی ویب سائٹ کا لنک شامل کریں۔ ویب سائٹ کو اوپر والے مینو کے نیچے ایک فریم میں دکھایا گیا ہے۔
+Module105Name=میل مین اور SPIP
+Module105Desc=ممبر ماڈیول کے لیے میل مین یا SPIP انٹرفیس
+Module200Name=ایل ڈی اے پی
+Module200Desc=LDAP ڈائریکٹری ہم وقت سازی
+Module210Name=پوسٹ نیوک
+Module210Desc=پوسٹ نیوک انضمام
+Module240Name=ڈیٹا ایکسپورٹ
+Module240Desc=Dolibarr ڈیٹا برآمد کرنے کا ٹول (مدد کے ساتھ)
+Module250Name=ڈیٹا کی درآمدات
+Module250Desc=Dolibarr میں ڈیٹا درآمد کرنے کا ٹول (مدد کے ساتھ)
+Module310Name=ممبران
+Module310Desc=فاؤنڈیشن کے اراکین کا انتظام
+Module320Name=آر ایس ایس فیڈ
+Module320Desc=Dolibarr صفحات پر RSS فیڈ شامل کریں۔
+Module330Name=بک مارکس اور شارٹ کٹس
+Module330Desc=شارٹ کٹس بنائیں، ہمیشہ قابل رسائی، اندرونی یا بیرونی صفحات کے لیے جن تک آپ کثرت سے رسائی حاصل کرتے ہیں۔
+Module400Name=پروجیکٹس یا لیڈز
+Module400Desc=پروجیکٹس، لیڈز/مواقع اور/یا کاموں کا انتظام۔ آپ کسی بھی عنصر (انوائس، آرڈر، تجویز، مداخلت، ...) کو کسی پروجیکٹ کو تفویض کر سکتے ہیں اور پروجیکٹ ویو سے ٹرانسورسل ویو حاصل کر سکتے ہیں۔
+Module410Name=ویب کیلنڈر
+Module410Desc=ویب کیلنڈر انضمام
+Module500Name=ٹیکس اور خصوصی اخراجات
+Module500Desc=دیگر اخراجات کا انتظام (سیلز ٹیکس، سماجی یا مالی ٹیکس، منافع، ...)
+Module510Name=تنخواہیں
+Module510Desc=ملازمین کی ادائیگیوں کو ریکارڈ اور ٹریک کریں۔
+Module520Name=قرضے
+Module520Desc=قرضوں کا انتظام
+Module600Name=کاروباری تقریب کے بارے میں اطلاعات
+Module600Desc=ای میل اطلاعات بھیجیں جو کاروباری ایونٹ کے ذریعہ شروع کی گئی ہیں: فی صارف (ہر صارف پر سیٹ اپ کی وضاحت کی گئی ہے)، تیسرے فریق کے رابطے (ہر تیسرے فریق پر سیٹ اپ کی وضاحت کی گئی ہے) یا مخصوص ای میلز کے ذریعے
+Module600Long=نوٹ کریں کہ یہ ماڈیول ریئل ٹائم میں ای میلز بھیجتا ہے جب کوئی مخصوص کاروباری واقعہ ہوتا ہے۔ اگر آپ ایجنڈے کے واقعات کے لیے ای میل یاددہانی بھیجنے کے لیے فیچر تلاش کر رہے ہیں، تو ماڈیول ایجنڈا کے سیٹ اپ میں جائیں۔
+Module610Name=مصنوعات کی مختلف حالتیں
+Module610Desc=مصنوعات کی مختلف قسموں کی تخلیق (رنگ، سائز وغیرہ)
+Module700Name=عطیات
+Module700Desc=عطیہ کا انتظام
+Module770Name=اخراجات کی رپورٹس
+Module770Desc=اخراجات کی رپورٹ کے دعووں کا انتظام کریں (ٹرانسپورٹیشن، کھانا، ...)
+Module1120Name=وینڈر کمرشل پروپوزل
+Module1120Desc=فروش تجارتی تجویز اور قیمتوں کی درخواست کریں۔
+Module1200Name=مینٹیس
+Module1200Desc=Mantis انضمام
+Module1520Name=دستاویز کی تخلیق
+Module1520Desc=بڑے پیمانے پر ای میل دستاویز تیار کرنا
+Module1780Name=ٹیگز/زمرہیں۔
+Module1780Desc=ٹیگ/زمرہ بنائیں (مصنوعات، گاہک، سپلائرز، رابطے یا اراکین)
+Module2000Name=WYSIWYG ایڈیٹر
+Module2000Desc=CKEditor (html) کا استعمال کرتے ہوئے ٹیکسٹ فیلڈز میں ترمیم/فارمیٹ کرنے کی اجازت دیں
+Module2200Name=متحرک قیمتیں
+Module2200Desc=قیمتوں کی خودکار تخلیق کے لیے ریاضی کے تاثرات استعمال کریں۔
+Module2300Name=طے شدہ ملازمتیں۔
+Module2300Desc=طے شدہ ملازمتوں کا انتظام (عرف کرون یا کرونو ٹیبل)
+Module2400Name=تقریبات/ایجنڈا
+Module2400Desc=واقعات کو ٹریک کریں۔ ٹریکنگ کے مقاصد کے لیے خودکار ایونٹس کو لاگ کریں یا دستی ایونٹس یا میٹنگز کو ریکارڈ کریں۔ یہ اچھے کسٹمر یا وینڈر ریلیشن شپ مینجمنٹ کے لیے پرنسپل ماڈیول ہے۔
+Module2500Name=ڈی ایم ایس / ای سی ایم
+Module2500Desc=دستاویز مینجمنٹ سسٹم / الیکٹرانک مواد کا انتظام۔ آپ کے تیار کردہ یا ذخیرہ شدہ دستاویزات کی خودکار تنظیم۔ جب آپ کو ضرورت ہو تو ان کا اشتراک کریں۔
+Module2600Name=API/ویب خدمات (SOAP سرور)
+Module2600Desc=API خدمات فراہم کرنے والے Dolibarr SOAP سرور کو فعال کریں۔
+Module2610Name=API/ویب خدمات (REST سرور)
+Module2610Desc=API خدمات فراہم کرنے والے Dolibarr REST سرور کو فعال کریں۔
+Module2660Name=ویب سروسز کو کال کریں (SOAP کلائنٹ)
+Module2660Desc=Dolibarr ویب سروسز کلائنٹ کو فعال کریں (ڈیٹا/درخواستوں کو بیرونی سرورز تک پہنچانے کے لیے استعمال کیا جا سکتا ہے۔ فی الحال صرف پرچیز آرڈرز سپورٹ ہیں۔)
 Module2700Name=Gravatar
-Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Needs Internet access
-Module2800Desc=FTP Client
+Module2700Desc=صارفین/ممبران کی تصویر دکھانے کے لیے آن لائن Gravatar سروس (www.gravatar.com) استعمال کریں (ان کے ای میلز کے ساتھ ملیں)۔ انٹرنیٹ تک رسائی کی ضرورت ہے۔
+Module2800Desc=ایف ٹی پی کلائنٹ
 Module2900Name=GeoIPMaxmind
-Module2900Desc=GeoIP Maxmind conversions capabilities
-Module3200Name=Unalterable Archives
-Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
-Module3400Name=Social Networks
-Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
+Module2900Desc=GeoIP میکس مائنڈ تبادلوں کی صلاحیتیں۔
+Module3200Name=ناقابل تبدیلی آرکائیوز
+Module3200Desc=کاروباری واقعات کا ایک غیر تبدیل شدہ لاگ کو فعال کریں۔ واقعات کو حقیقی وقت میں محفوظ کیا جاتا ہے۔ لاگ ان زنجیروں سے جڑے واقعات کی صرف پڑھنے کے لیے جدول ہے جسے برآمد کیا جا سکتا ہے۔ یہ ماڈیول کچھ ممالک کے لیے لازمی ہو سکتا ہے۔
+Module3400Name=سوشل نیٹ ورک
+Module3400Desc=سوشل نیٹ ورکس فیلڈز کو تھرڈ پارٹیز اور ایڈریسز (سکائپ، ٹویٹر، فیس بک، ...) میں فعال کریں۔
 Module4000Name=HRM
-Module4000Desc=Human resources management (management of department, employee contracts and feelings)
-Module5000Name=Multi-company
-Module5000Desc=Allows you to manage multiple companies
-Module6000Name=Inter-modules Workflow
-Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
-Module10000Name=Websites
-Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
-Module20000Name=Leave Request Management
-Module20000Desc=Define and track employee leave requests
-Module39000Name=Product Lots
-Module39000Desc=Lots, serial numbers, eat-by/sell-by date management for products
-Module40000Name=Multicurrency
-Module40000Desc=Use alternative currencies in prices and documents
-Module50000Name=PayBox
-Module50000Desc=Offer customers a PayBox online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
+Module4000Desc=انسانی وسائل کا انتظام (محکمہ کا انتظام، ملازمین کے معاہدے اور احساسات)
+Module5000Name=ملٹی کمپنی
+Module5000Desc=آپ کو متعدد کمپنیوں کا انتظام کرنے کی اجازت دیتا ہے۔
+Module6000Name=انٹر ماڈیول ورک فلو
+Module6000Desc=مختلف ماڈیولز کے درمیان ورک فلو کا انتظام (آبجیکٹ کی خودکار تخلیق اور/یا خودکار حیثیت کی تبدیلی)
+Module10000Name=ویب سائٹس
+Module10000Desc=WYSIWYG ایڈیٹر کے ساتھ ویب سائٹس (عوامی) بنائیں۔ یہ ویب ماسٹر یا ڈویلپر پر مبنی CMS ہے (HTML اور CSS کی زبان جاننا بہتر ہے)۔ بس اپنے ویب سرور (Apache, Nginx, ...) کو اپنے ڈومین نام کے ساتھ انٹرنیٹ پر آن لائن رکھنے کے لیے وقف شدہ Dolibarr ڈائریکٹری کی طرف اشارہ کرنے کے لیے سیٹ اپ کریں۔
+Module20000Name=درخواست کا انتظام چھوڑ دیں۔
+Module20000Desc=ملازم کی چھٹی کی درخواستوں کی وضاحت اور ٹریک کریں۔
+Module39000Name=پروڈکٹ لاٹ
+Module39000Desc=پروڈکٹس کے لیے لاٹ، سیریل نمبرز، کھانے کے لحاظ سے/فروخت کے لحاظ سے تاریخ کا انتظام
+Module40000Name=ملٹی کرنسی
+Module40000Desc=قیمتوں اور دستاویزات میں متبادل کرنسیوں کا استعمال کریں۔
+Module50000Name=پے باکس
+Module50000Desc=صارفین کو ایک PayBox آن لائن ادائیگی کا صفحہ (کریڈٹ/ڈیبٹ کارڈ) پیش کریں۔ اس کا استعمال آپ کے صارفین کو ایڈہاک ادائیگیوں یا کسی مخصوص Dolibarr آبجیکٹ (انوائس، آرڈر وغیرہ...) سے متعلق ادائیگی کرنے کی اجازت دینے کے لیے کیا جا سکتا ہے۔
 Module50100Name=POS SimplePOS
-Module50100Desc=Point of Sale module SimplePOS (simple POS).
+Module50100Desc=پوائنٹ آف سیل ماڈیول SimplePOS (سادہ POS)۔
 Module50150Name=POS TakePOS
-Module50150Desc=Point of Sale module TakePOS (touchscreen POS, for shops, bars or restaurants).
-Module50200Name=Paypal
-Module50200Desc=Offer customers a PayPal online payment page (PayPal account or credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
-Module50300Name=Stripe
-Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
-Module50400Name=Accounting (double entry)
-Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
-Module54000Name=PrintIPP
-Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
-Module55000Name=Poll, Survey or Vote
-Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
-Module59000Name=Margins
-Module59000Desc=Module to follow margins
-Module60000Name=Commissions
-Module60000Desc=Module to manage commissions
-Module62000Name=Incoterms
-Module62000Desc=Add features to manage Incoterms
-Module63000Name=Resources
-Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
-Permission11=Read customer invoices
-Permission12=Create/modify customer invoices
-Permission13=Invalidate customer invoices
-Permission14=Validate customer invoices
-Permission15=Send customer invoices by email
-Permission16=Create payments for customer invoices
-Permission19=Delete customer invoices
-Permission21=Read commercial proposals
-Permission22=Create/modify commercial proposals
-Permission24=Validate commercial proposals
-Permission25=Send commercial proposals
-Permission26=Close commercial proposals
-Permission27=Delete commercial proposals
-Permission28=Export commercial proposals
-Permission31=Read products
-Permission32=Create/modify products
-Permission34=Delete products
-Permission36=See/manage hidden products
-Permission38=Export products
-Permission39=Ignore minimum price
-Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
-Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
-Permission44=Delete projects (shared project and projects I'm contact for)
-Permission45=Export projects
-Permission61=Read interventions
-Permission62=Create/modify interventions
-Permission64=Delete interventions
-Permission67=Export interventions
-Permission68=Send interventions by email
-Permission69=Validate interventions
-Permission70=Invalidate interventions
-Permission71=Read members
-Permission72=Create/modify members
-Permission74=Delete members
-Permission75=Setup types of membership
-Permission76=Export data
-Permission78=Read subscriptions
-Permission79=Create/modify subscriptions
-Permission81=Read customers orders
-Permission82=Create/modify customers orders
-Permission84=Validate customers orders
-Permission86=Send customers orders
-Permission87=Close customers orders
-Permission88=Cancel customers orders
-Permission89=Delete customers orders
-Permission91=Read social or fiscal taxes and vat
-Permission92=Create/modify social or fiscal taxes and vat
-Permission93=Delete social or fiscal taxes and vat
-Permission94=Export social or fiscal taxes
-Permission95=Read reports
-Permission101=Read sendings
-Permission102=Create/modify sendings
-Permission104=Validate sendings
-Permission105=Send sendings by email
-Permission106=Export sendings
-Permission109=Delete sendings
-Permission111=Read financial accounts
-Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
-Permission114=Reconcile transactions
-Permission115=Export transactions and account statements
-Permission116=Transfers between accounts
-Permission117=Manage checks dispatching
-Permission121=Read third parties linked to user
-Permission122=Create/modify third parties linked to user
-Permission125=Delete third parties linked to user
-Permission126=Export third parties
-Permission130=Create/modify third parties payment information
-Permission141=Read all projects and tasks (also private projects for which I am not a contact)
-Permission142=Create/modify all projects and tasks (also private projects for which I am not a contact)
-Permission144=Delete all projects and tasks (also private projects i am not contact for)
-Permission146=Read providers
-Permission147=Read stats
-Permission151=Read direct debit payment orders
-Permission152=Create/modify a direct debit payment orders
-Permission153=Send/Transmit direct debit payment orders
-Permission154=Record Credits/Rejections of direct debit payment orders
-Permission161=Read contracts/subscriptions
-Permission162=Create/modify contracts/subscriptions
-Permission163=Activate a service/subscription of a contract
-Permission164=Disable a service/subscription of a contract
-Permission165=Delete contracts/subscriptions
-Permission167=Export contracts
-Permission171=Read trips and expenses (yours and your subordinates)
-Permission172=Create/modify trips and expenses
-Permission173=Delete trips and expenses
-Permission174=Read all trips and expenses
-Permission178=Export trips and expenses
-Permission180=Read suppliers
-Permission181=Read purchase orders
-Permission182=Create/modify purchase orders
-Permission183=Validate purchase orders
-Permission184=Approve purchase orders
-Permission185=Order or cancel purchase orders
-Permission186=Receive purchase orders
-Permission187=Close purchase orders
-Permission188=Cancel purchase orders
-Permission192=Create lines
-Permission193=Cancel lines
-Permission194=Read the bandwidth lines
-Permission202=Create ADSL connections
-Permission203=Order connections orders
-Permission204=Order connections
-Permission205=Manage connections
-Permission206=Read connections
-Permission211=Read Telephony
-Permission212=Order lines
-Permission213=Activate line
-Permission214=Setup Telephony
-Permission215=Setup providers
-Permission221=Read emailings
-Permission222=Create/modify emailings (topic, recipients...)
-Permission223=Validate emailings (allows sending)
-Permission229=Delete emailings
-Permission237=View recipients and info
-Permission238=Manually send mailings
-Permission239=Delete mailings after validation or sent
-Permission241=Read categories
-Permission242=Create/modify categories
-Permission243=Delete categories
-Permission244=See the contents of the hidden categories
-Permission251=Read other users and groups
-PermissionAdvanced251=Read other users
-Permission252=Read permissions of other users
-Permission253=Create/modify other users, groups and permissions
-PermissionAdvanced253=Create/modify internal/external users and permissions
-Permission254=Create/modify external users only
-Permission255=Modify other users password
-Permission256=Delete or disable other users
-Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
-Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
-Permission271=Read CA
-Permission272=Read invoices
-Permission273=Issue invoices
-Permission281=Read contacts
-Permission282=Create/modify contacts
-Permission283=Delete contacts
-Permission286=Export contacts
-Permission291=Read tariffs
-Permission292=Set permissions on the tariffs
-Permission293=Modify customer's tariffs
-Permission300=Read barcodes
-Permission301=Create/modify barcodes
-Permission302=Delete barcodes
-Permission311=Read services
-Permission312=Assign service/subscription to contract
-Permission331=Read bookmarks
-Permission332=Create/modify bookmarks
-Permission333=Delete bookmarks
-Permission341=Read its own permissions
-Permission342=Create/modify his own user information
-Permission343=Modify his own password
-Permission344=Modify its own permissions
-Permission351=Read groups
-Permission352=Read groups permissions
-Permission353=Create/modify groups
-Permission354=Delete or disable groups
-Permission358=Export users
-Permission401=Read discounts
-Permission402=Create/modify discounts
-Permission403=Validate discounts
-Permission404=Delete discounts
-Permission430=Use Debug Bar
-Permission511=Read salaries and payments (yours and subordinates)
-Permission512=Create/modify salaries and payments
-Permission514=Delete salaries and payments
-Permission517=Read salaries and payments everybody
-Permission519=Export salaries
-Permission520=Read Loans
-Permission522=Create/modify loans
-Permission524=Delete loans
-Permission525=Access loan calculator
-Permission527=Export loans
-Permission531=Read services
-Permission532=Create/modify services
-Permission534=Delete services
-Permission536=See/manage hidden services
-Permission538=Export services
-Permission561=Read payment orders by credit transfer
-Permission562=Create/modify payment order by credit transfer
-Permission563=Send/Transmit payment order by credit transfer
-Permission564=Record Debits/Rejections of credit transfer
-Permission601=Read stickers
-Permission602=Create/modify stickers
-Permission609=Delete stickers
-Permission650=Read Bills of Materials
-Permission651=Create/Update Bills of Materials
-Permission652=Delete Bills of Materials
-Permission660=Read Manufacturing Order (MO)
-Permission661=Create/Update Manufacturing Order (MO)
-Permission662=Delete Manufacturing Order (MO)
-Permission701=Read donations
-Permission702=Create/modify donations
-Permission703=Delete donations
-Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
-Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
-Permission775=Approve expense reports
-Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
-Permission778=Create/modify expense reports of everybody
-Permission779=Export expense reports
-Permission1001=Read stocks
-Permission1002=Create/modify warehouses
-Permission1003=Delete warehouses
-Permission1004=Read stock movements
-Permission1005=Create/modify stock movements
-Permission1011=View inventories
-Permission1012=Create new inventory
-Permission1014=Validate inventory
-Permission1015=Allow to change PMP value for a product
-Permission1016=Delete inventory
-Permission1101=Read delivery receipts
-Permission1102=Create/modify delivery receipts
-Permission1104=Validate delivery receipts
-Permission1109=Delete delivery receipts
-Permission1121=Read supplier proposals
-Permission1122=Create/modify supplier proposals
-Permission1123=Validate supplier proposals
-Permission1124=Send supplier proposals
-Permission1125=Delete supplier proposals
-Permission1126=Close supplier price requests
-Permission1181=Read suppliers
-Permission1182=Read purchase orders
-Permission1183=Create/modify purchase orders
-Permission1184=Validate purchase orders
-Permission1185=Approve purchase orders
-Permission1186=Order purchase orders
-Permission1187=Acknowledge receipt of purchase orders
-Permission1188=Delete purchase orders
-Permission1189=Check/Uncheck a purchase order reception
-Permission1190=Approve (second approval) purchase orders
-Permission1191=Export supplier orders and their attributes
-Permission1201=Get result of an export
-Permission1202=Create/Modify an export
-Permission1231=Read vendor invoices
-Permission1232=Create/modify vendor invoices
-Permission1233=Validate vendor invoices
-Permission1234=Delete vendor invoices
-Permission1235=Send vendor invoices by email
-Permission1236=Export vendor invoices, attributes and payments
-Permission1237=Export purchase orders and their details
-Permission1251=Run mass imports of external data into database (data load)
-Permission1321=Export customer invoices, attributes and payments
-Permission1322=Reopen a paid bill
-Permission1421=Export sales orders and attributes
-Permission1521=Read documents
-Permission1522=Delete documents
-Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
-Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
-Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
-Permission2411=Read actions (events or tasks) of others
-Permission2412=Create/modify actions (events or tasks) of others
-Permission2413=Delete actions (events or tasks) of others
-Permission2414=Export actions/tasks of others
-Permission2501=Read/Download documents
-Permission2502=Download documents
-Permission2503=Submit or delete documents
-Permission2515=Setup documents directories
-Permission2801=Use FTP client in read mode (browse and download only)
-Permission2802=Use FTP client in write mode (delete or upload files)
-Permission3200=Read archived events and fingerprints
-Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
-Permission4022=Validate evaluation
-Permission4023=Delete evaluation
-Permission4030=See comparison menu
-Permission10001=Read website content
-Permission10002=Create/modify website content (html and javascript content)
-Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
-Permission10005=Delete website content
-Permission20001=Read leave requests (your leave and those of your subordinates)
-Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
-Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
-Permission20007=Approve leave requests
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
-Permission50101=Use Point of Sale (SimplePOS)
-Permission50151=Use Point of Sale (TakePOS)
-Permission50152=Edit sales lines
-Permission50153=Edit ordered sales lines
-Permission50201=Read transactions
-Permission50202=Import transactions
-Permission50330=Read objects of Zapier
-Permission50331=Create/Update objects of Zapier
-Permission50332=Delete objects of Zapier
-Permission50401=Bind products and invoices with accounting accounts
-Permission50411=Read operations in ledger
-Permission50412=Write/Edit operations in ledger
-Permission50414=Delete operations in ledger
-Permission50415=Delete all operations by year and journal in ledger
-Permission50418=Export operations of the ledger
-Permission50420=Report and export reports (turnover, balance, journals, ledger)
-Permission50430=Define fiscal periods. Validate transactions and close fiscal periods.
-Permission50440=Manage chart of accounts, setup of accountancy
-Permission51001=Read assets
-Permission51002=Create/Update assets
-Permission51003=Delete assets
-Permission51005=Setup types of asset
-Permission54001=Print
-Permission55001=Read polls
-Permission55002=Create/modify polls
-Permission59001=Read commercial margins
-Permission59002=Define commercial margins
-Permission59003=Read every user margin
-Permission63001=Read resources
-Permission63002=Create/modify resources
-Permission63003=Delete resources
-Permission63004=Link resources to agenda events
-Permission64001=Allow direct printing
-Permission67000=Allow printing of receipts
-Permission68001=Read intracomm report
-Permission68002=Create/modify intracomm report
-Permission68004=Delete intracomm report
-Permission941601=Read receipts
-Permission941602=Create and modify receipts
-Permission941603=Validate receipts
-Permission941604=Send receipts by email
-Permission941605=Export receipts
-Permission941606=Delete receipts
-DictionaryCompanyType=Third-party types
-DictionaryCompanyJuridicalType=Third-party legal entities
-DictionaryProspectLevel=Prospect potential level for companies
-DictionaryProspectContactLevel=Prospect potential level for contacts
-DictionaryCanton=States/Provinces
-DictionaryRegion=Regions
-DictionaryCountry=Countries
-DictionaryCurrency=Currencies
-DictionaryCivility=Honorific titles
-DictionaryActions=Types of agenda events
-DictionarySocialContributions=Types of social or fiscal taxes
-DictionaryVAT=VAT Rates or Sales Tax Rates
-DictionaryRevenueStamp=Amount of tax stamps
-DictionaryPaymentConditions=Payment Terms
-DictionaryPaymentModes=Payment Modes
-DictionaryTypeContact=Contact/Address types
-DictionaryTypeOfContainer=Website - Type of website pages/containers
+Module50150Desc=پوائنٹ آف سیل ماڈیول TakePOS (ٹچ اسکرین POS، دکانوں، باروں یا ریستوراں کے لیے)۔
+Module50200Name=پے پال
+Module50200Desc=صارفین کو ایک پے پال آن لائن ادائیگی کا صفحہ پیش کریں (پے پال اکاؤنٹ یا کریڈٹ/ڈیبٹ کارڈز)۔ اس کا استعمال آپ کے صارفین کو ایڈہاک ادائیگیوں یا کسی مخصوص Dolibarr آبجیکٹ (انوائس، آرڈر وغیرہ...) سے متعلق ادائیگی کرنے کی اجازت دینے کے لیے کیا جا سکتا ہے۔
+Module50300Name=پٹی
+Module50300Desc=صارفین کو سٹرائپ آن لائن ادائیگی کا صفحہ (کریڈٹ/ڈیبٹ کارڈ) پیش کریں۔ اس کا استعمال آپ کے صارفین کو ایڈہاک ادائیگیوں یا کسی مخصوص Dolibarr آبجیکٹ (انوائس، آرڈر وغیرہ...) سے متعلق ادائیگی کرنے کی اجازت دینے کے لیے کیا جا سکتا ہے۔
+Module50400Name=اکاؤنٹنگ (ڈبل انٹری)
+Module50400Desc=اکاؤنٹنگ مینجمنٹ (ڈبل اندراجات، سپورٹ جنرل اور سبسڈیری لیجرز)۔ لیجر کو کئی دوسرے اکاؤنٹنگ سافٹ ویئر فارمیٹس میں برآمد کریں۔
+Module54000Name=پرنٹ آئی پی پی
+Module54000Desc=کپ IPP انٹرفیس کا استعمال کرتے ہوئے براہ راست پرنٹ (دستاویزات کھولے بغیر) (پرنٹر سرور سے نظر آنا چاہیے، اور CUPS سرور پر انسٹال ہونا چاہیے)۔
+Module55000Name=رائے شماری، سروے یا ووٹ
+Module55000Desc=آن لائن پولز، سروے یا ووٹ بنائیں (جیسے Doodle، Studs، RDVz وغیرہ...)
+Module59000Name=حاشیہ
+Module59000Desc=مارجن کی پیروی کرنے کے لیے ماڈیول
+Module60000Name=کمیشن
+Module60000Desc=کمیشن کے انتظام کے لیے ماڈیول
+Module62000Name=انکوٹرمز
+Module62000Desc=Incoterms کا نظم کرنے کے لیے خصوصیات شامل کریں۔
+Module63000Name=حوالہ جات
+Module63000Desc=ایونٹس کو مختص کرنے کے لیے وسائل (پرنٹرز، کاریں، کمرے، ...) کا نظم کریں۔
+Permission11=کسٹمر کی رسیدیں پڑھیں
+Permission12=کسٹمر انوائس بنائیں/ترمیم کریں۔
+Permission13=گاہک کی رسیدیں باطل کریں۔
+Permission14=کسٹمر انوائس کی توثیق کریں۔
+Permission15=ای میل کے ذریعے کسٹمر انوائس بھیجیں۔
+Permission16=کسٹمر انوائس کے لیے ادائیگیاں بنائیں
+Permission19=کسٹمر کی رسیدیں حذف کریں۔
+Permission21=تجارتی تجاویز پڑھیں
+Permission22=تجارتی تجاویز بنائیں/ترمیم کریں۔
+Permission24=تجارتی تجاویز کی توثیق کریں۔
+Permission25=تجارتی تجاویز بھیجیں۔
+Permission26=تجارتی تجاویز بند کریں۔
+Permission27=تجارتی تجاویز کو حذف کریں۔
+Permission28=تجارتی تجاویز برآمد کریں۔
+Permission31=مصنوعات پڑھیں
+Permission32=مصنوعات بنائیں/ترمیم کریں۔
+Permission34=مصنوعات کو حذف کریں۔
+Permission36=پوشیدہ پروڈکٹس دیکھیں/ان کا نظم کریں۔
+Permission38=مصنوعات برآمد کریں۔
+Permission39=کم از کم قیمت کو نظر انداز کریں۔
+Permission41=پروجیکٹس اور ٹاسک پڑھیں (مشترکہ پروجیکٹ اور پروجیکٹس جن کے لیے میں رابطہ کر رہا ہوں)۔ تفویض کردہ کاموں (ٹائم شیٹ) پر، میرے یا میرے درجہ بندی کے لیے استعمال شدہ وقت بھی درج کر سکتے ہیں۔
+Permission42=پروجیکٹ بنائیں/ترمیم کریں (مشترکہ پروجیکٹ اور پروجیکٹس جن کے لیے میں رابطہ کر رہا ہوں)۔ ٹاسک بھی بنا سکتے ہیں اور صارفین کو پروجیکٹ اور ٹاسک تفویض کر سکتے ہیں۔
+Permission44=پروجیکٹس کو حذف کریں (مشترکہ پروجیکٹ اور پروجیکٹس جن کے لیے میں رابطہ کر رہا ہوں)
+Permission45=ایکسپورٹ پروجیکٹس
+Permission61=مداخلتیں پڑھیں
+Permission62=مداخلتیں بنائیں/ترمیم کریں۔
+Permission64=مداخلتوں کو حذف کریں۔
+Permission67=مداخلتیں برآمد کریں۔
+Permission68=ای میل کے ذریعے مداخلتیں بھیجیں۔
+Permission69=مداخلتوں کی توثیق کریں۔
+Permission70=مداخلتوں کو باطل کریں۔
+Permission71=ممبرز پڑھیں
+Permission72=ممبرز بنائیں/ترمیم کریں۔
+Permission74=اراکین کو حذف کریں۔
+Permission75=رکنیت کی قسمیں ترتیب دیں۔
+Permission76=ڈیٹا ایکسپورٹ کریں۔
+Permission78=سبسکرپشنز پڑھیں
+Permission79=سبسکرپشنز بنائیں/ترمیم کریں۔
+Permission81=گاہکوں کے احکامات پڑھیں
+Permission82=صارفین کے آرڈرز بنائیں/ترمیم کریں۔
+Permission84=صارفین کے آرڈرز کی توثیق کریں۔
+Permission86=صارفین کو آرڈر بھیجیں۔
+Permission87=گاہکوں کے احکامات کو بند کریں۔
+Permission88=صارفین کے آرڈرز منسوخ کریں۔
+Permission89=صارفین کے آرڈرز کو حذف کریں۔
+Permission91=سماجی یا مالی ٹیکس اور وٹ پڑھیں
+Permission92=سماجی یا مالیاتی ٹیکس اور وٹ بنائیں/ترمیم کریں۔
+Permission93=سماجی یا مالی ٹیکس اور وٹ کو حذف کریں۔
+Permission94=سماجی یا مالی ٹیکس برآمد کریں۔
+Permission95=رپورٹس پڑھیں
+Permission101=بھیجیں پڑھیں
+Permission102=بھیجیں بنائیں/ترمیم کریں۔
+Permission104=بھیجنے کی توثیق کریں۔
+Permission105=ای میل کے ذریعے بھیجیں
+Permission106=بھیجیں برآمد کریں۔
+Permission109=بھیجیں حذف کریں۔
+Permission111=مالی اکاؤنٹس پڑھیں
+Permission112=لین دین بنائیں/ترمیم کریں/حذف کریں اور موازنہ کریں۔
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
+Permission114=لین دین کو ہم آہنگ کریں۔
+Permission115=لین دین اور اکاؤنٹ کے بیانات برآمد کریں۔
+Permission116=اکاؤنٹس کے درمیان منتقلی
+Permission117=چیک بھیجنے کا انتظام کریں۔
+Permission121=صارف سے منسلک تیسرے فریق کو پڑھیں
+Permission122=صارف سے منسلک تیسرے فریق بنائیں/ترمیم کریں۔
+Permission125=صارف سے منسلک تیسرے فریق کو حذف کریں۔
+Permission126=تیسرے فریق کو برآمد کریں۔
+Permission130=تیسرے فریق کی ادائیگی کی معلومات بنائیں/ترمیم کریں۔
+Permission141=تمام منصوبوں اور کاموں کو پڑھیں (نجی منصوبے بھی جن کے لیے میں رابطہ نہیں ہوں)
+Permission142=تمام پروجیکٹس اور ٹاسک بنائیں/ترمیم کریں (نجی پروجیکٹ بھی جن کے لیے میں رابطہ نہیں ہوں)
+Permission144=تمام منصوبوں اور کاموں کو حذف کریں (نجی پروجیکٹس جن کے لیے میں رابطہ نہیں کر رہا ہوں)
+Permission146=فراہم کنندگان کو پڑھیں
+Permission147=اعدادوشمار پڑھیں
+Permission151=براہ راست ڈیبٹ ادائیگی کے آرڈر پڑھیں
+Permission152=براہ راست ڈیبٹ ادائیگی کے آرڈرز بنائیں/ترمیم کریں۔
+Permission153=براہ راست ڈیبٹ ادائیگی کے آرڈر بھیجیں/منتقل کریں۔
+Permission154=براہ راست ڈیبٹ ادائیگی کے آرڈرز کے کریڈٹ/مسترد ریکارڈ کریں۔
+Permission161=معاہدے/سبسکرپشنز پڑھیں
+Permission162=معاہدے/سبسکرپشنز بنائیں/ترمیم کریں۔
+Permission163=کسی معاہدے کی سروس/سبسکرپشن کو چالو کریں۔
+Permission164=کسی معاہدے کی سروس/سبسکرپشن کو غیر فعال کریں۔
+Permission165=معاہدے/سبسکرپشنز کو حذف کریں۔
+Permission167=ایکسپورٹ معاہدے
+Permission171=دورے اور اخراجات پڑھیں (آپ کے اور آپ کے ماتحت)
+Permission172=ٹرپس اور اخراجات بنائیں/ترمیم کریں۔
+Permission173=دوروں اور اخراجات کو حذف کریں۔
+Permission174=تمام دورے اور اخراجات پڑھیں
+Permission178=سفر اور اخراجات برآمد کریں۔
+Permission180=سپلائرز پڑھیں
+Permission181=خریداری کے آرڈر پڑھیں
+Permission182=خریداری کے آرڈرز بنائیں/ترمیم کریں۔
+Permission183=خریداری کے آرڈر کی توثیق کریں۔
+Permission184=خریداری کے آرڈرز کو منظور کریں۔
+Permission185=آرڈر کریں یا خریداری کے آرڈر منسوخ کریں۔
+Permission186=خریداری کے آرڈر وصول کریں۔
+Permission187=خریداری کے آرڈر بند کریں۔
+Permission188=خریداری کے آرڈر منسوخ کریں۔
+Permission192=لائنیں بنائیں
+Permission193=لائنیں منسوخ کریں۔
+Permission194=بینڈوتھ لائنوں کو پڑھیں
+Permission202=ADSL کنکشن بنائیں
+Permission203=آرڈر کنکشن کے احکامات
+Permission204=کنکشن آرڈر کریں۔
+Permission205=رابطوں کا انتظام کریں۔
+Permission206=روابط پڑھیں
+Permission211=ٹیلی فونی پڑھیں
+Permission212=آرڈر لائنز
+Permission213=لائن کو چالو کریں۔
+Permission214=ٹیلی فونی سیٹ اپ کریں۔
+Permission215=سیٹ اپ فراہم کنندگان
+Permission221=ای میلز پڑھیں
+Permission222=ای میلز بنائیں/ترمیم کریں (موضوع، وصول کنندگان...)
+Permission223=ای میل کی توثیق کریں (بھیجنے کی اجازت دیتا ہے)
+Permission229=ای میلز کو حذف کریں۔
+Permission237=وصول کنندگان اور معلومات دیکھیں
+Permission238=دستی طور پر میل بھیجیں۔
+Permission239=توثیق یا بھیجے جانے کے بعد میلنگ کو حذف کریں۔
+Permission241=زمرے پڑھیں
+Permission242=زمرہ جات بنائیں/ترمیم کریں۔
+Permission243=زمرے حذف کریں۔
+Permission244=پوشیدہ زمروں کے مواد کو دیکھیں
+Permission251=دوسرے صارفین اور گروپس کو پڑھیں
+PermissionAdvanced251=دوسرے صارفین کو پڑھیں
+Permission252=دوسرے صارفین کی اجازتیں پڑھیں
+Permission253=دوسرے صارفین، گروپس اور اجازتیں بنائیں/ترمیم کریں۔
+PermissionAdvanced253=اندرونی/بیرونی صارفین اور اجازتیں بنائیں/ترمیم کریں۔
+Permission254=صرف بیرونی صارفین بنائیں/ترمیم کریں۔
+Permission255=دوسرے صارفین کے پاس ورڈ میں ترمیم کریں۔
+Permission256=دوسرے صارفین کو حذف یا غیر فعال کریں۔
+Permission262=تمام فریق ثالث اور ان کی اشیاء تک رسائی بڑھائیں (صرف تیسرے فریق ہی نہیں جن کے لیے صارف فروخت کا نمائندہ ہے)۔ <br> بیرونی صارفین کے لیے مؤثر نہیں ہے (ہمیشہ تجاویز، آرڈرز، انوائسز، معاہدوں وغیرہ کے لیے خود تک محدود)۔ <br> پراجیکٹس کے لیے موثر نہیں ہے (صرف پراجیکٹ کی اجازتوں، مرئیت اور تفویض کے معاملات پر اصول)۔
+Permission263=تمام فریق ثالث تک رسائی ان کی اشیاء کے بغیر بڑھائیں (صرف تیسرے فریق ہی نہیں جن کے لیے صارف فروخت کا نمائندہ ہے)۔ <br> بیرونی صارفین کے لیے مؤثر نہیں ہے (ہمیشہ تجاویز، آرڈرز، انوائسز، معاہدوں وغیرہ کے لیے خود تک محدود)۔ <br> پراجیکٹس کے لیے موثر نہیں ہے (صرف پراجیکٹ کی اجازتوں، مرئیت اور تفویض کے معاملات پر اصول)۔
+Permission271=CA پڑھیں
+Permission272=رسیدیں پڑھیں
+Permission273=رسیدیں جاری کریں۔
+Permission281=رابطے پڑھیں
+Permission282=روابط بنائیں/ترمیم کریں۔
+Permission283=رابطے حذف کریں۔
+Permission286=رابطے برآمد کریں۔
+Permission291=ٹیرف پڑھیں
+Permission292=ٹیرف پر اجازتیں مقرر کریں۔
+Permission293=کسٹمر کے ٹیرف میں ترمیم کریں۔
+Permission300=بارکوڈز پڑھیں
+Permission301=بارکوڈز بنائیں/ترمیم کریں۔
+Permission302=بارکوڈز کو حذف کریں۔
+Permission311=خدمات پڑھیں
+Permission312=معاہدے کے لیے سروس/سبسکرپشن تفویض کریں۔
+Permission331=بُک مارکس پڑھیں
+Permission332=بُک مارکس بنائیں/ترمیم کریں۔
+Permission333=بک مارکس کو حذف کریں۔
+Permission341=اس کی اپنی اجازتیں پڑھیں
+Permission342=اس کی اپنی صارف کی معلومات بنائیں/ترمیم کریں۔
+Permission343=اپنے پاس ورڈ میں ترمیم کریں۔
+Permission344=اس کی اپنی اجازتوں میں ترمیم کریں۔
+Permission351=گروپس پڑھیں
+Permission352=گروپوں کی اجازتیں پڑھیں
+Permission353=گروپس بنائیں/ترمیم کریں۔
+Permission354=گروپوں کو حذف یا غیر فعال کریں۔
+Permission358=صارفین کو برآمد کریں۔
+Permission401=چھوٹ پڑھیں
+Permission402=رعایتیں بنائیں/ترمیم کریں۔
+Permission403=چھوٹ کی توثیق کریں۔
+Permission404=چھوٹ کو حذف کریں۔
+Permission430=ڈیبگ بار استعمال کریں۔
+Permission511=تنخواہ اور ادائیگی پڑھیں (آپ کے اور ماتحت)
+Permission512=تنخواہوں اور ادائیگیوں کو بنائیں/ترمیم کریں۔
+Permission514=تنخواہوں اور ادائیگیوں کو حذف کریں۔
+Permission517=تنخواہ اور ادائیگی سب پڑھیں
+Permission519=ایکسپورٹ تنخواہیں۔
+Permission520=لون پڑھیں
+Permission522=قرضے بنائیں/ترمیم کریں۔
+Permission524=قرضوں کو حذف کریں۔
+Permission525=قرض کیلکولیٹر تک رسائی حاصل کریں۔
+Permission527=قرضے برآمد کریں۔
+Permission531=خدمات پڑھیں
+Permission532=خدمات بنائیں/ترمیم کریں۔
+Permission534=خدمات کو حذف کریں۔
+Permission536=پوشیدہ خدمات دیکھیں/ان کا نظم کریں۔
+Permission538=ایکسپورٹ سروسز
+Permission561=کریڈٹ ٹرانسفر کے ذریعے ادائیگی کے آرڈر پڑھیں
+Permission562=کریڈٹ ٹرانسفر کے ذریعے ادائیگی آرڈر بنائیں/ترمیم کریں۔
+Permission563=کریڈٹ ٹرانسفر کے ذریعے ادائیگی کا آرڈر بھیجیں/منتقل کریں۔
+Permission564=کریڈٹ کی منتقلی کے ڈیبٹ/مسترد ریکارڈ کریں۔
+Permission601=اسٹیکرز پڑھیں
+Permission602=اسٹیکرز بنائیں/ترمیم کریں۔
+Permission609=اسٹیکرز کو حذف کریں۔
+Permission650=مواد کے بل پڑھیں
+Permission651=مواد کے بل بنائیں/اپ ڈیٹ کریں۔
+Permission652=مواد کے بلز کو حذف کریں۔
+Permission660=مینوفیکچرنگ آرڈر (MO) پڑھیں
+Permission661=مینوفیکچرنگ آرڈر بنائیں/اپ ڈیٹ کریں (MO)
+Permission662=مینوفیکچرنگ آرڈر (MO) کو حذف کریں
+Permission701=عطیات پڑھیں
+Permission702=عطیات بنائیں/ترمیم کریں۔
+Permission703=عطیات کو حذف کریں۔
+Permission771=اخراجات کی رپورٹیں پڑھیں (آپ کی اور آپ کے ماتحت)
+Permission772=Create/modify expense reports (for you and your subordinates)
+Permission773=اخراجات کی رپورٹیں حذف کریں۔
+Permission775=اخراجات کی رپورٹوں کو منظور کریں۔
+Permission776=اخراجات کی رپورٹیں ادا کریں۔
+Permission777=Read all expense reports (even those of user not subordinates)
+Permission778=ہر ایک کے اخراجات کی رپورٹیں بنائیں/ترمیم کریں۔
+Permission779=اخراجات کی رپورٹیں برآمد کریں۔
+Permission1001=اسٹاک پڑھیں
+Permission1002=گودام بنائیں/ترمیم کریں۔
+Permission1003=گوداموں کو حذف کریں۔
+Permission1004=اسٹاک کی نقل و حرکت پڑھیں
+Permission1005=اسٹاک کی نقل و حرکت بنائیں/ترمیم کریں۔
+Permission1011=انوینٹری دیکھیں
+Permission1012=نئی انوینٹری بنائیں
+Permission1014=انوینٹری کی توثیق کریں۔
+Permission1015=کسی پروڈکٹ کے لیے پی ایم پی ویلیو کو تبدیل کرنے کی اجازت دیں۔
+Permission1016=انوینٹری کو حذف کریں۔
+Permission1101=ترسیل کی رسیدیں پڑھیں
+Permission1102=ترسیل کی رسیدیں بنائیں/ترمیم کریں۔
+Permission1104=ترسیل کی رسیدوں کی توثیق کریں۔
+Permission1109=ترسیل کی رسیدیں حذف کریں۔
+Permission1121=سپلائر کی تجاویز پڑھیں
+Permission1122=سپلائر کی تجاویز بنائیں/ترمیم کریں۔
+Permission1123=سپلائر کی تجاویز کی توثیق کریں۔
+Permission1124=سپلائر کی تجاویز بھیجیں۔
+Permission1125=سپلائر کی تجاویز کو حذف کریں۔
+Permission1126=سپلائر کی قیمت کی درخواستیں بند کریں۔
+Permission1181=سپلائرز پڑھیں
+Permission1182=خریداری کے آرڈر پڑھیں
+Permission1183=خریداری کے آرڈرز بنائیں/ترمیم کریں۔
+Permission1184=خریداری کے آرڈر کی توثیق کریں۔
+Permission1185=خریداری کے آرڈرز کو منظور کریں۔
+Permission1186=آرڈر خریداری کے احکامات
+Permission1187=خریداری کے آرڈر کی وصولی کو تسلیم کریں۔
+Permission1188=خریداری کے آرڈرز کو حذف کریں۔
+Permission1189=خریداری کے آرڈر کے استقبالیہ کو چیک/ان چیک کریں۔
+Permission1190=(دوسری منظوری) خریداری کے آرڈر کو منظور کریں۔
+Permission1191=سپلائر کے احکامات اور ان کی صفات برآمد کریں۔
+Permission1201=برآمد کا نتیجہ حاصل کریں۔
+Permission1202=ایکسپورٹ بنائیں/ترمیم کریں۔
+Permission1231=وینڈر کی رسیدیں پڑھیں
+Permission1232=وینڈر انوائسز بنائیں/ترمیم کریں۔
+Permission1233=وینڈر انوائس کی توثیق کریں۔
+Permission1234=وینڈر کی رسیدیں حذف کریں۔
+Permission1235=ای میل کے ذریعے وینڈر کی رسیدیں بھیجیں۔
+Permission1236=وینڈر انوائس، صفات اور ادائیگیاں برآمد کریں۔
+Permission1237=خریداری کے آرڈر اور ان کی تفصیلات برآمد کریں۔
+Permission1251=ڈیٹا بیس میں بیرونی ڈیٹا کی بڑے پیمانے پر درآمدات چلائیں (ڈیٹا لوڈ)
+Permission1321=کسٹمر انوائس، اوصاف اور ادائیگیاں برآمد کریں۔
+Permission1322=ادا شدہ بل کو دوبارہ کھولیں۔
+Permission1421=سیلز آرڈرز اور اوصاف برآمد کریں۔
+Permission1521=دستاویزات پڑھیں
+Permission1522=دستاویزات کو حذف کریں۔
+Permission2401=اس کے صارف اکاؤنٹ سے منسلک اعمال (واقعات یا کاموں) کو پڑھیں (اگر ایونٹ کا مالک یا صرف تفویض کیا گیا ہو)
+Permission2402=اس کے صارف اکاؤنٹ سے منسلک اعمال (واقعات یا کاموں) کو بنائیں/ترمیم کریں (اگر ایونٹ کا مالک ہو)
+Permission2403=اس کے صارف اکاؤنٹ سے منسلک اعمال (واقعات یا کام) کو حذف کریں (اگر ایونٹ کا مالک ہو)
+Permission2411=دوسروں کے اعمال (واقعات یا کام) پڑھیں
+Permission2412=دوسروں کے اعمال (واقعات یا کام) بنائیں/ترمیم کریں۔
+Permission2413=دوسروں کے اعمال (واقعات یا کاموں) کو حذف کریں۔
+Permission2414=دوسروں کے اعمال/کام برآمد کریں۔
+Permission2501=دستاویزات پڑھیں/ڈاؤن لوڈ کریں۔
+Permission2502=دستاویزات ڈاؤن لوڈ کریں۔
+Permission2503=دستاویزات جمع کروائیں یا حذف کریں۔
+Permission2515=دستاویزات کی ڈائریکٹریز ترتیب دیں۔
+Permission2801=FTP کلائنٹ کو پڑھنے کے موڈ میں استعمال کریں (صرف براؤز اور ڈاؤن لوڈ کریں)
+Permission2802=FTP کلائنٹ کو رائٹ موڈ میں استعمال کریں (فائلیں حذف یا اپ لوڈ کریں)
+Permission3200=محفوظ شدہ واقعات اور فنگر پرنٹس پڑھیں
+Permission3301=نئے ماڈیولز بنائیں
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
+Permission4022=تشخیص کی توثیق کریں۔
+Permission4023=تشخیص کو حذف کریں۔
+Permission4030=موازنہ کا مینو دیکھیں
+Permission10001=ویب سائٹ کا مواد پڑھیں
+Permission10002=ویب سائٹ کا مواد بنائیں/ترمیم کریں (HTML اور جاوا اسکرپٹ مواد)
+Permission10003=ویب سائٹ کا مواد بنائیں/ترمیم کریں (متحرک پی ایچ پی کوڈ)۔ خطرناک، محدود ڈویلپرز کے لیے محفوظ ہونا چاہیے۔
+Permission10005=ویب سائٹ کا مواد حذف کریں۔
+Permission20001=چھٹی کی درخواستیں پڑھیں (آپ کی چھٹی اور آپ کے ماتحتوں کی)
+Permission20002=اپنی چھٹی کی درخواستیں بنائیں/ترمیم کریں (آپ کی چھٹی اور آپ کے ماتحتوں کی)
+Permission20003=چھٹی کی درخواستوں کو حذف کریں۔
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
+Permission20007=چھٹی کی درخواستیں منظور کریں۔
+Permission23001=طے شدہ کام پڑھیں
+Permission23002=شیڈول شدہ جاب بنائیں/اپ ڈیٹ کریں۔
+Permission23003=طے شدہ کام کو حذف کریں۔
+Permission23004=طے شدہ کام کو انجام دیں۔
+Permission50101=پوائنٹ آف سیل کا استعمال کریں (SimplePOS)
+Permission50151=پوائنٹ آف سیل (TakePOS) کا استعمال کریں
+Permission50152=سیلز لائنوں میں ترمیم کریں۔
+Permission50153=آرڈر شدہ سیلز لائنوں میں ترمیم کریں۔
+Permission50201=لین دین پڑھیں
+Permission50202=لین دین درآمد کریں۔
+Permission50330=زپیئر کی اشیاء پڑھیں
+Permission50331=Zapier کی اشیاء بنائیں/اپ ڈیٹ کریں۔
+Permission50332=زپیئر کی اشیاء کو حذف کریں۔
+Permission50401=اکاؤنٹنگ اکاؤنٹس کے ساتھ مصنوعات اور رسیدیں باندھیں۔
+Permission50411=لیجر میں آپریشن پڑھیں
+Permission50412=لیجر میں آپریشنز لکھیں/ترمیم کریں۔
+Permission50414=لیجر میں کارروائیوں کو حذف کریں۔
+Permission50415=لیجر میں سال اور جرنل کے لحاظ سے تمام کارروائیوں کو حذف کریں۔
+Permission50418=لیجر کے ایکسپورٹ آپریشنز
+Permission50420=رپورٹ اور ایکسپورٹ رپورٹس (ٹرن اوور، بیلنس، روزنامچے، لیجر)
+Permission50430=مالی ادوار کی وضاحت کریں۔ لین دین کی توثیق کریں اور مالی ادوار کو بند کریں۔
+Permission50440=اکاؤنٹس کے چارٹ کا نظم کریں، اکاؤنٹنسی کا سیٹ اپ
+Permission51001=اثاثے پڑھیں
+Permission51002=اثاثے بنائیں/اپ ڈیٹ کریں۔
+Permission51003=اثاثے حذف کریں۔
+Permission51005=اثاثوں کی سیٹ اپ کی اقسام
+Permission54001=پرنٹ کریں
+Permission55001=سروے پڑھیں
+Permission55002=پولز بنائیں/ترمیم کریں۔
+Permission59001=تجارتی مارجن پڑھیں
+Permission59002=تجارتی مارجن کی وضاحت کریں۔
+Permission59003=ہر صارف مارجن پڑھیں
+Permission63001=وسائل پڑھیں
+Permission63002=وسائل بنائیں/ترمیم کریں۔
+Permission63003=وسائل کو حذف کریں۔
+Permission63004=وسائل کو ایجنڈے کے واقعات سے جوڑیں۔
+Permission64001=براہ راست پرنٹنگ کی اجازت دیں۔
+Permission67000=رسیدوں کی پرنٹنگ کی اجازت دیں۔
+Permission68001=انٹرا کام رپورٹ پڑھیں
+Permission68002=انٹرا کام رپورٹ بنائیں/ترمیم کریں۔
+Permission68004=انٹرا کام رپورٹ کو حذف کریں۔
+Permission941601=رسیدیں پڑھیں
+Permission941602=رسیدیں بنائیں اور ان میں ترمیم کریں۔
+Permission941603=رسیدوں کی تصدیق کریں۔
+Permission941604=ای میل کے ذریعے رسیدیں بھیجیں۔
+Permission941605=رسیدیں برآمد کریں۔
+Permission941606=رسیدیں حذف کریں۔
+DictionaryCompanyType=تیسری پارٹی کی اقسام
+DictionaryCompanyJuridicalType=فریق ثالث کے قانونی ادارے
+DictionaryProspectLevel=کمپنیوں کے لیے امکانی سطح
+DictionaryProspectContactLevel=رابطوں کے لیے ممکنہ سطح
+DictionaryCanton=ریاستیں/صوبے۔
+DictionaryRegion=ریجنز
+DictionaryCountry=ممالک
+DictionaryCurrency=کرنسیاں
+DictionaryCivility=اعزازی القابات
+DictionaryActions=ایجنڈے کے واقعات کی اقسام
+DictionarySocialContributions=سماجی یا مالی ٹیکس کی اقسام
+DictionaryVAT=VAT کی شرح یا سیلز ٹیکس کی شرح
+DictionaryRevenueStamp=ٹیکس ڈاک ٹکٹوں کی رقم
+DictionaryPaymentConditions=ادائیگی کی شرائط
+DictionaryPaymentModes=ادائیگی کے طریقے
+DictionaryTypeContact=رابطہ/پتہ کی اقسام
+DictionaryTypeOfContainer=ویب سائٹ - ویب سائٹ کے صفحات/کنٹینرز کی قسم
 DictionaryEcotaxe=Ecotax (WEEE)
-DictionaryPaperFormat=Paper formats
-DictionaryFormatCards=Card formats
-DictionaryFees=Expense report - Types of expense report lines
-DictionarySendingMethods=Shipping methods
-DictionaryStaff=Number of Employees
-DictionaryAvailability=Delivery delay
-DictionaryOrderMethods=Order methods
-DictionarySource=Origin of proposals/orders
-DictionaryAccountancyCategory=Personalized groups for reports
-DictionaryAccountancysystem=Models for chart of accounts
-DictionaryAccountancyJournal=Accounting journals
-DictionaryEMailTemplates=Email Templates
-DictionaryUnits=Units
-DictionaryMeasuringUnits=Measuring Units
-DictionarySocialNetworks=Social Networks
-DictionaryProspectStatus=Prospect status for companies
-DictionaryProspectContactStatus=Prospect status for contacts
-DictionaryHolidayTypes=Leave - Types of leave
-DictionaryOpportunityStatus=Lead status for project/lead
-DictionaryExpenseTaxCat=Expense report - Transportation categories
-DictionaryExpenseTaxRange=Expense report - Range by transportation category
-DictionaryTransportMode=Intracomm report - Transport mode
-DictionaryBatchStatus=Product lot/serial Quality Control status
-TypeOfUnit=Type of unit
-SetupSaved=Setup saved
-SetupNotSaved=Setup not saved
-BackToModuleList=Back to Module list
-BackToDictionaryList=Back to Dictionaries list
-TypeOfRevenueStamp=Type of tax stamp
-VATManagement=Sales Tax Management
-VATIsUsedDesc=By default when creating prospects, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependant on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
-VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for cases like associations, individuals or small companies.
-VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real). A system in which VAT is declared.
-VATIsNotUsedExampleFR=In France, it means associations that are non Sales tax declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (Sales tax in franchise) and paid a franchise Sales tax without any Sales tax declaration.  This choice will display the reference "Non applicable Sales tax - art-293B of CGI" on invoices.
+DictionaryPaperFormat=کاغذی شکلیں
+DictionaryFormatCards=کارڈ فارمیٹس
+DictionaryFees=اخراجات کی رپورٹ - اخراجات کی رپورٹ لائنوں کی اقسام
+DictionarySendingMethods=شپنگ کے طریقے
+DictionaryStaff=ملازمین کی تعداد
+DictionaryAvailability=ترسیل میں تاخیر
+DictionaryOrderMethods=آرڈر کے طریقے
+DictionarySource=تجاویز / احکامات کی اصل
+DictionaryAccountancyCategory=رپورٹس کے لیے ذاتی نوعیت کے گروپس
+DictionaryAccountancysystem=اکاؤنٹس کے چارٹ کے لیے ماڈل
+DictionaryAccountancyJournal=اکاؤنٹنگ جرائد
+DictionaryEMailTemplates=ای میل ٹیمپلیٹس
+DictionaryUnits=یونٹس
+DictionaryMeasuringUnits=پیمائش کی اکائیاں
+DictionarySocialNetworks=سوشل نیٹ ورک
+DictionaryProspectStatus=کمپنیوں کے لئے امکانی حیثیت
+DictionaryProspectContactStatus=رابطوں کے لیے امکانی حیثیت
+DictionaryHolidayTypes=چھٹی - چھٹی کی اقسام
+DictionaryOpportunityStatus=پروجیکٹ/لیڈ کے لیے لیڈ کی حیثیت
+DictionaryExpenseTaxCat=اخراجات کی رپورٹ - نقل و حمل کے زمرے
+DictionaryExpenseTaxRange=اخراجات کی رپورٹ - نقل و حمل کے زمرے کے لحاظ سے حد
+DictionaryTransportMode=انٹرا کام رپورٹ - ٹرانسپورٹ موڈ
+DictionaryBatchStatus=پروڈکٹ لاٹ/سیریل کوالٹی کنٹرول کی حیثیت
+TypeOfUnit=یونٹ کی قسم
+SetupSaved=سیٹ اپ محفوظ ہو گیا۔
+SetupNotSaved=سیٹ اپ محفوظ نہیں ہوا۔
+BackToModuleList=ماڈیول کی فہرست پر واپس جائیں۔
+BackToDictionaryList=لغت کی فہرست پر واپس جائیں۔
+TypeOfRevenueStamp=ٹیکس سٹیمپ کی قسم
+VATManagement=سیلز ٹیکس مینجمنٹ
+VATIsUsedDesc=امکانات، رسیدیں، آرڈرز وغیرہ بناتے وقت پہلے سے طے شدہ طور پر سیلز ٹیکس کی شرح فعال معیاری اصول کی پیروی کرتی ہے: <br> اگر بیچنے والا سیلز ٹیکس کے تابع نہیں ہے، تو سیلز ٹیکس ڈیفالٹ 0 پر ہوتا ہے۔ اصول کا اختتام۔ <br> اگر (بیچنے والے کا ملک = خریدار کا ملک)، تو سیلز ٹیکس بطور ڈیفالٹ بیچنے والے کے ملک میں پروڈکٹ کے سیلز ٹیکس کے برابر ہے۔ حکمرانی کا خاتمہ۔ <br> اگر بیچنے والا اور خریدار دونوں یورپی کمیونٹی میں ہیں اور سامان نقل و حمل سے متعلق مصنوعات ہیں (ہولیج، شپنگ، ایئر لائن) تو پہلے سے طے شدہ VAT 0 ہے۔ یہ اصول بیچنے والے کے ملک پر منحصر ہے - براہ کرم اپنے اکاؤنٹنٹ سے مشورہ کریں۔ VAT خریدار کو اپنے ملک کے کسٹم آفس کو ادا کرنا چاہیے نہ کہ بیچنے والے کو۔ حکمرانی کا خاتمہ۔ <br> اگر بیچنے والا اور خریدار دونوں یورپی کمیونٹی میں ہیں اور خریدار کمپنی نہیں ہے (ایک رجسٹرڈ انٹرا کمیونٹی VAT نمبر کے ساتھ) تو VAT بیچنے والے کے ملک کی VAT شرح سے ڈیفالٹ ہو جاتا ہے۔ حکمرانی کا خاتمہ۔ <br> اگر بیچنے والا اور خریدار دونوں یورپی کمیونٹی میں ہیں اور خریدار ایک کمپنی ہے (ایک رجسٹرڈ انٹرا کمیونٹی VAT نمبر کے ساتھ)، تو VAT بطور ڈیفالٹ 0 ہے۔ حکمرانی کا خاتمہ۔ <br> کسی بھی دوسری صورت میں مجوزہ ڈیفالٹ سیلز ٹیکس = 0 ہے۔ حکمرانی کا خاتمہ۔
+VATIsNotUsedDesc=پہلے سے طے شدہ طور پر مجوزہ سیلز ٹیکس 0 ہے جسے ایسوسی ایشنز، افراد یا چھوٹی کمپنیوں جیسے معاملات کے لیے استعمال کیا جا سکتا ہے۔
+VATIsUsedExampleFR=فرانس میں، اس کا مطلب ہے حقیقی مالیاتی نظام رکھنے والی کمپنیاں یا تنظیمیں (آسان اصلی یا نارمل اصلی)۔ ایک ایسا نظام جس میں VAT کا اعلان کیا جاتا ہے۔
+VATIsNotUsedExampleFR=فرانس میں، اس سے مراد ایسی انجمنیں ہیں جو کہ غیر سیلز ٹیکس کا اعلان کر رہی ہیں یا ایسی کمپنیاں، تنظیمیں یا لبرل پیشے جنہوں نے مائیکرو انٹرپرائز مالیاتی نظام (فرنچائز میں سیلز ٹیکس) کا انتخاب کیا ہے اور بغیر کسی سیلز ٹیکس کے اعلان کے فرنچائز سیلز ٹیکس ادا کیا ہے۔ یہ انتخاب رسیدوں پر حوالہ "غیر قابل اطلاق سیلز ٹیکس - آرٹ -293B آف CGI" ظاہر کرے گا۔
 ##### Local Taxes #####
-TypeOfSaleTaxes=Type of sales tax
-LTRate=Rate
-LocalTax1IsNotUsed=Do not use second tax
-LocalTax1IsUsedDesc=Use a second type of tax (other than first one)
-LocalTax1IsNotUsedDesc=Do not use other type of tax (other than first one)
-LocalTax1Management=Second type of tax
+TypeOfSaleTaxes=سیلز ٹیکس کی قسم
+LTRate=شرح
+LocalTax1IsNotUsed=دوسرا ٹیکس استعمال نہ کریں۔
+LocalTax1IsUsedDesc=دوسری قسم کا ٹیکس استعمال کریں (پہلے ٹیکس کے علاوہ)
+LocalTax1IsNotUsedDesc=دوسری قسم کا ٹیکس استعمال نہ کریں (پہلے ٹیکس کے علاوہ)
+LocalTax1Management=ٹیکس کی دوسری قسم
 LocalTax1IsUsedExample=
 LocalTax1IsNotUsedExample=
-LocalTax2IsNotUsed=Do not use third tax
-LocalTax2IsUsedDesc=Use a third type of tax (other than first one)
-LocalTax2IsNotUsedDesc=Do not use other type of tax (other than first one)
-LocalTax2Management=Third type of tax
+LocalTax2IsNotUsed=تیسرا ٹیکس استعمال نہ کریں۔
+LocalTax2IsUsedDesc=تیسری قسم کا ٹیکس استعمال کریں (پہلے ٹیکس کے علاوہ)
+LocalTax2IsNotUsedDesc=دوسری قسم کا ٹیکس استعمال نہ کریں (پہلے ٹیکس کے علاوہ)
+LocalTax2Management=ٹیکس کی تیسری قسم
 LocalTax2IsUsedExample=
 LocalTax2IsNotUsedExample=
-LocalTax1ManagementES=RE Management
-LocalTax1IsUsedDescES=The RE rate by default when creating prospects, invoices, orders etc. follow the active standard rule:<br>If the buyer is not subjected to RE, RE by default=0. End of rule.<br>If the buyer is subjected to RE then the RE by default. End of rule.<br>
-LocalTax1IsNotUsedDescES=By default the proposed RE is 0. End of rule.
-LocalTax1IsUsedExampleES=In Spain they are professionals subject to some specific sections of the Spanish IAE.
-LocalTax1IsNotUsedExampleES=In Spain they are professional and societies and subject to certain sections of the Spanish IAE.
-LocalTax2ManagementES=IRPF Management
-LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices, orders etc. follow the active standard rule:<br>If the seller is not subjected to IRPF, then IRPF by default=0. End of rule.<br>If the seller is subjected to IRPF then the IRPF by default. End of rule.<br>
-LocalTax2IsNotUsedDescES=By default the proposed IRPF is 0. End of rule.
-LocalTax2IsUsedExampleES=In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
-LocalTax2IsNotUsedExampleES=In Spain they are businesses not subject to tax system of modules.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
-UseRevenueStamp=Use a tax stamp
-UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
-CalcLocaltax=Reports on local taxes
-CalcLocaltax1=Sales - Purchases
-CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
-CalcLocaltax2=Purchases
-CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
-CalcLocaltax3=Sales
-CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
-NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
-LabelUsedByDefault=Label used by default if no translation can be found for code
-LabelOnDocuments=Label on documents
-LabelOrTranslationKey=Label or translation key
-ValueOfConstantKey=Value of a configuration constant
-ConstantIsOn=Option %s is on
-NbOfDays=No. of days
-AtEndOfMonth=At end of month
-CurrentNext=Current/Next
-Offset=Offset
-AlwaysActive=Always active
-Upgrade=Upgrade
-MenuUpgrade=Upgrade / Extend
-AddExtensionThemeModuleOrOther=Deploy/install external app/module
-WebServer=Web server
-DocumentRootServer=Web server's root directory
-DataRootServer=Data files directory
-IP=IP
-Port=Port
-VirtualServerName=Virtual server name
+LocalTax1ManagementES=RE مینجمنٹ
+LocalTax1IsUsedDescES=امکانات، انوائسز، آرڈرز وغیرہ بناتے وقت ڈیفالٹ RE کی شرح فعال معیاری اصول پر عمل کریں: <br> اگر خریدار پر RE، RE بذریعہ ڈیفالٹ = 0 نہیں ہے۔ حکمرانی کا خاتمہ۔ <br> اگر خریدار کو RE کا نشانہ بنایا جاتا ہے تو RE بطور ڈیفالٹ۔ حکمرانی کا خاتمہ۔ <br>
+LocalTax1IsNotUsedDescES=پہلے سے طے شدہ طور پر مجوزہ RE 0 ہے۔ اصول کا اختتام۔
+LocalTax1IsUsedExampleES=اسپین میں وہ پیشہ ور افراد ہیں جو ہسپانوی IAE کے کچھ مخصوص حصوں کے تابع ہیں۔
+LocalTax1IsNotUsedExampleES=اسپین میں وہ پیشہ ور اور معاشرے ہیں اور ہسپانوی IAE کے بعض حصوں کے تابع ہیں۔
+LocalTax2ManagementES=آئی آر پی ایف مینجمنٹ
+LocalTax2IsUsedDescES=امکانات، رسیدیں، آرڈرز وغیرہ بناتے وقت پہلے سے طے شدہ IRPF کی شرح فعال معیاری اصول پر عمل کریں: <br> اگر بیچنے والا IRPF کے تابع نہیں ہے، تو IRPF بذریعہ ڈیفالٹ=0۔ حکمرانی کا خاتمہ۔ <br> اگر بیچنے والے کو IRPF کا نشانہ بنایا جاتا ہے تو IRPF بطور ڈیفالٹ۔ حکمرانی کا خاتمہ۔ <br>
+LocalTax2IsNotUsedDescES=پہلے سے طے شدہ طور پر مجوزہ IRPF 0 ہے۔ اصول کا خاتمہ۔
+LocalTax2IsUsedExampleES=اسپین میں، فری لانسرز اور آزاد پیشہ ور افراد جو خدمات فراہم کرتے ہیں اور کمپنیاں جنہوں نے ماڈیولز کے ٹیکس نظام کا انتخاب کیا ہے۔
+LocalTax2IsNotUsedExampleES=اسپین میں وہ کاروبار ہیں جو ماڈیولز کے ٹیکس نظام کے تابع نہیں ہیں۔
+RevenueStampDesc="ٹیکس سٹیمپ" یا "ریونیو سٹیمپ" ایک مقررہ ٹیکس ہے جو آپ فی انوائس (یہ انوائس کی رقم پر منحصر نہیں ہے)۔ یہ فیصد ٹیکس بھی ہو سکتا ہے لیکن دوسری یا تیسری قسم کا ٹیکس استعمال کرنا فیصد ٹیکس کے لیے بہتر ہے کیونکہ ٹیکس سٹیمپ کوئی رپورٹنگ فراہم نہیں کرتے۔ صرف چند ممالک اس قسم کا ٹیکس استعمال کرتے ہیں۔
+UseRevenueStamp=ٹیکس سٹیمپ استعمال کریں۔
+UseRevenueStampExample=ٹیکس سٹیمپ کی قدر ڈیفالٹ کے طور پر لغات کے سیٹ اپ میں بیان کی جاتی ہے (%s - %s - %s)
+CalcLocaltax=مقامی ٹیکس سے متعلق رپورٹس
+CalcLocaltax1=فروخت - خریداری
+CalcLocaltax1Desc=لوکل ٹیکسز کی رپورٹس کا حساب لوکل ٹیکسز سیلز اور لوکل ٹیکس کی خریداری کے درمیان فرق کے ساتھ کیا جاتا ہے۔
+CalcLocaltax2=خریداری
+CalcLocaltax2Desc=لوکل ٹیکس کی رپورٹیں لوکل ٹیکس کی خریداریوں کی کل ہیں۔
+CalcLocaltax3=سیلز
+CalcLocaltax3Desc=مقامی ٹیکس کی رپورٹیں لوکل ٹیکسز کی فروخت کی کل ہیں۔
+NoLocalTaxXForThisCountry=ٹیکسوں کے سیٹ اپ کے مطابق (دیکھیں %s - %s - %s)، آپ کے ملک کو اس قسم کے ٹیکس استعمال کرنے کی ضرورت نہیں ہے۔
+LabelUsedByDefault=کوڈ کے لیے کوئی ترجمہ نہ ملنے کی صورت میں بطور ڈیفالٹ استعمال شدہ لیبل
+LabelOnDocuments=دستاویزات پر لیبل لگائیں۔
+LabelOrTranslationKey=لیبل یا ترجمہ کلید
+ValueOfConstantKey=کنفیگریشن مستقل کی قدر
+ConstantIsOn=آپشن %s آن ہے۔
+NbOfDays=دنوں کی تعداد
+AtEndOfMonth=مہینے کے آخر میں
+CurrentNext=موجودہ/اگلا
+Offset=آفسیٹ
+AlwaysActive=ہمیشہ متحرک
+Upgrade=اپ گریڈ
+MenuUpgrade=اپ گریڈ / توسیع
+AddExtensionThemeModuleOrOther=بیرونی ایپ/ماڈیول تعینات/انسٹال کریں۔
+WebServer=ویب سرور
+DocumentRootServer=ویب سرور کی روٹ ڈائرکٹری
+DataRootServer=ڈیٹا فائلوں کی ڈائرکٹری
+IP=آئی پی
+Port=بندرگاہ
+VirtualServerName=ورچوئل سرور کا نام
 OS=OS
-PhpWebLink=Web-Php link
-Server=Server
-Database=Database
-DatabaseServer=Database host
-DatabaseName=Database name
-DatabasePort=Database port
-DatabaseUser=Database user
-DatabasePassword=Database password
-Tables=Tables
-TableName=Table name
-NbOfRecord=No. of records
-Host=Server
-DriverType=Driver type
-SummarySystem=System information summary
-SummaryConst=List of all Dolibarr setup parameters
-MenuCompanySetup=Company/Organization
-DefaultMenuManager= Standard menu manager
-DefaultMenuSmartphoneManager=Smartphone menu manager
-Skin=Skin theme
-DefaultSkin=Default skin theme
-MaxSizeList=Max length for list
-DefaultMaxSizeList=Default max length for lists
-DefaultMaxSizeShortList=Default max length for short lists (i.e. in customer card)
-MessageOfDay=Message of the day
-MessageLogin=Login page message
-LoginPage=Login page
-BackgroundImageLogin=Background image
-PermanentLeftSearchForm=Permanent search form on left menu
-DefaultLanguage=Default language
-EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
-EnableShowLogo=Show the company logo in the menu
-CompanyInfo=Company/Organization
-CompanyIds=Company/Organization identities
-CompanyName=Name
-CompanyAddress=Address
-CompanyZip=Zip
-CompanyTown=Town
-CompanyCountry=Country
-CompanyCurrency=Main currency
-CompanyObject=Object of the company
-IDCountry=ID country
-Logo=Logo
-LogoDesc=Main logo of company. Will be used into generated documents (PDF, ...)
-LogoSquarred=Logo (squarred)
-LogoSquarredDesc=Must be a squarred icon (width = height). This logo will be used as the favorite icon or other need like for the top menu bar (if not disabled into display setup).
-DoNotSuggestPaymentMode=Do not suggest
-NoActiveBankAccountDefined=No active bank account defined
-OwnerOfBankAccount=Owner of bank account %s
-BankModuleNotActive=Bank accounts module not enabled
-ShowBugTrackLink=Show the link "<strong>%s</strong>"
-ShowBugTrackLinkDesc=Keep empty to not display this link, use value 'github' for the link to the Dolibarr project or define directly an url 'https://...'
-Alerts=Alerts
-DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
-DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
-Delays_MAIN_DELAY_ACTIONS_TODO=Planned events (agenda events) not completed
-Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Project not closed in time
-Delays_MAIN_DELAY_TASKS_TODO=Planned task (project tasks) not completed
-Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Order not processed
-Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Purchase order not processed
-Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Proposal not closed
-Delays_MAIN_DELAY_PROPALS_TO_BILL=Proposal not billed
-Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Service to activate
-Delays_MAIN_DELAY_RUNNING_SERVICES=Expired service
-Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Unpaid vendor invoice
-Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Unpaid customer invoice
-Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Pending bank reconciliation
-Delays_MAIN_DELAY_MEMBERS=Delayed membership fee
-Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Check deposit not done
-Delays_MAIN_DELAY_EXPENSEREPORTS=Expense report to approve
-Delays_MAIN_DELAY_HOLIDAYS=Leave requests to approve
-SetupDescription1=Before starting to use Dolibarr some initial parameters must be defined and modules enabled/configured.
-SetupDescription2=The following two sections are mandatory (the two first entries in the Setup menu):
-SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
-SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
-SetupDescription5=Other Setup menu entries manage optional parameters.
-SetupDescriptionLink=<a href="%s">%s - %s</a>
-SetupDescription3b=Basic parameters used to customize the default behavior of your application (e.g for country-related features).
-SetupDescription4b=This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
-AuditedSecurityEvents=Security events that are audited
-NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=Security events
-InfoDolibarr=About Dolibarr
-InfoBrowser=About Browser
-InfoOS=About OS
-InfoWebServer=About Web Server
-InfoDatabase=About Database
-InfoPHP=About PHP
-InfoPerf=About Performances
-InfoSecurity=About Security
-BrowserName=Browser name
-BrowserOS=Browser OS
-ListOfSecurityEvents=List of Dolibarr security events
-SecurityEventsPurged=Security events purged
-LogEventDesc=Enable logging for specific security events. Administrators the log via menu <b>%s - %s</b>. Warning, this feature can generate a large amount of data in the database.
-AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
-SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
-SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
-CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
-AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
-AccountantFileNumber=Accountant code
-DisplayDesc=Parameters affecting the look and presentation of the application can be modified here.
-AvailableModules=Available app/modules
-ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
-SessionTimeOut=Time out for session
-SessionExplanation=This number guarantees that the session will never expire before this delay, if the session cleaner is done by Internal PHP session cleaner (and nothing else). Internal PHP session cleaner does not guarantee that the session will expire after this delay. It will expire, after this delay, and when the session cleaner is run, so every <b>%s/%s</b> access, but only during access made by other sessions (if value is 0, it means clearing of session is done only by an external process).<br>Note: on some servers with an external session cleaning mechanism (cron under debian, ubuntu ...), the sessions can be destroyed after a period defined by an external setup, no matter what the value entered here is.
-SessionsPurgedByExternalSystem=Sessions on this server seems to be cleaned by an external mechanism (cron under debian, ubuntu ...), probably every <b>%s</b> seconds (= value of parameter <b>session.gc_maxlifetime</b>), so changing the value here has no effect. You must ask the server administrator to change session delay.
-TriggersAvailable=Available triggers
-TriggersDesc=Triggers are files that will modify the behavior of Dolibarr workflow once copied into the directory <b>htdocs/core/triggers</b>. They realize new actions, activated on Dolibarr events (new company creation, invoice validation, ...).
-TriggerDisabledByName=Triggers in this file are disabled by the <b>-NORUN</b> suffix in their name.
-TriggerDisabledAsModuleDisabled=Triggers in this file are disabled as module <b>%s</b> is disabled.
-TriggerAlwaysActive=Triggers in this file are always active, whatever are the activated Dolibarr modules.
-TriggerActiveAsModuleActive=Triggers in this file are active as module <b>%s</b> is enabled.
-GeneratedPasswordDesc=Choose the method to be used for auto-generated passwords.
-DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit (override) parameters not available in other pages. These are mostly reserved parameters for developers/advanced troubleshooting only.
-MiscellaneousDesc=All other security related parameters are defined here.
-LimitsSetup=Limits/Precision setup
-LimitsDesc=You can define limits, precisions and optimizations used by Dolibarr here
-MAIN_MAX_DECIMALS_UNIT=Max. decimals for unit prices
-MAIN_MAX_DECIMALS_TOT=Max. decimals for total prices
-MAIN_MAX_DECIMALS_SHOWN=Max. decimals for prices <b>shown on screen</b>. Add an ellipsis <b>...</b> after this parameter (e.g. "2...") if you want to see "<b>...</b>" suffixed to the truncated price.
-MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something other than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
-UnitPriceOfProduct=Net unit price of a product
-TotalPriceAfterRounding=Total price (excl/vat/incl tax) after rounding
-ParameterActiveForNextInputOnly=Parameter effective for next input only
-NoEventOrNoAuditSetup=No security event has been logged. This is normal if Audit has not been enabled in the "Setup - Security - Events" page.
-NoEventFoundWithCriteria=No security event has been found for this search criteria.
-SeeLocalSendMailSetup=See your local sendmail setup
-BackupDesc=A <b>complete</b> backup of a Dolibarr installation requires two steps.
-BackupDesc2=Backup the contents of the "documents" directory (<b>%s</b>) containing all uploaded and generated files. This will also include all the dump files generated in Step 1. This operation may last several minutes.
-BackupDesc3=Backup the structure and contents of your database (<b>%s</b>) into a dump file. For this, you can use the following assistant.
-BackupDescX=The archived directory should be stored in a secure place.
-BackupDescY=The generated dump file should be stored in a secure place.
-BackupPHPWarning=Backup cannot be guaranteed with this method. Previous one recommended.
-RestoreDesc=To restore a Dolibarr backup, two steps are required.
-RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
-RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
-RestoreMySQL=MySQL import
-ForcedToByAModule=This rule is forced to <b>%s</b> by an activated module
-ValueIsForcedBySystem=This value is forced by the system. You can't change it.
-PreviousDumpFiles=Existing backup files
-PreviousArchiveFiles=Existing archive files
-WeekStartOnDay=First day of the week
-RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be required (Program version %s differs from Database version %s)
-YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from command line after login to a shell with user <b>%s</b> or you must add -W option at end of command line to provide <b>%s</b> password.
-YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
-DownloadMoreSkins=More skins to download
-SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
-SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
-ShowProfIdInAddress=Show professional ID with addresses
-ShowVATIntaInAddress=Hide intra-Community VAT number
-TranslationUncomplete=Partial translation
-MAIN_DISABLE_METEO=Disable weather thumb
-MeteoStdMod=Standard mode
-MeteoStdModEnabled=Standard mode enabled
-MeteoPercentageMod=Percentage mode
-MeteoPercentageModEnabled=Percentage mode enabled
-MeteoUseMod=Click to use %s
-TestLoginToAPI=Test login to API
-ProxyDesc=Some features of Dolibarr require internet access. Define here the internet connection parameters such as access through a proxy server if necessary.
-ExternalAccess=External/Internet Access
-MAIN_PROXY_USE=Use a proxy server (otherwise access is direct to the internet)
-MAIN_PROXY_HOST=Proxy server: Name/Address
-MAIN_PROXY_PORT=Proxy server: Port
-MAIN_PROXY_USER=Proxy server: Login/User
-MAIN_PROXY_PASS=Proxy server: Password
-DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
-ExtraFields=Complementary attributes
-ExtraFieldsLines=Complementary attributes (lines)
-ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
-ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
-ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
-ExtraFieldsThirdParties=Complementary attributes (third party)
-ExtraFieldsContacts=Complementary attributes (contacts/address)
-ExtraFieldsMember=Complementary attributes (member)
-ExtraFieldsMemberType=Complementary attributes (member type)
-ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
-ExtraFieldsCustomerInvoicesRec=Complementary attributes (templates invoices)
-ExtraFieldsSupplierOrders=Complementary attributes (orders)
-ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
-ExtraFieldsProject=Complementary attributes (projects)
-ExtraFieldsProjectTask=Complementary attributes (tasks)
-ExtraFieldsSalaries=Complementary attributes (salaries)
-ExtraFieldHasWrongValue=Attribute %s has a wrong value.
-AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
-SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
-PathToDocuments=Path to documents
-PathDirectory=Directory
-SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might not be parsed correctly by some receiving mail servers. The result is that some mails can't be read by people hosted by those bugged platforms. This is the case for some Internet providers (Ex: Orange in France). This is not a problem with Dolibarr or PHP but with the receiving mail server. You can however add an option MAIN_FIX_FOR_BUGGED_MTA to 1 in Setup - Other to modify Dolibarr to avoid this. However, you may experience problems with other servers that strictly use the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" which has no disadvantages.
-TranslationSetup=Setup of translation
-TranslationKeySearch=Search a translation key or string
-TranslationOverwriteKey=Overwrite a translation string
-TranslationDesc=How to set the display language:<br>* Default/Systemwide: menu <strong>Home -> Setup -> Display</strong><br>* Per user: Click on the username at the top of the screen and modify the <strong>User Display Setup</strong> tab on the user card.
-TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
-TranslationOverwriteDesc2=You can use the other tab to help you know which translation key to use
-TranslationString=Translation string
-CurrentTranslationString=Current translation string
-WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
-NewTranslationStringToShow=New translation string to show
-OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
-TitleNumberOfActivatedModules=Activated modules
-TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
-YouMustEnableOneModule=You must at least enable 1 module
-ClassNotFoundIntoPathWarning=Class %s not found in PHP path
-YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only the following modules are available to external users (irrespective of the permissions of such users) and only if permissions are granted:<br>
-SuhosinSessionEncrypt=Session storage encrypted by Suhosin
-ConditionIsCurrently=Condition is currently %s
-YouUseBestDriver=You use driver %s which is the best driver currently available.
-YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
-NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
-ComboListOptim=Combo list loading optimization
-SearchOptim=Search optimization
-YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
-YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
-BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
-BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
-PHPModuleLoaded=PHP component %s is loaded
-PreloadOPCode=Preloaded OPCode is used
-AddRefInList=Display Customer/Vendor ref. into combo lists.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
-AddVatInList=Display Customer/Vendor VAT number into combo lists.
-AddAdressInList=Display Customer/Vendor adress into combo lists.<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
-AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
-AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
-FieldEdition=Edition of field %s
-FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
-GetBarCode=Get barcode
-NumberingModules=Numbering models
-DocumentModules=Document models
+PhpWebLink=ویب پی ایچ پی لنک
+Server=سرور
+Database=ڈیٹا بیس
+DatabaseServer=ڈیٹا بیس ہوسٹ
+DatabaseName=ڈیٹا بیس کا نام
+DatabasePort=ڈیٹا بیس پورٹ
+DatabaseUser=ڈیٹا بیس صارف
+DatabasePassword=ڈیٹا بیس پاس ورڈ
+Tables=میزیں
+TableName=ٹیبل کا نام
+NbOfRecord=ریکارڈز کی تعداد
+Host=سرور
+DriverType=ڈرائیور کی قسم
+SummarySystem=سسٹم کی معلومات کا خلاصہ
+SummaryConst=Dolibarr سیٹ اپ کے تمام پیرامیٹرز کی فہرست
+MenuCompanySetup=کمپنی/تنظیم
+DefaultMenuManager= معیاری مینو مینیجر
+DefaultMenuSmartphoneManager=اسمارٹ فون مینو مینیجر
+Skin=جلد کی تھیم
+DefaultSkin=پہلے سے طے شدہ جلد کی تھیم
+MaxSizeList=فہرست کے لیے زیادہ سے زیادہ لمبائی
+DefaultMaxSizeList=فہرستوں کے لیے پہلے سے طے شدہ زیادہ سے زیادہ لمبائی
+DefaultMaxSizeShortList=مختصر فہرستوں کے لیے پہلے سے طے شدہ زیادہ سے زیادہ لمبائی (یعنی کسٹمر کارڈ میں)
+MessageOfDay=دن کا پیغام
+MessageLogin=لاگ ان پیج پیغام
+LoginPage=لاگ ان صفحہ
+BackgroundImageLogin=پس منظر کی تصویر
+PermanentLeftSearchForm=بائیں مینو پر مستقل تلاش کا فارم
+DefaultLanguage=پہلے سے طے شدہ زبان
+EnableMultilangInterface=گاہک یا وینڈر تعلقات کے لیے کثیر زبانی تعاون کو فعال کریں۔
+EnableShowLogo=مینو میں کمپنی کا لوگو دکھائیں۔
+CompanyInfo=کمپنی/تنظیم
+CompanyIds=کمپنی/تنظیم کی شناخت
+CompanyName=نام
+CompanyAddress=پتہ
+CompanyZip=زپ
+CompanyTown=شہر
+CompanyCountry=ملک
+CompanyCurrency=اہم کرنسی
+CompanyObject=کمپنی کا اعتراض
+IDCountry=شناختی ملک
+Logo=لوگو
+LogoDesc=کمپنی کا مرکزی لوگو۔ تیار کردہ دستاویزات میں استعمال کیا جائے گا (پی ڈی ایف، ...)
+LogoSquarred=لوگو (مربع)
+LogoSquarredDesc=چوکور آئیکن (چوڑائی = اونچائی) ہونا چاہیے۔ اس لوگو کو پسندیدہ آئیکن کے طور پر استعمال کیا جائے گا یا دیگر ضرورتوں جیسا کہ ٹاپ مینو بار کے لیے (اگر ڈسپلے سیٹ اپ میں غیر فعال نہیں کیا گیا ہے)۔
+DoNotSuggestPaymentMode=تجویز نہ کریں۔
+NoActiveBankAccountDefined=کوئی فعال بینک اکاؤنٹ متعین نہیں ہے۔
+OwnerOfBankAccount=بینک اکاؤنٹ %s کا مالک
+BankModuleNotActive=بینک اکاؤنٹس ماڈیول فعال نہیں ہے۔
+ShowBugTrackLink=لنک دکھائیں "<strong> %s </strong>"
+ShowBugTrackLinkDesc=اس لنک کو ظاہر نہ کرنے کے لیے خالی رکھیں، Dolibarr پروجیکٹ کے لنک کے لیے ویلیو 'github' استعمال کریں یا براہ راست ایک url 'https://...' کی وضاحت کریں۔
+Alerts=انتباہات
+DelaysOfToleranceBeforeWarning=انتباہی انتباہ ظاہر کرنے سے پہلے تاخیر:
+DelaysOfToleranceDesc=تاخیر کو سیٹ کریں اس سے پہلے کہ الرٹ آئیکن %s دیر کے عنصر کے لیے اسکرین پر دکھایا جائے۔
+Delays_MAIN_DELAY_ACTIONS_TODO=منصوبہ بند واقعات (ایجنڈا ایونٹس) مکمل نہیں ہوئے۔
+Delays_MAIN_DELAY_PROJECT_TO_CLOSE=پروجیکٹ وقت پر بند نہیں ہوا۔
+Delays_MAIN_DELAY_TASKS_TODO=منصوبہ بند کام (پروجیکٹ ٹاسک) مکمل نہیں ہوئے۔
+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_RUNNING_SERVICES=میعاد ختم ہونے والی سروس
+Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=غیر ادا شدہ وینڈر انوائس
+Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=بلا معاوضہ کسٹمر انوائس
+Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=زیر التواء بینک مفاہمت
+Delays_MAIN_DELAY_MEMBERS=تاخیر سے رکنیت کی فیس
+Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=چیک ڈپازٹ نہیں ہوا۔
+Delays_MAIN_DELAY_EXPENSEREPORTS=منظوری کے لیے اخراجات کی رپورٹ
+Delays_MAIN_DELAY_HOLIDAYS=منظوری کے لیے درخواستیں چھوڑ دیں۔
+SetupDescription1=Dolibarr کا استعمال شروع کرنے سے پہلے کچھ ابتدائی پیرامیٹرز کی وضاحت اور ماڈیولز کو فعال/کنفیگر کرنا ضروری ہے۔
+SetupDescription2=درج ذیل دو حصے لازمی ہیں (سیٹ اپ مینو میں دو پہلی اندراجات):
+SetupDescription3= <a href="%s"> %s -> %s </a> <br> <br> <br> (آپ کے بنیادی پیرامیٹرز کو اپنی مرضی کے مطابق طرز عمل کے لیے استعمال کیا جاتا ہے ملک کی مخصوص خصوصیات کے لیے استعمال کیا جاتا ہے)۔
+SetupDescription4= <a href="%s"> %s -> %s </a> <br> <br> یہ سافٹ ویئر بہت سے molic/du ایپس کا مجموعہ ہے۔ آپ کی ضروریات سے متعلق ماڈیولز کو فعال اور ترتیب دیا جانا چاہیے۔ ان ماڈیولز کے ایکٹیویشن کے ساتھ مینو اندراجات ظاہر ہوں گے۔
+SetupDescription5=دیگر سیٹ اپ مینو اندراجات اختیاری پیرامیٹرز کا نظم کرتی ہیں۔
+SetupDescriptionLink= <a href="%s"> %s - %s </a>
+SetupDescription3b=بنیادی پیرامیٹرز جو آپ کی درخواست کے پہلے سے طے شدہ رویے کو حسب ضرورت بنانے کے لیے استعمال کیے جاتے ہیں (مثلاً ملک سے متعلقہ خصوصیات کے لیے)۔
+SetupDescription4b=یہ سافٹ ویئر بہت سے ماڈیولز/ایپلی کیشنز کا مجموعہ ہے۔ آپ کی ضروریات سے متعلق ماڈیولز کو فعال اور ترتیب دیا جانا چاہیے۔ ان ماڈیولز کے ایکٹیویشن کے ساتھ مینو اندراجات ظاہر ہوں گے۔
+AuditedSecurityEvents=سیکیورٹی کے واقعات جن کا آڈٹ کیا جاتا ہے۔
+NoSecurityEventsAreAduited=سیکیورٹی کے کوئی واقعات کا آڈٹ نہیں کیا جاتا ہے۔ آپ انہیں مینو %s سے فعال کر سکتے ہیں۔
+Audit=سیکیورٹی کے واقعات
+InfoDolibarr=Dolibarr کے بارے میں
+InfoBrowser=براؤزر کے بارے میں
+InfoOS=OS کے بارے میں
+InfoWebServer=ویب سرور کے بارے میں
+InfoDatabase=ڈیٹا بیس کے بارے میں
+InfoPHP=پی ایچ پی کے بارے میں
+InfoPerf=پرفارمنس کے بارے میں
+InfoSecurity=سیکیورٹی کے بارے میں
+BrowserName=براؤزر کا نام
+BrowserOS=براؤزر OS
+ListOfSecurityEvents=Dolibarr سیکورٹی کے واقعات کی فہرست
+SecurityEventsPurged=سیکورٹی کے واقعات کو صاف کیا
+LogEventDesc=مخصوص سیکیورٹی ایونٹس کے لیے لاگنگ کو فعال کریں۔ منتظمین لاگ ان مینو کے ذریعے <b> %s - %s </b> ۔ وارننگ، یہ فیچر ڈیٹا بیس میں بڑی مقدار میں ڈیٹا تیار کر سکتا ہے۔
+AreaForAdminOnly=سیٹ اپ پیرامیٹرز صرف <b> ایڈمنسٹریٹر صارفین </b> کے ذریعے سیٹ کیے جا سکتے ہیں۔
+SystemInfoDesc=سسٹم کی معلومات متفرق تکنیکی معلومات ہیں جو آپ کو صرف پڑھنے کے موڈ میں ملتی ہیں اور صرف منتظمین کے لیے دکھائی دیتی ہیں۔
+SystemAreaForAdminOnly=یہ علاقہ صرف منتظم صارفین کے لیے دستیاب ہے۔ Dolibarr صارف کی اجازت اس پابندی کو تبدیل نہیں کر سکتی۔
+CompanyFundationDesc=اپنی کمپنی/تنظیم کی معلومات میں ترمیم کریں۔ مکمل ہونے پر صفحہ کے نیچے "%s" بٹن پر کلک کریں۔
+AccountantDesc=اگر آپ کے پاس ایک بیرونی اکاؤنٹنٹ/بک کیپر ہے، تو آپ یہاں اس کی معلومات میں ترمیم کر سکتے ہیں۔
+AccountantFileNumber=اکاؤنٹنٹ کوڈ
+DisplayDesc=درخواست کی شکل اور پیشکش کو متاثر کرنے والے پیرامیٹرز کو یہاں تبدیل کیا جا سکتا ہے۔
+AvailableModules=دستیاب ایپ/ماڈیولز
+ToActivateModule=ماڈیولز کو چالو کرنے کے لیے، سیٹ اپ ایریا (ہوم-> سیٹ اپ-> ماڈیولز) پر جائیں۔
+SessionTimeOut=سیشن کے لیے وقت ختم
+SessionExplanation=یہ نمبر اس بات کی ضمانت دیتا ہے کہ سیشن اس تاخیر سے پہلے کبھی ختم نہیں ہوگا، اگر سیشن کلینر اندرونی پی ایچ پی سیشن کلینر کے ذریعے کیا جاتا ہے (اور کچھ نہیں)۔ اندرونی پی ایچ پی سیشن کلینر اس بات کی ضمانت نہیں دیتا کہ اس تاخیر کے بعد سیشن ختم ہو جائے گا۔ اس کی میعاد ختم ہو جائے گی، اس تاخیر کے بعد، اور جب سیشن کلینر چلایا جائے گا، لہذا ہر <b> %s/%s </b> رسائی، لیکن صرف دوسرے سیشنز کے ذریعے کی جانے والی رسائی کے دوران، اگر اس کا مطلب ہے کہ سیشن کی قیمت صرف 0 کے ذریعے واضح ہو جائے گی عمل)۔ <br> نوٹ: بیرونی سیشن کلیننگ میکانزم کے ساتھ کچھ سرورز پر (کرون انڈر ڈیبین، اوبنٹو...)، سیشنز کو خارجی سیٹ اپ کے ذریعے متعین مدت کے بعد تباہ کیا جا سکتا ہے، چاہے یہاں درج کی گئی قدر ہی کیوں نہ ہو۔
+SessionsPurgedByExternalSystem=ایسا لگتا ہے کہ اس سرور پر سیشنز ایک بیرونی میکانزم کے ذریعے صاف کیے گئے ہیں (cron under debian, ubuntu ...)، شاید ہر <b> %s </b> سیکنڈ (= پیرامیٹر کی قدر a0aee83f8z0700007007007000000000007_75_life) سیشن کی قیمت کو تبدیل کرنے کا وقت۔ آپ کو سرور ایڈمنسٹریٹر سے سیشن میں تاخیر کو تبدیل کرنے کے لیے کہنا چاہیے۔
+TriggersAvailable=دستیاب محرکات
+TriggersDesc=ٹرگرز وہ فائلیں ہیں جو ڈائرکٹری میں کاپی ہونے کے بعد Dolibarr ورک فلو کے رویے میں ترمیم کریں گی <b> htdocs/core/triggers </b> ۔ وہ نئی کارروائیوں کا احساس کرتے ہیں، جو Dolibarr ایونٹس (نئی کمپنی کی تخلیق، انوائس کی توثیق، ...) پر فعال ہوتے ہیں۔
+TriggerDisabledByName=اس فائل میں محرکات کو ان کے نام میں <b> -NORUN </b> لاحقہ سے غیر فعال کر دیا گیا ہے۔
+TriggerDisabledAsModuleDisabled=اس فائل میں محرکات غیر فعال ہیں کیونکہ ماڈیول <b> %s </b> غیر فعال ہے۔
+TriggerAlwaysActive=اس فائل میں محرکات ہمیشہ فعال رہتے ہیں، چاہے جو بھی ڈولیبر ماڈیولز چالو ہوں۔
+TriggerActiveAsModuleActive=اس فائل میں محرکات فعال ہیں کیونکہ ماڈیول <b> %s </b> فعال ہے۔
+GeneratedPasswordDesc=خود کار طریقے سے تیار کردہ پاس ورڈز کے لیے استعمال کرنے کا طریقہ منتخب کریں۔
+DictionaryDesc=تمام حوالہ ڈیٹا داخل کریں۔ آپ اپنی اقدار کو ڈیفالٹ میں شامل کر سکتے ہیں۔
+ConstDesc=یہ صفحہ آپ کو پیرامیٹرز میں ترمیم (اوور رائڈ) کرنے کی اجازت دیتا ہے جو دوسرے صفحات میں دستیاب نہیں ہیں۔ یہ زیادہ تر صرف ڈویلپرز / ایڈوانس ٹربل شوٹنگ کے لیے مخصوص پیرامیٹرز ہیں۔
+MiscellaneousDesc=سیکورٹی سے متعلق دیگر تمام پیرامیٹرز یہاں بیان کیے گئے ہیں۔
+LimitsSetup=حدود/صحت سے متعلق سیٹ اپ
+LimitsDesc=آپ یہاں Dolibarr کی طرف سے استعمال کردہ حدود، درستگی اور اصلاح کی وضاحت کر سکتے ہیں۔
+MAIN_MAX_DECIMALS_UNIT=زیادہ سے زیادہ یونٹ کی قیمتوں کے لیے اعشاریہ
+MAIN_MAX_DECIMALS_TOT=زیادہ سے زیادہ کل قیمتوں کے لیے اعشاریہ
+MAIN_MAX_DECIMALS_SHOWN=زیادہ سے زیادہ قیمتوں کے لیے اعشاریہ <b> اسکرین </b> پر دکھایا گیا ہے۔ اس پیرامیٹر کے بعد ایک ellipsis <b> ... </b> شامل کریں (جیسے "2...") اگر آپ "<b> ... </b>" کو tr کے ساتھ لاحقہ قیمت دیکھنا چاہتے ہیں۔
+MAIN_ROUNDING_RULE_TOT=راؤنڈنگ رینج کا مرحلہ (ان ممالک کے لیے جہاں بیس 10 کے علاوہ کسی اور چیز پر راؤنڈنگ کی جاتی ہے۔ مثال کے طور پر، اگر راؤنڈنگ 0.05 مراحل سے کی جاتی ہے تو 0.05 ڈالیں)
+UnitPriceOfProduct=کسی پروڈکٹ کی خالص یونٹ قیمت
+TotalPriceAfterRounding=راؤنڈنگ کے بعد کل قیمت (بغیر ٹیکس/وایٹ/ٹیکس)
+ParameterActiveForNextInputOnly=پیرامیٹر صرف اگلے ان پٹ کے لیے موثر ہے۔
+NoEventOrNoAuditSetup=کوئی سیکورٹی ایونٹ لاگ ان نہیں کیا گیا ہے۔ اگر "سیٹ اپ - سیکیورٹی - ایونٹس" صفحہ میں آڈٹ کو فعال نہیں کیا گیا ہے تو یہ معمول ہے۔
+NoEventFoundWithCriteria=اس تلاش کے معیار کے لیے کوئی سیکیورٹی ایونٹ نہیں ملا ہے۔
+SeeLocalSendMailSetup=اپنے مقامی ارسال میل کا سیٹ اپ دیکھیں
+BackupDesc=Dolibarr انسٹالیشن کے <b> مکمل </b> بیک اپ کے لیے دو مراحل کی ضرورت ہوتی ہے۔
+BackupDesc2="دستاویزات" ڈائرکٹری کے مواد کا بیک اپ لیں ( <b> %s </b> ) جس میں تمام اپ لوڈ اور تیار کردہ فائلیں ہیں۔ اس میں مرحلہ 1 میں تیار کردہ تمام ڈمپ فائلیں بھی شامل ہوں گی۔ یہ آپریشن کئی منٹ تک جاری رہ سکتا ہے۔
+BackupDesc3=اپنے ڈیٹا بیس ( <b> %s </b> ) کے ڈھانچے اور مواد کو ڈمپ فائل میں بیک اپ کریں۔ اس کے لیے آپ درج ذیل اسسٹنٹ استعمال کر سکتے ہیں۔
+BackupDescX=محفوظ شدہ ڈائرکٹری کو محفوظ جگہ پر محفوظ کیا جانا چاہیے۔
+BackupDescY=تیار کردہ ڈمپ فائل کو محفوظ جگہ پر محفوظ کیا جانا چاہئے۔
+BackupPHPWarning=اس طریقے سے بیک اپ کی ضمانت نہیں دی جا سکتی۔ پچھلا تجویز کردہ۔
+RestoreDesc=Dolibarr بیک اپ کو بحال کرنے کے لیے، دو مراحل درکار ہیں۔
+RestoreDesc2="دستاویزات" ڈائرکٹری کی بیک اپ فائل (مثال کے طور پر زپ فائل) کو ایک نئی Dolibarr انسٹالیشن میں یا اس موجودہ دستاویزات کی ڈائرکٹری ( <b> %s </b> ) میں بحال کریں۔
+RestoreDesc3=ڈیٹا بیس کی ساخت اور ڈیٹا کو بیک اپ ڈمپ فائل سے نئی ڈولیبر انسٹالیشن کے ڈیٹا بیس میں یا اس موجودہ انسٹالیشن کے ڈیٹا بیس میں بحال کریں ( <b> %s </b> )۔ تنبیہ، بحالی مکمل ہونے کے بعد، آپ کو دوبارہ جڑنے کے لیے ایک لاگ ان/پاس ورڈ استعمال کرنا چاہیے، جو بیک اپ ٹائم/انسٹالیشن سے موجود تھا۔ <br> اس موجودہ انسٹالیشن میں بیک اپ ڈیٹا بیس کو بحال کرنے کے لیے، آپ اس اسسٹنٹ کی پیروی کر سکتے ہیں۔
+RestoreMySQL=MySQL درآمد
+ForcedToByAModule=اس اصول کو ایک فعال ماڈیول کے ذریعے <b> %s </b> پر مجبور کیا جاتا ہے۔
+ValueIsForcedBySystem=یہ قیمت نظام کے ذریعہ مجبور ہے۔ آپ اسے تبدیل نہیں کر سکتے۔
+PreviousDumpFiles=موجودہ بیک اپ فائلیں۔
+PreviousArchiveFiles=موجودہ آرکائیو فائلز
+WeekStartOnDay=ہفتے کا پہلا دن
+RunningUpdateProcessMayBeRequired=اپ گریڈ کے عمل کو چلانے کی ضرورت محسوس ہوتی ہے (پروگرام ورژن %s ڈیٹا بیس ورژن %s سے مختلف ہے)
+YouMustRunCommandFromCommandLineAfterLoginToUser=آپ کو صارف <b> %s </b> کے ساتھ شیل میں لاگ ان کرنے کے بعد کمانڈ لائن سے اس کمانڈ کو چلانا ہوگا یا <b> <b> <b> %s </b> آپ کو کمانڈ لائن کے آخر میں -W آپشن شامل کرنا ہوگا۔
+YourPHPDoesNotHaveSSLSupport=ایس ایس ایل فنکشنز آپ کے پی ایچ پی میں دستیاب نہیں ہیں۔
+DownloadMoreSkins=ڈاؤن لوڈ کرنے کے لیے مزید کھالیں۔
+SimpleNumRefModelDesc=حوالہ نمبر %syymm-nnnn فارمیٹ میں لوٹاتا ہے جہاں yy سال ہے، mm مہینہ ہے اور nnnn ایک ترتیب وار خود بخود بڑھنے والا نمبر ہے بغیر کسی ری سیٹ کے
+SimpleNumRefNoDateModelDesc=حوالہ نمبر %s-nnnn فارمیٹ میں لوٹاتا ہے جہاں nnnn ایک ترتیب وار خود بخود بڑھنے والا نمبر ہے بغیر کسی ری سیٹ کے
+ShowProfIdInAddress=ایڈریس کے ساتھ پروفیشنل آئی ڈی دکھائیں۔
+ShowVATIntaInAddress=انٹرا کمیونٹی VAT نمبر چھپائیں۔
+TranslationUncomplete=جزوی ترجمہ
+MAIN_DISABLE_METEO=موسم کے انگوٹھے کو غیر فعال کریں۔
+MeteoStdMod=معیاری وضع
+MeteoStdModEnabled=معیاری وضع فعال ہے۔
+MeteoPercentageMod=فیصد موڈ
+MeteoPercentageModEnabled=فیصد موڈ فعال ہے۔
+MeteoUseMod=%s استعمال کرنے کے لیے کلک کریں۔
+TestLoginToAPI=API میں لاگ ان کی جانچ کریں۔
+ProxyDesc=Dolibarr کی کچھ خصوصیات کو انٹرنیٹ تک رسائی کی ضرورت ہے۔ یہاں انٹرنیٹ کنکشن کے پیرامیٹرز کی وضاحت کریں جیسے اگر ضروری ہو تو پراکسی سرور کے ذریعے رسائی۔
+ExternalAccess=بیرونی/انٹرنیٹ رسائی
+MAIN_PROXY_USE=ایک پراکسی سرور استعمال کریں (بصورت دیگر رسائی براہ راست انٹرنیٹ تک ہے)
+MAIN_PROXY_HOST=پراکسی سرور: نام/پتہ
+MAIN_PROXY_PORT=پراکسی سرور: پورٹ
+MAIN_PROXY_USER=پراکسی سرور: لاگ ان/صارف
+MAIN_PROXY_PASS=پراکسی سرور: پاس ورڈ
+DefineHereComplementaryAttributes=کسی بھی اضافی / حسب ضرورت اوصاف کی وضاحت کریں جن کو شامل کرنا ضروری ہے: %s
+ExtraFields=تکمیلی صفات
+ExtraFieldsLines=تکمیلی صفات (لائنز)
+ExtraFieldsLinesRec=تکمیلی صفات (ٹیمپلیٹس انوائس لائنز)
+ExtraFieldsSupplierOrdersLines=تکمیلی صفات (آرڈر لائنز)
+ExtraFieldsSupplierInvoicesLines=تکمیلی صفات (انوائس لائنز)
+ExtraFieldsThirdParties=تکمیلی صفات (تیسری پارٹی)
+ExtraFieldsContacts=تکمیلی صفات (رابطے/پتہ)
+ExtraFieldsMember=تکمیلی صفات (رکن)
+ExtraFieldsMemberType=تکمیلی صفات (رکن کی قسم)
+ExtraFieldsCustomerInvoices=تکمیلی صفات (انوائسز)
+ExtraFieldsCustomerInvoicesRec=تکمیلی صفات (ٹیمپلیٹس رسیدیں)
+ExtraFieldsSupplierOrders=تکمیلی صفات (احکامات)
+ExtraFieldsSupplierInvoices=تکمیلی صفات (انوائسز)
+ExtraFieldsProject=تکمیلی صفات (منصوبے)
+ExtraFieldsProjectTask=تکمیلی صفات (کام)
+ExtraFieldsSalaries=تکمیلی صفات (تنخواہ)
+ExtraFieldHasWrongValue=انتساب %s کی قدر غلط ہے۔
+AlphaNumOnlyLowerCharsAndNoSpace=صرف حروفِ عددی اور چھوٹے حروف بغیر جگہ کے
+SendmailOptionNotComplete=وارننگ، کچھ لینکس سسٹمز پر، آپ کے ای میل سے ای میل بھیجنے کے لیے، sendmail ایگزیکیوشن سیٹ اپ میں آپشن -ba (پیرامیٹر mail.force_extra_parameters آپ کی php.ini فائل میں) ہونا چاہیے۔ اگر کچھ وصول کنندگان کو کبھی بھی ای میلز موصول نہیں ہوتیں، تو mail.force_extra_parameters = -ba) کے ساتھ اس پی ایچ پی پیرامیٹر میں ترمیم کرنے کی کوشش کریں۔
+PathToDocuments=دستاویزات کا راستہ
+PathDirectory=ڈائرکٹری
+SendmailOptionMayHurtBuggedMTA=طریقہ "PHP میل ڈائریکٹ" کا استعمال کرتے ہوئے میل بھیجنے کی خصوصیت ایک میل پیغام تیار کرے گی جس کا شاید کچھ وصول کرنے والے میل سرورز کے ذریعے درست طریقے سے تجزیہ نہ کیا جائے۔ نتیجہ یہ ہے کہ کچھ میل ان بگڈ پلیٹ فارمز کی میزبانی والے لوگ نہیں پڑھ سکتے ہیں۔ یہ معاملہ کچھ انٹرنیٹ فراہم کنندگان کے لیے ہے (سابق: فرانس میں اورنج)۔ یہ Dolibarr یا PHP کے ساتھ مسئلہ نہیں ہے بلکہ وصول کرنے والے میل سرور کے ساتھ ہے۔ تاہم آپ سیٹ اپ میں ایک آپشن MAIN_FIX_FOR_BUGGED_MTA کو 1 میں شامل کر سکتے ہیں - اس سے بچنے کے لیے Dolibarr میں ترمیم کرنے کے لیے دوسرا۔ تاہم، آپ کو دوسرے سرورز کے ساتھ مسائل کا سامنا ہو سکتا ہے جو SMTP معیار کو سختی سے استعمال کرتے ہیں۔ دوسرا حل (تجویز کردہ) طریقہ "SMTP ساکٹ لائبریری" استعمال کرنا ہے جس کا کوئی نقصان نہیں ہے۔
+TranslationSetup=ترجمہ کا سیٹ اپ
+TranslationKeySearch=ترجمہ کلید یا تار تلاش کریں۔
+TranslationOverwriteKey=ترجمے کی تار کو اوور رائٹ کریں۔
+TranslationDesc=<br> * پہلے سے طے شدہ / Systemwide: ڈسپلے زبان سیٹ کرنے کے لئے کس طرح -> سیٹ اپ - گھر <strong> مینو فی صارف <br> * </strong>> دکھائیں: سکرین کے سب سے اوپر صارف نام پر کلک کریں اور صارف پر <strong> یوزر ڈسپلے سیٹ اپ </strong> ٹیب پر نظر ثانی کارڈ
+TranslationOverwriteDesc=آپ درج ذیل ٹیبل کو بھرنے والی تاروں کو بھی اوور رائڈ کر سکتے ہیں۔ "%s" ڈراپ ڈاؤن سے اپنی زبان کا انتخاب کریں، "%s" میں ترجمہ کی کلید اور اپنا نیا ترجمہ "%s" میں داخل کریں۔
+TranslationOverwriteDesc2=آپ یہ جاننے میں مدد کے لیے دوسرے ٹیب کا استعمال کر سکتے ہیں کہ کون سی ترجمے کی کلید استعمال کرنی ہے۔
+TranslationString=ترجمے کی تار
+CurrentTranslationString=موجودہ ترجمے کی تار
+WarningAtLeastKeyOrTranslationRequired=کم از کم کلید یا ترجمے کی تار کے لیے تلاش کا معیار درکار ہے۔
+NewTranslationStringToShow=دکھانے کے لیے ترجمہ کی نئی تار
+OriginalValueWas=اصل ترجمہ اوور رائٹ ہے۔ اصل قیمت یہ تھی: <br> <br> %s
+TransKeyWithoutOriginalValue=آپ نے ترجمہ کلید '<strong> %s </strong>' کے لیے ایک نیا ترجمہ مجبور کیا جو کسی بھی زبان کی فائلوں میں موجود نہیں ہے۔
+TitleNumberOfActivatedModules=چالو ماڈیولز
+TotalNumberOfActivatedModules=چالو ماڈیولز: <b> %s </b> / <b> %s a09a4b739f17f80
+YouMustEnableOneModule=آپ کو کم از کم 1 ماڈیول کو فعال کرنا ہوگا۔
+ClassNotFoundIntoPathWarning=کلاس %s پی ایچ پی پاتھ میں نہیں ملی
+YesInSummer=ہاں گرمیوں میں
+OnlyFollowingModulesAreOpenedToExternalUsers=نوٹ کریں، صرف مندرجہ ذیل ماڈیولز بیرونی صارفین کے لیے دستیاب ہیں (اس طرح کے صارفین کی اجازتوں سے قطع نظر) اور صرف اس صورت میں جب اجازت دی گئی ہو: <br>
+SuhosinSessionEncrypt=سیشن اسٹوریج کو سحوسین کے ذریعے خفیہ کردہ
+ConditionIsCurrently=حالت فی الحال %s ہے۔
+YouUseBestDriver=آپ ڈرائیور %s استعمال کرتے ہیں جو اس وقت دستیاب بہترین ڈرائیور ہے۔
+YouDoNotUseBestDriver=آپ ڈرائیور %s استعمال کرتے ہیں لیکن ڈرائیور %s کی سفارش کی جاتی ہے۔
+NbOfObjectIsLowerThanNoPb=آپ کے پاس ڈیٹا بیس میں صرف %s %s ہے۔ اس کے لیے کسی خاص اصلاح کی ضرورت نہیں ہے۔
+ComboListOptim=کومبو لسٹ لوڈنگ آپٹیمائزیشن
+SearchOptim=تلاش کی اصلاح
+YouHaveXObjectUseComboOptim=آپ کے پاس ڈیٹا بیس میں %s %s ہے۔ آپ کلیدی پریسڈ ایونٹ پر کومبو لسٹ کی لوڈنگ کو فعال کرنے کے لیے ماڈیول کے سیٹ اپ میں جا سکتے ہیں۔
+YouHaveXObjectUseSearchOptim=آپ کے پاس ڈیٹا بیس میں %s %s ہے۔ آپ Home-Setup-Other میں مستقل %s کو 1 میں شامل کر سکتے ہیں۔
+YouHaveXObjectUseSearchOptimDesc=یہ تلاش کو تاروں کے آغاز تک محدود کر دیتا ہے جس سے ڈیٹا بیس کے لیے اشاریہ جات کا استعمال ممکن ہو جاتا ہے اور آپ کو فوری جواب ملنا چاہیے۔
+YouHaveXObjectAndSearchOptimOn=آپ کے پاس ڈیٹا بیس میں %s %s ہے اور مستقل %s ہوم سیٹ اپ-دیگر میں %s پر سیٹ ہے۔
+BrowserIsOK=آپ %s ویب براؤزر استعمال کر رہے ہیں۔ یہ براؤزر سیکورٹی اور کارکردگی کے لیے ٹھیک ہے۔
+BrowserIsKO=آپ %s ویب براؤزر استعمال کر رہے ہیں۔ یہ براؤزر سیکورٹی، کارکردگی اور قابل اعتماد کے لیے ایک برا انتخاب کے طور پر جانا جاتا ہے۔ ہم Firefox، Chrome، Opera یا Safari استعمال کرنے کی تجویز کرتے ہیں۔
+PHPModuleLoaded=پی ایچ پی کا جزو %s لوڈ ہے۔
+PreloadOPCode=پہلے سے لوڈ شدہ اوپکوڈ استعمال کیا جاتا ہے۔
+AddRefInList=کسٹمر/وینڈر ریفری ڈسپلے کریں۔ کومبو فہرستوں میں۔ <br> فریق ثالث "CC12345 - SC45678 - The Big Company corp" کے نام کی شکل کے ساتھ ظاہر ہوں گے۔ "The Big Company corp" کے بجائے۔
+AddVatInList=کسٹمر/وینڈر VAT نمبر کومبو لسٹوں میں دکھائیں۔
+AddAdressInList=کومبو لسٹوں میں کسٹمر/وینڈر کا پتہ دکھائیں۔ <br> فریق ثالث "The Big Company corp." کے بجائے "The Big Company corp. - 21 jump street 123456 Big town - USA" کے نام کی شکل کے ساتھ ظاہر ہوں گے۔
+AddEmailPhoneTownInContactList=رابطہ ای میل (یا فونز کی اگر وضاحت نہیں کی گئی ہے) اور شہر کی معلومات کی فہرست (منتخب فہرست یا کومبو باکس) <br> رابطے "Dupond Durand - dupond.durand@email.com - پیرس" یا "Dupond Durand - 06 07" کے نام کی شکل کے ساتھ ظاہر ہوں گے۔ 59 65 66 - "ڈوپونڈ ڈیورنڈ" کی بجائے پیرس۔
+AskForPreferredShippingMethod=فریق ثالث کے لیے ترسیل کا ترجیحی طریقہ پوچھیں۔
+FieldEdition=فیلڈ کا ایڈیشن %s
+FillThisOnlyIfRequired=مثال: +2 (صرف اس صورت میں بھریں جب ٹائم زون آفسیٹ کے مسائل کا سامنا ہو)
+GetBarCode=بارکوڈ حاصل کریں۔
+NumberingModules=نمبر دینے والے ماڈل
+DocumentModules=دستاویزی ماڈلز
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
-PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
-PasswordGenerationPerso=Return a password according to your personally defined configuration.
-SetupPerso=According to your configuration
-PasswordPatternDesc=Password pattern description
+PasswordGenerationStandard=اندرونی Dolibarr الگورتھم کے مطابق تیار کردہ پاس ورڈ واپس کریں: %s حروف جس میں مشترکہ نمبر اور چھوٹے حروف شامل ہوں۔
+PasswordGenerationNone=تیار کردہ پاس ورڈ تجویز نہ کریں۔ پاس ورڈ کو دستی طور پر ٹائپ کرنا ضروری ہے۔
+PasswordGenerationPerso=اپنی ذاتی طور پر طے شدہ ترتیب کے مطابق پاس ورڈ واپس کریں۔
+SetupPerso=آپ کی ترتیب کے مطابق
+PasswordPatternDesc=پاس ورڈ پیٹرن کی تفصیل
 ##### Users setup #####
-RuleForGeneratedPasswords=Rules to generate and validate passwords
-DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
-UsersSetup=Users module setup
-UserMailRequired=Email required to create a new user
-UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
-UsersDocModules=Document templates for documents generated from user record
-GroupsDocModules=Document templates for documents generated from a group record
+RuleForGeneratedPasswords=پاس ورڈ بنانے اور ان کی توثیق کرنے کے اصول
+DisableForgetPasswordLinkOnLogonPage=لاگ ان صفحہ پر "پاس ورڈ بھول گئے" کا لنک مت دکھائیں۔
+UsersSetup=صارفین کا ماڈیول سیٹ اپ
+UserMailRequired=نیا صارف بنانے کے لیے ای میل درکار ہے۔
+UserHideInactive=غیر فعال صارفین کو صارفین کی تمام کومبو فہرستوں سے چھپائیں (تجویز نہیں کی گئی: اس کا مطلب یہ ہو سکتا ہے کہ آپ کچھ صفحات پر پرانے صارفین کو فلٹر یا تلاش نہیں کر سکیں گے)
+UsersDocModules=صارف کے ریکارڈ سے تیار کردہ دستاویزات کے لیے دستاویزی ٹیمپلیٹس
+GroupsDocModules=ایک گروپ ریکارڈ سے تیار کردہ دستاویزات کے لیے دستاویزی ٹیمپلیٹس
 ##### HRM setup #####
-HRMSetup=HRM module setup
+HRMSetup=HRM ماڈیول سیٹ اپ
 ##### Company setup #####
-CompanySetup=Companies module setup
-CompanyCodeChecker=Options for automatic generation of customer/vendor codes
-AccountCodeManager=Options for automatic generation of customer/vendor accounting codes
-NotificationsDesc=Email notifications can be sent automatically for some Dolibarr events.<br>Recipients of notifications can be defined:
-NotificationsDescUser=* per user, one user at a time.
-NotificationsDescContact=* per third-party contacts (customers or vendors), one contact at a time.
-NotificationsDescGlobal=* or by setting global email addresses in the setup page of the module.
-ModelModules=Document Templates
-DocumentModelOdt=Generate documents from OpenDocument templates (.ODT / .ODS files from LibreOffice, OpenOffice, KOffice, TextEdit,...)
-WatermarkOnDraft=Watermark on draft document
-JSOnPaimentBill=Activate feature to autofill payment lines on payment form
-CompanyIdProfChecker=Rules for Professional IDs
-MustBeUnique=Must be unique?
-MustBeMandatory=Mandatory to create third parties (if VAT number or type of company defined) ?
-MustBeInvoiceMandatory=Mandatory to validate invoices?
-TechnicalServicesProvided=Technical services provided
+CompanySetup=کمپنیاں ماڈیول سیٹ اپ
+CompanyCodeChecker=کسٹمر/وینڈر کوڈز کی خودکار تخلیق کے اختیارات
+AccountCodeManager=کسٹمر/وینڈر اکاؤنٹنگ کوڈز کی خودکار تخلیق کے لیے اختیارات
+NotificationsDesc=کچھ Dolibarr واقعات کے لیے ای میل اطلاعات خود بخود بھیجی جا سکتی ہیں۔ <br> اطلاعات کے وصول کنندگان کی تعریف کی جا سکتی ہے:
+NotificationsDescUser=* فی صارف، ایک وقت میں ایک صارف۔
+NotificationsDescContact=* فی تھرڈ پارٹی رابطے (گاہک یا دکاندار)، ایک وقت میں ایک رابطہ۔
+NotificationsDescGlobal=* یا ماڈیول کے سیٹ اپ صفحہ میں عالمی ای میل پتوں کو ترتیب دے کر۔
+ModelModules=دستاویز کے سانچے
+DocumentModelOdt=OpenDocument ٹیمپلیٹس سے دستاویزات تیار کریں (LibreOffice، OpenOffice، KOffice، TextEdit،... سے ODT / .ODS فائلیں)
+WatermarkOnDraft=مسودہ دستاویز پر واٹر مارک
+JSOnPaimentBill=ادائیگی کے فارم پر ادائیگی کی لائنوں کو خود سے بھرنے کے لیے خصوصیت کو فعال کریں۔
+CompanyIdProfChecker=پروفیشنل آئی ڈی کے لیے قواعد
+MustBeUnique=منفرد ہونا ضروری ہے؟
+MustBeMandatory=تیسرے فریق بنانا لازمی ہے (اگر VAT نمبر یا کمپنی کی قسم کی وضاحت کی گئی ہے)؟
+MustBeInvoiceMandatory=انوائس کی توثیق کرنا لازمی ہے؟
+TechnicalServicesProvided=تکنیکی خدمات فراہم کی گئیں۔
 #####DAV #####
-WebDAVSetupDesc=This is the link to access the WebDAV directory. It contains a "public" dir open to any user knowing the URL (if public directory access allowed) and a "private" directory that needs an existing login account/password for access.
-WebDavServer=Root URL of %s server: %s
+WebDAVSetupDesc=یہ WebDAV ڈائریکٹری تک رسائی کا لنک ہے۔ اس میں ایک "عوامی" ڈائرکٹری ہے جو کسی بھی صارف کے لیے کھلا ہے جو یو آر ایل کو جانتا ہے (اگر عوامی ڈائریکٹری تک رسائی کی اجازت ہے) اور ایک "نجی" ڈائریکٹری ہے جس تک رسائی کے لیے موجودہ لاگ ان اکاؤنٹ/ پاس ورڈ کی ضرورت ہے۔
+WebDavServer=%s سرور کا روٹ URL: %s
 ##### Webcal setup #####
-WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
+WebCalUrlForVCalExport=<b> %s </b> فارمیٹ کا ایکسپورٹ لنک درج ذیل لنک پر دستیاب ہے: %s
 ##### Invoices #####
-BillsSetup=Invoices module setup
-BillsNumberingModule=Invoices and credit notes numbering model
-BillsPDFModules=Invoice documents models
-BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
-PaymentsPDFModules=Payment documents models
-ForceInvoiceDate=Force invoice date to validation date
-SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined on the invoice
-SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
-SuggestPaymentByChequeToAddress=Suggest payment by check to
-FreeLegalTextOnInvoices=Free text on invoices
-WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty)
-PaymentsNumberingModule=Payments numbering model
-SuppliersPayment=Vendor payments
-SupplierPaymentSetup=Vendor payments setup
+BillsSetup=انوائس ماڈیول سیٹ اپ
+BillsNumberingModule=انوائسز اور کریڈٹ نوٹس نمبرنگ ماڈل
+BillsPDFModules=انوائس دستاویزات کے ماڈل
+BillsPDFModulesAccordindToInvoiceType=انوائس کی قسم کے مطابق انوائس دستاویزات کے ماڈل
+PaymentsPDFModules=ادائیگی کے دستاویزات کے ماڈل
+ForceInvoiceDate=انوائس کی تاریخ کو توثیق کی تاریخ پر مجبور کریں۔
+SuggestedPaymentModesIfNotDefinedInInvoice=انوائس پر تجویز کردہ ادائیگیوں کا موڈ بطور ڈیفالٹ اگر انوائس پر بیان نہیں کیا گیا ہے۔
+SuggestPaymentByRIBOnAccount=اکاؤنٹ پر رقم نکال کر ادائیگی کی تجویز کریں۔
+SuggestPaymentByChequeToAddress=چیک کے ذریعے ادائیگی کی تجویز کریں۔
+FreeLegalTextOnInvoices=رسیدوں پر مفت متن
+WatermarkOnDraftInvoices=ڈرافٹ رسیدوں پر واٹر مارک (اگر خالی نہ ہو)
+PaymentsNumberingModule=ادائیگیوں کا نمبر دینے والا ماڈل
+SuppliersPayment=وینڈر کی ادائیگی
+SupplierPaymentSetup=وینڈر ادائیگیوں کا سیٹ اپ
 ##### Proposals #####
-PropalSetup=Commercial proposals module setup
-ProposalsNumberingModules=Commercial proposal numbering models
-ProposalsPDFModules=Commercial proposal documents models
-SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
-FreeLegalTextOnProposal=Free text on commercial proposals
-WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+PropalSetup=تجارتی تجاویز ماڈیول سیٹ اپ
+ProposalsNumberingModules=تجارتی تجویز نمبر دینے والے ماڈل
+ProposalsPDFModules=تجارتی تجویز کے دستاویزات کے ماڈل
+SuggestedPaymentModesIfNotDefinedInProposal=تجویز کردہ ادائیگیوں کا موڈ بطور ڈیفالٹ اگر تجویز پر بیان نہیں کیا گیا ہے۔
+FreeLegalTextOnProposal=تجارتی تجاویز پر مفت متن
+WatermarkOnDraftProposal=تجارتی تجاویز کے مسودے پر واٹر مارک (اگر خالی نہ ہو)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=تجویز کے بینک اکاؤنٹ کی منزل کے لیے پوچھیں۔
 ##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
-WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
+SupplierProposalSetup=قیمت سپلائرز ماڈیول سیٹ اپ کی درخواست کرتی ہے۔
+SupplierProposalNumberingModules=قیمت سپلائرز کو نمبر دینے والے ماڈلز کی درخواست کرتی ہے۔
+SupplierProposalPDFModules=قیمت سپلائرز دستاویزات کے ماڈل کی درخواست کرتی ہے۔
+FreeLegalTextOnSupplierProposal=قیمت کی درخواستوں کے سپلائرز پر مفت متن
+WatermarkOnDraftSupplierProposal=ڈرافٹ قیمت پر واٹر مارک سپلائرز کی درخواست کرتا ہے (کوئی نہیں اگر خالی ہو)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=قیمت کی درخواست کے بینک اکاؤنٹ کی منزل کے لیے پوچھیں۔
+WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=آرڈر کے لیے گودام کے ماخذ سے پوچھیں۔
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=پرچیز آرڈر کے بینک اکاؤنٹ کی منزل کے لیے پوچھیں۔
 ##### Orders #####
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sales order by default if not defined on the order
-OrdersSetup=Sales Orders management setup
-OrdersNumberingModules=Orders numbering models
-OrdersModelModule=Order documents models
-FreeLegalTextOnOrders=Free text on orders
-WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
-ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
-BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
+SuggestedPaymentModesIfNotDefinedInOrder=سیلز آرڈر پر تجویز کردہ ادائیگی کا موڈ بذریعہ ڈیفالٹ اگر آرڈر پر بیان نہ کیا گیا ہو۔
+OrdersSetup=سیلز آرڈر مینجمنٹ سیٹ اپ
+OrdersNumberingModules=نمبر دینے والے ماڈلز کا آرڈر دیں۔
+OrdersModelModule=دستاویزات کے ماڈل آرڈر کریں۔
+FreeLegalTextOnOrders=آرڈر پر مفت متن
+WatermarkOnDraftOrders=ڈرافٹ آرڈرز پر واٹر مارک (اگر خالی نہ ہو)
+ShippableOrderIconInList=آرڈرز کی فہرست میں ایک آئیکن شامل کریں جو اس بات کی نشاندہی کرتا ہے کہ آیا آرڈر قابل ترسیل ہے۔
+BANK_ASK_PAYMENT_BANK_DURING_ORDER=آرڈر کی منزل کے لیے بینک اکاؤنٹ سے پوچھیں۔
 ##### Interventions #####
-InterventionsSetup=Interventions module setup
-FreeLegalTextOnInterventions=Free text on intervention documents
-FicheinterNumberingModules=Intervention numbering models
-TemplatePDFInterventions=Intervention card documents models
-WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
+InterventionsSetup=مداخلت ماڈیول سیٹ اپ
+FreeLegalTextOnInterventions=مداخلتی دستاویزات پر مفت متن
+FicheinterNumberingModules=مداخلت کے نمبر دینے والے ماڈل
+TemplatePDFInterventions=مداخلت کارڈ کے دستاویزات کے ماڈل
+WatermarkOnDraftInterventionCards=انٹروینشن کارڈ دستاویزات پر واٹر مارک (اگر خالی نہ ہو)
 ##### Contracts #####
-ContractsSetup=Contracts/Subscriptions module setup
-ContractsNumberingModules=Contracts numbering modules
-TemplatePDFContracts=Contracts documents models
-FreeLegalTextOnContracts=Free text on contracts
-WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
+ContractsSetup=کنٹریکٹس/سبسکرپشنز ماڈیول سیٹ اپ
+ContractsNumberingModules=کنٹریکٹ نمبرنگ ماڈیولز
+TemplatePDFContracts=معاہدہ دستاویزات کے ماڈلز
+FreeLegalTextOnContracts=معاہدوں پر مفت متن
+WatermarkOnDraftContractCards=مسودہ معاہدوں پر واٹر مارک (اگر خالی نہ ہو)
 ##### Members #####
-MembersSetup=Members module setup
-MemberMainOptions=Main options
-AdherentLoginRequired= Manage a Login for each member
-AdherentMailRequired=Email required to create a new member
-MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
-MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
-VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
-MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
-MembersDocModules=Document templates for documents generated from member record
+MembersSetup=ممبران ماڈیول سیٹ اپ
+MemberMainOptions=اہم اختیارات
+AdherentLoginRequired= ہر ممبر کے لیے لاگ ان کا انتظام کریں۔
+AdherentMailRequired=نیا رکن بنانے کے لیے ای میل درکار ہے۔
+MemberSendInformationByMailByDefault=اراکین کو میل کی تصدیق بھیجنے کے لیے چیک باکس (توثیق یا نئی رکنیت) بطور ڈیفالٹ آن ہے۔
+MemberCreateAnExternalUserForSubscriptionValidated=ہر نئے رکن کی توثیق شدہ رکنیت کے لیے ایک بیرونی صارف لاگ ان بنائیں
+VisitorCanChooseItsPaymentMode=وزیٹر دستیاب ادائیگی کے طریقوں میں سے انتخاب کر سکتا ہے۔
+MEMBER_REMINDER_EMAIL=میعاد ختم ہونے والی سبسکرپشنز کی ای میل </b> کے ذریعے خودکار یاد دہانی <b> کو فعال کریں۔ نوٹ: یاد دہانی بھیجنے کے لیے ماڈیول <strong> %s </strong> فعال اور درست طریقے سے سیٹ اپ ہونا چاہیے۔
+MembersDocModules=ممبر کے ریکارڈ سے تیار کردہ دستاویزات کے لیے دستاویزی ٹیمپلیٹس
 ##### LDAP setup #####
-LDAPSetup=LDAP Setup
-LDAPGlobalParameters=Global parameters
-LDAPUsersSynchro=Users
-LDAPGroupsSynchro=Groups
-LDAPContactsSynchro=Contacts
-LDAPMembersSynchro=Members
-LDAPMembersTypesSynchro=Members types
-LDAPSynchronization=LDAP synchronisation
-LDAPFunctionsNotAvailableOnPHP=LDAP functions are not available on your PHP
+LDAPSetup=LDAP سیٹ اپ
+LDAPGlobalParameters=عالمی پیرامیٹرز
+LDAPUsersSynchro=صارفین
+LDAPGroupsSynchro=گروپس
+LDAPContactsSynchro=رابطے
+LDAPMembersSynchro=ممبران
+LDAPMembersTypesSynchro=اراکین کی اقسام
+LDAPSynchronization=LDAP مطابقت پذیری
+LDAPFunctionsNotAvailableOnPHP=LDAP فنکشنز آپ کے PHP پر دستیاب نہیں ہیں۔
 LDAPToDolibarr=LDAP -> Dolibarr
 DolibarrToLDAP=Dolibarr -> LDAP
-LDAPNamingAttribute=Key in LDAP
-LDAPSynchronizeUsers=Organization of users in LDAP
-LDAPSynchronizeGroups=Organization of groups in LDAP
-LDAPSynchronizeContacts=Organization of contacts in LDAP
-LDAPSynchronizeMembers=Organization of foundation's members in LDAP
-LDAPSynchronizeMembersTypes=Organization of foundation's members types in LDAP
-LDAPPrimaryServer=Primary server
-LDAPSecondaryServer=Secondary server
-LDAPServerPort=Server port
-LDAPServerPortExample=Standard or StartTLS: 389, LDAPs: 636
-LDAPServerProtocolVersion=Protocol version
-LDAPServerUseTLS=Use TLS
-LDAPServerUseTLSExample=Your LDAP server use StartTLS
-LDAPServerDn=Server DN
-LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
-LDAPPassword=Administrator password
-LDAPUserDn=Users' DN
-LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com)
-LDAPGroupDn=Groups' DN
-LDAPGroupDnExample=Complete DN (ex: ou=groups,dc=example,dc=com)
-LDAPServerExample=Server address (ex: localhost, 192.168.0.2, ldaps://ldap.example.com/)
-LDAPServerDnExample=Complete DN (ex: dc=example,dc=com)
-LDAPDnSynchroActive=Users and groups synchronization
-LDAPDnSynchroActiveExample=LDAP to Dolibarr or Dolibarr to LDAP synchronization
-LDAPDnContactActive=Contacts' synchronization
-LDAPDnContactActiveExample=Activated/Unactivated synchronization
-LDAPDnMemberActive=Members' synchronization
-LDAPDnMemberActiveExample=Activated/Unactivated synchronization
-LDAPDnMemberTypeActive=Members types' synchronization
-LDAPDnMemberTypeActiveExample=Activated/Unactivated synchronization
-LDAPContactDn=Dolibarr contacts' DN
-LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=example,dc=com)
-LDAPMemberDn=Dolibarr members DN
-LDAPMemberDnExample=Complete DN (ex: ou=members,dc=example,dc=com)
-LDAPMemberObjectClassList=List of objectClass
-LDAPMemberObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPMemberTypeDn=Dolibarr members types DN
-LDAPMemberTypepDnExample=Complete DN (ex: ou=memberstypes,dc=example,dc=com)
-LDAPMemberTypeObjectClassList=List of objectClass
-LDAPMemberTypeObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames)
-LDAPUserObjectClassList=List of objectClass
-LDAPUserObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPGroupObjectClassList=List of objectClass
-LDAPGroupObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames)
-LDAPContactObjectClassList=List of objectClass
-LDAPContactObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPTestConnect=Test LDAP connection
-LDAPTestSynchroContact=Test contacts synchronization
-LDAPTestSynchroUser=Test user synchronization
-LDAPTestSynchroGroup=Test group synchronization
-LDAPTestSynchroMember=Test member synchronization
-LDAPTestSynchroMemberType=Test member type synchronization
-LDAPTestSearch= Test a LDAP search
-LDAPSynchroOK=Synchronization test successful
-LDAPSynchroKO=Failed synchronization test
-LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that the connection to the server is correctly configured and allows LDAP updates
-LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=%s)
-LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=%s)
-LDAPBindOK=Connect/Authenticate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPBindKO=Connect/Authenticate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPSetupForVersion3=LDAP server configured for version 3
-LDAPSetupForVersion2=LDAP server configured for version 2
-LDAPDolibarrMapping=Dolibarr Mapping
-LDAPLdapMapping=LDAP Mapping
-LDAPFieldLoginUnix=Login (unix)
-LDAPFieldLoginExample=Example: uid
-LDAPFilterConnection=Search filter
-LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
-LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
-LDAPFieldLoginSamba=Login (samba, activedirectory)
-LDAPFieldLoginSambaExample=Example: samaccountname
-LDAPFieldFullname=Full name
-LDAPFieldFullnameExample=Example: cn
-LDAPFieldPasswordNotCrypted=Password not encrypted
-LDAPFieldPasswordCrypted=Password encrypted
-LDAPFieldPasswordExample=Example: userPassword
-LDAPFieldCommonNameExample=Example: cn
-LDAPFieldName=Name
-LDAPFieldNameExample=Example: sn
-LDAPFieldFirstName=First name
-LDAPFieldFirstNameExample=Example: givenName
-LDAPFieldMail=Email address
-LDAPFieldMailExample=Example: mail
-LDAPFieldPhone=Professional phone number
-LDAPFieldPhoneExample=Example: telephonenumber
-LDAPFieldHomePhone=Personal phone number
-LDAPFieldHomePhoneExample=Example: homephone
-LDAPFieldMobile=Cellular phone
-LDAPFieldMobileExample=Example: mobile
-LDAPFieldFax=Fax number
-LDAPFieldFaxExample=Example: facsimiletelephonenumber
-LDAPFieldAddress=Street
-LDAPFieldAddressExample=Example: street
-LDAPFieldZip=Zip
-LDAPFieldZipExample=Example: postalcode
-LDAPFieldTown=Town
-LDAPFieldTownExample=Example: l
-LDAPFieldCountry=Country
-LDAPFieldDescription=Description
-LDAPFieldDescriptionExample=Example: description
-LDAPFieldNotePublic=Public Note
-LDAPFieldNotePublicExample=Example: publicnote
-LDAPFieldGroupMembers= Group members
-LDAPFieldGroupMembersExample= Example: uniqueMember
-LDAPFieldBirthdate=Birthdate
-LDAPFieldCompany=Company
-LDAPFieldCompanyExample=Example: o
-LDAPFieldSid=SID
-LDAPFieldSidExample=Example: objectsid
-LDAPFieldEndLastSubscription=Date of subscription end
-LDAPFieldTitle=Job position
-LDAPFieldTitleExample=Example: title
-LDAPFieldGroupid=Group id
-LDAPFieldGroupidExample=Exemple : gidnumber
-LDAPFieldUserid=User id
-LDAPFieldUseridExample=Exemple : uidnumber
-LDAPFieldHomedirectory=Home directory
-LDAPFieldHomedirectoryExample=Exemple : homedirectory
-LDAPFieldHomedirectoryprefix=Home directory prefix
-LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
-LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
-LDAPDescContact=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr contacts.
-LDAPDescUsers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr users.
-LDAPDescGroups=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr groups.
-LDAPDescMembers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members module.
-LDAPDescMembersTypes=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members types.
-LDAPDescValues=Example values are designed for <b>OpenLDAP</b> with following loaded schemas: <b>core.schema, cosine.schema, inetorgperson.schema</b>). If you use thoose values and OpenLDAP, modify your LDAP config file <b>slapd.conf</b> to have all thoose schemas loaded.
-ForANonAnonymousAccess=For an authenticated access (for a write access for example)
-PerfDolibarr=Performance setup/optimizing report
-YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed.
-NotSlowedDownByThis=Not slowed down by this.
-NotRiskOfLeakWithThis=Not risk of leak with this.
-ApplicativeCache=Applicative cache
-MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
-MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
-MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
-OPCodeCache=OPCode cache
-NoOPCodeCacheFound=No OPCode cache found. Maybe you are using an OPCode cache other than XCache or eAccelerator (good), or maybe you don't have OPCode cache (very bad).
-HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript)
-FilesOfTypeCached=Files of type %s are cached by HTTP server
-FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
-FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
-FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
-CacheByServer=Cache by server
-CacheByServerDesc=For example using the Apache directive "ExpiresByType image/gif A2592000"
-CacheByClient=Cache by browser
-CompressionOfResources=Compression of HTTP responses
-CompressionOfResourcesDesc=For example using the Apache directive "AddOutputFilterByType DEFLATE"
-TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
-DefaultValuesDesc=Here you may define the default value you wish to use when creating a new record, and/or default filters or the sort order when you list records.
-DefaultCreateForm=Default values (to use on forms)
-DefaultSearchFilters=Default search filters
-DefaultSortOrder=Default sort orders
-DefaultFocus=Default focus fields
-DefaultMandatory=Mandatory form fields
+LDAPNamingAttribute=LDAP میں کلید
+LDAPSynchronizeUsers=LDAP میں صارفین کی تنظیم
+LDAPSynchronizeGroups=LDAP میں گروپوں کی تنظیم
+LDAPSynchronizeContacts=LDAP میں رابطوں کی تنظیم
+LDAPSynchronizeMembers=LDAP میں فاؤنڈیشن کے اراکین کی تنظیم
+LDAPSynchronizeMembersTypes=LDAP میں فاؤنڈیشن کے اراکین کی اقسام کی تنظیم
+LDAPPrimaryServer=بنیادی سرور
+LDAPSecondaryServer=ثانوی سرور
+LDAPServerPort=سرور پورٹ
+LDAPServerPortExample=معیاری یا StartTLS: 389، LDAPs: 636
+LDAPServerProtocolVersion=پروٹوکول ورژن
+LDAPServerUseTLS=TLS استعمال کریں۔
+LDAPServerUseTLSExample=آپ کا LDAP سرور StartTLS استعمال کرتا ہے۔
+LDAPServerDn=سرور DN
+LDAPAdminDn=ایڈمنسٹریٹر ڈی این
+LDAPAdminDnExample=مکمل DN (مثال کے طور پر: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com فعال ڈائریکٹری کے لیے)
+LDAPPassword=ایڈمنسٹریٹر پاس ورڈ
+LDAPUserDn=صارفین کا ڈی این
+LDAPUserDnExample=مکمل DN (مثال کے طور پر: ou=users,dc=example,dc=com)
+LDAPGroupDn=گروپس کا ڈی این
+LDAPGroupDnExample=مکمل DN (مثال کے طور پر: ou=groups,dc=example,dc=com)
+LDAPServerExample=سرور کا پتہ (مثال کے طور پر: لوکل ہوسٹ، 192.168.0.2، ldaps://ldap.example.com/)
+LDAPServerDnExample=مکمل DN (مثال کے طور پر: dc=example,dc=com)
+LDAPDnSynchroActive=صارفین اور گروپس کی مطابقت پذیری
+LDAPDnSynchroActiveExample=LDAP سے Dolibarr یا Dolibarr سے LDAP مطابقت پذیری
+LDAPDnContactActive=رابطوں کی مطابقت پذیری
+LDAPDnContactActiveExample=فعال/غیر فعال مطابقت پذیری
+LDAPDnMemberActive=اراکین کی ہم آہنگی۔
+LDAPDnMemberActiveExample=فعال/غیر فعال مطابقت پذیری
+LDAPDnMemberTypeActive=اراکین کی اقسام کی مطابقت پذیری۔
+LDAPDnMemberTypeActiveExample=فعال/غیر فعال مطابقت پذیری
+LDAPContactDn=Dolibarr رابطے 'DN
+LDAPContactDnExample=مکمل DN (مثال کے طور پر: ou=contacts,dc=example,dc=com)
+LDAPMemberDn=Dolibarr کے ارکان DN
+LDAPMemberDnExample=مکمل DN (مثال کے طور پر: ou=members,dc=example,dc=com)
+LDAPMemberObjectClassList=آبجیکٹ کلاس کی فہرست
+LDAPMemberObjectClassListExample=آبجیکٹ کلاس کی وضاحت کرنے والے ریکارڈ کے اوصاف کی فہرست (مثال کے طور پر: ٹاپ، انیٹ آرگ پرسن یا ٹاپ، ایکٹو ڈائریکٹری کے لیے صارف)
+LDAPMemberTypeDn=Dolibarr کے ارکان DN کی قسمیں
+LDAPMemberTypepDnExample=مکمل DN (مثال کے طور پر: ou=membertypes,dc=example,dc=com)
+LDAPMemberTypeObjectClassList=آبجیکٹ کلاس کی فہرست
+LDAPMemberTypeObjectClassListExample=آبجیکٹ کلاس کی وضاحت کرنے والے ریکارڈ کی خصوصیات کی فہرست (مثال کے طور پر: ٹاپ، گروپ آف یونیک نام)
+LDAPUserObjectClassList=آبجیکٹ کلاس کی فہرست
+LDAPUserObjectClassListExample=آبجیکٹ کلاس کی وضاحت کرنے والے ریکارڈ کے اوصاف کی فہرست (مثال کے طور پر: ٹاپ، انیٹ آرگ پرسن یا ٹاپ، ایکٹو ڈائریکٹری کے لیے صارف)
+LDAPGroupObjectClassList=آبجیکٹ کلاس کی فہرست
+LDAPGroupObjectClassListExample=آبجیکٹ کلاس کی وضاحت کرنے والے ریکارڈ کی خصوصیات کی فہرست (مثال کے طور پر: ٹاپ، گروپ آف یونیک نام)
+LDAPContactObjectClassList=آبجیکٹ کلاس کی فہرست
+LDAPContactObjectClassListExample=آبجیکٹ کلاس کی وضاحت کرنے والے ریکارڈ کے اوصاف کی فہرست (مثال کے طور پر: ٹاپ، انیٹ آرگ پرسن یا ٹاپ، ایکٹو ڈائریکٹری کے لیے صارف)
+LDAPTestConnect=LDAP کنکشن کی جانچ کریں۔
+LDAPTestSynchroContact=رابطوں کی مطابقت پذیری کی جانچ کریں۔
+LDAPTestSynchroUser=صارف کی مطابقت پذیری کی جانچ کریں۔
+LDAPTestSynchroGroup=ٹیسٹ گروپ سنکرونائزیشن
+LDAPTestSynchroMember=ٹیسٹ ممبر سنکرونائزیشن
+LDAPTestSynchroMemberType=ٹیسٹ ممبر ٹائپ سنکرونائزیشن
+LDAPTestSearch= LDAP تلاش کی جانچ کریں۔
+LDAPSynchroOK=سنکرونائزیشن ٹیسٹ کامیاب
+LDAPSynchroKO=ناکام مطابقت پذیری ٹیسٹ
+LDAPSynchroKOMayBePermissions=ناکام مطابقت پذیری ٹیسٹ۔ چیک کریں کہ سرور سے کنکشن درست طریقے سے ترتیب دیا گیا ہے اور LDAP اپ ڈیٹس کی اجازت دیتا ہے۔
+LDAPTCPConnectOK=TCP کامیاب LDAP سرور سے جڑ گیا (Server=%s, Port=%s)
+LDAPTCPConnectKO=TCP LDAP سرور سے رابطہ ناکام ہوگیا (Server=%s, Port=%s)
+LDAPBindOK=LDAP سرور سے جڑیں/ تصدیق کریں کامیاب (Server=%s, Port=%s, Admin=%s, پاس ورڈ=%s)
+LDAPBindKO=LDAP سرور سے جڑنا/تصدیق کرنا ناکام ہو گیا (Server=%s, Port=%s, Admin=%s, پاس ورڈ=%s)
+LDAPSetupForVersion3=LDAP سرور ورژن 3 کے لیے ترتیب دیا گیا ہے۔
+LDAPSetupForVersion2=LDAP سرور ورژن 2 کے لیے ترتیب دیا گیا ہے۔
+LDAPDolibarrMapping=ڈولیبر میپنگ
+LDAPLdapMapping=LDAP میپنگ
+LDAPFieldLoginUnix=لاگ ان (یونکس)
+LDAPFieldLoginExample=مثال: uid
+LDAPFilterConnection=فلٹر تلاش کریں۔
+LDAPFilterConnectionExample=مثال: &(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=مثال: &(objectClass=groupOfUsers)
+LDAPFieldLoginSamba=لاگ ان (سامبا، ایکٹو ڈائرکٹری)
+LDAPFieldLoginSambaExample=مثال: samaccountname
+LDAPFieldFullname=پورا نام
+LDAPFieldFullnameExample=مثال: cn
+LDAPFieldPasswordNotCrypted=پاس ورڈ کو خفیہ نہیں کیا گیا۔
+LDAPFieldPasswordCrypted=پاس ورڈ کو خفیہ کر دیا گیا۔
+LDAPFieldPasswordExample=مثال: یوزر پاس ورڈ
+LDAPFieldCommonNameExample=مثال: cn
+LDAPFieldName=نام
+LDAPFieldNameExample=مثال: sn
+LDAPFieldFirstName=پہلا نام
+LDAPFieldFirstNameExample=مثال: دیا ہوا نام
+LDAPFieldMail=ای میل اڈریس
+LDAPFieldMailExample=مثال: میل
+LDAPFieldPhone=پیشہ ورانہ فون نمبر
+LDAPFieldPhoneExample=مثال: ٹیلی فون نمبر
+LDAPFieldHomePhone=ذاتی فون نمبر
+LDAPFieldHomePhoneExample=مثال: ہوم فون
+LDAPFieldMobile=موبائل فون
+LDAPFieldMobileExample=مثال: موبائل
+LDAPFieldFax=فیکس نمبر
+LDAPFieldFaxExample=مثال: نقلی ٹیلی فون نمبر
+LDAPFieldAddress=گلی
+LDAPFieldAddressExample=مثال: گلی
+LDAPFieldZip=زپ
+LDAPFieldZipExample=مثال: پوسٹل کوڈ
+LDAPFieldTown=شہر
+LDAPFieldTownExample=مثال: ایل
+LDAPFieldCountry=ملک
+LDAPFieldDescription=تفصیل
+LDAPFieldDescriptionExample=مثال: وضاحت
+LDAPFieldNotePublic=عوامی نوٹ
+LDAPFieldNotePublicExample=مثال: عوامی نوٹ
+LDAPFieldGroupMembers= گروپ کے اراکین
+LDAPFieldGroupMembersExample= مثال: uniqueMember
+LDAPFieldBirthdate=تاریخ پیدائش
+LDAPFieldCompany=کمپنی
+LDAPFieldCompanyExample=مثال: o
+LDAPFieldSid=ایس آئی ڈی
+LDAPFieldSidExample=مثال: آبجیکٹس
+LDAPFieldEndLastSubscription=سبسکرپشن ختم ہونے کی تاریخ
+LDAPFieldTitle=عہدہ
+LDAPFieldTitleExample=مثال: عنوان
+LDAPFieldGroupid=گروپ آئی ڈی
+LDAPFieldGroupidExample=مثال: gidnumber
+LDAPFieldUserid=صارف کی شناخت
+LDAPFieldUseridExample=مثال: uidnumber
+LDAPFieldHomedirectory=ہوم ڈائریکٹری
+LDAPFieldHomedirectoryExample=مثال: ہوم ڈائریکٹری
+LDAPFieldHomedirectoryprefix=ہوم ڈائریکٹری کا سابقہ
+LDAPSetupNotComplete=LDAP سیٹ اپ مکمل نہیں ہوا (دوسرے ٹیبز پر جائیں)
+LDAPNoUserOrPasswordProvidedAccessIsReadOnly=کوئی ایڈمنسٹریٹر یا پاس ورڈ فراہم نہیں کیا گیا۔ LDAP رسائی گمنام اور صرف پڑھنے کے موڈ میں ہوگی۔
+LDAPDescContact=یہ صفحہ آپ کو Dolibarr رابطوں پر پائے جانے والے ہر ڈیٹا کے لیے LDAP ٹری میں LDAP انتساب کے نام کی وضاحت کرنے کی اجازت دیتا ہے۔
+LDAPDescUsers=یہ صفحہ آپ کو Dolibarr صارفین پر پائے جانے والے ہر ڈیٹا کے لیے LDAP ٹری میں LDAP انتساب کے نام کی وضاحت کرنے کی اجازت دیتا ہے۔
+LDAPDescGroups=یہ صفحہ آپ کو Dolibarr گروپس پر پائے جانے والے ہر ڈیٹا کے لیے LDAP ٹری میں LDAP انتساب کے نام کی وضاحت کرنے کی اجازت دیتا ہے۔
+LDAPDescMembers=یہ صفحہ آپ کو ڈولیبر ممبرز ماڈیول پر پائے جانے والے ہر ڈیٹا کے لیے LDAP ٹری میں LDAP انتساب کے نام کی وضاحت کرنے کی اجازت دیتا ہے۔
+LDAPDescMembersTypes=یہ صفحہ آپ کو LDAP ٹری میں LDAP انتسابات کے نام کی وضاحت کرنے کی اجازت دیتا ہے جو Dolibarr ممبرز کی اقسام پر پائے جاتے ہیں۔
+LDAPDescValues=مثال کی قدریں <b> OpenLDAP </b> کے لیے درج ذیل بھری ہوئی اسکیموں کے ساتھ ڈیزائن کی گئی ہیں: <b> core.schema, cosine.schema, inetorgperson.schema a09a4b7789)۔ اگر آپ وہ اقدار اور OpenLDAP استعمال کرتے ہیں، تو اپنی LDAP کنفگ فائل <b> slapd.conf </b> میں ترمیم کریں تاکہ تمام اسکیموں کو لوڈ کیا جاسکے۔
+ForANonAnonymousAccess=ایک مستند رسائی کے لیے (مثال کے طور پر تحریری رسائی کے لیے)
+PerfDolibarr=کارکردگی کا سیٹ اپ/آپٹیمائزنگ رپورٹ
+YouMayFindPerfAdviceHere=یہ صفحہ کارکردگی سے متعلق کچھ چیک یا مشورہ فراہم کرتا ہے۔
+NotInstalled=انسٹال نہیں ہے۔
+NotSlowedDownByThis=اس سے سست نہیں ہوا۔
+NotRiskOfLeakWithThis=اس کے ساتھ لیک ہونے کا خطرہ نہیں۔
+ApplicativeCache=قابل اطلاق کیشے
+MemcachedNotAvailable=کوئی قابل اطلاق کیش نہیں ملا۔ آپ کیش سرور Memcached اور اس کیش سرور کو استعمال کرنے کے قابل ایک ماڈیول انسٹال کرکے کارکردگی کو بڑھا سکتے ہیں۔ <br> مزید معلومات یہاں <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN"> http://wiki.dolibarr.org/index.php/Module_MemCached_EN </a> ۔ <br> نوٹ کریں کہ بہت سارے ویب ہوسٹنگ فراہم کنندہ ایسے کیش سرور فراہم نہیں کرتے ہیں۔
+MemcachedModuleAvailableButNotSetup=اطلاقی کیشے کے لیے ماڈیول میم کیچ مل گیا لیکن ماڈیول کا سیٹ اپ مکمل نہیں ہے۔
+MemcachedAvailableAndSetup=memcached سرور کو استعمال کرنے کے لیے وقف کردہ ماڈیول میم کیش فعال ہے۔
+OPCodeCache=اوپکوڈ کیشے
+NoOPCodeCacheFound=کوئی OPCode کیشے نہیں ملا۔ ہو سکتا ہے کہ آپ XCache یا eAccelerator (اچھا) کے علاوہ کوئی OPCode کیشے استعمال کر رہے ہوں، یا ہو سکتا ہے کہ آپ کے پاس OPCode کیش نہ ہو (بہت خراب)۔
+HTTPCacheStaticResources=جامد وسائل کے لیے HTTP کیشے (css، img، javascript)
+FilesOfTypeCached=%s قسم کی فائلیں HTTP سرور کے ذریعہ کیش کی جاتی ہیں۔
+FilesOfTypeNotCached=%s قسم کی فائلیں HTTP سرور کے ذریعہ کیش نہیں ہوتی ہیں۔
+FilesOfTypeCompressed=%s قسم کی فائلوں کو HTTP سرور کے ذریعے کمپریس کیا جاتا ہے۔
+FilesOfTypeNotCompressed=%s قسم کی فائلیں HTTP سرور کے ذریعہ کمپریس نہیں ہوتی ہیں۔
+CacheByServer=کیش بذریعہ سرور
+CacheByServerDesc=مثال کے طور پر اپاچی ہدایت کا استعمال کرتے ہوئے "ExpiresByType image/gif A2592000"
+CacheByClient=براؤزر کے ذریعہ کیش
+CompressionOfResources=HTTP ردعمل کا کمپریشن
+CompressionOfResourcesDesc=مثال کے طور پر اپاچی ہدایت کا استعمال کرتے ہوئے "AddOutputFilterByType DEFLATE"
+TestNotPossibleWithCurrentBrowsers=موجودہ براؤزرز کے ساتھ اس طرح کا خودکار پتہ لگانا ممکن نہیں ہے۔
+DefaultValuesDesc=یہاں آپ ڈیفالٹ ویلیو کی وضاحت کر سکتے ہیں جسے آپ نیا ریکارڈ بناتے وقت استعمال کرنا چاہتے ہیں، اور/یا ڈیفالٹ فلٹرز یا ترتیب کی ترتیب جب آپ ریکارڈ کی فہرست بناتے ہیں۔
+DefaultCreateForm=پہلے سے طے شدہ اقدار (فارم پر استعمال کرنے کے لیے)
+DefaultSearchFilters=پہلے سے طے شدہ تلاش کے فلٹرز
+DefaultSortOrder=پہلے سے طے شدہ ترتیب کے احکامات
+DefaultFocus=پہلے سے طے شدہ فوکس فیلڈز
+DefaultMandatory=لازمی فارم فیلڈز
 ##### Products #####
-ProductSetup=Products module setup
-ServiceSetup=Services module setup
-ProductServiceSetup=Products and Services modules setup
-NumberOfProductShowInSelect=Maximum number of products to show in combo select lists (0=no limit)
-ViewProductDescInFormAbility=Display product descriptions in lines of items (otherwise show description in a tooltip popup)
-OnProductSelectAddProductDesc=How to use the description of the products when adding a product as a line of a document
-AutoFillFormFieldBeforeSubmit=Auto fill the description input field with the description of product
-DoNotAutofillButAutoConcat=Do not autofill the input field with description of product. Description of the product will be concatenated to the entered description automatically.
-DoNotUseDescriptionOfProdut=Description of the product will never be included into the description of lines of documents
-MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
-ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
-UseSearchToSelectProductTooltip=Also if you have a large number of products (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectProduct=Wait until you press a key before loading content of product combo list (This may increase performance if you have a large number of products, but it is less convenient)
-SetDefaultBarcodeTypeProducts=Default barcode type to use for products
-SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
-UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
-ProductCodeChecker= Module for product code generation and checking (product or service)
-ProductOtherConf= Product / Service configuration
-IsNotADir=is not a directory!
+ProductSetup=مصنوعات ماڈیول سیٹ اپ
+ServiceSetup=سروسز ماڈیول سیٹ اپ
+ProductServiceSetup=مصنوعات اور خدمات کے ماڈیول سیٹ اپ
+NumberOfProductShowInSelect=کومبو سلیکٹ لسٹ میں دکھانے کے لیے مصنوعات کی زیادہ سے زیادہ تعداد (0=کوئی حد نہیں)
+ViewProductDescInFormAbility=مصنوعات کی تفصیل آئٹمز کی لائنوں میں دکھائیں (بصورت دیگر ٹول ٹپ پاپ اپ میں تفصیل دکھائیں)
+OnProductSelectAddProductDesc=کسی پروڈکٹ کو دستاویز کی لائن کے طور پر شامل کرتے وقت مصنوعات کی تفصیل کا استعمال کیسے کریں۔
+AutoFillFormFieldBeforeSubmit=پروڈکٹ کی تفصیل کے ساتھ ڈسکرپشن ان پٹ فیلڈ کو خود بخود بھریں۔
+DoNotAutofillButAutoConcat=پروڈکٹ کی تفصیل کے ساتھ ان پٹ فیلڈ کو آٹو فل نہ کریں۔ پروڈکٹ کی تفصیل خود بخود درج کی گئی تفصیل سے مربوط ہو جائے گی۔
+DoNotUseDescriptionOfProdut=پروڈکٹ کی تفصیل کو کبھی بھی دستاویزات کی لائنوں کی تفصیل میں شامل نہیں کیا جائے گا۔
+MergePropalProductCard=اگر پروڈکٹ/سروس تجویز میں ہے تو پروڈکٹ/سروس اٹیچڈ فائلز ٹیب میں پروڈکٹ پی ڈی ایف دستاویز کو پی ڈی ایف ایزور کی تجویز میں ضم کرنے کا آپشن میں ایکٹیویٹ کریں۔
+ViewProductDescInThirdpartyLanguageAbility=مصنوعات کی تفصیل کو فریق ثالث کی زبان میں فارم میں دکھائیں (بصورت دیگر صارف کی زبان میں)
+UseSearchToSelectProductTooltip=اس کے علاوہ اگر آپ کے پاس پروڈکٹس کی ایک بڑی تعداد ہے (> 100 000)، تو آپ سیٹ اپ->دیگر میں مسلسل PRODUCT_DONOTSEARCH_ANYWHERE کو 1 پر سیٹ کرکے رفتار بڑھا سکتے ہیں۔ تلاش پھر سٹرنگ کے آغاز تک محدود ہو جائے گی۔
+UseSearchToSelectProduct=اس وقت تک انتظار کریں جب تک کہ آپ پروڈکٹ کومبو لسٹ کے مواد کو لوڈ کرنے سے پہلے ایک کلید کو دبائیں (اگر آپ کے پاس پروڈکٹس کی ایک بڑی تعداد ہے تو اس سے کارکردگی بڑھ سکتی ہے، لیکن یہ کم آسان ہے)
+SetDefaultBarcodeTypeProducts=مصنوعات کے لیے استعمال کرنے کے لیے ڈیفالٹ بار کوڈ کی قسم
+SetDefaultBarcodeTypeThirdParties=تیسرے فریق کے لیے استعمال کرنے کے لیے ڈیفالٹ بار کوڈ کی قسم
+UseUnits=آرڈر، تجویز یا انوائس لائنز ایڈیشن کے دوران مقدار کے لیے پیمائش کی اکائی کی وضاحت کریں۔
+ProductCodeChecker= پروڈکٹ کوڈ جنریشن اور چیکنگ کے لیے ماڈیول (پروڈکٹ یا سروس)
+ProductOtherConf= پروڈکٹ/سروس کنفیگریشن
+IsNotADir=ڈائریکٹری نہیں ہے!
 ##### Syslog #####
-SyslogSetup=Logs module setup
-SyslogOutput=Logs outputs
-SyslogFacility=Facility
-SyslogLevel=Level
-SyslogFilename=File name and path
-YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
-ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
-OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
-CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
-SyslogFileNumberOfSaves=Number of backup logs to keep
-ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
+SyslogSetup=لاگز ماڈیول سیٹ اپ
+SyslogOutput=لاگ آؤٹ پٹس
+SyslogFacility=سہولت
+SyslogLevel=سطح
+SyslogFilename=فائل کا نام اور راستہ
+YouCanUseDOL_DATA_ROOT=آپ Dolibarr "دستاویزات" ڈائریکٹری میں لاگ فائل کے لیے DOL_DATA_ROOT/dolibarr.log استعمال کر سکتے ہیں۔ آپ اس فائل کو ذخیرہ کرنے کے لیے ایک مختلف راستہ ترتیب دے سکتے ہیں۔
+ErrorUnknownSyslogConstant=مستقل %s ایک معروف Syslog مستقل نہیں ہے۔
+OnlyWindowsLOG_USER=ونڈوز پر، صرف LOG_USER سہولت کو سپورٹ کیا جائے گا۔
+CompressSyslogs=ڈیبگ لاگ فائلوں کا کمپریشن اور بیک اپ (ڈیبگ کے لیے ماڈیول لاگ کے ذریعے تیار کردہ)
+SyslogFileNumberOfSaves=رکھنے کے لیے بیک اپ لاگز کی تعداد
+ConfigureCleaningCronjobToSetFrequencyOfSaves=لاگ بیک اپ فریکوئنسی سیٹ کرنے کے لیے صفائی کے شیڈول کردہ کام کو ترتیب دیں۔
 ##### Donations #####
-DonationsSetup=Donation module setup
-DonationsReceiptModel=Template of donation receipt
+DonationsSetup=عطیہ ماڈیول سیٹ اپ
+DonationsReceiptModel=عطیہ کی رسید کا سانچہ
 ##### Barcode #####
-BarcodeSetup=Barcode setup
-PaperFormatModule=Print format module
-BarcodeEncodeModule=Barcode encoding type
-CodeBarGenerator=Barcode generator
-ChooseABarCode=No generator defined
-FormatNotSupportedByGenerator=Format not supported by this generator
-BarcodeDescEAN8=Barcode of type EAN8
-BarcodeDescEAN13=Barcode of type EAN13
-BarcodeDescUPC=Barcode of type UPC
-BarcodeDescISBN=Barcode of type ISBN
-BarcodeDescC39=Barcode of type C39
-BarcodeDescC128=Barcode of type C128
-BarcodeDescDATAMATRIX=Barcode of type Datamatrix
-BarcodeDescQRCODE=Barcode of type QR code
-GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
-BarcodeInternalEngine=Internal engine
-BarCodeNumberManager=Manager to auto define barcode numbers
+BarcodeSetup=بارکوڈ سیٹ اپ
+PaperFormatModule=پرنٹ فارمیٹ ماڈیول
+BarcodeEncodeModule=بارکوڈ انکوڈنگ کی قسم
+CodeBarGenerator=بارکوڈ جنریٹر
+ChooseABarCode=کوئی جنریٹر متعین نہیں ہے۔
+FormatNotSupportedByGenerator=فارمیٹ اس جنریٹر کے ذریعہ تعاون یافتہ نہیں ہے۔
+BarcodeDescEAN8=EAN8 قسم کا بارکوڈ
+BarcodeDescEAN13=EAN13 قسم کا بارکوڈ
+BarcodeDescUPC=UPC قسم کا بارکوڈ
+BarcodeDescISBN=ISBN قسم کا بارکوڈ
+BarcodeDescC39=C39 قسم کا بارکوڈ
+BarcodeDescC128=C128 قسم کا بارکوڈ
+BarcodeDescDATAMATRIX=ڈیٹا میٹرکس کی قسم کا بارکوڈ
+BarcodeDescQRCODE=بار کوڈ قسم کیو آر کوڈ
+GenbarcodeLocation=بار کوڈ جنریشن کمانڈ لائن ٹول (کچھ بار کوڈ کی اقسام کے لیے اندرونی انجن کے ذریعے استعمال کیا جاتا ہے)۔ "genbarcode" کے ساتھ ہم آہنگ ہونا ضروری ہے۔ <br> مثال کے طور پر: /usr/local/bin/genbarcode
+BarcodeInternalEngine=اندرونی انجن
+BarCodeNumberManager=بار کوڈ نمبروں کی خود بخود وضاحت کرنے کا مینیجر
 ##### Prelevements #####
-WithdrawalsSetup=Setup of module Direct Debit payments
+WithdrawalsSetup=ماڈیول ڈائریکٹ ڈیبٹ ادائیگیوں کا سیٹ اپ
 ##### ExternalRSS #####
-ExternalRSSSetup=External RSS imports setup
-NewRSS=New RSS Feed
-RSSUrl=RSS URL
-RSSUrlExample=An interesting RSS feed
+ExternalRSSSetup=بیرونی آر ایس ایس درآمدات کا سیٹ اپ
+NewRSS=نئی آر ایس ایس فیڈ
+RSSUrl=آر ایس ایس یو آر ایل
+RSSUrlExample=ایک دلچسپ RSS فیڈ
 ##### Mailing #####
-MailingSetup=EMailing module setup
-MailingEMailFrom=Sender email (From) for emails sent by emailing module
-MailingEMailError=Return Email (Errors-to) for emails with errors
-MailingDelay=Seconds to wait after sending next message
+MailingSetup=ای میلنگ ماڈیول سیٹ اپ
+MailingEMailFrom=ای میل کرنے والے ماڈیول کے ذریعے بھیجی گئی ای میلز کے لیے بھیجنے والا ای میل (منجانب)
+MailingEMailError=غلطیوں والی ای میلز کے لیے ای میل (Errors-to) واپس کریں۔
+MailingDelay=اگلا پیغام بھیجنے کے بعد انتظار کرنے کے لیے سیکنڈ
 ##### Notification #####
-NotificationSetup=Email Notification module setup
-NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
-FixedEmailTarget=Recipient
-NotificationDisableConfirmMessageContact=Hide the list of recipients (subscribed as contact) of notifications into the confirmation message
-NotificationDisableConfirmMessageUser=Hide the list of recipients (subscribed as user) of notifications into the confirmation message
-NotificationDisableConfirmMessageFix=Hide the list of recipients (subscribed as global email) of notifications into the confirmation message
+NotificationSetup=ای میل نوٹیفکیشن ماڈیول سیٹ اپ
+NotificationEMailFrom=اطلاعات کے ماڈیول کے ذریعے بھیجی گئی ای میلز کے لیے بھیجنے والا ای میل (منجانب)
+FixedEmailTarget=وصول کنندہ
+NotificationDisableConfirmMessageContact=تصدیقی پیغام میں اطلاعات کے وصول کنندگان کی فہرست (بطور رابطہ سبسکرائب شدہ) چھپائیں۔
+NotificationDisableConfirmMessageUser=تصدیقی پیغام میں اطلاعات کے وصول کنندگان کی فہرست (بطور صارف سبسکرائب شدہ) چھپائیں۔
+NotificationDisableConfirmMessageFix=تصدیقی پیغام میں اطلاعات کے وصول کنندگان کی فہرست (عالمی ای میل کے بطور سبسکرائب کردہ) چھپائیں۔
 ##### Sendings #####
-SendingsSetup=Shipping module setup
-SendingsReceiptModel=Sending receipt model
-SendingsNumberingModules=Sendings numbering modules
-SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that are received and signed by customer. Hence the product deliveries receipt is a duplicated feature and is rarely activated.
-FreeLegalTextOnShippings=Free text on shipments
+SendingsSetup=شپنگ ماڈیول سیٹ اپ
+SendingsReceiptModel=رسید کا ماڈل بھیجنا
+SendingsNumberingModules=نمبرنگ ماڈیول بھیج رہا ہے۔
+SendingsAbility=کسٹمر کی ترسیل کے لیے شپنگ شیٹس کی حمایت کریں۔
+NoNeedForDeliveryReceipts=زیادہ تر معاملات میں، شپنگ شیٹس کو کسٹمر کی ڈیلیوری کے لیے شیٹ کے طور پر استعمال کیا جاتا ہے (بھیجنے کے لیے پروڈکٹس کی فہرست) اور وہ شیٹس جو گاہک کے ذریعے موصول ہوتی ہیں اور ان پر دستخط کیے جاتے ہیں۔ لہذا مصنوعات کی ترسیل کی رسید ایک نقل شدہ خصوصیت ہے اور شاذ و نادر ہی چالو ہوتی ہے۔
+FreeLegalTextOnShippings=ترسیل پر مفت متن
 ##### Deliveries #####
-DeliveryOrderNumberingModules=Products deliveries receipt numbering module
-DeliveryOrderModel=Products deliveries receipt model
-DeliveriesOrderAbility=Support products deliveries receipts
-FreeLegalTextOnDeliveryReceipts=Free text on delivery receipts
+DeliveryOrderNumberingModules=پروڈکٹس کی ترسیل کی رسید نمبرنگ ماڈیول
+DeliveryOrderModel=مصنوعات کی ترسیل کی رسید کا ماڈل
+DeliveriesOrderAbility=سپورٹ مصنوعات کی ترسیل کی رسیدیں
+FreeLegalTextOnDeliveryReceipts=ترسیل کی رسیدوں پر مفت متن
 ##### FCKeditor #####
-AdvancedEditor=Advanced editor
-ActivateFCKeditor=Activate advanced editor for:
-FCKeditorForNotePublic=WYSIWIG creation/edition of the field "public notes" of elements
-FCKeditorForNotePrivate=WYSIWIG creation/edition of the field "private notes" of elements
-FCKeditorForCompany=WYSIWIG creation/edition of the field description of elements (except products/services)
-FCKeditorForProduct=WYSIWIG creation/edition of the field description of products/services
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
-FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
-FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
-FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
-FCKeditorForTicket=WYSIWIG creation/edition for tickets
+AdvancedEditor=ایڈوانس ایڈیٹر
+ActivateFCKeditor=اعلی درجے کے ایڈیٹر کو فعال کریں:
+FCKeditorForNotePublic=WYSIWIG عناصر کے "عوامی نوٹس" فیلڈ کا تخلیق/ایڈیشن
+FCKeditorForNotePrivate=WYSIWIG عناصر کے "نجی نوٹ" فیلڈ کی تخلیق/ایڈیشن
+FCKeditorForCompany=WYSIWIG عناصر کی فیلڈ تفصیل کا تخلیق/ایڈیشن (سوائے پروڈکٹس/سروسز)
+FCKeditorForProduct=WYSIWIG مصنوعات/خدمات کی فیلڈ تفصیل کا تخلیق/ایڈیشن
+FCKeditorForProductDetails=WYSIWIG تمام اداروں (تجاویز، آرڈرز، انوائسز وغیرہ...) کے لیے مصنوعات کی تفصیلات کی لائنز کی تخلیق/ایڈیشن۔ <span class="warning"> تنبیہ: اس کیس کے لیے اس اختیار کو استعمال کرنے کی سنجیدگی سے سفارش نہیں کی جاتی ہے کیونکہ یہ پی ڈی ایف فائلز بناتے وقت خصوصی حروف اور صفحہ کی فارمیٹنگ میں مسائل پیدا کر سکتا ہے۔ </span>
+FCKeditorForMailing= بڑے پیمانے پر ای میلنگ کے لیے WYSIWIG تخلیق/ایڈیشن (ٹولز-> ای میلنگ)
+FCKeditorForUserSignature=WYSIWIG تخلیق/صارف کے دستخط کا ایڈیشن
+FCKeditorForMail=تمام میل کے لیے WYSIWIG تخلیق/ایڈیشن (سوائے ٹولز-> ای میلنگ)
+FCKeditorForTicket=ٹکٹوں کے لیے WYSIWIG تخلیق/ایڈیشن
 ##### Stock #####
-StockSetup=Stock module setup
-IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
+StockSetup=اسٹاک ماڈیول سیٹ اپ
+IfYouUsePointOfSaleCheckModule=اگر آپ ڈیفالٹ کے ذریعہ فراہم کردہ پوائنٹ آف سیل ماڈیول (POS) یا کسی بیرونی ماڈیول کا استعمال کرتے ہیں، تو اس سیٹ اپ کو آپ کے POS ماڈیول کے ذریعے نظر انداز کیا جا سکتا ہے۔ زیادہ تر POS ماڈیولز کو بطور ڈیفالٹ فوری طور پر انوائس بنانے اور یہاں کے اختیارات سے قطع نظر اسٹاک کو کم کرنے کے لیے ڈیزائن کیا گیا ہے۔ لہذا اگر آپ کو اپنے POS سے سیل رجسٹر کرتے وقت اسٹاک میں کمی کی ضرورت ہے یا نہیں، تو اپنے POS ماڈیول سیٹ اپ کو بھی چیک کریں۔
 ##### Menu #####
-MenuDeleted=Menu deleted
-Menu=Menu
-Menus=Menus
-TreeMenuPersonalized=Personalized menus
-NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
-NewMenu=New menu
-MenuHandler=Menu handler
-MenuModule=Source module
-HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
-DetailId=Id menu
-DetailMenuHandler=Menu handler where to show new menu
-DetailMenuModule=Module name if menu entry come from a module
-DetailType=Type of menu (top or left)
-DetailTitre=Menu label or label code for translation
-DetailUrl=URL where menu send you (Absolute URL link or external link with http://)
-DetailEnabled=Condition to show or not entry
-DetailRight=Condition to display unauthorized grey menus
-DetailLangs=Lang file name for label code translation
-DetailUser=Intern / Extern / All
-Target=Target
-DetailTarget=Target for links (_blank top opens a new window)
-DetailLevel=Level (-1:top menu, 0:header menu, >0 menu and sub menu)
-ModifMenu=Menu change
-DeleteMenu=Delete menu entry
-ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b>?
-FailedToInitializeMenu=Failed to initialize menu
+MenuDeleted=مینو حذف کر دیا گیا۔
+Menu=مینو
+Menus=مینو
+TreeMenuPersonalized=ذاتی نوعیت کے مینو
+NotTopTreeMenuPersonalized=ذاتی نوعیت کے مینو ٹاپ مینو اندراج سے منسلک نہیں ہیں۔
+NewMenu=نیا مینو
+MenuHandler=مینو ہینڈلر
+MenuModule=ماخذ ماڈیول
+HideUnauthorizedMenu=اندرونی صارفین کے لیے بھی غیر مجاز مینو چھپائیں (بصورت دیگر صرف خاکستری)
+DetailId=آئی ڈی مینو
+DetailMenuHandler=مینو ہینڈلر جہاں نیا مینو دکھانا ہے۔
+DetailMenuModule=ماڈیول کا نام اگر مینو اندراج ماڈیول سے آتا ہے۔
+DetailType=مینو کی قسم (اوپر یا بائیں)
+DetailTitre=ترجمہ کے لیے مینو لیبل یا لیبل کوڈ
+DetailUrl=URL جہاں مینو آپ کو بھیجتا ہے (مطلق URL لنک یا http:// کے ساتھ بیرونی لنک)
+DetailEnabled=اندراج دکھانے یا نہ کرنے کی شرط
+DetailRight=غیر مجاز گرے مینو ڈسپلے کرنے کی حالت
+DetailLangs=لیبل کوڈ کے ترجمہ کے لیے Lang فائل کا نام
+DetailUser=اندرونی / بیرونی / تمام
+Target=ہدف
+DetailTarget=لنکس کے لیے ہدف (_خالی اوپر ایک نئی ونڈو کھولتا ہے)
+DetailLevel=سطح (-1: ٹاپ مینو، 0: ہیڈر مینو، >0 مینو اور سب مینو)
+ModifMenu=مینو میں تبدیلی
+DeleteMenu=مینو اندراج کو حذف کریں۔
+ConfirmDeleteMenu=کیا آپ واقعی مینو انٹری <b> %s </b> کو حذف کرنا چاہتے ہیں؟
+FailedToInitializeMenu=مینو شروع کرنے میں ناکام
 ##### Tax #####
-TaxSetup=Taxes, social or fiscal taxes and dividends module setup
-OptionVatMode=VAT due
-OptionVATDefault=Standard basis
-OptionVATDebitOption=Accrual basis
-OptionVatDefaultDesc=VAT is due:<br>- on delivery of goods (based on invoice date)<br>- on payments for services
-OptionVatDebitOptionDesc=VAT is due:<br>- on delivery of goods (based on invoice date)<br>- on invoice (debit) for services
-OptionPaymentForProductAndServices=Cash basis for products and services
-OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
-SummaryOfVatExigibilityUsedByDefault=Time of VAT eligibility by default according to chosen option:
-OnDelivery=On delivery
-OnPayment=On payment
-OnInvoice=On invoice
-SupposedToBePaymentDate=Payment date used
-SupposedToBeInvoiceDate=Invoice date used
-Buy=Buy
-Sell=Sell
-InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
-AccountancyCode=Accounting Code
-AccountancyCodeSell=Sale account. code
-AccountancyCodeBuy=Purchase account. code
-CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
+TaxSetup=ٹیکس، سماجی یا مالی ٹیکس اور ڈیویڈنڈ ماڈیول سیٹ اپ
+OptionVatMode=واجب الادا VAT
+OptionVATDefault=معیاری بنیاد
+OptionVATDebitOption=جمع کی بنیاد
+OptionVatDefaultDesc=VAT واجب الادا ہے: <br> - سامان کی ترسیل پر (انوائس کی تاریخ کی بنیاد پر) <br> - خدمات کی ادائیگی پر
+OptionVatDebitOptionDesc=VAT واجب الادا ہے: <br> - سامان کی ترسیل پر (انوائس کی تاریخ پر مبنی) <br> - خدمات کے انوائس (ڈیبٹ) پر
+OptionPaymentForProductAndServices=مصنوعات اور خدمات کے لیے نقد کی بنیاد
+OptionPaymentForProductAndServicesDesc=VAT واجب الادا ہے: <br> - سامان کی ادائیگی پر <br> - خدمات کی ادائیگی پر
+SummaryOfVatExigibilityUsedByDefault=منتخب کردہ اختیار کے مطابق پہلے سے طے شدہ VAT اہلیت کا وقت:
+OnDelivery=پہنچانے پر
+OnPayment=ادائیگی پر
+OnInvoice=رسید پر
+SupposedToBePaymentDate=ادائیگی کی تاریخ استعمال کی گئی۔
+SupposedToBeInvoiceDate=انوائس کی تاریخ استعمال کی گئی۔
+Buy=خریدنے
+Sell=بیچنا
+InvoiceDateUsed=انوائس کی تاریخ استعمال کی گئی۔
+YourCompanyDoesNotUseVAT=آپ کی کمپنی کو VAT (ہوم - سیٹ اپ - کمپنی/تنظیم) استعمال نہ کرنے کی تعریف کی گئی ہے، لہذا سیٹ اپ کے لیے کوئی VAT اختیارات نہیں ہیں۔
+AccountancyCode=اکاؤنٹنگ کوڈ
+AccountancyCodeSell=سیل اکاؤنٹ۔ کوڈ
+AccountancyCodeBuy=خریداری اکاؤنٹ۔ کوڈ
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=نیا ٹیکس بناتے وقت چیک باکس "خودکار طور پر ادائیگی بنائیں" کو بطور ڈیفالٹ خالی رکھیں
 ##### Agenda #####
-AgendaSetup=Events and agenda module setup
-PasswordTogetVCalExport=Key to authorize export link
-SecurityKey = Security Key
-PastDelayVCalExport=Do not export event older than
-AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
-AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
-AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
-AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
-AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
-AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
-AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
+AgendaSetup=واقعات اور ایجنڈا ماڈیول سیٹ اپ
+PasswordTogetVCalExport=ایکسپورٹ لنک کو اجازت دینے کی کلید
+SecurityKey = سیکیورٹی کلید
+PastDelayVCalExport=سے پرانا واقعہ برآمد نہ کریں۔
+AGENDA_USE_EVENT_TYPE=واقعات کی اقسام کا استعمال کریں (مینو سیٹ اپ میں منظم -> ڈکشنری -> ایجنڈا کے واقعات کی قسم)
+AGENDA_USE_EVENT_TYPE_DEFAULT=ایونٹ تخلیق فارم میں ایونٹ کی قسم کے لیے اس ڈیفالٹ ویلیو کو خودکار طور پر سیٹ کریں۔
+AGENDA_DEFAULT_FILTER_TYPE=ایجنڈا ویو کے سرچ فلٹر میں اس قسم کے ایونٹ کو خودکار طور پر سیٹ کریں۔
+AGENDA_DEFAULT_FILTER_STATUS=ایجنڈا ویو کے سرچ فلٹر میں ایونٹس کے لیے خودکار طور پر یہ اسٹیٹس سیٹ کریں۔
+AGENDA_DEFAULT_VIEW=مینو ایجنڈا کو منتخب کرتے وقت آپ ڈیفالٹ کے ذریعے کون سا منظر کھولنا چاہتے ہیں۔
+AGENDA_REMINDER_BROWSER=صارف کے براؤزر </b> پر ایونٹ کی یاد دہانی کو فعال کریں
+AGENDA_REMINDER_BROWSER_SOUND=آواز کی اطلاع کو فعال کریں۔
+AGENDA_REMINDER_EMAIL=ای میلز </b> کے ذریعے ایونٹ کی یاد دہانی کو فعال کریں
+AGENDA_REMINDER_EMAIL_NOTE=نوٹ: طے شدہ کام %s کی فریکوئنسی اس بات کا یقین کرنے کے لیے کافی ہونی چاہیے کہ یاد دہانی صحیح وقت پر بھیجی گئی ہے۔
+AGENDA_SHOW_LINKED_OBJECT=ایجنڈا ویو میں منسلک آبجیکٹ دکھائیں۔
 ##### Clicktodial #####
-ClickToDialSetup=Click To Dial module setup
-ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
-ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
-ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need a link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill the next field.
+ClickToDialSetup=ماڈیول سیٹ اپ ڈائل کرنے کے لیے کلک کریں۔
+ClickToDialUrlDesc=فون پکٹو پر کلک کرنے پر یو آر ایل کو کال کیا جاتا ہے۔ URL میں، آپ استعمال کر سکتے ہیں ٹیگز <br> <b> __PHONETO__ </b> کہ <br> <b> __PHONEFROM__ </b> clicktodial کے ساتھ تبدیل کیا جائے گا کہ وہ شخص (تمہارا) بلا کے فون نمبر سے ہمیں <br> <b> __LOGIN__ </b> کے ساتھ تبدیل کیا جائے گا کہ کال کرنے کے لئے اس شخص کا فون نمبر کے ساتھ تبدیل کیا جائے گا لاگ ان (صارف کارڈ پر بیان کردہ) <br> <b> __PASS__ </b> جسے کلک ٹوڈیل پاس ورڈ (یوزر کارڈ پر بیان کردہ) سے تبدیل کیا جائے گا۔
+ClickToDialDesc=یہ ماڈیول ڈیسک ٹاپ کمپیوٹر کا استعمال کرتے وقت فون نمبروں کو کلک کے قابل لنکس میں تبدیل کرتا ہے۔ ایک کلک نمبر پر کال کرے گا۔ یہ آپ کے ڈیسک ٹاپ پر سافٹ فون استعمال کرتے وقت یا مثال کے طور پر SIP پروٹوکول پر مبنی CTI سسٹم استعمال کرتے وقت فون کال شروع کرنے کے لیے استعمال کیا جا سکتا ہے۔ نوٹ: اسمارٹ فون استعمال کرتے وقت، فون نمبرز ہمیشہ کلک کے قابل ہوتے ہیں۔
+ClickToDialUseTelLink=فون نمبرز پر صرف ایک لنک "tel:" استعمال کریں۔
+ClickToDialUseTelLinkDesc=یہ طریقہ استعمال کریں اگر آپ کے صارفین کے پاس سافٹ فون یا سافٹ ویئر انٹرفیس ہے، جو براؤزر والے کمپیوٹر پر انسٹال ہے، اور جب آپ اپنے براؤزر میں "tel:" سے شروع ہونے والے لنک پر کلک کرتے ہیں تو اسے کال کیا جاتا ہے۔ اگر آپ کو کسی ایسے لنک کی ضرورت ہے جو "sip:" سے شروع ہو یا ایک مکمل سرور حل (مقامی سافٹ ویئر انسٹالیشن کی ضرورت نہیں)، آپ کو اسے "نہیں" پر سیٹ کرنا ہوگا اور اگلا فیلڈ بھرنا ہوگا۔
 ##### Point Of Sale (CashDesk) #####
-CashDesk=Point of Sale
-CashDeskSetup=Point of Sales module setup
-CashDeskThirdPartyForSell=Default generic third party to use for sales
-CashDeskBankAccountForSell=Default account to use to receive cash payments
-CashDeskBankAccountForCheque=Default account to use to receive payments by check
-CashDeskBankAccountForCB=Default account to use to receive payments by credit cards
-CashDeskBankAccountForSumup=Default bank account to use to receive payments by SumUp
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sale is done from Point of Sale (if "no", stock decrease is done for each sale done from POS, irrespective of the option set in module Stock).
-CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
-StockDecreaseForPointOfSaleDisabled=Stock decrease from Point of Sale disabled
-StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with module Serial/Lot management (currently active) so stock decrease is disabled.
-CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sale from Point of Sale. Hence a warehouse is required.
-CashDeskForceDecreaseStockLabel=Stock decrease for batch products was forced.
-CashDeskForceDecreaseStockDesc=Decrease first by the oldest eatby and sellby dates.
-CashDeskReaderKeyCodeForEnter=Key code for "Enter" defined in barcode reader (Example: 13)
+CashDesk=پوائنٹ آف سیل
+CashDeskSetup=پوائنٹ آف سیلز ماڈیول سیٹ اپ
+CashDeskThirdPartyForSell=فروخت کے لیے استعمال کرنے کے لیے ڈیفالٹ عام تھرڈ پارٹی
+CashDeskBankAccountForSell=نقد ادائیگی حاصل کرنے کے لیے استعمال کرنے کے لیے ڈیفالٹ اکاؤنٹ
+CashDeskBankAccountForCheque=چیک کے ذریعے ادائیگیاں وصول کرنے کے لیے استعمال کرنے کے لیے ڈیفالٹ اکاؤنٹ
+CashDeskBankAccountForCB=کریڈٹ کارڈز کے ذریعے ادائیگیاں وصول کرنے کے لیے استعمال کرنے کے لیے ڈیفالٹ اکاؤنٹ
+CashDeskBankAccountForSumup=SumUp کے ذریعے ادائیگیاں وصول کرنے کے لیے استعمال کرنے کے لیے ڈیفالٹ بینک اکاؤنٹ
+CashDeskDoNotDecreaseStock=پوائنٹ آف سیل سے فروخت ہونے پر اسٹاک میں کمی کو غیر فعال کریں (اگر "نہیں"، تو اسٹاک میں کمی POS سے کی گئی ہر فروخت کے لیے کی جاتی ہے، ماڈیول اسٹاک میں سیٹ کردہ آپشن سے قطع نظر)۔
+CashDeskIdWareHouse=سٹاک میں کمی کے لیے گودام کو استعمال کرنے پر مجبور کریں اور اسے محدود کریں۔
+StockDecreaseForPointOfSaleDisabled=پوائنٹ آف سیل سے اسٹاک میں کمی کو غیر فعال کر دیا گیا۔
+StockDecreaseForPointOfSaleDisabledbyBatch=POS میں اسٹاک میں کمی ماڈیول سیریل/لاٹ مینجمنٹ (فی الحال فعال) کے ساتھ مطابقت نہیں رکھتی ہے لہذا اسٹاک میں کمی کو غیر فعال کردیا گیا ہے۔
+CashDeskYouDidNotDisableStockDecease=آپ نے پوائنٹ آف سیل سے سیل کرتے وقت اسٹاک میں کمی کو غیر فعال نہیں کیا۔ اس لیے گودام کی ضرورت ہے۔
+CashDeskForceDecreaseStockLabel=بیچ کی مصنوعات کے اسٹاک میں کمی کو مجبور کیا گیا تھا۔
+CashDeskForceDecreaseStockDesc=سب سے پہلے سب سے پرانے کھانے اور فروخت کی تاریخوں سے کم کریں۔
+CashDeskReaderKeyCodeForEnter=بار کوڈ ریڈر میں بیان کردہ "Enter" کے لیے کلیدی کوڈ (مثال: 13)
 ##### Bookmark #####
-BookmarkSetup=Bookmark module setup
-BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or external web sites on your left menu.
-NbOfBoomarkToShow=Maximum number of bookmarks to show in left menu
+BookmarkSetup=بک مارک ماڈیول سیٹ اپ
+BookmarkDesc=یہ ماڈیول آپ کو بک مارکس کا انتظام کرنے کی اجازت دیتا ہے۔ آپ اپنے بائیں مینو میں کسی بھی Dolibarr صفحات یا بیرونی ویب سائٹس میں شارٹ کٹس بھی شامل کر سکتے ہیں۔
+NbOfBoomarkToShow=بائیں مینو میں دکھانے کے لیے بک مارکس کی زیادہ سے زیادہ تعداد
 ##### WebServices #####
-WebServicesSetup=Webservices module setup
-WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services.
-WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here
-EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at URL
+WebServicesSetup=ویب سروسز ماڈیول سیٹ اپ
+WebServicesDesc=اس ماڈیول کو فعال کرنے سے، Dolibarr متفرق ویب سروسز فراہم کرنے کے لیے ایک ویب سروس سرور بن جاتا ہے۔
+WSDLCanBeDownloadedHere=فراہم کردہ خدمات کی WSDL ڈسکرپٹر فائلیں یہاں ڈاؤن لوڈ کی جا سکتی ہیں۔
+EndPointIs=SOAP کلائنٹس کو اپنی درخواستیں URL پر دستیاب Dolibarr endpoint پر بھیجنی چاہئیں
 ##### API ####
-ApiSetup=API module setup
-ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore and test the APIs at URL
-OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
-ApiKey=Key for API
-WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
+ApiSetup=API ماڈیول سیٹ اپ
+ApiDesc=اس ماڈیول کو فعال کرنے سے، Dolibarr متفرق ویب سروسز فراہم کرنے کے لیے ایک REST سرور بن جاتا ہے۔
+ApiProductionMode=پروڈکشن موڈ کو فعال کریں (یہ خدمات کے انتظام کے لیے کیشے کے استعمال کو چالو کر دے گا)
+ApiExporerIs=آپ URL پر APIs کو دریافت اور جانچ کر سکتے ہیں۔
+OnlyActiveElementsAreExposed=صرف فعال ماڈیولز کے عناصر سامنے آئے ہیں۔
+ApiKey=API کے لیے کلید
+WarningAPIExplorerDisabled=API ایکسپلورر کو غیر فعال کر دیا گیا ہے۔ API ایکسپلورر کو API خدمات فراہم کرنے کی ضرورت نہیں ہے۔ یہ ڈیولپر کے لیے REST APIs کو تلاش کرنے/ٹیسٹ کرنے کا ایک ٹول ہے۔ اگر آپ کو اس ٹول کی ضرورت ہے تو اسے فعال کرنے کے لیے ماڈیول API REST کے سیٹ اپ میں جائیں۔
 ##### Bank #####
-BankSetupModule=Bank module setup
-FreeLegalTextOnChequeReceipts=Free text on check receipts
-BankOrderShow=Display order of bank accounts for countries using "detailed bank number"
-BankOrderGlobal=General
-BankOrderGlobalDesc=General display order
-BankOrderES=Spanish
-BankOrderESDesc=Spanish display order
-ChequeReceiptsNumberingModule=Check Receipts Numbering Module
+BankSetupModule=بینک ماڈیول سیٹ اپ
+FreeLegalTextOnChequeReceipts=چیک کی رسیدوں پر مفت متن
+BankOrderShow="تفصیلی بینک نمبر" استعمال کرنے والے ممالک کے لیے بینک اکاؤنٹس کا آرڈر ڈسپلے کریں
+BankOrderGlobal=جنرل
+BankOrderGlobalDesc=عام ڈسپلے آرڈر
+BankOrderES=ہسپانوی
+BankOrderESDesc=ہسپانوی ڈسپلے آرڈر
+ChequeReceiptsNumberingModule=رسیدیں نمبرنگ ماڈیول چیک کریں۔
 ##### Multicompany #####
-MultiCompanySetup=Multi-company module setup
+MultiCompanySetup=ملٹی کمپنی ماڈیول سیٹ اپ
 ##### Suppliers #####
-SuppliersSetup=Vendor module setup
-SuppliersCommandModel=Complete template of Purchase Order
-SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
-SuppliersInvoiceModel=Complete template of Vendor Invoice
-SuppliersInvoiceNumberingModel=Vendor invoices numbering models
-IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
+SuppliersSetup=وینڈر ماڈیول سیٹ اپ
+SuppliersCommandModel=پرچیز آرڈر کا مکمل سانچہ
+SuppliersCommandModelMuscadet=پرچیز آرڈر کا مکمل سانچہ (کارناس ٹیمپلیٹ کا پرانا نفاذ)
+SuppliersInvoiceModel=وینڈر انوائس کی مکمل ٹیمپلیٹ
+SuppliersInvoiceNumberingModel=وینڈر انوائسز نمبرنگ ماڈلز
+IfSetToYesDontForgetPermission=اگر غیر null قدر پر سیٹ ہے تو، دوسری منظوری کے لیے اجازت یافتہ گروپوں یا صارفین کو اجازت دینا نہ بھولیں۔
 ##### GeoIPMaxmind #####
-GeoIPMaxmindSetup=GeoIP Maxmind module setup
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
-NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
-YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
-YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
-TestGeoIPResult=Test of a conversion IP -> country
+GeoIPMaxmindSetup=GeoIP Maxmind ماڈیول سیٹ اپ
+PathToGeoIPMaxmindCountryDataFile=میکس مائنڈ آئی پی ٹو کنٹری ترجمہ پر مشتمل فائل کا راستہ۔ <br> مثالیں: <br> /usr/local/share/GeoIP/GeoIP.dat <br> /usr/share/GeoIP/GeoIP.dat a0342fccfda19bz/Cousr/Cosme/Couser
+NoteOnPathLocation=نوٹ کریں کہ آپ کی آئی پی ٹو کنٹری ڈیٹا فائل ایک ڈائرکٹری کے اندر ہونی چاہیے جسے آپ کا پی ایچ پی پڑھ سکتا ہے (اپنا پی ایچ پی اوپن_بیسڈر سیٹ اپ اور فائل سسٹم کی اجازتوں کو چیک کریں)۔
+YouCanDownloadFreeDatFileTo=آپ %s پر Maxmind GeoIP کنٹری فائل کا <b> مفت ڈیمو ورژن </b> ڈاؤن لوڈ کرسکتے ہیں۔
+YouCanDownloadAdvancedDatFileTo=آپ %s پر Maxmind GeoIP کنٹری فائل کے </b> اپ ڈیٹس کے ساتھ مزید <b> مکمل ورژن بھی ڈاؤن لوڈ کر سکتے ہیں۔
+TestGeoIPResult=تبادلوں کے آئی پی -> ملک کا ٹیسٹ
 ##### Projects #####
-ProjectsNumberingModules=Projects numbering module
-ProjectsSetup=Project module setup
-ProjectsModelModule=Project reports document model
-TasksNumberingModules=Tasks numbering module
-TaskModelModule=Tasks reports document model
-UseSearchToSelectProject=Wait until a key is pressed before loading content of Project combo list.<br>This may improve performance if you have a large number of projects, but it is less convenient.
+ProjectsNumberingModules=پروجیکٹس نمبرنگ ماڈیول
+ProjectsSetup=پروجیکٹ ماڈیول سیٹ اپ
+ProjectsModelModule=پروجیکٹ رپورٹس دستاویز کا ماڈل
+TasksNumberingModules=ٹاسک نمبرنگ ماڈیول
+TaskModelModule=ٹاسک رپورٹس دستاویز ماڈل
+UseSearchToSelectProject=پروجیکٹ کومبو لسٹ کا مواد لوڈ کرنے سے پہلے ایک کلید دبانے تک انتظار کریں۔ <br> اگر آپ کے پاس بڑی تعداد میں پروجیکٹس ہیں تو یہ کارکردگی کو بہتر بنا سکتا ہے، لیکن یہ کم آسان ہے۔
 ##### ECM (GED) #####
 ##### Fiscal Year #####
-AccountingPeriods=Accounting periods
-AccountingPeriodCard=Accounting period
-NewFiscalYear=New accounting period
-OpenFiscalYear=Open accounting period
-CloseFiscalYear=Close accounting period
-DeleteFiscalYear=Delete accounting period
-ConfirmDeleteFiscalYear=Are you sure to delete this accounting period?
-ShowFiscalYear=Show accounting period
-AlwaysEditable=Can always be edited
-MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
-NbMajMin=Minimum number of uppercase characters
-NbNumMin=Minimum number of numeric characters
-NbSpeMin=Minimum number of special characters
-NbIteConsecutive=Maximum number of repeating same characters
-NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
-SalariesSetup=Setup of module salaries
-SortOrder=Sort order
-Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and suppliers payment type
-IncludePath=Include path (defined into variable %s)
-ExpenseReportsSetup=Setup of module Expense Reports
-TemplatePDFExpenseReports=Document templates to generate expense report document
-ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
-ExpenseReportNumberingModules=Expense reports numbering module
-NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
-YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
-TemplatesForNotifications=Templates for notifications
-ListOfNotificationsPerUser=List of automatic notifications per user*
-ListOfNotificationsPerUserOrContact=List of possible automatic notifications (on business event) available per user* or per contact**
-ListOfFixedNotifications=List of automatic fixed notifications
-GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go to the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
-Threshold=Threshold
-BackupDumpWizard=Wizard to build the database dump file
-BackupZipWizard=Wizard to build the archive of documents directory
-SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
-SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is a manual process only a privileged user may perform.
-InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
-ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
-HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
-HighlightLinesColor=Highlight color of the line when the mouse passes over (use 'ffffff' for no highlight)
-HighlightLinesChecked=Highlight color of the line when it is checked (use 'ffffff' for no highlight)
-TextTitleColor=Text color of Page title
-LinkColor=Color of links
-PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
-NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
-BackgroundColor=Background color
-TopMenuBackgroundColor=Background color for Top menu
-TopMenuDisableImages=Hide images in Top menu
-LeftMenuBackgroundColor=Background color for Left menu
-BackgroundTableTitleColor=Background color for Table title line
-BackgroundTableTitleTextColor=Text color for Table title line
-BackgroundTableTitleTextlinkColor=Text color for Table title link line
-BackgroundTableLineOddColor=Background color for odd table lines
-BackgroundTableLineEvenColor=Background color for even table lines
-MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
-NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
-Enter0or1=Enter 0 or 1
-UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
-ColorFormat=The RGB color is in HEX format, eg: FF0000
-PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
-PositionIntoComboList=Position of line into combo lists
-SellTaxRate=Sales tax rate
-RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
-UrlTrackingDesc=If the provider or transport service offers a page or web site to check the status of your shipments, you may enter it here. You can use the key {TRACKID} in the URL parameters so the system will replace it with the tracking number the user entered into the shipment card.
-OpportunityPercent=When you create a lead, you will define an estimated amount of project/lead. According to status of the lead, this amount may be multiplied by this rate to evaluate a total amount all your leads may generate. Value is a percentage (between 0 and 100).
-TemplateForElement=This mail template is related to what type of object? An email template is available only when using the "Send Email" button from the related object.
-TypeOfTemplate=Type of template
-TemplateIsVisibleByOwnerOnly=Template is visible to owner only
-VisibleEverywhere=Visible everywhere
-VisibleNowhere=Visible nowhere
-FixTZ=TimeZone fix
-FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
-ExpectedChecksum=Expected Checksum
-CurrentChecksum=Current Checksum
-ExpectedSize=Expected size
-CurrentSize=Current size
-ForcedConstants=Required constant values
-MailToSendProposal=Customer proposals
-MailToSendOrder=Sales orders
-MailToSendInvoice=Customer invoices
-MailToSendShipment=Shipments
-MailToSendIntervention=Interventions
-MailToSendSupplierRequestForQuotation=Quotation request
-MailToSendSupplierOrder=Purchase orders
-MailToSendSupplierInvoice=Vendor invoices
-MailToSendContract=Contracts
-MailToSendReception=Receptions
-MailToThirdparty=Third parties
-MailToMember=Members
-MailToUser=Users
-MailToProject=Projects
-MailToTicket=Tickets
-ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the latest stable version
-TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
-TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
-ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
-MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
-ModelModulesProduct=Templates for product documents
-WarehouseModelModules=Templates for documents of warehouses
-ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
-SeeSubstitutionVars=See * note for list of possible substitution variables
-SeeChangeLog=See ChangeLog file (english only)
-AllPublishers=All publishers
-UnknownPublishers=Unknown publishers
-AddRemoveTabs=Add or remove tabs
-AddDataTables=Add object tables
-AddDictionaries=Add dictionaries tables
-AddData=Add objects or dictionaries data
-AddBoxes=Add widgets
-AddSheduledJobs=Add scheduled jobs
-AddHooks=Add hooks
-AddTriggers=Add triggers
-AddMenus=Add menus
-AddPermissions=Add permissions
-AddExportProfiles=Add export profiles
-AddImportProfiles=Add import profiles
-AddOtherPagesOrServices=Add other pages or services
-AddModels=Add document or numbering templates
-AddSubstitutions=Add keys substitutions
-DetectionNotPossible=Detection not possible
-UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved in database user table and must be provided on each API call)
-ListOfAvailableAPIs=List of available APIs
-activateModuleDependNotSatisfied=Module "%s" depends on module "%s", that is missing, so module "%1$s" may not work correctly. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
-CommandIsNotInsideAllowedCommands=The command you are trying to run is not in the list of allowed commands defined in parameter <strong>$dolibarr_main_restrict_os_commands</strong> in the <strong>conf.php</strong> file.
-LandingPage=Landing page
-SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", the price will also be the same for all companies if products are shared between environments
-ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users or groups manually if necessary.
-UserHasNoPermissions=This user has no permissions defined
-TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "%s")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "%s" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month after delta (delta is field "%s", N is stored into field "%s")
-BaseCurrency=Reference currency of the company (go into setup of company to change this)
-WarningNoteModuleInvoiceForFrenchLaw=This module %s is compliant with French laws (Loi Finance 2016).
-WarningNoteModulePOSForFrenchLaw=This module %s is compliant with French laws (Loi Finance 2016) because module Non Reversible Logs is automatically activated.
-WarningInstallationMayBecomeNotCompliantWithLaw=You are trying to install module %s that is an external module. Activating an external module means you trust the publisher of that module and that you are sure that this module does not adversely impact the behavior of your application, and is compliant with laws of your country (%s). If the module introduces an illegal feature, you become responsible for the use of illegal software.
-MAIN_PDF_MARGIN_LEFT=Left margin on PDF
-MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
-MAIN_PDF_MARGIN_TOP=Top margin on PDF
-MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
-MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
-MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
-MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Width of the column if a picture is added on lines
-MAIN_PDF_NO_SENDER_FRAME=Hide borders on sender address frame
-MAIN_PDF_NO_RECIPENT_FRAME=Hide borders on recipent address frame
-MAIN_PDF_HIDE_CUSTOMER_CODE=Hide customer code
-MAIN_PDF_HIDE_SENDER_NAME=Hide sender/company name in address block
-PROPOSAL_PDF_HIDE_PAYMENTTERM=Hide payments conditions
-PROPOSAL_PDF_HIDE_PAYMENTMODE=Hide payment mode
-MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
-NothingToSetup=There is no specific setup required for this module.
-SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
-SeveralLangugeVariatFound=Several language variants found
-RemoveSpecialChars=Remove special characters
-COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
-COMPANY_DIGITARIA_CLEAN_REGEX=Regex filter to clean value (COMPANY_DIGITARIA_CLEAN_REGEX)
-COMPANY_DIGITARIA_UNIQUE_CODE=Duplicate not allowed
-GDPRContact=Data Protection Officer (DPO, Data Privacy or GDPR contact)
-GDPRContactDesc=If you store data about European companies/citizens, you can name the contact who is responsible for the General Data Protection Regulation here
-HelpOnTooltip=Help text to show on tooltip
-HelpOnTooltipDesc=Put text or a translation key here for the text to show in a tooltip when this field appears in a form
-YouCanDeleteFileOnServerWith=You can delete this file on the server with Command Line:<br>%s
-ChartLoaded=Chart of account loaded
-SocialNetworkSetup=Setup of module Social Networks
-EnableFeatureFor=Enable features for <strong>%s</strong>
-VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
-SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
-EmailCollector=Email collector
-EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
-NewEmailCollector=New Email Collector
-EMailHost=Host of email IMAP server
-MailboxSourceDirectory=Mailbox source directory
-MailboxTargetDirectory=Mailbox target directory
-EmailcollectorOperations=Operations to do by collector
-EmailcollectorOperationsDesc=Operations are executed from top to bottom order
-MaxEmailCollectPerCollect=Max number of emails collected per collect
-CollectNow=Collect now
-ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Date of latest collect try
-DateLastcollectResultOk=Date of latest collect success
-LastResult=Latest result
-EmailCollectorConfirmCollectTitle=Email collect confirmation
-EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
-NoNewEmailToProcess=No new email (matching filters) to process
-NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
-RecordEvent=Record email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
-CodeLastResult=Latest result code
-NbOfEmailsInInbox=Number of emails in source directory
-LoadThirdPartyFromName=Load third party searching on %s (load only)
-LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
-WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
-WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
-WithDolTrackingIDInMsgId=Message sent from Dolibarr
-WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create job application
-FormatZip=Zip
-MainMenuCode=Menu entry code (mainmenu)
-ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-OpeningHours=Opening hours
-OpeningHoursDesc=Enter here the regular opening hours of your company.
-ResourceSetup=Configuration of Resource module
-UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disable feature to link a resource to users
-DisabledResourceLinkContact=Disable feature to link a resource to contacts
-EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
-ConfirmUnactivation=Confirm module reset
-OnMobileOnly=On small screen (smartphone) only
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
-MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
-MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
-MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
-MAIN_OPTIMIZEFORCOLORBLINDDesc=Enable this option if you are a color blind person, in some case interface will change color setup to increase contrast.
-Protanopia=Protanopia
+AccountingPeriods=اکاؤنٹنگ ادوار
+AccountingPeriodCard=اکاؤنٹنگ مدت
+NewFiscalYear=اکاؤنٹنگ کی نئی مدت
+OpenFiscalYear=اکاؤنٹنگ کی مدت کھولیں۔
+CloseFiscalYear=اکاؤنٹنگ کی مدت بند کریں۔
+DeleteFiscalYear=اکاؤنٹنگ مدت کو حذف کریں۔
+ConfirmDeleteFiscalYear=کیا آپ یقینی طور پر اس اکاؤنٹنگ مدت کو حذف کرنا چاہتے ہیں؟
+ShowFiscalYear=حساب کتاب کی مدت دکھائیں۔
+AlwaysEditable=ہمیشہ ترمیم کی جا سکتی ہے۔
+MAIN_APPLICATION_TITLE=ایپلیکیشن کے نظر آنے والے نام کو مجبور کریں (انتباہ: DoliDroid موبائل ایپلیکیشن استعمال کرتے وقت آپ کا اپنا نام یہاں سیٹ کرنے سے آٹوفل لاگ ان فیچر ٹوٹ سکتا ہے)
+NbMajMin=بڑے حروف کی کم از کم تعداد
+NbNumMin=عددی حروف کی کم از کم تعداد
+NbSpeMin=خصوصی حروف کی کم از کم تعداد
+NbIteConsecutive=ایک جیسے حروف کو دہرانے کی زیادہ سے زیادہ تعداد
+NoAmbiCaracAutoGeneration=خودکار جنریشن کے لیے مبہم حروف ("1","l","i","|""0","O") استعمال نہ کریں۔
+SalariesSetup=ماڈیول تنخواہوں کا سیٹ اپ
+SortOrder=ترتیب
+Format=فارمیٹ
+TypePaymentDesc=0:صارفین کی ادائیگی کی قسم، 1:وینڈر کی ادائیگی کی قسم، 2:صارفین اور سپلائرز دونوں کی ادائیگی کی قسم
+IncludePath=راستہ شامل کریں (متغیر %s میں بیان کیا گیا ہے)
+ExpenseReportsSetup=ماڈیول اخراجات کی رپورٹس کا سیٹ اپ
+TemplatePDFExpenseReports=اخراجات کی رپورٹ کی دستاویز تیار کرنے کے لیے دستاویزی ٹیمپلیٹس
+ExpenseReportsRulesSetup=ماڈیول اخراجات کی رپورٹس کا سیٹ اپ - قواعد
+ExpenseReportNumberingModules=اخراجات کی رپورٹ نمبرنگ ماڈیول
+NoModueToManageStockIncrease=خودکار اسٹاک میں اضافے کا انتظام کرنے کے قابل کوئی ماڈیول فعال نہیں کیا گیا ہے۔ اسٹاک میں اضافہ صرف دستی ان پٹ پر کیا جائے گا۔
+YouMayFindNotificationsFeaturesIntoModuleNotification=آپ ماڈیول "اطلاع" کو فعال اور ترتیب دے کر ای میل اطلاعات کے اختیارات تلاش کر سکتے ہیں۔
+TemplatesForNotifications=اطلاعات کے لیے ٹیمپلیٹس
+ListOfNotificationsPerUser=فی صارف خودکار اطلاعات کی فہرست*
+ListOfNotificationsPerUserOrContact=ممکنہ خودکار اطلاعات کی فہرست (کاروباری ایونٹ پر) فی صارف دستیاب* یا فی رابطہ**
+ListOfFixedNotifications=خودکار فکسڈ اطلاعات کی فہرست
+GoOntoUserCardToAddMore=صارفین کے لیے اطلاعات شامل کرنے یا ہٹانے کے لیے صارف کے ٹیب "اطلاعات" پر جائیں۔
+GoOntoContactCardToAddMore=رابطوں/پتوں کے لیے اطلاعات شامل کرنے یا ہٹانے کے لیے فریق ثالث کے ٹیب "اطلاعات" پر جائیں۔
+Threshold=حد
+BackupDumpWizard=ڈیٹا بیس ڈمپ فائل بنانے کے لیے وزرڈ
+BackupZipWizard=دستاویزات کی ڈائرکٹری کے آرکائیو بنانے کے لیے مددگار
+SomethingMakeInstallFromWebNotPossible=مندرجہ ذیل وجہ سے ویب انٹرفیس سے بیرونی ماڈیول کی تنصیب ممکن نہیں ہے۔
+SomethingMakeInstallFromWebNotPossible2=اس وجہ سے، یہاں بیان کردہ اپ گریڈ کرنے کا عمل ایک دستی عمل ہے جو صرف ایک مراعات یافتہ صارف انجام دے سکتا ہے۔
+InstallModuleFromWebHasBeenDisabledByFile=آپ کے منتظم کے ذریعہ ایپلیکیشن سے بیرونی ماڈیول کی تنصیب کو غیر فعال کر دیا گیا ہے۔ اس خصوصیت کی اجازت دینے کے لیے آپ کو اس سے فائل <strong> %s </strong> کو ہٹانے کے لیے کہنا چاہیے۔
+ConfFileMustContainCustom=ایپلیکیشن سے کسی بیرونی ماڈیول کو انسٹال کرنے یا بنانے کے لیے ماڈیول فائلوں کو ڈائرکٹری میں محفوظ کرنے کی ضرورت ہے <strong> %s </strong> ۔ اس ڈائرکٹری کو Dolibarr کے ذریعے پروسیس کرنے کے لیے، آپ کو اپنا <strong> conf/conf.php </strong> سیٹ اپ کرنا چاہیے تاکہ 2 ڈائرکٹیو لائنیں شامل کی جا سکیں: <br> <strong>_c06bz0. </strong> <br> <strong> $dolibarr_main_document_root_alt='%s/custom'; </strong>
+HighlightLinesOnMouseHover=جب ماؤس کی حرکت گزر جاتی ہے تو ٹیبل لائنوں کو نمایاں کریں۔
+HighlightLinesColor=ماؤس کے اوپر سے گزرنے پر لائن کا رنگ نمایاں کریں (کسی ہائی لائٹ کے لیے 'ffffff' استعمال کریں)
+HighlightLinesChecked=جب لائن کو چیک کیا جائے تو اس کے رنگ کو ہائی لائٹ کریں (کسی ہائی لائٹ کے لیے 'ffffff' استعمال کریں)
+TextTitleColor=صفحہ کے عنوان کا متن کا رنگ
+LinkColor=لنکس کا رنگ
+PressF5AfterChangingThis=کی بورڈ پر CTRL+F5 دبائیں یا اس قدر کو تبدیل کرنے کے بعد اپنا براؤزر کیش صاف کریں تاکہ اسے موثر بنایا جاسکے
+NotSupportedByAllThemes=ول بنیادی تھیمز کے ساتھ کام کرتا ہے، ہو سکتا ہے کہ بیرونی تھیمز کی حمایت نہ ہو۔
+BackgroundColor=پس منظر کا رنگ
+TopMenuBackgroundColor=ٹاپ مینو کے لیے پس منظر کا رنگ
+TopMenuDisableImages=ٹاپ مینو میں تصاویر چھپائیں۔
+LeftMenuBackgroundColor=بائیں مینو کے لیے پس منظر کا رنگ
+BackgroundTableTitleColor=ٹیبل ٹائٹل لائن کے لیے پس منظر کا رنگ
+BackgroundTableTitleTextColor=ٹیبل ٹائٹل لائن کے لیے متن کا رنگ
+BackgroundTableTitleTextlinkColor=ٹیبل ٹائٹل لنک لائن کے لیے متن کا رنگ
+BackgroundTableLineOddColor=طاق ٹیبل لائنوں کے لیے پس منظر کا رنگ
+BackgroundTableLineEvenColor=یکساں ٹیبل لائنوں کے لیے پس منظر کا رنگ
+MinimumNoticePeriod=نوٹس کی کم از کم مدت (آپ کی چھٹی کی درخواست اس تاخیر سے پہلے کی جانی چاہیے)
+NbAddedAutomatically=ہر مہینے صارفین کے کاؤنٹرز میں شامل دنوں کی تعداد (خود بخود)
+EnterAnyCode=یہ فیلڈ لائن کی شناخت کے لیے ایک حوالہ پر مشتمل ہے۔ اپنی پسند کی کوئی بھی قیمت درج کریں، لیکن خصوصی حروف کے بغیر۔
+Enter0or1=0 یا 1 درج کریں۔
+UnicodeCurrency=یہاں منحنی خطوط وحدانی کے درمیان درج کریں، بائٹ نمبر کی فہرست جو کرنسی کی علامت کی نمائندگی کرتی ہے۔ مثال کے طور پر: $ کے لیے، درج کریں [36] - برازیل اصلی R$ [82,36] کے لیے - € کے لیے، [8364] درج کریں
+ColorFormat=RGB رنگ HEX فارمیٹ میں ہے، جیسے: FF0000
+PictoHelp=ڈولیبر فارمیٹ میں آئیکن کا نام ('image.png' اگر موجودہ تھیم ڈائرکٹری میں ہے، 'image.png@nom_du_module' اگر کسی ماڈیول کی ڈائرکٹری /img/ میں ہے)
+PositionIntoComboList=کومبو فہرستوں میں لائن کی پوزیشن
+SellTaxRate=سیلز ٹیکس کی شرح
+RecuperableOnly=جی ہاں فرانس کی کسی ریاست کے لیے مختص VAT کے لیے "معلوم نہیں ہوا لیکن قابل بازیافت"۔ دیگر تمام معاملات میں قدر کو "نہیں" پر رکھیں۔
+UrlTrackingDesc=اگر فراہم کنندہ یا ٹرانسپورٹ سروس آپ کی ترسیل کی حالت کو جانچنے کے لیے کوئی صفحہ یا ویب سائٹ پیش کرتی ہے، تو آپ اسے یہاں درج کر سکتے ہیں۔ آپ URL پیرامیٹرز میں کلید {TRACKID} استعمال کر سکتے ہیں تاکہ سسٹم اسے اس ٹریکنگ نمبر سے بدل دے جو صارف نے شپمنٹ کارڈ میں درج کیا ہے۔
+OpportunityPercent=جب آپ لیڈ بناتے ہیں، تو آپ پروجیکٹ/لیڈ کی تخمینی مقدار کی وضاحت کریں گے۔ لیڈ کی حیثیت کے مطابق، اس رقم کو اس شرح سے ضرب دیا جا سکتا ہے تاکہ آپ کی تمام لیڈز کی مجموعی رقم کا اندازہ لگایا جا سکے۔ قدر ایک فیصد ہے (0 اور 100 کے درمیان)۔
+TemplateForElement=یہ میل ٹیمپلیٹ کس قسم کی چیز سے متعلق ہے؟ ای میل ٹیمپلیٹ صرف اس وقت دستیاب ہوتا ہے جب متعلقہ آبجیکٹ سے "ای میل بھیجیں" بٹن استعمال کیا جائے۔
+TypeOfTemplate=ٹیمپلیٹ کی قسم
+TemplateIsVisibleByOwnerOnly=ٹیمپلیٹ صرف مالک کو نظر آتا ہے۔
+VisibleEverywhere=ہر جگہ نظر آتا ہے۔
+VisibleNowhere=کہیں نظر نہیں آتا
+FixTZ=ٹائم زون درست کریں۔
+FillFixTZOnlyIfRequired=مثال: +2 (صرف اس صورت میں بھریں جب مسئلہ ہو)
+ExpectedChecksum=متوقع چیکسم
+CurrentChecksum=موجودہ چیکسم
+ExpectedSize=متوقع سائز
+CurrentSize=موجودہ سائز
+ForcedConstants=مطلوبہ مستقل اقدار
+MailToSendProposal=گاہک کی تجاویز
+MailToSendOrder=سیلز آرڈرز
+MailToSendInvoice=کسٹمر کی رسیدیں
+MailToSendShipment=شپمنٹس
+MailToSendIntervention=مداخلتیں
+MailToSendSupplierRequestForQuotation=حوالے کی درخواست
+MailToSendSupplierOrder=خریداری کے احکامات
+MailToSendSupplierInvoice=وینڈر کی رسیدیں
+MailToSendContract=معاہدے
+MailToSendReception=استقبالیہ
+MailToThirdparty=تیسرے فریقوں
+MailToMember=ممبران
+MailToUser=صارفین
+MailToProject=پروجیکٹس
+MailToTicket=ٹکٹ
+ByDefaultInList=لسٹ ویو پر بطور ڈیفالٹ دکھائیں۔
+YouUseLastStableVersion=آپ تازہ ترین مستحکم ورژن استعمال کرتے ہیں۔
+TitleExampleForMajorRelease=پیغام کی مثال جسے آپ اس بڑے ریلیز کا اعلان کرنے کے لیے استعمال کر سکتے ہیں (اسے اپنی ویب سائٹس پر بلا جھجھک استعمال کریں)
+TitleExampleForMaintenanceRelease=پیغام کی مثال جو آپ اس مینٹیننس ریلیز کا اعلان کرنے کے لیے استعمال کر سکتے ہیں (اسے اپنی ویب سائٹس پر بلا جھجھک استعمال کریں)
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP اور CRM %s دستیاب ہے۔ ورژن %s صارفین اور ڈویلپرز دونوں کے لیے بہت ساری نئی خصوصیات کے ساتھ ایک بڑی ریلیز ہے۔ آپ اسے https://www.dolibarr.org پورٹل (سب ڈائرکٹری اسٹیبل ورژن) کے ڈاؤن لوڈ ایریا سے ڈاؤن لوڈ کر سکتے ہیں۔ تبدیلیوں کی مکمل فہرست کے لیے آپ <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog </a> پڑھ سکتے ہیں۔
+ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP اور CRM %s دستیاب ہے۔ ورژن %s ایک مینٹیننس ورژن ہے، لہذا اس میں صرف بگ فکسز شامل ہیں۔ ہم تمام صارفین کو اس ورژن میں اپ گریڈ کرنے کی تجویز کرتے ہیں۔ بحالی کی ریلیز ڈیٹا بیس میں نئی خصوصیات یا تبدیلیاں متعارف نہیں کرواتی ہے۔ آپ اسے https://www.dolibarr.org پورٹل (سب ڈائرکٹری سٹیبل ورژن) کے ڈاؤن لوڈ ایریا سے ڈاؤن لوڈ کر سکتے ہیں۔ تبدیلیوں کی مکمل فہرست کے لیے آپ <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog </a> پڑھ سکتے ہیں۔
+MultiPriceRuleDesc=جب آپشن "قیمتوں کی کئی سطحیں فی پروڈکٹ/سروس" کو فعال کیا جاتا ہے، تو آپ ہر پروڈکٹ کے لیے مختلف قیمتیں (ایک فی قیمت کی سطح) کی وضاحت کر سکتے ہیں۔ آپ کا وقت بچانے کے لیے، یہاں آپ پہلے درجے کی قیمت کی بنیاد پر ہر سطح کے لیے قیمت کا خودکار حساب لگانے کے لیے ایک اصول درج کر سکتے ہیں، اس لیے آپ کو ہر پروڈکٹ کے لیے صرف پہلے درجے کی قیمت درج کرنی ہوگی۔ یہ صفحہ آپ کا وقت بچانے کے لیے ڈیزائن کیا گیا ہے لیکن صرف اس صورت میں مفید ہے جب ہر سطح کے لیے آپ کی قیمتیں پہلے درجے کی نسبت ہوں۔ آپ زیادہ تر معاملات میں اس صفحہ کو نظر انداز کر سکتے ہیں۔
+ModelModulesProduct=پروڈکٹ دستاویزات کے لیے ٹیمپلیٹس
+WarehouseModelModules=گوداموں کی دستاویزات کے سانچے
+ToGenerateCodeDefineAutomaticRuleFirst=خود بخود کوڈز بنانے کے قابل ہونے کے لیے، آپ کو بار کوڈ نمبر کی خود بخود وضاحت کرنے کے لیے پہلے مینیجر کی وضاحت کرنی چاہیے۔
+SeeSubstitutionVars=ممکنہ متبادل متغیرات کی فہرست کے لیے *نوٹ دیکھیں
+SeeChangeLog=ChangeLog فائل دیکھیں (صرف انگریزی)
+AllPublishers=تمام پبلشرز
+UnknownPublishers=نامعلوم پبلشرز
+AddRemoveTabs=ٹیبز شامل کریں یا ہٹا دیں۔
+AddDataTables=آبجیکٹ ٹیبلز شامل کریں۔
+AddDictionaries=لغات کی میزیں شامل کریں۔
+AddData=اشیاء یا لغات کا ڈیٹا شامل کریں۔
+AddBoxes=ویجٹ شامل کریں۔
+AddSheduledJobs=طے شدہ ملازمتیں شامل کریں۔
+AddHooks=ہکس شامل کریں۔
+AddTriggers=محرکات شامل کریں۔
+AddMenus=مینو شامل کریں۔
+AddPermissions=اجازتیں شامل کریں۔
+AddExportProfiles=ایکسپورٹ پروفائلز شامل کریں۔
+AddImportProfiles=درآمدی پروفائلز شامل کریں۔
+AddOtherPagesOrServices=دوسرے صفحات یا خدمات شامل کریں۔
+AddModels=دستاویز یا نمبری ٹیمپلیٹس شامل کریں۔
+AddSubstitutions=چابیاں کے متبادل شامل کریں۔
+DetectionNotPossible=پتہ لگانا ممکن نہیں۔
+UrlToGetKeyToUseAPIs=API استعمال کرنے کے لیے ٹوکن حاصل کرنے کے لیے یو آر ایل (ٹوکن موصول ہونے کے بعد اسے ڈیٹا بیس یوزر ٹیبل میں محفوظ کر لیا جاتا ہے اور ہر API کال پر فراہم کرنا ضروری ہے)
+ListOfAvailableAPIs=دستیاب APIs کی فہرست
+activateModuleDependNotSatisfied=ماڈیول "%s" ماڈیول "%s" پر منحصر ہے، جو غائب ہے، لہذا ماڈیول "%1$s" درست طریقے سے کام نہیں کر سکتا۔ اگر آپ کسی حیرت سے محفوظ رہنا چاہتے ہیں تو براہ کرم ماڈیول "%2$s" انسٹال کریں یا ماڈیول "%1$s" کو غیر فعال کریں۔
+CommandIsNotInsideAllowedCommands=آپ جس کمانڈ کو چلانے کی کوشش کر رہے ہیں وہ <strong> $dolibarr_main_restrict_os_commands </strong> پیرامیٹر میں بیان کردہ اجازت شدہ کمانڈز کی فہرست میں نہیں ہے
+LandingPage=لینڈنگ پیج
+SamePriceAlsoForSharedCompanies=اگر آپ ایک ملٹی کمپنی ماڈیول استعمال کرتے ہیں، انتخاب "سنگل قیمت" کے ساتھ، قیمت بھی تمام کمپنیوں کے لیے یکساں ہوگی اگر مصنوعات ماحول کے درمیان شیئر کی جائیں
+ModuleEnabledAdminMustCheckRights=ماڈیول کو چالو کر دیا گیا ہے۔ فعال ماڈیول (زبانیں) کی اجازت صرف منتظم صارفین کو دی گئی تھی۔ اگر ضروری ہو تو آپ کو دوسرے صارفین یا گروپس کو دستی طور پر اجازت دینے کی ضرورت پڑسکتی ہے۔
+UserHasNoPermissions=اس صارف کے پاس کوئی اجازت نہیں ہے۔
+TypeCdr="کوئی نہیں" کا استعمال کریں اگر ادائیگی کی تاریخ انوائس کی تاریخ کے علاوہ دنوں میں ڈیلٹا ہے (ڈیلٹا فیلڈ "%s" ہے) <br> "مہینے کے آخر میں" کا استعمال کریں، اگر ڈیلٹا کے بعد، اختتام تک پہنچنے کے لیے تاریخ کو بڑھانا ضروری ہے۔ مہینے کا (+ ایک اختیاری "%s" دنوں میں) <br> ادائیگی کی مدت کی تاریخ ڈیلٹا کے بعد مہینے کی پہلی Nth ہونے کے لیے "موجودہ/اگلا" استعمال کریں (ڈیلٹا فیلڈ "%s" ہے، N کو فیلڈ "%s" میں ذخیرہ کیا جاتا ہے
+BaseCurrency=کمپنی کی حوالہ کرنسی (اسے تبدیل کرنے کے لیے کمپنی کے سیٹ اپ میں جائیں)
+WarningNoteModuleInvoiceForFrenchLaw=یہ ماڈیول %s فرانسیسی قوانین کے مطابق ہے (Loi Finance 2016)۔
+WarningNoteModulePOSForFrenchLaw=یہ ماڈیول %s فرانسیسی قوانین (Loi Finance 2016) کے مطابق ہے کیونکہ ماڈیول نان ریورسیبل لاگز خود بخود فعال ہو جاتا ہے۔
+WarningInstallationMayBecomeNotCompliantWithLaw=آپ ماڈیول %s انسٹال کرنے کی کوشش کر رہے ہیں جو ایک بیرونی ماڈیول ہے۔ ایک بیرونی ماڈیول کو چالو کرنے کا مطلب ہے کہ آپ اس ماڈیول کے ناشر پر بھروسہ کرتے ہیں اور آپ کو یقین ہے کہ یہ ماڈیول آپ کی درخواست کے رویے پر منفی اثر نہیں ڈالتا، اور آپ کے ملک کے قوانین کے مطابق ہے (%s)۔ اگر ماڈیول کوئی غیر قانونی خصوصیت متعارف کراتا ہے، تو آپ غیر قانونی سافٹ ویئر کے استعمال کے ذمہ دار ہو جاتے ہیں۔
+MAIN_PDF_MARGIN_LEFT=پی ڈی ایف پر بائیں مارجن
+MAIN_PDF_MARGIN_RIGHT=پی ڈی ایف پر دایاں مارجن
+MAIN_PDF_MARGIN_TOP=پی ڈی ایف پر ٹاپ مارجن
+MAIN_PDF_MARGIN_BOTTOM=پی ڈی ایف پر نیچے کا مارجن
+MAIN_DOCUMENTS_LOGO_HEIGHT=پی ڈی ایف پر لوگو کی اونچائی
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=پروپوزل لائنز پر تصویر کے لیے کالم شامل کریں۔
+MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=کالم کی چوڑائی اگر لائنوں پر تصویر شامل کی جائے۔
+MAIN_PDF_NO_SENDER_FRAME=مرسل ایڈریس فریم پر بارڈرز چھپائیں۔
+MAIN_PDF_NO_RECIPENT_FRAME=وصول کنندہ کے ایڈریس فریم پر بارڈرز چھپائیں۔
+MAIN_PDF_HIDE_CUSTOMER_CODE=کسٹمر کوڈ چھپائیں۔
+MAIN_PDF_HIDE_SENDER_NAME=ایڈریس بلاک میں بھیجنے والے/کمپنی کا نام چھپائیں۔
+PROPOSAL_PDF_HIDE_PAYMENTTERM=ادائیگی کی شرائط چھپائیں۔
+PROPOSAL_PDF_HIDE_PAYMENTMODE=ادائیگی کا موڈ چھپائیں۔
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=پی ڈی ایف میں الیکٹرانک سائن شامل کریں۔
+NothingToSetup=اس ماڈیول کے لیے کسی مخصوص سیٹ اپ کی ضرورت نہیں ہے۔
+SetToYesIfGroupIsComputationOfOtherGroups=اگر یہ گروپ دوسرے گروپوں کی گنتی ہے تو اسے ہاں پر سیٹ کریں۔
+EnterCalculationRuleIfPreviousFieldIsYes=اگر پچھلا فیلڈ ہاں پر سیٹ کیا گیا ہو تو حساب کتاب کا اصول درج کریں۔ <br> مثال کے طور پر: <br> CODEGRP1+CODEGRP2
+SeveralLangugeVariatFound=زبان کی کئی قسمیں ملیں۔
+RemoveSpecialChars=خصوصی حروف کو ہٹا دیں۔
+COMPANY_AQUARIUM_CLEAN_REGEX=کلین ویلیو کے لیے ریجیکس فلٹر (COMPANY_AQUARIUM_CLEAN_REGEX)
+COMPANY_DIGITARIA_CLEAN_REGEX=کلین ویلیو کے لیے ریجیکس فلٹر (COMPANY_DIGITARIA_CLEAN_REGEX)
+COMPANY_DIGITARIA_UNIQUE_CODE=نقل کی اجازت نہیں ہے۔
+GDPRContact=ڈیٹا پروٹیکشن آفیسر (ڈی پی او، ڈیٹا پرائیویسی یا جی ڈی پی آر رابطہ)
+GDPRContactDesc=اگر آپ یورپی کمپنیوں/شہریوں کے بارے میں ڈیٹا ذخیرہ کرتے ہیں، تو آپ یہاں اس رابطہ کا نام دے سکتے ہیں جو جنرل ڈیٹا پروٹیکشن ریگولیشن کا ذمہ دار ہے۔
+HelpOnTooltip=ٹول ٹپ پر دکھانے کے لیے متن کی مدد کریں۔
+HelpOnTooltipDesc=جب یہ فیلڈ فارم میں ظاہر ہوتا ہے تو ٹول ٹپ میں متن دکھانے کے لیے متن یا ترجمہ کی کلید یہاں رکھیں
+YouCanDeleteFileOnServerWith=آپ اس فائل کو سرور پر کمانڈ لائن کے ساتھ حذف کر سکتے ہیں: <br> %s
+ChartLoaded=اکاؤنٹ کا چارٹ لوڈ ہو گیا۔
+SocialNetworkSetup=ماڈیول سوشل نیٹ ورکس کا سیٹ اپ
+EnableFeatureFor=<strong> %s </strong> کے لیے خصوصیات کو فعال کریں
+VATIsUsedIsOff=نوٹ: مینو %s - %s میں سیلز ٹیکس یا VAT استعمال کرنے کا اختیار <strong> آف </strong> پر سیٹ کیا گیا ہے، لہذا سیلز ٹیکس یا VAT ہمیشہ سیلز کے لیے استعمال ہوگا۔
+SwapSenderAndRecipientOnPDF=پی ڈی ایف دستاویزات پر بھیجنے والے اور وصول کنندہ کے پتے کی پوزیشن کو تبدیل کریں۔
+FeatureSupportedOnTextFieldsOnly=تنبیہ، خصوصیت صرف ٹیکسٹ فیلڈز اور کومبو لسٹوں پر معاون ہے۔ نیز ایک URL پیرامیٹر ایکشن=create or action=edit سیٹ ہونا چاہیے یا اس فیچر کو متحرک کرنے کے لیے صفحہ کا نام 'new.php' کے ساتھ ختم ہونا چاہیے۔
+EmailCollector=ای میل کلکٹر
+EmailCollectorDescription=باقاعدگی سے ای میل باکسز (IMAP پروٹوکول کا استعمال کرتے ہوئے) اسکین کرنے کے لیے ایک طے شدہ جاب اور سیٹ اپ صفحہ شامل کریں اور اپنی درخواست میں موصول ہونے والی ای میلز کو صحیح جگہ پر ریکارڈ کریں اور/یا کچھ ریکارڈ خود بخود بنائیں (جیسے لیڈز)۔
+NewEmailCollector=نیا ای میل کلکٹر
+EMailHost=ای میل IMAP سرور کا میزبان
+MailboxSourceDirectory=میل باکس سورس ڈائرکٹری
+MailboxTargetDirectory=میل باکس ٹارگٹ ڈائرکٹری
+EmailcollectorOperations=کلیکٹر کے ذریعہ کرنے کے لئے آپریشن
+EmailcollectorOperationsDesc=اوپر سے نیچے کے حکم تک آپریشنز کیے جاتے ہیں۔
+MaxEmailCollectPerCollect=فی جمع کردہ ای میلز کی زیادہ سے زیادہ تعداد
+CollectNow=ابھی جمع کریں۔
+ConfirmCloneEmailCollector=کیا آپ واقعی ای میل کلکٹر %s کو کلون کرنا چاہتے ہیں؟
+DateLastCollectResult=جمع کرنے کی تازہ ترین کوشش کی تاریخ
+DateLastcollectResultOk=جمع کرنے کی تازہ ترین کامیابی کی تاریخ
+LastResult=تازہ ترین نتیجہ
+EmailCollectorConfirmCollectTitle=ای میل جمع تصدیق
+EmailCollectorConfirmCollect=کیا آپ ابھی اس کلکٹر کے لیے کلیکشن چلانا چاہتے ہیں؟
+NoNewEmailToProcess=کارروائی کے لیے کوئی نیا ای میل (مماثل فلٹرز) نہیں ہے۔
+NothingProcessed=کچھ نہیں کیا
+XEmailsDoneYActionsDone=%s ای میلز اہل ہیں، %s ای میلز پر کامیابی کے ساتھ کارروائی کی گئی (%s ریکارڈ/کارروائیوں کے لیے)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
+CodeLastResult=تازہ ترین نتیجہ کوڈ
+NbOfEmailsInInbox=سورس ڈائرکٹری میں ای میلز کی تعداد
+LoadThirdPartyFromName=%s پر تیسرے فریق کی تلاش کو لوڈ کریں (صرف لوڈ)
+LoadThirdPartyFromNameOrCreate=%s پر تیسرے فریق کی تلاش کو لوڈ کریں (اگر نہیں ملا تو بنائیں)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
+WithDolTrackingID=Dolibarr سے بھیجے گئے پہلے ای میل کے ذریعے شروع کی گئی گفتگو کا پیغام
+WithoutDolTrackingID=Dolibarr سے نہیں بھیجے گئے پہلے ای میل کے ذریعے شروع کی گئی گفتگو کا پیغام
+WithDolTrackingIDInMsgId=Dolibarr سے پیغام بھیجا گیا۔
+WithoutDolTrackingIDInMsgId=Dolibarr سے پیغام نہیں بھیجا گیا۔
+CreateCandidature=ملازمت کی درخواست بنائیں
+FormatZip=زپ
+MainMenuCode=مینو انٹری کوڈ (مین مینو)
+ECMAutoTree=خودکار ECM درخت دکھائیں۔
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OpeningHours=ابتدائی گھنٹے
+OpeningHoursDesc=اپنی کمپنی کے باقاعدہ کھلنے کے اوقات یہاں درج کریں۔
+ResourceSetup=وسائل کے ماڈیول کی ترتیب
+UseSearchToSelectResource=وسائل کا انتخاب کرنے کے لیے سرچ فارم کا استعمال کریں (ڈراپ ڈاؤن فہرست کے بجائے)۔
+DisabledResourceLinkUser=کسی وسائل کو صارفین سے منسلک کرنے کے لیے خصوصیت کو غیر فعال کریں۔
+DisabledResourceLinkContact=کسی وسائل کو رابطوں سے جوڑنے کے لیے خصوصیت کو غیر فعال کریں۔
+EnableResourceUsedInEventCheck=یہ چیک کرنے کے لیے فیچر کو فعال کریں کہ آیا کسی ایونٹ میں کوئی وسیلہ استعمال میں ہے۔
+ConfirmUnactivation=ماڈیول ری سیٹ کی تصدیق کریں۔
+OnMobileOnly=صرف چھوٹی اسکرین (اسمارٹ فون) پر
+DisableProspectCustomerType="Prospect + Customer" تیسرے فریق کی قسم کو غیر فعال کریں (لہذا فریق ثالث کو "Prospect" یا "Customer" ہونا چاہیے، لیکن دونوں نہیں ہو سکتے)
+MAIN_OPTIMIZEFORTEXTBROWSER=نابینا افراد کے لیے انٹرفیس کو آسان بنائیں
+MAIN_OPTIMIZEFORTEXTBROWSERDesc=اس اختیار کو فعال کریں اگر آپ نابینا ہیں، یا اگر آپ Lynx یا Links جیسے ٹیکسٹ براؤزر سے ایپلیکیشن استعمال کرتے ہیں۔
+MAIN_OPTIMIZEFORCOLORBLIND=رنگ نابینا شخص کے لیے انٹرفیس کا رنگ تبدیل کریں۔
+MAIN_OPTIMIZEFORCOLORBLINDDesc=اگر آپ کلر بلائنڈ ہیں تو اس آپشن کو فعال کریں، بعض صورتوں میں انٹرفیس کنٹراسٹ بڑھانے کے لیے رنگ سیٹ اپ کو تبدیل کر دے گا۔
+Protanopia=پروٹانوپیا
 Deuteranopes=Deuteranopes
-Tritanopes=Tritanopes
-ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
-DefaultCustomerType=Default thirdparty type for "New customer" creation form
-ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
-RootCategoryForProductsToSell=Root category of products to sell
-RootCategoryForProductsToSellDesc=If defined, only products inside this category or childs of this category will be available in the Point Of Sale
-DebugBar=Debug Bar
-DebugBarDesc=Toolbar that comes with a plenty of tools to simplify debugging
-DebugBarSetup=DebugBar Setup
-GeneralOptions=General Options
-LogsLinesNumber=Number of lines to show on logs tab
-UseDebugBar=Use the debug bar
-DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
-WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
-ModuleActivated=Module %s is activated and slows the interface
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
-ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
-IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
-AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
-SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
-EXPORTS_SHARE_MODELS=Export models are share with everybody
-ExportSetup=Setup of module Export
-ImportSetup=Setup of module Import
-InstanceUniqueID=Unique ID of the instance
-SmallerThan=Smaller than
-LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
-WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
-EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
-EndPointFor=End point for %s : %s
-DeleteEmailCollector=Delete email collector
-ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
-RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
-AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
-RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+Tritanopes=ٹریٹانوپس
+ThisValueCanOverwrittenOnUserLevel=اس قدر کو ہر صارف اپنے صارف صفحہ - ٹیب '%s' سے اوور رائٹ کر سکتا ہے۔
+DefaultCustomerType="نئے گاہک" تخلیق فارم کے لیے پہلے سے طے شدہ تیسری پارٹی کی قسم
+ABankAccountMustBeDefinedOnPaymentModeSetup=نوٹ: اس خصوصیت کو کام کرنے کے لیے بینک اکاؤنٹ کو ادائیگی کے ہر موڈ (Paypal، Stripe، ...) کے ماڈیول پر بیان کیا جانا چاہیے۔
+RootCategoryForProductsToSell=فروخت کرنے کے لئے مصنوعات کی جڑ زمرہ
+RootCategoryForProductsToSellDesc=اگر وضاحت کی گئی ہے تو، صرف اس زمرے کے اندر کی مصنوعات یا اس زمرے کے بچے ہی پوائنٹ آف سیل میں دستیاب ہوں گے۔
+DebugBar=ڈیبگ بار
+DebugBarDesc=ٹول بار جو ڈیبگنگ کو آسان بنانے کے لیے بہت سارے ٹولز کے ساتھ آتا ہے۔
+DebugBarSetup=ڈیبگ بار سیٹ اپ
+GeneralOptions=عمومی اختیارات
+LogsLinesNumber=لاگز ٹیب پر دکھانے کے لیے لائنوں کی تعداد
+UseDebugBar=ڈیبگ بار استعمال کریں۔
+DEBUGBAR_LOGS_LINES_NUMBER=کنسول میں رکھنے کے لیے آخری لاگ لائنوں کی تعداد
+WarningValueHigherSlowsDramaticalyOutput=انتباہ، اعلی قدریں ڈرامائی طور پر آؤٹ پٹ کو سست کر دیتی ہیں۔
+ModuleActivated=ماڈیول %s چالو ہے اور انٹرفیس کو سست کرتا ہے
+ModuleActivatedWithTooHighLogLevel=ماڈیول %s بہت زیادہ لاگنگ لیول کے ساتھ چالو کیا جاتا ہے (بہتر پرفارمنس اور سیکیورٹی کے لیے کم لیول استعمال کرنے کی کوشش کریں)
+ModuleSyslogActivatedButLevelNotTooVerbose=ماڈیول %s فعال ہے اور لاگ لیول (%s) درست ہے (زیادہ لفظی نہیں)
+IfYouAreOnAProductionSetThis=اگر آپ پیداواری ماحول پر ہیں، تو آپ کو اس پراپرٹی کو %s پر سیٹ کرنا چاہیے۔
+AntivirusEnabledOnUpload=اپ لوڈ کردہ فائلوں پر اینٹی وائرس فعال ہے۔
+SomeFilesOrDirInRootAreWritable=کچھ فائلیں یا ڈائریکٹریاں صرف پڑھنے کے موڈ میں نہیں ہیں۔
+EXPORTS_SHARE_MODELS=ایکسپورٹ ماڈل سب کے ساتھ شیئر کیے جاتے ہیں۔
+ExportSetup=ماڈیول ایکسپورٹ کا سیٹ اپ
+ImportSetup=ماڈیول درآمد کا سیٹ اپ
+InstanceUniqueID=مثال کی منفرد ID
+SmallerThan=سے چھوٹا
+LargerThan=سے بڑا
+IfTrackingIDFoundEventWillBeLinked=نوٹ کریں کہ اگر ای میل میں کسی آبجیکٹ کی ٹریکنگ آئی ڈی پائی جاتی ہے، یا اگر ای میل کسی ای میل کا جواب ہے جو کسی شے سے جمع اور منسلک ہے، تو تخلیق شدہ واقعہ خود بخود معلوم متعلقہ آبجیکٹ سے منسلک ہو جائے گا۔
+WithGMailYouCanCreateADedicatedPassword=جی میل اکاؤنٹ کے ساتھ، اگر آپ نے 2 مراحل کی توثیق کو فعال کیا ہے، تو یہ سفارش کی جاتی ہے کہ https://myaccount.google.com/ سے اپنے اکاؤنٹ کا پاس ورڈ استعمال کرنے کے بجائے ایپلیکیشن کے لیے ایک وقف شدہ دوسرا پاس ورڈ بنائیں۔
+EmailCollectorTargetDir=ای میل کو کامیابی کے ساتھ پروسیس ہونے پر اسے کسی اور ٹیگ/ڈائریکٹری میں منتقل کرنا ایک مطلوبہ رویہ ہو سکتا ہے۔ اس فیچر کو استعمال کرنے کے لیے صرف ڈائرکٹری کا نام یہاں سیٹ کریں (نام میں خصوصی حروف کا استعمال نہ کریں)۔ نوٹ کریں کہ آپ کو پڑھنا/لکھنا لاگ ان اکاؤنٹ بھی استعمال کرنا چاہیے۔
+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>
+EndPointFor=%s کے لیے اختتامی نقطہ : %s
+DeleteEmailCollector=ای میل کلیکٹر کو حذف کریں۔
+ConfirmDeleteEmailCollector=کیا آپ واقعی اس ای میل کلیکٹر کو حذف کرنا چاہتے ہیں؟
+RecipientEmailsWillBeReplacedWithThisValue=وصول کنندہ کے ای میلز کو ہمیشہ اس قدر سے بدل دیا جائے گا۔
+AtLeastOneDefaultBankAccountMandatory=کم از کم 1 ڈیفالٹ بینک اکاؤنٹ کی وضاحت ہونی چاہیے۔
+RESTRICT_ON_IP=صرف کچھ میزبان IP تک رسائی کی اجازت دیں (وائلڈ کارڈ کی اجازت نہیں ہے، اقدار کے درمیان جگہ استعمال کریں)۔ خالی کا مطلب ہے کہ ہر میزبان رسائی کر سکتا ہے۔
 IPListExample=127.0.0.1 192.168.0.2 [::1]
-BaseOnSabeDavVersion=Based on the library SabreDAV version
-NotAPublicIp=Not a public IP
-MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
-FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
-EmailTemplate=Template for email
-EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
-PDF_SHOW_PROJECT=Show project on document
-ShowProjectLabel=Project Label
-PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
-PDF_USE_A=Gererate PDF documents with format PDF/A instead of defaut format PDF
-FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
-RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
-JumpToBoxes=Jump to Setup -> Widgets
-MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
-MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
-TemplateAdded=Template added
-TemplateUpdated=Template updated
-TemplateDeleted=Template deleted
-MailToSendEventPush=Event reminder email
-SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
-DictionaryProductNature= Nature of product
-CountryIfSpecificToOneCountry=Country (if specific to a given country)
-YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
-ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
-CombinationsSeparator=Separator character for product combinations
-SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
-SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
-AskThisIDToYourBank=Contact your bank to get this ID
-AdvancedModeOnly=Permision available in Advanced permission mode only
-ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
-MailToSendEventOrganization=Event Organization
-MailToPartnership=Partnership
-AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
-YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
-PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
-NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
-RecommendedValueIs=Recommended: %s
-Recommended=Recommended
-NotRecommended=Not recommended
-ARestrictedPath=Some restricted path
-CheckForModuleUpdate=Check for external modules updates
-CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
-ModuleUpdateAvailable=An update is available
-NoExternalModuleWithUpdate=No updates found for external modules
-SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
-YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
-RandomlySelectedIfSeveral=Randomly selected if several pictures are available
-DatabasePasswordObfuscated=Database password is obfuscated in conf file
-DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
-APIsAreNotEnabled=APIs modules are not enabled
-YouShouldSetThisToOff=You should set this to 0 or off
-InstallAndUpgradeLockedBy=Install and upgrades are locked by the file <b>%s</b>
-OldImplementation=Old implementation
-PDF_SHOW_LINK_TO_ONLINE_PAYMENT=If some online payment modules are enabled (Paypal, Stripe, ...), add a link on the PDF to make the online payment
-DashboardDisableGlobal=Disable globally all the thumbs of open objects
-BoxstatsDisableGlobal=Disable totally box statistics
-DashboardDisableBlocks=Thumbs of open objects (to process or late) on main dashboard
-DashboardDisableBlockAgenda=Disable the thumb for agenda
-DashboardDisableBlockProject=Disable the thumb for projects
-DashboardDisableBlockCustomer=Disable the thumb for customers
-DashboardDisableBlockSupplier=Disable the thumb for suppliers
-DashboardDisableBlockContract=Disable the thumb for contracts
-DashboardDisableBlockTicket=Disable the thumb for tickets
-DashboardDisableBlockBank=Disable the thumb for banks
-DashboardDisableBlockAdherent=Disable the thumb for memberships
-DashboardDisableBlockExpenseReport=Disable the thumb for expense reports
-DashboardDisableBlockHoliday=Disable the thumb for leaves
-EnabledCondition=Condition to have field enabled (if not enabled, visibility will always be off)
-IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
-LanguageAndPresentation=Language and presentation
-SkinAndColors=Skin and colors
-IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
-PDF_USE_1A=Generate PDF with PDF/A-1b format
-MissingTranslationForConfKey = Missing translation for %s
-NativeModules=Native modules
-NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
-API_DISABLE_COMPRESSION=Disable compression of API responses
+BaseOnSabeDavVersion=لائبریری SabreDAV ورژن پر مبنی
+NotAPublicIp=عوامی IP نہیں ہے۔
+MakeAnonymousPing=Dolibarr فاؤنڈیشن سرور پر ایک گمنام پنگ '+1' بنائیں (صرف 1 بار انسٹالیشن کے بعد)
+FeatureNotAvailableWithReceptionModule=ماڈیول ریسپشن فعال ہونے پر فیچر دستیاب نہیں ہے۔
+EmailTemplate=ای میل کے لیے ٹیمپلیٹ
+EMailsWillHaveMessageID=ای میلز میں اس نحو سے مماثل ٹیگ 'حوالہ جات' ہوگا۔
+PDF_SHOW_PROJECT=دستاویز پر پروجیکٹ دکھائیں۔
+ShowProjectLabel=پروجیکٹ لیبل
+PDF_USE_ALSO_LANGUAGE_CODE=اگر آپ چاہتے ہیں کہ آپ کی پی ڈی ایف میں کچھ متن ایک ہی جنریٹڈ پی ڈی ایف میں 2 مختلف زبانوں میں ڈپلیکیٹ ہوں، تو آپ کو یہاں یہ دوسری زبان سیٹ کرنی ہوگی تاکہ جنریٹ کی گئی پی ڈی ایف ایک ہی صفحہ میں 2 مختلف زبانوں پر مشتمل ہو، جو پی ڈی ایف بنانے کے وقت منتخب کی گئی ہو اور یہ ( صرف چند پی ڈی ایف ٹیمپلیٹس اس کی حمایت کرتے ہیں)۔ فی پی ڈی ایف 1 زبان کے لیے خالی رکھیں۔
+PDF_USE_A=ڈیفالٹ فارمیٹ پی ڈی ایف کے بجائے PDF/A فارمیٹ کے ساتھ پی ڈی ایف دستاویزات تیار کریں۔
+FafaIconSocialNetworksDesc=یہاں ایک FontAwesome آئیکن کا کوڈ درج کریں۔ اگر آپ نہیں جانتے کہ FontAwesome کیا ہے، تو آپ عام قدر fa-address-book استعمال کر سکتے ہیں۔
+RssNote=نوٹ: ہر آر ایس ایس فیڈ کی تعریف ایک ویجیٹ فراہم کرتی ہے جسے ڈیش بورڈ میں دستیاب رکھنے کے لیے آپ کو اسے فعال کرنا ہوگا۔
+JumpToBoxes=سیٹ اپ پر جائیں -> وجیٹس
+MeasuringUnitTypeDesc=یہاں ایک قدر استعمال کریں جیسے "سائز"، "سطح"، "حجم"، "وزن"، "وقت"
+MeasuringScaleDesc=پیمانہ ان جگہوں کی تعداد ہے جو آپ کو ڈیفالٹ ریفرنس یونٹ سے ملنے کے لیے اعشاریہ کے حصے کو منتقل کرنا ہے۔ "وقت" یونٹ کی قسم کے لیے، یہ سیکنڈوں کی تعداد ہے۔ 80 اور 99 کے درمیان کی قدریں محفوظ اقدار ہیں۔
+TemplateAdded=ٹیمپلیٹ شامل کیا گیا۔
+TemplateUpdated=ٹیمپلیٹ اپ ڈیٹ ہو گیا۔
+TemplateDeleted=سانچہ حذف کر دیا گیا۔
+MailToSendEventPush=ایونٹ کی یاد دہانی ای میل
+SwitchThisForABetterSecurity=مزید سیکیورٹی کے لیے اس قدر کو %s میں تبدیل کرنے کی سفارش کی جاتی ہے۔
+DictionaryProductNature= مصنوعات کی نوعیت
+CountryIfSpecificToOneCountry=ملک (اگر مخصوص ملک کے لیے مخصوص ہے)
+YouMayFindSecurityAdviceHere=آپ کو یہاں سیکورٹی ایڈوائزری مل سکتی ہے۔
+ModuleActivatedMayExposeInformation=یہ پی ایچ پی ایکسٹینشن حساس ڈیٹا کو بے نقاب کر سکتی ہے۔ اگر آپ کو اس کی ضرورت نہیں ہے تو اسے غیر فعال کریں۔
+ModuleActivatedDoNotUseInProduction=ترقی کے لیے ڈیزائن کردہ ایک ماڈیول کو فعال کر دیا گیا ہے۔ اسے پیداواری ماحول پر فعال نہ کریں۔
+CombinationsSeparator=پروڈکٹ کے امتزاج کے لیے الگ کرنے والا کریکٹر
+SeeLinkToOnlineDocumentation=مثالوں کے لیے ٹاپ مینو پر آن لائن دستاویزات کا لنک دیکھیں
+SHOW_SUBPRODUCT_REF_IN_PDF=اگر ماڈیول <b> %s </b> کی خصوصیت "%s" استعمال کی گئی ہے تو، PDF پر کٹ کے ذیلی مصنوعات کی تفصیلات دکھائیں۔
+AskThisIDToYourBank=یہ ID حاصل کرنے کے لیے اپنے بینک سے رابطہ کریں۔
+AdvancedModeOnly=اجازت صرف اعلیٰ اجازت کے موڈ میں دستیاب ہے۔
+ConfFileIsReadableOrWritableByAnyUsers=conf فائل کسی بھی صارف کے ذریعہ پڑھنے کے قابل یا قابل تحریر ہے۔ صرف ویب سرور صارف اور گروپ کو اجازت دیں۔
+MailToSendEventOrganization=ایونٹ آرگنائزیشن
+MailToPartnership=شراکت داری
+AGENDA_EVENT_DEFAULT_STATUS=فارم سے ایونٹ بناتے وقت ڈیفالٹ ایونٹ کی حیثیت
+YouShouldDisablePHPFunctions=آپ کو پی ایچ پی کے افعال کو غیر فعال کرنا چاہئے۔
+IfCLINotRequiredYouShouldDisablePHPFunctions=سوائے اس کے کہ اگر آپ کو کسٹم کوڈ میں سسٹم کمانڈ چلانے کی ضرورت ہو، تو آپ کو پی ایچ پی فنکشنز کو غیر فعال کرنا چاہیے۔
+PHPFunctionsRequiredForCLI=شیل مقصد کے لیے (جیسا کہ طے شدہ جاب بیک اپ کرنا یا اینی ٹیوورس پروگرام چلانا)، آپ کو پی ایچ پی کے افعال کو برقرار رکھنا چاہیے۔
+NoWritableFilesFoundIntoRootDir=آپ کی روٹ ڈائرکٹری (اچھی) میں عام پروگراموں کی کوئی قابل تحریر فائل یا ڈائرکٹری نہیں ملی
+RecommendedValueIs=تجویز کردہ: %s
+Recommended=تجویز کردہ
+NotRecommended=تجویز کردہ نہیں
+ARestrictedPath=کچھ محدود راستہ
+CheckForModuleUpdate=بیرونی ماڈیولز کی تازہ کاریوں کی جانچ کریں۔
+CheckForModuleUpdateHelp=یہ عمل بیرونی ماڈیولز کے ایڈیٹرز سے رابطہ کرے گا تاکہ یہ چیک کیا جا سکے کہ آیا کوئی نیا ورژن دستیاب ہے۔
+ModuleUpdateAvailable=ایک اپ ڈیٹ دستیاب ہے۔
+NoExternalModuleWithUpdate=بیرونی ماڈیولز کے لیے کوئی اپ ڈیٹ نہیں ملا
+SwaggerDescriptionFile=سویگر API تفصیل فائل (مثال کے طور پر redoc کے ساتھ استعمال کے لیے)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=آپ نے فرسودہ WS API کو فعال کیا۔ اس کے بجائے آپ کو REST API استعمال کرنا چاہیے۔
+RandomlySelectedIfSeveral=اگر متعدد تصاویر دستیاب ہوں تو تصادفی طور پر منتخب کریں۔
+DatabasePasswordObfuscated=ڈیٹا بیس کا پاس ورڈ conf فائل میں مبہم ہے۔
+DatabasePasswordNotObfuscated=ڈیٹا بیس کا پاس ورڈ conf فائل میں مبہم نہیں ہے۔
+APIsAreNotEnabled=APIs ماڈیولز فعال نہیں ہیں۔
+YouShouldSetThisToOff=آپ کو اسے 0 یا آف پر سیٹ کرنا چاہیے۔
+InstallAndUpgradeLockedBy=انسٹال اور اپ گریڈ فائل <b> %s </b> کے ذریعہ مقفل ہیں۔
+OldImplementation=پرانا عمل درآمد
+PDF_SHOW_LINK_TO_ONLINE_PAYMENT=اگر آن لائن ادائیگی کے کچھ ماڈیولز فعال ہیں (پے پال، پٹی، ...)، آن لائن ادائیگی کرنے کے لیے پی ڈی ایف پر ایک لنک شامل کریں۔
+DashboardDisableGlobal=کھلی اشیاء کے تمام انگوٹھوں کو عالمی سطح پر غیر فعال کریں۔
+BoxstatsDisableGlobal=مکمل طور پر باکس کے اعدادوشمار کو غیر فعال کریں۔
+DashboardDisableBlocks=مین ڈیش بورڈ پر کھلی اشیاء کے انگوٹھوں (کارروائی کے لیے یا دیر سے)
+DashboardDisableBlockAgenda=ایجنڈے کے لیے انگوٹھے کو غیر فعال کریں۔
+DashboardDisableBlockProject=منصوبوں کے لیے انگوٹھے کو غیر فعال کریں۔
+DashboardDisableBlockCustomer=صارفین کے لیے انگوٹھے کو غیر فعال کریں۔
+DashboardDisableBlockSupplier=سپلائرز کے لیے انگوٹھے کو غیر فعال کریں۔
+DashboardDisableBlockContract=معاہدوں کے لیے انگوٹھے کو غیر فعال کریں۔
+DashboardDisableBlockTicket=ٹکٹوں کے لیے انگوٹھے کو غیر فعال کریں۔
+DashboardDisableBlockBank=بینکوں کے لیے انگوٹھے کو غیر فعال کریں۔
+DashboardDisableBlockAdherent=رکنیت کے لیے انگوٹھے کو غیر فعال کریں۔
+DashboardDisableBlockExpenseReport=اخراجات کی رپورٹ کے لیے انگوٹھے کو غیر فعال کریں۔
+DashboardDisableBlockHoliday=پتیوں کے لیے انگوٹھے کو غیر فعال کریں۔
+EnabledCondition=فیلڈ کو فعال کرنے کی شرط (اگر فعال نہیں ہے تو، مرئیت ہمیشہ بند رہے گی)
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=اگر آپ دوسرا ٹیکس استعمال کرنا چاہتے ہیں، تو آپ کو پہلا سیل ٹیکس بھی فعال کرنا ہوگا۔
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=اگر آپ تیسرا ٹیکس استعمال کرنا چاہتے ہیں تو آپ کو پہلا سیل ٹیکس بھی فعال کرنا ہوگا۔
+LanguageAndPresentation=زبان اور پیشکش
+SkinAndColors=جلد اور رنگ
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=اگر آپ دوسرا ٹیکس استعمال کرنا چاہتے ہیں، تو آپ کو پہلا سیل ٹیکس بھی فعال کرنا ہوگا۔
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=اگر آپ تیسرا ٹیکس استعمال کرنا چاہتے ہیں تو آپ کو پہلا سیل ٹیکس بھی فعال کرنا ہوگا۔
+PDF_USE_1A=PDF/A-1b فارمیٹ کے ساتھ پی ڈی ایف بنائیں
+MissingTranslationForConfKey = %s کا ترجمہ غائب ہے۔
+NativeModules=مقامی ماڈیولز
+NoDeployedModulesFoundWithThisSearchCriteria=تلاش کے ان معیارات کے لیے کوئی ماڈیول نہیں ملا
+API_DISABLE_COMPRESSION=API جوابات کے کمپریشن کو غیر فعال کریں۔
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/ur_PK/agenda.lang b/htdocs/langs/ur_PK/agenda.lang
index db135467608..b1e31be983f 100644
--- a/htdocs/langs/ur_PK/agenda.lang
+++ b/htdocs/langs/ur_PK/agenda.lang
@@ -1,174 +1,174 @@
 # Dolibarr language file - Source file is en_US - agenda
-IdAgenda=ID event
-Actions=Events
-Agenda=Agenda
-TMenuAgenda=Agenda
-Agendas=Agendas
-LocalAgenda=Default calendar
-ActionsOwnedBy=Event owned by
-ActionsOwnedByShort=Owner
-AffectedTo=Assigned to
-Event=Event
-Events=Events
-EventsNb=Number of events
-ListOfActions=List of events
-EventReports=Event reports
-Location=Location
-ToUserOfGroup=Event assigned to any user in the group
-EventOnFullDay=Event on all day(s)
-MenuToDoActions=All incomplete events
-MenuDoneActions=All terminated events
-MenuToDoMyActions=My incomplete events
-MenuDoneMyActions=My terminated events
-ListOfEvents=List of events (default calendar)
-ActionsAskedBy=Events reported by
-ActionsToDoBy=Events assigned to
-ActionsDoneBy=Events done by
-ActionAssignedTo=Event assigned to
-ViewCal=Month view
-ViewDay=Day view
-ViewWeek=Week view
-ViewPerUser=Per user view
-ViewPerType=Per type view
-AutoActions= Automatic filling
-AgendaAutoActionDesc= Here you may define events which you want Dolibarr to create automatically  in Agenda. If nothing is checked, only manual actions will be included in logs and displayed in Agenda. Automatic tracking of business actions done on objects (validation, status change) will not be saved.
-AgendaSetupOtherDesc= This page provides options to allow the export of your Dolibarr events into an external calendar (Thunderbird, Google Calendar etc...)
-AgendaExtSitesDesc=This page allows to declare external sources of calendars to see their events into Dolibarr agenda.
-ActionsEvents=Events for which Dolibarr will create an action in agenda automatically
-EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
+IdAgenda=شناختی واقعہ
+Actions=تقریبات
+Agenda=ایجنڈا
+TMenuAgenda=ایجنڈا
+Agendas=ایجنڈا
+LocalAgenda=ڈیفالٹ کیلنڈر
+ActionsOwnedBy=ایونٹ کی ملکیت
+ActionsOwnedByShort=مالک
+AffectedTo=مقرر کیا، مقرر کرنا
+Event=تقریب
+Events=تقریبات
+EventsNb=واقعات کی تعداد
+ListOfActions=واقعات کی فہرست
+EventReports=واقعہ کی رپورٹس
+Location=مقام
+ToUserOfGroup=گروپ میں کسی بھی صارف کو تفویض کردہ ایونٹ
+EventOnFullDay=پورے دن کا واقعہ
+MenuToDoActions=تمام نامکمل واقعات
+MenuDoneActions=تمام ختم شدہ واقعات
+MenuToDoMyActions=میرے نامکمل واقعات
+MenuDoneMyActions=میرے ختم شدہ واقعات
+ListOfEvents=واقعات کی فہرست (پہلے سے طے شدہ کیلنڈر)
+ActionsAskedBy=واقعات کی اطلاع بذریعہ
+ActionsToDoBy=ایونٹس تفویض کیے گئے۔
+ActionsDoneBy=کے ذریعہ کئے گئے واقعات
+ActionAssignedTo=تقریب تفویض کی گئی۔
+ViewCal=مہینے کا نظارہ
+ViewDay=دن کا نظارہ
+ViewWeek=ہفتہ کا نظارہ
+ViewPerUser=فی صارف منظر
+ViewPerType=فی قسم کا نظارہ
+AutoActions= خودکار بھرنا
+AgendaAutoActionDesc= یہاں آپ ان واقعات کی وضاحت کر سکتے ہیں جو آپ چاہتے ہیں کہ ڈولیبر ایجنڈے میں خود بخود تخلیق کرے۔ اگر کچھ بھی چیک نہیں کیا گیا ہے، تو لاگز میں صرف دستی کارروائیاں شامل ہوں گی اور ایجنڈا میں دکھائی جائیں گی۔ اشیاء پر کی جانے والی کاروباری کارروائیوں کی خودکار ٹریکنگ (توثیق، حیثیت کی تبدیلی) کو محفوظ نہیں کیا جائے گا۔
+AgendaSetupOtherDesc= یہ صفحہ آپ کے Dolibarr ایونٹس کو بیرونی کیلنڈر (تھنڈر برڈ، گوگل کیلنڈر وغیرہ...) میں برآمد کرنے کی اجازت دینے کے اختیارات فراہم کرتا ہے۔
+AgendaExtSitesDesc=یہ صفحہ کیلنڈرز کے بیرونی ذرائع کا اعلان کرنے کی اجازت دیتا ہے تاکہ ان کے واقعات کو Dolibarr ایجنڈے میں دیکھا جا سکے۔
+ActionsEvents=ایسے واقعات جن کے لیے Dolibarr خود بخود ایجنڈے میں ایک ایکشن تشکیل دے گا۔
+EventRemindersByEmailNotEnabled=ای میل کے ذریعے ایونٹ کی یاد دہانیوں کو %s ماڈیول سیٹ اپ میں فعال نہیں کیا گیا تھا۔
 ##### Agenda event labels #####
-NewCompanyToDolibarr=Third party %s created
-COMPANY_MODIFYInDolibarr=Third party %s modified
-COMPANY_DELETEInDolibarr=Third party %s deleted
-ContractValidatedInDolibarr=Contract %s validated
-CONTRACT_DELETEInDolibarr=Contract %s deleted
-PropalClosedSignedInDolibarr=Proposal %s signed
-PropalClosedRefusedInDolibarr=Proposal %s refused
-PropalValidatedInDolibarr=Proposal %s validated
-PropalClassifiedBilledInDolibarr=Proposal %s classified billed
-InvoiceValidatedInDolibarr=Invoice %s validated
-InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
-InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status
-InvoiceDeleteDolibarr=Invoice %s deleted
-InvoicePaidInDolibarr=Invoice %s changed to paid
-InvoiceCanceledInDolibarr=Invoice %s canceled
-MemberValidatedInDolibarr=Member %s validated
-MemberModifiedInDolibarr=Member %s modified
-MemberResiliatedInDolibarr=Member %s terminated
-MemberDeletedInDolibarr=Member %s deleted
-MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
-MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
-MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
-ShipmentValidatedInDolibarr=Shipment %s validated
-ShipmentClassifyClosedInDolibarr=Shipment %s classified billed
-ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified re-open
-ShipmentBackToDraftInDolibarr=Shipment %s go back to draft status
-ShipmentDeletedInDolibarr=Shipment %s deleted
-ShipmentCanceledInDolibarr=Shipment %s canceled
-ReceptionValidatedInDolibarr=Reception %s validated
-OrderCreatedInDolibarr=Order %s created
-OrderValidatedInDolibarr=Order %s validated
-OrderDeliveredInDolibarr=Order %s classified delivered
-OrderCanceledInDolibarr=Order %s canceled
-OrderBilledInDolibarr=Order %s classified billed
-OrderApprovedInDolibarr=Order %s approved
-OrderRefusedInDolibarr=Order %s refused
-OrderBackToDraftInDolibarr=Order %s go back to draft status
-ProposalSentByEMail=Commercial proposal %s sent by email
-ContractSentByEMail=Contract %s sent by email
-OrderSentByEMail=Sales order %s sent by email
-InvoiceSentByEMail=Customer invoice %s sent by email
-SupplierOrderSentByEMail=Purchase order %s sent by email
-ORDER_SUPPLIER_DELETEInDolibarr=Purchase order %s deleted
-SupplierInvoiceSentByEMail=Vendor invoice %s sent by email
-ShippingSentByEMail=Shipment %s sent by email
-ShippingValidated= Shipment %s validated
-InterventionSentByEMail=Intervention %s sent by email
-ProposalDeleted=Proposal deleted
-OrderDeleted=Order deleted
-InvoiceDeleted=Invoice deleted
-DraftInvoiceDeleted=Draft invoice deleted
-CONTACT_CREATEInDolibarr=Contact %s created
-CONTACT_MODIFYInDolibarr=Contact %s modified
-CONTACT_DELETEInDolibarr=Contact %s deleted
-PRODUCT_CREATEInDolibarr=Product %s created
-PRODUCT_MODIFYInDolibarr=Product %s modified
-PRODUCT_DELETEInDolibarr=Product %s deleted
-HOLIDAY_CREATEInDolibarr=Request for leave %s created
-HOLIDAY_MODIFYInDolibarr=Request for leave %s modified
-HOLIDAY_APPROVEInDolibarr=Request for leave %s approved
-HOLIDAY_VALIDATEInDolibarr=Request for leave %s validated
-HOLIDAY_DELETEInDolibarr=Request for leave %s deleted
-EXPENSE_REPORT_CREATEInDolibarr=Expense report %s created
-EXPENSE_REPORT_VALIDATEInDolibarr=Expense report %s validated
-EXPENSE_REPORT_APPROVEInDolibarr=Expense report %s approved
-EXPENSE_REPORT_DELETEInDolibarr=Expense report %s deleted
-EXPENSE_REPORT_REFUSEDInDolibarr=Expense report %s refused
-PROJECT_CREATEInDolibarr=Project %s created
-PROJECT_MODIFYInDolibarr=Project %s modified
-PROJECT_DELETEInDolibarr=Project %s deleted
-TICKET_CREATEInDolibarr=Ticket %s created
-TICKET_MODIFYInDolibarr=Ticket %s modified
-TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
-TICKET_CLOSEInDolibarr=Ticket %s closed
-TICKET_DELETEInDolibarr=Ticket %s deleted
-BOM_VALIDATEInDolibarr=BOM validated
-BOM_UNVALIDATEInDolibarr=BOM unvalidated
-BOM_CLOSEInDolibarr=BOM disabled
-BOM_REOPENInDolibarr=BOM reopen
-BOM_DELETEInDolibarr=BOM deleted
-MRP_MO_VALIDATEInDolibarr=MO validated
-MRP_MO_UNVALIDATEInDolibarr=MO set to draft status
-MRP_MO_PRODUCEDInDolibarr=MO produced
-MRP_MO_DELETEInDolibarr=MO deleted
-MRP_MO_CANCELInDolibarr=MO canceled
-PAIDInDolibarr=%s paid
+NewCompanyToDolibarr=تیسری پارٹی %s بنائی گئی۔
+COMPANY_MODIFYInDolibarr=فریق ثالث %s میں ترمیم کی گئی۔
+COMPANY_DELETEInDolibarr=فریق ثالث %s حذف کر دیا گیا۔
+ContractValidatedInDolibarr=معاہدہ %s کی توثیق ہو گئی۔
+CONTRACT_DELETEInDolibarr=معاہدہ %s حذف کر دیا گیا۔
+PropalClosedSignedInDolibarr=تجویز %s پر دستخط کیے گئے۔
+PropalClosedRefusedInDolibarr=تجویز %s سے انکار کر دیا گیا۔
+PropalValidatedInDolibarr=تجویز %s کی توثیق کر دی گئی۔
+PropalClassifiedBilledInDolibarr=تجویز %s کلاسیفائیڈ بل
+InvoiceValidatedInDolibarr=انوائس %s کی توثیق ہو گئی۔
+InvoiceValidatedInDolibarrFromPos=انوائس %s POS سے تصدیق شدہ
+InvoiceBackToDraftInDolibarr=انوائس %s ڈرافٹ اسٹیٹس پر واپس جائیں۔
+InvoiceDeleteDolibarr=انوائس %s حذف کر دیا گیا۔
+InvoicePaidInDolibarr=انوائس %s ادائیگی میں تبدیل ہو گئی۔
+InvoiceCanceledInDolibarr=انوائس %s منسوخ کر دیا گیا۔
+MemberValidatedInDolibarr=ممبر %s کی توثیق کر دی گئی۔
+MemberModifiedInDolibarr=ممبر %s میں ترمیم کی گئی۔
+MemberResiliatedInDolibarr=رکن %s ختم کر دیا گیا۔
+MemberDeletedInDolibarr=رکن %s حذف کر دیا گیا۔
+MemberSubscriptionAddedInDolibarr=رکن %s کے لیے رکنیت %s شامل کی گئی
+MemberSubscriptionModifiedInDolibarr=رکن %s کے لیے سبسکرپشن %s میں ترمیم کی گئی
+MemberSubscriptionDeletedInDolibarr=رکن %s کی رکنیت %s کو حذف کر دیا گیا
+ShipmentValidatedInDolibarr=کھیپ %s کی توثیق کر دی گئی۔
+ShipmentClassifyClosedInDolibarr=کھیپ %s درجہ بند بل
+ShipmentUnClassifyCloseddInDolibarr=کھیپ %s دوبارہ کھولنے کی درجہ بندی
+ShipmentBackToDraftInDolibarr=کھیپ %s ڈرافٹ اسٹیٹس پر واپس جائیں۔
+ShipmentDeletedInDolibarr=کھیپ %s حذف کر دی گئی۔
+ShipmentCanceledInDolibarr=کھیپ %s منسوخ کر دی گئی۔
+ReceptionValidatedInDolibarr=استقبالیہ %s توثیق شدہ
+OrderCreatedInDolibarr=آرڈر %s بنایا گیا۔
+OrderValidatedInDolibarr=آرڈر %s کی توثیق ہو گئی۔
+OrderDeliveredInDolibarr=آرڈر %s کلاسیفائیڈ ڈیلیور کر دیا گیا۔
+OrderCanceledInDolibarr=آرڈر %s منسوخ کر دیا گیا۔
+OrderBilledInDolibarr=آرڈر %s کلاسیفائیڈ بل کے ساتھ
+OrderApprovedInDolibarr=آرڈر %s منظور کر لیا گیا۔
+OrderRefusedInDolibarr=آرڈر %s سے انکار کر دیا گیا۔
+OrderBackToDraftInDolibarr=آرڈر %s ڈرافٹ اسٹیٹس پر واپس جائیں۔
+ProposalSentByEMail=تجارتی تجویز %s ای میل کے ذریعے بھیجی گئی۔
+ContractSentByEMail=معاہدہ %s ای میل کے ذریعے بھیجا گیا۔
+OrderSentByEMail=سیلز آرڈر %s ای میل کے ذریعے بھیجا گیا۔
+InvoiceSentByEMail=کسٹمر انوائس %s ای میل کے ذریعے بھیجا گیا۔
+SupplierOrderSentByEMail=خریداری کا آرڈر %s ای میل کے ذریعے بھیجا گیا ہے۔
+ORDER_SUPPLIER_DELETEInDolibarr=خریداری کا آرڈر %s حذف کر دیا گیا۔
+SupplierInvoiceSentByEMail=وینڈر انوائس %s ای میل کے ذریعے بھیجا گیا۔
+ShippingSentByEMail=کھیپ %s ای میل کے ذریعے بھیجی گئی۔
+ShippingValidated= کھیپ %s کی توثیق کر دی گئی۔
+InterventionSentByEMail=مداخلت %s ای میل کے ذریعے بھیجی گئی۔
+ProposalDeleted=تجویز حذف کر دی گئی۔
+OrderDeleted=آرڈر حذف کر دیا گیا۔
+InvoiceDeleted=رسید حذف کر دی گئی۔
+DraftInvoiceDeleted=انوائس کا مسودہ حذف کر دیا گیا۔
+CONTACT_CREATEInDolibarr=رابطہ %s بنایا گیا۔
+CONTACT_MODIFYInDolibarr=رابطہ کریں %s ترمیم شدہ
+CONTACT_DELETEInDolibarr=رابطہ %s حذف کر دیا گیا۔
+PRODUCT_CREATEInDolibarr=پروڈکٹ %s بنائی گئی۔
+PRODUCT_MODIFYInDolibarr=پروڈکٹ %s میں ترمیم کی گئی۔
+PRODUCT_DELETEInDolibarr=پروڈکٹ %s کو حذف کر دیا گیا۔
+HOLIDAY_CREATEInDolibarr=چھٹی کی درخواست %s بنائی گئی۔
+HOLIDAY_MODIFYInDolibarr=چھٹی کی درخواست %s میں ترمیم کی گئی۔
+HOLIDAY_APPROVEInDolibarr=چھٹی کی درخواست %s منظور کر لی گئی۔
+HOLIDAY_VALIDATEInDolibarr=چھٹی کی درخواست %s کی توثیق ہو گئی۔
+HOLIDAY_DELETEInDolibarr=چھٹی کی درخواست %s حذف کر دی گئی۔
+EXPENSE_REPORT_CREATEInDolibarr=اخراجات کی رپورٹ %s بنائی گئی۔
+EXPENSE_REPORT_VALIDATEInDolibarr=اخراجات کی رپورٹ %s کی توثیق کی گئی۔
+EXPENSE_REPORT_APPROVEInDolibarr=اخراجات کی رپورٹ %s منظور کر لی گئی۔
+EXPENSE_REPORT_DELETEInDolibarr=اخراجات کی رپورٹ %s حذف کر دی گئی۔
+EXPENSE_REPORT_REFUSEDInDolibarr=اخراجات کی رپورٹ %s سے انکار کر دیا گیا۔
+PROJECT_CREATEInDolibarr=پروجیکٹ %s بنایا گیا۔
+PROJECT_MODIFYInDolibarr=پروجیکٹ %s میں ترمیم کی گئی۔
+PROJECT_DELETEInDolibarr=پروجیکٹ %s حذف کر دیا گیا۔
+TICKET_CREATEInDolibarr=ٹکٹ %s بن گیا۔
+TICKET_MODIFYInDolibarr=ٹکٹ %s میں ترمیم کی گئی۔
+TICKET_ASSIGNEDInDolibarr=ٹکٹ %s تفویض کر دیا گیا۔
+TICKET_CLOSEInDolibarr=ٹکٹ %s بند
+TICKET_DELETEInDolibarr=ٹکٹ %s حذف کر دیا گیا۔
+BOM_VALIDATEInDolibarr=BOM کی تصدیق ہو گئی۔
+BOM_UNVALIDATEInDolibarr=BOM غیر تصدیق شدہ
+BOM_CLOSEInDolibarr=BOM غیر فعال
+BOM_REOPENInDolibarr=BOM دوبارہ کھلا۔
+BOM_DELETEInDolibarr=BOM حذف کر دیا گیا۔
+MRP_MO_VALIDATEInDolibarr=MO کی توثیق کی گئی۔
+MRP_MO_UNVALIDATEInDolibarr=MO کو مسودہ کی حیثیت پر سیٹ کیا گیا ہے۔
+MRP_MO_PRODUCEDInDolibarr=MO نے تیار کیا۔
+MRP_MO_DELETEInDolibarr=MO حذف کر دیا گیا۔
+MRP_MO_CANCELInDolibarr=MO منسوخ کر دیا گیا۔
+PAIDInDolibarr=%s ادا کیا گیا۔
 ##### End agenda events #####
-AgendaModelModule=Document templates for event
-DateActionStart=Start date
-DateActionEnd=End date
-AgendaUrlOptions1=You can also add following parameters to filter output:
-AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
-AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
-AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
-AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
-AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic events.
-AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
-AgendaShowBirthdayEvents=Birthdays of contacts
-AgendaHideBirthdayEvents=Hide birthdays of contacts
-Busy=Busy
-ExportDataset_event1=List of agenda events
-DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
-DefaultWorkingHours=Default working hours in day (Example: 9-18)
+AgendaModelModule=تقریب کے لیے دستاویز کے سانچے
+DateActionStart=شروع کرنے کی تاریخ
+DateActionEnd=آخری تاریخ
+AgendaUrlOptions1=آپ فلٹر آؤٹ پٹ میں درج ذیل پیرامیٹرز بھی شامل کر سکتے ہیں:
+AgendaUrlOptions3= <b> logina=%s </b> آؤٹ پٹ کو کسی صارف کی ملکیت والی کارروائیوں تک محدود کرنے کے لیے
+AgendaUrlOptionsNotAdmin= <b> logina=!%s </b> آؤٹ پٹ کو ان کارروائیوں تک محدود کرنے کے لیے جو صارف کی ملکیت نہیں ہیں
+AgendaUrlOptions4= <b> logint=%s </b> صارف کو تفویض کردہ کارروائیوں تک آؤٹ پٹ کو محدود کرنے کے لیے
+AgendaUrlOptionsProject= <b> پروجیکٹ=__PROJECT_ID__ </b> پروجیکٹ سے منسلک کارروائیوں تک آؤٹ پٹ کو محدود کرنے کے لیے <b> __PROJECT_ID__ </b> ۔
+AgendaUrlOptionsNotAutoEvent= <b> notactiontype=systemauto </b> خودکار واقعات کو خارج کرنے کے لیے۔
+AgendaUrlOptionsIncludeHolidays= <b> includeholidays=1 </b> تعطیلات کے واقعات شامل کرنے کے لیے
+AgendaShowBirthdayEvents=رابطوں کی سالگرہ
+AgendaHideBirthdayEvents=رابطوں کی سالگرہ چھپائیں۔
+Busy=مصروف
+ExportDataset_event1=ایجنڈے کے واقعات کی فہرست
+DefaultWorkingDays=پہلے سے طے شدہ کام کے دنوں کی حد ہفتے میں ہوتی ہے (مثال: 1-5، 1-6)
+DefaultWorkingHours=دن میں کام کے پہلے سے طے شدہ گھنٹے (مثال: 9-18)
 # External Sites ical
-ExportCal=Export calendar
-ExtSites=Import external calendars
-ExtSitesEnableThisTool=Show external calendars (defined in global setup) in Agenda. Does not affect external calendars defined by users.
-ExtSitesNbOfAgenda=Number of calendars
-AgendaExtNb=Calendar no. %s
-ExtSiteUrlAgenda=URL to access .ical file
-ExtSiteNoLabel=No Description
-VisibleTimeRange=Visible time range
-VisibleDaysRange=Visible days range
-AddEvent=Create event
-MyAvailability=My availability
-ActionType=Event type
-DateActionBegin=Start event date
-ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b>?
-RepeatEvent=Repeat event
-OnceOnly=Once only
-EveryWeek=Every week
-EveryMonth=Every month
-DayOfMonth=Day of month
-DayOfWeek=Day of week
-DateStartPlusOne=Date start + 1 hour
-SetAllEventsToTodo=Set all events to todo
-SetAllEventsToInProgress=Set all events to in progress
-SetAllEventsToFinished=Set all events to finished
-ReminderTime=Reminder period before the event
-TimeType=Duration type
-ReminderType=Callback type
-AddReminder=Create an automatic reminder notification for this event
-ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Popup Notification
-ActiveByDefault=Enabled by default
+ExportCal=کیلنڈر برآمد کریں۔
+ExtSites=بیرونی کیلنڈرز درآمد کریں۔
+ExtSitesEnableThisTool=ایجنڈا میں بیرونی کیلنڈرز (عالمی سیٹ اپ میں بیان کردہ) دکھائیں۔ صارفین کے ذریعہ بیان کردہ بیرونی کیلنڈرز کو متاثر نہیں کرتا ہے۔
+ExtSitesNbOfAgenda=کیلنڈرز کی تعداد
+AgendaExtNb=کیلنڈر نمبر %s
+ExtSiteUrlAgenda=.ical فائل تک رسائی کے لیے URL
+ExtSiteNoLabel=کوئی وضاحت نہیں
+VisibleTimeRange=مرئی وقت کی حد
+VisibleDaysRange=مرئی دنوں کی حد
+AddEvent=ایونٹ بنائیں
+MyAvailability=میری دستیابی
+ActionType=واقعہ کی قسم
+DateActionBegin=ایونٹ کی تاریخ شروع کریں۔
+ConfirmCloneEvent=کیا آپ واقعی <b> %s </b> ایونٹ کا کلون کرنا چاہتے ہیں؟
+RepeatEvent=واقعہ کو دہرائیں۔
+OnceOnly=صرف ایک بار
+EveryWeek=ہر ہفتے
+EveryMonth=ہر مہینے
+DayOfMonth=مہینے کا دن
+DayOfWeek=ہفتے کا دن
+DateStartPlusOne=شروع ہونے کی تاریخ + 1 گھنٹہ
+SetAllEventsToTodo=تمام ایونٹس کو ٹوڈو پر سیٹ کریں۔
+SetAllEventsToInProgress=تمام واقعات کو پیشرفت پر سیٹ کریں۔
+SetAllEventsToFinished=تمام واقعات کو ختم ہونے پر سیٹ کریں۔
+ReminderTime=ایونٹ سے پہلے یاد دہانی کی مدت
+TimeType=دورانیہ کی قسم
+ReminderType=کال بیک کی قسم
+AddReminder=اس ایونٹ کے لیے ایک خودکار یاد دہانی کی اطلاع بنائیں
+ErrorReminderActionCommCreation=اس ایونٹ کے لیے یاد دہانی کی اطلاع بنانے میں خرابی۔
+BrowserPush=براؤزر پاپ اپ نوٹیفکیشن
+ActiveByDefault=بطور ڈیفالٹ فعال
diff --git a/htdocs/langs/ur_PK/assets.lang b/htdocs/langs/ur_PK/assets.lang
index afafc98503f..7babde2f017 100644
--- a/htdocs/langs/ur_PK/assets.lang
+++ b/htdocs/langs/ur_PK/assets.lang
@@ -16,52 +16,52 @@
 #
 # Generic
 #
-Assets = Assets
-NewAsset = New asset
-AccountancyCodeAsset = Accounting code (asset)
-AccountancyCodeDepreciationAsset = Accounting code (depreciation asset account)
-AccountancyCodeDepreciationExpense = Accounting code (depreciation expense account)
-NewAssetType=New asset type
-AssetsTypeSetup=Asset type setup
-AssetTypeModified=Asset type modified
-AssetType=Asset type
-AssetsLines=Assets
-DeleteType=Delete
-DeleteAnAssetType=Delete an asset type
-ConfirmDeleteAssetType=Are you sure you want to delete this asset type?
-ShowTypeCard=Show type '%s'
+Assets = اثاثے
+NewAsset = نیا اثاثہ
+AccountancyCodeAsset = اکاؤنٹنگ کوڈ (اثاثہ)
+AccountancyCodeDepreciationAsset = اکاؤنٹنگ کوڈ (فرسودگی اثاثہ اکاؤنٹ)
+AccountancyCodeDepreciationExpense = اکاؤنٹنگ کوڈ (فرسودگی کے اخراجات کا اکاؤنٹ)
+NewAssetType=اثاثہ کی نئی قسم
+AssetsTypeSetup=اثاثہ کی قسم کا سیٹ اپ
+AssetTypeModified=اثاثہ کی قسم میں ترمیم کی گئی۔
+AssetType=اثاثہ کی قسم
+AssetsLines=اثاثے
+DeleteType=حذف کریں۔
+DeleteAnAssetType=اثاثہ کی قسم کو حذف کریں۔
+ConfirmDeleteAssetType=کیا آپ واقعی اس اثاثہ کی قسم کو حذف کرنا چاہتے ہیں؟
+ShowTypeCard=قسم '%s' دکھائیں
 
 # Module label 'ModuleAssetsName'
-ModuleAssetsName = Assets
+ModuleAssetsName = اثاثے
 # Module description 'ModuleAssetsDesc'
-ModuleAssetsDesc = Assets description
+ModuleAssetsDesc = اثاثوں کی تفصیل
 
 #
 # Admin page
 #
-AssetsSetup = Assets setup
-Settings = Settings
-AssetsSetupPage = Assets setup page
-ExtraFieldsAssetsType = Complementary attributes (Asset type)
-AssetsType=Asset type
-AssetsTypeId=Asset type id
-AssetsTypeLabel=Asset type label
-AssetsTypes=Assets types
+AssetsSetup = اثاثوں کا سیٹ اپ
+Settings = ترتیبات
+AssetsSetupPage = اثاثوں کا سیٹ اپ صفحہ
+ExtraFieldsAssetsType = تکمیلی صفات (اثاثہ کی قسم)
+AssetsType=اثاثہ کی قسم
+AssetsTypeId=اثاثہ کی قسم کی شناخت
+AssetsTypeLabel=اثاثہ کی قسم کا لیبل
+AssetsTypes=اثاثوں کی اقسام
 
 #
 # Menu
 #
-MenuAssets = Assets
-MenuNewAsset = New asset
-MenuTypeAssets = Type assets
-MenuListAssets = List
-MenuNewTypeAssets = New
-MenuListTypeAssets = List
+MenuAssets = اثاثے
+MenuNewAsset = نیا اثاثہ
+MenuTypeAssets = اثاثوں کی قسم
+MenuListAssets = فہرست
+MenuNewTypeAssets = نئی
+MenuListTypeAssets = فہرست
 
 #
 # Module
 #
-Asset=Asset
-NewAssetType=New asset type
-NewAsset=New asset
-ConfirmDeleteAsset=Are you sure you want to delete this asset ?
+Asset=اثاثہ
+NewAssetType=اثاثہ کی نئی قسم
+NewAsset=نیا اثاثہ
+ConfirmDeleteAsset=کیا آپ واقعی اس اثاثہ کو حذف کرنا چاہتے ہیں؟
diff --git a/htdocs/langs/ur_PK/banks.lang b/htdocs/langs/ur_PK/banks.lang
index f066877f676..03be017e754 100644
--- a/htdocs/langs/ur_PK/banks.lang
+++ b/htdocs/langs/ur_PK/banks.lang
@@ -1,184 +1,184 @@
 # Dolibarr language file - Source file is en_US - banks
-Bank=Bank
-MenuBankCash=Banks | Cash
-MenuVariousPayment=Miscellaneous payments
-MenuNewVariousPayment=New Miscellaneous payment
-BankName=Bank name
-FinancialAccount=Account
-BankAccount=Bank account
-BankAccounts=Bank accounts
-BankAccountsAndGateways=Bank accounts | Gateways
-ShowAccount=Show Account
-AccountRef=Financial account ref
-AccountLabel=Financial account label
-CashAccount=Cash account
-CashAccounts=Cash accounts
-CurrentAccounts=Current accounts
-SavingAccounts=Savings accounts
-ErrorBankLabelAlreadyExists=Financial account label already exists
-BankBalance=Balance
-BankBalanceBefore=Balance before
-BankBalanceAfter=Balance after
-BalanceMinimalAllowed=Minimum allowed balance
-BalanceMinimalDesired=Minimum desired balance
-InitialBankBalance=Initial balance
-EndBankBalance=End balance
-CurrentBalance=Current balance
-FutureBalance=Future balance
-ShowAllTimeBalance=Show balance from start
-AllTime=From start
-Reconciliation=Reconciliation
-RIB=Bank Account Number
-IBAN=IBAN number
-BIC=BIC/SWIFT code
-SwiftValid=BIC/SWIFT valid
-SwiftNotValid=BIC/SWIFT not valid
-IbanValid=BAN valid
-IbanNotValid=BAN not valid
-StandingOrders=Direct debit orders
-StandingOrder=Direct debit order
-PaymentByDirectDebit=Payment by direct debit
-PaymentByBankTransfers=Payments by credit transfer
-PaymentByBankTransfer=Payment by credit transfer
-AccountStatement=Account statement
-AccountStatementShort=Statement
-AccountStatements=Account statements
-LastAccountStatements=Last account statements
-IOMonthlyReporting=Monthly reporting
-BankAccountDomiciliation=Bank address
-BankAccountCountry=Account country
-BankAccountOwner=Account owner name
-BankAccountOwnerAddress=Account owner address
-CreateAccount=Create account
-NewBankAccount=New account
-NewFinancialAccount=New financial account
-MenuNewFinancialAccount=New financial account
-EditFinancialAccount=Edit account
-LabelBankCashAccount=Bank or cash label
-AccountType=Account type
-BankType0=Savings account
-BankType1=Current or credit card account
-BankType2=Cash account
-AccountsArea=Accounts area
-AccountCard=Account card
-DeleteAccount=Delete account
-ConfirmDeleteAccount=Are you sure you want to delete this account?
-Account=Account
-BankTransactionByCategories=Bank entries by categories
-BankTransactionForCategory=Bank entries for category <b>%s</b>
-RemoveFromRubrique=Remove link with category
-RemoveFromRubriqueConfirm=Are you sure you want to remove link between the entry and the category?
-ListBankTransactions=List of bank entries
-IdTransaction=Transaction ID
-BankTransactions=Bank entries
-BankTransaction=Bank entry
-ListTransactions=List entries
-ListTransactionsByCategory=List entries/category
-TransactionsToConciliate=Entries to reconcile
-TransactionsToConciliateShort=To reconcile
-Conciliable=Can be reconciled
-Conciliate=Reconcile
-Conciliation=Reconciliation
-SaveStatementOnly=Save statement only
-ReconciliationLate=Reconciliation late
-IncludeClosedAccount=Include closed accounts
-OnlyOpenedAccount=Only open accounts
-AccountToCredit=Account to credit
-AccountToDebit=Account to debit
-DisableConciliation=Disable reconciliation feature for this account
-ConciliationDisabled=Reconciliation feature disabled
-LinkedToAConciliatedTransaction=Linked to a conciliated entry
-StatusAccountOpened=Open
-StatusAccountClosed=Closed
-AccountIdShort=Number
-LineRecord=Transaction
-AddBankRecord=Add entry
-AddBankRecordLong=Add entry manually
-Conciliated=Reconciled
-ConciliatedBy=Reconciled by
-DateConciliating=Reconcile date
-BankLineConciliated=Entry reconciled with bank receipt
-Reconciled=Reconciled
-NotReconciled=Not reconciled
-CustomerInvoicePayment=Customer payment
-SupplierInvoicePayment=Vendor payment
-SubscriptionPayment=Subscription payment
-WithdrawalPayment=Debit payment order
-SocialContributionPayment=Social/fiscal tax payment
-BankTransfer=Credit transfer
-BankTransfers=Credit transfers
-MenuBankInternalTransfer=Internal transfer
-TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
-TransferFrom=From
-TransferTo=To
-TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
-CheckTransmitter=Sender
-ValidateCheckReceipt=Validate this check receipt?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
-DeleteCheckReceipt=Delete this check receipt?
-ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
-BankChecks=Bank checks
-BankChecksToReceipt=Checks awaiting deposit
-BankChecksToReceiptShort=Checks awaiting deposit
-ShowCheckReceipt=Show check deposit receipt
-NumberOfCheques=No. of check
-DeleteTransaction=Delete entry
-ConfirmDeleteTransaction=Are you sure you want to delete this entry?
-ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
-BankMovements=Movements
-PlannedTransactions=Planned entries
-Graph=Graphs
-ExportDataset_banque_1=Bank entries and account statement
-ExportDataset_banque_2=Deposit slip
-TransactionOnTheOtherAccount=Transaction on the other account
-PaymentNumberUpdateSucceeded=Payment number updated successfully
-PaymentNumberUpdateFailed=Payment number could not be updated
-PaymentDateUpdateSucceeded=Payment date updated successfully
-PaymentDateUpdateFailed=Payment date could not be updated
-Transactions=Transactions
-BankTransactionLine=Bank entry
-AllAccounts=All bank and cash accounts
-BackToAccount=Back to account
-ShowAllAccounts=Show for all accounts
-FutureTransaction=Future transaction. Unable to reconcile.
-SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
-EventualyAddCategory=Eventually, specify a category in which to classify the records
-ToConciliate=To reconcile?
-ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
-DefaultRIB=Default BAN
-AllRIB=All BAN
-LabelRIB=BAN Label
-NoBANRecord=No BAN record
-DeleteARib=Delete BAN record
-ConfirmDeleteRib=Are you sure you want to delete this BAN record?
-RejectCheck=Check returned
-ConfirmRejectCheck=Are you sure you want to mark this check as rejected?
-RejectCheckDate=Date the check was returned
-CheckRejected=Check returned
-CheckRejectedAndInvoicesReopened=Check returned and invoices re-open
-BankAccountModelModule=Document templates for bank accounts
-DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
-DocumentModelBan=Template to print a page with BAN information.
-NewVariousPayment=New miscellaneous payment
-VariousPayment=Miscellaneous payment
-VariousPayments=Miscellaneous payments
-ShowVariousPayment=Show miscellaneous payment
-AddVariousPayment=Add miscellaneous payment
-VariousPaymentId=Miscellaneous payment ID
-VariousPaymentLabel=Miscellaneous payment label
-ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
-SEPAMandate=SEPA mandate
-YourSEPAMandate=Your SEPA mandate
-FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
-AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
-CashControl=POS cash desk control
-NewCashFence=New cash desk opening or closing
-BankColorizeMovement=Colorize movements
-BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
-BankColorizeMovementName1=Background color for debit movement
-BankColorizeMovementName2=Background color for credit movement
-IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
-NoBankAccountDefined=No bank account defined
-NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
-AlreadyOneBankAccount=Already one bank account defined
+Bank=بینک
+MenuBankCash=بینک | نقد
+MenuVariousPayment=متفرق ادائیگیاں
+MenuNewVariousPayment=نئی متفرق ادائیگی
+BankName=بینک کا نام
+FinancialAccount=کھاتہ
+BankAccount=بینک اکاؤنٹ
+BankAccounts=بینک اکاؤنٹ
+BankAccountsAndGateways=بینک اکاؤنٹس | گیٹ ویز
+ShowAccount=اکاؤنٹ دکھائیں۔
+AccountRef=مالیاتی اکاؤنٹ کا حوالہ
+AccountLabel=مالیاتی اکاؤنٹ کا لیبل
+CashAccount=کیش اکاؤنٹ
+CashAccounts=کیش اکاؤنٹس
+CurrentAccounts=موجودہ کھاتہ
+SavingAccounts=بچت اکاؤنٹس
+ErrorBankLabelAlreadyExists=مالیاتی اکاؤنٹ کا لیبل پہلے سے موجود ہے۔
+BankBalance=بقیہ
+BankBalanceBefore=پہلے بیلنس
+BankBalanceAfter=کے بعد بیلنس
+BalanceMinimalAllowed=کم از کم اجازت شدہ بیلنس
+BalanceMinimalDesired=کم از کم مطلوبہ بیلنس
+InitialBankBalance=ابتدائی بیلنس
+EndBankBalance=بیلنس ختم کریں۔
+CurrentBalance=موجودہ توازن
+FutureBalance=مستقبل کا توازن
+ShowAllTimeBalance=شروع سے توازن دکھائیں۔
+AllTime=شروع سے
+Reconciliation=مفاہمت
+RIB=بینک اکاؤنٹ نمبر
+IBAN=IBAN نمبر
+BIC=BIC/SWIFT کوڈ
+SwiftValid=BIC/SWIFT درست
+SwiftNotValid=BIC/SWIFT درست نہیں ہے۔
+IbanValid=BAN درست ہے۔
+IbanNotValid=BAN درست نہیں ہے۔
+StandingOrders=براہ راست ڈیبٹ آرڈرز
+StandingOrder=براہ راست ڈیبٹ آرڈر
+PaymentByDirectDebit=براہ راست ڈیبٹ کے ذریعے ادائیگی
+PaymentByBankTransfers=کریڈٹ ٹرانسفر کے ذریعے ادائیگی
+PaymentByBankTransfer=کریڈٹ ٹرانسفر کے ذریعے ادائیگی
+AccountStatement=اکاؤنٹ اسٹیٹمنٹ
+AccountStatementShort=بیان
+AccountStatements=اکاؤنٹ کے بیانات
+LastAccountStatements=اکاؤنٹ کے آخری بیانات
+IOMonthlyReporting=ماہانہ رپورٹنگ
+BankAccountDomiciliation=بینک کا پتہ
+BankAccountCountry=اکاؤنٹ ملک
+BankAccountOwner=اکاؤنٹ کے مالک کا نام
+BankAccountOwnerAddress=اکاؤنٹ کے مالک کا پتہ
+CreateAccount=اکاؤنٹ بنائیں
+NewBankAccount=نیا کھاتہ
+NewFinancialAccount=نیا مالیاتی اکاؤنٹ
+MenuNewFinancialAccount=نیا مالیاتی اکاؤنٹ
+EditFinancialAccount=اکاؤنٹ میں ترمیم کریں۔
+LabelBankCashAccount=بینک یا کیش لیبل
+AccountType=اکاؤنٹ کی اقسام
+BankType0=بچت اکاونٹ
+BankType1=کرنٹ یا کریڈٹ کارڈ اکاؤنٹ
+BankType2=کیش اکاؤنٹ
+AccountsArea=اکاؤنٹس کا علاقہ
+AccountCard=اکاؤنٹ کارڈ
+DeleteAccount=کھاتہ مٹا دو
+ConfirmDeleteAccount=کیا آپ واقعی اس اکاؤنٹ کو حذف کرنا چاہتے ہیں؟
+Account=کھاتہ
+BankTransactionByCategories=زمرہ جات کے لحاظ سے بینک اندراجات
+BankTransactionForCategory=زمرہ <b> %s </b> کے لیے بینک اندراجات
+RemoveFromRubrique=زمرہ کے ساتھ لنک کو ہٹا دیں۔
+RemoveFromRubriqueConfirm=کیا آپ واقعی اندراج اور زمرہ کے درمیان لنک کو ہٹانا چاہتے ہیں؟
+ListBankTransactions=بینک اندراجات کی فہرست
+IdTransaction=ٹرانزیکشن ID
+BankTransactions=بینک اندراجات
+BankTransaction=بینک میں داخلہ
+ListTransactions=فہرست اندراجات
+ListTransactionsByCategory=فہرست اندراجات/زمرہ
+TransactionsToConciliate=مفاہمت کے لیے اندراجات
+TransactionsToConciliateShort=مصالحت کرنا
+Conciliable=صلح ہو سکتی ہے۔
+Conciliate=صلح کرنا
+Conciliation=مفاہمت
+SaveStatementOnly=صرف بیان کو محفوظ کریں۔
+ReconciliationLate=مفاہمت دیر سے
+IncludeClosedAccount=بند اکاؤنٹس شامل کریں۔
+OnlyOpenedAccount=صرف اکاؤنٹس کھولیں۔
+AccountToCredit=کریڈٹ کے لیے اکاؤنٹ
+AccountToDebit=ڈیبٹ کرنے کے لیے اکاؤنٹ
+DisableConciliation=اس اکاؤنٹ کے لیے مفاہمت کی خصوصیت کو غیر فعال کریں۔
+ConciliationDisabled=مفاہمت کی خصوصیت غیر فعال ہے۔
+LinkedToAConciliatedTransaction=ایک متفقہ اندراج سے منسلک
+StatusAccountOpened=کھولیں۔
+StatusAccountClosed=بند
+AccountIdShort=نمبر
+LineRecord=لین دین
+AddBankRecord=اندراج شامل کریں۔
+AddBankRecordLong=دستی طور پر اندراج شامل کریں۔
+Conciliated=صلح کر لی
+ConciliatedBy=کی طرف سے مصالحت
+DateConciliating=مصالحت کی تاریخ
+BankLineConciliated=اندراج بینک کی رسید کے ساتھ ہم آہنگ
+Reconciled=صلح کر لی
+NotReconciled=صلح نہیں ہوئی۔
+CustomerInvoicePayment=گاہک کی ادائیگی
+SupplierInvoicePayment=وینڈر کی ادائیگی
+SubscriptionPayment=رکنیت کی ادائیگی
+WithdrawalPayment=ڈیبٹ ادائیگی کا آرڈر
+SocialContributionPayment=سماجی/مالیاتی ٹیکس کی ادائیگی
+BankTransfer=کریڈٹ ٹرانسفر
+BankTransfers=کریڈٹ ٹرانسفر
+MenuBankInternalTransfer=اندرونی منتقلی
+TransferDesc=ایک اکاؤنٹ سے دوسرے اکاؤنٹ میں منتقلی کے لیے اندرونی منتقلی کا استعمال کریں، ایپلیکیشن دو ریکارڈ لکھے گی: سورس اکاؤنٹ میں ڈیبٹ اور ہدف اکاؤنٹ میں کریڈٹ۔ اس لین دین کے لیے ایک ہی رقم، لیبل اور تاریخ استعمال کی جائے گی۔
+TransferFrom=سے
+TransferTo=کو
+TransferFromToDone=<b> %s </b> %s کے <b> %s </b> کرنے <b> %s </b> سے منتقلی ریکارڈ کیا گیا ہے.
+CheckTransmitter=بھیجنے والا
+ValidateCheckReceipt=اس چیک کی رسید کی توثیق کریں؟
+ConfirmValidateCheckReceipt=کیا آپ واقعی اس چیک کی رسید کو توثیق کے لیے جمع کرانا چاہتے ہیں؟ ایک بار توثیق کے بعد کوئی تبدیلی ممکن نہیں ہوگی۔
+DeleteCheckReceipt=اس چیک کی رسید کو حذف کریں؟
+ConfirmDeleteCheckReceipt=کیا آپ واقعی اس چیک کی رسید کو حذف کرنا چاہتے ہیں؟
+BankChecks=بینک چیک
+BankChecksToReceipt=چیک ڈپازٹ کے منتظر ہیں۔
+BankChecksToReceiptShort=چیک ڈپازٹ کے منتظر ہیں۔
+ShowCheckReceipt=چیک ڈپازٹ کی رسید دکھائیں۔
+NumberOfCheques=چیک کی تعداد
+DeleteTransaction=اندراج کو حذف کریں۔
+ConfirmDeleteTransaction=کیا آپ واقعی اس اندراج کو حذف کرنا چاہتے ہیں؟
+ThisWillAlsoDeleteBankRecord=یہ جنریٹڈ بینک انٹری کو بھی حذف کر دے گا۔
+BankMovements=حرکتیں
+PlannedTransactions=منصوبہ بند اندراجات
+Graph=گرافس
+ExportDataset_banque_1=بینک اندراجات اور اکاؤنٹ اسٹیٹمنٹ
+ExportDataset_banque_2=رقم جمع کروانے کی رسید
+TransactionOnTheOtherAccount=دوسرے اکاؤنٹ پر لین دین
+PaymentNumberUpdateSucceeded=ادائیگی نمبر کامیابی کے ساتھ اپ ڈیٹ ہو گیا۔
+PaymentNumberUpdateFailed=ادائیگی نمبر کو اپ ڈیٹ نہیں کیا جا سکا
+PaymentDateUpdateSucceeded=ادائیگی کی تاریخ کامیابی کے ساتھ اپ ڈیٹ ہو گئی۔
+PaymentDateUpdateFailed=ادائیگی کی تاریخ اپ ڈیٹ نہیں ہو سکی
+Transactions=لین دین
+BankTransactionLine=بینک انٹری
+AllAccounts=تمام بینک اور کیش اکاؤنٹس
+BackToAccount=اکاؤنٹ پر واپس جائیں۔
+ShowAllAccounts=تمام اکاؤنٹس کے لیے دکھائیں۔
+FutureTransaction=مستقبل کا لین دین۔ مصالحت سے قاصر۔
+SelectChequeTransactionAndGenerate=ان چیکوں کو منتخب/فلٹر کریں جنہیں چیک ڈپازٹ کی رسید میں شامل کیا جانا ہے۔ پھر، "تخلیق" پر کلک کریں.
+InputReceiptNumber=مفاہمت سے متعلق بینک اسٹیٹمنٹ کا انتخاب کریں۔ ترتیب دینے والی عددی قدر استعمال کریں: YYYYMM یا YYYYMMDD
+EventualyAddCategory=آخر کار، ایک زمرہ کی وضاحت کریں جس میں ریکارڈز کی درجہ بندی کی جائے۔
+ToConciliate=صلح کرنے کے لیے؟
+ThenCheckLinesAndConciliate=پھر، بینک اسٹیٹمنٹ میں موجود لائنوں کو چیک کریں اور کلک کریں۔
+DefaultRIB=پہلے سے طے شدہ پابندی
+AllRIB=تمام BAN
+LabelRIB=BAN لیبل
+NoBANRecord=کوئی BAN ریکارڈ نہیں ہے۔
+DeleteARib=BAN ریکارڈ کو حذف کریں۔
+ConfirmDeleteRib=کیا آپ واقعی اس BAN ریکارڈ کو حذف کرنا چاہتے ہیں؟
+RejectCheck=چیک واپس آ گیا۔
+ConfirmRejectCheck=کیا آپ واقعی اس چیک کو مسترد شدہ کے بطور نشان زد کرنا چاہتے ہیں؟
+RejectCheckDate=چیک کی واپسی کی تاریخ
+CheckRejected=چیک واپس آ گیا۔
+CheckRejectedAndInvoicesReopened=چیک واپس آ گیا اور رسیدیں دوبارہ کھلیں۔
+BankAccountModelModule=بینک اکاؤنٹس کے لیے دستاویزی ٹیمپلیٹس
+DocumentModelSepaMandate=SEPA مینڈیٹ کا سانچہ۔ EEC میں صرف یورپی ممالک کے لیے مفید ہے۔
+DocumentModelBan=BAN کی معلومات کے ساتھ صفحہ پرنٹ کرنے کے لیے ٹیمپلیٹ۔
+NewVariousPayment=نئی متفرق ادائیگی
+VariousPayment=متفرق ادائیگی
+VariousPayments=متفرق ادائیگیاں
+ShowVariousPayment=متفرق ادائیگی دکھائیں۔
+AddVariousPayment=متفرق ادائیگی شامل کریں۔
+VariousPaymentId=متفرق ادائیگی ID
+VariousPaymentLabel=متفرق ادائیگی کا لیبل
+ConfirmCloneVariousPayment=متفرق ادائیگی کے کلون کی تصدیق کریں۔
+SEPAMandate=SEPA مینڈیٹ
+YourSEPAMandate=آپ کا SEPA مینڈیٹ
+FindYourSEPAMandate=یہ آپ کا SEPA مینڈیٹ ہے کہ وہ ہماری کمپنی کو آپ کے بینک کو براہ راست ڈیبٹ آرڈر کرنے کی اجازت دیتا ہے۔ اسے دستخط شدہ واپس کریں (دستخط شدہ دستاویز کو اسکین کریں) یا اسے بذریعہ ڈاک بھیجیں۔
+AutoReportLastAccountStatement=مفاہمت کرتے وقت آخری سٹیٹمنٹ نمبر کے ساتھ فیلڈ 'بینک اسٹیٹمنٹ کا نمبر' خودکار طور پر پُر کریں۔
+CashControl=POS کیش ڈیسک کنٹرول
+NewCashFence=نیا کیش ڈیسک کھلنا یا بند کرنا
+BankColorizeMovement=حرکات کو رنگین کریں۔
+BankColorizeMovementDesc=اگر یہ فنکشن فعال ہے، تو آپ ڈیبٹ یا کریڈٹ کی نقل و حرکت کے لیے مخصوص پس منظر کا رنگ منتخب کر سکتے ہیں۔
+BankColorizeMovementName1=ڈیبٹ حرکت کے لیے پس منظر کا رنگ
+BankColorizeMovementName2=کریڈٹ موومنٹ کے لیے پس منظر کا رنگ
+IfYouDontReconcileDisableProperty=اگر آپ کچھ بینک اکاؤنٹس پر بینک مفاہمت نہیں کرتے ہیں، تو اس وارننگ کو ہٹانے کے لیے ان پر موجود پراپرٹی "%s" کو غیر فعال کر دیں۔
+NoBankAccountDefined=کوئی بینک اکاؤنٹ متعین نہیں ہے۔
+NoRecordFoundIBankcAccount=بینک اکاؤنٹ میں کوئی ریکارڈ نہیں ملا۔ عام طور پر، ایسا اس وقت ہوتا ہے جب بینک اکاؤنٹ میں لین دین کی فہرست سے ریکارڈ کو دستی طور پر حذف کر دیا جاتا ہے (مثال کے طور پر بینک اکاؤنٹ کی مصالحت کے دوران)۔ دوسری وجہ یہ ہے کہ ادائیگی اس وقت ریکارڈ کی گئی تھی جب ماڈیول "%s" غیر فعال تھا۔
+AlreadyOneBankAccount=پہلے ہی ایک بینک اکاؤنٹ کی وضاحت کی گئی ہے۔
diff --git a/htdocs/langs/ur_PK/bills.lang b/htdocs/langs/ur_PK/bills.lang
index 518f6c93406..e11fa404609 100644
--- a/htdocs/langs/ur_PK/bills.lang
+++ b/htdocs/langs/ur_PK/bills.lang
@@ -1,608 +1,608 @@
 # Dolibarr language file - Source file is en_US - bills
-Bill=Invoice
-Bills=Invoices
-BillsCustomers=Customer invoices
-BillsCustomer=Customer invoice
-BillsSuppliers=Vendor invoices
-BillsCustomersUnpaid=Unpaid customer invoices
-BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
-BillsSuppliersUnpaid=Unpaid vendor invoices
-BillsSuppliersUnpaidForCompany=Unpaid vendors invoices for %s
-BillsLate=Late payments
-BillsStatistics=Customers invoices statistics
-BillsStatisticsSuppliers=Vendors invoices statistics
-DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping
-DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter.
-DisabledBecauseNotErasable=Disabled because cannot be erased
-InvoiceStandard=Standard invoice
-InvoiceStandardAsk=Standard invoice
-InvoiceStandardDesc=This kind of invoice is the common invoice.
-InvoiceDeposit=Down payment invoice
-InvoiceDepositAsk=Down payment invoice
-InvoiceDepositDesc=This kind of invoice is done when a down payment has been received.
-InvoiceProForma=Proforma invoice
-InvoiceProFormaAsk=Proforma invoice
-InvoiceProFormaDesc=<b>Proforma invoice</b> is an image of a true invoice but has no accountancy value.
-InvoiceReplacement=Replacement invoice
-InvoiceReplacementAsk=Replacement invoice for invoice
-InvoiceReplacementDesc=<b>Replacement invoice</b> is used to completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
-InvoiceAvoir=Credit note
-InvoiceAvoirAsk=Credit note to correct invoice
-InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice shows an amount that differs from the amount actually paid (eg the customer paid too much by mistake, or will not pay the complete amount since some products were returned).
-invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
-invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
-ReplaceInvoice=Replace invoice %s
-ReplacementInvoice=Replacement invoice
-ReplacedByInvoice=Replaced by invoice %s
-ReplacementByInvoice=Replaced by invoice
-CorrectInvoice=Correct invoice %s
-CorrectionInvoice=Correction invoice
-UsedByInvoice=Used to pay invoice %s
-ConsumedBy=Consumed by
-NotConsumed=Not consumed
-NoReplacableInvoice=No replaceable invoices
-NoInvoiceToCorrect=No invoice to correct
-InvoiceHasAvoir=Was source of one or several credit notes
-CardBill=Invoice card
-PredefinedInvoices=Predefined Invoices
-Invoice=Invoice
-PdfInvoiceTitle=Invoice
-Invoices=Invoices
-InvoiceLine=Invoice line
-InvoiceCustomer=Customer invoice
-CustomerInvoice=Customer invoice
-CustomersInvoices=Customer invoices
-SupplierInvoice=Vendor invoice
-SuppliersInvoices=Vendor invoices
-SupplierInvoiceLines=Vendor invoice lines
-SupplierBill=Vendor invoice
-SupplierBills=Vendor invoices
-Payment=Payment
-PaymentBack=Refund
-CustomerInvoicePaymentBack=Refund
-Payments=Payments
-PaymentsBack=Refunds
-paymentInInvoiceCurrency=in invoices currency
-PaidBack=Paid back
-DeletePayment=Delete payment
-ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an available credit?
-ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an available credit?
-ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
-SupplierPayments=Vendor payments
-ReceivedPayments=Received payments
-ReceivedCustomersPayments=Payments received from customers
-PayedSuppliersPayments=Payments paid to vendors
-ReceivedCustomersPaymentsToValid=Received customers payments to validate
-PaymentsReportsForYear=Payments reports for %s
-PaymentsReports=Payments reports
-PaymentsAlreadyDone=Payments already done
-PaymentsBackAlreadyDone=Refunds already done
-PaymentRule=Payment rule
-PaymentMode=Payment Type
-DefaultPaymentMode=Default Payment Type
-DefaultBankAccount=Default Bank Account
-PaymentTypeDC=Debit/Credit Card
-PaymentTypePP=PayPal
-IdPaymentMode=Payment Type (id)
-CodePaymentMode=Payment Type (code)
-LabelPaymentMode=Payment Type (label)
-PaymentModeShort=Payment Type
-PaymentTerm=Payment Term
-PaymentConditions=Payment Terms
-PaymentConditionsShort=Payment Terms
-PaymentAmount=Payment amount
-PaymentHigherThanReminderToPay=Payment higher than reminder to pay
-HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
-ClassifyPaid=Classify 'Paid'
-ClassifyUnPaid=Classify 'Unpaid'
-ClassifyPaidPartially=Classify 'Paid partially'
-ClassifyCanceled=Classify 'Abandoned'
-ClassifyClosed=Classify 'Closed'
-ClassifyUnBilled=Classify 'Unbilled'
-CreateBill=Create Invoice
-CreateCreditNote=Create credit note
-AddBill=Create invoice or credit note
-AddToDraftInvoices=Add to draft invoice
-DeleteBill=Delete invoice
-SearchACustomerInvoice=Search for a customer invoice
-SearchASupplierInvoice=Search for a vendor invoice
-CancelBill=Cancel an invoice
-SendRemindByMail=Send reminder by email
-DoPayment=Enter payment
-DoPaymentBack=Enter refund
-ConvertToReduc=Mark as credit available
-ConvertExcessReceivedToReduc=Convert excess received into available credit
-ConvertExcessPaidToReduc=Convert excess paid into available discount
-EnterPaymentReceivedFromCustomer=Enter payment received from customer
-EnterPaymentDueToCustomer=Make payment due to customer
-DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
-PriceBase=Base price
-BillStatus=Invoice status
-StatusOfGeneratedInvoices=Status of generated invoices
-BillStatusDraft=Draft (needs to be validated)
-BillStatusPaid=Paid
-BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
-BillStatusConverted=Paid (ready for consumption in final invoice)
-BillStatusCanceled=Abandoned
-BillStatusValidated=Validated (needs to be paid)
-BillStatusStarted=Started
-BillStatusNotPaid=Not paid
-BillStatusNotRefunded=Not refunded
-BillStatusClosedUnpaid=Closed (unpaid)
-BillStatusClosedPaidPartially=Paid (partially)
-BillShortStatusDraft=Draft
-BillShortStatusPaid=Paid
-BillShortStatusPaidBackOrConverted=Refunded or converted
-Refunded=Refunded
-BillShortStatusConverted=Paid
-BillShortStatusCanceled=Abandoned
-BillShortStatusValidated=Validated
-BillShortStatusStarted=Started
-BillShortStatusNotPaid=Not paid
-BillShortStatusNotRefunded=Not refunded
-BillShortStatusClosedUnpaid=Closed
-BillShortStatusClosedPaidPartially=Paid (partially)
-PaymentStatusToValidShort=To validate
-ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
-ErrorNoPaiementModeConfigured=No default payment type defined. Go to Invoice module setup to fix this.
-ErrorCreateBankAccount=Create a bank account, then go to Setup panel of Invoice module to define payment types
-ErrorBillNotFound=Invoice %s does not exist
-ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
-ErrorDiscountAlreadyUsed=Error, discount already used
-ErrorInvoiceAvoirMustBeNegative=Error, correct invoice must have a negative amount
-ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have an amount excluding tax positive (or null)
-ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice that has been replaced by another invoice that is still in draft status
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
-BillFrom=From
-BillTo=To
-ActionsOnBill=Actions on invoice
-RecurringInvoiceTemplate=Template / Recurring invoice
-NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
-FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
-NotARecurringInvoiceTemplate=Not a recurring template invoice
-NewBill=New invoice
-LastBills=Latest %s invoices
-LatestTemplateInvoices=Latest %s template invoices
-LatestCustomerTemplateInvoices=Latest %s customer template invoices
-LatestSupplierTemplateInvoices=Latest %s vendor template invoices
-LastCustomersBills=Latest %s customer invoices
-LastSuppliersBills=Latest %s vendor invoices
-AllBills=All invoices
-AllCustomerTemplateInvoices=All template invoices
-OtherBills=Other invoices
-DraftBills=Draft invoices
-CustomersDraftInvoices=Customer draft invoices
-SuppliersDraftInvoices=Vendor draft invoices
-Unpaid=Unpaid
-ErrorNoPaymentDefined=Error No payment defined
-ConfirmDeleteBill=Are you sure you want to delete this invoice?
-ConfirmValidateBill=Are you sure you want to validate this invoice with reference <b>%s</b>?
-ConfirmUnvalidateBill=Are you sure you want to change invoice <b>%s</b> to draft status?
-ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
-ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
-ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason for closing this invoice?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
-ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
-ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer
-ConfirmClassifyPaidPartiallyReasonBankCharge=Deduction by bank (intermediary bank fees)
-ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned
-ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
-ConfirmClassifyPaidPartiallyReasonAvoirDesc=Use this choice if all other does not suit
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
-ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=This choice is used when payment is not complete because some of products were returned
-ConfirmClassifyPaidPartiallyReasonBankChargeDesc=The unpaid amount is <b>intermediary bank fees</b>, deducted directly from the <b>correct amount</b> paid by the Customer.
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
-ConfirmClassifyAbandonReasonOther=Other
-ConfirmClassifyAbandonReasonOtherDesc=This choice will be used in all other cases. For example because you plan to create a replacing invoice.
-ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
-ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
-ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
-ValidateBill=Validate invoice
-UnvalidateBill=Unvalidate invoice
-NumberOfBills=No. of invoices
-NumberOfBillsByMonth=No. of invoices per month
-AmountOfBills=Amount of invoices
-AmountOfBillsHT=Amount of invoices (net of tax)
-AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
-UseSituationInvoices=Allow situation invoice
-UseSituationInvoicesCreditNote=Allow situation invoice credit note
-Retainedwarranty=Retained warranty
-AllowedInvoiceForRetainedWarranty=Retained warranty usable on the following types of invoices
-RetainedwarrantyDefaultPercent=Retained warranty default percent
-RetainedwarrantyOnlyForSituation=Make "retained warranty" available only for situation invoices
-RetainedwarrantyOnlyForSituationFinal=On situation invoices the global "retained warranty" deduction is applied only on the final situation
-ToPayOn=To pay on %s
-toPayOn=to pay on %s
-RetainedWarranty=Retained Warranty
-PaymentConditionsShortRetainedWarranty=Retained warranty payment terms
-DefaultPaymentConditionsRetainedWarranty=Default retained warranty payment terms
-setPaymentConditionsShortRetainedWarranty=Set retained warranty payment terms
-setretainedwarranty=Set retained warranty
-setretainedwarrantyDateLimit=Set retained warranty date limit
-RetainedWarrantyDateLimit=Retained warranty date limit
-RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
-AlreadyPaid=Already paid
-AlreadyPaidBack=Already paid back
-AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
-Abandoned=Abandoned
-RemainderToPay=Remaining unpaid
-RemainderToPayMulticurrency=Remaining unpaid, original currency
-RemainderToTake=Remaining amount to take
-RemainderToTakeMulticurrency=Remaining amount to take, original currency
-RemainderToPayBack=Remaining amount to refund
-RemainderToPayBackMulticurrency=Remaining amount to refund, original currency
-NegativeIfExcessRefunded=negative if excess refunded
-Rest=Pending
-AmountExpected=Amount claimed
-ExcessReceived=Excess received
-ExcessReceivedMulticurrency=Excess received, original currency
-NegativeIfExcessReceived=negative if excess received
-ExcessPaid=Excess paid
-ExcessPaidMulticurrency=Excess paid, original currency
-EscompteOffered=Discount offered (payment before term)
-EscompteOfferedShort=Discount
-SendBillRef=Submission of invoice %s
-SendReminderBillRef=Submission of invoice %s (reminder)
-SendPaymentReceipt=Submission of payment receipt %s
-NoDraftBills=No draft invoices
-NoOtherDraftBills=No other draft invoices
-NoDraftInvoices=No draft invoices
-RefBill=Invoice ref
-ToBill=To bill
-RemainderToBill=Remainder to bill
-SendBillByMail=Send invoice by email
-SendReminderBillByMail=Send reminder by email
-RelatedCommercialProposals=Related commercial proposals
-RelatedRecurringCustomerInvoices=Related recurring customer invoices
-MenuToValid=To valid
-DateMaxPayment=Payment due on
-DateInvoice=Invoice date
-DatePointOfTax=Point of tax
-NoInvoice=No invoice
-NoOpenInvoice=No open invoice
-NbOfOpenInvoices=Number of open invoices
-ClassifyBill=Classify invoice
-SupplierBillsToPay=Unpaid vendor invoices
-CustomerBillsUnpaid=Unpaid customer invoices
-NonPercuRecuperable=Non-recoverable
-SetConditions=Set Payment Terms
-SetMode=Set Payment Type
-SetRevenuStamp=Set revenue stamp
-Billed=Billed
-RecurringInvoices=Recurring invoices
-RecurringInvoice=Recurring invoice
-RepeatableInvoice=Template invoice
-RepeatableInvoices=Template invoices
-Repeatable=Template
-Repeatables=Templates
-ChangeIntoRepeatableInvoice=Convert into template invoice
-CreateRepeatableInvoice=Create template invoice
-CreateFromRepeatableInvoice=Create from template invoice
-CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
-CustomersInvoicesAndPayments=Customer invoices and payments
-ExportDataset_invoice_1=Customer invoices and invoice details
-ExportDataset_invoice_2=Customer invoices and payments
-ProformaBill=Proforma Bill:
-Reduction=Reduction
-ReductionShort=Disc.
-Reductions=Reductions
-ReductionsShort=Disc.
-Discounts=Discounts
-AddDiscount=Create discount
-AddRelativeDiscount=Create relative discount
-EditRelativeDiscount=Edit relative discount
-AddGlobalDiscount=Create absolute discount
-EditGlobalDiscounts=Edit absolute discounts
-AddCreditNote=Create credit note
-ShowDiscount=Show discount
-ShowReduc=Show the discount
-ShowSourceInvoice=Show the source invoice
-RelativeDiscount=Relative discount
-GlobalDiscount=Global discount
-CreditNote=Credit note
-CreditNotes=Credit notes
-CreditNotesOrExcessReceived=Credit notes or excess received
-Deposit=Down payment
-Deposits=Down payments
-DiscountFromCreditNote=Discount from credit note %s
-DiscountFromDeposit=Down payments from invoice %s
-DiscountFromExcessReceived=Payments in excess of invoice %s
-DiscountFromExcessPaid=Payments in excess of invoice %s
-AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation
-CreditNoteDepositUse=Invoice must be validated to use this kind of credits
-NewGlobalDiscount=New absolute discount
-NewRelativeDiscount=New relative discount
-DiscountType=Discount type
-NoteReason=Note/Reason
-ReasonDiscount=Reason
-DiscountOfferedBy=Granted by
-DiscountStillRemaining=Discounts or credits available
-DiscountAlreadyCounted=Discounts or credits already consumed
-CustomerDiscounts=Customer discounts
-SupplierDiscounts=Vendors discounts
-BillAddress=Bill address
-HelpEscompte=This discount is a discount granted to customer because payment was made before term.
-HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
-HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
-IdSocialContribution=Social/fiscal tax payment id
-PaymentId=Payment id
-PaymentRef=Payment ref.
-InvoiceId=Invoice id
-InvoiceRef=Invoice ref.
-InvoiceDateCreation=Invoice creation date
-InvoiceStatus=Invoice status
-InvoiceNote=Invoice note
-InvoicePaid=Invoice paid
-InvoicePaidCompletely=Paid completely
-InvoicePaidCompletelyHelp=Invoice that are paid completely. This excludes invoices that are paid partially. To get list of all 'Closed' or non 'Closed' invoices, prefer to use a filter on the invoice status.
-OrderBilled=Order billed
-DonationPaid=Donation paid
-PaymentNumber=Payment number
-RemoveDiscount=Remove discount
-WatermarkOnDraftBill=Watermark on draft invoices (nothing if empty)
-InvoiceNotChecked=No invoice selected
-ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
-DisabledBecauseReplacedInvoice=Action disabled because invoice has been replaced
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payments during the fixed year are included here.
-NbOfPayments=No. of payments
-SplitDiscount=Split discount in two
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into two smaller discounts?
-TypeAmountOfEachNewDiscount=Input amount for each of two parts:
-TotalOfTwoDiscountMustEqualsOriginal=The total of the two new discounts must be equal to the original discount amount.
-ConfirmRemoveDiscount=Are you sure you want to remove this discount?
-RelatedBill=Related invoice
-RelatedBills=Related invoices
-RelatedCustomerInvoices=Related customer invoices
-RelatedSupplierInvoices=Related vendor invoices
-LatestRelatedBill=Latest related invoice
-WarningBillExist=Warning, one or more invoices already exist
-MergingPDFTool=Merging PDF tool
-AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
-PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
-PaymentNote=Payment note
-ListOfPreviousSituationInvoices=List of previous situation invoices
-ListOfNextSituationInvoices=List of next situation invoices
-ListOfSituationInvoices=List of situation invoices
-CurrentSituationTotal=Total current situation
-DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
-RemoveSituationFromCycle=Remove this invoice from cycle
-ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
-ConfirmOuting=Confirm outing
-FrequencyPer_d=Every %s days
-FrequencyPer_m=Every %s months
-FrequencyPer_y=Every %s years
-FrequencyUnit=Frequency unit
-toolTipFrequency=Examples:<br><b>Set 7, Day</b>: give a new invoice every 7 days<br><b>Set 3, Month</b>: give a new invoice every 3 month
-NextDateToExecution=Date for next invoice generation
-NextDateToExecutionShort=Date next gen.
-DateLastGeneration=Date of latest generation
-DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Max. number of invoice generation
-NbOfGenerationDone=Number of invoice generation already done
-NbOfGenerationOfRecordDone=Number of record generation already done
-NbOfGenerationDoneShort=Number of generation done
-MaxGenerationReached=Maximum number of generations reached
-InvoiceAutoValidate=Validate invoices automatically
-GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
-DateIsNotEnough=Date not reached yet
-InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
-GeneratedFromTemplate=Generated from template invoice %s
-WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
-WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
-ViewAvailableGlobalDiscounts=View available discounts
-GroupPaymentsByModOnReports=Group payments by mode on reports
+Bill=رسید
+Bills=رسیدیں
+BillsCustomers=کسٹمر کی رسیدیں
+BillsCustomer=گاہک کی رسید
+BillsSuppliers=وینڈر انوائسز
+BillsCustomersUnpaid=بلا معاوضہ کسٹمر انوائس
+BillsCustomersUnpaidForCompany=%s کے لیے غیر ادا شدہ کسٹمر انوائسز
+BillsSuppliersUnpaid=غیر ادا شدہ وینڈر انوائسز
+BillsSuppliersUnpaidForCompany=%s کے لیے غیر ادا شدہ وینڈرز کی رسیدیں
+BillsLate=تاخیر سے ادائیگیاں
+BillsStatistics=صارفین کی رسیدوں کے اعدادوشمار
+BillsStatisticsSuppliers=وینڈرز انوائس کے اعدادوشمار
+DisabledBecauseDispatchedInBookkeeping=غیر فعال کیونکہ انوائس بک کیپنگ میں بھیجی گئی تھی۔
+DisabledBecauseNotLastInvoice=انوائس کو مٹانے کے قابل نہ ہونے کی وجہ سے غیر فعال ہے۔ اس کے بعد کچھ رسیدیں ریکارڈ کی گئیں اور اس سے کاؤنٹر میں سوراخ ہو جائیں گے۔
+DisabledBecauseNotErasable=غیر فعال کیونکہ مٹایا نہیں جا سکتا
+InvoiceStandard=معیاری رسید
+InvoiceStandardAsk=معیاری رسید
+InvoiceStandardDesc=اس قسم کی رسید عام رسید ہے۔
+InvoiceDeposit=ڈاون پیمنٹ انوائس
+InvoiceDepositAsk=ڈاون پیمنٹ انوائس
+InvoiceDepositDesc=اس قسم کی رسید اس وقت کی جاتی ہے جب ڈاؤن پیمنٹ موصول ہو جاتی ہے۔
+InvoiceProForma=پروفارما رسید
+InvoiceProFormaAsk=پروفارما رسید
+InvoiceProFormaDesc= <b> پروفارما انوائس </b> ایک حقیقی انوائس کی تصویر ہے لیکن اس کی کوئی اکاؤنٹنسی ویلیو نہیں ہے۔
+InvoiceReplacement=متبادل رسید
+InvoiceReplacementAsk=انوائس کے بدلے انوائس
+InvoiceReplacementDesc= <b> تبدیلی کی رسید </b> کو مکمل طور پر انوائس کو تبدیل کرنے کے لیے استعمال کیا جاتا ہے جس میں پہلے سے کوئی ادائیگی موصول نہیں ہوئی ہے۔ <br> <br> نوٹ: صرف ان انوائسز کو تبدیل کیا جا سکتا ہے جن پر کوئی ادائیگی نہ ہو۔ اگر آپ جو انوائس تبدیل کرتے ہیں وہ ابھی تک بند نہیں ہوا ہے، تو یہ خود بخود 'متروک' پر بند ہو جائے گا۔
+InvoiceAvoir=کریڈٹ نوٹ
+InvoiceAvoirAsk=انوائس درست کرنے کے لیے کریڈٹ نوٹ
+InvoiceAvoirDesc=<b> کریڈٹ نوٹ </b> ایک منفی انوائس ہے جس کا استعمال اس حقیقت کو درست کرنے کے لیے کیا جاتا ہے کہ انوائس ایک ایسی رقم دکھاتی ہے جو اصل میں ادا کی گئی رقم سے مختلف ہوتی ہے (مثلاً صارف نے غلطی سے بہت زیادہ ادائیگی کی، یا مکمل رقم ادا نہیں کرے گا کیونکہ کچھ مصنوعات واپس کردی گئی ہیں) .
+invoiceAvoirWithLines=اصل انوائس سے لائنوں کے ساتھ کریڈٹ نوٹ بنائیں
+invoiceAvoirWithPaymentRestAmount=اصل انوائس کے بقایا بغیر ادائیگی کے ساتھ کریڈٹ نوٹ بنائیں
+invoiceAvoirLineWithPaymentRestAmount=بقیہ غیر ادا شدہ رقم کے لیے کریڈٹ نوٹ
+ReplaceInvoice=انوائس %s کو تبدیل کریں۔
+ReplacementInvoice=متبادل رسید
+ReplacedByInvoice=انوائس %s سے تبدیل کیا گیا۔
+ReplacementByInvoice=انوائس سے بدل دیا گیا۔
+CorrectInvoice=درست انوائس %s
+CorrectionInvoice=تصحیح کی رسید
+UsedByInvoice=انوائس %s ادا کرنے کے لیے استعمال کیا جاتا ہے۔
+ConsumedBy=کی طرف سے کھپت
+NotConsumed=استعمال نہیں کیا گیا۔
+NoReplacableInvoice=کوئی قابل تبدیلی رسید نہیں۔
+NoInvoiceToCorrect=درست کرنے کے لیے کوئی رسید نہیں۔
+InvoiceHasAvoir=ایک یا متعدد کریڈٹ نوٹوں کا ذریعہ تھا۔
+CardBill=انوائس کارڈ
+PredefinedInvoices=پہلے سے طے شدہ رسیدیں
+Invoice=رسید
+PdfInvoiceTitle=رسید
+Invoices=رسیدیں
+InvoiceLine=انوائس لائن
+InvoiceCustomer=گاہک کی رسید
+CustomerInvoice=گاہک کی رسید
+CustomersInvoices=کسٹمر کی رسیدیں
+SupplierInvoice=وینڈر رسید
+SuppliersInvoices=وینڈر انوائسز
+SupplierInvoiceLines=وینڈر انوائس لائنز
+SupplierBill=وینڈر رسید
+SupplierBills=وینڈر کی رسیدیں
+Payment=ادائیگی
+PaymentBack=واپس کرنا
+CustomerInvoicePaymentBack=واپس کرنا
+Payments=ادائیگیاں
+PaymentsBack=ریفنڈز
+paymentInInvoiceCurrency=انوائس کرنسی میں
+PaidBack=واپس ادائیگی
+DeletePayment=ادائیگی کو حذف کریں۔
+ConfirmDeletePayment=کیا آپ واقعی اس ادائیگی کو حذف کرنا چاہتے ہیں؟
+ConfirmConvertToReduc=کیا آپ اس %s کو دستیاب کریڈٹ میں تبدیل کرنا چاہتے ہیں؟
+ConfirmConvertToReduc2=رقم تمام رعایتوں میں محفوظ ہو جائے گی اور اس صارف کے لیے موجودہ یا مستقبل کے انوائس کے لیے رعایت کے طور پر استعمال ہو سکتی ہے۔
+ConfirmConvertToReducSupplier=کیا آپ اس %s کو دستیاب کریڈٹ میں تبدیل کرنا چاہتے ہیں؟
+ConfirmConvertToReducSupplier2=رقم تمام رعایتوں میں محفوظ ہو جائے گی اور اس وینڈر کے لیے موجودہ یا مستقبل کے انوائس کے لیے رعایت کے طور پر استعمال کی جا سکتی ہے۔
+SupplierPayments=وینڈر کی ادائیگی
+ReceivedPayments=ادائیگیاں موصول ہوئیں
+ReceivedCustomersPayments=صارفین سے ادائیگیاں موصول ہوئیں
+PayedSuppliersPayments=دکانداروں کو ادائیگی کی ادائیگی
+ReceivedCustomersPaymentsToValid=تصدیق کرنے کے لیے صارفین کی ادائیگیاں موصول ہوئیں
+PaymentsReportsForYear=%s کے لیے ادائیگیوں کی رپورٹ
+PaymentsReports=ادائیگی کی رپورٹس
+PaymentsAlreadyDone=ادائیگیاں ہو چکی ہیں۔
+PaymentsBackAlreadyDone=ریفنڈز پہلے ہی ہو چکے ہیں۔
+PaymentRule=ادائیگی کا اصول
+PaymentMode=ادائیگی کی قسم
+DefaultPaymentMode=پہلے سے طے شدہ ادائیگی کی قسم
+DefaultBankAccount=ڈیفالٹ بینک اکاؤنٹ
+IdPaymentMode=ادائیگی کی قسم (id)
+CodePaymentMode=ادائیگی کی قسم (کوڈ)
+LabelPaymentMode=ادائیگی کی قسم (لیبل)
+PaymentModeShort=ادائیگی کی قسم
+PaymentTerm=ادائیگی کی شرط
+PaymentConditions=ادائیگی کی شرائط
+PaymentConditionsShort=ادائیگی کی شرائط
+PaymentAmount=ادائیگی کی رقم
+PaymentHigherThanReminderToPay=ادائیگی کی یاد دہانی سے زیادہ ادائیگی
+HelpPaymentHigherThanReminderToPay=توجہ فرمائیں، ایک یا زیادہ بلوں کی ادائیگی کی رقم ادا کی جانی والی بقایا رقم سے زیادہ ہے۔ <br> اپنے اندراج میں ترمیم کریں، بصورت دیگر تصدیق کریں اور ہر زائد ادائیگی شدہ رسید کے لیے موصول ہونے والے اضافی کے لیے ایک کریڈٹ نوٹ بنانے پر غور کریں۔
+HelpPaymentHigherThanReminderToPaySupplier=توجہ فرمائیں، ایک یا زیادہ بلوں کی ادائیگی کی رقم ادا کی جانی والی بقایا رقم سے زیادہ ہے۔ <br> اپنے اندراج میں ترمیم کریں، بصورت دیگر تصدیق کریں اور ہر زائد ادائیگی شدہ انوائس کے لیے اضافی ادائیگی کے لیے کریڈٹ نوٹ بنانے پر غور کریں۔
+ClassifyPaid='ادائیگی' کی درجہ بندی کریں
+ClassifyUnPaid='غیر ادا شدہ' کی درجہ بندی کریں
+ClassifyPaidPartially=درجہ بندی 'جزوی طور پر ادا شدہ'
+ClassifyCanceled='ترک' کی درجہ بندی کریں
+ClassifyClosed='بند' کی درجہ بندی کریں
+ClassifyUnBilled='غیر بل' کی درجہ بندی کریں
+CreateBill=انوائس بنائیں
+CreateCreditNote=کریڈٹ نوٹ بنائیں
+AddBill=انوائس یا کریڈٹ نوٹ بنائیں
+AddToDraftInvoices=ڈرافٹ انوائس میں شامل کریں۔
+DeleteBill=رسید حذف کریں۔
+SearchACustomerInvoice=کسٹمر انوائس تلاش کریں۔
+SearchASupplierInvoice=وینڈر انوائس تلاش کریں۔
+CancelBill=انوائس منسوخ کریں۔
+SendRemindByMail=ای میل کے ذریعے یاد دہانی بھیجیں۔
+DoPayment=ادائیگی درج کریں۔
+DoPaymentBack=رقم کی واپسی درج کریں۔
+ConvertToReduc=کریڈٹ دستیاب کے بطور نشان زد کریں۔
+ConvertExcessReceivedToReduc=حاصل شدہ اضافی کو دستیاب کریڈٹ میں تبدیل کریں۔
+ConvertExcessPaidToReduc=اضافی ادائیگی کو دستیاب رعایت میں تبدیل کریں۔
+EnterPaymentReceivedFromCustomer=کسٹمر سے موصول ہونے والی ادائیگی درج کریں۔
+EnterPaymentDueToCustomer=گاہک کی وجہ سے ادائیگی کریں۔
+DisabledBecauseRemainderToPayIsZero=غیرفعال ہے کیونکہ بقیہ غیر ادا شدہ صفر ہے۔
+PriceBase=بنیادی قیمت
+BillStatus=رسید کی حیثیت
+StatusOfGeneratedInvoices=تیار کردہ رسیدوں کی حیثیت
+BillStatusDraft=مسودہ (توثیق کرنے کی ضرورت ہے)
+BillStatusPaid=ادا کیا
+BillStatusPaidBackOrConverted=کریڈٹ نوٹ کی واپسی یا کریڈٹ دستیاب کے بطور نشان زد
+BillStatusConverted=ادا شدہ (حتمی انوائس میں استعمال کے لیے تیار)
+BillStatusCanceled=چھوڑ دیا
+BillStatusValidated=تصدیق شدہ (ادائیگی کی ضرورت ہے)
+BillStatusStarted=شروع
+BillStatusNotPaid=ادائیگی نہیں کی
+BillStatusNotRefunded=واپس نہیں کیا گیا۔
+BillStatusClosedUnpaid=بند (بغیر ادا شدہ)
+BillStatusClosedPaidPartially=ادا شدہ (جزوی طور پر)
+BillShortStatusDraft=مسودہ
+BillShortStatusPaid=ادا کیا
+BillShortStatusPaidBackOrConverted=رقم کی واپسی یا تبدیل شدہ
+Refunded=رقم کی واپسی
+BillShortStatusConverted=ادا کیا
+BillShortStatusCanceled=چھوڑ دیا
+BillShortStatusValidated=تصدیق شدہ
+BillShortStatusStarted=شروع
+BillShortStatusNotPaid=ادائیگی نہیں کی
+BillShortStatusNotRefunded=واپس نہیں کیا گیا۔
+BillShortStatusClosedUnpaid=بند
+BillShortStatusClosedPaidPartially=ادا شدہ (جزوی طور پر)
+PaymentStatusToValidShort=تصدیق کرنا
+ErrorVATIntraNotConfigured=انٹرا کمیونٹی VAT نمبر کی ابھی تک وضاحت نہیں کی گئی ہے۔
+ErrorNoPaiementModeConfigured=ادائیگی کی کوئی ڈیفالٹ قسم کی وضاحت نہیں کی گئی ہے۔ اسے ٹھیک کرنے کے لیے انوائس ماڈیول سیٹ اپ پر جائیں۔
+ErrorCreateBankAccount=ایک بینک اکاؤنٹ بنائیں، پھر ادائیگی کی اقسام کی وضاحت کرنے کے لیے انوائس ماڈیول کے سیٹ اپ پینل پر جائیں۔
+ErrorBillNotFound=انوائس %s موجود نہیں ہے۔
+ErrorInvoiceAlreadyReplaced=خرابی، آپ نے انوائس %s کو تبدیل کرنے کے لیے انوائس کی توثیق کرنے کی کوشش کی۔ لیکن اسے پہلے ہی انوائس %s سے تبدیل کر دیا گیا ہے۔
+ErrorDiscountAlreadyUsed=خرابی، ڈسکاؤنٹ پہلے ہی استعمال ہو چکا ہے۔
+ErrorInvoiceAvoirMustBeNegative=خرابی، درست انوائس میں منفی رقم ہونی چاہیے۔
+ErrorInvoiceOfThisTypeMustBePositive=خرابی، اس قسم کی رسید میں ٹیکس مثبت (یا کالعدم) کے علاوہ رقم ہونی چاہیے
+ErrorCantCancelIfReplacementInvoiceNotValidated=خرابی، ایک انوائس کو منسوخ نہیں کیا جا سکتا جس کی جگہ کسی اور انوائس نے لے لی ہو جو ابھی بھی مسودہ کی حالت میں ہے
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=یہ حصہ یا دوسرا حصہ پہلے ہی استعمال ہو چکا ہے لہذا ڈسکاؤنٹ سیریز کو ہٹایا نہیں جا سکتا۔
+BillFrom=سے
+BillTo=کو
+ActionsOnBill=انوائس پر کارروائیاں
+RecurringInvoiceTemplate=ٹیمپلیٹ / بار بار چلنے والی رسید
+NoQualifiedRecurringInvoiceTemplateFound=کوئی اعادی ٹیمپلیٹ انوائس جنریشن کے لیے اہل نہیں ہے۔
+FoundXQualifiedRecurringInvoiceTemplate=%s اعادی ٹیمپلیٹ انوائس جنریشن کے لیے اہل ملا۔
+NotARecurringInvoiceTemplate=اعادی ٹیمپلیٹ انوائس نہیں ہے۔
+NewBill=نئی رسید
+LastBills=تازہ ترین %s رسیدیں۔
+LatestTemplateInvoices=تازہ ترین %s ٹیمپلیٹ انوائسز
+LatestCustomerTemplateInvoices=تازہ ترین %s کسٹمر ٹیمپلیٹ انوائسز
+LatestSupplierTemplateInvoices=تازہ ترین %s وینڈر ٹیمپلیٹ انوائسز
+LastCustomersBills=تازہ ترین %s کسٹمر انوائسز
+LastSuppliersBills=تازہ ترین %s وینڈر انوائسز
+AllBills=تمام رسیدیں
+AllCustomerTemplateInvoices=تمام ٹیمپلیٹ رسیدیں
+OtherBills=دیگر رسیدیں
+DraftBills=رسیدوں کا مسودہ
+CustomersDraftInvoices=کسٹمر ڈرافٹ انوائس
+SuppliersDraftInvoices=وینڈر ڈرافٹ انوائس
+Unpaid=بلا معاوضہ
+ErrorNoPaymentDefined=خرابی کوئی ادائیگی کی وضاحت نہیں کی گئی ہے۔
+ConfirmDeleteBill=کیا آپ واقعی اس رسید کو حذف کرنا چاہتے ہیں؟
+ConfirmValidateBill=کیا آپ واقعی <b> %s </b> حوالہ کے ساتھ اس رسید کی توثیق کرنا چاہتے ہیں؟
+ConfirmUnvalidateBill=کیا آپ واقعی انوائس <b> %s </b> کو ڈرافٹ اسٹیٹس میں تبدیل کرنا چاہتے ہیں؟
+ConfirmClassifyPaidBill=کیا آپ واقعی انوائس <b> %s </b> کو ادا شدہ اسٹیٹس میں تبدیل کرنا چاہتے ہیں؟
+ConfirmCancelBill=کیا آپ واقعی <b> %s </b> رسید منسوخ کرنا چاہتے ہیں؟
+ConfirmCancelBillQuestion=آپ اس انوائس کو 'متروک' کیوں درجہ بندی کرنا چاہتے ہیں؟
+ConfirmClassifyPaidPartially=کیا آپ واقعی انوائس <b> %s </b> کو ادا شدہ اسٹیٹس میں تبدیل کرنا چاہتے ہیں؟
+ConfirmClassifyPaidPartiallyQuestion=یہ رسید مکمل طور پر ادا نہیں کی گئی ہے۔ اس رسید کو بند کرنے کی وجہ کیا ہے؟
+ConfirmClassifyPaidPartiallyReasonAvoir=بقیہ بلا معاوضہ <b> (%s %s) </b> دی گئی رعایت ہے کیونکہ ادائیگی مدت سے پہلے کی گئی تھی۔ میں ایک کریڈٹ نوٹ کے ساتھ VAT کو ریگولرائز کرتا ہوں۔
+ConfirmClassifyPaidPartiallyReasonDiscount=بقیہ بلا معاوضہ <b> (%s %s) </b> دی گئی رعایت ہے کیونکہ ادائیگی مدت سے پہلے کی گئی تھی۔
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=بقیہ بلا معاوضہ <b> (%s %s) </b> دی گئی رعایت ہے کیونکہ ادائیگی مدت سے پہلے کی گئی تھی۔ میں اس رعایت پر VAT کھونا قبول کرتا ہوں۔
+ConfirmClassifyPaidPartiallyReasonDiscountVat=بقیہ بلا معاوضہ <b> (%s %s) </b> دی گئی رعایت ہے کیونکہ ادائیگی مدت سے پہلے کی گئی تھی۔ میں بغیر کریڈٹ نوٹ کے اس رعایت پر VAT وصول کرتا ہوں۔
+ConfirmClassifyPaidPartiallyReasonBadCustomer=برا گاہک
+ConfirmClassifyPaidPartiallyReasonBankCharge=بینک کی طرف سے کٹوتی (درمیانی بینک کی فیس)
+ConfirmClassifyPaidPartiallyReasonProductReturned=مصنوعات جزوی طور پر واپس آ گئیں۔
+ConfirmClassifyPaidPartiallyReasonOther=دوسری وجہ سے چھوڑ دی گئی رقم
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=یہ انتخاب ممکن ہے اگر آپ کی رسید مناسب تبصروں کے ساتھ فراہم کی گئی ہو۔ (مثال کے طور پر "صرف اس قیمت کے مطابق ٹیکس جو اصل میں ادا کیا گیا ہے، کٹوتی کے حقوق دیتا ہے")
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=کچھ ممالک میں، یہ انتخاب صرف اس صورت میں ممکن ہو سکتا ہے جب آپ کی رسید میں درست نوٹ ہوں۔
+ConfirmClassifyPaidPartiallyReasonAvoirDesc=اس انتخاب کا استعمال کریں اگر باقی سب مناسب نہیں ہے۔
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b> برا گاہک </b> وہ صارف ہے جو اپنا قرض ادا کرنے سے انکار کرتا ہے۔
+ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=یہ انتخاب اس وقت استعمال کیا جاتا ہے جب ادائیگی مکمل نہیں ہوتی ہے کیونکہ کچھ مصنوعات واپس کردی گئی تھیں۔
+ConfirmClassifyPaidPartiallyReasonBankChargeDesc=غیر ادا شدہ رقم <b> انٹرمیڈیری بینک فیس ہے
+ConfirmClassifyPaidPartiallyReasonOtherDesc=اس انتخاب کو استعمال کریں اگر باقی سب موزوں نہیں ہیں، مثال کے طور پر درج ذیل صورت حال میں: <br> - ادائیگی مکمل نہیں ہوئی کیونکہ کچھ پروڈکٹس واپس بھیجے گئے تھے ایک کریڈٹ نوٹ بنا کر اکاؤنٹنسی سسٹم میں۔
+ConfirmClassifyAbandonReasonOther=دیگر
+ConfirmClassifyAbandonReasonOtherDesc=یہ انتخاب دیگر تمام معاملات میں استعمال کیا جائے گا۔ مثال کے طور پر کیونکہ آپ ایک بدلی انوائس بنانے کا ارادہ رکھتے ہیں۔
+ConfirmCustomerPayment=کیا آپ <b> %s </b> %s کے لیے اس ادائیگی کے ان پٹ کی تصدیق کرتے ہیں؟
+ConfirmSupplierPayment=کیا آپ <b> %s </b> %s کے لیے اس ادائیگی کے ان پٹ کی تصدیق کرتے ہیں؟
+ConfirmValidatePayment=کیا آپ واقعی اس ادائیگی کی توثیق کرنا چاہتے ہیں؟ ادائیگی کی توثیق ہونے کے بعد کوئی تبدیلی نہیں کی جا سکتی۔
+ValidateBill=رسید کی توثیق کریں۔
+UnvalidateBill=انوائس کو غیر درست کریں۔
+NumberOfBills=رسیدوں کی تعداد
+NumberOfBillsByMonth=ماہانہ رسیدوں کی تعداد
+AmountOfBills=رسیدوں کی رقم
+AmountOfBillsHT=رسیدوں کی رقم (ٹیکس کا خالص)
+AmountOfBillsByMonthHT=ماہ کے حساب سے رسیدوں کی رقم (ٹیکس کا خالص)
+UseSituationInvoices=صورتحال کی رسید کی اجازت دیں۔
+UseSituationInvoicesCreditNote=صورتحال انوائس کریڈٹ نوٹ کی اجازت دیں۔
+Retainedwarranty=برقرار رکھی وارنٹی
+AllowedInvoiceForRetainedWarranty=درج ذیل قسم کی رسیدوں پر قابل استعمال وارنٹی برقرار رکھی گئی ہے۔
+RetainedwarrantyDefaultPercent=وارنٹی ڈیفالٹ فیصد برقرار رکھا
+RetainedwarrantyOnlyForSituation="برقرار وارنٹی" صرف صورت حال کی رسیدوں کے لیے دستیاب کرائیں۔
+RetainedwarrantyOnlyForSituationFinal=صورتحال کی رسیدوں پر عالمی "برقرار وارنٹی" کی کٹوتی صرف حتمی صورت حال پر لاگو ہوتی ہے۔
+ToPayOn=%s پر ادائیگی کرنے کے لیے
+toPayOn=%s پر ادائیگی کریں۔
+RetainedWarranty=برقرار رکھی وارنٹی
+PaymentConditionsShortRetainedWarranty=وارنٹی ادائیگی کی شرائط کو برقرار رکھا
+DefaultPaymentConditionsRetainedWarranty=پہلے سے طے شدہ وارنٹی ادائیگی کی شرائط
+setPaymentConditionsShortRetainedWarranty=برقرار رکھی گئی وارنٹی ادائیگی کی شرائط طے کریں۔
+setretainedwarranty=برقرار رکھی وارنٹی مقرر کریں
+setretainedwarrantyDateLimit=برقرار رکھنے والی وارنٹی کی تاریخ کی حد مقرر کریں۔
+RetainedWarrantyDateLimit=وارنٹی کی تاریخ کی حد برقرار ہے۔
+RetainedWarrantyNeed100Percent=پی ڈی ایف پر ظاہر کرنے کے لیے صورتحال کی رسید 100%% پر ہونی چاہیے۔
+AlreadyPaid=پہلے ہی ادا کر دیا ہے۔
+AlreadyPaidBack=پہلے ہی واپس ادا کر دیا ہے۔
+AlreadyPaidNoCreditNotesNoDeposits=پہلے سے ادا شدہ (بغیر کریڈٹ نوٹ اور نیچے ادائیگیوں کے)
+Abandoned=چھوڑ دیا
+RemainderToPay=باقی بلا معاوضہ
+RemainderToPayMulticurrency=بقایا بلا معاوضہ، اصل کرنسی
+RemainderToTake=لینے کے لیے باقی رقم
+RemainderToTakeMulticurrency=لینے کے لیے باقی رقم، اصل کرنسی
+RemainderToPayBack=ریفنڈ کے لیے باقی رقم
+RemainderToPayBackMulticurrency=ریفنڈ کے لیے باقی رقم، اصل کرنسی
+NegativeIfExcessRefunded=اضافی رقم کی واپسی کی صورت میں منفی
+Rest=زیر التواء
+AmountExpected=دعوی کردہ رقم
+ExcessReceived=ضرورت سے زیادہ موصول ہوئی۔
+ExcessReceivedMulticurrency=اضافی موصول ہوئی، اصل کرنسی
+NegativeIfExcessReceived=اضافی موصول ہونے پر منفی
+ExcessPaid=زائد ادائیگی
+ExcessPaidMulticurrency=اضافی ادا شدہ، اصل کرنسی
+EscompteOffered=رعایت کی پیشکش (مدت سے پہلے ادائیگی)
+EscompteOfferedShort=رعایت
+SendBillRef=رسید جمع کرانا %s
+SendReminderBillRef=رسید جمع کرانا %s (یاد دہانی)
+SendPaymentReceipt=ادائیگی کی رسید جمع کروانا %s
+NoDraftBills=کوئی مسودہ رسید نہیں ہے۔
+NoOtherDraftBills=کوئی دوسرا مسودہ رسید نہیں ہے۔
+NoDraftInvoices=کوئی مسودہ رسید نہیں ہے۔
+RefBill=انوائس کا حوالہ
+ToBill=بل کرنا
+RemainderToBill=بل کے لیے باقی ہے۔
+SendBillByMail=ای میل کے ذریعے رسید بھیجیں۔
+SendReminderBillByMail=ای میل کے ذریعے یاد دہانی بھیجیں۔
+RelatedCommercialProposals=متعلقہ تجارتی تجاویز
+RelatedRecurringCustomerInvoices=متعلقہ بار بار آنے والے کسٹمر انوائسز
+MenuToValid=درست کرنا
+DateMaxPayment=ادائیگی واجب الادا ہے۔
+DateInvoice=رسید کی تاریخ
+DatePointOfTax=ٹیکس کا نقطہ
+NoInvoice=کوئی رسید نہیں۔
+NoOpenInvoice=کوئی کھلا رسید نہیں۔
+NbOfOpenInvoices=کھلی رسیدوں کی تعداد
+ClassifyBill=انوائس کی درجہ بندی کریں۔
+SupplierBillsToPay=غیر ادا شدہ وینڈر انوائسز
+CustomerBillsUnpaid=بلا معاوضہ کسٹمر انوائس
+NonPercuRecuperable=ناقابل بازیافت
+SetConditions=ادائیگی کی شرائط طے کریں۔
+SetMode=ادائیگی کی قسم سیٹ کریں۔
+SetRevenuStamp=ریونیو سٹیمپ سیٹ کریں۔
+Billed=بل کیا گیا۔
+RecurringInvoices=بار بار چلنے والی رسیدیں
+RecurringInvoice=بار بار چلنے والی رسید
+RepeatableInvoice=ٹیمپلیٹ رسید
+RepeatableInvoices=ٹیمپلیٹ رسیدیں
+Repeatable=سانچے
+Repeatables=ٹیمپلیٹس
+ChangeIntoRepeatableInvoice=ٹیمپلیٹ انوائس میں تبدیل کریں۔
+CreateRepeatableInvoice=ٹیمپلیٹ انوائس بنائیں
+CreateFromRepeatableInvoice=ٹیمپلیٹ انوائس سے بنائیں
+CustomersInvoicesAndInvoiceLines=کسٹمر انوائس اور انوائس کی تفصیلات
+CustomersInvoicesAndPayments=کسٹمر کی رسیدیں اور ادائیگیاں
+ExportDataset_invoice_1=کسٹمر انوائس اور انوائس کی تفصیلات
+ExportDataset_invoice_2=کسٹمر کی رسیدیں اور ادائیگیاں
+ProformaBill=پروفارما بل:
+Reduction=کمی
+ReductionShort=ڈسک
+Reductions=کمی
+ReductionsShort=ڈسک
+Discounts=چھوٹ
+AddDiscount=رعایت بنائیں
+AddRelativeDiscount=رشتہ دار رعایت بنائیں
+EditRelativeDiscount=متعلقہ رعایت میں ترمیم کریں۔
+AddGlobalDiscount=مطلق رعایت بنائیں
+EditGlobalDiscounts=مطلق چھوٹ میں ترمیم کریں۔
+AddCreditNote=کریڈٹ نوٹ بنائیں
+ShowDiscount=رعایت دکھائیں۔
+ShowReduc=رعایت دکھائیں۔
+ShowSourceInvoice=سورس انوائس دکھائیں۔
+RelativeDiscount=متعلقہ رعایت
+GlobalDiscount=عالمی رعایت
+CreditNote=کریڈٹ نوٹ
+CreditNotes=قرضے کی پرچیان
+CreditNotesOrExcessReceived=کریڈٹ نوٹس یا زائد وصول ہوئے۔
+Deposit=بیعانہ
+Deposits=نیچے ادائیگیاں
+DiscountFromCreditNote=کریڈٹ نوٹ %s سے رعایت
+DiscountFromDeposit=انوائس %s سے نیچے ادائیگی
+DiscountFromExcessReceived=انوائس %s سے زیادہ ادائیگی
+DiscountFromExcessPaid=انوائس %s سے زیادہ ادائیگی
+AbsoluteDiscountUse=اس قسم کا کریڈٹ انوائس پر اس کی توثیق سے پہلے استعمال کیا جا سکتا ہے۔
+CreditNoteDepositUse=اس قسم کے کریڈٹ استعمال کرنے کے لیے انوائس کی توثیق ہونی چاہیے۔
+NewGlobalDiscount=نیا مطلق رعایت
+NewRelativeDiscount=نیا رشتہ دار رعایت
+DiscountType=ڈسکاؤنٹ کی قسم
+NoteReason=نوٹ/ وجہ
+ReasonDiscount=وجہ
+DiscountOfferedBy=کی طرف سے عطا کیا
+DiscountStillRemaining=چھوٹ یا کریڈٹ دستیاب ہیں۔
+DiscountAlreadyCounted=چھوٹ یا کریڈٹ پہلے ہی استعمال ہو چکے ہیں۔
+CustomerDiscounts=گاہک کی چھوٹ
+SupplierDiscounts=دکانداروں کی چھوٹ
+BillAddress=بل کا پتہ
+HelpEscompte=یہ رعایت گاہک کو دی گئی رعایت ہے کیونکہ ادائیگی مدت سے پہلے کی گئی تھی۔
+HelpAbandonBadCustomer=اس رقم کو چھوڑ دیا گیا ہے (کسٹمر کو برا گاہک کہا جاتا ہے) اور اسے ایک غیر معمولی نقصان سمجھا جاتا ہے۔
+HelpAbandonOther=اس رقم کو چھوڑ دیا گیا ہے کیونکہ یہ ایک غلطی تھی (مثال کے طور پر غلط صارف یا انوائس کی جگہ کسی اور نے لے لی)
+IdSocialContribution=سماجی/مالیاتی ٹیکس ادائیگی کی شناخت
+PaymentId=ادائیگی کی شناخت
+PaymentRef=ادائیگی کا حوالہ
+InvoiceId=انوائس آئی ڈی
+InvoiceRef=انوائس کا حوالہ
+InvoiceDateCreation=انوائس بنانے کی تاریخ
+InvoiceStatus=رسید کی حیثیت
+InvoiceNote=انوائس نوٹ
+InvoicePaid=بل کی ادائیگی ھو چکی ہے
+InvoicePaidCompletely=مکمل طور پر ادا کیا
+InvoicePaidCompletelyHelp=رسید جو مکمل طور پر ادا کی جاتی ہے۔ اس میں وہ رسیدیں شامل نہیں ہیں جن کی ادائیگی جزوی طور پر کی جاتی ہے۔ تمام 'بند' یا غیر 'بند' رسیدوں کی فہرست حاصل کرنے کے لیے، انوائس کی حیثیت پر فلٹر استعمال کرنے کو ترجیح دیں۔
+OrderBilled=آرڈر کا بل دیا گیا۔
+DonationPaid=عطیہ ادا کیا گیا۔
+PaymentNumber=ادائیگی نمبر
+RemoveDiscount=رعایت کو ہٹا دیں۔
+WatermarkOnDraftBill=ڈرافٹ رسیدوں پر واٹر مارک (خالی ہونے پر کچھ نہیں)
+InvoiceNotChecked=کوئی رسید منتخب نہیں کی گئی۔
+ConfirmCloneInvoice=کیا آپ واقعی اس رسید <b> %s </b> کلون کرنا چاہتے ہیں؟
+DisabledBecauseReplacedInvoice=کارروائی غیر فعال ہے کیونکہ انوائس کو تبدیل کر دیا گیا ہے۔
+DescTaxAndDividendsArea=یہ علاقہ خصوصی اخراجات کے لیے کی گئی تمام ادائیگیوں کا خلاصہ پیش کرتا ہے۔ یہاں صرف مقررہ سال کے دوران ادائیگیوں کے ریکارڈ شامل ہیں۔
+NbOfPayments=ادائیگیوں کی تعداد
+SplitDiscount=رعایت کو دو حصوں میں تقسیم کریں۔
+ConfirmSplitDiscount=کیا آپ واقعی <b> %s </b> %s کی اس رعایت کو دو چھوٹی رعایتوں میں تقسیم کرنا چاہتے ہیں؟
+TypeAmountOfEachNewDiscount=دو حصوں میں سے ہر ایک کے لیے ان پٹ کی رقم:
+TotalOfTwoDiscountMustEqualsOriginal=دو نئی رعایتوں کا کل اصل رعایت کی رقم کے برابر ہونا چاہیے۔
+ConfirmRemoveDiscount=کیا آپ واقعی اس رعایت کو ہٹانا چاہتے ہیں؟
+RelatedBill=متعلقہ رسید
+RelatedBills=متعلقہ رسیدیں
+RelatedCustomerInvoices=متعلقہ کسٹمر انوائس
+RelatedSupplierInvoices=متعلقہ وینڈر انوائسز
+LatestRelatedBill=تازہ ترین متعلقہ رسید
+WarningBillExist=انتباہ، ایک یا زیادہ رسیدیں پہلے سے موجود ہیں۔
+MergingPDFTool=پی ڈی ایف ٹول کو ضم کرنا
+AmountPaymentDistributedOnInvoice=ادائیگی کی رقم انوائس پر تقسیم کی جاتی ہے۔
+PaymentOnDifferentThirdBills=مختلف فریق ثالث کے بلوں پر ادائیگی کی اجازت دیں لیکن ایک ہی پیرنٹ کمپنی
+PaymentNote=ادائیگی کا نوٹ
+ListOfPreviousSituationInvoices=پچھلی صورتحال کی رسیدوں کی فہرست
+ListOfNextSituationInvoices=اگلی صورتحال کے رسیدوں کی فہرست
+ListOfSituationInvoices=صورتحال کی رسیدوں کی فہرست
+CurrentSituationTotal=کل موجودہ صورتحال
+DisabledBecauseNotEnouthCreditNote=کسی صورت حال کی رسید کو سائیکل سے ہٹانے کے لیے، اس انوائس کے کریڈٹ نوٹ کی کل کو اس انوائس کے کل کا احاطہ کرنا چاہیے
+RemoveSituationFromCycle=اس انوائس کو سائیکل سے ہٹا دیں۔
+ConfirmRemoveSituationFromCycle=اس انوائس %s کو سائیکل سے ہٹا دیں؟
+ConfirmOuting=باہر جانے کی تصدیق کریں۔
+FrequencyPer_d=ہر %s دن
+FrequencyPer_m=ہر %s ماہ بعد
+FrequencyPer_y=ہر %s سال
+FrequencyUnit=تعدد یونٹ
+toolTipFrequency=مثالیں: <br> <b> سیٹ 7، دن </b> : ہر 7 دن بعد ایک نیا انوائس دیں
+NextDateToExecution=اگلی انوائس جنریشن کی تاریخ
+NextDateToExecutionShort=اگلی نسل کی تاریخ۔
+DateLastGeneration=تازہ ترین نسل کی تاریخ
+DateLastGenerationShort=تازہ ترین جنرل کی تاریخ۔
+MaxPeriodNumber=زیادہ سے زیادہ انوائس نسل کی تعداد
+NbOfGenerationDone=انوائس جنریشن کی تعداد پہلے ہی ہو چکی ہے۔
+NbOfGenerationOfRecordDone=ریکارڈ جنریشن کی تعداد پہلے ہی ہو چکی ہے۔
+NbOfGenerationDoneShort=مکمل ہونے والی نسل کی تعداد
+MaxGenerationReached=نسلوں کی زیادہ سے زیادہ تعداد تک پہنچ گئی۔
+InvoiceAutoValidate=انوائسز کی خود بخود توثیق کریں۔
+GeneratedFromRecurringInvoice=ٹیمپلیٹ ریکرنگ انوائس %s سے تیار کردہ
+DateIsNotEnough=ابھی تک تاریخ نہیں پہنچی۔
+InvoiceGeneratedFromTemplate=انوائس %s بار بار چلنے والی ٹیمپلیٹ انوائس %s سے تیار کیا گیا
+GeneratedFromTemplate=ٹیمپلیٹ انوائس %s سے تیار کردہ
+WarningInvoiceDateInFuture=وارننگ، انوائس کی تاریخ موجودہ تاریخ سے زیادہ ہے۔
+WarningInvoiceDateTooFarInFuture=وارننگ، انوائس کی تاریخ موجودہ تاریخ سے بہت دور ہے۔
+ViewAvailableGlobalDiscounts=دستیاب چھوٹ دیکھیں
+GroupPaymentsByModOnReports=رپورٹس پر موڈ کے لحاظ سے گروپ ادائیگی
 # PaymentConditions
-Statut=Status
-PaymentConditionShortRECEP=Due Upon Receipt
-PaymentConditionRECEP=Due Upon Receipt
-PaymentConditionShort30D=30 days
-PaymentCondition30D=30 days
-PaymentConditionShort30DENDMONTH=30 days of month-end
-PaymentCondition30DENDMONTH=Within 30 days following the end of the month
-PaymentConditionShort60D=60 days
-PaymentCondition60D=60 days
-PaymentConditionShort60DENDMONTH=60 days of month-end
-PaymentCondition60DENDMONTH=Within 60 days following the end of the month
-PaymentConditionShortPT_DELIVERY=Delivery
-PaymentConditionPT_DELIVERY=On delivery
-PaymentConditionShortPT_ORDER=Order
-PaymentConditionPT_ORDER=On order
+Statut=حالت
+PaymentConditionShortRECEP=وصولی پر واجب الادا
+PaymentConditionRECEP=وصولی پر واجب الادا
+PaymentConditionShort30D=30 یوم
+PaymentCondition30D=30 یوم
+PaymentConditionShort30DENDMONTH=مہینے کے اختتام کے 30 دن
+PaymentCondition30DENDMONTH=مہینے کے اختتام کے بعد 30 دنوں کے اندر
+PaymentConditionShort60D=60 دن
+PaymentCondition60D=60 دن
+PaymentConditionShort60DENDMONTH=مہینے کے اختتام کے 60 دن
+PaymentCondition60DENDMONTH=مہینے کے اختتام کے بعد 60 دنوں کے اندر
+PaymentConditionShortPT_DELIVERY=ترسیل
+PaymentConditionPT_DELIVERY=پہنچانے پر
+PaymentConditionShortPT_ORDER=ترتیب
+PaymentConditionPT_ORDER=حکم پر
 PaymentConditionShortPT_5050=50-50
-PaymentConditionPT_5050=50%% in advance, 50%% on delivery
-PaymentConditionShort10D=10 days
-PaymentCondition10D=10 days
-PaymentConditionShort10DENDMONTH=10 days of month-end
-PaymentCondition10DENDMONTH=Within 10 days following the end of the month
-PaymentConditionShort14D=14 days
-PaymentCondition14D=14 days
-PaymentConditionShort14DENDMONTH=14 days of month-end
-PaymentCondition14DENDMONTH=Within 14 days following the end of the month
-FixAmount=Fixed amount - 1 line with label '%s'
-VarAmount=Variable amount (%% tot.)
-VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
-VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
+PaymentConditionPT_5050=50%% پیشگی، 50%% ڈیلیوری پر
+PaymentConditionShort10D=10 دن
+PaymentCondition10D=10 دن
+PaymentConditionShort10DENDMONTH=مہینے کے اختتام کے 10 دن
+PaymentCondition10DENDMONTH=مہینے کے اختتام کے بعد 10 دنوں کے اندر
+PaymentConditionShort14D=14 دن
+PaymentCondition14D=14 دن
+PaymentConditionShort14DENDMONTH=مہینے کے اختتام کے 14 دن
+PaymentCondition14DENDMONTH=مہینے کے اختتام کے بعد 14 دنوں کے اندر
+FixAmount=مقررہ رقم - '%s' لیبل کے ساتھ 1 لائن
+VarAmount=متغیر رقم (%% tot.)
+VarAmountOneLine=متغیر رقم (%% tot.) - '%s' لیبل کے ساتھ 1 لائن
+VarAmountAllLines=متغیر رقم (%% tot.) - اصل سے تمام لائنیں
 # PaymentType
-PaymentTypeVIR=Bank transfer
-PaymentTypeShortVIR=Bank transfer
-PaymentTypePRE=Direct debit payment order
-PaymentTypeShortPRE=Debit payment order
-PaymentTypeLIQ=Cash
-PaymentTypeShortLIQ=Cash
-PaymentTypeCB=Credit card
-PaymentTypeShortCB=Credit card
-PaymentTypeCHQ=Check
-PaymentTypeShortCHQ=Check
-PaymentTypeTIP=TIP (Documents against Payment)
-PaymentTypeShortTIP=TIP Payment
-PaymentTypeVAD=Online payment
-PaymentTypeShortVAD=Online payment
-PaymentTypeTRA=Bank draft
-PaymentTypeShortTRA=Draft
-PaymentTypeFAC=Factor
-PaymentTypeShortFAC=Factor
-BankDetails=Bank details
-BankCode=Bank code
-DeskCode=Branch code
-BankAccountNumber=Account number
-BankAccountNumberKey=Checksum
-Residence=Address
-IBANNumber=IBAN account number
+PaymentTypeVIR=بینک ٹرانسفر
+PaymentTypeShortVIR=بینک ٹرانسفر
+PaymentTypePRE=براہ راست ڈیبٹ ادائیگی کا آرڈر
+PaymentTypeShortPRE=ڈیبٹ ادائیگی کا آرڈر
+PaymentTypeLIQ=نقد
+PaymentTypeShortLIQ=نقد
+PaymentTypeCB=کریڈٹ کارڈ
+PaymentTypeShortCB=کریڈٹ کارڈ
+PaymentTypeCHQ=چیک کریں۔
+PaymentTypeShortCHQ=چیک کریں۔
+PaymentTypeTIP=TIP (ادائیگی کے خلاف دستاویزات)
+PaymentTypeShortTIP=TIP ادائیگی
+PaymentTypeVAD=آن لائن ادائیگی
+PaymentTypeShortVAD=آن لائن ادائیگی
+PaymentTypeTRA=بینک ڈرافٹ
+PaymentTypeShortTRA=مسودہ
+PaymentTypeFAC=عنصر
+PaymentTypeShortFAC=عنصر
+PaymentTypeDC=ڈیبٹ/کریڈٹ کارڈ
+PaymentTypePP=پے پال
+BankDetails=بینک کی تفصیلات
+BankCode=بینک کوڈ
+DeskCode=برانچ کوڈ
+BankAccountNumber=اکاؤنٹ نمبر
+BankAccountNumberKey=چیکسم
+Residence=پتہ
+IBANNumber=IBAN اکاؤنٹ نمبر
 IBAN=IBAN
-CustomerIBAN=IBAN of customer
-SupplierIBAN=IBAN of vendor
+CustomerIBAN=گاہک کا IBAN
+SupplierIBAN=وینڈر کا IBAN
 BIC=BIC/SWIFT
-BICNumber=BIC/SWIFT code
-ExtraInfos=Extra infos
-RegulatedOn=Regulated on
-ChequeNumber=Check N°
-ChequeOrTransferNumber=Check/Transfer N°
-ChequeBordereau=Check schedule
-ChequeMaker=Check/Transfer sender
-ChequeBank=Bank of Check
-CheckBank=Check
-NetToBePaid=Net to be paid
-PhoneNumber=Tel
-FullPhoneNumber=Telephone
-TeleFax=Fax
-PrettyLittleSentence=Accept the amount of payments due by checks issued in my name as a Member of an accounting association approved by the Fiscal Administration.
-IntracommunityVATNumber=Intra-Community VAT ID
-PaymentByChequeOrderedTo=Check payments (including tax) are payable to %s, send to
-PaymentByChequeOrderedToShort=Check payments (incl. tax) are payable to
-SendTo=sent to
-PaymentByTransferOnThisBankAccount=Payment by transfer to the following bank account
-VATIsNotUsedForInvoice=* Non applicable VAT art-293B of CGI
-LawApplicationPart1=By application of the law 80.335 of 12/05/80
-LawApplicationPart2=the goods remain the property of
-LawApplicationPart3=the seller until full payment of
-LawApplicationPart4=their price.
-LimitedLiabilityCompanyCapital=SARL with Capital of
-UseLine=Apply
-UseDiscount=Use discount
-UseCredit=Use credit
-UseCreditNoteInInvoicePayment=Reduce amount to pay with this credit
-MenuChequeDeposits=Check Deposits
-MenuCheques=Checks
-MenuChequesReceipts=Check receipts
-NewChequeDeposit=New deposit
-ChequesReceipts=Check receipts
-ChequesArea=Check deposits area
-ChequeDeposits=Check deposits
-Cheques=Checks
-DepositId=Id deposit
-NbCheque=Number of checks
-CreditNoteConvertedIntoDiscount=This %s has been converted into %s
-UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third-party address as recipient for invoices
-ShowUnpaidAll=Show all unpaid invoices
-ShowUnpaidLateOnly=Show late unpaid invoices only
-PaymentInvoiceRef=Payment invoice %s
-ValidateInvoice=Validate invoice
-ValidateInvoices=Validate invoices
-Cash=Cash
-Reported=Delayed
-DisabledBecausePayments=Not possible since there are some payments
-CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
-CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
-CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
-ExpectedToPay=Expected payment
-CantRemoveConciliatedPayment=Can't remove reconciled payment
-PayedByThisPayment=Paid by this payment
-ClosePaidInvoicesAutomatically=Classify automatically all standard, down payment or replacement invoices as "Paid" when payment is done entirely.
-ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Paid" when refund is done entirely.
-ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
-ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
-ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
-AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
-ToMakePayment=Pay
-ToMakePaymentBack=Pay back
-ListOfYourUnpaidInvoices=List of unpaid invoices
-NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
-RevenueStamp=Tax stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
-YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
-PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
-PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
-TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
-MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
-TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
-CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
-EarlyClosingReason=Early closing reason
-EarlyClosingComment=Early closing note
+BICNumber=BIC/SWIFT کوڈ
+ExtraInfos=اضافی معلومات
+RegulatedOn=پر ریگولیٹڈ
+ChequeNumber=N° چیک کریں۔
+ChequeOrTransferNumber=چیک/منتقلی N°
+ChequeBordereau=شیڈول چیک کریں۔
+ChequeMaker=بھیجنے والے کو چیک/منتقل کریں۔
+ChequeBank=بینک آف چیک
+CheckBank=چیک کریں۔
+NetToBePaid=ادا کرنے کے لیے خالص
+PhoneNumber=ٹیلی فون
+FullPhoneNumber=ٹیلی فون
+TeleFax=فیکس
+PrettyLittleSentence=مالیاتی انتظامیہ کی طرف سے منظور شدہ اکاؤنٹنگ ایسوسی ایشن کے ممبر کی حیثیت سے میرے نام پر جاری کردہ چیکس کے ذریعے واجب الادا ادائیگیوں کی رقم کو قبول کریں۔
+IntracommunityVATNumber=انٹرا کمیونٹی VAT ID
+PaymentByChequeOrderedTo=چیک کی ادائیگیاں (بشمول ٹیکس) %s کو قابل ادائیگی ہیں، بھیجیں
+PaymentByChequeOrderedToShort=چیک کی ادائیگیاں (ٹیکس سمیت) قابل ادائیگی ہیں۔
+SendTo=کو بھیجا
+PaymentByTransferOnThisBankAccount=درج ذیل بینک اکاؤنٹ میں ٹرانسفر کے ذریعے ادائیگی
+VATIsNotUsedForInvoice=* CGI کا غیر قابل اطلاق VAT آرٹ-293B
+LawApplicationPart1=قانون 80.335 از 12/05/80 کے اطلاق سے
+LawApplicationPart2=سامان کی ملکیت رہتی ہے
+LawApplicationPart3=کی مکمل ادائیگی تک بیچنے والے
+LawApplicationPart4=ان کی قیمت.
+LimitedLiabilityCompanyCapital=کیپٹل کے ساتھ SARL
+UseLine=درخواست دیں
+UseDiscount=ڈسکاؤنٹ استعمال کریں۔
+UseCredit=کریڈٹ استعمال کریں۔
+UseCreditNoteInInvoicePayment=اس کریڈٹ کے ساتھ ادائیگی کے لیے رقم کم کریں۔
+MenuChequeDeposits=چیک ڈپازٹس
+MenuCheques=چیک کرتا ہے۔
+MenuChequesReceipts=رسیدیں چیک کریں۔
+NewChequeDeposit=نیا ڈپازٹ
+ChequesReceipts=رسیدیں چیک کریں۔
+ChequesArea=ڈپازٹ ایریا چیک کریں۔
+ChequeDeposits=چیک ڈپازٹس
+Cheques=چیک کرتا ہے۔
+DepositId=آئی ڈی ڈپازٹ
+NbCheque=چیکوں کی تعداد
+CreditNoteConvertedIntoDiscount=اس %s کو %s میں تبدیل کر دیا گیا ہے۔
+UsBillingContactAsIncoiveRecipientIfExist=انوائس کے وصول کنندہ کے طور پر فریق ثالث کے پتے کی بجائے 'بلنگ رابطہ' ٹائپ کے ساتھ رابطہ/پتہ استعمال کریں
+ShowUnpaidAll=تمام غیر ادا شدہ رسیدیں دکھائیں۔
+ShowUnpaidLateOnly=صرف تاخیر سے ادا شدہ رسیدیں دکھائیں۔
+PaymentInvoiceRef=ادائیگی کی رسید %s
+ValidateInvoice=رسید کی توثیق کریں۔
+ValidateInvoices=رسیدوں کی تصدیق کریں۔
+Cash=نقد
+Reported=تاخیر
+DisabledBecausePayments=ممکن نہیں کیونکہ کچھ ادائیگیاں ہیں۔
+CantRemovePaymentWithOneInvoicePaid=ادائیگی کو ہٹایا نہیں جا سکتا کیونکہ کم از کم ایک انوائس کلاسیفائیڈ ادا شدہ ہے۔
+CantRemovePaymentVATPaid=ادائیگی کو ہٹایا نہیں جا سکتا کیونکہ VAT ڈیکلریشن کی درجہ بندی ادا کی گئی ہے۔
+CantRemovePaymentSalaryPaid=ادائیگی کو ختم نہیں کیا جا سکتا کیونکہ تنخواہ کی درجہ بندی ادا کی جاتی ہے۔
+ExpectedToPay=متوقع ادائیگی
+CantRemoveConciliatedPayment=مصالحت شدہ ادائیگی کو ہٹایا نہیں جا سکتا
+PayedByThisPayment=اس ادائیگی سے ادا کیا گیا۔
+ClosePaidInvoicesAutomatically=ادائیگی مکمل ہونے پر تمام معیاری، ڈاؤن پیمنٹ یا متبادل رسیدوں کو خود بخود "ادائیگی" کے طور پر درجہ بندی کریں۔
+ClosePaidCreditNotesAutomatically=جب ریفنڈ مکمل ہو جائے تو خود بخود تمام کریڈٹ نوٹ کو "ادائیگی" کے طور پر درجہ بندی کریں۔
+ClosePaidContributionsAutomatically=جب ادائیگی مکمل ہو جائے تو خود بخود تمام سماجی یا مالی تعاون کو "ادائیگی" کے طور پر درجہ بندی کریں۔
+ClosePaidVATAutomatically=جب ادائیگی مکمل ہو جائے تو خود بخود VAT کے اعلان کو "ادائیگی" کے طور پر درجہ بندی کریں۔
+ClosePaidSalaryAutomatically=جب ادائیگی مکمل ہو جائے تو خود بخود تنخواہ کو "ادائیگی" کے طور پر درجہ بندی کریں۔
+AllCompletelyPayedInvoiceWillBeClosed=تمام انوائسز جن میں ادائیگی کرنا باقی نہیں ہے خود بخود "ادائیگی" کی حیثیت کے ساتھ بند ہو جائے گی۔
+ToMakePayment=ادا کریں۔
+ToMakePaymentBack=واپس ادا کریں۔
+ListOfYourUnpaidInvoices=غیر ادا شدہ رسیدوں کی فہرست
+NoteListOfYourUnpaidInvoices=نوٹ: اس فہرست میں صرف تیسرے فریق کی رسیدیں شامل ہیں جن سے آپ بطور سیلز نمائندہ منسلک ہیں۔
+RevenueStamp=ٹیکس سٹیمپ
+YouMustCreateInvoiceFromThird=یہ اختیار صرف اس وقت دستیاب ہوتا ہے جب فریق ثالث کے ٹیب "کسٹمر" سے انوائس بناتے ہوں۔
+YouMustCreateInvoiceFromSupplierThird=یہ اختیار صرف اس وقت دستیاب ہوتا ہے جب فریق ثالث کے ٹیب "وینڈر" سے انوائس بناتے ہوں۔
+YouMustCreateStandardInvoiceFirstDesc=آپ کو سب سے پہلے ایک معیاری انوائس بنانا ہوگی اور اسے "ٹیمپلیٹ" میں تبدیل کرکے ایک نیا ٹیمپلیٹ انوائس بنانا ہوگا۔
+PDFCrabeDescription=انوائس پی ڈی ایف ٹیمپلیٹ کریب۔ ایک مکمل انوائس ٹیمپلیٹ (سپنج ٹیمپلیٹ کا پرانا نفاذ)
+PDFSpongeDescription=انوائس پی ڈی ایف ٹیمپلیٹ سپنج۔ ایک مکمل انوائس ٹیمپلیٹ
+PDFCrevetteDescription=انوائس پی ڈی ایف ٹیمپلیٹ کریویٹ۔ صورت حال کی رسیدوں کے لیے ایک مکمل انوائس ٹیمپلیٹ
+TerreNumRefModelDesc1=معیاری رسیدوں کے لیے %syymm-nnnn فارمیٹ میں واپسی نمبر اور کریڈٹ نوٹ کے لیے %syymm-nnnn جہاں yy سال ہے، mm مہینہ ہے اور nnnn ایک ترتیب وار خود بخود بڑھنے والا نمبر ہے جس میں کوئی وقفہ نہیں ہے اور 0 پر واپس نہیں آتا ہے۔
+MarsNumRefModelDesc1=معیاری رسیدوں کے لیے %syymm-nnnn فارمیٹ میں واپسی کا نمبر، متبادل رسیدوں کے لیے %syymm-nnnn، ڈاؤن پیمنٹ انوائسز کے لیے %syymm-nnnn اور %syymm-nnnn کے لیے %syymm-nnnn سال کے لیے کریڈٹ نمبر ہے، اور a0ecb2ec87mm-90000000000000 سال کے لیے خودکار نمبر ہے۔ بغیر کسی وقفے اور 0 پر واپسی کے بغیر
+TerreNumRefModelError=$syymm سے شروع ہونے والا بل پہلے سے موجود ہے اور ترتیب کے اس ماڈل کے ساتھ مطابقت نہیں رکھتا ہے۔ اس ماڈیول کو فعال کرنے کے لیے اسے ہٹا دیں یا اس کا نام تبدیل کریں۔
+CactusNumRefModelDesc1=معیاری رسیدوں کے لیے %syymm-nnnn فارمیٹ میں واپسی کا نمبر، کریڈٹ نوٹس کے لیے %syymm-nnnn اور ڈاؤن پیمنٹ انوائسز کے لیے %syymm-nnnn جہاں yy سال ہے، mm ایک مہینہ ہے اور نمبر کے ساتھ کوئی وقفہ نہیں ہے 0
+EarlyClosingReason=ابتدائی بندش کی وجہ
+EarlyClosingComment=ابتدائی اختتامی نوٹ
 ##### Types de contacts #####
-TypeContact_facture_internal_SALESREPFOLL=Representative following-up customer invoice
-TypeContact_facture_external_BILLING=Customer invoice contact
-TypeContact_facture_external_SHIPPING=Customer shipping contact
-TypeContact_facture_external_SERVICE=Customer service contact
-TypeContact_invoice_supplier_internal_SALESREPFOLL=Representative following-up vendor invoice
-TypeContact_invoice_supplier_external_BILLING=Vendor invoice contact
-TypeContact_invoice_supplier_external_SHIPPING=Vendor shipping contact
-TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
+TypeContact_facture_internal_SALESREPFOLL=نمائندہ پیروی کرنے والا کسٹمر انوائس
+TypeContact_facture_external_BILLING=کسٹمر انوائس رابطہ
+TypeContact_facture_external_SHIPPING=کسٹمر شپنگ رابطہ
+TypeContact_facture_external_SERVICE=کسٹمر سروس سے رابطہ کریں۔
+TypeContact_invoice_supplier_internal_SALESREPFOLL=نمائندہ فالو اپ وینڈر انوائس
+TypeContact_invoice_supplier_external_BILLING=وینڈر انوائس رابطہ
+TypeContact_invoice_supplier_external_SHIPPING=وینڈر شپنگ رابطہ
+TypeContact_invoice_supplier_external_SERVICE=وینڈر سروس سے رابطہ کریں۔
 # Situation invoices
-InvoiceFirstSituationAsk=First situation invoice
-InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
-InvoiceSituation=Situation invoice
-PDFInvoiceSituation=Situation invoice
-InvoiceSituationAsk=Invoice following the situation
-InvoiceSituationDesc=Create a new situation following an already existing one
-SituationAmount=Situation invoice amount(net)
-SituationDeduction=Situation subtraction
-ModifyAllLines=Modify all lines
-CreateNextSituationInvoice=Create next situation
-ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
-ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
-ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
-NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
-DisabledBecauseNotLastInCycle=The next situation already exists.
-DisabledBecauseFinal=This situation is final.
+InvoiceFirstSituationAsk=پہلی صورت حال کی رسید
+InvoiceFirstSituationDesc=<b> صورتحال کی رسیدیں </b> کسی پیشرفت سے متعلق حالات سے منسلک ہیں، مثال کے طور پر تعمیر کی ترقی۔ ہر صورت حال ایک انوائس سے منسلک ہے.
+InvoiceSituation=صورتحال رسید
+PDFInvoiceSituation=صورتحال رسید
+InvoiceSituationAsk=صورت حال کے بعد رسید
+InvoiceSituationDesc=پہلے سے موجود صورتحال کے بعد ایک نئی صورتحال پیدا کریں۔
+SituationAmount=صورت حال رسید کی رقم (خالص)
+SituationDeduction=صورتحال گھٹاؤ
+ModifyAllLines=تمام لائنوں میں ترمیم کریں۔
+CreateNextSituationInvoice=اگلی صورتحال بنائیں
+ErrorFindNextSituationInvoice=اگلی صورتحال سائیکل ریف کو تلاش کرنے میں خرابی
+ErrorOutingSituationInvoiceOnUpdate=اس صورتحال کے انوائس کو آؤٹ کرنے سے قاصر ہے۔
+ErrorOutingSituationInvoiceCreditNote=منسلک کریڈٹ نوٹ کو باہر کرنے سے قاصر ہے۔
+NotLastInCycle=یہ انوائس سائیکل میں تازہ ترین نہیں ہے اور اس میں ترمیم نہیں کی جانی چاہیے۔
+DisabledBecauseNotLastInCycle=اگلی صورتحال پہلے سے موجود ہے۔
+DisabledBecauseFinal=یہ صورتحال حتمی ہے۔
 situationInvoiceShortcode_AS=AS
-situationInvoiceShortcode_S=S
-CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
-NoSituations=No open situations
-InvoiceSituationLast=Final and general invoice
-PDFCrevetteSituationNumber=Situation N°%s
-PDFCrevetteSituationInvoiceLineDecompte=Situation invoice - COUNT
-PDFCrevetteSituationInvoiceTitle=Situation invoice
-PDFCrevetteSituationInvoiceLine=Situation N°%s: Inv. N°%s on %s
-TotalSituationInvoice=Total situation
-invoiceLineProgressError=Invoice line progress can't be greater than or equal to the next invoice line
-updatePriceNextInvoiceErrorUpdateline=Error: update price on invoice line: %s
-ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
-ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both methods (manual and automatic) can be used together with no risk of duplication.
-DeleteRepeatableInvoice=Delete template invoice
-ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
-CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per selected object)
-BillCreated=%s invoice(s) generated
-BillXCreated=Invoice %s generated
-StatusOfGeneratedDocuments=Status of document generation
-DoNotGenerateDoc=Do not generate document file
-AutogenerateDoc=Auto generate document file
-AutoFillDateFrom=Set start date for service line with invoice date
-AutoFillDateFromShort=Set start date
-AutoFillDateTo=Set end date for service line with next invoice date
-AutoFillDateToShort=Set end date
-MaxNumberOfGenerationReached=Max number of gen. reached
-BILL_DELETEInDolibarr=Invoice deleted
-BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
-UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
-CustomersInvoicesArea=Customer billing area
-SupplierInvoicesArea=Supplier billing area
-FacParentLine=Invoice Line Parent
-SituationTotalRayToRest=Remainder to pay without taxe
-PDFSituationTitle=Situation n° %d
-SituationTotalProgress=Total progress %d %%
-SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
-NoPaymentAvailable=No payment available for %s
-PaymentRegisteredAndInvoiceSetToPaid=Payment registered and invoice %s set to paid
-SendEmailsRemindersOnInvoiceDueDate=Send reminder by email for unpaid invoices
+situationInvoiceShortcode_S=ایس
+CantBeLessThanMinPercent=ترقی پچھلی صورت حال میں اس کی قدر سے کم نہیں ہو سکتی۔
+NoSituations=کھلے حالات نہیں۔
+InvoiceSituationLast=حتمی اور عام رسید
+PDFCrevetteSituationNumber=صورتحال N°%s
+PDFCrevetteSituationInvoiceLineDecompte=صورتحال رسید - COUNT
+PDFCrevetteSituationInvoiceTitle=صورتحال رسید
+PDFCrevetteSituationInvoiceLine=صورتحال N°%s: Inv. N°%s پر %s
+TotalSituationInvoice=کل صورتحال
+invoiceLineProgressError=انوائس لائن کی پیشرفت اگلی انوائس لائن سے زیادہ یا اس کے برابر نہیں ہو سکتی
+updatePriceNextInvoiceErrorUpdateline=خرابی: انوائس لائن پر قیمت کو اپ ڈیٹ کریں: %s
+ToCreateARecurringInvoice=اس معاہدے کے لیے بار بار چلنے والی انوائس بنانے کے لیے، پہلے یہ ڈرافٹ انوائس بنائیں، پھر اسے انوائس ٹیمپلیٹ میں تبدیل کریں اور مستقبل کے انوائسز کی نسل کے لیے تعدد کی وضاحت کریں۔
+ToCreateARecurringInvoiceGene=مستقبل کی رسیدیں باقاعدگی سے اور دستی طور پر بنانے کے لیے، صرف مینو <strong> %s - %s - %s a0a65d071f6fc90z پر جائیں۔
+ToCreateARecurringInvoiceGeneAuto=اگر آپ کو ایسی رسیدیں خود بخود تیار کرنے کی ضرورت ہے تو، اپنے منتظم کو فعال کرنے اور ماڈیول ترتیب دینے کے لیے کہیں <strong> %s </strong> ۔ نوٹ کریں کہ دونوں طریقوں (دستی اور خودکار) کو ایک ساتھ استعمال کیا جا سکتا ہے جس میں نقل کا کوئی خطرہ نہیں ہے۔
+DeleteRepeatableInvoice=ٹیمپلیٹ انوائس کو حذف کریں۔
+ConfirmDeleteRepeatableInvoice=کیا آپ واقعی ٹیمپلیٹ انوائس کو حذف کرنا چاہتے ہیں؟
+CreateOneBillByThird=فی تھرڈ پارٹی ایک انوائس بنائیں (بصورت دیگر، فی منتخب آبجیکٹ ایک انوائس)
+BillCreated=%s انوائس تیار کی گئی۔
+BillXCreated=انوائس %s تیار ہوا۔
+StatusOfGeneratedDocuments=دستاویز کی تیاری کی حیثیت
+DoNotGenerateDoc=دستاویز فائل نہ بنائیں
+AutogenerateDoc=دستاویز فائل کو خود بخود تیار کریں۔
+AutoFillDateFrom=انوائس کی تاریخ کے ساتھ سروس لائن کے لیے آغاز کی تاریخ مقرر کریں۔
+AutoFillDateFromShort=آغاز کی تاریخ مقرر کریں۔
+AutoFillDateTo=اگلی انوائس تاریخ کے ساتھ سروس لائن کے لیے اختتامی تاریخ مقرر کریں۔
+AutoFillDateToShort=اختتامی تاریخ مقرر کریں۔
+MaxNumberOfGenerationReached=جین کی زیادہ سے زیادہ تعداد۔ پہنچ گئے
+BILL_DELETEInDolibarr=رسید حذف کر دی گئی۔
+BILL_SUPPLIER_DELETEInDolibarr=فراہم کنندہ کی رسید حذف کر دی گئی۔
+UnitPriceXQtyLessDiscount=یونٹ کی قیمت x مقدار - ڈسکاؤنٹ
+CustomersInvoicesArea=کسٹمر بلنگ ایریا
+SupplierInvoicesArea=سپلائر بلنگ ایریا
+FacParentLine=انوائس لائن والدین
+SituationTotalRayToRest=ٹیکس کے بغیر ادا کرنے کے لیے باقی ہے۔
+PDFSituationTitle=صورتحال n° %d
+SituationTotalProgress=کل پیش رفت %d %%
+SearchUnpaidInvoicesWithDueDate=مقررہ تاریخ = %s کے ساتھ بلا معاوضہ رسیدیں تلاش کریں۔
+NoPaymentAvailable=%s کے لیے کوئی ادائیگی دستیاب نہیں ہے۔
+PaymentRegisteredAndInvoiceSetToPaid=ادائیگی رجسٹرڈ اور انوائس %s ادا کرنے پر سیٹ ہے۔
+SendEmailsRemindersOnInvoiceDueDate=بلا معاوضہ رسیدوں کے لیے ای میل کے ذریعے یاد دہانی بھیجیں۔
diff --git a/htdocs/langs/ur_PK/blockedlog.lang b/htdocs/langs/ur_PK/blockedlog.lang
index 44cb183050a..e1287289172 100644
--- a/htdocs/langs/ur_PK/blockedlog.lang
+++ b/htdocs/langs/ur_PK/blockedlog.lang
@@ -1,54 +1,54 @@
-BlockedLog=Unalterable Logs
-Field=Field
-BlockedLogDesc=This module tracks some events into an unalterable log (that you can't modify once recorded) into a block chain, in real time. This module provides compatibility with requirements of laws of some countries (like France with the law Finance 2016 - Norme NF525).
-Fingerprints=Archived events and fingerprints
-FingerprintsDesc=This is the tool to browse or extract the unalterable logs. Unalterable logs are generated and archived locally into a dedicated table, in real time when you record a business event. You can use this tool to export this archive and save it into an external support (some countries, like France, ask that you do it every year). Note that, there is no feature to purge this log and every change tried to be done directly into this log (by a hacker for example) will be reported with a non-valid fingerprint. If you really need to purge this table because you used your application for a demo/test purpose and want to clean your data to start your production, you can ask your reseller or integrator to reset your database (all your data will be removed).
-CompanyInitialKey=Company initial key (hash of genesis block)
-BrowseBlockedLog=Unalterable logs
-ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
-ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
-DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists) or has modified checksum of the previous record.
-OkCheckFingerprintValidity=Archived log record is valid. The data on this line was not modified and the entry follows the previous one.
-OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to previous one but the chain was corrupted previously.
-AddedByAuthority=Stored into remote authority
-NotAddedByAuthorityYet=Not yet stored into remote authority
-ShowDetails=Show stored details
-logPAYMENT_VARIOUS_CREATE=Payment (not assigned to an invoice) created
-logPAYMENT_VARIOUS_MODIFY=Payment (not assigned to an invoice) modified
-logPAYMENT_VARIOUS_DELETE=Payment (not assigned to an invoice) logical deletion
-logPAYMENT_ADD_TO_BANK=Payment added to bank
-logPAYMENT_CUSTOMER_CREATE=Customer payment created
-logPAYMENT_CUSTOMER_DELETE=Customer payment logical deletion
-logDONATION_PAYMENT_CREATE=Donation payment created
-logDONATION_PAYMENT_DELETE=Donation payment logical deletion
-logBILL_PAYED=Customer invoice paid
-logBILL_UNPAYED=Customer invoice set unpaid
-logBILL_VALIDATE=Customer invoice validated
-logBILL_SENTBYMAIL=Customer invoice send by mail
-logBILL_DELETE=Customer invoice logically deleted
-logMODULE_RESET=Module BlockedLog was disabled
-logMODULE_SET=Module BlockedLog was enabled
-logDON_VALIDATE=Donation validated
-logDON_MODIFY=Donation modified
-logDON_DELETE=Donation logical deletion
-logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
-logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
-logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
-logCASHCONTROL_VALIDATE=Cash desk closing recording
-BlockedLogBillDownload=Customer invoice download
-BlockedLogBillPreview=Customer invoice preview
-BlockedlogInfoDialog=Log Details
-ListOfTrackedEvents=List of tracked events
-Fingerprint=Fingerprint
-DownloadLogCSV=Export archived logs (CSV)
-logDOC_PREVIEW=Preview of a validated document in order to print or download
-logDOC_DOWNLOAD=Download of a validated document in order to print or send
-DataOfArchivedEvent=Full datas of archived event
-ImpossibleToReloadObject=Original object (type %s, id %s) not linked (see 'Full datas' column to get unalterable saved data)
-BlockedLogAreRequiredByYourCountryLegislation=Unalterable Logs module may be required by the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they can not be validated by a tax audit.
-BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Unalterable Logs module was activated because of the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they cannot be validated by a tax audit.
-BlockedLogDisableNotAllowedForCountry=List of countries where usage of this module is mandatory (just to prevent to disable the module by error, if your country is in this list, disable of module is not possible without editing this list first. Note also that enabling/disabling this module will keep a track into the unalterable log).
-OnlyNonValid=Non-valid
-TooManyRecordToScanRestrictFilters=Too many records to scan/analyze. Please restrict list with more restrictive filters.
-RestrictYearToExport=Restrict month / year to export
+BlockedLog=ناقابل تبدیلی لاگز
+Field=میدان
+BlockedLogDesc=یہ ماڈیول کچھ واقعات کو ایک ناقابل تبدیلی لاگ میں ٹریک کرتا ہے (جس کو آپ ایک بار ریکارڈ کرنے کے بعد تبدیل نہیں کر سکتے ہیں) ایک بلاک چین میں، حقیقی وقت میں۔ یہ ماڈیول کچھ ممالک کے قوانین کی ضروریات کے ساتھ مطابقت فراہم کرتا ہے (جیسے فرانس کے ساتھ قانون فنانس 2016 - Norme NF525)۔
+Fingerprints=محفوظ شدہ واقعات اور فنگر پرنٹس
+FingerprintsDesc=یہ غیر تبدیل شدہ لاگز کو براؤز کرنے یا نکالنے کا ٹول ہے۔ غیر تبدیل شدہ لاگز مقامی طور پر ایک مخصوص ٹیبل میں تیار اور محفوظ کیے جاتے ہیں، حقیقی وقت میں جب آپ کسی کاروباری ایونٹ کو ریکارڈ کرتے ہیں۔ آپ اس ٹول کو اس آرکائیو کو ایکسپورٹ کرنے اور اسے بیرونی سپورٹ میں محفوظ کرنے کے لیے استعمال کر سکتے ہیں (کچھ ممالک، جیسے فرانس، آپ سے ہر سال ایسا کرنے کو کہتے ہیں)۔ نوٹ کریں کہ اس لاگ کو صاف کرنے کے لیے کوئی خصوصیت نہیں ہے اور ہر تبدیلی کو براہ راست اس لاگ میں کرنے کی کوشش کی جائے گی (مثال کے طور پر ایک ہیکر کی طرف سے) ایک غیر درست فنگر پرنٹ کے ساتھ رپورٹ کیا جائے گا۔ اگر آپ کو واقعی اس ٹیبل کو صاف کرنے کی ضرورت ہے کیونکہ آپ نے اپنی ایپلیکیشن ڈیمو/ٹیسٹ کے مقصد کے لیے استعمال کی ہے اور اپنی پروڈکشن شروع کرنے کے لیے اپنا ڈیٹا صاف کرنا چاہتے ہیں، تو آپ اپنے ری سیلر یا انٹیگریٹر سے اپنا ڈیٹا بیس ری سیٹ کرنے کے لیے کہہ سکتے ہیں (آپ کا تمام ڈیٹا ہٹا دیا جائے گا)۔
+CompanyInitialKey=کمپنی کی ابتدائی کلید (جینسیس بلاک کی ہیش)
+BrowseBlockedLog=ناقابل تغیر نوشتہ جات
+ShowAllFingerPrintsMightBeTooLong=تمام محفوظ شدہ لاگز دکھائیں (لمبا ہو سکتا ہے)
+ShowAllFingerPrintsErrorsMightBeTooLong=تمام غیر درست آرکائیو لاگز دکھائیں (لمبا ہو سکتا ہے)
+DownloadBlockChain=فنگر پرنٹس ڈاؤن لوڈ کریں۔
+KoCheckFingerprintValidity=محفوظ شدہ لاگ انٹری درست نہیں ہے۔ اس کا مطلب ہے کہ کسی نے (ایک ہیکر؟) اس ریکارڈ کے کچھ ڈیٹا کو ریکارڈ کرنے کے بعد اس میں ترمیم کی ہے، یا پچھلے محفوظ شدہ ریکارڈ کو مٹا دیا ہے (پچھلے # موجود کے ساتھ اس لائن کو چیک کریں) یا پچھلے ریکارڈ کے چیک سم میں ترمیم کی ہے۔
+OkCheckFingerprintValidity=محفوظ شدہ لاگ ریکارڈ درست ہے۔ اس لائن کے ڈیٹا میں ترمیم نہیں کی گئی تھی اور اندراج پچھلے ایک کی پیروی کرتا ہے۔
+OkCheckFingerprintValidityButChainIsKo=محفوظ شدہ لاگ پچھلے ایک کے مقابلے میں درست معلوم ہوتا ہے لیکن سلسلہ پہلے خراب ہو گیا تھا۔
+AddedByAuthority=ریموٹ اتھارٹی میں محفوظ
+NotAddedByAuthorityYet=ابھی تک ریموٹ اتھارٹی میں ذخیرہ نہیں کیا گیا ہے۔
+ShowDetails=ذخیرہ شدہ تفصیلات دکھائیں۔
+logPAYMENT_VARIOUS_CREATE=ادائیگی (انوائس کو تفویض نہیں کی گئی) بنائی گئی۔
+logPAYMENT_VARIOUS_MODIFY=ادائیگی (انوائس کو تفویض نہیں کی گئی) میں ترمیم کی گئی۔
+logPAYMENT_VARIOUS_DELETE=ادائیگی (انوائس کو تفویض نہیں کیا گیا) منطقی حذف
+logPAYMENT_ADD_TO_BANK=بینک میں ادائیگی شامل کر دی گئی۔
+logPAYMENT_CUSTOMER_CREATE=گاہک کی ادائیگی بنائی گئی۔
+logPAYMENT_CUSTOMER_DELETE=کسٹمر ادائیگی منطقی حذف
+logDONATION_PAYMENT_CREATE=عطیہ کی ادائیگی بنائی گئی۔
+logDONATION_PAYMENT_DELETE=عطیہ کی ادائیگی منطقی حذف
+logBILL_PAYED=کسٹمر انوائس ادا کر دی گئی۔
+logBILL_UNPAYED=کسٹمر انوائس بغیر ادا شدہ سیٹ
+logBILL_VALIDATE=کسٹمر انوائس کی توثیق ہو گئی۔
+logBILL_SENTBYMAIL=کسٹمر انوائس بذریعہ ڈاک بھیجیں۔
+logBILL_DELETE=کسٹمر انوائس کو منطقی طور پر حذف کر دیا گیا۔
+logMODULE_RESET=Module BlockedLog کو غیر فعال کر دیا گیا تھا۔
+logMODULE_SET=Module BlockedLog کو فعال کر دیا گیا تھا۔
+logDON_VALIDATE=عطیہ کی توثیق کی گئی۔
+logDON_MODIFY=عطیہ میں ترمیم کی گئی۔
+logDON_DELETE=عطیہ منطقی حذف
+logMEMBER_SUBSCRIPTION_CREATE=ممبر کی رکنیت بنائی گئی۔
+logMEMBER_SUBSCRIPTION_MODIFY=ممبر کی رکنیت میں ترمیم کی گئی۔
+logMEMBER_SUBSCRIPTION_DELETE=ممبر کی رکنیت کا منطقی حذف کرنا
+logCASHCONTROL_VALIDATE=کیش ڈیسک بند ہونے کی ریکارڈنگ
+BlockedLogBillDownload=کسٹمر انوائس ڈاؤن لوڈ
+BlockedLogBillPreview=کسٹمر انوائس کا پیش نظارہ
+BlockedlogInfoDialog=لاگ تفصیلات
+ListOfTrackedEvents=ٹریک کردہ واقعات کی فہرست
+Fingerprint=فنگر پرنٹ
+DownloadLogCSV=آرکائیو شدہ لاگز (CSV) برآمد کریں
+logDOC_PREVIEW=پرنٹ یا ڈاؤن لوڈ کرنے کے لیے تصدیق شدہ دستاویز کا پیش نظارہ
+logDOC_DOWNLOAD=پرنٹ یا بھیجنے کے لیے توثیق شدہ دستاویز کو ڈاؤن لوڈ کریں۔
+DataOfArchivedEvent=محفوظ شدہ ایونٹ کے مکمل ڈیٹا
+ImpossibleToReloadObject=اصل آبجیکٹ (قسم %s، id %s) منسلک نہیں (غیر تبدیل شدہ محفوظ کردہ ڈیٹا حاصل کرنے کے لیے 'مکمل ڈیٹا' کالم دیکھیں)
+BlockedLogAreRequiredByYourCountryLegislation=آپ کے ملک کی قانون سازی کے ذریعہ ناقابل تبدیلی لاگس ماڈیول کی ضرورت ہوسکتی ہے۔ اس ماڈیول کو غیر فعال کرنے سے مستقبل کے کسی بھی لین دین کو قانون اور قانونی سافٹ ویئر کے استعمال کے حوالے سے غلط قرار دیا جا سکتا ہے کیونکہ ٹیکس آڈٹ کے ذریعے ان کی توثیق نہیں کی جا سکتی ہے۔
+BlockedLogActivatedBecauseRequiredByYourCountryLegislation=آپ کے ملک کی قانون سازی کی وجہ سے ناقابل تبدیلی لاگز ماڈیول کو چالو کیا گیا تھا۔ اس ماڈیول کو غیر فعال کرنے سے مستقبل کے کسی بھی لین دین کو قانون اور قانونی سافٹ ویئر کے استعمال کے حوالے سے غلط قرار دیا جا سکتا ہے کیونکہ ٹیکس آڈٹ کے ذریعے ان کی توثیق نہیں کی جا سکتی ہے۔
+BlockedLogDisableNotAllowedForCountry=ان ممالک کی فہرست جہاں اس ماڈیول کا استعمال لازمی ہے (صرف غلطی سے ماڈیول کو غیر فعال کرنے سے روکنے کے لیے، اگر آپ کا ملک اس فہرست میں ہے، تو پہلے اس فہرست میں ترمیم کیے بغیر ماڈیول کو غیر فعال کرنا ممکن نہیں ہے۔ یہ بھی نوٹ کریں کہ اس ماڈیول کو فعال/غیر فعال کرنے سے ناقابل تبدیلی لاگ میں ٹریک رکھیں)۔
+OnlyNonValid=غیر درست
+TooManyRecordToScanRestrictFilters=اسکین/تجزیہ کرنے کے لیے بہت زیادہ ریکارڈز۔ براہ کرم مزید پابندی والے فلٹرز کے ساتھ فہرست کو محدود کریں۔
+RestrictYearToExport=ایکسپورٹ کرنے کے لیے مہینے/سال کو محدود کریں۔
diff --git a/htdocs/langs/ur_PK/bookmarks.lang b/htdocs/langs/ur_PK/bookmarks.lang
index be0f2f7e25d..c34c4bc2399 100644
--- a/htdocs/langs/ur_PK/bookmarks.lang
+++ b/htdocs/langs/ur_PK/bookmarks.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - marque pages
-AddThisPageToBookmarks=Add current page to bookmarks
-Bookmark=Bookmark
-Bookmarks=Bookmarks
-ListOfBookmarks=List of bookmarks
-EditBookmarks=List/edit bookmarks
-NewBookmark=New bookmark
-ShowBookmark=Show bookmark
-OpenANewWindow=Open a new tab
-ReplaceWindow=Replace current tab
-BookmarkTargetNewWindowShort=New tab
-BookmarkTargetReplaceWindowShort=Current tab
-BookmarkTitle=Bookmark name
+AddThisPageToBookmarks=موجودہ صفحہ کو بُک مارکس میں شامل کریں۔
+Bookmark=بک مارک
+Bookmarks=بک مارکس
+ListOfBookmarks=بک مارکس کی فہرست
+EditBookmarks=بُک مارکس کی فہرست/ترمیم کریں۔
+NewBookmark=نیا بک مارک
+ShowBookmark=بُک مارک دکھائیں۔
+OpenANewWindow=ایک نیا ٹیب کھولیں۔
+ReplaceWindow=موجودہ ٹیب کو تبدیل کریں۔
+BookmarkTargetNewWindowShort=نیا ٹیب
+BookmarkTargetReplaceWindowShort=موجودہ ٹیب
+BookmarkTitle=بک مارک نام
 UrlOrLink=URL
-BehaviourOnClick=Behaviour when a bookmark URL is selected
-CreateBookmark=Create bookmark
-SetHereATitleForLink=Set a name for the bookmark
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external/absolute link (https://externalurl.com) or an internal/relative link (/mypage.php). You can also use phone like tel:0123456.
-ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Choose if the linked page should open in the current tab or a new tab
-BookmarksManagement=Bookmarks management
+BehaviourOnClick=ایک بک مارک URL منتخب ہونے پر برتاؤ
+CreateBookmark=بک مارک بنائیں
+SetHereATitleForLink=بک مارک کے لیے ایک نام سیٹ کریں۔
+UseAnExternalHttpLinkOrRelativeDolibarrLink=ایک بیرونی/مطلق لنک (https://externalurl.com) یا اندرونی/رشتہ دار لنک (/mypage.php) استعمال کریں۔ آپ tel:0123456 کی طرح فون بھی استعمال کر سکتے ہیں۔
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=منتخب کریں کہ منسلک صفحہ موجودہ ٹیب میں کھلنا چاہیے یا نئے ٹیب میں
+BookmarksManagement=بُک مارکس کا انتظام
 BookmarksMenuShortCut=Ctrl + shift + m
-NoBookmarks=No bookmarks defined
+NoBookmarks=کوئی بک مارکس کی وضاحت نہیں کی گئی ہے۔
diff --git a/htdocs/langs/ur_PK/boxes.lang b/htdocs/langs/ur_PK/boxes.lang
index 710d49bfab6..e641e138f71 100644
--- a/htdocs/langs/ur_PK/boxes.lang
+++ b/htdocs/langs/ur_PK/boxes.lang
@@ -1,120 +1,120 @@
 # Dolibarr language file - Source file is en_US - boxes
-BoxDolibarrStateBoard=Statistics on main business objects in database
-BoxLoginInformation=Login Information
-BoxLastRssInfos=RSS Information
-BoxLastProducts=Latest %s Products/Services
-BoxProductsAlertStock=Stock alerts for products
-BoxLastProductsInContract=Latest %s contracted products/services
-BoxLastSupplierBills=Latest Vendor invoices
-BoxLastCustomerBills=Latest Customer invoices
-BoxOldestUnpaidCustomerBills=Oldest unpaid customer invoices
-BoxOldestUnpaidSupplierBills=Oldest unpaid vendor invoices
-BoxLastProposals=Latest commercial proposals
-BoxLastProspects=Latest modified prospects
-BoxLastCustomers=Latest modified customers
-BoxLastSuppliers=Latest modified suppliers
-BoxLastCustomerOrders=Latest sales orders
-BoxLastActions=Latest actions
-BoxLastContracts=Latest contracts
-BoxLastContacts=Latest contacts/addresses
-BoxLastMembers=Latest members
-BoxLastModifiedMembers=Latest modified members
-BoxLastMembersSubscriptions=Latest member subscriptions
-BoxFicheInter=Latest interventions
-BoxCurrentAccounts=Open accounts balance
-BoxTitleMemberNextBirthdays=Birthdays of this month (members)
-BoxTitleMembersByType=Members by type
-BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
-BoxTitleLastRssInfos=Latest %s news from %s
-BoxTitleLastProducts=Products/Services: last %s modified
-BoxTitleProductsAlertStock=Products: stock alert
-BoxTitleLastSuppliers=Latest %s recorded suppliers
-BoxTitleLastModifiedSuppliers=Vendors: last %s modified
-BoxTitleLastModifiedCustomers=Customers: last %s modified
-BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s modified Customer invoices
-BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
-BoxTitleLastModifiedProspects=Prospects: last %s modified
-BoxTitleLastModifiedMembers=Latest %s members
-BoxTitleLastFicheInter=Latest %s modified interventions
-BoxTitleOldestUnpaidCustomerBills=Customer Invoices: oldest %s unpaid
-BoxTitleOldestUnpaidSupplierBills=Vendor Invoices: oldest %s unpaid
-BoxTitleCurrentAccounts=Open Accounts: balances
-BoxTitleSupplierOrdersAwaitingReception=Supplier orders awaiting reception
-BoxTitleLastModifiedContacts=Contacts/Addresses: last %s modified
-BoxMyLastBookmarks=Bookmarks: latest %s
-BoxOldestExpiredServices=Oldest active expired services
-BoxLastExpiredServices=Latest %s oldest contacts with active expired services
-BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s contracts which were modified
-BoxTitleLastModifiedDonations=Latest %s donations which were modified
-BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
-BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
-BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
-BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
-BoxGlobalActivity=Global activity (invoices, proposals, orders)
-BoxGoodCustomers=Good customers
-BoxTitleGoodCustomers=%s Good customers
-BoxScheduledJobs=Scheduled jobs
-BoxTitleFunnelOfProspection=Lead funnel
-FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
-LastRefreshDate=Latest refresh date
-NoRecordedBookmarks=No bookmarks defined.
-ClickToAdd=Click here to add.
-NoRecordedCustomers=No recorded customers
-NoRecordedContacts=No recorded contacts
-NoActionsToDo=No actions to do
-NoRecordedOrders=No recorded sales orders
-NoRecordedProposals=No recorded proposals
-NoRecordedInvoices=No recorded customer invoices
-NoUnpaidCustomerBills=No unpaid customer invoices
-NoUnpaidSupplierBills=No unpaid vendor invoices
-NoModifiedSupplierBills=No recorded vendor invoices
-NoRecordedProducts=No recorded products/services
-NoRecordedProspects=No recorded prospects
-NoContractedProducts=No products/services contracted
-NoRecordedContracts=No recorded contracts
-NoRecordedInterventions=No recorded interventions
-BoxLatestSupplierOrders=Latest purchase orders
-BoxLatestSupplierOrdersAwaitingReception=Latest Purchase Orders (with a pending reception)
-NoSupplierOrder=No recorded purchase order
-BoxCustomersInvoicesPerMonth=Customer Invoices per month
-BoxSuppliersInvoicesPerMonth=Vendor Invoices per month
-BoxCustomersOrdersPerMonth=Sales Orders per month
-BoxSuppliersOrdersPerMonth=Vendor Orders per month
-BoxProposalsPerMonth=Proposals per month
-NoTooLowStockProducts=No products are under the low stock limit
-BoxProductDistribution=Products/Services Distribution
-ForObject=On %s
-BoxTitleLastModifiedSupplierBills=Vendor Invoices: last %s modified
-BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
-BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
-BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
-BoxTitleLastModifiedPropals=Latest %s modified proposals
-BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
-BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
-ForCustomersInvoices=Customers invoices
-ForCustomersOrders=Customers orders
-ForProposals=Proposals
-LastXMonthRolling=The latest %s month rolling
-ChooseBoxToAdd=Add widget to your dashboard
-BoxAdded=Widget was added in your dashboard
-BoxTitleUserBirthdaysOfMonth=Birthdays of this month (users)
-BoxLastManualEntries=Latest record in accountancy entered manually or without source document
-BoxTitleLastManualEntries=%s latest record entered manually or without source document
-NoRecordedManualEntries=No manual entries record in accountancy
-BoxSuspenseAccount=Count accountancy operation with suspense account
-BoxTitleSuspenseAccount=Number of unallocated lines
-NumberOfLinesInSuspenseAccount=Number of line in suspense account
-SuspenseAccountNotDefined=Suspense account isn't defined
-BoxLastCustomerShipments=Last customer shipments
-BoxTitleLastCustomerShipments=Latest %s customer shipments
-NoRecordedShipments=No recorded customer shipment
-BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
+BoxDolibarrStateBoard=ڈیٹا بیس میں اہم کاروباری اشیاء کے اعدادوشمار
+BoxLoginInformation=لاگ ان کی معلومات
+BoxLastRssInfos=آر ایس ایس کی معلومات
+BoxLastProducts=تازہ ترین %s مصنوعات/خدمات
+BoxProductsAlertStock=مصنوعات کے لیے اسٹاک الرٹس
+BoxLastProductsInContract=تازہ ترین %s معاہدہ شدہ مصنوعات/خدمات
+BoxLastSupplierBills=تازہ ترین وینڈر انوائسز
+BoxLastCustomerBills=تازہ ترین کسٹمر انوائسز
+BoxOldestUnpaidCustomerBills=سب سے پرانی بلا معاوضہ کسٹمر انوائس
+BoxOldestUnpaidSupplierBills=سب سے پرانی بلا معاوضہ وینڈر انوائس
+BoxLastProposals=تازہ ترین تجارتی تجاویز
+BoxLastProspects=تازہ ترین ترمیم شدہ امکانات
+BoxLastCustomers=تازہ ترین ترمیم شدہ صارفین
+BoxLastSuppliers=تازہ ترین ترمیم شدہ سپلائرز
+BoxLastCustomerOrders=تازہ ترین سیلز آرڈرز
+BoxLastActions=تازہ ترین اقدامات
+BoxLastContracts=تازہ ترین معاہدے
+BoxLastContacts=تازہ ترین رابطے/پتے
+BoxLastMembers=تازہ ترین ممبران
+BoxLastModifiedMembers=تازہ ترین ترمیم شدہ ممبران
+BoxLastMembersSubscriptions=تازہ ترین ممبر سبسکرپشنز
+BoxFicheInter=تازہ ترین مداخلت
+BoxCurrentAccounts=کھاتوں کا بیلنس کھولیں۔
+BoxTitleMemberNextBirthdays=اس مہینے کی سالگرہ (ممبران)
+BoxTitleMembersByType=قسم کے لحاظ سے اراکین
+BoxTitleMembersSubscriptionsByYear=اراکین کی رکنیتیں سال کے لحاظ سے
+BoxTitleLastRssInfos=%s سے تازہ ترین %s خبریں
+BoxTitleLastProducts=مصنوعات/خدمات: آخری %s میں ترمیم کی گئی۔
+BoxTitleProductsAlertStock=مصنوعات: اسٹاک الرٹ
+BoxTitleLastSuppliers=تازہ ترین %s ریکارڈ شدہ سپلائرز
+BoxTitleLastModifiedSuppliers=وینڈرز: آخری %s میں ترمیم کی گئی۔
+BoxTitleLastModifiedCustomers=صارفین: آخری %s میں ترمیم کی گئی۔
+BoxTitleLastCustomersOrProspects=تازہ ترین %s صارفین یا امکانات
+BoxTitleLastCustomerBills=تازہ ترین %s تبدیل شدہ کسٹمر انوائسز
+BoxTitleLastSupplierBills=تازہ ترین %s ترمیم شدہ وینڈر انوائسز
+BoxTitleLastModifiedProspects=امکانات: آخری %s میں ترمیم کی گئی۔
+BoxTitleLastModifiedMembers=تازہ ترین %s ممبران
+BoxTitleLastFicheInter=تازہ ترین %s ترمیم شدہ مداخلتیں۔
+BoxTitleOldestUnpaidCustomerBills=کسٹمر انوائس: سب سے پرانی %s بلا معاوضہ
+BoxTitleOldestUnpaidSupplierBills=وینڈر انوائسز: سب سے پرانی %s بلا معاوضہ
+BoxTitleCurrentAccounts=اکاؤنٹس کھولیں: بیلنس
+BoxTitleSupplierOrdersAwaitingReception=سپلائر کے آرڈرز استقبال کے منتظر ہیں۔
+BoxTitleLastModifiedContacts=رابطے/پتے: آخری %s میں ترمیم کی گئی۔
+BoxMyLastBookmarks=بک مارکس: تازہ ترین %s
+BoxOldestExpiredServices=سب سے پرانی فعال میعاد ختم ہونے والی خدمات
+BoxLastExpiredServices=فعال میعاد ختم ہونے والی خدمات کے ساتھ تازہ ترین %s قدیم ترین رابطے
+BoxTitleLastActionsToDo=کرنے کے لیے تازہ ترین %s کارروائیاں
+BoxTitleLastContracts=تازہ ترین %s معاہدے جن میں ترمیم کی گئی تھی۔
+BoxTitleLastModifiedDonations=تازہ ترین %s عطیات جن میں ترمیم کی گئی تھی۔
+BoxTitleLastModifiedExpenses=تازہ ترین %s اخراجات کی رپورٹس جن میں ترمیم کی گئی تھی۔
+BoxTitleLatestModifiedBoms=تازہ ترین %s BOMs جن میں ترمیم کی گئی تھی۔
+BoxTitleLatestModifiedMos=تازہ ترین %s مینوفیکچرنگ آرڈرز جن میں ترمیم کی گئی تھی۔
+BoxTitleLastOutstandingBillReached=زیادہ سے زیادہ بقایا والے صارفین سے تجاوز کر گیا ہے۔
+BoxGlobalActivity=عالمی سرگرمی (انوائسز، پروپوزل، آرڈرز)
+BoxGoodCustomers=اچھے گاہکوں
+BoxTitleGoodCustomers=%s اچھے صارفین
+BoxScheduledJobs=طے شدہ ملازمتیں۔
+BoxTitleFunnelOfProspection=لیڈ فنل
+FailedToRefreshDataInfoNotUpToDate=RSS بہاؤ کو تازہ کرنے میں ناکام۔ تازہ ترین کامیاب ریفریش کی تاریخ: %s
+LastRefreshDate=تازہ ترین تازہ کاری کی تاریخ
+NoRecordedBookmarks=کوئی بک مارکس کی وضاحت نہیں کی گئی ہے۔
+ClickToAdd=شامل کرنے کے لیے یہاں کلک کریں۔
+NoRecordedCustomers=کوئی ریکارڈ شدہ گاہک نہیں۔
+NoRecordedContacts=کوئی ریکارڈ شدہ رابطے نہیں ہیں۔
+NoActionsToDo=کرنے کے لیے کوئی عمل نہیں۔
+NoRecordedOrders=کوئی ریکارڈ شدہ سیلز آرڈر نہیں ہیں۔
+NoRecordedProposals=کوئی ریکارڈ شدہ تجاویز نہیں ہیں۔
+NoRecordedInvoices=کوئی ریکارڈ شدہ کسٹمر انوائس نہیں ہے۔
+NoUnpaidCustomerBills=کوئی غیر ادا شدہ کسٹمر انوائس نہیں ہے۔
+NoUnpaidSupplierBills=کوئی غیر ادا شدہ وینڈر انوائس نہیں ہے۔
+NoModifiedSupplierBills=کوئی ریکارڈ شدہ وینڈر انوائس نہیں ہے۔
+NoRecordedProducts=کوئی ریکارڈ شدہ مصنوعات/خدمات نہیں۔
+NoRecordedProspects=کوئی ریکارڈ شدہ امکانات نہیں۔
+NoContractedProducts=کوئی پروڈکٹس/سروسز کا معاہدہ نہیں ہے۔
+NoRecordedContracts=کوئی ریکارڈ شدہ معاہدے نہیں ہیں۔
+NoRecordedInterventions=کوئی ریکارڈ شدہ مداخلت نہیں ہے۔
+BoxLatestSupplierOrders=تازہ ترین خریداری کے آرڈر
+BoxLatestSupplierOrdersAwaitingReception=تازہ ترین خریداری کے آرڈرز (ایک زیر التواء استقبالیہ کے ساتھ)
+NoSupplierOrder=کوئی ریکارڈ شدہ خریداری آرڈر نہیں ہے۔
+BoxCustomersInvoicesPerMonth=فی مہینہ کسٹمر انوائس
+BoxSuppliersInvoicesPerMonth=وینڈر انوائسز فی مہینہ
+BoxCustomersOrdersPerMonth=سیلز آرڈرز فی مہینہ
+BoxSuppliersOrdersPerMonth=ہر ماہ وینڈر آرڈرز
+BoxProposalsPerMonth=ماہانہ تجاویز
+NoTooLowStockProducts=کوئی بھی مصنوعات کم اسٹاک کی حد کے تحت نہیں ہیں۔
+BoxProductDistribution=مصنوعات/خدمات کی تقسیم
+ForObject=%s پر
+BoxTitleLastModifiedSupplierBills=وینڈر انوائسز: آخری %s میں ترمیم کی گئی۔
+BoxTitleLatestModifiedSupplierOrders=وینڈر آرڈرز: آخری %s میں ترمیم کی گئی۔
+BoxTitleLastModifiedCustomerBills=کسٹمر انوائسز: آخری %s میں ترمیم کی گئی۔
+BoxTitleLastModifiedCustomerOrders=سیلز آرڈرز: آخری %s میں ترمیم کی گئی۔
+BoxTitleLastModifiedPropals=تازہ ترین %s ترمیم شدہ تجاویز
+BoxTitleLatestModifiedJobPositions=تازہ ترین %s تبدیل شدہ ملازمت کی پوزیشنیں۔
+BoxTitleLatestModifiedCandidatures=تازہ ترین %s تبدیل شدہ ملازمت کی درخواستیں۔
+ForCustomersInvoices=صارفین کی رسیدیں
+ForCustomersOrders=صارفین کے احکامات
+ForProposals=تجاویز
+LastXMonthRolling=تازہ ترین %s مہینہ رولنگ
+ChooseBoxToAdd=اپنے ڈیش بورڈ میں ویجیٹ شامل کریں۔
+BoxAdded=ویجیٹ آپ کے ڈیش بورڈ میں شامل کیا گیا تھا۔
+BoxTitleUserBirthdaysOfMonth=اس مہینے کی سالگرہ (صارفین)
+BoxLastManualEntries=اکاؤنٹنسی میں تازہ ترین ریکارڈ دستی طور پر یا ماخذ دستاویز کے بغیر درج کیا گیا ہے۔
+BoxTitleLastManualEntries=%s تازہ ترین ریکارڈ دستی طور پر یا ماخذ دستاویز کے بغیر درج کیا گیا۔
+NoRecordedManualEntries=اکاؤنٹنسی میں کوئی دستی اندراجات کا ریکارڈ نہیں ہے۔
+BoxSuspenseAccount=سسپنس اکاؤنٹ کے ساتھ اکاؤنٹنسی آپریشن کو شمار کریں۔
+BoxTitleSuspenseAccount=غیر مختص لائنوں کی تعداد
+NumberOfLinesInSuspenseAccount=سسپنس اکاؤنٹ میں لائن کی تعداد
+SuspenseAccountNotDefined=سسپنس اکاؤنٹ کی وضاحت نہیں کی گئی ہے۔
+BoxLastCustomerShipments=آخری کسٹمر کی ترسیل
+BoxTitleLastCustomerShipments=تازہ ترین %s کسٹمر کی ترسیل
+NoRecordedShipments=کوئی ریکارڈ شدہ کسٹمر شپمنٹ نہیں۔
+BoxCustomersOutstandingBillReached=واجب الادا گاہک کی حد تک پہنچ گئی۔
 # Pages
-UsersHome=Home users and groups
-MembersHome=Home Membership
-ThirdpartiesHome=Home Thirdparties
-TicketsHome=Home Tickets
-AccountancyHome=Home Accountancy
-ValidatedProjects=Validated projects
+UsersHome=گھریلو صارفین اور گروپس
+MembersHome=ہوم ممبرشپ
+ThirdpartiesHome=ہوم تھرڈ پارٹیز
+TicketsHome=ہوم ٹکٹس
+AccountancyHome=ہوم اکاؤنٹنسی
+ValidatedProjects=تصدیق شدہ منصوبے
diff --git a/htdocs/langs/ur_PK/cashdesk.lang b/htdocs/langs/ur_PK/cashdesk.lang
index f99600c2aca..9b07a7e47f7 100644
--- a/htdocs/langs/ur_PK/cashdesk.lang
+++ b/htdocs/langs/ur_PK/cashdesk.lang
@@ -1,136 +1,136 @@
 # Language file - Source file is en_US - cashdesk
-CashDeskMenu=Point of sale
-CashDesk=Point of sale
-CashDeskBankCash=Bank account (cash)
-CashDeskBankCB=Bank account (card)
-CashDeskBankCheque=Bank account (cheque)
-CashDeskWarehouse=Warehouse
-CashdeskShowServices=Selling services
-CashDeskProducts=Products
-CashDeskStock=Stock
-CashDeskOn=on
-CashDeskThirdParty=Third party
-ShoppingCart=Shopping cart
-NewSell=New sell
-AddThisArticle=Add this article
-RestartSelling=Go back on sell
-SellFinished=Sale complete
-PrintTicket=Print ticket
-SendTicket=Send ticket
-NoProductFound=No article found
-ProductFound=product found
-NoArticle=No article
-Identification=Identification
-Article=Article
-Difference=Difference
-TotalTicket=Total ticket
-NoVAT=No VAT for this sale
-Change=Excess received
-BankToPay=Account for payment
-ShowCompany=Show company
-ShowStock=Show warehouse
-DeleteArticle=Click to remove this article
-FilterRefOrLabelOrBC=Search (Ref/Label)
-UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
-DolibarrReceiptPrinter=Dolibarr Receipt Printer
-PointOfSale=Point of Sale
-PointOfSaleShort=POS
-CloseBill=Close Bill
-Floors=Floors
-Floor=Floor
-AddTable=Add table
-Place=Place
-TakeposConnectorNecesary='TakePOS Connector' required
-OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
-NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser
-SearchProduct=Search product
-Receipt=Receipt
-Header=Header
-Footer=Footer
-AmountAtEndOfPeriod=Amount at end of period (day, month or year)
-TheoricalAmount=Theorical amount
-RealAmount=Real amount
-CashFence=Cash desk closing
-CashFenceDone=Cash desk closing done for the period
-NbOfInvoices=Nb of invoices
-Paymentnumpad=Type of Pad to enter payment
-Numberspad=Numbers Pad
-BillsCoinsPad=Coins and banknotes Pad
-DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
-TakeposNeedsCategories=TakePOS needs at least one product categorie to work
-TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
-OrderNotes=Can add some notes to each ordered items
-CashDeskBankAccountFor=Default account to use for payments in
-NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
-TicketVatGrouped=Group VAT by rate in tickets|receipts
-AutoPrintTickets=Automatically print tickets|receipts
-PrintCustomerOnReceipts=Print customer on tickets|receipts
-EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
-ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
-ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
-History=History
-ValidateAndClose=Validate and close
-Terminal=Terminal
-NumberOfTerminals=Number of Terminals
-TerminalSelect=Select terminal you want to use:
-POSTicket=POS Ticket
-POSTerminal=POS Terminal
-POSModule=POS Module
-BasicPhoneLayout=Use basic layout for phones
-SetupOfTerminalNotComplete=Setup of terminal %s is not complete
-DirectPayment=Direct payment
-DirectPaymentButton=Add a "Direct cash payment" button
-InvoiceIsAlreadyValidated=Invoice is already validated
-NoLinesToBill=No lines to bill
-CustomReceipt=Custom Receipt
-ReceiptName=Receipt Name
-ProductSupplements=Manage supplements of products
-SupplementCategory=Supplement category
-ColorTheme=Color theme
-Colorful=Colorful
-HeadBar=Head Bar
-SortProductField=Field for sorting products
-Browser=Browser
-BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
-TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
-PrintMethod=Print method
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
-ByTerminal=By terminal
-TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
-CashDeskRefNumberingModules=Numbering module for POS sales
-CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
-TakeposGroupSameProduct=Group same products lines
-StartAParallelSale=Start a new parallel sale
-SaleStartedAt=Sale started at %s
-ControlCashOpening=Open the "Control cash" popup when opening the POS
-CloseCashFence=Close cash desk control
-CashReport=Cash report
-MainPrinterToUse=Main printer to use
-OrderPrinterToUse=Order printer to use
-MainTemplateToUse=Main template to use
-OrderTemplateToUse=Order template to use
-BarRestaurant=Bar Restaurant
-AutoOrder=Order by the customer himself
-RestaurantMenu=Menu
-CustomerMenu=Customer menu
-ScanToMenu=Scan QR code to see the menu
-ScanToOrder=Scan QR code to order
-Appearance=Appearance
-HideCategoryImages=Hide Category Images
-HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines of images to show
-DefineTablePlan=Define tables plan
-GiftReceiptButton=Add a "Gift receipt" button
-GiftReceipt=Gift receipt
-ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
-AllowDelayedPayment=Allow delayed payment
-PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
-WeighingScale=Weighing scale
-ShowPriceHT = Display the column with the price excluding tax (on screen)
-ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
-CustomerDisplay=Customer display
-SplitSale=Split sale
-PrintWithoutDetailsButton=Add "Print without details" button
-PrintWithoutDetailsLabelDefault=Line label by default on printing without details
-PrintWithoutDetails=Print without details
-YearNotDefined=Year is not defined
+CashDeskMenu=پوائنٹ آف سیل
+CashDesk=پوائنٹ آف سیل
+CashDeskBankCash=بینک اکاؤنٹ (نقدی)
+CashDeskBankCB=بینک اکاؤنٹ (کارڈ)
+CashDeskBankCheque=بینک اکاؤنٹ (چیک)
+CashDeskWarehouse=گودام
+CashdeskShowServices=فروخت کی خدمات
+CashDeskProducts=مصنوعات
+CashDeskStock=اسٹاک
+CashDeskOn=پر
+CashDeskThirdParty=تیسری پارٹی
+ShoppingCart=خریداری کی ٹوکری
+NewSell=نئی فروخت
+AddThisArticle=اس مضمون کو شامل کریں۔
+RestartSelling=فروخت پر واپس جائیں۔
+SellFinished=فروخت مکمل
+PrintTicket=ٹکٹ پرنٹ کریں۔
+SendTicket=ٹکٹ بھیجیں۔
+NoProductFound=کوئی مضمون نہیں ملا
+ProductFound=پروڈکٹ ملا
+NoArticle=کوئی مضمون نہیں۔
+Identification=شناخت
+Article=مضمون
+Difference=فرق
+TotalTicket=کل ٹکٹ
+NoVAT=اس فروخت کے لیے کوئی VAT نہیں ہے۔
+Change=ضرورت سے زیادہ موصول ہوئی۔
+BankToPay=ادائیگی کے لیے اکاؤنٹ
+ShowCompany=کمپنی دکھائیں۔
+ShowStock=گودام دکھائیں۔
+DeleteArticle=اس مضمون کو ہٹانے کے لیے کلک کریں۔
+FilterRefOrLabelOrBC=تلاش کریں (حوالہ/لیبل)
+UserNeedPermissionToEditStockToUsePos=آپ انوائس بنانے پر اسٹاک کو کم کرنے کے لیے کہتے ہیں، اس لیے POS استعمال کرنے والے صارف کو اسٹاک میں ترمیم کرنے کی اجازت کی ضرورت ہوتی ہے۔
+DolibarrReceiptPrinter=Dolibarr رسید پرنٹر
+PointOfSale=پوائنٹ آف سیل
+PointOfSaleShort=پی او ایس
+CloseBill=بل بند کریں۔
+Floors=فرش
+Floor=فرش
+AddTable=ٹیبل شامل کریں۔
+Place=جگہ
+TakeposConnectorNecesary='TakePOS کنیکٹر' درکار ہے۔
+OrderPrinters=کچھ پرنٹرز کو آرڈر بھیجنے کے لیے بٹن شامل کریں، بغیر ادائیگی کے (مثال کے طور پر کچن میں آرڈر بھیجنے کے لیے)
+NotAvailableWithBrowserPrinter=رسید کے لیے پرنٹر براؤزر پر سیٹ ہونے پر دستیاب نہیں ہے۔
+SearchProduct=پروڈکٹ تلاش کریں۔
+Receipt=رسید
+Header=ہیڈر
+Footer=فوٹر
+AmountAtEndOfPeriod=مدت کے اختتام پر رقم (دن، مہینہ یا سال)
+TheoricalAmount=نظریاتی رقم
+RealAmount=اصلی رقم
+CashFence=کیش ڈیسک بند ہو رہا ہے۔
+CashFenceDone=کیش ڈیسک کی بندش مدت کے لیے ہو گئی۔
+NbOfInvoices=رسیدوں کا نمبر
+Paymentnumpad=ادائیگی داخل کرنے کے لیے پیڈ کی قسم
+Numberspad=نمبرز پیڈ
+BillsCoinsPad=سکے اور بینک نوٹ پیڈ
+DolistorePosCategory=Dolibarr کے لیے TakePOS ماڈیولز اور دیگر POS حل
+TakeposNeedsCategories=TakePOS کو کام کرنے کے لیے کم از کم ایک پروڈکٹ کیٹیگری کی ضرورت ہے۔
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS کو کام کرنے کے لیے <b> %s </b> زمرہ کے تحت کم از کم 1 پروڈکٹ کیٹیگری کی ضرورت ہے۔
+OrderNotes=ہر آرڈر شدہ اشیاء میں کچھ نوٹ شامل کر سکتے ہیں۔
+CashDeskBankAccountFor=میں ادائیگیوں کے لیے استعمال کرنے کے لیے ڈیفالٹ اکاؤنٹ
+NoPaimementModesDefined=TakePOS کنفیگریشن میں پیمنٹ موڈ کی وضاحت نہیں کی گئی ہے۔
+TicketVatGrouped=ٹکٹوں میں شرح کے لحاظ سے گروپ VAT | رسیدیں
+AutoPrintTickets=خودکار طور پر ٹکٹیں | رسیدیں پرنٹ کریں۔
+PrintCustomerOnReceipts=ٹکٹوں پر کسٹمر پرنٹ کریں | رسیدیں
+EnableBarOrRestaurantFeatures=بار یا ریستوراں کے لیے خصوصیات کو فعال کریں۔
+ConfirmDeletionOfThisPOSSale=کیا آپ اس موجودہ فروخت کو حذف کرنے کی تصدیق کرتے ہیں؟
+ConfirmDiscardOfThisPOSSale=کیا آپ اس موجودہ فروخت کو مسترد کرنا چاہتے ہیں؟
+History=تاریخ
+ValidateAndClose=توثیق کریں اور بند کریں۔
+Terminal=ٹرمینل
+NumberOfTerminals=ٹرمینلز کی تعداد
+TerminalSelect=ٹرمینل منتخب کریں جو آپ استعمال کرنا چاہتے ہیں:
+POSTicket=POS ٹکٹ
+POSTerminal=پی او ایس ٹرمینل
+POSModule=POS ماڈیول
+BasicPhoneLayout=فونز کے لیے بنیادی ترتیب استعمال کریں۔
+SetupOfTerminalNotComplete=ٹرمینل %s کا سیٹ اپ مکمل نہیں ہے۔
+DirectPayment=براہ راست ادائیگی
+DirectPaymentButton="براہ راست نقد ادائیگی" بٹن شامل کریں۔
+InvoiceIsAlreadyValidated=انوائس پہلے ہی تصدیق شدہ ہے۔
+NoLinesToBill=بل کے لیے کوئی لائن نہیں ہے۔
+CustomReceipt=حسب ضرورت رسید
+ReceiptName=رسید کا نام
+ProductSupplements=مصنوعات کے سپلیمنٹس کا انتظام کریں۔
+SupplementCategory=ضمنی زمرہ
+ColorTheme=رنگین تھیم
+Colorful=رنگین
+HeadBar=ہیڈ بار
+SortProductField=مصنوعات کو چھانٹنے کا میدان
+Browser=براؤزر
+BrowserMethodDescription=سادہ اور آسان رسید پرنٹنگ۔ رسید کو ترتیب دینے کے لیے صرف چند پیرامیٹرز۔ براؤزر کے ذریعے پرنٹ کریں۔
+TakeposConnectorMethodDescription=اضافی خصوصیات کے ساتھ بیرونی ماڈیول۔ بادل سے پرنٹ کرنے کا امکان۔
+PrintMethod=پرنٹ کا طریقہ
+ReceiptPrinterMethodDescription=بہت سارے پیرامیٹرز کے ساتھ طاقتور طریقہ۔ ٹیمپلیٹس کے ساتھ مکمل مرضی کے مطابق۔ ایپلیکیشن کی میزبانی کرنے والا سرور کلاؤڈ میں نہیں ہو سکتا (آپ کے نیٹ ورک میں پرنٹرز تک پہنچنے کے قابل ہونا چاہیے)۔
+ByTerminal=ٹرمینل کے ذریعے
+TakeposNumpadUsePaymentIcon=نمبر پیڈ کے پیمنٹ بٹن پر ٹیکسٹ کی بجائے آئیکن استعمال کریں۔
+CashDeskRefNumberingModules=POS سیلز کے لیے نمبرنگ ماڈیول
+CashDeskGenericMaskCodes6 =  <br> <b> {TN} </b> ٹیگ ٹرمینل نمبر شامل کرنے کے لیے استعمال کیا جاتا ہے
+TakeposGroupSameProduct=ایک ہی مصنوعات کی لائنوں کو گروپ کریں۔
+StartAParallelSale=ایک نئی متوازی فروخت شروع کریں۔
+SaleStartedAt=فروخت %s پر شروع ہوئی۔
+ControlCashOpening=POS کھولتے وقت "کنٹرول کیش" پاپ اپ کھولیں۔
+CloseCashFence=کیش ڈیسک کنٹرول بند کریں۔
+CashReport=کیش رپورٹ
+MainPrinterToUse=استعمال کرنے کے لیے مین پرنٹر
+OrderPrinterToUse=پرنٹر کو استعمال کرنے کا آرڈر دیں۔
+MainTemplateToUse=استعمال کرنے کے لیے اہم ٹیمپلیٹ
+OrderTemplateToUse=آرڈر ٹیمپلیٹ استعمال کرنے کے لیے
+BarRestaurant=بار ریستوراں
+AutoOrder=گاہک خود آرڈر کریں۔
+RestaurantMenu=مینو
+CustomerMenu=کسٹمر مینو
+ScanToMenu=مینو دیکھنے کے لیے QR کوڈ اسکین کریں۔
+ScanToOrder=آرڈر کرنے کے لیے کیو آر کوڈ اسکین کریں۔
+Appearance=ظہور
+HideCategoryImages=زمرہ کی تصاویر چھپائیں۔
+HideProductImages=پروڈکٹ کی تصاویر چھپائیں۔
+NumberOfLinesToShow=دکھانے کے لیے تصاویر کی لائنوں کی تعداد
+DefineTablePlan=ٹیبل پلان کی وضاحت کریں۔
+GiftReceiptButton=ایک "تحفے کی رسید" بٹن شامل کریں۔
+GiftReceipt=تحفے کی رسید
+ModuleReceiptPrinterMustBeEnabled=ماڈیول رسید پرنٹر کو پہلے فعال کیا گیا ہوگا۔
+AllowDelayedPayment=تاخیر سے ادائیگی کی اجازت دیں۔
+PrintPaymentMethodOnReceipts=ٹکٹوں پر ادائیگی کا طریقہ پرنٹ کریں | رسیدیں
+WeighingScale=وزن کا پیمانہ
+ShowPriceHT = ٹیکس کو چھوڑ کر قیمت کے ساتھ کالم دکھائیں (اسکرین پر)
+ShowPriceHTOnReceipt = ٹیکس کو چھوڑ کر قیمت کے ساتھ کالم دکھائیں (رسید پر)
+CustomerDisplay=کسٹمر ڈسپلے
+SplitSale=تقسیم فروخت
+PrintWithoutDetailsButton="تفصیلات کے بغیر پرنٹ کریں" بٹن شامل کریں۔
+PrintWithoutDetailsLabelDefault=بغیر تفصیلات کے پرنٹنگ پر بطور ڈیفالٹ لائن لیبل
+PrintWithoutDetails=تفصیلات کے بغیر پرنٹ کریں۔
+YearNotDefined=سال کی تعریف نہیں ہے۔
diff --git a/htdocs/langs/ur_PK/categories.lang b/htdocs/langs/ur_PK/categories.lang
index cf0de898bdb..51a89cb8a61 100644
--- a/htdocs/langs/ur_PK/categories.lang
+++ b/htdocs/langs/ur_PK/categories.lang
@@ -1,100 +1,100 @@
 # Dolibarr language file - Source file is en_US - categories
-Rubrique=Tag/Category
-Rubriques=Tags/Categories
-RubriquesTransactions=Tags/Categories of transactions
-categories=tags/categories
-NoCategoryYet=No tag/category of this type has been created
-In=In
-AddIn=Add in
-modify=modify
-Classify=Classify
-CategoriesArea=Tags/Categories area
-ProductsCategoriesArea=Product/Service tags/categories area
-SuppliersCategoriesArea=Vendor tags/categories area
-CustomersCategoriesArea=Customer tags/categories area
-MembersCategoriesArea=Member tags/categories area
-ContactsCategoriesArea=Contact tags/categories area
-AccountsCategoriesArea=Bank account tags/categories area
-ProjectsCategoriesArea=Project tags/categories area
-UsersCategoriesArea=User tags/categories area
-SubCats=Sub-categories
-CatList=List of tags/categories
-CatListAll=List of tags/categories (all types)
-NewCategory=New tag/category
-ModifCat=Modify tag/category
-CatCreated=Tag/category created
-CreateCat=Create tag/category
-CreateThisCat=Create this tag/category
-NoSubCat=No subcategory.
-SubCatOf=Subcategory
-FoundCats=Found tags/categories
-ImpossibleAddCat=Impossible to add the tag/category %s
-WasAddedSuccessfully=<b>%s</b> was added successfully.
-ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
-ProductIsInCategories=Product/service is linked to following tags/categories
-CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
-CompanyIsInSuppliersCategories=This third party is linked to following vendors tags/categories
-MemberIsInCategories=This member is linked to following members tags/categories
-ContactIsInCategories=This contact is linked to following contacts tags/categories
-ProductHasNoCategory=This product/service is not in any tags/categories
-CompanyHasNoCategory=This third party is not in any tags/categories
-MemberHasNoCategory=This member is not in any tags/categories
-ContactHasNoCategory=This contact is not in any tags/categories
-ProjectHasNoCategory=This project is not in any tags/categories
-ClassifyInCategory=Add to tag/category
-NotCategorized=Without tag/category
-CategoryExistsAtSameLevel=This category already exists with this ref
-ContentsVisibleByAllShort=Contents visible by all
-ContentsNotVisibleByAllShort=Contents not visible by all
-DeleteCategory=Delete tag/category
-ConfirmDeleteCategory=Are you sure you want to delete this tag/category?
-NoCategoriesDefined=No tag/category defined
-SuppliersCategoryShort=Vendors tag/category
-CustomersCategoryShort=Customers tag/category
-ProductsCategoryShort=Products tag/category
-MembersCategoryShort=Members tag/category
-SuppliersCategoriesShort=Vendors tags/categories
-CustomersCategoriesShort=Customers tags/categories
-ProspectsCategoriesShort=Prospects tags/categories
-CustomersProspectsCategoriesShort=Cust./Prosp. tags/categories
-ProductsCategoriesShort=Products tags/categories
-MembersCategoriesShort=Members tags/categories
-ContactCategoriesShort=Contacts tags/categories
-AccountsCategoriesShort=Accounts tags/categories
-ProjectsCategoriesShort=Projects tags/categories
-UsersCategoriesShort=Users tags/categories
-StockCategoriesShort=Warehouse tags/categories
-ThisCategoryHasNoItems=This category does not contain any items.
-CategId=Tag/category id
-ParentCategory=Parent tag/category
-ParentCategoryLabel=Label of parent tag/category
-CatSupList=List of vendors tags/categories
-CatCusList=List of customers/prospects tags/categories
-CatProdList=List of products tags/categories
-CatMemberList=List of members tags/categories
-CatContactList=List of contacts tags/categories
-CatProjectsList=List of projects tags/categories
-CatUsersList=List of users tags/categories
-CatSupLinks=Links between vendors and tags/categories
-CatCusLinks=Links between customers/prospects and tags/categories
-CatContactsLinks=Links between contacts/addresses and tags/categories
-CatProdLinks=Links between products/services and tags/categories
-CatMembersLinks=Links between members and tags/categories
-CatProjectsLinks=Links between projects and tags/categories
-CatUsersLinks=Links between users and tags/categories
-DeleteFromCat=Remove from tags/category
-ExtraFieldsCategories=Complementary attributes
-CategoriesSetup=Tags/categories setup
-CategorieRecursiv=Link with parent tag/category automatically
-CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
-AddProductServiceIntoCategory=Add the following product/service
-AddCustomerIntoCategory=Assign category to customer
-AddSupplierIntoCategory=Assign category to supplier
-ShowCategory=Show tag/category
-ByDefaultInList=By default in list
-ChooseCategory=Choose category
-StocksCategoriesArea=Warehouse Categories
-ActionCommCategoriesArea=Event Categories
-WebsitePagesCategoriesArea=Page-Container Categories
-KnowledgemanagementsCategoriesArea=KM article Categories
-UseOrOperatorForCategories=Use 'OR' operator for categories
+Rubrique=ٹیگ/زمرہ
+Rubriques=ٹیگز/زمرہیں۔
+RubriquesTransactions=لین دین کے ٹیگز/کیٹیگریز
+categories=ٹیگز/زمرے
+NoCategoryYet=اس قسم کا کوئی ٹیگ/زمرہ نہیں بنایا گیا ہے۔
+In=میں
+AddIn=شامل کرو
+modify=ترمیم کریں
+Classify=درجہ بندی کریں۔
+CategoriesArea=ٹیگز / زمرہ جات کا علاقہ
+ProductsCategoriesArea=پروڈکٹ/سروس ٹیگز/کیٹیگریز کا علاقہ
+SuppliersCategoriesArea=وینڈر کے ٹیگ/زمرے کا علاقہ
+CustomersCategoriesArea=گاہک کے ٹیگ / زمرہ جات کا علاقہ
+MembersCategoriesArea=اراکین کے ٹیگ/زمرے کا علاقہ
+ContactsCategoriesArea=ٹیگ / زمرہ جات کے علاقے سے رابطہ کریں۔
+AccountsCategoriesArea=بینک اکاؤنٹ ٹیگز/کیٹیگریز کا علاقہ
+ProjectsCategoriesArea=پروجیکٹ ٹیگز/زمرے کا علاقہ
+UsersCategoriesArea=صارف کے ٹیگ / زمرہ جات کا علاقہ
+SubCats=ذیلی زمرے
+CatList=ٹیگز/ زمرہ جات کی فہرست
+CatListAll=ٹیگز/زمرے کی فہرست (تمام اقسام)
+NewCategory=نیا ٹیگ/زمرہ
+ModifCat=ٹیگ/زمرہ میں ترمیم کریں۔
+CatCreated=ٹیگ/زمرہ بنایا گیا۔
+CreateCat=ٹیگ/زمرہ بنائیں
+CreateThisCat=یہ ٹیگ/کیٹیگری بنائیں
+NoSubCat=کوئی ذیلی زمرہ نہیں۔
+SubCatOf=ذیلی زمرہ
+FoundCats=ٹیگز/زمرے ملے
+ImpossibleAddCat=ٹیگ/زمرہ %s شامل کرنا ناممکن ہے۔
+WasAddedSuccessfully= <b> %s </b> کامیابی کے ساتھ شامل کر دیا گیا۔
+ObjectAlreadyLinkedToCategory=عنصر پہلے ہی اس ٹیگ/زمرہ سے منسلک ہے۔
+ProductIsInCategories=پروڈکٹ/سروس مندرجہ ذیل ٹیگز/کیٹیگریز سے منسلک ہے۔
+CompanyIsInCustomersCategories=یہ تیسرا فریق مندرجہ ذیل صارفین/امکانات کے ٹیگز/زمرے سے منسلک ہے۔
+CompanyIsInSuppliersCategories=یہ تیسرا فریق درج ذیل وینڈرز کے ٹیگز/کیٹیگریز سے منسلک ہے۔
+MemberIsInCategories=یہ ممبر مندرجہ ذیل ممبروں کے ٹیگز/کیٹیگریز سے منسلک ہے۔
+ContactIsInCategories=یہ رابطہ مندرجہ ذیل رابطوں کے ٹیگز/کیٹیگریز سے منسلک ہے۔
+ProductHasNoCategory=یہ پروڈکٹ/سروس کسی ٹیگ/زمرے میں نہیں ہے۔
+CompanyHasNoCategory=یہ تیسرا فریق کسی ٹیگ/زمرے میں نہیں ہے۔
+MemberHasNoCategory=یہ ممبر کسی ٹیگ/کیٹیگری میں نہیں ہے۔
+ContactHasNoCategory=یہ رابطہ کسی ٹیگ/کیٹیگری میں نہیں ہے۔
+ProjectHasNoCategory=یہ منصوبہ کسی بھی ٹیگ/زمرے میں نہیں ہے۔
+ClassifyInCategory=ٹیگ/زمرہ میں شامل کریں۔
+NotCategorized=ٹیگ/زمرہ کے بغیر
+CategoryExistsAtSameLevel=یہ زمرہ اس حوالہ کے ساتھ پہلے سے موجود ہے۔
+ContentsVisibleByAllShort=مواد سب کو نظر آتا ہے۔
+ContentsNotVisibleByAllShort=مواد سب کو نظر نہیں آتا
+DeleteCategory=ٹیگ/زمرہ حذف کریں۔
+ConfirmDeleteCategory=کیا آپ واقعی اس ٹیگ/زمرہ کو حذف کرنا چاہتے ہیں؟
+NoCategoriesDefined=کوئی ٹیگ/زمرہ متعین نہیں ہے۔
+SuppliersCategoryShort=وینڈرز ٹیگ/زمرہ
+CustomersCategoryShort=صارفین کا ٹیگ/زمرہ
+ProductsCategoryShort=مصنوعات کا ٹیگ/زمرہ
+MembersCategoryShort=اراکین کا ٹیگ/زمرہ
+SuppliersCategoriesShort=وینڈرز کے ٹیگ/زمرے
+CustomersCategoriesShort=صارفین کے ٹیگ/زمرے
+ProspectsCategoriesShort=امکانات کے ٹیگ/زمرے
+CustomersProspectsCategoriesShort=Cust./Prosp. ٹیگز/زمرے
+ProductsCategoriesShort=مصنوعات کے ٹیگ/زمرے
+MembersCategoriesShort=اراکین کے ٹیگ/زمرے
+ContactCategoriesShort=رابطوں کے ٹیگ/زمرے
+AccountsCategoriesShort=اکاؤنٹس کے ٹیگ/زمرے
+ProjectsCategoriesShort=پروجیکٹس کے ٹیگ/زمرے
+UsersCategoriesShort=صارفین کے ٹیگ/زمرے
+StockCategoriesShort=گودام کے ٹیگ/زمرے
+ThisCategoryHasNoItems=اس زمرے میں کوئی آئٹم نہیں ہے۔
+CategId=ٹیگ/زمرہ کی شناخت
+ParentCategory=پیرنٹ ٹیگ/زمرہ
+ParentCategoryLabel=پیرنٹ ٹیگ/زمرہ کا لیبل
+CatSupList=دکانداروں کے ٹیگ/زمرے کی فہرست
+CatCusList=صارفین/ممکنہ ٹیگز/زمرے کی فہرست
+CatProdList=مصنوعات کے ٹیگ/زمرے کی فہرست
+CatMemberList=اراکین کے ٹیگ/زمرے کی فہرست
+CatContactList=رابطوں کے ٹیگ/زمرے کی فہرست
+CatProjectsList=منصوبوں کے ٹیگ/زمرے کی فہرست
+CatUsersList=صارفین کے ٹیگ / زمرہ جات کی فہرست
+CatSupLinks=وینڈرز اور ٹیگز/زمرے کے درمیان روابط
+CatCusLinks=گاہک/امکانات اور ٹیگ/زمرے کے درمیان روابط
+CatContactsLinks=رابطوں/پتے اور ٹیگز/زمرے کے درمیان روابط
+CatProdLinks=پروڈکٹس/سروسز اور ٹیگز/کیٹیگریز کے درمیان روابط
+CatMembersLinks=اراکین اور ٹیگ/زمرے کے درمیان روابط
+CatProjectsLinks=پراجیکٹس اور ٹیگز/زمرے کے درمیان روابط
+CatUsersLinks=صارفین اور ٹیگز/زمرے کے درمیان روابط
+DeleteFromCat=ٹیگز/زمرہ سے ہٹا دیں۔
+ExtraFieldsCategories=تکمیلی صفات
+CategoriesSetup=ٹیگز/کیٹیگریز سیٹ اپ
+CategorieRecursiv=پیرنٹ ٹیگ/زمرہ کے ساتھ خود بخود لنک کریں۔
+CategorieRecursivHelp=اگر آپشن آن ہے، جب آپ کسی پروڈکٹ کو ذیلی زمرہ میں شامل کرتے ہیں، تو پروڈکٹ کو بھی پیرنٹ کیٹیگری میں شامل کر دیا جائے گا۔
+AddProductServiceIntoCategory=درج ذیل پروڈکٹ/سروس شامل کریں۔
+AddCustomerIntoCategory=گاہک کو زمرہ تفویض کریں۔
+AddSupplierIntoCategory=سپلائر کو زمرہ تفویض کریں۔
+ShowCategory=ٹیگ/زمرہ دکھائیں۔
+ByDefaultInList=فہرست میں بطور ڈیفالٹ
+ChooseCategory=زمرہ منتخب کریں۔
+StocksCategoriesArea=گودام کے زمرے
+ActionCommCategoriesArea=ایونٹ کے زمرے
+WebsitePagesCategoriesArea=صفحہ کنٹینر زمرہ جات
+KnowledgemanagementsCategoriesArea=KM مضمون کے زمرے
+UseOrOperatorForCategories=زمرہ جات کے لیے 'OR' آپریٹر استعمال کریں۔
diff --git a/htdocs/langs/ur_PK/commercial.lang b/htdocs/langs/ur_PK/commercial.lang
index 21d282cd794..2d111025699 100644
--- a/htdocs/langs/ur_PK/commercial.lang
+++ b/htdocs/langs/ur_PK/commercial.lang
@@ -1,81 +1,81 @@
 # Dolibarr language file - Source file is en_US - commercial
-Commercial=Commerce
-CommercialArea=Commerce area
-Customer=Customer
-Customers=Customers
-Prospect=Prospect
-Prospects=Prospects
-DeleteAction=Delete an event
-NewAction=New event
-AddAction=Create event
-AddAnAction=Create an event
-AddActionRendezVous=Create a Rendez-vous event
-ConfirmDeleteAction=Are you sure you want to delete this event?
-CardAction=Event card
-ActionOnCompany=Related company
-ActionOnContact=Related contact
-TaskRDVWith=Meeting with %s
-ShowTask=Show task
-ShowAction=Show event
-ActionsReport=Events report
-ThirdPartiesOfSaleRepresentative=Third parties with sales representative
-SaleRepresentativesOfThirdParty=Sales representatives of third party
-SalesRepresentative=Sales representative
-SalesRepresentatives=Sales representatives
-SalesRepresentativeFollowUp=Sales representative (follow-up)
-SalesRepresentativeSignature=Sales representative (signature)
-NoSalesRepresentativeAffected=No particular sales representative assigned
-ShowCustomer=Show customer
-ShowProspect=Show prospect
-ListOfProspects=List of prospects
-ListOfCustomers=List of customers
-LastDoneTasks=Latest %s completed actions
-LastActionsToDo=Oldest %s not completed actions
-DoneAndToDoActions=Completed and To do events
-DoneActions=Completed events
-ToDoActions=Incomplete events
-SendPropalRef=Submission of commercial proposal %s
-SendOrderRef=Submission of order %s
-StatusNotApplicable=Not applicable
-StatusActionToDo=To do
-StatusActionDone=Complete
-StatusActionInProcess=In process
-TasksHistoryForThisContact=Events for this contact
-LastProspectDoNotContact=Do not contact
-LastProspectNeverContacted=Never contacted
-LastProspectToContact=To contact
-LastProspectContactInProcess=Contact in process
-LastProspectContactDone=Contact done
-ActionAffectedTo=Event assigned to
-ActionDoneBy=Event done by
-ActionAC_TEL=Phone call
-ActionAC_FAX=Send fax
-ActionAC_PROP=Send proposal by mail
-ActionAC_EMAIL=Send Email
-ActionAC_EMAIL_IN=Reception of Email
-ActionAC_RDV=Meetings
-ActionAC_INT=Intervention on site
-ActionAC_FAC=Send customer invoice by mail
-ActionAC_REL=Send customer invoice by mail (reminder)
-ActionAC_CLO=Close
-ActionAC_EMAILING=Send mass email
-ActionAC_COM=Send sales order by mail
-ActionAC_SHIP=Send shipping by mail
-ActionAC_SUP_ORD=Send purchase order by mail
-ActionAC_SUP_INV=Send vendor invoice by mail
-ActionAC_OTH=Other
-ActionAC_OTH_AUTO=Other auto
-ActionAC_MANUAL=Manually inserted events
-ActionAC_AUTO=Automatically inserted events
-ActionAC_OTH_AUTOShort=Other
-ActionAC_EVENTORGANIZATION=Event organization events
-Stats=Sales statistics
-StatusProsp=Prospect status
-DraftPropals=Draft commercial proposals
-NoLimit=No limit
-ToOfferALinkForOnlineSignature=Link for online signature
-WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
-ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
-ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
-SignatureProposalRef=Signature of quote/commercial proposal %s
-FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
+Commercial=کامرس
+CommercialArea=کامرس ایریا
+Customer=صارف
+Customers=گاہکوں
+Prospect=امکان
+Prospects=امکانات
+DeleteAction=ایک واقعہ حذف کریں۔
+NewAction=نیا واقعہ
+AddAction=ایونٹ بنائیں
+AddAnAction=ایک ایونٹ بنائیں
+AddActionRendezVous=ایک Rendez-vous ایونٹ بنائیں
+ConfirmDeleteAction=کیا آپ واقعی اس ایونٹ کو حذف کرنا چاہتے ہیں؟
+CardAction=ایونٹ کارڈ
+ActionOnCompany=متعلقہ کمپنی
+ActionOnContact=متعلقہ رابطہ
+TaskRDVWith=%s کے ساتھ ملاقات
+ShowTask=کام دکھائیں۔
+ShowAction=واقعہ دکھائیں۔
+ActionsReport=واقعات کی رپورٹ
+ThirdPartiesOfSaleRepresentative=فروخت کے نمائندے کے ساتھ تیسرے فریق
+SaleRepresentativesOfThirdParty=تیسرے فریق کے سیلز نمائندے۔
+SalesRepresentative=سیلز نمائندہ
+SalesRepresentatives=فروخت کرنے والے نمائندے
+SalesRepresentativeFollowUp=سیلز نمائندہ (فالو اپ)
+SalesRepresentativeSignature=سیلز نمائندہ (دستخط)
+NoSalesRepresentativeAffected=کوئی خاص سیلز نمائندہ تفویض نہیں کیا گیا ہے۔
+ShowCustomer=گاہک دکھائیں۔
+ShowProspect=امکان دکھائیں۔
+ListOfProspects=امکانات کی فہرست
+ListOfCustomers=صارفین کی فہرست
+LastDoneTasks=تازہ ترین %s مکمل کارروائیاں
+LastActionsToDo=قدیم ترین %s مکمل نہیں ہوئی کارروائیاں
+DoneAndToDoActions=مکمل اور کرنے کے واقعات
+DoneActions=مکمل واقعات
+ToDoActions=نامکمل واقعات
+SendPropalRef=تجارتی تجویز %s جمع کروانا
+SendOrderRef=آرڈر %s جمع کروانا
+StatusNotApplicable=قابل اطلاق نہیں۔
+StatusActionToDo=ایسا کرنے کے لئے
+StatusActionDone=مکمل
+StatusActionInProcess=اس عمل میں
+TasksHistoryForThisContact=اس رابطے کے لیے تقریبات
+LastProspectDoNotContact=رابطہ نہ کریں۔
+LastProspectNeverContacted=کبھی رابطہ نہیں کیا۔
+LastProspectToContact=رابطہ کرنا
+LastProspectContactInProcess=رابطہ عمل میں ہے۔
+LastProspectContactDone=رابطہ ہو گیا۔
+ActionAffectedTo=تقریب تفویض کی گئی۔
+ActionDoneBy=تقریب کی طرف سے کیا گیا
+ActionAC_TEL=فون کال
+ActionAC_FAX=فیکس بھیجیں۔
+ActionAC_PROP=بذریعہ ڈاک تجویز بھیجیں۔
+ActionAC_EMAIL=ای میل بھیجیں
+ActionAC_EMAIL_IN=ای میل کا استقبال
+ActionAC_RDV=ملاقاتیں
+ActionAC_INT=سائٹ پر مداخلت
+ActionAC_FAC=میل کے ذریعے کسٹمر انوائس بھیجیں۔
+ActionAC_REL=میل کے ذریعے کسٹمر انوائس بھیجیں (یاد دہانی)
+ActionAC_CLO=بند کریں
+ActionAC_EMAILING=بڑے پیمانے پر ای میل بھیجیں۔
+ActionAC_COM=میل کے ذریعے سیلز آرڈر بھیجیں۔
+ActionAC_SHIP=میل کے ذریعے شپنگ بھیجیں۔
+ActionAC_SUP_ORD=خریداری کا آرڈر بذریعہ ڈاک بھیجیں۔
+ActionAC_SUP_INV=وینڈر انوائس بذریعہ ڈاک بھیجیں۔
+ActionAC_OTH=دیگر
+ActionAC_OTH_AUTO=دیگر آٹو
+ActionAC_MANUAL=دستی طور پر داخل کردہ واقعات
+ActionAC_AUTO=خودکار طور پر شامل واقعات
+ActionAC_OTH_AUTOShort=دیگر
+ActionAC_EVENTORGANIZATION=تقریب کی تنظیم کے واقعات
+Stats=فروخت کے اعدادوشمار
+StatusProsp=امکانی حیثیت
+DraftPropals=تجارتی تجاویز کا مسودہ
+NoLimit=کوئی حد نہیں
+ToOfferALinkForOnlineSignature=آن لائن دستخط کے لیے لنک
+WelcomeOnOnlineSignaturePage=%s سے تجارتی تجاویز قبول کرنے کے لیے صفحہ پر خوش آمدید
+ThisScreenAllowsYouToSignDocFrom=یہ اسکرین آپ کو ایک اقتباس/تجارتی تجویز کو قبول کرنے اور اس پر دستخط کرنے، یا انکار کرنے کی اجازت دیتی ہے۔
+ThisIsInformationOnDocumentToSign=یہ قبول کرنے یا انکار کرنے کے لیے دستاویز کی معلومات ہے۔
+SignatureProposalRef=اقتباس/تجارتی تجویز %s کے دستخط
+FeatureOnlineSignDisabled=آن لائن دستخط کرنے کی خصوصیت غیر فعال یا خصوصیت کے فعال ہونے سے پہلے تیار کردہ دستاویز
diff --git a/htdocs/langs/ur_PK/companies.lang b/htdocs/langs/ur_PK/companies.lang
index 0495674f069..a6a675b79fc 100644
--- a/htdocs/langs/ur_PK/companies.lang
+++ b/htdocs/langs/ur_PK/companies.lang
@@ -1,121 +1,121 @@
 # Dolibarr language file - Source file is en_US - companies
-ErrorCompanyNameAlreadyExists=Company name %s already exists. Choose another one.
-ErrorSetACountryFirst=Set the country first
-SelectThirdParty=Select a third party
-ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
-DeleteContact=Delete a contact/address
-ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
-MenuNewThirdParty=New Third Party
-MenuNewCustomer=New Customer
-MenuNewProspect=New Prospect
-MenuNewSupplier=New Vendor
-MenuNewPrivateIndividual=New private individual
-NewCompany=New company (prospect, customer, vendor)
-NewThirdParty=New Third Party (prospect, customer, vendor)
-CreateDolibarrThirdPartySupplier=Create a third party (vendor)
-CreateThirdPartyOnly=Create third party
-CreateThirdPartyAndContact=Create a third party + a child contact
-ProspectionArea=Prospection area
-IdThirdParty=Id third party
-IdCompany=Company Id
-IdContact=Contact Id
-ThirdPartyContacts=Third-party contacts
-ThirdPartyContact=Third-party contact/address
-Company=Company
-CompanyName=Company name
-AliasNames=Alias name (commercial, trademark, ...)
-AliasNameShort=Alias Name
-Companies=Companies
-CountryIsInEEC=Country is inside the European Economic Community
-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=Prospects
-ThirdPartyProspectsStats=Prospects
-ThirdPartyCustomers=Customers
-ThirdPartyCustomersStats=Customers
-ThirdPartyCustomersWithIdProf12=Customers with %s or %s
-ThirdPartySuppliers=Vendors
-ThirdPartyType=Third-party type
-Individual=Private individual
-ToCreateContactWithSameName=Will automatically create a contact/address with same information as the third party under the third party. In most cases, even if your third party is a physical person, creating a third party alone is enough.
-ParentCompany=Parent company
-Subsidiaries=Subsidiaries
-ReportByMonth=Report per month
-ReportByCustomers=Report per customer
-ReportByThirdparties=Report per thirdparty
-ReportByQuarter=Report per rate
-CivilityCode=Civility code
-RegisteredOffice=Registered office
-Lastname=Last name
-Firstname=First name
-PostOrFunction=Job position
-UserTitle=Title
-NatureOfThirdParty=Nature of Third party
-NatureOfContact=Nature of Contact
-Address=Address
-State=State/Province
-StateCode=State/Province code
-StateShort=State
-Region=Region
-Region-State=Region - State
-Country=Country
-CountryCode=Country code
-CountryId=Country id
-Phone=Phone
-PhoneShort=Phone
-Skype=Skype
-Call=Call
-Chat=Chat
-PhonePro=Bus. phone
-PhonePerso=Pers. phone
-PhoneMobile=Mobile
-No_Email=Refuse bulk emailings
-Fax=Fax
-Zip=Zip Code
-Town=City
-Web=Web
-Poste= Position
-DefaultLang=Default language
-VATIsUsed=Sales tax used
-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
-OverAllProposals=Proposals
-OverAllOrders=Orders
-OverAllInvoices=Invoices
-OverAllSupplierProposals=Price requests
+ErrorCompanyNameAlreadyExists=کمپنی کا نام %s پہلے سے موجود ہے۔ ایک اور کا انتخاب کریں۔
+ErrorSetACountryFirst=پہلے ملک کو سیٹ کریں۔
+SelectThirdParty=تیسرے فریق کو منتخب کریں۔
+ConfirmDeleteCompany=کیا آپ واقعی اس کمپنی اور تمام متعلقہ معلومات کو حذف کرنا چاہتے ہیں؟
+DeleteContact=رابطہ/پتہ حذف کریں۔
+ConfirmDeleteContact=کیا آپ واقعی اس رابطہ اور تمام متعلقہ معلومات کو حذف کرنا چاہتے ہیں؟
+MenuNewThirdParty=نئی تیسری پارٹی
+MenuNewCustomer=نیا گاہک
+MenuNewProspect=نیا امکان
+MenuNewSupplier=نیا فروش
+MenuNewPrivateIndividual=نیا نجی فرد
+NewCompany=نئی کمپنی (امکان، گاہک، وینڈر)
+NewThirdParty=نئی تیسری پارٹی (امکان، گاہک، وینڈر)
+CreateDolibarrThirdPartySupplier=تیسری پارٹی بنائیں (فروش)
+CreateThirdPartyOnly=تھرڈ پارٹی بنائیں
+CreateThirdPartyAndContact=ایک فریق ثالث + بچے کا رابطہ بنائیں
+ProspectionArea=پراسپیکشن ایریا
+IdThirdParty=آئی ڈی تھرڈ پارٹی
+IdCompany=کمپنی کی شناخت
+IdContact=رابطہ کی شناخت
+ThirdPartyContacts=فریق ثالث کے رابطے
+ThirdPartyContact=فریق ثالث کا رابطہ/ پتہ
+Company=کمپنی
+CompanyName=کمپنی کا نام
+AliasNames=عرفی نام (تجارتی، ٹریڈ مارک، ...)
+AliasNameShort=عرفی نام
+Companies=کمپنیاں
+CountryIsInEEC=ملک یورپی اقتصادی برادری کے اندر ہے۔
+PriceFormatInCurrentLanguage=موجودہ زبان اور کرنسی میں قیمت ڈسپلے فارمیٹ
+ThirdPartyName=فریق ثالث کا نام
+ThirdPartyEmail=تھرڈ پارٹی ای میل
+ThirdParty=تیسری پارٹی
+ThirdParties=تیسرے فریقوں
+ThirdPartyProspects=امکانات
+ThirdPartyProspectsStats=امکانات
+ThirdPartyCustomers=گاہکوں
+ThirdPartyCustomersStats=گاہکوں
+ThirdPartyCustomersWithIdProf12=%s یا %s والے صارفین
+ThirdPartySuppliers=فروش
+ThirdPartyType=تیسری پارٹی کی قسم
+Individual=نجی فرد
+ToCreateContactWithSameName=تھرڈ پارٹی کے تحت تھرڈ پارٹی جیسی معلومات کے ساتھ خود بخود ایک رابطہ/پتہ بنائے گا۔ زیادہ تر معاملات میں، یہاں تک کہ اگر آپ کا تیسرا فریق جسمانی شخص ہے، تو اکیلے تیسرے فریق کو بنانا کافی ہے۔
+ParentCompany=پیرنٹ کمپنی
+Subsidiaries=ماتحت اداروں
+ReportByMonth=ماہانہ رپورٹ
+ReportByCustomers=رپورٹ فی گاہک
+ReportByThirdparties=رپورٹ فی تھرڈ پارٹی
+ReportByQuarter=رپورٹ فی ریٹ
+CivilityCode=شہریت کا ضابطہ
+RegisteredOffice=منظور شدہ دفتر
+Lastname=آخری نام
+Firstname=پہلا نام
+PostOrFunction=عہدہ
+UserTitle=عنوان
+NatureOfThirdParty=تیسرے فریق کی نوعیت
+NatureOfContact=رابطے کی نوعیت
+Address=پتہ
+State=ریاست/صوبہ
+StateCode=ریاست/صوبائی کوڈ
+StateShort=حالت
+Region=علاقہ
+Region-State=علاقہ - ریاست
+Country=ملک
+CountryCode=ملک کا کوڈ
+CountryId=ملک کی شناخت
+Phone=فون
+PhoneShort=فون
+Skype=سکائپ
+Call=کال کریں۔
+Chat=گپ شپ
+PhonePro=بس. فون
+PhonePerso=Pers فون
+PhoneMobile=موبائل
+No_Email=بلک ای میلز سے انکار کریں۔
+Fax=فیکس
+Zip=زپ کوڈ
+Town=شہر
+Web=ویب
+Poste= پوزیشن
+DefaultLang=پہلے سے طے شدہ زبان
+VATIsUsed=سیلز ٹیکس استعمال کیا گیا۔
+VATIsUsedWhenSelling=یہ اس بات کی وضاحت کرتا ہے کہ آیا اس تیسرے فریق میں سیلز ٹیکس شامل ہے یا نہیں جب وہ اپنے صارفین کو انوائس کرتا ہے۔
+VATIsNotUsed=سیلز ٹیکس استعمال نہیں کیا جاتا
+CopyAddressFromSoc=تیسرے فریق کی تفصیلات سے پتہ کاپی کریں۔
+ThirdpartyNotCustomerNotSupplierSoNoRef=فریق ثالث نہ تو گاہک اور نہ وینڈر، کوئی حوالہ دینے والی اشیاء دستیاب نہیں۔
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=تھرڈ پارٹی نہ تو گاہک اور نہ وینڈر، چھوٹ دستیاب نہیں ہے۔
+PaymentBankAccount=ادائیگی بینک اکاؤنٹ
+OverAllProposals=تجاویز
+OverAllOrders=احکامات
+OverAllInvoices=رسیدیں
+OverAllSupplierProposals=قیمت کی درخواستیں۔
 ##### Local Taxes #####
-LocalTax1IsUsed=Use second tax
-LocalTax1IsUsedES= RE is used
-LocalTax1IsNotUsedES= RE is not used
-LocalTax2IsUsed=Use third tax
-LocalTax2IsUsedES= IRPF is used
-LocalTax2IsNotUsedES= IRPF is not used
-WrongCustomerCode=Customer code invalid
-WrongSupplierCode=Vendor code invalid
-CustomerCodeModel=Customer code model
-SupplierCodeModel=Vendor code model
-Gencod=Barcode
+LocalTax1IsUsed=دوسرا ٹیکس استعمال کریں۔
+LocalTax1IsUsedES= RE استعمال کیا جاتا ہے۔
+LocalTax1IsNotUsedES= RE استعمال نہیں کیا جاتا ہے۔
+LocalTax2IsUsed=تیسرا ٹیکس استعمال کریں۔
+LocalTax2IsUsedES= IRPF استعمال کیا جاتا ہے۔
+LocalTax2IsNotUsedES= IRPF استعمال نہیں کیا جاتا ہے۔
+WrongCustomerCode=کسٹمر کوڈ غلط ہے۔
+WrongSupplierCode=وینڈر کوڈ غلط ہے۔
+CustomerCodeModel=کسٹمر کوڈ ماڈل
+SupplierCodeModel=وینڈر کوڈ ماڈل
+Gencod=بارکوڈ
 ##### Professional ID #####
-ProfId1Short=Prof. id 1
-ProfId2Short=Prof. id 2
-ProfId3Short=Prof. id 3
-ProfId4Short=Prof. id 4
-ProfId5Short=Prof. id 5
-ProfId6Short=Prof. id 6
-ProfId1=Professional ID 1
-ProfId2=Professional ID 2
-ProfId3=Professional ID 3
-ProfId4=Professional ID 4
-ProfId5=Professional ID 5
-ProfId6=Professional ID 6
-ProfId1AR=Prof Id 1 (CUIT/CUIL)
+ProfId1Short=پروفیسر آئی ڈی 1
+ProfId2Short=پروفیسر آئی ڈی 2
+ProfId3Short=پروفیسر آئی ڈی 3
+ProfId4Short=پروفیسر آئی ڈی 4
+ProfId5Short=پروفیسر آئی ڈی 5
+ProfId6Short=پروفیسر آئی ڈی 6
+ProfId1=پروفیشنل آئی ڈی 1
+ProfId2=پروفیشنل آئی ڈی 2
+ProfId3=پروفیشنل آئی ڈی 3
+ProfId4=پروفیشنل آئی ڈی 4
+ProfId5=پروفیشنل آئی ڈی 5
+ProfId6=پروفیشنل آئی ڈی 6
+ProfId1AR=پروفیسر کی شناخت 1 (CUIT/CUIL)
 ProfId2AR=Prof Id 2 (Revenu brutes)
 ProfId3AR=-
 ProfId4AR=-
@@ -123,41 +123,53 @@ ProfId5AR=-
 ProfId6AR=-
 ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-Nr)
-ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
+ProfId3AT=پروفیسر کی شناخت 3 (ہینڈل رجسٹر-Nr.)
 ProfId4AT=-
-ProfId5AT=EORI number
+ProfId5AT=EORI نمبر
 ProfId6AT=-
-ProfId1AU=Prof Id 1 (ABN)
+ProfId1AU=پروفیسر Id 1 (ABN)
 ProfId2AU=-
 ProfId3AU=-
 ProfId4AU=-
 ProfId5AU=-
 ProfId6AU=-
-ProfId1BE=Prof Id 1 (Professional number)
+ProfId1BE=پروفیسر کی شناخت 1 (پیشہ ور نمبر)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=EORI number
+ProfId5BE=EORI نمبر
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
 ProfId3BR=IM (Inscricao Municipal)
-ProfId4BR=CPF
+ProfId4BR=سی پی ایف
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=UID-Nummer
+ProfId1CH=UID-نمبر
 ProfId2CH=-
-ProfId3CH=Prof Id 1 (Federal number)
-ProfId4CH=Prof Id 2 (Commercial Record number)
-ProfId5CH=EORI number
+ProfId3CH=پروفیسر کی شناخت 1 (وفاقی نمبر)
+ProfId4CH=پروفیسر کی شناخت 2 (کمرشل ریکارڈ نمبر)
+ProfId5CH=EORI نمبر
 ProfId6CH=-
-ProfId1CL=Prof Id 1 (R.U.T.)
+ProfId1CL=پروفیسر Id 1 (R.U.T.)
 ProfId2CL=-
 ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
-ProfId1CO=Prof Id 1 (R.U.T.)
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
+ProfId1CO=پروفیسر Id 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
 ProfId4CO=-
@@ -165,319 +177,319 @@ ProfId5CO=-
 ProfId6CO=-
 ProfId1DE=Prof Id 1 (USt.-IdNr)
 ProfId2DE=Prof Id 2 (USt.-Nr)
-ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
+ProfId3DE=پروفیسر کی شناخت 3 (ہینڈل رجسٹر-Nr.)
 ProfId4DE=-
-ProfId5DE=EORI number
+ProfId5DE=EORI نمبر
 ProfId6DE=-
-ProfId1ES=Prof Id 1 (CIF/NIF)
-ProfId2ES=Prof Id 2 (Social security number)
-ProfId3ES=Prof Id 3 (CNAE)
-ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=Prof Id 5 (EORI number)
+ProfId1ES=پروفیسر کی شناخت 1 (CIF/NIF)
+ProfId2ES=پروفیسر آئی ڈی 2 (سوشل سیکیورٹی نمبر)
+ProfId3ES=پروفیسر آئی ڈی 3 (CNAE)
+ProfId4ES=پروفیسر کی شناخت 4 (کالج نمبر)
+ProfId5ES=پروفیسر کی شناخت 5 (EORI نمبر)
 ProfId6ES=-
-ProfId1FR=Prof Id 1 (SIREN)
-ProfId2FR=Prof Id 2 (SIRET)
+ProfId1FR=پروفیسر Id 1 (SIREN)
+ProfId2FR=پروفیسر آئی ڈی 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
-ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=Prof Id 5 (numéro EORI)
+ProfId4FR=پروفیسر کی شناخت 4 (RCS/RM)
+ProfId5FR=پروفیسر آئی ڈی 5 (نمبر EORI)
 ProfId6FR=-
-ProfId1ShortFR=SIREN
+ProfId1ShortFR=سائرن کی آواز
 ProfId2ShortFR=SIRET
-ProfId3ShortFR=NAF
-ProfId4ShortFR=RCS
-ProfId5ShortFR=EORI
+ProfId3ShortFR=این اے ایف
+ProfId4ShortFR=آر سی ایس
+ProfId5ShortFR=ای او آر آئی
 ProfId6ShortFR=-
-ProfId1GB=Registration Number
+ProfId1GB=رجسٹریشن نمبر
 ProfId2GB=-
-ProfId3GB=SIC
+ProfId3GB=ایس آئی سی
 ProfId4GB=-
 ProfId5GB=-
 ProfId6GB=-
-ProfId1HN=Id prof. 1 (RTN)
+ProfId1HN=آئی ڈی پروفیسر 1 (RTN)
 ProfId2HN=-
 ProfId3HN=-
 ProfId4HN=-
 ProfId5HN=-
 ProfId6HN=-
-ProfId1IN=Prof Id 1 (TIN)
-ProfId2IN=Prof Id 2 (PAN)
-ProfId3IN=Prof Id 3 (SRVC TAX)
-ProfId4IN=Prof Id 4
-ProfId5IN=Prof Id 5
+ProfId1IN=پروفیسر کی شناخت 1 (TIN)
+ProfId2IN=پروفیسر کی شناخت 2 (PAN)
+ProfId3IN=پروفیسر کی شناخت 3 (SRVC TAX)
+ProfId4IN=پروفیسر آئی ڈی 4
+ProfId5IN=پروفیسر آئی ڈی 5
 ProfId6IN=-
 ProfId1IT=-
 ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
-ProfId5IT=EORI number
+ProfId5IT=EORI نمبر
 ProfId6IT=-
-ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
-ProfId2LU=Id. prof. 2 (Business permit)
+ProfId1LU=آئی ڈی پروفیسر 1 (R.C.S. لکسمبرگ)
+ProfId2LU=آئی ڈی پروفیسر 2 (کاروباری اجازت نامہ)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=EORI number
+ProfId5LU=EORI نمبر
 ProfId6LU=-
-ProfId1MA=Id prof. 1 (R.C.)
-ProfId2MA=Id prof. 2 (Patente)
-ProfId3MA=Id prof. 3 (I.F.)
-ProfId4MA=Id prof. 4 (C.N.S.S.)
-ProfId5MA=Id prof. 5 (I.C.E.)
+ProfId1MA=آئی ڈی پروفیسر 1 (R.C.)
+ProfId2MA=آئی ڈی پروفیسر 2 (پیٹنٹ)
+ProfId3MA=آئی ڈی پروفیسر 3 (آئی ایف)
+ProfId4MA=آئی ڈی پروفیسر 4 (C.N.S.S.)
+ProfId5MA=آئی ڈی پروفیسر 5 (I.C.E.)
 ProfId6MA=-
-ProfId1MX=Prof Id 1 (R.F.C).
-ProfId2MX=Prof Id 2 (R..P. IMSS)
-ProfId3MX=Prof Id 3 (Profesional Charter)
+ProfId1MX=پروفیسر Id 1 (R.F.C)۔
+ProfId2MX=پروفیسر Id 2 (R.P. IMSS)
+ProfId3MX=Prof Id 3 (پروفیشنل چارٹر)
 ProfId4MX=-
 ProfId5MX=-
 ProfId6MX=-
-ProfId1NL=KVK nummer
+ProfId1NL=KVK نمبر
 ProfId2NL=-
 ProfId3NL=-
-ProfId4NL=Burgerservicenummer (BSN)
-ProfId5NL=EORI number
+ProfId4NL=برگر سروس نمبر (BSN)
+ProfId5NL=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)
+ProfId1PT=پروفیسر Id 1 (NIPC)
+ProfId2PT=پروفیسر آئی ڈی 2 (سوشل سیکیورٹی نمبر)
+ProfId3PT=پروفیسر آئی ڈی 3 (کمرشل ریکارڈ نمبر)
+ProfId4PT=پروفیسر آئی ڈی 4 (کنزرویٹری)
+ProfId5PT=پروفیسر کی شناخت 5 (EORI نمبر)
 ProfId6PT=-
-ProfId1SN=RC
-ProfId2SN=NINEA
+ProfId1SN=آر سی
+ProfId2SN=نینا
 ProfId3SN=-
 ProfId4SN=-
 ProfId5SN=-
 ProfId6SN=-
-ProfId1TN=Prof Id 1 (RC)
-ProfId2TN=Prof Id 2 (Fiscal matricule)
+ProfId1TN=پروفیسر Id 1 (RC)
+ProfId2TN=پروفیسر کی شناخت 2 (مالی میٹرک)
 ProfId3TN=Prof Id 3 (Douane code)
-ProfId4TN=Prof Id 4 (BAN)
+ProfId4TN=پروفیسر Id 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof Id (FEIN)
+ProfId1US=پروفیسر کی شناخت (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
 ProfId5US=-
 ProfId6US=-
-ProfId1RO=Prof Id 1 (CUI)
-ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
-ProfId3RO=Prof Id 3 (CAEN)
-ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=Prof Id 5 (EORI number)
+ProfId1RO=پروفیسر کی شناخت 1 (CUI)
+ProfId2RO=پروفیسر Id 2 (Nr. Înmatriculare)
+ProfId3RO=پروفیسر ID 3 (CAEN)
+ProfId4RO=پروفیسر کی شناخت 5 (EUID)
+ProfId5RO=پروفیسر کی شناخت 5 (EORI نمبر)
 ProfId6RO=-
-ProfId1RU=Prof Id 1 (OGRN)
-ProfId2RU=Prof Id 2 (INN)
-ProfId3RU=Prof Id 3 (KPP)
-ProfId4RU=Prof Id 4 (OKPO)
+ProfId1RU=پروفیسر آئی ڈی 1 (OGRN)
+ProfId2RU=پروفیسر کی شناخت 2 (INN)
+ProfId3RU=پروفیسر Id 3 (KPP)
+ProfId4RU=پروفیسر آئی ڈی 4 (OKPO)
 ProfId5RU=-
 ProfId6RU=-
-ProfId1UA=Prof Id 1 (EDRPOU)
-ProfId2UA=Prof Id 2 (DRFO)
-ProfId3UA=Prof Id 3 (INN)
-ProfId4UA=Prof Id 4 (Certificate)
-ProfId5UA=Prof Id 5 (RNOKPP)
+ProfId1UA=پروفیسر کی شناخت 1 (EDRPOU)
+ProfId2UA=پروفیسر آئی ڈی 2 (DRFO)
+ProfId3UA=پروفیسر کی شناخت 3 (INN)
+ProfId4UA=پروفیسر کی شناخت 4 (سرٹیفکیٹ)
+ProfId5UA=پروفیسر کی شناخت 5 (RNOKPP)
 ProfId6UA=Prof Id 6 (TRDPAU)
-ProfId1DZ=RC
-ProfId2DZ=Art.
-ProfId3DZ=NIF
-ProfId4DZ=NIS
+ProfId1DZ=آر سی
+ProfId2DZ=فن
+ProfId3DZ=این آئی ایف
+ProfId4DZ=این آئی ایس
 VATIntra=VAT ID
 VATIntraShort=VAT ID
-VATIntraSyntaxIsValid=Syntax is valid
-VATReturn=VAT return
-ProspectCustomer=Prospect / Customer
-Prospect=Prospect
-CustomerCard=Customer Card
-Customer=Customer
-CustomerRelativeDiscount=Relative customer discount
-SupplierRelativeDiscount=Relative vendor discount
-CustomerRelativeDiscountShort=Relative discount
-CustomerAbsoluteDiscountShort=Absolute discount
-CompanyHasRelativeDiscount=This customer has a default discount of <b>%s%%</b>
-CompanyHasNoRelativeDiscount=This customer has no relative discount by default
-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
-CompanyHasCreditNote=This customer still has credit notes for <b>%s</b> %s
-HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this vendor
-HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this vendor
-HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this vendor
-HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this vendor
-CompanyHasNoAbsoluteDiscount=This customer has no discount credit available
-CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
-CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
-SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
-SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
-DiscountNone=None
-Vendor=Vendor
-Supplier=Vendor
-AddContact=Create contact
-AddContactAddress=Create contact/address
-EditContact=Edit contact
-EditContactAddress=Edit contact/address
-Contact=Contact/Address
-Contacts=Contacts/Addresses
-ContactId=Contact id
-ContactsAddresses=Contacts/Addresses
-FromContactName=Name:
-NoContactDefinedForThirdParty=No contact defined for this third party
-NoContactDefined=No contact defined
-DefaultContact=Default contact/address
-ContactByDefaultFor=Default contact/address for
-AddThirdParty=Create third party
-DeleteACompany=Delete a company
-PersonalInformations=Personal data
-AccountancyCode=Accounting account
-CustomerCode=Customer Code
-SupplierCode=Vendor Code
-CustomerCodeShort=Customer Code
-SupplierCodeShort=Vendor Code
-CustomerCodeDesc=Customer Code, unique for all customers
-SupplierCodeDesc=Vendor Code, unique for all vendors
-RequiredIfCustomer=Required if third party is a customer or prospect
-RequiredIfSupplier=Required if third party is a vendor
-ValidityControledByModule=Validity controlled by the module
-ThisIsModuleRules=Rules for this module
-ProspectToContact=Prospect to contact
-CompanyDeleted=Company "%s" deleted from database.
-ListOfContacts=List of contacts/addresses
-ListOfContactsAddresses=List of contacts/addresses
-ListOfThirdParties=List of Third Parties
-ShowCompany=Third Party
-ShowContact=Contact-Address
-ContactsAllShort=All (No filter)
-ContactType=Contact type
-ContactForOrders=Order's contact
-ContactForOrdersOrShipments=Order's or shipment's contact
-ContactForProposals=Proposal's contact
-ContactForContracts=Contract's contact
-ContactForInvoices=Invoice's contact
-NoContactForAnyOrder=This contact is not a contact for any order
-NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
-NoContactForAnyProposal=This contact is not a contact for any commercial proposal
-NoContactForAnyContract=This contact is not a contact for any contract
-NoContactForAnyInvoice=This contact is not a contact for any invoice
-NewContact=New contact
-NewContactAddress=New Contact/Address
-MyContacts=My contacts
-Capital=Capital
-CapitalOf=Capital of %s
-EditCompany=Edit company
-ThisUserIsNot=This user is not a prospect, customer or vendor
-VATIntraCheck=Check
-VATIntraCheckDesc=The VAT ID must include the country prefix. The link <b>%s</b> uses the European VAT checker service (VIES) which requires internet access from the Dolibarr server.
+VATIntraSyntaxIsValid=نحو درست ہے۔
+VATReturn=VAT کی واپسی۔
+ProspectCustomer=امکان / گاہک
+Prospect=امکان
+CustomerCard=کسٹمر کارڈ
+Customer=صارف
+CustomerRelativeDiscount=متعلقہ کسٹمر رعایت
+SupplierRelativeDiscount=متعلقہ وینڈر ڈسکاؤنٹ
+CustomerRelativeDiscountShort=متعلقہ رعایت
+CustomerAbsoluteDiscountShort=مطلق رعایت
+CompanyHasRelativeDiscount=اس صارف کے پاس <b> %s%% </b> کی ڈیفالٹ رعایت ہے۔
+CompanyHasNoRelativeDiscount=اس صارف کو بطور ڈیفالٹ کوئی رشتہ دار رعایت نہیں ہے۔
+HasRelativeDiscountFromSupplier=آپ کے پاس اس وینڈر سے <b> %s%% </b> کی ڈیفالٹ رعایت ہے۔
+HasNoRelativeDiscountFromSupplier=آپ کے پاس اس وینڈر سے کوئی ڈیفالٹ رشتہ دار رعایت نہیں ہے۔
+CompanyHasAbsoluteDiscount=اس صارف کے پاس <b> %s </b> %s کے لیے رعایتیں دستیاب ہیں (کریڈٹ نوٹس یا ڈاؤن پیمنٹس)
+CompanyHasDownPaymentOrCommercialDiscount=اس صارف کے پاس <b> %s </b> %s کے لیے چھوٹ دستیاب ہے (تجارتی، نیچے ادائیگیاں)
+CompanyHasCreditNote=اس صارف کے پاس ابھی بھی <b> %s </b> %s کے لیے کریڈٹ نوٹ موجود ہیں۔
+HasNoAbsoluteDiscountFromSupplier=آپ کو اس وینڈر سے کوئی رعایتی کریڈٹ دستیاب نہیں ہے۔
+HasAbsoluteDiscountFromSupplier=آپ کے پاس اس وینڈر سے <b> %s </b> %s کے لیے رعایتیں دستیاب ہیں (کریڈٹ نوٹس یا ڈاؤن پیمنٹس)
+HasDownPaymentOrCommercialDiscountFromSupplier=آپ کے پاس اس وینڈر سے <b> %s </b> %s کے لیے چھوٹ دستیاب ہے (تجارتی، نیچے ادائیگی)
+HasCreditNoteFromSupplier=آپ کے پاس اس وینڈر سے <b> %s </b> %s کے لیے کریڈٹ نوٹس ہیں۔
+CompanyHasNoAbsoluteDiscount=اس صارف کے پاس کوئی رعایتی کریڈٹ دستیاب نہیں ہے۔
+CustomerAbsoluteDiscountAllUsers=صارفین کی مطلق چھوٹ (تمام صارفین کی طرف سے دی گئی)
+CustomerAbsoluteDiscountMy=صارفین کی مطلق چھوٹ (آپ کی طرف سے دی گئی)
+SupplierAbsoluteDiscountAllUsers=مطلق وینڈر ڈسکاؤنٹس (تمام صارفین کے ذریعہ درج)
+SupplierAbsoluteDiscountMy=مطلق وینڈر ڈسکاؤنٹس (خود سے داخل)
+DiscountNone=کوئی نہیں۔
+Vendor=فروش
+Supplier=فروش
+AddContact=رابطہ بنائیں
+AddContactAddress=رابطہ/پتہ بنائیں
+EditContact=رابطے میں ترمیم کریں۔
+EditContactAddress=رابطہ/پتہ میں ترمیم کریں۔
+Contact=رابطہ/ پتہ
+Contacts=رابطے/پتے
+ContactId=رابطہ آئی ڈی
+ContactsAddresses=رابطے/پتے
+FromContactName=نام:
+NoContactDefinedForThirdParty=اس تیسرے فریق کے لیے کوئی رابطہ متعین نہیں ہے۔
+NoContactDefined=کوئی رابطہ متعین نہیں ہے۔
+DefaultContact=پہلے سے طے شدہ رابطہ/پتہ
+ContactByDefaultFor=پہلے سے طے شدہ رابطہ/پتہ برائے
+AddThirdParty=تھرڈ پارٹی بنائیں
+DeleteACompany=کمپنی کو حذف کریں۔
+PersonalInformations=ذاتی مواد
+AccountancyCode=حساب کتاب
+CustomerCode=کسٹمر کوڈ
+SupplierCode=وینڈر کوڈ
+CustomerCodeShort=کسٹمر کوڈ
+SupplierCodeShort=وینڈر کوڈ
+CustomerCodeDesc=کسٹمر کوڈ، تمام صارفین کے لیے منفرد
+SupplierCodeDesc=وینڈر کوڈ، تمام دکانداروں کے لیے منفرد
+RequiredIfCustomer=اگر تیسرا فریق گاہک یا امکان ہے۔
+RequiredIfSupplier=اگر تھرڈ پارٹی وینڈر ہے تو درکار ہے۔
+ValidityControledByModule=موزونیت ماڈیول کے ذریعے کنٹرول کی جاتی ہے۔
+ThisIsModuleRules=اس ماڈیول کے لیے قواعد
+ProspectToContact=رابطہ کرنے کا امکان
+CompanyDeleted=کمپنی "%s" کو ڈیٹا بیس سے حذف کر دیا گیا۔
+ListOfContacts=رابطوں/ پتوں کی فہرست
+ListOfContactsAddresses=رابطوں/ پتوں کی فہرست
+ListOfThirdParties=تیسرے فریق کی فہرست
+ShowCompany=تیسری پارٹی
+ShowContact=رابطہ کا پتہ
+ContactsAllShort=تمام (کوئی فلٹر نہیں)
+ContactType=رابطے کی قسم
+ContactForOrders=آرڈر کا رابطہ
+ContactForOrdersOrShipments=آرڈر یا شپمنٹ کا رابطہ
+ContactForProposals=تجویز کا رابطہ
+ContactForContracts=معاہدہ کا رابطہ
+ContactForInvoices=انوائس کا رابطہ
+NoContactForAnyOrder=یہ رابطہ کسی آرڈر کے لیے رابطہ نہیں ہے۔
+NoContactForAnyOrderOrShipments=یہ رابطہ کسی آرڈر یا شپمنٹ کے لیے رابطہ نہیں ہے۔
+NoContactForAnyProposal=یہ رابطہ کسی تجارتی تجویز کے لیے رابطہ نہیں ہے۔
+NoContactForAnyContract=یہ رابطہ کسی معاہدے کے لیے رابطہ نہیں ہے۔
+NoContactForAnyInvoice=یہ رابطہ کسی رسید کے لیے رابطہ نہیں ہے۔
+NewContact=نیا رابطہ
+NewContactAddress=نیا رابطہ/پتہ
+MyContacts=میرے رابطے
+Capital=سرمایہ
+CapitalOf=%s کا سرمایہ
+EditCompany=کمپنی میں ترمیم کریں۔
+ThisUserIsNot=یہ صارف کوئی امکان، گاہک یا وینڈر نہیں ہے۔
+VATIntraCheck=چیک کریں۔
+VATIntraCheckDesc=VAT ID میں ملک کا سابقہ شامل ہونا چاہیے۔ لنک <b> %s </b> یورپی VAT چیکر سروس (VIES) کا استعمال کرتا ہے جسے 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>
-ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
-NorProspectNorCustomer=Not prospect, nor customer
-JuridicalStatus=Business entity type
-Workforce=Workforce
-Staff=Employees
-ProspectLevelShort=Potential
-ProspectLevel=Prospect potential
-ContactPrivate=Private
-ContactPublic=Shared
-ContactVisibility=Visibility
-ContactOthers=Other
-OthersNotLinkedToThirdParty=Others, not linked to a third party
-ProspectStatus=Prospect status
-PL_NONE=None
-PL_UNKNOWN=Unknown
-PL_LOW=Low
-PL_MEDIUM=Medium
-PL_HIGH=High
+VATIntraCheckableOnEUSite=یورپی کمیشن کی ویب سائٹ پر انٹرا کمیونٹی VAT ID چیک کریں۔
+VATIntraManualCheck=آپ یورپی کمیشن کی ویب سائٹ <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a> پر دستی طور پر بھی چیک کر سکتے ہیں۔
+ErrorVATCheckMS_UNAVAILABLE=چیک کرنا ممکن نہیں ہے۔ چیک سروس رکن ریاست (%s) کی طرف سے فراہم نہیں کی جاتی ہے۔
+NorProspectNorCustomer=نہ امکان، نہ گاہک
+JuridicalStatus=کاروباری ادارے کی قسم
+Workforce=افرادی قوت
+Staff=ملازمین
+ProspectLevelShort=ممکنہ، استعداد
+ProspectLevel=امکانی امکان
+ContactPrivate=نجی
+ContactPublic=مشترکہ
+ContactVisibility=مرئیت
+ContactOthers=دیگر
+OthersNotLinkedToThirdParty=دوسرے، کسی تیسرے فریق سے منسلک نہیں ہیں۔
+ProspectStatus=امکانی حیثیت
+PL_NONE=کوئی نہیں۔
+PL_UNKNOWN=نامعلوم
+PL_LOW=کم
+PL_MEDIUM=درمیانہ
+PL_HIGH=اعلی
 TE_UNKNOWN=-
-TE_STARTUP=Startup
-TE_GROUP=Large company
-TE_MEDIUM=Medium company
-TE_ADMIN=Governmental
-TE_SMALL=Small company
-TE_RETAIL=Retailer
-TE_WHOLE=Wholesaler
-TE_PRIVATE=Private individual
-TE_OTHER=Other
-StatusProspect-1=Do not contact
-StatusProspect0=Never contacted
-StatusProspect1=To be contacted
-StatusProspect2=Contact in process
-StatusProspect3=Contact done
-ChangeDoNotContact=Change status to 'Do not contact'
-ChangeNeverContacted=Change status to 'Never contacted'
-ChangeToContact=Change status to 'To be contacted'
-ChangeContactInProcess=Change status to 'Contact in process'
-ChangeContactDone=Change status to 'Contact done'
-ProspectsByStatus=Prospects by status
-NoParentCompany=None
-ExportCardToFormat=Export card to format
-ContactNotLinkedToCompany=Contact not linked to any third party
-DolibarrLogin=Dolibarr login
-NoDolibarrAccess=No Dolibarr access
-ExportDataset_company_1=Third-parties (companies/foundations/physical people) and their properties
-ExportDataset_company_2=Contacts and their properties
-ImportDataset_company_1=Third-parties and their properties
-ImportDataset_company_2=Third-parties additional contacts/addresses and attributes
-ImportDataset_company_3=Third-parties Bank accounts
-ImportDataset_company_4=Third-parties Sales representatives (assign sales representatives/users to companies)
-PriceLevel=Price Level
-PriceLevelLabels=Price Level Labels
-DeliveryAddress=Delivery address
-AddAddress=Add address
-SupplierCategory=Vendor category
-JuridicalStatus200=Independent
-DeleteFile=Delete file
-ConfirmDeleteFile=Are you sure you want to delete this file?
-AllocateCommercial=Assigned to sales representative
-Organization=Organization
-FiscalYearInformation=Fiscal Year
-FiscalMonthStart=Starting month of the fiscal year
-SocialNetworksInformation=Social networks
-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
-InActivity=Open
-ActivityCeased=Closed
-ThirdPartyIsClosed=Third party is closed
-ProductsIntoElements=List of products/services mapped to %s
-CurrentOutstandingBill=Current outstanding bill
-OutstandingBill=Max. for outstanding bill
-OutstandingBillReached=Max. for outstanding bill reached
-OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
-LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
-ManagingDirectors=Manager(s) name (CEO, director, president...)
-MergeOriginThirdparty=Duplicate third party (third party you want to delete)
-MergeThirdparties=Merge third parties
-ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
-ThirdpartiesMergeSuccess=Third parties have been merged
-SaleRepresentativeLogin=Login of sales representative
-SaleRepresentativeFirstname=First name of sales representative
-SaleRepresentativeLastname=Last name of sales representative
-ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=Customer or Vendor code already used, a new code is suggested
-KeepEmptyIfGenericAddress=Keep this field empty if this address is a generic address
+TE_STARTUP=شروع
+TE_GROUP=بڑی کمپنی
+TE_MEDIUM=درمیانی کمپنی
+TE_ADMIN=حکومتی
+TE_SMALL=چھوٹی کمپنی
+TE_RETAIL=خوردہ فروش
+TE_WHOLE=تھوک فروش
+TE_PRIVATE=نجی فرد
+TE_OTHER=دیگر
+StatusProspect-1=رابطہ نہ کریں۔
+StatusProspect0=کبھی رابطہ نہیں کیا۔
+StatusProspect1=رابطہ کیا جائے۔
+StatusProspect2=رابطہ عمل میں ہے۔
+StatusProspect3=رابطہ ہو گیا۔
+ChangeDoNotContact=اسٹیٹس کو 'رابطہ نہ کریں' میں تبدیل کریں
+ChangeNeverContacted=اسٹیٹس کو 'کبھی رابطہ نہیں ہوا' میں تبدیل کریں
+ChangeToContact=حیثیت کو 'رابطہ کرنے کے لیے' میں تبدیل کریں
+ChangeContactInProcess=حالت کو 'رابطہ جاری ہے' میں تبدیل کریں
+ChangeContactDone=حالت کو 'رابطہ ہو گیا' میں تبدیل کریں
+ProspectsByStatus=حیثیت کے لحاظ سے امکانات
+NoParentCompany=کوئی نہیں۔
+ExportCardToFormat=فارمیٹ میں کارڈ برآمد کریں۔
+ContactNotLinkedToCompany=رابطہ کسی تیسرے فریق سے منسلک نہیں ہے۔
+DolibarrLogin=Dolibarr لاگ ان
+NoDolibarrAccess=Dolibarr تک رسائی نہیں ہے۔
+ExportDataset_company_1=فریق ثالث (کمپنیاں/فاؤنڈیشنز/جسمانی لوگ) اور ان کی خصوصیات
+ExportDataset_company_2=رابطے اور ان کی خصوصیات
+ImportDataset_company_1=فریق ثالث اور ان کی خصوصیات
+ImportDataset_company_2=فریق ثالث کے اضافی رابطے/پتے اور صفات
+ImportDataset_company_3=فریق ثالث کے بینک اکاؤنٹس
+ImportDataset_company_4=فریق ثالث کے سیلز نمائندے (کمپنیوں کو سیلز کے نمائندے/صارفین تفویض کریں)
+PriceLevel=قیمت کی سطح
+PriceLevelLabels=قیمت کی سطح کے لیبلز
+DeliveryAddress=ترسیل کا پتہ
+AddAddress=ایڈریس شامل کریں۔
+SupplierCategory=وینڈر کیٹیگری
+JuridicalStatus200=آزاد
+DeleteFile=فائل کو ڈیلیٹ کریں
+ConfirmDeleteFile=کیا آپ واقعی اس فائل کو حذف کرنا چاہتے ہیں؟
+AllocateCommercial=سیلز کے نمائندے کو تفویض کیا گیا۔
+Organization=تنظیم
+FiscalYearInformation=مالی سال
+FiscalMonthStart=مالی سال کا شروع ہونے والا مہینہ
+SocialNetworksInformation=سوشل نیٹ ورک
+SocialNetworksFacebookURL=فیس بک یو آر ایل
+SocialNetworksTwitterURL=ٹویٹر یو آر ایل
+SocialNetworksLinkedinURL=لنکڈ یو آر ایل
+SocialNetworksInstagramURL=انسٹاگرام یو آر ایل
+SocialNetworksYoutubeURL=یوٹیوب یو آر ایل
+SocialNetworksGithubURL=گیتھب یو آر ایل
+YouMustAssignUserMailFirst=ای میل اطلاع شامل کرنے کے قابل ہونے سے پہلے آپ کو اس صارف کے لیے ایک ای میل بنانا چاہیے۔
+YouMustCreateContactFirst=ای میل اطلاعات شامل کرنے کے قابل ہونے کے لیے، آپ کو پہلے فریق ثالث کے لیے درست ای میلز کے ساتھ رابطوں کی وضاحت کرنی چاہیے
+ListSuppliersShort=دکانداروں کی فہرست
+ListProspectsShort=امکانات کی فہرست
+ListCustomersShort=صارفین کی فہرست
+ThirdPartiesArea=تیسرے فریق/رابطے۔
+LastModifiedThirdParties=تازہ ترین %s فریق ثالث جن میں ترمیم کی گئی تھی۔
+UniqueThirdParties=تیسرے فریق کی کل تعداد
+InActivity=کھولیں۔
+ActivityCeased=بند
+ThirdPartyIsClosed=تیسری پارٹی بند ہے۔
+ProductsIntoElements=%s پر میپ کیے گئے پروڈکٹس/سروسز کی فہرست
+CurrentOutstandingBill=موجودہ بقایا بل
+OutstandingBill=زیادہ سے زیادہ بقایا بل کے لیے
+OutstandingBillReached=زیادہ سے زیادہ بقایا بل تک پہنچ گئے۔
+OrderMinAmount=آرڈر کے لیے کم از کم رقم
+MonkeyNumRefModelDesc=کسٹمر کوڈ کے لیے %syymm-nnnn فارمیٹ میں ایک نمبر اور وینڈر کوڈ کے لیے %syymm-nnnn جہاں yy سال ہے، mm مہینہ ہے اور nnnn ایک ترتیب وار خود بخود بڑھنے والا نمبر ہے جس میں کوئی وقفہ نہیں ہوتا ہے اور 0 پر واپس نہیں آتا ہے۔
+LeopardNumRefModelDesc=کوڈ مفت ہے۔ اس کوڈ میں کسی بھی وقت ترمیم کی جا سکتی ہے۔
+ManagingDirectors=مینیجر کا نام (سی ای او، ڈائریکٹر، صدر...)
+MergeOriginThirdparty=ڈپلیکیٹ تھرڈ پارٹی (تیسری پارٹی جسے آپ حذف کرنا چاہتے ہیں)
+MergeThirdparties=تیسرے فریق کو ضم کریں۔
+ConfirmMergeThirdparties=کیا آپ واقعی منتخب تیسرے فریق کو موجودہ کے ساتھ ضم کرنا چاہتے ہیں؟ تمام منسلک اشیاء (انوائسز، آرڈرز، ...) کو موجودہ تھرڈ پارٹی میں منتقل کر دیا جائے گا، جس کے بعد منتخب تھرڈ پارٹی کو حذف کر دیا جائے گا۔
+ThirdpartiesMergeSuccess=تیسرے فریق کو ضم کر دیا گیا ہے۔
+SaleRepresentativeLogin=سیلز کے نمائندے کا لاگ ان
+SaleRepresentativeFirstname=سیلز کے نمائندے کا پہلا نام
+SaleRepresentativeLastname=سیلز کے نمائندے کا آخری نام
+ErrorThirdpartiesMerge=فریقین ثالث کو حذف کرتے وقت ایک خامی تھی۔ براہ کرم لاگ چیک کریں۔ تبدیلیاں واپس کر دی گئی ہیں۔
+NewCustomerSupplierCodeProposed=گاہک یا وینڈر کا کوڈ پہلے سے استعمال ہوا ہے، ایک نیا کوڈ تجویز کیا گیا ہے۔
+KeepEmptyIfGenericAddress=اگر یہ پتہ ایک عام پتہ ہے تو اس فیلڈ کو خالی رکھیں
 #Imports
-PaymentTypeCustomer=Payment Type - Customer
-PaymentTermsCustomer=Payment Terms - Customer
-PaymentTypeSupplier=Payment Type - Vendor
-PaymentTermsSupplier=Payment Term - Vendor
-PaymentTypeBoth=Payment Type - Customer and Vendor
-MulticurrencyUsed=Use Multicurrency
-MulticurrencyCurrency=Currency
-InEEC=Europe (EEC)
-RestOfEurope=Rest of Europe (EEC)
-OutOfEurope=Out of Europe (EEC)
-CurrentOutstandingBillLate=Current outstanding bill late
-BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
+PaymentTypeCustomer=ادائیگی کی قسم - گاہک
+PaymentTermsCustomer=ادائیگی کی شرائط - گاہک
+PaymentTypeSupplier=ادائیگی کی قسم - فروش
+PaymentTermsSupplier=ادائیگی کی مدت - فروش
+PaymentTypeBoth=ادائیگی کی قسم - گاہک اور وینڈر
+MulticurrencyUsed=ملٹی کرنسی استعمال کریں۔
+MulticurrencyCurrency=کرنسی
+InEEC=یورپ (EEC)
+RestOfEurope=باقی یورپ (EEC)
+OutOfEurope=یورپ سے باہر (EEC)
+CurrentOutstandingBillLate=موجودہ بقایا بل دیر سے
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=ہوشیار رہیں، آپ کی پروڈکٹ کی قیمت کی ترتیبات کے مطابق، آپ کو POS میں پروڈکٹ شامل کرنے سے پہلے فریق ثالث کو تبدیل کرنا چاہیے۔
diff --git a/htdocs/langs/ur_PK/compta.lang b/htdocs/langs/ur_PK/compta.lang
index 640a229b7f2..1ead4c31257 100644
--- a/htdocs/langs/ur_PK/compta.lang
+++ b/htdocs/langs/ur_PK/compta.lang
@@ -1,300 +1,300 @@
 # Dolibarr language file - Source file is en_US - compta
-MenuFinancial=Billing | Payment
-TaxModuleSetupToModifyRules=Go to <a href="%s">Taxes module setup</a> to modify rules for calculation
-TaxModuleSetupToModifyRulesLT=Go to <a href="%s">Company setup</a> to modify rules for calculation
-OptionMode=Option for accountancy
-OptionModeTrue=Option Incomes-Expenses
-OptionModeVirtual=Option Claims-Debts
-OptionModeTrueDesc=In this context, the turnover is calculated over payments (date of payments). The validity of the figures is assured only if the book-keeping is scrutinized through the input/output on the accounts via invoices.
-OptionModeVirtualDesc=In this context, the turnover is calculated over invoices (date of validation). When these invoices are due, whether they have been paid or not, they are listed in the turnover output.
-FeatureIsSupportedInInOutModeOnly=Feature only available in CREDITS-DEBTS accountancy mode (See Accountancy module configuration)
-VATReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Tax module setup.
-LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Company setup.
-Param=Setup
-RemainingAmountPayment=Amount payment remaining:
-Account=Account
-Accountparent=Parent account
-Accountsparent=Parent accounts
-Income=Income
-Outcome=Expense
-MenuReportInOut=Income / Expense
-ReportInOut=Balance of income and expenses
-ReportTurnover=Turnover invoiced
-ReportTurnoverCollected=Turnover collected
-PaymentsNotLinkedToInvoice=Payments not linked to any invoice, so not linked to any third party
-PaymentsNotLinkedToUser=Payments not linked to any user
-Profit=Profit
-AccountingResult=Accounting result
-BalanceBefore=Balance (before)
-Balance=Balance
-Debit=Debit
-Credit=Credit
-Piece=Accounting Doc.
-AmountHTVATRealReceived=Net collected
-AmountHTVATRealPaid=Net paid
-VATToPay=Tax sales
-VATReceived=Tax received
-VATToCollect=Tax purchases
-VATSummary=Tax monthly
-VATBalance=Tax Balance
-VATPaid=Tax paid
-LT1Summary=Tax 2 summary
-LT2Summary=Tax 3 summary
-LT1SummaryES=RE Balance
-LT2SummaryES=IRPF Balance
-LT1SummaryIN=CGST Balance
-LT2SummaryIN=SGST Balance
-LT1Paid=Tax 2 paid
-LT2Paid=Tax 3 paid
-LT1PaidES=RE Paid
-LT2PaidES=IRPF Paid
-LT1PaidIN=CGST Paid
-LT2PaidIN=SGST Paid
-LT1Customer=Tax 2 sales
-LT1Supplier=Tax 2 purchases
-LT1CustomerES=RE sales
-LT1SupplierES=RE purchases
-LT1CustomerIN=CGST sales
-LT1SupplierIN=CGST purchases
-LT2Customer=Tax 3 sales
-LT2Supplier=Tax 3 purchases
-LT2CustomerES=IRPF sales
-LT2SupplierES=IRPF purchases
-LT2CustomerIN=SGST sales
-LT2SupplierIN=SGST purchases
-VATCollected=VAT collected
-StatusToPay=To pay
-SpecialExpensesArea=Area for all special payments
-VATExpensesArea=Area for all TVA payments
-SocialContribution=Social or fiscal tax
-SocialContributions=Social or fiscal taxes
-SocialContributionsDeductibles=Deductible social or fiscal taxes
-SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
-DateOfSocialContribution=Date of social or fiscal tax
-LabelContrib=Label contribution
-TypeContrib=Type contribution
-MenuSpecialExpenses=Special expenses
-MenuTaxAndDividends=Taxes and dividends
-MenuSocialContributions=Social/fiscal taxes
-MenuNewSocialContribution=New social/fiscal tax
-NewSocialContribution=New social/fiscal tax
-AddSocialContribution=Add social/fiscal tax
-ContributionsToPay=Social/fiscal taxes to pay
-AccountancyTreasuryArea=Billing and payment area
-NewPayment=New payment
-PaymentCustomerInvoice=Customer invoice payment
-PaymentSupplierInvoice=vendor invoice payment
-PaymentSocialContribution=Social/fiscal tax payment
-PaymentVat=VAT payment
-AutomaticCreationPayment=Automatically record the payment
-ListPayment=List of payments
-ListOfCustomerPayments=List of customer payments
-ListOfSupplierPayments=List of vendor payments
-DateStartPeriod=Date start period
-DateEndPeriod=Date end period
-newLT1Payment=New tax 2 payment
-newLT2Payment=New tax 3 payment
-LT1Payment=Tax 2 payment
-LT1Payments=Tax 2 payments
-LT2Payment=Tax 3 payment
-LT2Payments=Tax 3 payments
-newLT1PaymentES=New RE payment
-newLT2PaymentES=New IRPF payment
-LT1PaymentES=RE Payment
-LT1PaymentsES=RE Payments
-LT2PaymentES=IRPF Payment
-LT2PaymentsES=IRPF Payments
-VATPayment=Sales tax payment
-VATPayments=Sales tax payments
-VATDeclarations=VAT declarations
-VATDeclaration=VAT declaration
-VATRefund=Sales tax refund
-NewVATPayment=New sales tax payment
-NewLocalTaxPayment=New tax %s payment
-Refund=Refund
-SocialContributionsPayments=Social/fiscal taxes payments
-ShowVatPayment=Show VAT payment
-TotalToPay=Total to pay
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
-CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=Vendor accounting code
-CustomerAccountancyCodeShort=Cust. account. code
-SupplierAccountancyCodeShort=Sup. account. code
-AccountNumber=Account number
-NewAccountingAccount=New account
-Turnover=Turnover invoiced
-TurnoverCollected=Turnover collected
-SalesTurnoverMinimum=Minimum turnover
-ByExpenseIncome=By expenses & incomes
-ByThirdParties=By third parties
-ByUserAuthorOfInvoice=By invoice author
-CheckReceipt=Check deposit
-CheckReceiptShort=Check deposit
-LastCheckReceiptShort=Latest %s check receipts
-NewCheckReceipt=New discount
-NewCheckDeposit=New check deposit
-NewCheckDepositOn=Create receipt for deposit on account: %s
-NoWaitingChecks=No checks awaiting deposit.
-DateChequeReceived=Check receiving date
-NbOfCheques=No. of checks
-PaySocialContribution=Pay a social/fiscal tax
-PayVAT=Pay a VAT declaration
-PaySalary=Pay a salary card
-ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
-ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
-ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
-DeleteSocialContribution=Delete a social or fiscal tax payment
-DeleteVAT=Delete a VAT declaration
-DeleteSalary=Delete a salary card
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
-ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
-ConfirmDeleteSalary=Are you sure you want to delete this salary?
-ExportDataset_tax_1=Social and fiscal taxes and payments
-CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
-CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
-CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
-CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
-CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
-CalcModeLT1Debt=Mode <b>%sRE on customer invoices%s</b>
-CalcModeLT1Rec= Mode <b>%sRE on suppliers invoices%s</b>
-CalcModeLT2= Mode <b>%sIRPF on customer invoices - suppliers invoices%s</b>
-CalcModeLT2Debt=Mode <b>%sIRPF on customer invoices%s</b>
-CalcModeLT2Rec= Mode <b>%sIRPF on suppliers invoices%s</b>
-AnnualSummaryDueDebtMode=Balance of income and expenses, annual summary
-AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
-AnnualByCompanies=Balance of income and expenses, by predefined groups of account
-AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
-AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
-SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
-SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
-RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
-RulesAmountWithTaxExcluded=- Amounts of invoices shown are with all taxes excluded
-RulesResultDue=- It includes all invoices, expenses, VAT, donations, salaries, whether they are paid or not.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries, the date of end of period is used.
-RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT, donations and salaries.
-RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
-RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<br>
-RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
-RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
-RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
-RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
-RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
-SeePageForSetup=See menu <a href="%s">%s</a> for setup
-DepositsAreNotIncluded=- Down payment invoices are not included
-DepositsAreIncluded=- Down payment invoices are included
-LT1ReportByMonth=Tax 2 report by month
-LT2ReportByMonth=Tax 3 report by month
-LT1ReportByCustomers=Report tax 2 by third party
-LT2ReportByCustomers=Report tax 3 by third party
-LT1ReportByCustomersES=Report by third party RE
-LT2ReportByCustomersES=Report by third party IRPF
-VATReport=Sales tax report
-VATReportByPeriods=Sales tax report by period
-VATReportByMonth=Sales tax report by month
-VATReportByRates=Sales tax report by rate
-VATReportByThirdParties=Sales tax report by third party
-VATReportByCustomers=Sales tax report by customer
-VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
-VATReportByQuartersInInputOutputMode=Report by Sales tax rate of the tax collected and paid
-VATReportShowByRateDetails=Show details of this rate
-LT1ReportByQuarters=Report tax 2 by rate
-LT2ReportByQuarters=Report tax 3 by rate
-LT1ReportByQuartersES=Report by RE rate
-LT2ReportByQuartersES=Report by IRPF rate
-SeeVATReportInInputOutputMode=See report <b>%sVAT collection%s</b> for a standard calculation
-SeeVATReportInDueDebtMode=See report <b>%sVAT on debit%s</b> for a calculation with an option on the invoicing
-RulesVATInServices=- For services, the report includes the VAT of payments actually received or paid on the basis of the date of payment.
-RulesVATInProducts=- For material assets, the report includes the VAT on the basis of the date of payment.
-RulesVATDueServices=- For services, the report includes VAT of due invoices, paid or not, based on the invoice date.
-RulesVATDueProducts=- For material assets, the report includes the VAT of due invoices, based on the invoice date.
-OptionVatInfoModuleComptabilite=Note: For material assets, it should use the date of delivery to be more fair.
-ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
-PercentOfInvoice=%%/invoice
-NotUsedForGoods=Not used on goods
-ProposalStats=Statistics on proposals
-OrderStats=Statistics on orders
-InvoiceStats=Statistics on bills
-Dispatch=Dispatching
-Dispatched=Dispatched
-ToDispatch=To dispatch
-ThirdPartyMustBeEditAsCustomer=Third party must be defined as a customer
-SellsJournal=Sales Journal
-PurchasesJournal=Purchases Journal
-DescSellsJournal=Sales Journal
-DescPurchasesJournal=Purchases Journal
-CodeNotDef=Not defined
-WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
-DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
-Pcg_version=Chart of accounts models
-Pcg_type=Pcg type
-Pcg_subtype=Pcg subtype
-InvoiceLinesToDispatch=Invoice lines to dispatch
-ByProductsAndServices=By product and service
-RefExt=External ref
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
-LinkedOrder=Link to order
-Mode1=Method 1
-Mode2=Method 2
-CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
-CalculationRuleDescSupplier=According to vendor, choose appropriate method to apply same calculation rule and get same result expected by your vendor.
-TurnoverPerProductInCommitmentAccountingNotRelevant=The report of Turnover collected per product is not available. This report is only available for turnover invoiced.
-TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The report of Turnover collected per sale tax rate is not available. This report is only available for turnover invoiced.
-CalculationMode=Calculation mode
-AccountancyJournal=Accounting code journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
-ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accounting account on third party is not defined.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
-ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
-ConfirmCloneTax=Confirm the clone of a social/fiscal tax
-ConfirmCloneVAT=Confirm the clone of a VAT declaration
-ConfirmCloneSalary=Confirm the clone of a salary
-CloneTaxForNextMonth=Clone it for next month
-SimpleReport=Simple report
-AddExtraReport=Extra reports (add foreign and national customer report)
-OtherCountriesCustomersReport=Foreign customers report
-BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Based on the two first letters of the VAT number being different from your own company's country code
-SameCountryCustomersWithVAT=National customers report
-BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Based on the two first letters of the VAT number being the same as your own company's country code
-LinkedFichinter=Link to an intervention
-ImportDataset_tax_contrib=Social/fiscal taxes
-ImportDataset_tax_vat=Vat payments
-ErrorBankAccountNotFound=Error: Bank account not found
-FiscalPeriod=Accounting period
-ListSocialContributionAssociatedProject=List of social contributions associated with the project
-DeleteFromCat=Remove from accounting group
-AccountingAffectation=Accounting assignment
-LastDayTaxIsRelatedTo=Last day of period the tax is related to
-VATDue=Sale tax claimed
-ClaimedForThisPeriod=Claimed for the period
-PaidDuringThisPeriod=Paid for this period
-PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
-ByVatRate=By sale tax rate
-TurnoverbyVatrate=Turnover invoiced by sale tax rate
-TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
-PurchasebyVatrate=Purchase by sale tax rate
-LabelToShow=Short label
-PurchaseTurnover=Purchase turnover
-PurchaseTurnoverCollected=Purchase turnover collected
-RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
-RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
-RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
-RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
-ReportPurchaseTurnover=Purchase turnover invoiced
-ReportPurchaseTurnoverCollected=Purchase turnover collected
-IncludeVarpaysInResults = Include various payments in reports
-IncludeLoansInResults = Include loans in reports
-InvoiceLate30Days = Invoices late (> 30 days)
-InvoiceLate15Days = Invoices late (15 to 30 days)
-InvoiceLateMinus15Days = Invoices late (< 15 days)
-InvoiceNotLate = To be collected (< 15 days)
-InvoiceNotLate15Days = To be collected (15 to 30 days)
-InvoiceNotLate30Days = To be collected (> 30 days)
-InvoiceToPay=To pay (< 15 days)
-InvoiceToPay15Days=To pay (15 to 30 days)
-InvoiceToPay30Days=To pay (> 30 days)
-ConfirmPreselectAccount=Preselect accountancy code
-ConfirmPreselectAccountQuestion=Are you sure you want to preselect the %s selected lines with this accountancy code ?
+MenuFinancial=بلنگ | ادائیگی
+TaxModuleSetupToModifyRules=حساب کے قواعد میں ترمیم کرنے کے لیے <a href="%s"> ٹیکسز ماڈیول سیٹ اپ </a> پر جائیں
+TaxModuleSetupToModifyRulesLT=حساب کے قواعد میں ترمیم کرنے کے لیے <a href="%s"> کمپنی کے سیٹ اپ </a> پر جائیں
+OptionMode=اکاؤنٹنسی کے لیے آپشن
+OptionModeTrue=آپشن آمدنی-اخراجات
+OptionModeVirtual=اختیاری دعوے-قرض
+OptionModeTrueDesc=اس تناظر میں، ٹرن اوور کا حساب ادائیگیوں (ادائیگی کی تاریخ) پر کیا جاتا ہے۔ اعداد و شمار کی درستگی کی یقین دہانی صرف اس صورت میں کی جاتی ہے جب انوائس کے ذریعے اکاؤنٹس پر ان پٹ/آؤٹ پٹ کے ذریعے بک کیپنگ کی چھان بین کی جاتی ہے۔
+OptionModeVirtualDesc=اس تناظر میں، ٹرن اوور کا حساب انوائسز (توثیق کی تاریخ) پر کیا جاتا ہے۔ جب یہ رسیدیں واجب الادا ہوں، چاہے ان کی ادائیگی کی گئی ہو یا نہ ہو، وہ ٹرن اوور آؤٹ پٹ میں درج ہیں۔
+FeatureIsSupportedInInOutModeOnly=خصوصیت صرف کریڈٹس-ڈیبیٹس اکاؤنٹنسی موڈ میں دستیاب ہے (دیکھیں اکاؤنٹنسی ماڈیول کنفیگریشن)
+VATReportBuildWithOptionDefinedInModule=یہاں دکھائی گئی رقم کا حساب ٹیکس ماڈیول سیٹ اپ کے ذریعے بیان کردہ اصولوں کا استعمال کرتے ہوئے کیا جاتا ہے۔
+LTReportBuildWithOptionDefinedInModule=یہاں دکھائی گئی رقوم کا حساب کمپنی کے سیٹ اپ کے ذریعے بیان کردہ اصولوں کے ذریعے کیا جاتا ہے۔
+Param=سیٹ اپ
+RemainingAmountPayment=باقی ادائیگی کی رقم:
+Account=کھاتہ
+Accountparent=والدین کا اکاؤنٹ
+Accountsparent=والدین کے اکاؤنٹس
+Income=آمدنی
+Outcome=خرچہ
+MenuReportInOut=آمدنی/خرچ
+ReportInOut=آمدنی اور اخراجات کا توازن
+ReportTurnover=ٹرن اوور انوائس
+ReportTurnoverCollected=ٹرن اوور جمع ہوا۔
+PaymentsNotLinkedToInvoice=ادائیگیاں کسی انوائس سے منسلک نہیں ہیں، لہذا کسی تیسرے فریق سے منسلک نہیں ہیں۔
+PaymentsNotLinkedToUser=ادائیگیاں کسی صارف سے منسلک نہیں ہیں۔
+Profit=منافع
+AccountingResult=اکاؤنٹنگ نتیجہ
+BalanceBefore=توازن (پہلے)
+Balance=بقیہ
+Debit=ڈیبٹ
+Credit=کریڈٹ
+Piece=اکاؤنٹنگ ڈاکٹر
+AmountHTVATRealReceived=نیٹ جمع
+AmountHTVATRealPaid=خالص ادائیگی
+VATToPay=ٹیکس کی فروخت
+VATReceived=ٹیکس وصول کیا۔
+VATToCollect=ٹیکس کی خریداری
+VATSummary=ماہانہ ٹیکس
+VATBalance=ٹیکس بیلنس
+VATPaid=ٹیکس ادا کیا۔
+LT1Summary=ٹیکس 2 کا خلاصہ
+LT2Summary=ٹیکس 3 کا خلاصہ
+LT1SummaryES=RE بیلنس
+LT2SummaryES=IRPF بیلنس
+LT1SummaryIN=سی جی ایس ٹی بیلنس
+LT2SummaryIN=ایس جی ایس ٹی بیلنس
+LT1Paid=ٹیکس 2 ادا کیا گیا۔
+LT2Paid=ٹیکس 3 ادا کیا گیا۔
+LT1PaidES=RE ادا کیا گیا۔
+LT2PaidES=آئی آر پی ایف ادا کیا گیا۔
+LT1PaidIN=CGST ادا کیا
+LT2PaidIN=ایس جی ایس ٹی ادا کیا گیا۔
+LT1Customer=ٹیکس 2 سیلز
+LT1Supplier=ٹیکس 2 خریداری
+LT1CustomerES=RE فروخت
+LT1SupplierES=RE خریداریاں
+LT1CustomerIN=سی جی ایس ٹی کی فروخت
+LT1SupplierIN=سی جی ایس ٹی خریداری
+LT2Customer=ٹیکس 3 سیلز
+LT2Supplier=ٹیکس 3 خریداری
+LT2CustomerES=آئی آر پی ایف کی فروخت
+LT2SupplierES=آئی آر پی ایف کی خریداری
+LT2CustomerIN=ایس جی ایس ٹی کی فروخت
+LT2SupplierIN=SGST خریداری
+VATCollected=VAT جمع کیا گیا۔
+StatusToPay=قیمت ادا کرنا
+SpecialExpensesArea=تمام خصوصی ادائیگیوں کا علاقہ
+VATExpensesArea=TVA کی تمام ادائیگیوں کا علاقہ
+SocialContribution=سماجی یا مالی ٹیکس
+SocialContributions=سماجی یا مالی ٹیکس
+SocialContributionsDeductibles=کٹوتی کے قابل سماجی یا مالی ٹیکس
+SocialContributionsNondeductibles=غیر منقطع سماجی یا مالی ٹیکس
+DateOfSocialContribution=سماجی یا مالی ٹیکس کی تاریخ
+LabelContrib=لیبل شراکت
+TypeContrib=شراکت کی قسم
+MenuSpecialExpenses=خصوصی اخراجات
+MenuTaxAndDividends=ٹیکس اور منافع
+MenuSocialContributions=سماجی/مالیاتی ٹیکس
+MenuNewSocialContribution=نیا سماجی/مالیاتی ٹیکس
+NewSocialContribution=نیا سماجی/مالیاتی ٹیکس
+AddSocialContribution=سماجی/مالیاتی ٹیکس شامل کریں۔
+ContributionsToPay=ادا کرنے کے لیے سماجی/مالیاتی ٹیکس
+AccountancyTreasuryArea=بلنگ اور ادائیگی کا علاقہ
+NewPayment=نئی ادائیگی
+PaymentCustomerInvoice=کسٹمر انوائس کی ادائیگی
+PaymentSupplierInvoice=وینڈر انوائس کی ادائیگی
+PaymentSocialContribution=سماجی/مالیاتی ٹیکس کی ادائیگی
+PaymentVat=VAT ادائیگی
+AutomaticCreationPayment=ادائیگی کو خود بخود ریکارڈ کریں۔
+ListPayment=ادائیگیوں کی فہرست
+ListOfCustomerPayments=صارفین کی ادائیگیوں کی فہرست
+ListOfSupplierPayments=وینڈر کی ادائیگیوں کی فہرست
+DateStartPeriod=تاریخ شروع ہونے کی مدت
+DateEndPeriod=تاریخ ختم ہونے کی مدت
+newLT1Payment=نیا ٹیکس 2 ادائیگی
+newLT2Payment=نیا ٹیکس 3 ادائیگی
+LT1Payment=ٹیکس 2 ادائیگی
+LT1Payments=ٹیکس 2 ادائیگیاں
+LT2Payment=ٹیکس 3 ادائیگی
+LT2Payments=ٹیکس 3 ادائیگیاں
+newLT1PaymentES=نئی RE ادائیگی
+newLT2PaymentES=نئی IRPF ادائیگی
+LT1PaymentES=RE ادائیگی
+LT1PaymentsES=RE ادائیگیاں
+LT2PaymentES=IRPF ادائیگی
+LT2PaymentsES=IRPF ادائیگیاں
+VATPayment=سیلز ٹیکس کی ادائیگی
+VATPayments=سیلز ٹیکس کی ادائیگی
+VATDeclarations=VAT کے اعلانات
+VATDeclaration=VAT کا اعلان
+VATRefund=سیلز ٹیکس کی واپسی
+NewVATPayment=سیلز ٹیکس کی نئی ادائیگی
+NewLocalTaxPayment=نیا ٹیکس %s ادائیگی
+Refund=واپس کرنا
+SocialContributionsPayments=سماجی/مالیاتی ٹیکس کی ادائیگی
+ShowVatPayment=VAT ادائیگی دکھائیں۔
+TotalToPay=ادا کرنے کے لیے کل
+BalanceVisibilityDependsOnSortAndFilters=اس فہرست میں بیلنس صرف اس صورت میں نظر آتا ہے جب ٹیبل کو %s پر ترتیب دیا گیا ہو اور 1 بینک اکاؤنٹ پر فلٹر کیا گیا ہو (کسی دوسرے فلٹر کے بغیر)
+CustomerAccountancyCode=کسٹمر اکاؤنٹنگ کوڈ
+SupplierAccountancyCode=وینڈر اکاؤنٹنگ کوڈ
+CustomerAccountancyCodeShort=کسٹم. کھاتہ. کوڈ
+SupplierAccountancyCodeShort=سڑکنا. کھاتہ. کوڈ
+AccountNumber=اکاؤنٹ نمبر
+NewAccountingAccount=نیا کھاتہ
+Turnover=ٹرن اوور رسید
+TurnoverCollected=ٹرن اوور جمع ہوا۔
+SalesTurnoverMinimum=کم سے کم کاروبار
+ByExpenseIncome=اخراجات اور آمدنی سے
+ByThirdParties=تیسرے فریق کے ذریعہ
+ByUserAuthorOfInvoice=انوائس مصنف کے ذریعہ
+CheckReceipt=چیک ڈپازٹ
+CheckReceiptShort=چیک ڈپازٹ
+LastCheckReceiptShort=تازہ ترین %s چیک کی رسیدیں
+NewCheckReceipt=نئی رعایت
+NewCheckDeposit=نیا چیک ڈپازٹ
+NewCheckDepositOn=اکاؤنٹ پر جمع کرنے کے لیے رسید بنائیں: %s
+NoWaitingChecks=کوئی چیک ڈپازٹ کے منتظر نہیں۔
+DateChequeReceived=وصول کرنے کی تاریخ چیک کریں۔
+NbOfCheques=چیکوں کی تعداد
+PaySocialContribution=سماجی/مالیاتی ٹیکس ادا کریں۔
+PayVAT=VAT اعلامیہ ادا کریں۔
+PaySalary=تنخواہ کارڈ ادا کریں۔
+ConfirmPaySocialContribution=کیا آپ واقعی اس سماجی یا مالی ٹیکس کو بطور ادا شدہ درجہ بندی کرنا چاہتے ہیں؟
+ConfirmPayVAT=کیا آپ واقعی اس VAT ڈیکلریشن کو بطور ادا شدہ درجہ بندی کرنا چاہتے ہیں؟
+ConfirmPaySalary=کیا آپ واقعی اس تنخواہ کارڈ کو بطور ادا شدہ درجہ بندی کرنا چاہتے ہیں؟
+DeleteSocialContribution=سماجی یا مالی ٹیکس کی ادائیگی کو حذف کریں۔
+DeleteVAT=VAT اعلامیہ حذف کریں۔
+DeleteSalary=تنخواہ کارڈ حذف کریں۔
+ConfirmDeleteSocialContribution=کیا آپ واقعی اس سماجی/مالیاتی ٹیکس کی ادائیگی کو حذف کرنا چاہتے ہیں؟
+ConfirmDeleteVAT=کیا آپ واقعی اس VAT ڈیکلریشن کو حذف کرنا چاہتے ہیں؟
+ConfirmDeleteSalary=کیا آپ واقعی اس تنخواہ کو حذف کرنا چاہتے ہیں؟
+ExportDataset_tax_1=سماجی اور مالیاتی ٹیکس اور ادائیگیاں
+CalcModeVATDebt=موڈ <b> %sVAT پر عزم accounting%s </b> ۔
+CalcModeVATEngagement=موڈ <b> %sVAT آمدنی-خرچوں0ecb2ec87f49fz0 </b>
+CalcModeDebt=معلوم ریکارڈ شدہ دستاویزات کا تجزیہ یہاں تک کہ اگر وہ ابھی تک لیجر میں شمار نہ ہوں۔
+CalcModeEngagement=معلوم ریکارڈ شدہ ادائیگیوں کا تجزیہ، چاہے وہ ابھی تک لیجر میں شمار نہ ہوں۔
+CalcModeBookkeeping=بک کیپنگ لیجر ٹیبل میں جرنلائزڈ ڈیٹا کا تجزیہ۔
+CalcModeLT1= موڈ <b> %sRE کسٹمر انوائس پر - سپلائرز invoices%s </b>
+CalcModeLT1Debt=موڈ <b> %sRE کسٹمر انوائس پر موڈ
+CalcModeLT1Rec= موڈ <b> %sRE سپلائرز انوائس پر
+CalcModeLT2= موڈ <b> %sIRPF کسٹمر انوائس پر - سپلائرز invoices%s </b>
+CalcModeLT2Debt=موڈ <b> %sIRPF کسٹمر انوائس پر
+CalcModeLT2Rec= موڈ <b> %sIRPF سپلائرز انوائس پر انوائس
+AnnualSummaryDueDebtMode=آمدنی اور اخراجات کا توازن، سالانہ خلاصہ
+AnnualSummaryInputOutputMode=آمدنی اور اخراجات کا توازن، سالانہ خلاصہ
+AnnualByCompanies=اکاؤنٹ کے پہلے سے طے شدہ گروپوں کے ذریعہ آمدنی اور اخراجات کا توازن
+AnnualByCompaniesDueDebtMode=آمدنی اور اخراجات کا توازن، پہلے سے طے شدہ گروپس کے ذریعے تفصیل، موڈ <b> %sClaims-Debts%s </b> نے کہا
+AnnualByCompaniesInputOutputMode=آمدنی اور اخراجات کا توازن، پہلے سے طے شدہ گروپوں کے لحاظ سے تفصیل، موڈ <b> %sIncomes-Expenses%s </b> نے کہا a0aee83365837fz4701917fz
+SeeReportInInputOutputMode=دیکھیں <b> %sادائیگیوں کا تجزیہ
+SeeReportInDueDebtMode=دیکھیں <b> %s ریکارڈ شدہ دستاویزات کا تجزیہ.
+SeeReportInBookkeepingMode=دیکھیں <b> %s بک کیپنگ لیجر ٹیبل کا تجزیہ
+RulesAmountWithTaxIncluded=- دکھائی گئی رقم تمام ٹیکسوں کے ساتھ ہے۔
+RulesAmountWithTaxExcluded=- دکھائے گئے انوائسز کی رقم تمام ٹیکسوں کو چھوڑ کر ہے۔
+RulesResultDue=- اس میں تمام رسیدیں، اخراجات، VAT، عطیات، تنخواہیں، چاہے وہ ادا کیے جائیں یا نہ ہوں۔ <br> - یہ انوائسز کی بلنگ کی تاریخ اور اخراجات یا ٹیکس کی ادائیگیوں کی مقررہ تاریخ پر مبنی ہے۔ تنخواہوں کے لیے، مدت کے اختتام کی تاریخ استعمال کی جاتی ہے۔
+RulesResultInOut=- اس میں رسیدیں، اخراجات، VAT اور تنخواہوں پر کی گئی حقیقی ادائیگیاں شامل ہیں۔ <br> - یہ رسیدوں، اخراجات، VAT، عطیات اور تنخواہوں کی ادائیگی کی تاریخوں پر مبنی ہے۔
+RulesCADue=- اس میں گاہک کی واجب الادا رسیدیں شامل ہیں چاہے انہیں ادائیگی کی گئی ہو یا نہیں۔ <br> - یہ ان رسیدوں کی بلنگ تاریخ پر مبنی ہے۔ <br>
+RulesCAIn=- اس میں صارفین سے موصول ہونے والی رسیدوں کی تمام موثر ادائیگیاں شامل ہیں۔ <br> - یہ ان رسیدوں کی ادائیگی کی تاریخ پر مبنی ہے <br>
+RulesCATotalSaleJournal=اس میں سیل جرنل کی تمام کریڈٹ لائنیں شامل ہیں۔
+RulesSalesTurnoverOfIncomeAccounts=اس میں گروپ انکم میں پروڈکٹ اکاؤنٹس کے لیے لائنوں کی (کریڈٹ - ڈیبٹ) شامل ہوتی ہے۔
+RulesAmountOnInOutBookkeepingRecord=اس میں آپ کے لیجر میں اکاؤنٹنگ اکاؤنٹس کے ساتھ ریکارڈ شامل ہے جس میں گروپ "EXPENSE" یا "INCOME" ہے
+RulesResultBookkeepingPredefined=اس میں آپ کے لیجر میں اکاؤنٹنگ اکاؤنٹس کا ریکارڈ شامل ہے جس میں گروپ "خرچ" یا "آمدنی" ہے۔
+RulesResultBookkeepingPersonalized=یہ آپ کے لیجر میں اکاؤنٹنگ اکاؤنٹس کے ساتھ ریکارڈ دکھاتا ہے <b> ذاتی نوعیت کے گروپوں کے ذریعے
+SeePageForSetup=سیٹ اپ کے لیے مینو <a href="%s"> %s </a> دیکھیں
+DepositsAreNotIncluded=- نیچے ادائیگی کی رسیدیں شامل نہیں ہیں۔
+DepositsAreIncluded=- نیچے ادائیگی کی رسیدیں شامل ہیں۔
+LT1ReportByMonth=ماہانہ ٹیکس 2 رپورٹ
+LT2ReportByMonth=ماہانہ ٹیکس 3 رپورٹ
+LT1ReportByCustomers=تیسرے فریق کے ذریعہ ٹیکس 2 کی اطلاع دیں۔
+LT2ReportByCustomers=تیسرے فریق کے ذریعہ ٹیکس 3 کی اطلاع دیں۔
+LT1ReportByCustomersES=تھرڈ پارٹی RE کی طرف سے رپورٹ
+LT2ReportByCustomersES=تھرڈ پارٹی IRPF کی رپورٹ
+VATReport=سیلز ٹیکس رپورٹ
+VATReportByPeriods=مدت کے لحاظ سے سیلز ٹیکس کی رپورٹ
+VATReportByMonth=ماہانہ سیلز ٹیکس کی رپورٹ
+VATReportByRates=شرح کے لحاظ سے سیلز ٹیکس کی رپورٹ
+VATReportByThirdParties=تیسرے فریق کے ذریعہ سیلز ٹیکس کی رپورٹ
+VATReportByCustomers=گاہک کے ذریعہ سیلز ٹیکس کی رپورٹ
+VATReportByCustomersInInputOutputMode=جمع کردہ اور ادا کردہ کسٹمر VAT کی رپورٹ
+VATReportByQuartersInInputOutputMode=جمع کیے گئے اور ادا کیے گئے ٹیکس کی سیلز ٹیکس کی شرح کے حساب سے رپورٹ
+VATReportShowByRateDetails=اس شرح کی تفصیلات دکھائیں۔
+LT1ReportByQuarters=شرح کے لحاظ سے ٹیکس 2 کی اطلاع دیں۔
+LT2ReportByQuarters=شرح کے لحاظ سے ٹیکس 3 کی اطلاع دیں۔
+LT1ReportByQuartersES=RE کی شرح کی طرف سے رپورٹ
+LT2ReportByQuartersES=IRPF کی شرح کی طرف سے رپورٹ
+SeeVATReportInInputOutputMode=معیاری حساب کتاب کے لیے رپورٹ دیکھیں
+SeeVATReportInDueDebtMode=انوائسنگ پر اختیار کے ساتھ حساب کے لیے debit%s </b> پر <b> %sVAT رپورٹ دیکھیں
+RulesVATInServices=- خدمات کے لیے، رپورٹ میں ادائیگی کی تاریخ کی بنیاد پر درحقیقت موصول یا ادا کی گئی ادائیگیوں کا VAT شامل ہوتا ہے۔
+RulesVATInProducts=- مادی اثاثوں کے لیے، رپورٹ میں ادائیگی کی تاریخ کی بنیاد پر VAT شامل ہوتا ہے۔
+RulesVATDueServices=- خدمات کے لیے، رپورٹ میں انوائس کی تاریخ کی بنیاد پر واجب الادا انوائسز کا VAT شامل ہے، ادا کیا گیا یا نہیں۔
+RulesVATDueProducts=- مادی اثاثوں کے لیے، رپورٹ میں انوائس کی تاریخ کی بنیاد پر واجب الادا انوائسز کا VAT شامل ہوتا ہے۔
+OptionVatInfoModuleComptabilite=نوٹ: مادی اثاثوں کے لیے، اسے ترسیل کی تاریخ کو زیادہ منصفانہ بنانے کے لیے استعمال کرنا چاہیے۔
+ThisIsAnEstimatedValue=یہ ایک پیش نظارہ ہے، کاروباری واقعات پر مبنی ہے نہ کہ حتمی لیجر ٹیبل سے، لہذا حتمی نتائج اس پیش نظارہ اقدار سے مختلف ہو سکتے ہیں۔
+PercentOfInvoice=%%/انوائس
+NotUsedForGoods=سامان پر استعمال نہیں ہوتا
+ProposalStats=تجاویز پر اعدادوشمار
+OrderStats=آرڈرز کے اعدادوشمار
+InvoiceStats=بلوں کے اعدادوشمار
+Dispatch=بھیجنا
+Dispatched=روانہ کر دیا گیا۔
+ToDispatch=بھیجنے کے لیے
+ThirdPartyMustBeEditAsCustomer=تیسری پارٹی کو گاہک کے طور پر بیان کیا جانا چاہیے۔
+SellsJournal=سیلز جرنل
+PurchasesJournal=جرنل کی خریداری
+DescSellsJournal=سیلز جرنل
+DescPurchasesJournal=جرنل کی خریداری
+CodeNotDef=متعین نہیں۔
+WarningDepositsNotIncluded=اس اکاؤنٹنسی ماڈیول کے ساتھ اس ورژن میں ڈاؤن پیمنٹ انوائسز شامل نہیں ہیں۔
+DatePaymentTermCantBeLowerThanObjectDate=ادائیگی کی مدت کی تاریخ اعتراض کی تاریخ سے کم نہیں ہو سکتی۔
+Pcg_version=اکاؤنٹس ماڈلز کا چارٹ
+Pcg_type=پی سی جی کی قسم
+Pcg_subtype=پی سی جی ذیلی قسم
+InvoiceLinesToDispatch=بھیجنے کے لیے انوائس لائنز
+ByProductsAndServices=مصنوعات اور خدمت کے لحاظ سے
+RefExt=بیرونی حوالہ
+ToCreateAPredefinedInvoice=ٹیمپلیٹ انوائس بنانے کے لیے، ایک معیاری انوائس بنائیں، پھر، اس کی توثیق کیے بغیر، بٹن "%s" پر کلک کریں۔
+LinkedOrder=آرڈر کے لیے لنک
+Mode1=طریقہ 1
+Mode2=طریقہ 2
+CalculationRuleDesc=کل VAT کا حساب لگانے کے لیے، دو طریقے ہیں: <br> طریقہ 1 ہر لائن پر vat کو گول کر رہا ہے، پھر ان کا خلاصہ کر رہا ہے۔ <br> طریقہ 2 ہر لائن پر تمام vat کو جمع کر رہا ہے، پھر نتیجہ کو گول کر رہا ہے۔ <br> حتمی نتیجہ چند سینٹس سے مختلف ہو سکتا ہے۔ ڈیفالٹ موڈ <b> %s </b> موڈ ہے۔
+CalculationRuleDescSupplier=وینڈر کے مطابق، حساب کتاب کے ایک ہی اصول کو لاگو کرنے کے لیے مناسب طریقہ کا انتخاب کریں اور وہی نتیجہ حاصل کریں جس کی آپ کے وینڈر کی توقع ہے۔
+TurnoverPerProductInCommitmentAccountingNotRelevant=فی پروڈکٹ جمع ہونے والے ٹرن اوور کی رپورٹ دستیاب نہیں ہے۔ یہ رپورٹ صرف ٹرن اوور انوائس کے لیے دستیاب ہے۔
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=فی سیل ٹیکس کی شرح سے جمع ہونے والے ٹرن اوور کی رپورٹ دستیاب نہیں ہے۔ یہ رپورٹ صرف ٹرن اوور انوائس کے لیے دستیاب ہے۔
+CalculationMode=کیلکولیشن موڈ
+AccountancyJournal=اکاؤنٹنگ کوڈ جرنل
+ACCOUNTING_VAT_SOLD_ACCOUNT=سیلز پر VAT کے لیے بطور ڈیفالٹ اکاؤنٹنگ اکاؤنٹ (اگر VAT ڈکشنری سیٹ اپ پر وضاحت نہیں کی گئی ہے تو استعمال کیا جاتا ہے)
+ACCOUNTING_VAT_BUY_ACCOUNT=خریداریوں پر VAT کے لیے بطور ڈیفالٹ اکاؤنٹنگ اکاؤنٹ (اگر VAT لغت کے سیٹ اپ پر وضاحت نہ کی گئی ہو تو استعمال کیا جاتا ہے)
+ACCOUNTING_VAT_PAY_ACCOUNT=VAT کی ادائیگی کے لیے بطور ڈیفالٹ اکاؤنٹنگ اکاؤنٹ
+ACCOUNTING_ACCOUNT_CUSTOMER=اکاؤنٹنگ اکاؤنٹ کسٹمر تھرڈ پارٹیز کے لیے استعمال کیا جاتا ہے۔
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=تھرڈ پارٹی کارڈ پر بیان کردہ وقف اکاؤنٹنگ اکاؤنٹ صرف Subledger اکاؤنٹنگ کے لیے استعمال کیا جائے گا۔ یہ جنرل لیجر کے لیے اور سبلیجر اکاؤنٹنگ کی ڈیفالٹ ویلیو کے طور پر استعمال کیا جائے گا اگر تھرڈ پارٹی پر مخصوص کسٹمر اکاؤنٹنگ اکاؤنٹ کی وضاحت نہیں کی گئی ہے۔
+ACCOUNTING_ACCOUNT_SUPPLIER=وینڈر تھرڈ پارٹیز کے لیے اکاؤنٹنگ اکاؤنٹ استعمال کیا جاتا ہے۔
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=تھرڈ پارٹی کارڈ پر بیان کردہ وقف اکاؤنٹنگ اکاؤنٹ صرف Subledger اکاؤنٹنگ کے لیے استعمال کیا جائے گا۔ یہ جنرل لیجر کے لیے اور سبلیجر اکاؤنٹنگ کی ڈیفالٹ ویلیو کے طور پر استعمال کیا جائے گا اگر تیسرے فریق پر ڈیڈیکیٹڈ وینڈر اکاؤنٹنگ اکاؤنٹ کی وضاحت نہیں کی گئی ہے۔
+ConfirmCloneTax=سماجی/مالیاتی ٹیکس کے کلون کی تصدیق کریں۔
+ConfirmCloneVAT=VAT ڈیکلریشن کے کلون کی تصدیق کریں۔
+ConfirmCloneSalary=تنخواہ کے کلون کی تصدیق کریں۔
+CloneTaxForNextMonth=اسے اگلے مہینے کے لیے کلون کریں۔
+SimpleReport=سادہ رپورٹ
+AddExtraReport=اضافی رپورٹیں (غیر ملکی اور قومی کسٹمر رپورٹ شامل کریں)
+OtherCountriesCustomersReport=غیر ملکی صارفین کی رپورٹ
+BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=VAT نمبر کے دو پہلے حروف کی بنیاد پر جو آپ کی اپنی کمپنی کے ملک کے کوڈ سے مختلف ہیں۔
+SameCountryCustomersWithVAT=قومی صارفین کی رپورٹ
+BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=VAT نمبر کے دو پہلے حروف کی بنیاد پر جو آپ کی اپنی کمپنی کے ملک کے کوڈ کے برابر ہیں۔
+LinkedFichinter=مداخلت سے لنک کریں۔
+ImportDataset_tax_contrib=سماجی/مالیاتی ٹیکس
+ImportDataset_tax_vat=Vat ادائیگیاں
+ErrorBankAccountNotFound=خرابی: بینک اکاؤنٹ نہیں ملا
+FiscalPeriod=اکاؤنٹنگ مدت
+ListSocialContributionAssociatedProject=پروجیکٹ سے وابستہ سماجی شراکت کی فہرست
+DeleteFromCat=اکاؤنٹنگ گروپ سے ہٹا دیں۔
+AccountingAffectation=اکاؤنٹنگ اسائنمنٹ
+LastDayTaxIsRelatedTo=مدت کے آخری دن ٹیکس سے متعلق ہے۔
+VATDue=سیلز ٹیکس کا دعویٰ کیا گیا۔
+ClaimedForThisPeriod=مدت کے لیے دعویٰ کیا گیا۔
+PaidDuringThisPeriod=اس مدت کے لیے ادائیگی کی گئی۔
+PaidDuringThisPeriodDesc=یہ VAT ڈیکلریشنز سے منسلک تمام ادائیگیوں کا مجموعہ ہے جن کی منتخب تاریخ کی حد میں مدت کے اختتام کی تاریخ ہوتی ہے۔
+ByVatRate=سیلز ٹیکس کی شرح سے
+TurnoverbyVatrate=سیل ٹیکس کی شرح سے ٹرن اوور کی رسید
+TurnoverCollectedbyVatrate=ٹرن اوور سیلز ٹیکس کی شرح سے جمع ہوتا ہے۔
+PurchasebyVatrate=سیل ٹیکس کی شرح کے ذریعے خریداری
+LabelToShow=مختصر لیبل
+PurchaseTurnover=خریداری کا کاروبار
+PurchaseTurnoverCollected=خریداری کا کاروبار جمع ہوا۔
+RulesPurchaseTurnoverDue=- اس میں سپلائر کی واجب الادا رسیدیں شامل ہیں چاہے وہ ادا کیے گئے ہوں یا نہیں۔ <br> - یہ ان رسیدوں کی انوائس تاریخ پر مبنی ہے۔ <br>
+RulesPurchaseTurnoverIn=- اس میں سپلائرز کو کی جانے والی رسیدوں کی تمام موثر ادائیگیاں شامل ہیں۔ <br> - یہ ان رسیدوں کی ادائیگی کی تاریخ پر مبنی ہے <br>
+RulesPurchaseTurnoverTotalPurchaseJournal=اس میں خریداری کے جریدے کی تمام ڈیبٹ لائنیں شامل ہیں۔
+RulesPurchaseTurnoverOfExpenseAccounts=اس میں گروپ ایکسپینس میں پروڈکٹ اکاؤنٹس کے لیے لائنوں کی (ڈیبٹ - کریڈٹ) شامل ہوتی ہے۔
+ReportPurchaseTurnover=ٹرن اوور کی انوائس خریدی۔
+ReportPurchaseTurnoverCollected=خریداری کا کاروبار جمع ہوا۔
+IncludeVarpaysInResults = رپورٹس میں مختلف ادائیگیاں شامل کریں۔
+IncludeLoansInResults = رپورٹوں میں قرضوں کو شامل کریں۔
+InvoiceLate30Days = رسیدیں تاخیر سے (> 30 دن)
+InvoiceLate15Days = رسیدیں تاخیر سے (15 سے 30 دن)
+InvoiceLateMinus15Days = رسیدیں تاخیر سے (<15 دن)
+InvoiceNotLate = جمع کیا جائے گا (<15 دن)
+InvoiceNotLate15Days = جمع کیا جائے گا (15 سے 30 دن)
+InvoiceNotLate30Days = جمع کیا جائے گا (> 30 دن)
+InvoiceToPay=ادائیگی کے لیے (<15 دن)
+InvoiceToPay15Days=ادائیگی کے لیے (15 سے 30 دن)
+InvoiceToPay30Days=ادائیگی کے لیے (> 30 دن)
+ConfirmPreselectAccount=اکاؤنٹنسی کوڈ کو پہلے سے منتخب کریں۔
+ConfirmPreselectAccountQuestion=کیا آپ واقعی اس اکاؤنٹنسی کوڈ کے ساتھ %s منتخب لائنوں کو پہلے سے منتخب کرنا چاہتے ہیں؟
diff --git a/htdocs/langs/ur_PK/contracts.lang b/htdocs/langs/ur_PK/contracts.lang
index 1f3526bd994..f5008da9565 100644
--- a/htdocs/langs/ur_PK/contracts.lang
+++ b/htdocs/langs/ur_PK/contracts.lang
@@ -1,104 +1,104 @@
 # Dolibarr language file - Source file is en_US - contracts
-ContractsArea=Contracts area
-ListOfContracts=List of contracts
-AllContracts=All contracts
-ContractCard=Contract card
-ContractStatusNotRunning=Not running
-ContractStatusDraft=Draft
-ContractStatusValidated=Validated
-ContractStatusClosed=Closed
-ServiceStatusInitial=Not running
-ServiceStatusRunning=Running
-ServiceStatusNotLate=Running, not expired
-ServiceStatusNotLateShort=Not expired
-ServiceStatusLate=Running, expired
-ServiceStatusLateShort=Expired
-ServiceStatusClosed=Closed
-ShowContractOfService=Show contract of service
-Contracts=Contracts
-ContractsSubscriptions=Contracts/Subscriptions
-ContractsAndLine=Contracts and line of contracts
-Contract=Contract
-ContractLine=Contract line
-Closing=Closing
-NoContracts=No contracts
-MenuServices=Services
-MenuInactiveServices=Services not active
-MenuRunningServices=Running services
-MenuExpiredServices=Expired services
-MenuClosedServices=Closed services
-NewContract=New contract
-NewContractSubscription=New contract or subscription
-AddContract=Create contract
-DeleteAContract=Delete a contract
-ActivateAllOnContract=Activate all services
-CloseAContract=Close a contract
-ConfirmDeleteAContract=Are you sure you want to delete this contract and all its services?
-ConfirmValidateContract=Are you sure you want to validate this contract under name <b>%s</b>?
-ConfirmActivateAllOnContract=This will open all services (not yet active). Are you sure you want to open all services?
-ConfirmCloseContract=This will close all services (expired or not). Are you sure you want to close this contract?
-ConfirmCloseService=Are you sure you want to close this service with date <b>%s</b>?
-ValidateAContract=Validate a contract
-ActivateService=Activate service
-ConfirmActivateService=Are you sure you want to activate this service with date <b>%s</b>?
-RefContract=Contract reference
-DateContract=Contract date
-DateServiceActivate=Service activation date
-ListOfServices=List of services
-ListOfInactiveServices=List of not active services
-ListOfExpiredServices=List of expired active services
-ListOfClosedServices=List of closed services
-ListOfRunningServices=List of running services
-NotActivatedServices=Inactive services (among validated contracts)
-BoardNotActivatedServices=Services to activate among validated contracts
-BoardNotActivatedServicesShort=Services to activate
-LastContracts=Latest %s contracts
-LastModifiedServices=Latest %s modified services
-ContractStartDate=Start date
-ContractEndDate=End date
-DateStartPlanned=Planned start date
-DateStartPlannedShort=Planned start date
-DateEndPlanned=Planned end date
-DateEndPlannedShort=Planned end date
-DateStartReal=Real start date
-DateStartRealShort=Real start date
-DateEndReal=Real end date
-DateEndRealShort=Real end date
-CloseService=Close service
-BoardRunningServices=Services running
-BoardRunningServicesShort=Services running
-BoardExpiredServices=Services expired
-BoardExpiredServicesShort=Services expired
-ServiceStatus=Status of service
-DraftContracts=Drafts contracts
-CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
-ActivateAllContracts=Activate all contract lines
-CloseAllContracts=Close all contract lines
-DeleteContractLine=Delete a contract line
-ConfirmDeleteContractLine=Are you sure you want to delete this contract line?
-MoveToAnotherContract=Move service into another contract.
-ConfirmMoveToAnotherContract=I choosed new target contract and confirm I want to move this service into this contract.
-ConfirmMoveToAnotherContractQuestion=Choose in which existing contract (of same third party), you want to move this service to?
-PaymentRenewContractId=Renew contract line (number %s)
-ExpiredSince=Expiration date
-NoExpiredServices=No expired active services
-ListOfServicesToExpireWithDuration=List of Services to expire in %s days
-ListOfServicesToExpireWithDurationNeg=List of Services expired from more than %s days
-ListOfServicesToExpire=List of Services to expire
-NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
-StandardContractsTemplate=Standard contracts template
-ContactNameAndSignature=For %s, name and signature:
-OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
-ConfirmCloneContract=Are you sure you want to clone the contract <b>%s</b>?
-LowerDateEndPlannedShort=Lower planned end date of active services
-SendContractRef=Contract information __REF__
-OtherContracts=Other contracts
+ContractsArea=معاہدوں کا علاقہ
+ListOfContracts=معاہدوں کی فہرست
+AllContracts=تمام معاہدے
+ContractCard=معاہدہ کارڈ
+ContractStatusNotRunning=نہیں چل رہا ہے۔
+ContractStatusDraft=مسودہ
+ContractStatusValidated=تصدیق شدہ
+ContractStatusClosed=بند
+ServiceStatusInitial=نہیں چل رہا ہے۔
+ServiceStatusRunning=چل رہا ہے۔
+ServiceStatusNotLate=چل رہا ہے، میعاد ختم نہیں ہوا۔
+ServiceStatusNotLateShort=میعاد ختم نہیں ہوئی۔
+ServiceStatusLate=چل رہا ہے، میعاد ختم ہو گیا ہے۔
+ServiceStatusLateShort=میعاد ختم
+ServiceStatusClosed=بند
+ShowContractOfService=سروس کا معاہدہ دکھائیں۔
+Contracts=معاہدے
+ContractsSubscriptions=معاہدے/سبسکرپشنز
+ContractsAndLine=معاہدے اور معاہدے کی لائن
+Contract=معاہدہ
+ContractLine=معاہدہ لائن
+Closing=بند کرنا
+NoContracts=کوئی معاہدہ نہیں۔
+MenuServices=خدمات
+MenuInactiveServices=خدمات فعال نہیں ہیں۔
+MenuRunningServices=رننگ سروسز
+MenuExpiredServices=میعاد ختم ہونے والی خدمات
+MenuClosedServices=بند خدمات
+NewContract=نیا معاہدہ
+NewContractSubscription=نیا معاہدہ یا رکنیت
+AddContract=معاہدہ بنائیں
+DeleteAContract=ایک معاہدہ حذف کریں۔
+ActivateAllOnContract=تمام خدمات کو چالو کریں۔
+CloseAContract=ایک معاہدہ بند کریں۔
+ConfirmDeleteAContract=کیا آپ واقعی یہ معاہدہ اور اس کی تمام سروسز کو حذف کرنا چاہتے ہیں؟
+ConfirmValidateContract=کیا آپ واقعی <b> %s </b> کے نام سے اس معاہدے کی توثیق کرنا چاہتے ہیں؟
+ConfirmActivateAllOnContract=اس سے تمام خدمات کھل جائیں گی (ابھی تک فعال نہیں ہیں)۔ کیا آپ واقعی تمام سروسز کھولنا چاہتے ہیں؟
+ConfirmCloseContract=اس سے تمام سروسز بند ہو جائیں گی (میعاد ختم ہو چکی ہے یا نہیں)۔ کیا آپ واقعی یہ معاہدہ بند کرنا چاہتے ہیں؟
+ConfirmCloseService=کیا آپ واقعی اس سروس کو <b> %s </b> کے ساتھ بند کرنا چاہتے ہیں؟
+ValidateAContract=معاہدے کی توثیق کریں۔
+ActivateService=سروس کو چالو کریں۔
+ConfirmActivateService=کیا آپ واقعی اس سروس کو <b> %s </b> کے ساتھ فعال کرنا چاہتے ہیں؟
+RefContract=معاہدہ کا حوالہ
+DateContract=معاہدے کی تاریخ
+DateServiceActivate=سروس ایکٹیویشن کی تاریخ
+ListOfServices=خدمات کی فہرست
+ListOfInactiveServices=غیر فعال خدمات کی فہرست
+ListOfExpiredServices=میعاد ختم ہونے والی فعال خدمات کی فہرست
+ListOfClosedServices=بند خدمات کی فہرست
+ListOfRunningServices=چلانے والی خدمات کی فہرست
+NotActivatedServices=غیر فعال خدمات (تصدیق شدہ معاہدوں کے درمیان)
+BoardNotActivatedServices=تصدیق شدہ معاہدوں کے درمیان فعال کرنے کے لیے خدمات
+BoardNotActivatedServicesShort=چالو کرنے کے لیے خدمات
+LastContracts=تازہ ترین %s معاہدے
+LastModifiedServices=تازہ ترین %s ترمیم شدہ خدمات
+ContractStartDate=شروع کرنے کی تاریخ
+ContractEndDate=آخری تاریخ
+DateStartPlanned=منصوبہ بند آغاز کی تاریخ
+DateStartPlannedShort=منصوبہ بند آغاز کی تاریخ
+DateEndPlanned=منصوبہ بند اختتامی تاریخ
+DateEndPlannedShort=منصوبہ بند اختتامی تاریخ
+DateStartReal=حقیقی آغاز کی تاریخ
+DateStartRealShort=حقیقی آغاز کی تاریخ
+DateEndReal=حقیقی اختتامی تاریخ
+DateEndRealShort=حقیقی اختتامی تاریخ
+CloseService=سروس بند کریں۔
+BoardRunningServices=خدمات چل رہی ہیں۔
+BoardRunningServicesShort=خدمات چل رہی ہیں۔
+BoardExpiredServices=خدمات کی میعاد ختم ہوگئی
+BoardExpiredServicesShort=خدمات کی میعاد ختم ہوگئی
+ServiceStatus=خدمت کی حیثیت
+DraftContracts=معاہدوں کا مسودہ
+CloseRefusedBecauseOneServiceActive=معاہدہ بند نہیں کیا جا سکتا کیونکہ اس پر کم از کم ایک کھلی سروس موجود ہے۔
+ActivateAllContracts=تمام کنٹریکٹ لائنوں کو چالو کریں۔
+CloseAllContracts=تمام کنٹریکٹ لائنیں بند کریں۔
+DeleteContractLine=معاہدہ لائن کو حذف کریں۔
+ConfirmDeleteContractLine=کیا آپ واقعی اس معاہدہ لائن کو حذف کرنا چاہتے ہیں؟
+MoveToAnotherContract=سروس کو دوسرے معاہدے میں منتقل کریں۔
+ConfirmMoveToAnotherContract=میں نے نیا ہدف معاہدہ منتخب کیا اور تصدیق کی کہ میں اس سروس کو اس معاہدے میں منتقل کرنا چاہتا ہوں۔
+ConfirmMoveToAnotherContractQuestion=منتخب کریں کہ کون سا موجودہ معاہدہ (اسی تیسرے فریق کا) ہے، آپ اس سروس کو منتقل کرنا چاہتے ہیں؟
+PaymentRenewContractId=کنٹریکٹ لائن کی تجدید کریں (نمبر %s)
+ExpiredSince=میعاد ختم ہونے کی تاریخ
+NoExpiredServices=کوئی میعاد ختم شدہ فعال خدمات نہیں ہیں۔
+ListOfServicesToExpireWithDuration=خدمات کی فہرست %s دنوں میں ختم ہونے والی ہے۔
+ListOfServicesToExpireWithDurationNeg=خدمات کی فہرست کی میعاد %s دنوں سے زیادہ ہے۔
+ListOfServicesToExpire=میعاد ختم ہونے والی خدمات کی فہرست
+NoteListOfYourExpiredServices=اس فہرست میں صرف تیسرے فریق کے لیے معاہدوں کی خدمات شامل ہیں جن سے آپ بطور سیلز نمائندہ منسلک ہیں۔
+StandardContractsTemplate=معیاری معاہدوں کا سانچہ
+ContactNameAndSignature=%s کے لیے، نام اور دستخط:
+OnlyLinesWithTypeServiceAreUsed=صرف "Service" کی قسم والی لائنوں کو کلون کیا جائے گا۔
+ConfirmCloneContract=کیا آپ واقعی <b> %s </b> معاہدہ کلون کرنا چاہتے ہیں؟
+LowerDateEndPlannedShort=فعال خدمات کی کم منصوبہ بند اختتامی تاریخ
+SendContractRef=معاہدے کی معلومات __REF__
+OtherContracts=دوسرے معاہدے
 ##### Types de contacts #####
-TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract
-TypeContact_contrat_internal_SALESREPFOLL=Sales representative following-up contract
-TypeContact_contrat_external_BILLING=Billing customer contact
-TypeContact_contrat_external_CUSTOMER=Follow-up customer contact
-TypeContact_contrat_external_SALESREPSIGN=Signing contract customer contact
-HideClosedServiceByDefault=Hide closed services by default
-ShowClosedServices=Show Closed Services
-HideClosedServices=Hide Closed Services
+TypeContact_contrat_internal_SALESREPSIGN=سیلز کا نمائندہ معاہدہ پر دستخط کرتا ہے۔
+TypeContact_contrat_internal_SALESREPFOLL=سیلز کے نمائندے فالو اپ معاہدہ
+TypeContact_contrat_external_BILLING=بلنگ کسٹمر رابطہ
+TypeContact_contrat_external_CUSTOMER=فالو اپ کسٹمر رابطہ
+TypeContact_contrat_external_SALESREPSIGN=کنٹریکٹ پر دستخط کرنا کسٹمر رابطہ
+HideClosedServiceByDefault=بند خدمات کو بطور ڈیفالٹ چھپائیں۔
+ShowClosedServices=بند خدمات دکھائیں۔
+HideClosedServices=بند خدمات کو چھپائیں۔
diff --git a/htdocs/langs/ur_PK/cron.lang b/htdocs/langs/ur_PK/cron.lang
index 4fd2220dea6..432b56a5362 100644
--- a/htdocs/langs/ur_PK/cron.lang
+++ b/htdocs/langs/ur_PK/cron.lang
@@ -1,91 +1,91 @@
 # Dolibarr language file - Source file is en_US - cron
 # About page
 # Right
-Permission23101 = Read Scheduled job
-Permission23102 = Create/update Scheduled job
-Permission23103 = Delete Scheduled job
-Permission23104 = Execute Scheduled job
+Permission23101 = طے شدہ کام پڑھیں
+Permission23102 = شیڈول شدہ جاب بنائیں/اپ ڈیٹ کریں۔
+Permission23103 = طے شدہ کام کو حذف کریں۔
+Permission23104 = طے شدہ کام کو انجام دیں۔
 # Admin
-CronSetup=Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
-OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
-KeyForCronAccess=Security key for URL to launch cron jobs
-FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
-CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
-CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
-CronMethodDoesNotExists=Class %s does not contains any method %s
-CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
-CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
-CronJobProfiles=List of predefined cron job profiles
+CronSetup=شیڈول جاب مینجمنٹ سیٹ اپ
+URLToLaunchCronJobs=براؤزر سے کوالیفائیڈ کرون جابز کو چیک کرنے اور لانچ کرنے کے لیے URL
+OrToLaunchASpecificJob=یا براؤزر سے کسی مخصوص کام کو چیک کرنا اور لانچ کرنا
+KeyForCronAccess=کرون جابز شروع کرنے کے لیے URL کے لیے سیکیورٹی کلید
+FileToLaunchCronJobs=کوالیفائیڈ کرون جابز کو چیک کرنے اور لانچ کرنے کے لیے کمانڈ لائن
+CronExplainHowToRunUnix=یونکس ماحول پر آپ کو ہر 5 منٹ میں کمانڈ لائن چلانے کے لیے درج ذیل کرونٹاب انٹری کا استعمال کرنا چاہیے۔
+CronExplainHowToRunWin=مائیکروسافٹ (ٹی ایم) ونڈوز ماحول پر آپ ہر 5 منٹ میں کمانڈ لائن چلانے کے لیے شیڈول ٹاسک ٹولز استعمال کر سکتے ہیں۔
+CronMethodDoesNotExists=کلاس %s میں کوئی طریقہ نہیں ہے %s
+CronMethodNotAllowed=کلاس %s کا طریقہ %s حرام طریقوں کی بلیک لسٹ میں ہے
+CronJobDefDesc=کرون جاب پروفائلز کی وضاحت ماڈیول ڈسکرپٹر فائل میں کی گئی ہے۔ جب ماڈیول فعال ہو جاتا ہے، تو وہ لوڈ اور دستیاب ہو جاتے ہیں تاکہ آپ ایڈمن ٹولز مینو %s سے جابز کا انتظام کر سکیں۔
+CronJobProfiles=پہلے سے طے شدہ کرون جاب پروفائلز کی فہرست
 # Menu
-EnabledAndDisabled=Enabled and disabled
+EnabledAndDisabled=فعال اور غیر فعال
 # Page list
-CronLastOutput=Latest run output
-CronLastResult=Latest result code
-CronCommand=Command
-CronList=Scheduled jobs
-CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
-CronExecute=Launch scheduled job
-CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
-CronTask=Job
-CronNone=None
-CronDtStart=Not before
-CronDtEnd=Not after
-CronDtNextLaunch=Next execution
-CronDtLastLaunch=Start date of latest execution
-CronDtLastResult=End date of latest execution
-CronFrequency=Frequency
-CronClass=Class
-CronMethod=Method
-CronModule=Module
-CronNoJobs=No jobs registered
-CronPriority=Priority
-CronLabel=Label
-CronNbRun=Number of launches
-CronMaxRun=Maximum number of launches
-CronEach=Every
-JobFinished=Job launched and finished
-Scheduled=Scheduled
+CronLastOutput=تازہ ترین رن آؤٹ پٹ
+CronLastResult=تازہ ترین نتیجہ کوڈ
+CronCommand=کمانڈ
+CronList=طے شدہ ملازمتیں۔
+CronDelete=طے شدہ ملازمتوں کو حذف کریں۔
+CronConfirmDelete=کیا آپ واقعی ان شیڈول کردہ جابز کو حذف کرنا چاہتے ہیں؟
+CronExecute=طے شدہ کام شروع کریں۔
+CronConfirmExecute=کیا آپ واقعی ان طے شدہ ملازمتوں کو ابھی انجام دینا چاہتے ہیں؟
+CronInfo=شیڈول کردہ جاب ماڈیول ملازمتوں کو خود بخود انجام دینے کے لیے شیڈول کرنے کی اجازت دیتا ہے۔ ملازمتیں دستی طور پر بھی شروع کی جا سکتی ہیں۔
+CronTask=جاب
+CronNone=کوئی نہیں۔
+CronDtStart=پہلے نہیں۔
+CronDtEnd=کے بعد نہیں۔
+CronDtNextLaunch=اگلی پھانسی
+CronDtLastLaunch=تازہ ترین عمل درآمد کی تاریخ شروع کریں۔
+CronDtLastResult=تازہ ترین عمل درآمد کی آخری تاریخ
+CronFrequency=تعدد
+CronClass=کلاس
+CronMethod=طریقہ
+CronModule=ماڈیول
+CronNoJobs=کوئی نوکریاں رجسٹرڈ نہیں ہیں۔
+CronPriority=ترجیح
+CronLabel=لیبل
+CronNbRun=لانچوں کی تعداد
+CronMaxRun=لانچوں کی زیادہ سے زیادہ تعداد
+CronEach=ہر کوئی
+JobFinished=کام شروع ہوا اور ختم ہوا۔
+Scheduled=طے شدہ
 #Page card
-CronAdd= Add jobs
-CronEvery=Execute job each
-CronObject=Instance/Object to create
-CronArgs=Parameters
-CronSaveSucess=Save successfully
-CronNote=Comment
-CronFieldMandatory=Fields %s is mandatory
-CronErrEndDateStartDt=End date cannot be before start date
-StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Schedule
-CronStatusInactiveBtn=Disable
-CronTaskInactive=This job is disabled (not scheduled)
-CronId=Id
-CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For example to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
-CronCommandHelp=The system command line to execute.
-CronCreateJob=Create new Scheduled Job
-CronFrom=From
+CronAdd= ملازمتیں شامل کریں۔
+CronEvery=ہر ایک کا کام انجام دیں۔
+CronObject=مثال/تخلیق کے لیے آبجیکٹ
+CronArgs=پیرامیٹرز
+CronSaveSucess=کامیابی سے محفوظ کریں۔
+CronNote=تبصرہ
+CronFieldMandatory=فیلڈز %s لازمی ہے۔
+CronErrEndDateStartDt=اختتامی تاریخ تاریخ آغاز سے پہلے کی نہیں ہو سکتی
+StatusAtInstall=ماڈیول کی تنصیب کی حالت
+CronStatusActiveBtn=شیڈول
+CronStatusInactiveBtn=غیر فعال کریں۔
+CronTaskInactive=یہ کام غیر فعال ہے (شیڈول نہیں ہے)
+CronId=آئی ڈی
+CronClassFile=کلاس کے ساتھ فائل کا نام
+CronModuleHelp=Dolibarr ماڈیول ڈائرکٹری کا نام (بیرونی Dolibarr ماڈیول کے ساتھ بھی کام کرتا ہے)۔ <BR> مثال کے طور پر Dolibarr پروڈکٹ آبجیکٹ /htdocs/ <u> پروڈکٹ کے حاصل کرنے کے طریقہ کو کال کرنے کے لیے
+CronClassFileHelp=لوڈ کرنے کے لیے متعلقہ راستہ اور فائل کا نام (راستہ ویب سرور روٹ ڈائرکٹری سے متعلق ہے)۔ <BR> مثال کے طور پر Dolibarr پروڈکٹ آبجیکٹ کے بازیافت کے طریقہ کار کو کال کرنے کے لیے
+CronObjectHelp=لوڈ کرنے کے لیے آبجیکٹ کا نام۔ <BR> مثال کے طور پر Dolibarr پروڈکٹ آبجیکٹ /htdocs/product/class/product.class.php کے بازیافت طریقہ کو کال کرنے کے لئے، کلاس فائل کے نام کی قدر <br> <i> ہے
+CronMethodHelp=لانچ کرنے کا آبجیکٹ طریقہ۔ <BR> مثال کے طور پر Dolibarr پروڈکٹ آبجیکٹ /htdocs/product/class/product.class.php کے بازیافت طریقہ کو کال کرنے کے لئے، طریقہ کی قدر <br> <i> ہے
+CronArgsHelp=طریقہ کار کے دلائل۔ <BR> مثال کے طور پر Dolibarr پروڈکٹ آبجیکٹ /htdocs/product/class/product.class.php کے بازیافت کے طریقہ کو کال کرنے کے لئے، پیرامیٹرز کی قدر <br> <i> 0، ProductRef71e8181fcz0 ہو سکتی ہے
+CronCommandHelp=چلانے کے لیے سسٹم کمانڈ لائن۔
+CronCreateJob=نئی طے شدہ ملازمت بنائیں
+CronFrom=سے
 # Info
 # Common
-CronType=Job type
-CronType_method=Call method of a PHP Class
-CronType_command=Shell command
-CronCannotLoadClass=Cannot load class file %s (to use class %s)
-CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
-UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
-JobDisabled=Job disabled
-MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
-DATAPOLICYJob=Data cleaner and anonymizer
-JobXMustBeEnabled=Job %s must be enabled
+CronType=ملازمت کی قسم
+CronType_method=پی ایچ پی کلاس کا کال طریقہ
+CronType_command=شیل کمانڈ
+CronCannotLoadClass=کلاس فائل %s لوڈ نہیں کی جا سکتی (کلاس %s استعمال کرنے کے لیے)
+CronCannotLoadObject=کلاس فائل %s لوڈ کی گئی تھی، لیکن اس میں آبجیکٹ %s نہیں ملا
+UseMenuModuleToolsToAddCronJobs=مینو میں جائیں " <a href="%s"> ہوم - ایڈمن ٹولز - شیڈیولڈ جابز </a>" شیڈول جابز کو دیکھنے اور ان میں ترمیم کرنے کے لیے۔
+JobDisabled=ملازمت غیر فعال
+MakeLocalDatabaseDumpShort=مقامی ڈیٹا بیس کا بیک اپ
+MakeLocalDatabaseDump=ایک مقامی ڈیٹا بیس ڈمپ بنائیں۔ پیرامیٹرز ہیں: کمپریشن ('gz' یا 'bz' یا 'none')، بیک اپ کی قسم ('mysql'، 'pgsql'، 'auto')، 1، 'auto' یا فائل کا نام، رکھنے کے لیے بیک اپ فائلوں کی تعداد
+WarningCronDelayed=توجہ، کارکردگی کے مقصد کے لیے، فعال ملازمتوں کے نفاذ کی اگلی تاریخ جو بھی ہو، آپ کی ملازمتوں کو چلانے سے پہلے زیادہ سے زیادہ %s گھنٹے تک تاخیر ہو سکتی ہے۔
+DATAPOLICYJob=ڈیٹا کلینر اور گمنام
+JobXMustBeEnabled=جاب %s کا فعال ہونا ضروری ہے۔
 # Cron Boxes
-LastExecutedScheduledJob=Last executed scheduled job
-NextScheduledJobExecute=Next scheduled job to execute
-NumberScheduledJobError=Number of scheduled jobs in error
+LastExecutedScheduledJob=آخری بار طے شدہ کام
+NextScheduledJobExecute=اگلا طے شدہ کام انجام دینے کے لیے
+NumberScheduledJobError=غلطی سے طے شدہ کاموں کی تعداد
diff --git a/htdocs/langs/ur_PK/deliveries.lang b/htdocs/langs/ur_PK/deliveries.lang
index cd8a36e6c70..e4226709783 100644
--- a/htdocs/langs/ur_PK/deliveries.lang
+++ b/htdocs/langs/ur_PK/deliveries.lang
@@ -1,33 +1,33 @@
 # Dolibarr language file - Source file is en_US - deliveries
-Delivery=Delivery
-DeliveryRef=Ref Delivery
-DeliveryCard=Receipt card
-DeliveryOrder=Delivery receipt
-DeliveryDate=Delivery date
-CreateDeliveryOrder=Generate delivery receipt
-DeliveryStateSaved=Delivery state saved
-SetDeliveryDate=Set shipping date
-ValidateDeliveryReceipt=Validate delivery receipt
-ValidateDeliveryReceiptConfirm=Are you sure you want to validate this delivery receipt?
-DeleteDeliveryReceipt=Delete delivery receipt
-DeleteDeliveryReceiptConfirm=Are you sure you want to delete delivery receipt <b>%s</b>?
-DeliveryMethod=Delivery method
-TrackingNumber=Tracking number
-DeliveryNotValidated=Delivery not validated
-StatusDeliveryCanceled=Canceled
-StatusDeliveryDraft=Draft
-StatusDeliveryValidated=Received
+Delivery=ترسیل
+DeliveryRef=حوالگی کی ترسیل
+DeliveryCard=رسید کارڈ
+DeliveryOrder=ترسیل کی رسید
+DeliveryDate=ادئیگی کی تاریخ
+CreateDeliveryOrder=ترسیل کی رسید تیار کریں۔
+DeliveryStateSaved=ڈیلیوری کی حالت محفوظ ہو گئی۔
+SetDeliveryDate=شپنگ کی تاریخ طے کریں۔
+ValidateDeliveryReceipt=ترسیل کی رسید کی توثیق کریں۔
+ValidateDeliveryReceiptConfirm=کیا آپ واقعی اس ترسیل کی رسید کی توثیق کرنا چاہتے ہیں؟
+DeleteDeliveryReceipt=ترسیل کی رسید کو حذف کریں۔
+DeleteDeliveryReceiptConfirm=کیا آپ واقعی ڈیلیوری رسید <b> %s </b> کو حذف کرنا چاہتے ہیں؟
+DeliveryMethod=ترسیل کا طریقہ
+TrackingNumber=ٹریکنگ نمبر
+DeliveryNotValidated=ڈیلیوری کی توثیق نہیں ہوئی۔
+StatusDeliveryCanceled=منسوخ
+StatusDeliveryDraft=مسودہ
+StatusDeliveryValidated=موصول ہوا۔
 # merou PDF model
-NameAndSignature=Name and Signature:
-ToAndDate=To___________________________________ on ____/_____/__________
-GoodStatusDeclaration=Have received the goods above in good condition,
-Deliverer=Deliverer:
-Sender=Sender
-Recipient=Recipient
-ErrorStockIsNotEnough=There's not enough stock
-Shippable=Shippable
-NonShippable=Not Shippable
-ShowShippableStatus=Show shippable status
-ShowReceiving=Show delivery receipt
-NonExistentOrder=Nonexistent order
-StockQuantitiesAlreadyAllocatedOnPreviousLines = Stock quantities already allocated on previous lines
+NameAndSignature=نام اور دستخط:
+ToAndDate=___________________________________ پر ________________________________
+GoodStatusDeclaration=اوپر کا سامان اچھی حالت میں ملا ہے،
+Deliverer=پہنچانے والا:
+Sender=بھیجنے والا
+Recipient=وصول کنندہ
+ErrorStockIsNotEnough=کافی اسٹاک نہیں ہے۔
+Shippable=قابل ترسیل
+NonShippable=قابل ترسیل نہیں۔
+ShowShippableStatus=قابل ترسیل حیثیت دکھائیں۔
+ShowReceiving=ترسیل کی رسید دکھائیں۔
+NonExistentOrder=غیر موجود آرڈر
+StockQuantitiesAlreadyAllocatedOnPreviousLines = اسٹاک کی مقدار پہلے ہی پچھلی لائنوں پر مختص کی گئی ہے۔
diff --git a/htdocs/langs/ur_PK/dict.lang b/htdocs/langs/ur_PK/dict.lang
index 0524cf1ca18..ce8948efbac 100644
--- a/htdocs/langs/ur_PK/dict.lang
+++ b/htdocs/langs/ur_PK/dict.lang
@@ -1,359 +1,359 @@
 # Dolibarr language file - Source file is en_US - dict
-CountryFR=France
-CountryBE=Belgium
-CountryIT=Italy
-CountryES=Spain
-CountryDE=Germany
-CountryCH=Switzerland
+CountryFR=فرانس
+CountryBE=بیلجیم
+CountryIT=اٹلی
+CountryES=سپین
+CountryDE=جرمنی
+CountryCH=سوئٹزرلینڈ
 # Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
-CountryGB=United Kingdom
-CountryUK=United Kingdom
-CountryIE=Ireland
-CountryCN=China
-CountryTN=Tunisia
-CountryUS=United States
-CountryMA=Morocco
-CountryDZ=Algeria
-CountryCA=Canada
-CountryTG=Togo
-CountryGA=Gabon
-CountryNL=Netherlands
-CountryHU=Hungary
-CountryRU=Russia
-CountrySE=Sweden
-CountryCI=Ivory Coast
-CountrySN=Senegal
-CountryAR=Argentina
-CountryCM=Cameroon
-CountryPT=Portugal
-CountrySA=Saudi Arabia
-CountryMC=Monaco
-CountryAU=Australia
-CountrySG=Singapore
-CountryAF=Afghanistan
-CountryAX=Åland Islands
-CountryAL=Albania
-CountryAS=American Samoa
-CountryAD=Andorra
-CountryAO=Angola
-CountryAI=Anguilla
-CountryAQ=Antarctica
-CountryAG=Antigua and Barbuda
-CountryAM=Armenia
-CountryAW=Aruba
-CountryAT=Austria
-CountryAZ=Azerbaijan
-CountryBS=Bahamas
-CountryBH=Bahrain
-CountryBD=Bangladesh
-CountryBB=Barbados
-CountryBY=Belarus
-CountryBZ=Belize
-CountryBJ=Benin
-CountryBM=Bermuda
-CountryBT=Bhutan
-CountryBO=Bolivia
-CountryBA=Bosnia and Herzegovina
-CountryBW=Botswana
-CountryBV=Bouvet Island
-CountryBR=Brazil
-CountryIO=British Indian Ocean Territory
-CountryBN=Brunei Darussalam
-CountryBG=Bulgaria
-CountryBF=Burkina Faso
-CountryBI=Burundi
-CountryKH=Cambodia
-CountryCV=Cape Verde
-CountryKY=Cayman Islands
-CountryCF=Central African Republic
-CountryTD=Chad
-CountryCL=Chile
-CountryCX=Christmas Island
-CountryCC=Cocos (Keeling) Islands
-CountryCO=Colombia
-CountryKM=Comoros
-CountryCG=Congo
-CountryCD=Congo, The Democratic Republic of the
-CountryCK=Cook Islands
-CountryCR=Costa Rica
-CountryHR=Croatia
-CountryCU=Cuba
-CountryCY=Cyprus
-CountryCZ=Czech Republic
-CountryDK=Denmark
-CountryDJ=Djibouti
-CountryDM=Dominica
-CountryDO=Dominican Republic
-CountryEC=Ecuador
-CountryEG=Egypt
-CountrySV=El Salvador
-CountryGQ=Equatorial Guinea
-CountryER=Eritrea
-CountryEE=Estonia
-CountryET=Ethiopia
-CountryFK=Falkland Islands
-CountryFO=Faroe Islands
-CountryFJ=Fiji Islands
-CountryFI=Finland
-CountryGF=French Guiana
-CountryPF=French Polynesia
-CountryTF=French Southern Territories
-CountryGM=Gambia
-CountryGE=Georgia
-CountryGH=Ghana
-CountryGI=Gibraltar
-CountryGR=Greece
-CountryGL=Greenland
-CountryGD=Grenada
-CountryGP=Guadeloupe
-CountryGU=Guam
-CountryGT=Guatemala
-CountryGN=Guinea
-CountryGW=Guinea-Bissau
-CountryGY=Guyana
-CountryHT=Haïti
-CountryHM=Heard Island and McDonald
-CountryVA=Holy See (Vatican City State)
-CountryHN=Honduras
-CountryHK=Hong Kong
-CountryIS=Iceland
-CountryIN=India
-CountryID=Indonesia
-CountryIR=Iran
-CountryIQ=Iraq
-CountryIL=Israel
-CountryJM=Jamaica
-CountryJP=Japan
-CountryJO=Jordan
-CountryKZ=Kazakhstan
-CountryKE=Kenya
-CountryKI=Kiribati
-CountryKP=North Korea
-CountryKR=South Korea
-CountryKW=Kuwait
-CountryKG=Kyrgyzstan
-CountryLA=Lao
-CountryLV=Latvia
-CountryLB=Lebanon
-CountryLS=Lesotho
-CountryLR=Liberia
-CountryLY=Libyan
-CountryLI=Liechtenstein
-CountryLT=Lithuania
-CountryLU=Luxembourg
-CountryMO=Macao
-CountryMK=Macedonia, the former Yugoslav of
-CountryMG=Madagascar
-CountryMW=Malawi
-CountryMY=Malaysia
-CountryMV=Maldives
-CountryML=Mali
-CountryMT=Malta
-CountryMH=Marshall Islands
-CountryMQ=Martinique
-CountryMR=Mauritania
-CountryMU=Mauritius
-CountryYT=Mayotte
-CountryMX=Mexico
-CountryFM=Micronesia
-CountryMD=Moldova
-CountryMN=Mongolia
-CountryMS=Monserrat
-CountryMZ=Mozambique
-CountryMM=Myanmar (Burma)
-CountryNA=Namibia
-CountryNR=Nauru
-CountryNP=Nepal
-CountryAN=Netherlands Antilles
-CountryNC=New Caledonia
-CountryNZ=New Zealand
-CountryNI=Nicaragua
-CountryNE=Niger
-CountryNG=Nigeria
-CountryNU=Niue
-CountryNF=Norfolk Island
-CountryMP=Northern Mariana Islands
-CountryNO=Norway
-CountryOM=Oman
-CountryPK=Pakistan
-CountryPW=Palau
-CountryPS=Palestinian Territory, Occupied
-CountryPA=Panama
-CountryPG=Papua New Guinea
-CountryPY=Paraguay
-CountryPE=Peru
-CountryPH=Philippines
-CountryPN=Pitcairn Islands
-CountryPL=Poland
-CountryPR=Puerto Rico
-CountryQA=Qatar
-CountryRE=Reunion
-CountryRO=Romania
-CountryRW=Rwanda
-CountrySH=Saint Helena
-CountryKN=Saint Kitts and Nevis
-CountryLC=Saint Lucia
-CountryPM=Saint Pierre and Miquelon
-CountryVC=Saint Vincent and Grenadines
-CountryWS=Samoa
-CountrySM=San Marino
-CountryST=Sao Tome and Principe
-CountryRS=Serbia
-CountrySC=Seychelles
-CountrySL=Sierra Leone
-CountrySK=Slovakia
-CountrySI=Slovenia
-CountrySB=Solomon Islands
-CountrySO=Somalia
-CountryZA=South Africa
-CountryGS=South Georgia and the South Sandwich Islands
-CountryLK=Sri Lanka
-CountrySD=Sudan
-CountrySR=Suriname
-CountrySJ=Svalbard and Jan Mayen
-CountrySZ=Swaziland
-CountrySY=Syrian
-CountryTW=Taiwan
-CountryTJ=Tajikistan
-CountryTZ=Tanzania
-CountryTH=Thailand
-CountryTL=Timor-Leste
-CountryTK=Tokelau
-CountryTO=Tonga
-CountryTT=Trinidad and Tobago
-CountryTR=Turkey
-CountryTM=Turkmenistan
-CountryTC=Turks and Caicos Islands
-CountryTV=Tuvalu
-CountryUG=Uganda
-CountryUA=Ukraine
-CountryAE=United Arab Emirates
-CountryUM=United States Minor Outlying Islands
-CountryUY=Uruguay
-CountryUZ=Uzbekistan
-CountryVU=Vanuatu
-CountryVE=Venezuela
-CountryVN=Viet Nam
-CountryVG=Virgin Islands, British
-CountryVI=Virgin Islands, U.S.
-CountryWF=Wallis and Futuna
-CountryEH=Western Sahara
-CountryYE=Yemen
-CountryZM=Zambia
-CountryZW=Zimbabwe
-CountryGG=Guernsey
-CountryIM=Isle of Man
-CountryJE=Jersey
-CountryME=Montenegro
-CountryBL=Saint Barthelemy
-CountryMF=Saint Martin
+CountryGB=متحدہ سلطنت یونائیٹڈ کنگڈم
+CountryUK=متحدہ سلطنت یونائیٹڈ کنگڈم
+CountryIE=آئرلینڈ
+CountryCN=چین
+CountryTN=تیونس
+CountryUS=ریاستہائے متحدہ
+CountryMA=مراکش
+CountryDZ=الجزائر
+CountryCA=کینیڈا
+CountryTG=جانے کے لئے
+CountryGA=گبون
+CountryNL=نیدرلینڈز
+CountryHU=ہنگری
+CountryRU=روس
+CountrySE=سویڈن
+CountryCI=آئیوری کوسٹ
+CountrySN=سینیگال
+CountryAR=ارجنٹائن
+CountryCM=کیمرون
+CountryPT=پرتگال
+CountrySA=سعودی عرب
+CountryMC=موناکو
+CountryAU=آسٹریلیا
+CountrySG=سنگاپور
+CountryAF=افغانستان
+CountryAX=آلینڈ جزائر
+CountryAL=البانیہ
+CountryAS=امریکی ساموا
+CountryAD=اندورا
+CountryAO=انگولا
+CountryAI=انگویلا
+CountryAQ=انٹارکٹیکا
+CountryAG=انٹیگوا اور باربوڈا
+CountryAM=آرمینیا
+CountryAW=اروبا
+CountryAT=آسٹریا
+CountryAZ=آذربائیجان
+CountryBS=بہاماس
+CountryBH=بحرین
+CountryBD=بنگلہ دیش
+CountryBB=بارباڈوس
+CountryBY=بیلاروس
+CountryBZ=بیلیز
+CountryBJ=بینن
+CountryBM=برمودا
+CountryBT=بھوٹان
+CountryBO=بولیویا
+CountryBA=بوسنیا اور ہرزیگوینا
+CountryBW=بوٹسوانا
+CountryBV=بوویٹ جزیرہ
+CountryBR=برازیل
+CountryIO=برطانوی بحر ہند کا علاقہ
+CountryBN=برونائی دارالسلام
+CountryBG=بلغاریہ
+CountryBF=برکینا فاسو
+CountryBI=برونڈی
+CountryKH=کمبوڈیا
+CountryCV=کیپ وردے
+CountryKY=جزائر کیمن
+CountryCF=مرکزی افریقی جمہوریت
+CountryTD=چاڈ
+CountryCL=چلی
+CountryCX=کرسمس جزیرہ
+CountryCC=کوکوس (کیلنگ) جزائر
+CountryCO=کولمبیا
+CountryKM=کوموروس
+CountryCG=کانگو
+CountryCD=کانگو، ڈیموکریٹک ریپبلک آف دی
+CountryCK=کوک جزائر
+CountryCR=کوسٹا ریکا
+CountryHR=کروشیا
+CountryCU=کیوبا
+CountryCY=قبرص
+CountryCZ=جمہوریہ چیک
+CountryDK=ڈنمارک
+CountryDJ=جبوتی
+CountryDM=ڈومینیکا
+CountryDO=ڈومینیکن ریپبلک
+CountryEC=ایکواڈور
+CountryEG=مصر
+CountrySV=ال سلواڈور
+CountryGQ=استوائی گنی
+CountryER=اریٹیریا
+CountryEE=ایسٹونیا
+CountryET=ایتھوپیا
+CountryFK=فاک لینڈ جزائر
+CountryFO=جزائر فیرو
+CountryFJ=جزائر فجی
+CountryFI=فن لینڈ
+CountryGF=فرانسیسی گیانا
+CountryPF=فرانسیسی پولینیشیا
+CountryTF=فرانسیسی جنوبی علاقے
+CountryGM=گیمبیا
+CountryGE=جارجیا
+CountryGH=گھانا
+CountryGI=جبرالٹر
+CountryGR=یونان
+CountryGL=گرین لینڈ
+CountryGD=گریناڈا
+CountryGP=گواڈیلوپ
+CountryGU=گوام
+CountryGT=گوئٹے مالا
+CountryGN=گنی
+CountryGW=گنی بساؤ
+CountryGY=گیانا
+CountryHT=ہیٹی
+CountryHM=ہرڈ آئی لینڈ اور میکڈونلڈ
+CountryVA=ہولی سی (ویٹیکن سٹی اسٹیٹ)
+CountryHN=ہونڈوراس
+CountryHK=ہانگ کانگ
+CountryIS=آئس لینڈ
+CountryIN=انڈیا
+CountryID=انڈونیشیا
+CountryIR=ایران
+CountryIQ=عراق
+CountryIL=اسرا ییل
+CountryJM=جمیکا
+CountryJP=جاپان
+CountryJO=اردن
+CountryKZ=قازقستان
+CountryKE=کینیا
+CountryKI=کریباتی
+CountryKP=شمالی کوریا
+CountryKR=جنوبی کوریا
+CountryKW=کویت
+CountryKG=کرغزستان
+CountryLA=لاؤ
+CountryLV=لٹویا
+CountryLB=لبنان
+CountryLS=لیسوتھو
+CountryLR=لائبیریا
+CountryLY=لیبیا
+CountryLI=لیختنسٹین
+CountryLT=لتھوانیا
+CountryLU=لکسمبرگ
+CountryMO=مکاؤ
+CountryMK=مقدونیہ، سابق یوگوسلاو
+CountryMG=مڈغاسکر
+CountryMW=ملاوی
+CountryMY=ملائیشیا
+CountryMV=مالدیپ
+CountryML=مالی
+CountryMT=مالٹا
+CountryMH=مارشل جزائر
+CountryMQ=مارٹنیک
+CountryMR=موریطانیہ
+CountryMU=ماریشس
+CountryYT=مایوٹ
+CountryMX=میکسیکو
+CountryFM=مائیکرونیشیا
+CountryMD=مالڈووا
+CountryMN=منگولیا
+CountryMS=مونسیرت
+CountryMZ=موزمبیق
+CountryMM=میانمار (برما)
+CountryNA=نمیبیا
+CountryNR=نورو
+CountryNP=نیپال
+CountryAN=نیدرلینڈ اینٹیلز
+CountryNC=نیو کیلیڈونیا
+CountryNZ=نیوزی لینڈ
+CountryNI=نکاراگوا
+CountryNE=نائجر
+CountryNG=نائیجیریا
+CountryNU=نیو
+CountryNF=نورفولک جزیرہ
+CountryMP=شمالی ماریانا جزائر
+CountryNO=ناروے
+CountryOM=عمان
+CountryPK=پاکستان
+CountryPW=پلاؤ
+CountryPS=فلسطینی علاقہ، مقبوضہ
+CountryPA=پانامہ
+CountryPG=پاپوا نیو گنی
+CountryPY=پیراگوئے
+CountryPE=پیرو
+CountryPH=فلپائن
+CountryPN=پٹکیرن جزائر
+CountryPL=پولینڈ
+CountryPR=پورٹو ریکو
+CountryQA=قطر
+CountryRE=ری یونین
+CountryRO=رومانیہ
+CountryRW=روانڈا
+CountrySH=سینٹ ہیلینا
+CountryKN=سینٹ کٹس اینڈ نیوس
+CountryLC=سینٹ لوسیا
+CountryPM=سینٹ پیئر اور میکیلون
+CountryVC=سینٹ ونسنٹ اور گریناڈائنز
+CountryWS=ساموا
+CountrySM=سان مارینو
+CountryST=ساؤ ٹوم اور پرنسپے۔
+CountryRS=سربیا
+CountrySC=سیشلز
+CountrySL=سیرا لیون
+CountrySK=سلوواکیہ
+CountrySI=سلووینیا
+CountrySB=جزائر سلیمان
+CountrySO=صومالیہ
+CountryZA=جنوبی افریقہ
+CountryGS=جنوبی جارجیا اور جنوبی سینڈوچ جزائر
+CountryLK=سری لنکا
+CountrySD=سوڈان
+CountrySR=سورینام
+CountrySJ=سوالبارڈ اور جان ماین
+CountrySZ=سوازی لینڈ
+CountrySY=شامی
+CountryTW=تائیوان
+CountryTJ=تاجکستان
+CountryTZ=تنزانیہ
+CountryTH=تھائی لینڈ
+CountryTL=تیمور-لیستے
+CountryTK=ٹوکیلاؤ
+CountryTO=ٹونگا
+CountryTT=ٹرینیڈاڈ اور ٹوباگو
+CountryTR=ترکی
+CountryTM=ترکمانستان
+CountryTC=ترک اور کیکوس جزائر
+CountryTV=تووالو
+CountryUG=یوگنڈا
+CountryUA=یوکرین
+CountryAE=متحدہ عرب امارات
+CountryUM=ریاست ہائے متحدہ امریکہ کے چھوٹے بیرونی جزائر
+CountryUY=یوراگوئے
+CountryUZ=ازبکستان
+CountryVU=وانواتو
+CountryVE=وینزویلا
+CountryVN=ویت نام
+CountryVG=ورجن جزائر، برطانوی
+CountryVI=ورجن آئی لینڈز، یو ایس
+CountryWF=والس اور فوٹونا
+CountryEH=مغربی صحارا
+CountryYE=یمن
+CountryZM=زیمبیا
+CountryZW=زمبابوے
+CountryGG=گرنسی
+CountryIM=آئل آف مین
+CountryJE=جرسی
+CountryME=مونٹی نیگرو
+CountryBL=سینٹ بارتھیلمی۔
+CountryMF=سینٹ مارٹن
 
 ##### Civilities #####
-CivilityMME=Mrs.
-CivilityMR=Mr.
-CivilityMLE=Ms.
-CivilityMTRE=Master
-CivilityDR=Doctor
+CivilityMME=مسز.
+CivilityMR=مسٹر.
+CivilityMLE=MS.
+CivilityMTRE=ماسٹر
+CivilityDR=ڈاکٹر
 ##### Currencies #####
-Currencyeuros=Euros
-CurrencyAUD=AU Dollars
-CurrencySingAUD=AU Dollar
-CurrencyCAD=CAN Dollars
-CurrencySingCAD=CAN Dollar
-CurrencyCHF=Swiss Francs
-CurrencySingCHF=Swiss Franc
-CurrencyEUR=Euros
-CurrencySingEUR=Euro
-CurrencyFRF=French Francs
-CurrencySingFRF=French Franc
-CurrencyGBP=GB Pounds
-CurrencySingGBP=GB Pound
-CurrencyINR=Indian rupees
-CurrencySingINR=Indian rupee
-CurrencyMAD=Dirham
-CurrencySingMAD=Dirham
-CurrencyMGA=Ariary
-CurrencySingMGA=Ariary
-CurrencyMUR=Mauritius rupees
-CurrencySingMUR=Mauritius rupee
-CurrencyNOK=Norwegian krones
-CurrencySingNOK=Norwegian kronas
-CurrencyTND=Tunisian dinars
-CurrencySingTND=Tunisian dinar
-CurrencyUSD=US Dollars
-CurrencySingUSD=US Dollar
-CurrencyUAH=Hryvnia
-CurrencySingUAH=Hryvnia
+Currencyeuros=یورو
+CurrencyAUD=اے یو ڈالرز
+CurrencySingAUD=اے یو ڈالر
+CurrencyCAD=CAN ڈالرز
+CurrencySingCAD=CAN ڈالر
+CurrencyCHF=سوئس فرانک
+CurrencySingCHF=سوئس فرانک
+CurrencyEUR=یورو
+CurrencySingEUR=یورو
+CurrencyFRF=فرانسیسی فرانک
+CurrencySingFRF=فرانسیسی فرانک
+CurrencyGBP=جی بی پاؤنڈز
+CurrencySingGBP=جی بی پاؤنڈ
+CurrencyINR=ہندوستانی روپیہ
+CurrencySingINR=ہندوستانی روپیہ
+CurrencyMAD=درہم
+CurrencySingMAD=درہم
+CurrencyMGA=ایریری
+CurrencySingMGA=ایریری
+CurrencyMUR=ماریشس روپے
+CurrencySingMUR=ماریشس روپیہ
+CurrencyNOK=نارویجن کرون
+CurrencySingNOK=نارویجن کرونا
+CurrencyTND=تیونسی دینار
+CurrencySingTND=تیونسی دینار
+CurrencyUSD=امریکی ڈالر
+CurrencySingUSD=امریکی ڈالر
+CurrencyUAH=ہریونیا
+CurrencySingUAH=ہریونیا
 CurrencyXAF=CFA Francs BEAC
-CurrencySingXAF=CFA Franc BEAC
+CurrencySingXAF=CFA فرانک BEAC
 CurrencyXOF=CFA Francs BCEAO
-CurrencySingXOF=CFA Franc BCEAO
-CurrencyXPF=CFP Francs
-CurrencySingXPF=CFP Franc
-CurrencyCentEUR=cents
-CurrencyCentSingEUR=cent
-CurrencyCentINR=paisa
-CurrencyCentSingINR=paise
-CurrencyThousandthSingTND=thousandth
+CurrencySingXOF=CFA فرانک BCEAO
+CurrencyXPF=CFP فرانک
+CurrencySingXPF=CFP فرانک
+CurrencyCentEUR=سینٹ
+CurrencyCentSingEUR=سینٹ
+CurrencyCentINR=پیسہ
+CurrencyCentSingINR=پیسہ
+CurrencyThousandthSingTND=ہزارواں
 #### Input reasons #####
-DemandReasonTypeSRC_INTE=Internet
-DemandReasonTypeSRC_CAMP_MAIL=Mailing campaign
-DemandReasonTypeSRC_CAMP_EMAIL=EMailing campaign
-DemandReasonTypeSRC_CAMP_PHO=Phone campaign
-DemandReasonTypeSRC_CAMP_FAX=Fax campaign
-DemandReasonTypeSRC_COMM=Commercial contact
-DemandReasonTypeSRC_SHOP=Shop contact
-DemandReasonTypeSRC_WOM=Word of mouth
-DemandReasonTypeSRC_PARTNER=Partner
-DemandReasonTypeSRC_EMPLOYEE=Employee
-DemandReasonTypeSRC_SPONSORING=Sponsorship
-DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
+DemandReasonTypeSRC_INTE=انٹرنیٹ
+DemandReasonTypeSRC_CAMP_MAIL=میلنگ مہم
+DemandReasonTypeSRC_CAMP_EMAIL=ای میل مہم
+DemandReasonTypeSRC_CAMP_PHO=فون مہم
+DemandReasonTypeSRC_CAMP_FAX=فیکس مہم
+DemandReasonTypeSRC_COMM=تجارتی رابطہ
+DemandReasonTypeSRC_SHOP=دکان سے رابطہ کریں۔
+DemandReasonTypeSRC_WOM=منہ کے لفظ
+DemandReasonTypeSRC_PARTNER=ساتھی
+DemandReasonTypeSRC_EMPLOYEE=ملازم
+DemandReasonTypeSRC_SPONSORING=کفالت
+DemandReasonTypeSRC_SRC_CUSTOMER=گاہک کا آنے والا رابطہ
 #### Paper formats ####
-PaperFormatEU4A0=Format 4A0
-PaperFormatEU2A0=Format 2A0
-PaperFormatEUA0=Format A0
-PaperFormatEUA1=Format A1
-PaperFormatEUA2=Format A2
-PaperFormatEUA3=Format A3
-PaperFormatEUA4=Format A4
-PaperFormatEUA5=Format A5
-PaperFormatEUA6=Format A6
-PaperFormatUSLETTER=Format Letter US
-PaperFormatUSLEGAL=Format Legal US
-PaperFormatUSEXECUTIVE=Format Executive US
-PaperFormatUSLEDGER=Format Ledger/Tabloid
-PaperFormatCAP1=Format P1 Canada
-PaperFormatCAP2=Format P2 Canada
-PaperFormatCAP3=Format P3 Canada
-PaperFormatCAP4=Format P4 Canada
-PaperFormatCAP5=Format P5 Canada
-PaperFormatCAP6=Format P6 Canada
+PaperFormatEU4A0=فارمیٹ 4A0
+PaperFormatEU2A0=فارمیٹ 2A0
+PaperFormatEUA0=فارمیٹ A0
+PaperFormatEUA1=فارمیٹ A1
+PaperFormatEUA2=فارمیٹ A2
+PaperFormatEUA3=فارمیٹ A3
+PaperFormatEUA4=فارمیٹ A4
+PaperFormatEUA5=فارمیٹ A5
+PaperFormatEUA6=فارمیٹ A6
+PaperFormatUSLETTER=فارمیٹ خط US
+PaperFormatUSLEGAL=فارمیٹ قانونی US
+PaperFormatUSEXECUTIVE=فارمیٹ ایگزیکٹو US
+PaperFormatUSLEDGER=فارمیٹ لیجر/ٹیبلوئڈ
+PaperFormatCAP1=فارمیٹ P1 کینیڈا
+PaperFormatCAP2=فارمیٹ P2 کینیڈا
+PaperFormatCAP3=فارمیٹ P3 کینیڈا
+PaperFormatCAP4=فارمیٹ P4 کینیڈا
+PaperFormatCAP5=فارمیٹ P5 کینیڈا
+PaperFormatCAP6=فارمیٹ P6 کینیڈا
 #### Expense report categories ####
-ExpAutoCat=Car
-ExpCycloCat=Moped
-ExpMotoCat=Motorbike
-ExpAuto3CV=3 CV
-ExpAuto4CV=4 CV
-ExpAuto5CV=5 CV
-ExpAuto6CV=6 CV
-ExpAuto7CV=7 CV
-ExpAuto8CV=8 CV
-ExpAuto9CV=9 CV
-ExpAuto10CV=10 CV
-ExpAuto11CV=11 CV
-ExpAuto12CV=12 CV
-ExpAuto3PCV=3 CV and more
-ExpAuto4PCV=4 CV and more
-ExpAuto5PCV=5 CV and more
-ExpAuto6PCV=6 CV and more
-ExpAuto7PCV=7 CV and more
-ExpAuto8PCV=8 CV and more
-ExpAuto9PCV=9 CV and more
-ExpAuto10PCV=10 CV and more
-ExpAuto11PCV=11 CV and more
-ExpAuto12PCV=12 CV and more
-ExpAuto13PCV=13 CV and more
-ExpCyclo=Capacity lower to 50cm3
-ExpMoto12CV=Motorbike 1 or 2 CV
-ExpMoto345CV=Motorbike 3, 4 or 5 CV
-ExpMoto5PCV=Motorbike 5 CV and more
+ExpAutoCat=گاڑی
+ExpCycloCat=موپڈ
+ExpMotoCat=موٹر سائیکل
+ExpAuto3CV=3 سی وی
+ExpAuto4CV=4 سی وی
+ExpAuto5CV=5 سی وی
+ExpAuto6CV=6 سی وی
+ExpAuto7CV=7 سی وی
+ExpAuto8CV=8 سی وی
+ExpAuto9CV=9 سی وی
+ExpAuto10CV=10 سی وی
+ExpAuto11CV=11 سی وی
+ExpAuto12CV=12 سی وی
+ExpAuto3PCV=3 CV اور مزید
+ExpAuto4PCV=4 CV اور مزید
+ExpAuto5PCV=5 CV اور مزید
+ExpAuto6PCV=6 CV اور مزید
+ExpAuto7PCV=7 CV اور مزید
+ExpAuto8PCV=8 CV اور مزید
+ExpAuto9PCV=9 CV اور مزید
+ExpAuto10PCV=10 CV اور مزید
+ExpAuto11PCV=11 CV اور مزید
+ExpAuto12PCV=12 CV اور مزید
+ExpAuto13PCV=13 CV اور مزید
+ExpCyclo=صلاحیت 50cm3 تک کم ہے۔
+ExpMoto12CV=موٹر بائیک 1 یا 2 سی وی
+ExpMoto345CV=موٹر بائیک 3، 4 یا 5 سی وی
+ExpMoto5PCV=موٹر بائیک 5 سی وی اور مزید
diff --git a/htdocs/langs/ur_PK/donations.lang b/htdocs/langs/ur_PK/donations.lang
index d512abb2eea..da6534254a5 100644
--- a/htdocs/langs/ur_PK/donations.lang
+++ b/htdocs/langs/ur_PK/donations.lang
@@ -1,35 +1,35 @@
 # Dolibarr language file - Source file is en_US - donations
-Donation=Donation
-Donations=Donations
-DonationRef=Donation ref.
-Donor=Donor
-AddDonation=Create a donation
-NewDonation=New donation
-DeleteADonation=Delete a donation
-ConfirmDeleteADonation=Are you sure you want to delete this donation?
-PublicDonation=Public donation
-DonationsArea=Donations area
-DonationStatusPromiseNotValidated=Draft promise
-DonationStatusPromiseValidated=Validated promise
-DonationStatusPaid=Donation received
-DonationStatusPromiseNotValidatedShort=Draft
-DonationStatusPromiseValidatedShort=Validated
-DonationStatusPaidShort=Received
-DonationTitle=Donation receipt
-DonationDate=Donation date
-DonationDatePayment=Payment date
-ValidPromess=Validate promise
-DonationReceipt=Donation receipt
-DonationsModels=Documents models for donation receipts
-LastModifiedDonations=Latest %s modified donations
-DonationRecipient=Donation recipient
-IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
-MinimumAmount=Minimum amount is  %s
-FreeTextOnDonations=Free text to show in footer
-FrenchOptions=Options for France
-DONATION_ART200=Show article 200 from CGI if you are concerned
-DONATION_ART238=Show article 238 from CGI if you are concerned
-DONATION_ART885=Show article 885 from CGI if you are concerned
-DonationPayment=Donation payment
-DonationValidated=Donation %s validated
-DonationUseThirdparties=Use an existing thirdparty as coordinates of donators
+Donation=عطیہ
+Donations=عطیات
+DonationRef=عطیہ کا حوالہ
+Donor=ڈونر
+AddDonation=عطیہ بنائیں
+NewDonation=نیا عطیہ
+DeleteADonation=عطیہ کو حذف کریں۔
+ConfirmDeleteADonation=کیا آپ واقعی اس عطیہ کو حذف کرنا چاہتے ہیں؟
+PublicDonation=عوامی عطیہ
+DonationsArea=عطیات کا علاقہ
+DonationStatusPromiseNotValidated=وعدہ کا مسودہ
+DonationStatusPromiseValidated=توثیق شدہ وعدہ
+DonationStatusPaid=عطیہ موصول ہوا۔
+DonationStatusPromiseNotValidatedShort=مسودہ
+DonationStatusPromiseValidatedShort=تصدیق شدہ
+DonationStatusPaidShort=موصول ہوا۔
+DonationTitle=عطیہ کی رسید
+DonationDate=عطیہ کی تاریخ
+DonationDatePayment=ادائیگی کی تاریخ
+ValidPromess=وعدے کی تصدیق کریں۔
+DonationReceipt=عطیہ کی رسید
+DonationsModels=عطیہ کی رسیدوں کے لیے دستاویزات کے ماڈل
+LastModifiedDonations=تازہ ترین %s تبدیل شدہ عطیات
+DonationRecipient=عطیہ وصول کنندہ
+IConfirmDonationReception=وصول کنندہ مندرجہ ذیل رقم کے عطیہ کے طور پر استقبالیہ کا اعلان کرتا ہے۔
+MinimumAmount=کم از کم رقم %s ہے۔
+FreeTextOnDonations=فوٹر میں دکھانے کے لیے مفت متن
+FrenchOptions=فرانس کے لیے اختیارات
+DONATION_ART200=اگر آپ فکر مند ہیں تو CGI سے آرٹیکل 200 دکھائیں۔
+DONATION_ART238=اگر آپ کو تشویش ہے تو CGI سے آرٹیکل 238 دکھائیں۔
+DONATION_ART885=اگر آپ فکر مند ہیں تو CGI سے آرٹیکل 885 دکھائیں۔
+DonationPayment=عطیہ کی ادائیگی
+DonationValidated=عطیہ %s توثیق شدہ
+DonationUseThirdparties=عطیہ دہندگان کے کوآرڈینیٹ کے طور پر موجودہ فریق ثالث کا استعمال کریں۔
diff --git a/htdocs/langs/ur_PK/ecm.lang b/htdocs/langs/ur_PK/ecm.lang
index 494a6c55164..cc4546ea90c 100644
--- a/htdocs/langs/ur_PK/ecm.lang
+++ b/htdocs/langs/ur_PK/ecm.lang
@@ -1,49 +1,49 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=No. of documents in directory
-ECMSection=Directory
-ECMSectionManual=Manual directory
-ECMSectionAuto=Automatic directory
-ECMSectionsManual=Manual tree
-ECMSectionsAuto=Automatic tree
-ECMSections=Directories
-ECMRoot=ECM Root
-ECMNewSection=New directory
-ECMAddSection=Add directory
-ECMCreationDate=Creation date
-ECMNbOfFilesInDir=Number of files in directory
-ECMNbOfSubDir=Number of sub-directories
-ECMNbOfFilesInSubDir=Number of files in sub-directories
-ECMCreationUser=Creator
-ECMArea=DMS/ECM area
-ECMAreaDesc=The DMS/ECM (Document Management System / Electronic Content Management) area allows you to save, share and search quickly all kind of documents in Dolibarr.
-ECMAreaDesc2=* Automatic directories are filled automatically when adding documents from card of an element.<br>* Manual directories can be used to save documents not linked to a particular element.
-ECMSectionWasRemoved=Directory <b>%s</b> has been deleted.
-ECMSectionWasCreated=Directory <b>%s</b> has been created.
-ECMSearchByKeywords=Search by keywords
-ECMSearchByEntity=Search by object
-ECMSectionOfDocuments=Directories of documents
-ECMTypeAuto=Automatic
-ECMDocsBy=Documents linked to %s
-ECMNoDirectoryYet=No directory created
-ShowECMSection=Show directory
-DeleteSection=Remove directory
-ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
-ECMDirectoryForFiles=Relative directory for files
-CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
-CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
-ECMFileManager=File manager
-ECMSelectASection=Select a directory in the tree...
-DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
-ReSyncListOfDir=Resync list of directories
-HashOfFileContent=Hash of file content
-NoDirectoriesFound=No directories found
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
-ExtraFieldsEcmFiles=Extrafields Ecm Files
-ExtraFieldsEcmDirectories=Extrafields Ecm Directories
-ECMSetup=ECM Setup
-GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
-ConfirmImgWebpCreation=Confirm all images duplication
-SucessConvertImgWebp=Images successfully duplicated
-ECMDirName=Dir name
-ECMParentDirectory=Parent directory
+ECMNbOfDocs=ڈائریکٹری میں دستاویزات کی تعداد
+ECMSection=ڈائرکٹری
+ECMSectionManual=دستی ڈائریکٹری
+ECMSectionAuto=خودکار ڈائریکٹری
+ECMSectionsManual=دستی درخت
+ECMSectionsAuto=خودکار درخت
+ECMSections=ڈائریکٹریز
+ECMRoot=ای سی ایم روٹ
+ECMNewSection=نئی ڈائریکٹری
+ECMAddSection=ڈائریکٹری شامل کریں۔
+ECMCreationDate=بنانے کی تاریخ
+ECMNbOfFilesInDir=ڈائریکٹری میں فائلوں کی تعداد
+ECMNbOfSubDir=ذیلی ڈائریکٹریوں کی تعداد
+ECMNbOfFilesInSubDir=ذیلی ڈائریکٹریوں میں فائلوں کی تعداد
+ECMCreationUser=خالق
+ECMArea=DMS/ECM ایریا
+ECMAreaDesc=DMS/ECM (دستاویزی انتظامی نظام/الیکٹرانک مواد کا انتظام) کا علاقہ آپ کو Dolibarr میں تمام قسم کے دستاویزات کو تیزی سے محفوظ کرنے، شیئر کرنے اور تلاش کرنے کی اجازت دیتا ہے۔
+ECMAreaDesc2=* کسی عنصر کے کارڈ سے دستاویزات شامل کرتے وقت خودکار ڈائریکٹریز خود بخود بھر جاتی ہیں۔ <br> * دستی ڈائریکٹریز کو کسی خاص عنصر سے منسلک نہ ہونے والی دستاویزات کو محفوظ کرنے کے لیے استعمال کیا جا سکتا ہے۔
+ECMSectionWasRemoved=ڈائریکٹری <b> %s </b> حذف کر دی گئی ہے۔
+ECMSectionWasCreated=ڈائرکٹری <b> %s </b> بنائی گئی ہے۔
+ECMSearchByKeywords=مطلوبہ الفاظ کے ذریعہ تلاش کریں۔
+ECMSearchByEntity=آبجیکٹ کے ذریعہ تلاش کریں۔
+ECMSectionOfDocuments=دستاویزات کی ڈائریکٹریز
+ECMTypeAuto=خودکار
+ECMDocsBy=%s سے منسلک دستاویزات
+ECMNoDirectoryYet=کوئی ڈائریکٹری نہیں بنائی گئی۔
+ShowECMSection=ڈائریکٹری دکھائیں۔
+DeleteSection=ڈائریکٹری کو ہٹا دیں۔
+ConfirmDeleteSection=کیا آپ تصدیق کر سکتے ہیں کہ آپ ڈائریکٹری <b> %s </b> کو حذف کرنا چاہتے ہیں؟
+ECMDirectoryForFiles=فائلوں کے لیے متعلقہ ڈائریکٹری
+CannotRemoveDirectoryContainsFilesOrDirs=ہٹانا ممکن نہیں ہے کیونکہ اس میں کچھ فائلیں یا ذیلی ڈائریکٹریز ہیں۔
+CannotRemoveDirectoryContainsFiles=ہٹانا ممکن نہیں کیونکہ اس میں کچھ فائلیں ہیں۔
+ECMFileManager=فائل مینیجر
+ECMSelectASection=درخت میں ایک ڈائریکٹری منتخب کریں...
+DirNotSynchronizedSyncFirst=ایسا لگتا ہے کہ یہ ڈائرکٹری ECM ماڈیول کے باہر بنائی یا تبدیل کی گئی ہے۔ اس ڈائرکٹری کا مواد حاصل کرنے کے لیے آپ کو ڈسک اور ڈیٹابیس کو سنکرونائز کرنے کے لیے پہلے "Resync" بٹن پر کلک کرنا چاہیے۔
+ReSyncListOfDir=ڈائریکٹریز کی فہرست کو دوبارہ ہم آہنگ کریں۔
+HashOfFileContent=فائل کے مواد کی ہیش
+NoDirectoriesFound=کوئی ڈائریکٹری نہیں ملی
+FileNotYetIndexedInDatabase=فائل ابھی تک ڈیٹا بیس میں انڈیکس نہیں ہوئی ہے (اسے دوبارہ اپ لوڈ کرنے کی کوشش کریں)
+ExtraFieldsEcmFiles=Extrafields Ecm فائلیں۔
+ExtraFieldsEcmDirectories=Extrafields Ecm ڈائریکٹریز
+ECMSetup=ECM سیٹ اپ
+GenerateImgWebp=تمام تصاویر کو دوسرے ورژن کے ساتھ .webp فارمیٹ کے ساتھ ڈپلیکیٹ کریں۔
+ConfirmGenerateImgWebp=اگر آپ تصدیق کرتے ہیں، تو آپ اس فولڈر میں موجود تمام تصاویر کے لیے .webp فارمیٹ میں ایک تصویر بنائیں گے (سب فولڈرز شامل نہیں ہیں)...
+ConfirmImgWebpCreation=تمام تصاویر کی نقل کی تصدیق کریں۔
+SucessConvertImgWebp=تصاویر کامیابی کے ساتھ ڈپلیکیٹ ہو گئیں۔
+ECMDirName=دیر کا نام
+ECMParentDirectory=پیرنٹ ڈائرکٹری
diff --git a/htdocs/langs/ur_PK/errors.lang b/htdocs/langs/ur_PK/errors.lang
index 7bb0fac3f7b..c3ff20c67c9 100644
--- a/htdocs/langs/ur_PK/errors.lang
+++ b/htdocs/langs/ur_PK/errors.lang
@@ -1,329 +1,330 @@
 # Dolibarr language file - Source file is en_US - errors
 
 # No errors
-NoErrorCommitIsDone=No error, we commit
+NoErrorCommitIsDone=کوئی غلطی نہیں، ہم ارتکاب کرتے ہیں۔
 # Errors
-ErrorButCommitIsDone=Errors found but we validate despite this
-ErrorBadEMail=Email %s is incorrect
-ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
-ErrorBadUrl=Url %s is incorrect
-ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
-ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
-ErrorLoginAlreadyExists=Login %s already exists.
-ErrorGroupAlreadyExists=Group %s already exists.
-ErrorEmailAlreadyExists=Email %s already exists.
-ErrorRecordNotFound=Record not found.
-ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
-ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
-ErrorFailToRenameFile=Failed to rename file '<b>%s</b>' into '<b>%s</b>'.
-ErrorFailToDeleteFile=Failed to remove file '<b>%s</b>'.
-ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
-ErrorFailToRenameDir=Failed to rename directory '<b>%s</b>' into '<b>%s</b>'.
-ErrorFailToCreateDir=Failed to create directory '<b>%s</b>'.
-ErrorFailToDeleteDir=Failed to delete directory '<b>%s</b>'.
-ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
-ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
-ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as contact for this type.
-ErrorCashAccountAcceptsOnlyCashMoney=This bank account is a cash account, so it accepts payments of type cash only.
-ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be different.
-ErrorBadThirdPartyName=Bad value for third-party name
-ErrorProdIdIsMandatory=The %s is mandatory
-ErrorBadCustomerCodeSyntax=Bad syntax for customer code
-ErrorBadBarCodeSyntax=Bad syntax for barcode. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
-ErrorCustomerCodeRequired=Customer code required
-ErrorBarCodeRequired=Barcode required
-ErrorCustomerCodeAlreadyUsed=Customer code already used
-ErrorBarCodeAlreadyUsed=Barcode already used
-ErrorPrefixRequired=Prefix required
-ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
-ErrorSupplierCodeRequired=Vendor code required
-ErrorSupplierCodeAlreadyUsed=Vendor code already used
-ErrorBadParameters=Bad parameters
-ErrorWrongParameters=Wrong or missing parameters
-ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
-ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
-ErrorBadDateFormat=Value '%s' has wrong date format
-ErrorWrongDate=Date is not correct!
-ErrorFailedToWriteInDir=Failed to write in directory %s
-ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
-ErrorUserCannotBeDelete=User cannot be deleted. Maybe it is associated to Dolibarr entities.
-ErrorFieldsRequired=Some required fields have been left blank.
-ErrorSubjectIsRequired=The email subject is required
-ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
-ErrorNoMailDefinedForThisUser=No mail defined for this user
-ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
-ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
-ErrorTopMenuMustHaveAParentWithId0=A menu of type 'Top' can't have a parent menu. Put 0 in parent menu or choose a menu of type 'Left'.
-ErrorLeftMenuMustHaveAParentId=A menu of type 'Left' must have a parent id.
-ErrorFileNotFound=File <b>%s</b> not found (Bad path, wrong permissions or access denied by PHP openbasedir or safe_mode parameter)
-ErrorDirNotFound=Directory <b>%s</b> not found (Bad path, wrong permissions or access denied by PHP openbasedir or safe_mode parameter)
-ErrorFunctionNotAvailableInPHP=Function <b>%s</b> is required for this feature but is not available in this version/setup of PHP.
-ErrorDirAlreadyExists=A directory with this name already exists.
-ErrorFileAlreadyExists=A file with this name already exists.
-ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
-ErrorPartialFile=File not received completely by server.
-ErrorNoTmpDir=Temporary directy %s does not exists.
-ErrorUploadBlockedByAddon=Upload blocked by a PHP/Apache plugin.
-ErrorFileSizeTooLarge=File size is too large.
-ErrorFieldTooLong=Field %s is too long.
-ErrorSizeTooLongForIntType=Size too long for int type (%s digits maximum)
-ErrorSizeTooLongForVarcharType=Size too long for string type (%s chars maximum)
-ErrorNoValueForSelectType=Please fill value for select list
-ErrorNoValueForCheckBoxType=Please fill value for checkbox list
-ErrorNoValueForRadioType=Please fill value for radio list
-ErrorBadFormatValueList=The list value cannot have more than one comma: <u>%s</u>, but need at least one: key,value
-ErrorFieldCanNotContainSpecialCharacters=The field <b>%s</b> must not contains special characters.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=The field <b>%s</b> must not contain special characters, nor upper case characters and cannot contain only numbers.
-ErrorFieldMustHaveXChar=The field <b>%s</b> must have at least %s characters.
-ErrorNoAccountancyModuleLoaded=No accountancy module activated
-ErrorExportDuplicateProfil=This profile name already exists for this export set.
-ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
-ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
-ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
-ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
-ErrorRecordHasChildren=Failed to delete record since it has some child records.
-ErrorRecordHasAtLeastOneChildOfType=Object %s has at least one child of type %s
-ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into another object.
-ErrorModuleRequireJavascript=Javascript must not be disabled to have this feature working. To enable/disable Javascript, go to menu Home->Setup->Display.
-ErrorPasswordsMustMatch=Both typed passwords must match each other
-ErrorContactEMail=A technical error occured. Please, contact administrator to following email <b>%s</b> and provide the error code <b>%s</b> in your message, or add a screen copy of this page.
-ErrorWrongValueForField=Field <b>%s</b>: '<b>%s</b>' does not match regex rule <b>%s</b>
-ErrorFieldValueNotIn=Field <b>%s</b>: '<b>%s</b>' is not a value found in field <b>%s</b> of <b>%s</b>
-ErrorFieldRefNotIn=Field <b>%s</b>: '<b>%s</b>' is not a <b>%s</b> existing ref
-ErrorsOnXLines=%s errors found
-ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus)
-ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field "%s"
-ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
-ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
-ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
-ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
-ErrorBadMask=Error on mask
-ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
-ErrorBadMaskBadRazMonth=Error, bad reset value
-ErrorMaxNumberReachForThisMask=Maximum number reached for this mask
-ErrorCounterMustHaveMoreThan3Digits=Counter must have more than 3 digits
-ErrorSelectAtLeastOne=Error, select at least one entry.
-ErrorDeleteNotPossibleLineIsConsolidated=Delete not possible because record is linked to a bank transaction that is conciliated
-ErrorProdIdAlreadyExist=%s is assigned to another third
-ErrorFailedToSendPassword=Failed to send password
-ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEXMLLOAD_DEBUG if error messages does not provide enough information.
-ErrorForbidden=Access denied.<br>You try to access to a page, area or feature of a disabled module or without being in an authenticated session or that is not allowed to your user.
-ErrorForbidden2=Permission for this login can be defined by your Dolibarr administrator from menu %s->%s.
-ErrorForbidden3=It seems that Dolibarr is not used through an authenticated session. Take a look at Dolibarr setup documentation to know how to manage authentications (htaccess, mod_auth or other...).
-ErrorForbidden4=Note: clear your browser cookies to destroy existing sessions for this login.
-ErrorNoImagickReadimage=Class Imagick is not found in this PHP. No preview can be available. Administrators can disable this tab from menu Setup - Display.
-ErrorRecordAlreadyExists=Record already exists
-ErrorLabelAlreadyExists=This label already exists
-ErrorCantReadFile=Failed to read file '%s'
-ErrorCantReadDir=Failed to read directory '%s'
-ErrorBadLoginPassword=Bad value for login or password
-ErrorLoginDisabled=Your account has been disabled
-ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server user. Check also the command is not protected on shell level by a security layer like apparmor.
-ErrorFailedToChangePassword=Failed to change password
-ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
-ErrorLoginHasNoEmail=This user has no email address. Process aborted.
-ErrorBadValueForCode=Bad value for security code. Try again with new value...
-ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative
-ErrorFieldCantBeNegativeOnInvoice=Field <strong>%s</strong> cannot be negative on this type of invoice. If you need to add a discount line, just create the discount first (from field '%s' in thirdparty card) and apply it to the invoice.
-ErrorLinesCantBeNegativeForOneVATRate=Total of lines (net of tax) can't be negative for a given not null VAT rate (Found a negative total for VAT rate <b>%s</b>%%).
-ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a deposit. You will face problems when you will need to consume the deposit in final invoice if you do so.
-ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
-ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
-ErrorNoActivatedBarcode=No barcode type activated
-ErrUnzipFails=Failed to unzip %s with ZipArchive
-ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
-ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
-ErrorModuleFileRequired=You must select a Dolibarr module package file
-ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
-ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP base
-ErrorFailedToRemoveToMailmanList=Failed to remove record %s to Mailman list %s or SPIP base
-ErrorNewValueCantMatchOldValue=New value can't be equal to old one
-ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
-ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
-ErrorFailedToAddContact=Failed to add contact
-ErrorDateMustBeBeforeToday=The date must be lower than today
-ErrorDateMustBeInFuture=The date must be greater than today
-ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
-ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use this feature.
-ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
-ErrorWarehouseMustDiffers=Source and target warehouses must differs
-ErrorBadFormat=Bad format!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
-ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
-ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank entry that was reconciled
-ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Paid
-ErrorPriceExpression1=Cannot assign to constant '%s'
-ErrorPriceExpression2=Cannot redefine built-in function '%s'
-ErrorPriceExpression3=Undefined variable '%s' in function definition
-ErrorPriceExpression4=Illegal character '%s'
-ErrorPriceExpression5=Unexpected '%s'
-ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
-ErrorPriceExpression8=Unexpected operator '%s'
-ErrorPriceExpression9=An unexpected error occured
-ErrorPriceExpression10=Operator '%s' lacks operand
-ErrorPriceExpression11=Expecting '%s'
-ErrorPriceExpression14=Division by zero
-ErrorPriceExpression17=Undefined variable '%s'
-ErrorPriceExpression19=Expression not found
-ErrorPriceExpression20=Empty expression
-ErrorPriceExpression21=Empty result '%s'
-ErrorPriceExpression22=Negative result '%s'
-ErrorPriceExpression23=Unknown or non set variable '%s' in %s
-ErrorPriceExpression24=Variable '%s' exists but has no value
-ErrorPriceExpressionInternal=Internal error '%s'
-ErrorPriceExpressionUnknown=Unknown error '%s'
-ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
-ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on product '%s' requiring lot/serial information
-ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified (approved or denied) before being allowed to do this action
-ErrorCantSetReceptionToTotalDoneWithReceptionDenied=All recorded receptions must first be verified (approved) before being allowed to do this action
-ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
-ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
-ErrorGlobalVariableUpdater2=Missing parameter '%s'
-ErrorGlobalVariableUpdater3=The requested data was not found in result
-ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
-ErrorGlobalVariableUpdater5=No global variable selected
-ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
-ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter it's status.
-ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
-ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
-ErrorSavingChanges=An error has occurred when saving the changes
-ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
-ErrorFileMustHaveFormat=File must have format %s
-ErrorFilenameCantStartWithDot=Filename can't start with a '.'
-ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
-ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
-ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
-ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
-ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s to add it into a new shipment.
-ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
-ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
-ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
-ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
-ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
-ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
-ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
-ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
-ErrorTaskAlreadyAssigned=Task already assigned to user
-ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
-ErrorModuleFileSeemsToHaveAWrongFormat2=At least one mandatory directory must exists into zip of module: <strong>%s</strong> or <strong>%s</strong>
-ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
-ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
-ErrorNoWarehouseDefined=Error, no warehouses defined.
-ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
-ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
-ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=Mass validation is not possible when option to increase/decrease stock is set on this action (you must validate one by one so you can define the warehouse to increase/decrease)
-ErrorObjectMustHaveStatusDraftToBeValidated=Object %s must have status 'Draft' to be validated.
-ErrorObjectMustHaveLinesToBeValidated=Object %s must have lines to be validated.
-ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Only validated invoices can be sent using the "Send by email" mass action.
-ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a predefined product or not
-ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
-ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
-ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
-ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
-ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
-ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
-ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
-ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
-ErrorURLMustEndWith=URL %s must end %s
-ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
-ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
-ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
-ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
-ErrorSearchCriteriaTooSmall=Search criteria too small.
-ErrorObjectMustHaveStatusActiveToBeDisabled=Objects must have status 'Active' to be disabled
-ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Objects must have status 'Draft' or 'Disabled' to be enabled
-ErrorNoFieldWithAttributeShowoncombobox=No fields has property 'showoncombobox' into definition of object '%s'. No way to show the combolist.
-ErrorFieldRequiredForProduct=Field '%s' is required for product %s
-ProblemIsInSetupOfTerminal=Problem is in setup of terminal %s.
-ErrorAddAtLeastOneLineFirst=Add at least one line first
-ErrorRecordAlreadyInAccountingDeletionNotPossible=Error, record is already transferred in accounting, deletion is not possible.
-ErrorLanguageMandatoryIfPageSetAsTranslationOfAnother=Error, language is mandatory if you set the page as a translation of another one.
-ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated page is same than this one.
-ErrorBatchNoFoundForProductInWarehouse=No lot/serial found for product "%s" in warehouse "%s".
-ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this lot/serial for product "%s" in warehouse "%s".
-ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
-ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
-ErrorReplaceStringEmpty=Error, the string to replace into is empty
-ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
-ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
-ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
-ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
-ErrorLoginDateValidity=Error, this login is outside the validity date range
-ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
-ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
-ErrorNotAvailableWithThisDistribution=Not available with this distribution
-ErrorPublicInterfaceNotEnabled=Public interface was not enabled
-ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
-ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
-ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
-ErrorDateIsInFuture=Error, the date can't be in the future
-ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
-ErrorAPercentIsRequired=Error, please fill in the percentage correctly
-ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
-ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
-ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice=Duration not defined on service. No way to calculate the hourly price.
-ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
-ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
-CheckVersionFail=Version check fail
-ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
-ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
-ErrorIsNotADraft=%s is not a draft
-ErrorExecIdFailed=Can't execute command "id"
+ErrorButCommitIsDone=غلطیاں ملی ہیں لیکن ہم اس کے باوجود تصدیق کرتے ہیں۔
+ErrorBadEMail=ای میل %s غلط ہے۔
+ErrorBadMXDomain=ای میل %s غلط معلوم ہوتا ہے (ڈومین کا کوئی درست MX ریکارڈ نہیں ہے)
+ErrorBadUrl=یو آر ایل %s غلط ہے۔
+ErrorBadValueForParamNotAString=آپ کے پیرامیٹر کی خراب قدر۔ یہ عام طور پر اس وقت شامل ہوتا ہے جب ترجمہ غائب ہو۔
+ErrorRefAlreadyExists=حوالہ <b> %s </b> پہلے سے موجود ہے۔
+ErrorLoginAlreadyExists=لاگ ان %s پہلے سے موجود ہے۔
+ErrorGroupAlreadyExists=گروپ %s پہلے سے موجود ہے۔
+ErrorEmailAlreadyExists=ای میل %s پہلے سے موجود ہے۔
+ErrorRecordNotFound=ریکارڈ نہیں ملا۔
+ErrorFailToCopyFile=فائل '<b> %s </b>' کو '<b> %s a09a4b739f18f' میں کاپی کرنے میں ناکام۔
+ErrorFailToCopyDir=ڈائرکٹری ' <b> %s </b>' کو '<b> %s a09a4b739f18f' میں کاپی کرنے میں ناکام۔
+ErrorFailToRenameFile=فائل کا نام '<b> %s </b>' کو '<b> %s a09a4b739f17' میں تبدیل کرنے میں ناکام۔
+ErrorFailToDeleteFile=فائل '<b> %s </b>' کو ہٹانے میں ناکام۔
+ErrorFailToCreateFile=فائل '<b> %s </b>' بنانے میں ناکام۔
+ErrorFailToRenameDir=ڈائریکٹری ' <b> %s </b>' کو '<b> %s a09a4b739f17' میں تبدیل کرنے میں ناکام۔
+ErrorFailToCreateDir=ڈائریکٹری ' <b> %s </b>' بنانے میں ناکام۔
+ErrorFailToDeleteDir=ڈائریکٹری '<b> %s </b>' کو حذف کرنے میں ناکام۔
+ErrorFailToMakeReplacementInto=فائل '<b> %s </b>' میں تبدیل کرنے میں ناکام۔
+ErrorFailToGenerateFile=فائل '<b> %s </b>' بنانے میں ناکام۔
+ErrorThisContactIsAlreadyDefinedAsThisType=یہ رابطہ پہلے ہی اس قسم کے رابطے کے طور پر بیان کیا گیا ہے۔
+ErrorCashAccountAcceptsOnlyCashMoney=یہ بینک اکاؤنٹ ایک کیش اکاؤنٹ ہے، اس لیے یہ صرف قسم کی نقدی کی ادائیگی قبول کرتا ہے۔
+ErrorFromToAccountsMustDiffers=ذرائع اور اہداف کے بینک اکاؤنٹس مختلف ہونے چاہئیں۔
+ErrorBadThirdPartyName=فریق ثالث کے نام کی خراب قدر
+ErrorProdIdIsMandatory=%s لازمی ہے۔
+ErrorBadCustomerCodeSyntax=کسٹمر کوڈ کے لیے خراب نحو
+ErrorBadBarCodeSyntax=بارکوڈ کے لیے خراب نحو۔ ہوسکتا ہے کہ آپ نے برا کوڈ کی قسم سیٹ کی ہو یا آپ نے نمبرنگ کے لیے بارکوڈ ماسک کی وضاحت کی ہو جو اسکین کردہ ویلیو سے مماثل نہ ہو۔
+ErrorCustomerCodeRequired=کسٹمر کوڈ درکار ہے۔
+ErrorBarCodeRequired=بارکوڈ درکار ہے۔
+ErrorCustomerCodeAlreadyUsed=گاہک کوڈ پہلے ہی استعمال ہو چکا ہے۔
+ErrorBarCodeAlreadyUsed=بارکوڈ پہلے سے استعمال کیا گیا ہے۔
+ErrorPrefixRequired=سابقہ مطلوب ہے۔
+ErrorBadSupplierCodeSyntax=وینڈر کوڈ کے لیے خراب نحو
+ErrorSupplierCodeRequired=وینڈر کوڈ درکار ہے۔
+ErrorSupplierCodeAlreadyUsed=وینڈر کوڈ پہلے ہی استعمال ہو چکا ہے۔
+ErrorBadParameters=خراب پیرامیٹرز
+ErrorWrongParameters=غلط یا غائب پیرامیٹرز
+ErrorBadValueForParameter=پیرامیٹر '%s' کے لیے غلط قدر '%s'
+ErrorBadImageFormat=امیج فائل میں معاون فارمیٹ نہیں ہے (آپ کا پی ایچ پی اس فارمیٹ کی تصاویر کو تبدیل کرنے کے فنکشنز کو سپورٹ نہیں کرتا ہے)
+ErrorBadDateFormat=قدر '%s' کی تاریخ کی شکل غلط ہے۔
+ErrorWrongDate=تاریخ درست نہیں ہے!
+ErrorFailedToWriteInDir=ڈائریکٹری %s میں لکھنے میں ناکام
+ErrorFoundBadEmailInFile=فائل میں %s لائنوں کے لیے غلط ای میل نحو ملا (مثال کی لائن %s with email=%s)
+ErrorUserCannotBeDelete=صارف کو حذف نہیں کیا جا سکتا۔ ہوسکتا ہے کہ اس کا تعلق Dolibarr اداروں سے ہو۔
+ErrorFieldsRequired=کچھ مطلوبہ فیلڈز کو خالی چھوڑ دیا گیا ہے۔
+ErrorSubjectIsRequired=ای میل کا مضمون درکار ہے۔
+ErrorFailedToCreateDir=ڈائریکٹری بنانے میں ناکام۔ چیک کریں کہ ویب سرور صارف کو Dolibarr دستاویزات کی ڈائرکٹری میں لکھنے کی اجازت ہے۔ اگر اس پی ایچ پی پر پیرامیٹر <b> safe_mode </b> فعال ہے تو چیک کریں کہ Dolibarr php فائلیں ویب سرور صارف (یا گروپ) کی ملکیت ہیں۔
+ErrorNoMailDefinedForThisUser=اس صارف کے لیے کوئی میل متعین نہیں ہے۔
+ErrorSetupOfEmailsNotComplete=ای میلز کا سیٹ اپ مکمل نہیں ہے۔
+ErrorFeatureNeedJavascript=اس فیچر کو کام کرنے کے لیے جاوا اسکرپٹ کو چالو کرنے کی ضرورت ہے۔ اسے سیٹ اپ - ڈسپلے میں تبدیل کریں۔
+ErrorTopMenuMustHaveAParentWithId0='ٹاپ' قسم کے مینو میں پیرنٹ مینو نہیں ہو سکتا۔ پیرنٹ مینو میں 0 ڈالیں یا 'بائیں' قسم کا مینو منتخب کریں۔
+ErrorLeftMenuMustHaveAParentId='بائیں' قسم کے مینو میں والدین کی شناخت ہونی چاہیے۔
+ErrorFileNotFound=فائل <b> %s </b> نہیں ملی (خراب راستہ، غلط اجازت یا رسائی پی ایچ پی کے اوپن بیسڈیر یا سیف_موڈ پیرامیٹر کے ذریعہ مسترد)
+ErrorDirNotFound=ڈائرکٹری <b> %s </b> نہیں ملی (خراب راستہ، غلط اجازت یا رسائی پی ایچ پی کے اوپن بیسڈیر یا سیف موڈ پیرامیٹر سے انکار)
+ErrorFunctionNotAvailableInPHP=فنکشن <b> %s </b> اس خصوصیت کے لیے درکار ہے لیکن پی ایچ پی کے اس ورژن/سیٹ اپ میں دستیاب نہیں ہے۔
+ErrorDirAlreadyExists=اس نام کی ڈائرکٹری پہلے سے موجود ہے۔
+ErrorFileAlreadyExists=اس نام کی فائل پہلے سے موجود ہے۔
+ErrorDestinationAlreadyExists=<b> %s </b> نام کی ایک اور فائل پہلے سے موجود ہے۔
+ErrorPartialFile=فائل سرور کے ذریعہ مکمل طور پر موصول نہیں ہوئی۔
+ErrorNoTmpDir=عارضی ڈائرکٹری %s موجود نہیں ہے۔
+ErrorUploadBlockedByAddon=اپ لوڈ کو PHP/Apache پلگ ان کے ذریعے مسدود کر دیا گیا ہے۔
+ErrorFileSizeTooLarge=فائل کا سائز بہت بڑا ہے۔
+ErrorFieldTooLong=فیلڈ %s بہت لمبا ہے۔
+ErrorSizeTooLongForIntType=int قسم کے لیے سائز بہت لمبا ہے (%s ہندسے زیادہ سے زیادہ)
+ErrorSizeTooLongForVarcharType=سٹرنگ کی قسم کے لیے سائز بہت لمبا ہے (%s حروف زیادہ سے زیادہ)
+ErrorNoValueForSelectType=براہ کرم منتخب فہرست کے لیے قدر بھریں۔
+ErrorNoValueForCheckBoxType=براہ کرم چیک باکس کی فہرست کے لیے قدر بھریں۔
+ErrorNoValueForRadioType=براہ کرم ریڈیو لسٹ کے لیے قدر بھریں۔
+ErrorBadFormatValueList=فہرست کی قدر میں ایک سے زیادہ کوما نہیں ہو سکتا: <u> %s </u>، لیکن کم از کم ایک کی ضرورت ہے: کلید، قدر
+ErrorFieldCanNotContainSpecialCharacters=فیلڈ <b> %s </b> خاص حروف پر مشتمل نہیں ہونا چاہیے۔
+ErrorFieldCanNotContainSpecialNorUpperCharacters=فیلڈ <b> %s </b> خصوصی حروف پر مشتمل نہیں ہونا چاہئے اور نہ ہی بڑے حروف پر مشتمل ہونا چاہئے اور صرف اعداد پر مشتمل نہیں ہونا چاہئے۔
+ErrorFieldMustHaveXChar=فیلڈ <b> %s </b> میں کم از کم %s حروف ہونے چاہئیں۔
+ErrorNoAccountancyModuleLoaded=کوئی اکاؤنٹنسی ماڈیول فعال نہیں ہے۔
+ErrorExportDuplicateProfil=اس برآمدی سیٹ کے لیے یہ پروفائل نام پہلے سے موجود ہے۔
+ErrorLDAPSetupNotComplete=Dolibarr-LDAP مماثلت مکمل نہیں ہے۔
+ErrorLDAPMakeManualTest=ایک .ldif فائل ڈائرکٹری %s میں تیار کی گئی ہے۔ غلطیوں کے بارے میں مزید معلومات حاصل کرنے کے لیے اسے کمانڈ لائن سے دستی طور پر لوڈ کرنے کی کوشش کریں۔
+ErrorCantSaveADoneUserWithZeroPercentage="اسٹیٹس ناٹ اسٹارٹ" کے ساتھ کسی ایکشن کو محفوظ نہیں کیا جا سکتا اگر فیلڈ "ڈون بائے" بھی بھری ہو۔
+ErrorRefAlreadyExists=حوالہ <b> %s </b> پہلے سے موجود ہے۔
+ErrorPleaseTypeBankTransactionReportName=براہ کرم بینک اسٹیٹمنٹ کا نام درج کریں جہاں اندراج کی اطلاع دی جانی ہے (فارمیٹ YYYYMM یا YYYYMMDD)
+ErrorRecordHasChildren=ریکارڈ کو حذف کرنے میں ناکام کیونکہ اس میں کچھ چائلڈ ریکارڈز ہیں۔
+ErrorRecordHasAtLeastOneChildOfType=آبجیکٹ %s میں %s قسم کا کم از کم ایک بچہ ہے
+ErrorRecordIsUsedCantDelete=ریکارڈ کو حذف نہیں کیا جا سکتا۔ یہ پہلے ہی کسی اور چیز میں استعمال یا شامل ہے۔
+ErrorModuleRequireJavascript=اس فیچر کو کام کرنے کے لیے جاوا اسکرپٹ کو غیر فعال نہیں کیا جانا چاہیے۔ جاوا اسکرپٹ کو فعال/غیر فعال کرنے کے لیے، مینو ہوم-> سیٹ اپ-> ڈسپلے پر جائیں۔
+ErrorPasswordsMustMatch=دونوں ٹائپ شدہ پاس ورڈ ایک دوسرے سے مماثل ہونے چاہئیں
+ErrorContactEMail=ایک تکنیکی خرابی پیش آگئی۔ براہ کرم، درج ذیل ای میل کے لیے منتظم سے رابطہ کریں
+ErrorWrongValueForField=فیلڈ <b> %s </b> : '<b> %s a09a4b739f17f8zec0839f17f8zec083839f17f8zexa83fz39fz7839f49fz083839f49fz0839fz7839f49fz0839fz7fz19 سے مماثل ہے
+ErrorFieldValueNotIn=فیلڈ <b> %s </b>: '<b> %s </b>' ایک قیمت میدان <b> %s </b> میں پائے کا نہیں ہے <b> %s </b>
+ErrorFieldRefNotIn=فیلڈ <b> %s </b> : '<b> %s </b>839f17f8z080839f739f17fz087839fz08739fz087fz0839fz087fz39fz087fz087fz087fz07fz087f49fz07fz09fz0839f17fz087fz087fz07fz07fz0839f17fz07fz087fz0839f17fz087fz.
+ErrorsOnXLines=%s غلطیاں پائی گئیں۔
+ErrorFileIsInfectedWithAVirus=اینٹی وائرس پروگرام فائل کی توثیق کرنے کے قابل نہیں تھا (فائل کسی وائرس سے متاثر ہو سکتی ہے)
+ErrorSpecialCharNotAllowedForField=فیلڈ "%s" کے لیے خصوصی حروف کی اجازت نہیں ہے
+ErrorNumRefModel=ڈیٹا بیس (%s) میں ایک حوالہ موجود ہے اور اس نمبر کے اصول کے ساتھ مطابقت نہیں رکھتا ہے۔ اس ماڈیول کو چالو کرنے کے لیے ریکارڈ یا نام بدل کر حوالہ ہٹا دیں۔
+ErrorQtyTooLowForThisSupplier=اس وینڈر کے لیے مقدار بہت کم ہے یا اس وینڈر کے لیے اس پروڈکٹ پر کوئی قیمت متعین نہیں ہے۔
+ErrorOrdersNotCreatedQtyTooLow=بہت کم مقدار کی وجہ سے کچھ آرڈرز نہیں بنائے گئے ہیں۔
+ErrorModuleSetupNotComplete=ماڈیول %s کا سیٹ اپ نامکمل لگتا ہے۔ ہوم پر جائیں - سیٹ اپ - مکمل کرنے کے لیے ماڈیولز۔
+ErrorBadMask=ماسک میں خرابی۔
+ErrorBadMaskFailedToLocatePosOfSequence=غلطی، ترتیب نمبر کے بغیر ماسک
+ErrorBadMaskBadRazMonth=خرابی، خراب ری سیٹ قدر
+ErrorMaxNumberReachForThisMask=اس ماسک کے لیے زیادہ سے زیادہ تعداد تک پہنچ گئی ہے۔
+ErrorCounterMustHaveMoreThan3Digits=کاؤنٹر میں 3 ہندسوں سے زیادہ ہونا ضروری ہے۔
+ErrorSelectAtLeastOne=خرابی، کم از کم ایک اندراج منتخب کریں۔
+ErrorDeleteNotPossibleLineIsConsolidated=حذف کرنا ممکن نہیں ہے کیونکہ ریکارڈ ایک بینک ٹرانزیکشن سے منسلک ہے جو کہ مفاہمت کے ساتھ ہے۔
+ErrorProdIdAlreadyExist=%s دوسرے تیسرے کو تفویض کیا گیا ہے۔
+ErrorFailedToSendPassword=پاس ورڈ بھیجنے میں ناکام
+ErrorFailedToLoadRSSFile=RSS فیڈ حاصل کرنے میں ناکام۔ مستقل MAIN_SIMPLEXMLLOAD_DEBUG شامل کرنے کی کوشش کریں اگر غلطی کے پیغامات کافی معلومات فراہم نہیں کرتے ہیں۔
+ErrorForbidden=رسائی مسترد کر دی. <br> آپ کسی غیر فعال ماڈیول کے صفحہ، علاقے یا خصوصیت تک رسائی حاصل کرنے کی کوشش کرتے ہیں یا بغیر تصدیق شدہ سیشن میں شامل ہوتے ہیں یا آپ کے صارف کو اس کی اجازت نہیں ہے۔
+ErrorForbidden2=اس لاگ ان کے لیے اجازت کی تعریف آپ کے Dolibarr منتظم مینو %s->%s سے کر سکتے ہیں۔
+ErrorForbidden3=ایسا لگتا ہے کہ Dolibarr کو مستند سیشن کے ذریعے استعمال نہیں کیا گیا ہے۔ Dolibarr سیٹ اپ دستاویزات پر ایک نظر ڈالیں تاکہ یہ معلوم ہو سکے کہ تصدیق کیسے کریں (htaccess، mod_auth یا دیگر...)۔
+ErrorForbidden4=نوٹ: اس لاگ ان کے لیے موجودہ سیشنز کو تباہ کرنے کے لیے اپنے براؤزر کی کوکیز کو صاف کریں۔
+ErrorNoImagickReadimage=کلاس امیجک اس پی ایچ پی میں نہیں ملتی ہے۔ کوئی پیش نظارہ دستیاب نہیں ہوسکتا ہے۔ منتظمین مینو سیٹ اپ - ڈسپلے سے اس ٹیب کو غیر فعال کر سکتے ہیں۔
+ErrorRecordAlreadyExists=ریکارڈ پہلے سے موجود ہے۔
+ErrorLabelAlreadyExists=یہ لیبل پہلے سے موجود ہے۔
+ErrorCantReadFile=فائل '%s' پڑھنے میں ناکام
+ErrorCantReadDir=ڈائریکٹری '%s' پڑھنے میں ناکام
+ErrorBadLoginPassword=لاگ ان یا پاس ورڈ کی خراب قدر
+ErrorLoginDisabled=آپ کا اکاؤنٹ غیر فعال کر دیا گیا ہے۔
+ErrorFailedToRunExternalCommand=بیرونی کمانڈ چلانے میں ناکام۔ چیک کریں کہ یہ آپ کے پی ایچ پی سرور صارف کے ذریعہ دستیاب اور چلانے کے قابل ہے۔ یہ بھی چیک کریں کہ کمانڈ شیل کی سطح پر حفاظتی پرت جیسے اپارمر کے ذریعہ محفوظ نہیں ہے۔
+ErrorFailedToChangePassword=پاس ورڈ تبدیل کرنے میں ناکام
+ErrorLoginDoesNotExists=لاگ ان <b> %s </b> والا صارف نہیں مل سکا۔
+ErrorLoginHasNoEmail=اس صارف کا کوئی ای میل پتہ نہیں ہے۔ عمل روک دیا گیا۔
+ErrorBadValueForCode=سیکیورٹی کوڈ کی خراب قدر۔ نئی قدر کے ساتھ دوبارہ کوشش کریں...
+ErrorBothFieldCantBeNegative=فیلڈز %s اور %s دونوں منفی نہیں ہو سکتے
+ErrorFieldCantBeNegativeOnInvoice=فیلڈ <strong> %s </strong> اس قسم کے انوائس پر منفی نہیں ہو سکتا۔ اگر آپ کو ڈسکاؤنٹ لائن شامل کرنے کی ضرورت ہے تو پہلے رعایت بنائیں (تیسرے فریق کارڈ میں '%s' فیلڈ سے) اور اسے انوائس پر لاگو کریں۔
+ErrorLinesCantBeNegativeForOneVATRate=لائنوں کی کل (ٹیکس کا خالص) دی گئی غیر صفر VAT کی شرح کے لیے منفی نہیں ہو سکتا (VAT کی شرح <b> %s </b> %% کے لیے منفی ٹوٹل ملا)۔
+ErrorLinesCantBeNegativeOnDeposits=ڈپازٹ میں لائنیں منفی نہیں ہو سکتیں۔ اگر آپ ایسا کرتے ہیں تو آپ کو اس وقت مسائل کا سامنا کرنا پڑے گا جب آپ کو حتمی انوائس میں ڈپازٹ استعمال کرنے کی ضرورت ہوگی۔
+ErrorQtyForCustomerInvoiceCantBeNegative=کسٹمر انوائس میں لائن کی مقدار منفی نہیں ہو سکتی
+ErrorWebServerUserHasNotPermission=ویب سرور کو چلانے کے لیے استعمال ہونے والے صارف اکاؤنٹ <b> %s </b> کو اس کی اجازت نہیں ہے۔
+ErrorNoActivatedBarcode=بار کوڈ کی کوئی قسم فعال نہیں ہے۔
+ErrUnzipFails=ZipArchive کے ساتھ %s کو ان زپ کرنے میں ناکام
+ErrNoZipEngine=اس پی ایچ پی میں %s فائل کو زپ/انزپ کرنے کے لیے کوئی انجن نہیں ہے
+ErrorFileMustBeADolibarrPackage=فائل %s Dolibarr zip پیکیج ہونی چاہیے۔
+ErrorModuleFileRequired=آپ کو ایک Dolibarr ماڈیول پیکیج فائل کو منتخب کرنا ہوگا۔
+ErrorPhpCurlNotInstalled=PHP CURL انسٹال نہیں ہے، یہ Paypal کے ساتھ بات کرنے کے لیے ضروری ہے۔
+ErrorFailedToAddToMailmanList=میل مین لسٹ %s یا SPIP بیس میں ریکارڈ %s شامل کرنے میں ناکام
+ErrorFailedToRemoveToMailmanList=میل مین لسٹ %s یا SPIP بیس سے ریکارڈ %s کو ہٹانے میں ناکام
+ErrorNewValueCantMatchOldValue=نئی قدر پرانی کے برابر نہیں ہو سکتی
+ErrorFailedToValidatePasswordReset=پاس ورڈ دوبارہ شروع کرنے میں ناکام۔ ہو سکتا ہے دوبارہ شروع کر دیا گیا ہو (یہ لنک صرف ایک بار استعمال کیا جا سکتا ہے)۔ اگر نہیں، تو دوبارہ شروع کرنے کے عمل کو دوبارہ شروع کرنے کی کوشش کریں۔
+ErrorToConnectToMysqlCheckInstance=ڈیٹا بیس سے جڑنا ناکام ہوجاتا ہے۔ چیک کریں کہ ڈیٹا بیس سرور چل رہا ہے (مثال کے طور پر، mysql/mariadb کے ساتھ، آپ اسے 'sudo service mysql start' کے ساتھ کمانڈ لائن سے لانچ کر سکتے ہیں)۔
+ErrorFailedToAddContact=رابطہ شامل کرنے میں ناکام
+ErrorDateMustBeBeforeToday=تاریخ آج سے کم ہونی چاہیے۔
+ErrorDateMustBeInFuture=تاریخ آج سے زیادہ ہونی چاہیے۔
+ErrorPaymentModeDefinedToWithoutSetup=ادائیگی کا موڈ %s ٹائپ کرنے کے لیے سیٹ کیا گیا تھا لیکن اس ادائیگی کے موڈ کے لیے ظاہر کرنے کے لیے معلومات کی وضاحت کرنے کے لیے ماڈیول انوائس کا سیٹ اپ مکمل نہیں کیا گیا تھا۔
+ErrorPHPNeedModule=خرابی، اس خصوصیت کو استعمال کرنے کے لیے آپ کے پی ایچ پی میں ماڈیول <b> %s </b> انسٹال ہونا چاہیے۔
+ErrorOpenIDSetupNotComplete=آپ OpenID کی توثیق کی اجازت دینے کے لیے Dolibarr config فائل ترتیب دیتے ہیں، لیکن OpenID سروس کے URL کو مستقل %s میں بیان نہیں کیا گیا ہے۔
+ErrorWarehouseMustDiffers=ماخذ اور ہدف کے گوداموں میں فرق ہونا چاہیے۔
+ErrorBadFormat=خراب فارمیٹ!
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=خرابی، یہ رکن ابھی تک کسی تیسرے فریق سے منسلک نہیں ہے۔ انوائس کے ساتھ سبسکرپشن بنانے سے پہلے ممبر کو کسی موجودہ تھرڈ پارٹی سے لنک کریں یا ایک نیا تھرڈ پارٹی بنائیں۔
+ErrorThereIsSomeDeliveries=خرابی، اس شپمنٹ سے کچھ ڈیلیوری منسلک ہیں۔ حذف کرنے سے انکار کر دیا۔
+ErrorCantDeletePaymentReconciliated=ایسی ادائیگی کو حذف نہیں کیا جا سکتا جس نے ایک بینک اندراج تیار کیا تھا جس کا مفاہمت کیا گیا تھا۔
+ErrorCantDeletePaymentSharedWithPayedInvoice=ادائیگی کی حیثیت کے ساتھ کم از کم ایک انوائس کے ذریعے اشتراک کردہ ادائیگی کو حذف نہیں کیا جا سکتا
+ErrorPriceExpression1=مستقل '%s' کو تفویض نہیں کیا جا سکتا
+ErrorPriceExpression2=بلٹ ان فنکشن '%s' کی دوبارہ وضاحت نہیں کی جا سکتی
+ErrorPriceExpression3=فنکشن کی تعریف میں غیر متعینہ متغیر '%s'
+ErrorPriceExpression4=غیر قانونی کردار '%s'
+ErrorPriceExpression5=غیر متوقع '%s'
+ErrorPriceExpression6=دلائل کی غلط تعداد (%s دیا گیا، %s متوقع)
+ErrorPriceExpression8=غیر متوقع آپریٹر '%s'
+ErrorPriceExpression9=ایک غیر متوقع خرابی پیش آگئی
+ErrorPriceExpression10=آپریٹر '%s' میں آپرینڈ کی کمی ہے۔
+ErrorPriceExpression11='%s' کی توقع
+ErrorPriceExpression14=صفر سے تقسیم
+ErrorPriceExpression17=غیر متعینہ متغیر '%s'
+ErrorPriceExpression19=اظہار نہیں ملا
+ErrorPriceExpression20=خالی اظہار
+ErrorPriceExpression21=خالی نتیجہ '%s'
+ErrorPriceExpression22=منفی نتیجہ '%s'
+ErrorPriceExpression23=نامعلوم یا غیر سیٹ متغیر '%s' %s میں
+ErrorPriceExpression24=متغیر '%s' موجود ہے لیکن اس کی کوئی قدر نہیں ہے۔
+ErrorPriceExpressionInternal=اندرونی خرابی '%s'
+ErrorPriceExpressionUnknown=نامعلوم خرابی '%s'
+ErrorSrcAndTargetWarehouseMustDiffers=ماخذ اور ہدف کے گوداموں میں فرق ہونا چاہیے۔
+ErrorTryToMakeMoveOnProductRequiringBatchData=پروڈکٹ '%s' پر لاٹ/سیریل معلومات کے بغیر اسٹاک موومنٹ کرنے کی کوشش میں خرابی
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=اس کارروائی کی اجازت دینے سے پہلے تمام ریکارڈ شدہ استقبالیہ کی تصدیق (منظور یا مسترد) ہونی چاہیے
+ErrorCantSetReceptionToTotalDoneWithReceptionDenied=اس کارروائی کی اجازت دینے سے پہلے تمام ریکارڈ شدہ استقبالیہ کی تصدیق (منظور شدہ) ہونی چاہیے۔
+ErrorGlobalVariableUpdater0=HTTP درخواست غلطی '%s' کے ساتھ ناکام ہوگئی
+ErrorGlobalVariableUpdater1=غلط JSON فارمیٹ '%s'
+ErrorGlobalVariableUpdater2=غائب پیرامیٹر '%s'
+ErrorGlobalVariableUpdater3=مطلوبہ ڈیٹا نتیجہ میں نہیں ملا
+ErrorGlobalVariableUpdater4=SOAP کلائنٹ غلطی '%s' کے ساتھ ناکام ہوگیا
+ErrorGlobalVariableUpdater5=کوئی عالمی متغیر منتخب نہیں کیا گیا۔
+ErrorFieldMustBeANumeric=فیلڈ <b> %s </b> ایک عددی قدر ہونی چاہیے
+ErrorMandatoryParametersNotProvided=لازمی پیرامیٹر فراہم نہیں کیا گیا ہے۔
+ErrorOppStatusRequiredIfAmount=آپ نے اس لیڈ کے لیے ایک تخمینہ رقم مقرر کی ہے۔ لہذا آپ کو اس کی حیثیت بھی درج کرنی ہوگی۔
+ErrorFailedToLoadModuleDescriptorForXXX=%s کے لیے ماڈیول ڈسکرپٹر کلاس لوڈ کرنے میں ناکام
+ErrorBadDefinitionOfMenuArrayInModuleDescriptor=ماڈیول ڈسکرپٹر میں مینو ارے کی خراب تعریف (کلیدی fk_menu کے لیے خراب قدر)
+ErrorSavingChanges=تبدیلیوں کو محفوظ کرتے وقت ایک خرابی پیش آگئی ہے۔
+ErrorWarehouseRequiredIntoShipmentLine=جہاز کے لیے لائن پر گودام کی ضرورت ہے۔
+ErrorFileMustHaveFormat=فائل کا فارمیٹ %s ہونا چاہیے۔
+ErrorFilenameCantStartWithDot=فائل کا نام '.' سے شروع نہیں ہو سکتا۔
+ErrorSupplierCountryIsNotDefined=اس وینڈر کے لیے ملک کی وضاحت نہیں کی گئی ہے۔ پہلے اس کو درست کریں۔
+ErrorsThirdpartyMerge=دونوں ریکارڈز کو ضم کرنے میں ناکام۔ درخواست منسوخ کر دی گئی۔
+ErrorStockIsNotEnoughToAddProductOnOrder=پروڈکٹ %s کو نئے آرڈر میں شامل کرنے کے لیے اسٹاک کافی نہیں ہے۔
+ErrorStockIsNotEnoughToAddProductOnInvoice=پروڈکٹ %s کو نئے انوائس میں شامل کرنے کے لیے اسٹاک کافی نہیں ہے۔
+ErrorStockIsNotEnoughToAddProductOnShipment=پروڈکٹ %s کو نئی کھیپ میں شامل کرنے کے لیے اسٹاک کافی نہیں ہے۔
+ErrorStockIsNotEnoughToAddProductOnProposal=پروڈکٹ %s کو نئی تجویز میں شامل کرنے کے لیے اسٹاک کافی نہیں ہے۔
+ErrorFailedToLoadLoginFileForMode=موڈ '%s' کے لیے لاگ ان کلید حاصل کرنے میں ناکام۔
+ErrorModuleNotFound=ماڈیول کی فائل نہیں ملی۔
+ErrorFieldAccountNotDefinedForBankLine=اکاؤنٹنگ اکاؤنٹ کی قدر سورس لائن id %s (%s) کے لیے متعین نہیں ہے
+ErrorFieldAccountNotDefinedForInvoiceLine=انوائس id %s (%s) کے لیے اکاؤنٹنگ اکاؤنٹ کی قدر کی وضاحت نہیں کی گئی
+ErrorFieldAccountNotDefinedForLine=اکاؤنٹنگ اکاؤنٹ کی قدر لائن کے لیے متعین نہیں ہے (%s)
+ErrorBankStatementNameMustFollowRegex=خرابی، بینک اسٹیٹمنٹ کا نام درج ذیل نحوی اصول %s کی پیروی کرنا چاہیے
+ErrorPhpMailDelivery=چیک کریں کہ آپ وصول کنندگان کی بہت زیادہ تعداد کا استعمال نہیں کرتے ہیں اور یہ کہ آپ کا ای میل مواد اسپام جیسا نہیں ہے۔ مزید مکمل معلومات کے لیے اپنے ایڈمنسٹریٹر سے فائر وال اور سرور لاگ فائلوں کو چیک کرنے کے لیے بھی کہیں۔
+ErrorUserNotAssignedToTask=استعمال شدہ وقت میں داخل ہونے کے قابل ہونے کے لیے صارف کو کام کے لیے تفویض کیا جانا چاہیے۔
+ErrorTaskAlreadyAssigned=کام پہلے ہی صارف کو تفویض کیا گیا ہے۔
+ErrorModuleFileSeemsToHaveAWrongFormat=ایسا لگتا ہے کہ ماڈیول پیکیج کا فارمیٹ غلط ہے۔
+ErrorModuleFileSeemsToHaveAWrongFormat2=ماڈیول کی زپ میں کم از کم ایک لازمی ڈائرکٹری کا ہونا ضروری ہے: <strong> %s </strong> یا <strong> a0ecb2ec87f49fzfz506010
+ErrorFilenameDosNotMatchDolibarrPackageRules=ماڈیول پیکج کا نام ( <strong> %s </strong> ) متوقع نام کے نحو سے مماثل نہیں ہے: <strong> a0ecb2ec87f49fza606019fz
+ErrorDuplicateTrigger=خرابی، ڈپلیکیٹ ٹرگر کا نام %s۔ پہلے سے ہی %s سے بھری ہوئی ہے۔
+ErrorNoWarehouseDefined=خرابی، کسی گودام کی وضاحت نہیں کی گئی۔
+ErrorBadLinkSourceSetButBadValueForRef=آپ جو لنک استعمال کرتے ہیں وہ درست نہیں ہے۔ ادائیگی کے لیے 'ذریعہ' کی وضاحت کی گئی ہے، لیکن 'ریف' کے لیے قدر درست نہیں ہے۔
+ErrorTooManyErrorsProcessStopped=بہت زیادہ غلطیاں۔ عمل روک دیا گیا۔
+ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=جب اس ایکشن پر سٹاک کو بڑھانے/کم کرنے کا آپشن سیٹ ہو تو بڑے پیمانے پر توثیق ممکن نہیں ہے (آپ کو ایک ایک کرکے توثیق کرنی چاہیے تاکہ آپ گودام کو بڑھانے/کم کرنے کے لیے وضاحت کر سکیں)
+ErrorObjectMustHaveStatusDraftToBeValidated=آبجیکٹ %s کی توثیق کے لیے اسٹیٹس 'ڈرافٹ' ہونا ضروری ہے۔
+ErrorObjectMustHaveLinesToBeValidated=آبجیکٹ %s کی توثیق کے لیے لائنیں ہونی چاہئیں۔
+ErrorOnlyInvoiceValidatedCanBeSentInMassAction="ای میل کے ذریعے بھیجیں" بڑے پیمانے پر کارروائی کا استعمال کرتے ہوئے صرف تصدیق شدہ رسیدیں بھیجی جا سکتی ہیں۔
+ErrorChooseBetweenFreeEntryOrPredefinedProduct=آپ کو انتخاب کرنا ہوگا کہ آیا مضمون پہلے سے طے شدہ مصنوعات ہے یا نہیں۔
+ErrorDiscountLargerThanRemainToPaySplitItBefore=آپ جس رعایت کو لاگو کرنے کی کوشش کرتے ہیں وہ ادا کرنے کے باقی رہنے سے زیادہ ہے۔ رعایت کو پہلے 2 چھوٹی رعایتوں میں تقسیم کریں۔
+ErrorFileNotFoundWithSharedLink=فائل نہیں ملی۔ ہو سکتا ہے کہ شیئر کلید میں ترمیم کی گئی ہو یا فائل کو حال ہی میں ہٹا دیا گیا ہو۔
+ErrorProductBarCodeAlreadyExists=پروڈکٹ کا بارکوڈ %s پہلے سے ہی کسی اور پروڈکٹ کے حوالہ پر موجود ہے۔
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=یہ بھی نوٹ کریں کہ جب کم از کم ایک ذیلی پروڈکٹ (یا ذیلی مصنوعات کے ذیلی پروڈکٹ) کو سیریل/لاٹ نمبر کی ضرورت ہو تو کٹس کا استعمال خود بخود ذیلی مصنوعات میں اضافہ/کمی کے لیے ممکن نہیں ہے۔
+ErrorDescRequiredForFreeProductLines=مفت مصنوعات کے ساتھ لائنوں کے لیے تفصیل لازمی ہے۔
+ErrorAPageWithThisNameOrAliasAlreadyExists=صفحہ/کنٹینر <strong> %s </strong> کا وہی نام یا متبادل عرف ہے جسے آپ استعمال کرنے کی کوشش کرتے ہیں۔
+ErrorDuringChartLoad=کھاتوں کا چارٹ لوڈ کرتے وقت خرابی۔ اگر کچھ اکاؤنٹس لوڈ نہیں کیے گئے تھے، تو آپ پھر بھی انہیں دستی طور پر درج کر سکتے ہیں۔
+ErrorBadSyntaxForParamKeyForContent=param keyforcontent کے لیے خراب نحو۔ %s یا %s سے شروع ہونے والی قدر ہونی چاہیے
+ErrorVariableKeyForContentMustBeSet=خرابی، نام کے ساتھ مستقل %s (دکھانے کے لیے متنی مواد کے ساتھ) یا %s (دکھانے کے لیے بیرونی یو آر ایل کے ساتھ) سیٹ ہونا ضروری ہے۔
+ErrorURLMustEndWith=URL %s %s ختم ہونا ضروری ہے
+ErrorURLMustStartWithHttp=URL %s http:// یا https:// سے شروع ہونا چاہیے
+ErrorHostMustNotStartWithHttp=میزبان کا نام %s http:// یا https:// سے شروع نہیں ہونا چاہیے
+ErrorNewRefIsAlreadyUsed=خرابی، نیا حوالہ پہلے ہی استعمال ہو چکا ہے۔
+ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=خرابی، بند انوائس سے منسلک ادائیگی کو حذف کرنا ممکن نہیں ہے۔
+ErrorSearchCriteriaTooSmall=تلاش کا معیار بہت چھوٹا ہے۔
+ErrorObjectMustHaveStatusActiveToBeDisabled=آبجیکٹ کو غیر فعال کرنے کے لیے 'فعال' حیثیت کا ہونا ضروری ہے۔
+ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=آبجیکٹ کو فعال کرنے کے لیے 'ڈرافٹ' یا 'غیر فعال' کی حیثیت ہونی چاہیے۔
+ErrorNoFieldWithAttributeShowoncombobox=آبجیکٹ '%s' کی تعریف میں کسی بھی فیلڈ میں 'showoncombobox' پراپرٹی نہیں ہے۔ کامبولسٹ کو دکھانے کا کوئی طریقہ نہیں ہے۔
+ErrorFieldRequiredForProduct=پروڈکٹ %s کے لیے فیلڈ '%s' درکار ہے
+ProblemIsInSetupOfTerminal=ٹرمینل %s کے سیٹ اپ میں مسئلہ ہے۔
+ErrorAddAtLeastOneLineFirst=پہلے کم از کم ایک لائن شامل کریں۔
+ErrorRecordAlreadyInAccountingDeletionNotPossible=غلطی، ریکارڈ پہلے ہی اکاؤنٹنگ میں منتقل ہو چکا ہے، حذف کرنا ممکن نہیں ہے۔
+ErrorLanguageMandatoryIfPageSetAsTranslationOfAnother=اگر آپ صفحہ کو کسی اور کے ترجمہ کے طور پر سیٹ کرتے ہیں تو غلطی، زبان لازمی ہے۔
+ErrorLanguageOfTranslatedPageIsSameThanThisPage=خرابی، ترجمہ شدہ صفحہ کی زبان اس سے ایک جیسی ہے۔
+ErrorBatchNoFoundForProductInWarehouse=گودام "%s" میں پروڈکٹ "%s" کے لیے کوئی لاٹ/سیریل نہیں ملا۔
+ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=گودام "%s" میں پروڈکٹ "%s" کے لیے اس لاٹ/سیریل کے لیے کافی مقدار نہیں ہے۔
+ErrorOnlyOneFieldForGroupByIsPossible='گروپ بذریعہ' کے لیے صرف 1 فیلڈ ممکن ہے (دوسرے کو مسترد کر دیا گیا ہے)
+ErrorTooManyDifferentValueForSelectedGroupBy=فیلڈ ' <b> %s a09a4b73' کے لیے 'a09a4b73' کے بطور گراف استعمال کر سکتے ہیں کے لیے بہت زیادہ مختلف ویلیو (<b> %s </b> سے زیادہ ) ملی۔ فیلڈ 'گروپ از' ہٹا دیا گیا ہے۔ ہوسکتا ہے کہ آپ اسے X-Axis کے طور پر استعمال کرنا چاہتے ہوں؟
+ErrorReplaceStringEmpty=خرابی، جس سٹرنگ کو تبدیل کرنا ہے وہ خالی ہے۔
+ErrorProductNeedBatchNumber=خرابی، پروڈکٹ '<b> %s </b>' بہت زیادہ/سیریل نمبر کی ضرورت ہے
+ErrorProductDoesNotNeedBatchNumber=خرابی، پروڈکٹ '<b> %s </b>' لاٹ/سیریل نمبر قبول نہیں کرتا
+ErrorFailedToReadObject=خرابی، <b> %s </b> قسم کے آبجیکٹ کو پڑھنے میں ناکام
+ErrorParameterMustBeEnabledToAllwoThisFeature=خرابی، پیرامیٹر <b> %s </b> کو <b> conf/conf.php میں فعال ہونا ضروری ہے
+ErrorLoginDateValidity=خرابی، یہ لاگ ان درست تاریخ کی حد سے باہر ہے۔
+ErrorValueLength=فیلڈ کی لمبائی '<b> %s </b>' '<b> %s a09a4b739f' سے زیادہ ہونی چاہیے۔
+ErrorReservedKeyword=لفظ '<b> %s </b>' ایک محفوظ مطلوبہ لفظ ہے۔
+ErrorNotAvailableWithThisDistribution=اس تقسیم کے ساتھ دستیاب نہیں ہے۔
+ErrorPublicInterfaceNotEnabled=عوامی انٹرفیس فعال نہیں تھا۔
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=نئے صفحہ کی زبان کی وضاحت ضروری ہے اگر اسے کسی دوسرے صفحہ کے ترجمہ کے طور پر سیٹ کیا گیا ہو۔
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=نئے صفحہ کی زبان ماخذ کی زبان نہیں ہونی چاہیے اگر اسے کسی دوسرے صفحہ کے ترجمہ کے طور پر سیٹ کیا گیا ہو۔
+ErrorAParameterIsRequiredForThisOperation=اس آپریشن کے لیے ایک پیرامیٹر لازمی ہے۔
+ErrorDateIsInFuture=خرابی، تاریخ مستقبل میں نہیں ہو سکتی
+ErrorAnAmountWithoutTaxIsRequired=غلطی، رقم لازمی ہے۔
+ErrorAPercentIsRequired=غلطی، براہ کرم فیصد درست طریقے سے پُر کریں۔
+ErrorYouMustFirstSetupYourChartOfAccount=آپ کو پہلے اپنے اکاؤنٹ کا چارٹ ترتیب دینا ہوگا۔
+ErrorFailedToFindEmailTemplate=کوڈ نام %s کے ساتھ ٹیمپلیٹ تلاش کرنے میں ناکام
+ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice=سروس پر مدت کی وضاحت نہیں کی گئی ہے۔ فی گھنٹہ قیمت کا حساب لگانے کا کوئی طریقہ نہیں ہے۔
+ErrorActionCommPropertyUserowneridNotDefined=صارف کا مالک درکار ہے۔
+ErrorActionCommBadType=ایونٹ کی قسم کی منتخب کردہ (id: %n، کوڈ: %s) ایونٹ کی قسم ڈکشنری میں موجود نہیں ہے۔
+CheckVersionFail=ورژن کی جانچ ناکام
+ErrorWrongFileName=فائل کے نام میں __SOMETHING__ نہیں ہو سکتا
+ErrorNotInDictionaryPaymentConditions=ادائیگی کی شرائط ڈکشنری میں نہیں ہے، براہ کرم ترمیم کریں۔
+ErrorIsNotADraft=%s ڈرافٹ نہیں ہے۔
+ErrorExecIdFailed=کمانڈ "id" پر عمل نہیں کیا جا سکتا
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # Warnings
-WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
-WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
-WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
-WarningEnableYourModulesApplications=Click here to enable your modules and applications
-WarningSafeModeOnCheckExecDir=Warning, PHP option <b>safe_mode</b> is on so command must be stored inside a directory declared by php parameter <b>safe_mode_exec_dir</b>.
-WarningBookmarkAlreadyExists=A bookmark with this title or this target (URL) already exists.
-WarningPassIsEmpty=Warning, database password is empty. This is a security hole. You should add a password to your database and change your conf.php file to reflect this.
-WarningConfFileMustBeReadOnly=Warning, your config file (<b>htdocs/conf/conf.php</b>) can be overwritten by the web server. This is a serious security hole. Modify permissions on file to be in read only mode for operating system user used by Web server. If you use Windows and FAT format for your disk, you must know that this file system does not allow to add permissions on file, so can't be completely safe.
-WarningsOnXLines=Warnings on <b>%s</b> source record(s)
-WarningNoDocumentModelActivated=No model, for document generation, has been activated. A model will be chosen by default until you check your module setup.
-WarningLockFileDoesNotExists=Warning, once setup is finished, you must disable the installation/migration tools by adding a file <b>install.lock</b> into directory <b>%s</b>. Omitting the creation of this file is a grave security risk.
-WarningUntilDirRemoved=All security warnings (visible by admin users only) will remain active as long as the vulnerability is present (or that constant MAIN_REMOVE_INSTALL_WARNING is added in Setup->Other Setup).
-WarningCloseAlways=Warning, closing is done even if amount differs between source and target elements. Enable this feature with caution.
-WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all pages showing the box.
-WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card).
-WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
-WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
-WarningTooManyDataPleaseUseMoreFilters=Too many data (more than %s lines). Please use more filters or set the constant %s to a higher limit.
-WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while their hourly rate was not defined. A value of 0 %s per hour was used but this may result in wrong valuation of time spent.
-WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
-WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
-WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
-WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
-WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
-WarningProjectClosed=Project is closed. You must re-open it first.
-WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
-WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
-WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
-WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
-WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
-WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
-WarningPaypalPaymentNotCompatibleWithStrict=The value 'Strict' makes the online payment features not working correctly. Use 'Lax' instead.
+WarningParamUploadMaxFileSizeHigherThanPostMaxSize=آپ کا پی ایچ پی پیرامیٹر upload_max_filesize (%s) PHP پیرامیٹر post_max_size (%s) سے زیادہ ہے۔ یہ ایک مستقل سیٹ اپ نہیں ہے۔
+WarningPasswordSetWithNoAccount=اس ممبر کے لیے پاس ورڈ سیٹ کیا گیا تھا۔ تاہم، کوئی صارف اکاؤنٹ نہیں بنایا گیا تھا۔ لہذا یہ پاس ورڈ محفوظ ہے لیکن اسے Dolibarr میں لاگ ان کرنے کے لیے استعمال نہیں کیا جا سکتا۔ اسے کسی بیرونی ماڈیول/انٹرفیس کے ذریعے استعمال کیا جا سکتا ہے لیکن اگر آپ کو کسی رکن کے لیے کوئی لاگ ان یا پاس ورڈ متعین کرنے کی ضرورت نہیں ہے، تو آپ ممبر ماڈیول سیٹ اپ سے "ہر ممبر کے لیے لاگ ان کا انتظام کریں" کے آپشن کو غیر فعال کر سکتے ہیں۔ اگر آپ کو لاگ ان کا انتظام کرنے کی ضرورت ہے لیکن کسی پاس ورڈ کی ضرورت نہیں ہے، تو آپ اس انتباہ سے بچنے کے لیے اس فیلڈ کو خالی رکھ سکتے ہیں۔ نوٹ: اگر ممبر کسی صارف سے منسلک ہے تو ای میل کو لاگ ان کے طور پر بھی استعمال کیا جا سکتا ہے۔
+WarningMandatorySetupNotComplete=لازمی پیرامیٹرز ترتیب دینے کے لیے یہاں کلک کریں۔
+WarningEnableYourModulesApplications=اپنے ماڈیولز اور ایپلیکیشنز کو فعال کرنے کے لیے یہاں کلک کریں۔
+WarningSafeModeOnCheckExecDir=وارننگ، PHP آپشن <b> safe_mode </b> آن ہے لہذا کمانڈ کو php پیرامیٹر <b> safe_mode_exec_dir a09a4b739f80f17 کے ذریعہ اعلان کردہ ڈائریکٹری کے اندر ذخیرہ کرنا ضروری ہے۔
+WarningBookmarkAlreadyExists=اس عنوان یا اس ہدف (URL) کے ساتھ ایک بک مارک پہلے سے موجود ہے۔
+WarningPassIsEmpty=انتباہ، ڈیٹا بیس پاس ورڈ خالی ہے۔ یہ ایک حفاظتی سوراخ ہے۔ آپ کو اپنے ڈیٹا بیس میں پاس ورڈ شامل کرنا چاہیے اور اس کی عکاسی کرنے کے لیے اپنی conf.php فائل کو تبدیل کرنا چاہیے۔
+WarningConfFileMustBeReadOnly=وارننگ، آپ کی کنفگ فائل ( <b> htdocs/conf/conf.php </b> ) ویب سرور کے ذریعے اوور رائٹ کی جا سکتی ہے۔ یہ ایک سنگین حفاظتی سوراخ ہے۔ ویب سرور کے ذریعے استعمال ہونے والے آپریٹنگ سسٹم کے صارف کے لیے صرف پڑھنے کے موڈ میں فائل پر اجازتوں میں ترمیم کریں۔ اگر آپ اپنی ڈسک کے لیے Windows اور FAT فارمیٹ استعمال کرتے ہیں، تو آپ کو معلوم ہونا چاہیے کہ یہ فائل سسٹم فائل پر اجازتیں شامل کرنے کی اجازت نہیں دیتا، اس لیے مکمل طور پر محفوظ نہیں ہو سکتا۔
+WarningsOnXLines=<b> %s </b> سورس ریکارڈ (ز) پر وارننگ
+WarningNoDocumentModelActivated=دستاویز بنانے کے لیے کوئی ماڈل فعال نہیں کیا گیا ہے۔ ایک ماڈل کو بطور ڈیفالٹ منتخب کیا جائے گا جب تک کہ آپ اپنے ماڈیول سیٹ اپ کو چیک نہیں کر لیتے۔
+WarningLockFileDoesNotExists=تنبیہ، سیٹ اپ مکمل ہونے کے بعد، آپ کو ایک فائل <b> install.lock </b> ڈائرکٹری <b> %s a049fz0a49fz7f8z0 میں شامل کرکے انسٹالیشن/مائیگریشن ٹولز کو غیر فعال کرنا ہوگا۔ اس فائل کی تخلیق کو چھوڑنا ایک سنگین سیکیورٹی رسک ہے۔
+WarningUntilDirRemoved=تمام حفاظتی انتباہات (صرف منتظم صارفین کے ذریعہ نظر آتے ہیں) اس وقت تک فعال رہیں گے جب تک کہ خطرہ موجود ہے (یا یہ کہ مستقل MAIN_REMOVE_INSTALL_WARNING سیٹ اپ->دیگر سیٹ اپ میں شامل کیا گیا ہے)۔
+WarningCloseAlways=انتباہ، بند کیا جاتا ہے یہاں تک کہ اگر رقم ماخذ اور ہدف کے عناصر کے درمیان مختلف ہو۔ احتیاط کے ساتھ اس فیچر کو فعال کریں۔
+WarningUsingThisBoxSlowDown=انتباہ، اس باکس کا استعمال کرتے ہوئے باکس کو ظاہر کرنے والے تمام صفحات کو سنجیدگی سے سست کر دیں۔
+WarningClickToDialUserSetupNotComplete=آپ کے صارف کے لیے ClickToDial معلومات کا سیٹ اپ مکمل نہیں ہے (اپنے صارف کارڈ پر ClickToDial ٹیب دیکھیں)۔
+WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=نابینا افراد یا ٹیکسٹ براؤزرز کے لیے ڈسپلے سیٹ اپ کو بہتر بنانے پر خصوصیت کو غیر فعال کر دیا جاتا ہے۔
+WarningPaymentDateLowerThanInvoiceDate=ادائیگی کی تاریخ (%s) انوائس %s کے لیے انوائس کی تاریخ (%s) سے پہلے کی ہے۔
+WarningTooManyDataPleaseUseMoreFilters=بہت زیادہ ڈیٹا (%s لائنوں سے زیادہ)۔ براہ کرم مزید فلٹرز استعمال کریں یا مستقل %s کو زیادہ حد پر سیٹ کریں۔
+WarningSomeLinesWithNullHourlyRate=کچھ اوقات کچھ صارفین کے ذریعہ ریکارڈ کیے گئے تھے جبکہ ان کی فی گھنٹہ کی شرح کی وضاحت نہیں کی گئی تھی۔ 0 %s فی گھنٹہ کی قدر استعمال کی گئی تھی لیکن اس کے نتیجے میں گزرے ہوئے وقت کی غلط تشخیص ہو سکتی ہے۔
+WarningYourLoginWasModifiedPleaseLogin=آپ کے لاگ ان میں ترمیم کی گئی تھی۔ سیکیورٹی کے مقصد کے لیے آپ کو اگلی کارروائی سے پہلے اپنے نئے لاگ ان کے ساتھ لاگ ان کرنا پڑے گا۔
+WarningAnEntryAlreadyExistForTransKey=اس زبان کے لیے ترجمہ کلید کے لیے ایک اندراج پہلے سے موجود ہے۔
+WarningNumberOfRecipientIsRestrictedInMassAction=انتباہ، فہرستوں پر بڑے پیمانے پر کارروائیوں کا استعمال کرتے وقت مختلف وصول کنندگان کی تعداد <b> %s </b> تک محدود ہے۔
+WarningDateOfLineMustBeInExpenseReportRange=انتباہ، لائن کی تاریخ اخراجات کی رپورٹ کی حد میں نہیں ہے۔
+WarningProjectDraft=پروجیکٹ ابھی بھی ڈرافٹ موڈ میں ہے۔ اگر آپ کاموں کو استعمال کرنے کا ارادہ رکھتے ہیں تو اس کی توثیق کرنا نہ بھولیں۔
+WarningProjectClosed=پروجیکٹ بند ہے۔ آپ کو پہلے اسے دوبارہ کھولنا ہوگا۔
+WarningSomeBankTransactionByChequeWereRemovedAfter=کچھ بینک ٹرانزیکشنز کو ہٹا دیا گیا جس کے بعد ان سمیت رسیدیں تیار کی گئیں۔ اس لیے چیکوں کی تعداد اور رسید کی کل تعداد اور فہرست میں کل تعداد سے مختلف ہو سکتے ہیں۔
+WarningFailedToAddFileIntoDatabaseIndex=انتباہ، ECM ڈیٹا بیس انڈیکس ٹیبل میں فائل کا اندراج شامل کرنے میں ناکام
+WarningTheHiddenOptionIsOn=وارننگ، پوشیدہ آپشن <b> %s </b> آن ہے۔
+WarningCreateSubAccounts=وارننگ، آپ براہ راست ذیلی اکاؤنٹ نہیں بنا سکتے، آپ کو ایک فریق ثالث یا صارف بنانا ہوگا اور انہیں اس فہرست میں تلاش کرنے کے لیے اکاؤنٹنگ کوڈ تفویض کرنا ہوگا۔
+WarningAvailableOnlyForHTTPSServers=صرف HTTPS محفوظ کنکشن استعمال کرنے کی صورت میں دستیاب ہے۔
+WarningModuleXDisabledSoYouMayMissEventHere=ماڈیول %s کو فعال نہیں کیا گیا ہے۔ تو ہو سکتا ہے کہ آپ یہاں بہت سی تقریب سے محروم رہیں۔
+WarningPaypalPaymentNotCompatibleWithStrict=قدر 'سخت' آن لائن ادائیگی کی خصوصیات کو صحیح طریقے سے کام نہیں کرتی ہے۔ اس کے بجائے 'Lax' استعمال کریں۔
 
 # Validate
-RequireValidValue = Value not valid
-RequireAtLeastXString = Requires at least %s character(s)
-RequireXStringMax = Requires %s character(s) max
-RequireAtLeastXDigits = Requires at least %s digit(s)
-RequireXDigitsMax = Requires %s digit(s) max
-RequireValidEmail = Email address is not valid
-RequireMaxLength = Length must be less than %s chars
-RequireMinLength = Length must be more than %s char(s)
-RequireValidUrl = Require valid URL
-RequireValidDate = Require a valid date
-RequireANotEmptyValue = Is required
-RequireValidDuration = Require a valid duration
-RequireValidExistingElement = Require an existing value
-RequireValidBool = Require a valid boolean
-BadSetupOfField = Error bad setup of field
-BadSetupOfFieldClassNotFoundForValidation = Error bad setup of field : Class not found for validation
-BadSetupOfFieldFileNotFound = Error bad setup of field : File not found for inclusion
-BadSetupOfFieldFetchNotCallable = Error bad setup of field : Fetch not callable on class
+RequireValidValue = قدر درست نہیں ہے۔
+RequireAtLeastXString = کم از کم %s حروف کی ضرورت ہے
+RequireXStringMax = زیادہ سے زیادہ %s حروف کی ضرورت ہے۔
+RequireAtLeastXDigits = کم از کم %s ہندسوں کی ضرورت ہے
+RequireXDigitsMax = زیادہ سے زیادہ %s ہندسوں کی ضرورت ہے۔
+RequireValidEmail = ای میل ایڈریس درست نہیں ہے۔
+RequireMaxLength = لمبائی %s حروف سے کم ہونی چاہیے۔
+RequireMinLength = لمبائی %s char(s) سے زیادہ ہونی چاہیے
+RequireValidUrl = درست URL درکار ہے۔
+RequireValidDate = ایک درست تاریخ درکار ہے۔
+RequireANotEmptyValue = مطلوب ہے۔
+RequireValidDuration = ایک درست مدت درکار ہے۔
+RequireValidExistingElement = ایک موجودہ قدر درکار ہے۔
+RequireValidBool = ایک درست بولین کی ضرورت ہے۔
+BadSetupOfField = فیلڈ کے خراب سیٹ اپ میں خرابی۔
+BadSetupOfFieldClassNotFoundForValidation = فیلڈ کے سیٹ اپ میں خرابی: توثیق کے لیے کلاس نہیں ملی
+BadSetupOfFieldFileNotFound = فیلڈ کے خراب سیٹ اپ میں خرابی: شمولیت کے لیے فائل نہیں ملی
+BadSetupOfFieldFetchNotCallable = فیلڈ کے خراب سیٹ اپ میں خرابی: کلاس پر کال کے قابل نہیں بازیافت کریں۔
diff --git a/htdocs/langs/ur_PK/eventorganization.lang b/htdocs/langs/ur_PK/eventorganization.lang
index 82951892a32..16d4ea5798a 100644
--- a/htdocs/langs/ur_PK/eventorganization.lang
+++ b/htdocs/langs/ur_PK/eventorganization.lang
@@ -17,150 +17,150 @@
 #
 # Generic
 #
-ModuleEventOrganizationName = Event Organization
-EventOrganizationDescription = Event Organization through Module Project
-EventOrganizationDescriptionLong= Manage the organization of an event (show, conferences, attendees or speakers, with public pages for suggestion, vote or registration)
+ModuleEventOrganizationName = ایونٹ آرگنائزیشن
+EventOrganizationDescription = ماڈیول پروجیکٹ کے ذریعے ایونٹ آرگنائزیشن
+EventOrganizationDescriptionLong= کسی پروگرام کی تنظیم کا نظم کریں (شو، کانفرنسز، شرکاء یا مقررین، تجویز، ووٹ یا رجسٹریشن کے لیے عوامی صفحات کے ساتھ)
 #
 # Menu
 #
-EventOrganizationMenuLeft = Organized events
-EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+EventOrganizationMenuLeft = منظم تقریبات
+EventOrganizationConferenceOrBoothMenuLeft = کانفرنس یا بوتھ
 
-PaymentEvent=Payment of event
+PaymentEvent=تقریب کی ادائیگی
 
 #
 # Admin page
 #
-NewRegistration=Registration
-EventOrganizationSetup=Event Organization setup
-EventOrganization=Event organization
-Settings=Settings
-EventOrganizationSetupPage = Event Organization setup page
-EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
-EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
-EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
-EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
-EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
-EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
-EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a registration to a booth has been paid.
-EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a registration to an event has been paid.
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+NewRegistration=اندراج
+EventOrganizationSetup=ایونٹ آرگنائزیشن سیٹ اپ
+EventOrganization=تقریب کی تنظیم
+Settings=ترتیبات
+EventOrganizationSetupPage = ایونٹ آرگنائزیشن سیٹ اپ صفحہ
+EVENTORGANIZATION_TASK_LABEL = پروجیکٹ کی توثیق ہونے پر خود بخود تخلیق کرنے کے لیے کاموں کا لیبل
+EVENTORGANIZATION_TASK_LABELTooltip = آپ ایک منظم واقعہ کی توثیق کرتے ہیں، بعض کاموں کو خود کار طریقے سے مثال کے منصوبے <br> <br> میں پیدا کیا جا سکتا ہے: کانفرنس کے <br> بھیجیں کال <br> کانفرنسوں <br> بوتھ کے لئے کال وصول بھیجیں <br> شرکاء کے لئے واقعات کو کھولیں سبسکرپشنز <br> لئے کال وصول بوتھ کے لئے کال ارسال <br> مقررین کو ایونٹ کی یاد دلائیں <br> بوتھ ہوسٹر کو ایونٹ کی یاد دہانی بھیجیں
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = فریق ثالث میں شامل کرنے کے لیے زمرہ خود بخود بن جاتا ہے جب کوئی کانفرنس تجویز کرتا ہے۔
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = تیسری پارٹیوں میں شامل کرنے کے لیے زمرہ خود بخود بن جاتا ہے جب وہ بوتھ تجویز کرتے ہیں۔
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = کانفرنس کی تجویز موصول ہونے کے بعد بھیجنے کے لیے ای میل کا سانچہ۔
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = بوتھ کی تجویز موصول ہونے کے بعد بھیجنے کے لیے ای میل کا سانچہ۔
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = بوتھ پر رجسٹریشن کے بعد بھیجنے کے لیے ای میل کا ٹیمپلیٹ ادا ہو چکا ہے۔
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = کسی تقریب میں رجسٹریشن کے بعد بھیجنے کے لیے ای میل کا ٹیمپلیٹ ادا ہو چکا ہے۔
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = حاضرین کو اجتماعی ای میل کا سانچہ
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = مقررین کو مساج کرنے کے ای میل کا سانچہ
+EVENTORGANIZATION_FILTERATTENDEES_CAT = زمرہ کے ساتھ شرکاء کے تخلیق کارڈ/فارم میں تھرڈ پارٹی کی منتخب فہرست کو فلٹر کریں۔
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = گاہک کی قسم کے ساتھ شرکاء کے تخلیق کارڈ/فارم میں تیسرے فریق کی منتخب فہرست کو فلٹر کریں۔
 
 #
 # Object
 #
-EventOrganizationConfOrBooth= Conference Or Booth
-ManageOrganizeEvent = Manage the organization of an event
-ConferenceOrBooth = Conference Or Booth
-ConferenceOrBoothTab = Conference Or Booth
-AmountPaid = Amount paid
-DateOfRegistration = Date of registration
-ConferenceOrBoothAttendee = Conference Or Booth Attendee
+EventOrganizationConfOrBooth= کانفرنس یا بوتھ
+ManageOrganizeEvent = ایونٹ کی تنظیم کا نظم کریں۔
+ConferenceOrBooth = کانفرنس یا بوتھ
+ConferenceOrBoothTab = کانفرنس یا بوتھ
+AmountPaid = رقم ادا کر دی
+DateOfRegistration = رجسٹریشن کی تاریخ
+ConferenceOrBoothAttendee = کانفرنس یا بوتھ اٹینڈی
 
 #
 # Template Mail
 #
-YourOrganizationEventConfRequestWasReceived = Your request for conference was received
-YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
-EventOrganizationEmailAskConf = Request for conference
-EventOrganizationEmailAskBooth = Request for booth
-EventOrganizationEmailBoothPayment = Payment of your booth
-EventOrganizationEmailRegistrationPayment = Registration for an event
-EventOrganizationMassEmailAttendees = Communication to attendees
-EventOrganizationMassEmailSpeakers = Communication to speakers
+YourOrganizationEventConfRequestWasReceived = کانفرنس کے لیے آپ کی درخواست موصول ہو گئی۔
+YourOrganizationEventBoothRequestWasReceived = بوتھ کے لیے آپ کی درخواست موصول ہوئی تھی۔
+EventOrganizationEmailAskConf = کانفرنس کی درخواست
+EventOrganizationEmailAskBooth = بوتھ کی درخواست
+EventOrganizationEmailBoothPayment = اپنے بوتھ کی ادائیگی
+EventOrganizationEmailRegistrationPayment = ایک تقریب کے لیے رجسٹریشن
+EventOrganizationMassEmailAttendees = شرکاء کے لیے مواصلت
+EventOrganizationMassEmailSpeakers = مقررین سے مواصلت
 
 #
 # Event
 #
-AllowUnknownPeopleSuggestConf=Allow people to suggest conferences
-AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest a conference they want to do
-AllowUnknownPeopleSuggestBooth=Allow people to apply for a booth
-AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to apply for a booth
-PriceOfRegistration=Price of registration
-PriceOfRegistrationHelp=Price to pay to register or participate in the event
-PriceOfBooth=Subscription price to stand a booth
-PriceOfBoothHelp=Subscription price to stand a booth
-EventOrganizationICSLink=Link ICS for events
-ConferenceOrBoothInformation=Conference Or Booth informations
-Attendees=Attendees
-ListOfAttendeesOfEvent=List of attendees of the event project
-DownloadICSLink = Download ICS link
-EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
-SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
-SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
-NbVotes=Number of votes
+AllowUnknownPeopleSuggestConf=لوگوں کو کانفرنسیں تجویز کرنے دیں۔
+AllowUnknownPeopleSuggestConfHelp=نامعلوم لوگوں کو ایک کانفرنس تجویز کرنے کی اجازت دیں جو وہ کرنا چاہتے ہیں۔
+AllowUnknownPeopleSuggestBooth=لوگوں کو بوتھ کے لیے درخواست دینے کی اجازت دیں۔
+AllowUnknownPeopleSuggestBoothHelp=نامعلوم افراد کو بوتھ کے لیے درخواست دینے کی اجازت دیں۔
+PriceOfRegistration=رجسٹریشن کی قیمت
+PriceOfRegistrationHelp=رجسٹر کرنے یا ایونٹ میں شرکت کے لیے ادا کرنے کی قیمت
+PriceOfBooth=ایک بوتھ کھڑا کرنے کے لیے سبسکرپشن کی قیمت
+PriceOfBoothHelp=ایک بوتھ کھڑے کرنے کے لئے سبسکرپشن کی قیمت
+EventOrganizationICSLink=واقعات کے لیے ICS لنک کریں۔
+ConferenceOrBoothInformation=کانفرنس یا بوتھ کی معلومات
+Attendees=حاضرین
+ListOfAttendeesOfEvent=ایونٹ پروجیکٹ کے شرکاء کی فہرست
+DownloadICSLink = ICS لنک ڈاؤن لوڈ کریں۔
+EVENTORGANIZATION_SECUREKEY = ایک کانفرنس سے عوامی رجسٹریشن لنک کی محفوظ کلید
+SERVICE_BOOTH_LOCATION = بوتھ کے مقام کے بارے میں انوائس قطار کے لیے استعمال کی جانے والی سروس
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = کانفرنس میں شرکت کرنے والے کی رکنیت کے بارے میں انوائس قطار کے لیے استعمال ہونے والی خدمت
+NbVotes=ووٹوں کی تعداد
 #
 # Status
 #
-EvntOrgDraft = Draft
-EvntOrgSuggested = Suggested
-EvntOrgConfirmed = Confirmed
-EvntOrgNotQualified = Not Qualified
-EvntOrgDone = Done
-EvntOrgCancelled = Cancelled
+EvntOrgDraft = مسودہ
+EvntOrgSuggested = تجویز کردہ
+EvntOrgConfirmed = تصدیق شدہ
+EvntOrgNotQualified = نا اہل
+EvntOrgDone = ہو گیا
+EvntOrgCancelled = منسوخ
 #
 # Public page
 #
-SuggestForm = Suggestion page
-SuggestOrVoteForConfOrBooth = Page for suggestion or vote
-EvntOrgRegistrationHelpMessage = Here, you can vote for a conference or suggest a new one for the event. You can also apply to have a booth during the event.
-EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference to animate during the event.
-EvntOrgRegistrationBoothHelpMessage = Here, you can apply to have a booth during the event.
-ListOfSuggestedConferences = List of suggested conferences
-ListOfSuggestedBooths = List of suggested booths
-ListOfConferencesOrBooths=List of conferences or booths of event project
-SuggestConference = Suggest a new conference
-SuggestBooth = Suggest a booth
-ViewAndVote = View and vote for suggested events
-PublicAttendeeSubscriptionGlobalPage = Public link for registration to the event
-PublicAttendeeSubscriptionPage = Public link for registration to this event only
-MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the event : <b>%s</b>
-EvntOrgDuration = This conference starts on %s and ends on %s.
-ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
-BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
-EventType = Event type
-LabelOfBooth=Booth label
-LabelOfconference=Conference label
-ConferenceIsNotConfirmed=Registration not available, conference is not confirmed yet
-DateMustBeBeforeThan=%s must be before %s
-DateMustBeAfterThan=%s must be after %s
+SuggestForm = تجویز کا صفحہ
+SuggestOrVoteForConfOrBooth = تجویز یا ووٹ کے لیے صفحہ
+EvntOrgRegistrationHelpMessage = یہاں، آپ کانفرنس کے لیے ووٹ دے سکتے ہیں یا ایونٹ کے لیے ایک نیا تجویز کر سکتے ہیں۔ آپ ایونٹ کے دوران بوتھ رکھنے کے لیے بھی درخواست دے سکتے ہیں۔
+EvntOrgRegistrationConfHelpMessage = یہاں، آپ ایونٹ کے دوران متحرک ہونے کے لیے ایک نئی کانفرنس تجویز کر سکتے ہیں۔
+EvntOrgRegistrationBoothHelpMessage = یہاں، آپ ایونٹ کے دوران بوتھ رکھنے کے لیے درخواست دے سکتے ہیں۔
+ListOfSuggestedConferences = تجویز کردہ کانفرنسوں کی فہرست
+ListOfSuggestedBooths = تجویز کردہ بوتھوں کی فہرست
+ListOfConferencesOrBooths=کانفرنسوں یا ایونٹ پروجیکٹ کے بوتھ کی فہرست
+SuggestConference = ایک نئی کانفرنس تجویز کریں۔
+SuggestBooth = ایک بوتھ تجویز کریں۔
+ViewAndVote = تجویز کردہ واقعات کو دیکھیں اور ووٹ دیں۔
+PublicAttendeeSubscriptionGlobalPage = ایونٹ کی رجسٹریشن کے لیے پبلک لنک
+PublicAttendeeSubscriptionPage = صرف اس ایونٹ کی رجسٹریشن کے لیے پبلک لنک
+MissingOrBadSecureKey = سیکیورٹی کلید غلط یا غائب ہے۔
+EvntOrgWelcomeMessage = یہ فارم آپ کو ایونٹ میں ایک نئے شریک کے طور پر رجسٹر کرنے کی اجازت دیتا ہے: <b> %s </b>
+EvntOrgDuration = یہ کانفرنس %s پر شروع ہوتی ہے اور %s پر ختم ہوتی ہے۔
+ConferenceAttendeeFee = ایونٹ کے لیے کانفرنس کے شرکاء کی فیس: '%s' %s سے %s تک ہوتی ہے۔
+BoothLocationFee = ایونٹ کے لیے بوتھ کا مقام: '%s' %s سے %s تک
+EventType = واقعہ کی قسم
+LabelOfBooth=بوتھ لیبل
+LabelOfconference=کانفرنس کا لیبل
+ConferenceIsNotConfirmed=رجسٹریشن دستیاب نہیں ہے، کانفرنس کی ابھی تصدیق نہیں ہوئی ہے۔
+DateMustBeBeforeThan=%s %s سے پہلے ہونا ضروری ہے
+DateMustBeAfterThan=%s %s کے بعد ہونا چاہیے
 
-NewSubscription=Registration
-OrganizationEventConfRequestWasReceived=Your suggestion for a conference has been received
-OrganizationEventBoothRequestWasReceived=Your request for a booth has been received
-OrganizationEventPaymentOfBoothWasReceived=Your payment for your booth has been recorded
-OrganizationEventPaymentOfRegistrationWasReceived=Your payment for your event registration has been recorded
-OrganizationEventBulkMailToAttendees=This is a remind about your participation in the event as an attendee
-OrganizationEventBulkMailToSpeakers=This is a reminder on your participation in the event as a speaker
-OrganizationEventLinkToThirdParty=Link to third party (customer, supplier or partner)
+NewSubscription=اندراج
+OrganizationEventConfRequestWasReceived=کانفرنس کے لیے آپ کی تجویز موصول ہوئی ہے۔
+OrganizationEventBoothRequestWasReceived=بوتھ کے لیے آپ کی درخواست موصول ہو گئی ہے۔
+OrganizationEventPaymentOfBoothWasReceived=آپ کے بوتھ کے لیے آپ کی ادائیگی ریکارڈ کی گئی ہے۔
+OrganizationEventPaymentOfRegistrationWasReceived=آپ کے ایونٹ کے رجسٹریشن کے لیے آپ کی ادائیگی ریکارڈ کر لی گئی ہے۔
+OrganizationEventBulkMailToAttendees=یہ ایک حاضری کے طور پر ایونٹ میں آپ کی شرکت کے بارے میں ایک یاد دہانی ہے۔
+OrganizationEventBulkMailToSpeakers=یہ ایک مقرر کی حیثیت سے تقریب میں آپ کی شرکت کی یاد دہانی ہے۔
+OrganizationEventLinkToThirdParty=فریق ثالث سے لنک کریں (کسٹمر، سپلائر یا پارٹنر)
 
-NewSuggestionOfBooth=Application for a booth
-NewSuggestionOfConference=Application for a conference
+NewSuggestionOfBooth=بوتھ کے لیے درخواست
+NewSuggestionOfConference=کانفرنس کے لیے درخواست
 
 #
 # Vote page
 #
-EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
-EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
-EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
-EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
-VoteOk = Your vote has been accepted.
-AlreadyVoted = You have already voted for this event.
-VoteError = An error has occurred during the vote, please try again.
+EvntOrgRegistrationWelcomeMessage = کانفرنس یا بوتھ تجویز کے صفحے پر خوش آمدید۔
+EvntOrgRegistrationConfWelcomeMessage = کانفرنس کے تجویز والے صفحے پر خوش آمدید۔
+EvntOrgRegistrationBoothWelcomeMessage = بوتھ تجویز کے صفحے پر خوش آمدید۔
+EvntOrgVoteHelpMessage = یہاں، آپ پروجیکٹ کے لیے تجویز کردہ ایونٹس کو دیکھ اور ووٹ دے سکتے ہیں۔
+VoteOk = آپ کا ووٹ قبول کر لیا گیا ہے۔
+AlreadyVoted = آپ پہلے ہی اس ایونٹ کے لیے ووٹ دے چکے ہیں۔
+VoteError = ووٹنگ کے دوران ایک خرابی پیش آگئی، براہ کرم دوبارہ کوشش کریں۔
 
-SubscriptionOk = Your registration has been validated
-ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to an event
-Attendee = Attendee
-PaymentConferenceAttendee = Conference attendee payment
-PaymentBoothLocation = Booth location payment
-DeleteConferenceOrBoothAttendee=Remove attendee
-RegistrationAndPaymentWereAlreadyRecorder=A registration and a payment were already recorded for the email <b>%s</b>
-EmailAttendee=Attendee email
-EmailCompanyForInvoice=Company email (for invoice, if different of attendee email)
-ErrorSeveralCompaniesWithEmailContactUs=Several companies with this email has been found so we can't validate automaticaly your registration. Please contact us at %s for a manual validation
-ErrorSeveralCompaniesWithNameContactUs=Several companies with this name has been found so we can't validate automaticaly your registration. Please contact us at %s for a manual validation
-NoPublicActionsAllowedForThisEvent=No public actions are open to public for this event
+SubscriptionOk = آپ کی رجسٹریشن کی توثیق کر دی گئی ہے۔
+ConfAttendeeSubscriptionConfirmation = کسی تقریب میں آپ کی رکنیت کی تصدیق
+Attendee = حاضری
+PaymentConferenceAttendee = کانفرنس کے شرکاء کی ادائیگی
+PaymentBoothLocation = بوتھ کے مقام کی ادائیگی
+DeleteConferenceOrBoothAttendee=شرکت کنندہ کو ہٹا دیں۔
+RegistrationAndPaymentWereAlreadyRecorder=ای میل <b> %s </b> کے لیے رجسٹریشن اور ادائیگی پہلے ہی ریکارڈ کی گئی تھی۔
+EmailAttendee=حاضری کا ای میل
+EmailCompanyForInvoice=کمپنی کا ای میل (انوائس کے لیے، اگر حاضری کے ای میل سے مختلف ہو)
+ErrorSeveralCompaniesWithEmailContactUs=اس ای میل کے ساتھ کئی کمپنیاں مل گئی ہیں لہذا ہم آپ کی رجسٹریشن کو خودکار طور پر درست نہیں کر سکتے۔ براہ کرم دستی توثیق کے لیے ہم سے %s پر رابطہ کریں۔
+ErrorSeveralCompaniesWithNameContactUs=اس نام کی کئی کمپنیاں ملی ہیں اس لیے ہم آپ کی رجسٹریشن کو خودکار طور پر درست نہیں کر سکتے۔ براہ کرم دستی توثیق کے لیے ہم سے %s پر رابطہ کریں۔
+NoPublicActionsAllowedForThisEvent=اس تقریب کے لیے عوام کے لیے کوئی عوامی کارروائی نہیں ہے۔
diff --git a/htdocs/langs/ur_PK/exports.lang b/htdocs/langs/ur_PK/exports.lang
index f2f2d2cf587..ba8d192060d 100644
--- a/htdocs/langs/ur_PK/exports.lang
+++ b/htdocs/langs/ur_PK/exports.lang
@@ -1,137 +1,137 @@
 # Dolibarr language file - Source file is en_US - exports
-ExportsArea=Exports
-ImportArea=Import
-NewExport=New Export
-NewImport=New Import
-ExportableDatas=Exportable dataset
-ImportableDatas=Importable dataset
-SelectExportDataSet=Choose dataset you want to export...
-SelectImportDataSet=Choose dataset you want to import...
-SelectExportFields=Choose the fields you want to export, or select a predefined export profile
-SelectImportFields=Choose the source file fields you want to import and their target field in database by moving them up and down with anchor %s, or select a predefined import profile:
-NotImportedFields=Fields of source file not imported
-SaveExportModel=Save your selections as an export profile/template (for reuse).
-SaveImportModel=Save this import profile (for reuse) ...
-ExportModelName=Export profile name
-ExportModelSaved=Export profile saved as <b>%s</b>.
-ExportableFields=Exportable fields
-ExportedFields=Exported fields
-ImportModelName=Import profile name
-ImportModelSaved=Import profile saved as <b>%s</b>.
-DatasetToExport=Dataset to export
-DatasetToImport=Import file into dataset
-ChooseFieldsOrdersAndTitle=Choose fields order...
-FieldsTitle=Fields title
-FieldTitle=Field title
-NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
-AvailableFormats=Available Formats
-LibraryShort=Library
-ExportCsvSeparator=Csv caracter separator
-ImportCsvSeparator=Csv caracter separator
-Step=Step
-FormatedImport=Import Assistant
-FormatedImportDesc1=This module allows you to update existing data or add new objects into the database from a file without technical knowledge, using an assistant.
-FormatedImportDesc2=First step is to choose the kind of data you want to import, then the format of the source file, then the fields you want to import.
-FormatedExport=Export Assistant
-FormatedExportDesc1=These tools allow the export of personalized data using an assistant, to help you in the process without requiring technical knowledge.
-FormatedExportDesc2=First step is to choose a predefined dataset, then which fields you want to export, and in which order.
-FormatedExportDesc3=When data to export are selected, you can choose the format of the output file.
-Sheet=Sheet
-NoImportableData=No importable data (no module with definitions to allow data imports)
-FileSuccessfullyBuilt=File generated
-SQLUsedForExport=SQL Request used to extract data
-LineId=Id of line
-LineLabel=Label of line
-LineDescription=Description of line
-LineUnitPrice=Unit price of line
-LineVATRate=VAT Rate of line
-LineQty=Quantity for line
-LineTotalHT=Amount excl. tax for line
-LineTotalTTC=Amount with tax for line
-LineTotalVAT=Amount of VAT for line
-TypeOfLineServiceOrProduct=Type of line (0=product, 1=service)
-FileWithDataToImport=File with data to import
-FileToImport=Source file to import
-FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
-DownloadEmptyExample=Download template file with field content information
-StarAreMandatory=* are mandatory fields
-ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
-ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
-SourceFileFormat=Source file format
-FieldsInSourceFile=Fields in source file
-FieldsInTargetDatabase=Target fields in Dolibarr database (bold=mandatory)
-Field=Field
-NoFields=No fields
-MoveField=Move field column number %s
-ExampleOfImportFile=Example_of_import_file
-SaveImportProfile=Save this import profile
-ErrorImportDuplicateProfil=Failed to save this import profile with this name. An existing profile already exists with this name.
-TablesTarget=Targeted tables
-FieldsTarget=Targeted fields
-FieldTarget=Targeted field
-FieldSource=Source field
-NbOfSourceLines=Number of lines in source file
-NowClickToTestTheImport=Check that the file format (field and string delimiters) of your file matches the options shown and that you have omitted the header line, or these will be flagged as errors in the following simulation.<br>Click on the "<b>%s</b>" button to run a check of the file structure/contents and simulate the import process.<br><b>No data will be changed in your database</b>.
-RunSimulateImportFile=Run Import Simulation
-FieldNeedSource=This field requires data from the source file
-SomeMandatoryFieldHaveNoSource=Some mandatory fields have no source from data file
-InformationOnSourceFile=Information on source file
-InformationOnTargetTables=Information on target fields
-SelectAtLeastOneField=Switch at least one source field in the column of fields to export
-SelectFormat=Choose this import file format
-RunImportFile=Import Data
-NowClickToRunTheImport=Check the results of the import simulation. Correct any errors and re-test.<br>When the simulation reports no errors you may proceed to import the data into the database.
-DataLoadedWithId=The imported data will have an additional field in each database table with this import id: <b>%s</b>, to allow it to be searchable in the case of investigating a problem related to this import.
-ErrorMissingMandatoryValue=Mandatory data is empty in the source file for field <b>%s</b>.
-TooMuchErrors=There are still <b>%s</b> other source lines with errors but output has been limited.
-TooMuchWarnings=There are still <b>%s</b> other source lines with warnings but output has been limited.
-EmptyLine=Empty line (will be discarded)
-CorrectErrorBeforeRunningImport=You <b>must</b> correct all errors <b>before</b> running the definitive import.
-FileWasImported=File was imported with number <b>%s</b>.
-YouCanUseImportIdToFindRecord=You can find all the imported records in your database by filtering on field <b>import_key='%s'</b>.
-NbOfLinesOK=Number of lines with no errors and no warnings: <b>%s</b>.
-NbOfLinesImported=Number of lines successfully imported: <b>%s</b>.
-DataComeFromNoWhere=Value to insert comes from nowhere in source file.
-DataComeFromFileFieldNb=Value to insert comes from field number <b>%s</b> in source file.
-DataComeFromIdFoundFromRef=Value that comes from field number <b>%s</b> of source file will be used to find the id of the parent object to use (so the object <b>%s</b> that has the ref. from source file must exist in the database).
-DataComeFromIdFoundFromCodeId=Code that comes from field number <b>%s</b> of source file will be used to find the id of the parent object to use (so the code from source file must exist in the dictionary <b>%s</b>). Note that if you know the id, you can also use it in the source file instead of the code. Import should work in both cases.
-DataIsInsertedInto=Data coming from source file will be inserted into the following field:
-DataIDSourceIsInsertedInto=The id of the parent object, that was found using the data in the source file, will be inserted into the following field:
-DataCodeIDSourceIsInsertedInto=The id of the parent line, that was found from code, will be inserted into the following field:
-SourceRequired=Data value is mandatory
-SourceExample=Example of possible data value
-ExampleAnyRefFoundIntoElement=Any ref found for element <b>%s</b>
-ExampleAnyCodeOrIdFoundIntoDictionary=Any code (or id) found into dictionary <b>%s</b>
-CSVFormatDesc=<b>Comma Separated Value</b> file format (.csv).<br>This is a text file format where fields are separated by a separator [ %s ]. If separator is found inside a field content, field is rounded by round character [ %s ]. Escape character to escape round character is [ %s ].
-Excel95FormatDesc=<b>Excel</b> file format (.xls)<br>This is the native Excel 95 format (BIFF5).
-Excel2007FormatDesc=<b>Excel</b> file format (.xlsx)<br>This is the native Excel 2007 format (SpreadsheetML).
-TsvFormatDesc=<b>Tab Separated Value</b> file format (.tsv)<br>This is a text file format where fields are separated by a tabulator [tab].
-ExportFieldAutomaticallyAdded=Field <b>%s</b> was automatically added. It will avoid you to have similar lines to be treated as duplicate record (with this field added, all lines will own their own id and will differ).
-CsvOptions=CSV format options
-Separator=Field Separator
-Enclosure=String Delimiter
-SpecialCode=Special code
-ExportStringFilter=%% allows replacing one or more characters in the text
-ExportDateFilter=YYYY, YYYYMM, YYYYMMDD: filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD: filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD: filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD: filters on all previous years/months/days
-ExportNumericFilter=NNNNN filters by one value<br>NNNNN+NNNNN filters over a range of values<br>< NNNNN filters by lower values<br>> NNNNN filters by higher values
-ImportFromLine=Import starting from line number
-EndAtLineNb=End at line number
-ImportFromToLine=Limit range (From - To). Eg. to omit header line(s).
-SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines.<br>If the header lines are NOT omitted, this will result in multiple errors in the Import Simulation.
-KeepEmptyToGoToEndOfFile=Keep this field empty to process all lines to the end of the file.
-SelectPrimaryColumnsForUpdateAttempt=Select column(s) to use as primary key for an UPDATE import
-UpdateNotYetSupportedForThisImport=Update is not supported for this type of import (only insert)
-NoUpdateAttempt=No update attempt was performed, only insert
-ImportDataset_user_1=Users (employees or not) and properties
-ComputedField=Computed field
+ExportsArea=برآمدات
+ImportArea=درآمد کریں۔
+NewExport=نئی ایکسپورٹ
+NewImport=نئی درآمد
+ExportableDatas=قابل برآمد ڈیٹاسیٹ
+ImportableDatas=قابل درآمد ڈیٹاسیٹ
+SelectExportDataSet=ڈیٹا سیٹ کا انتخاب کریں جسے آپ برآمد کرنا چاہتے ہیں...
+SelectImportDataSet=ڈیٹا سیٹ کا انتخاب کریں جسے آپ درآمد کرنا چاہتے ہیں...
+SelectExportFields=وہ فیلڈز منتخب کریں جنہیں آپ ایکسپورٹ کرنا چاہتے ہیں، یا پہلے سے طے شدہ ایکسپورٹ پروفائل منتخب کریں۔
+SelectImportFields=اینکر %s کے ساتھ اوپر اور نیچے منتقل کرکے ڈیٹا بیس میں ان سورس فائل فیلڈز اور ان کے ٹارگٹ فیلڈ کو منتخب کریں جنہیں آپ امپورٹ کرنا چاہتے ہیں، یا پہلے سے طے شدہ امپورٹ پروفائل منتخب کریں:
+NotImportedFields=سورس فائل کے فیلڈز درآمد نہیں کیے گئے۔
+SaveExportModel=اپنے انتخاب کو ایکسپورٹ پروفائل/ٹیمپلیٹ کے طور پر محفوظ کریں (دوبارہ استعمال کے لیے)۔
+SaveImportModel=اس درآمدی پروفائل کو محفوظ کریں (دوبارہ استعمال کے لیے)...
+ExportModelName=پروفائل کا نام برآمد کریں۔
+ExportModelSaved=ایکسپورٹ پروفائل کو <b> %s </b> کے بطور محفوظ کیا گیا۔
+ExportableFields=قابل برآمد فیلڈز
+ExportedFields=برآمد شدہ فیلڈز
+ImportModelName=پروفائل کا نام درآمد کریں۔
+ImportModelSaved=امپورٹ پروفائل کو <b> %s </b> کے بطور محفوظ کیا گیا۔
+DatasetToExport=برآمد کرنے کے لیے ڈیٹا سیٹ
+DatasetToImport=ڈیٹاسیٹ میں فائل درآمد کریں۔
+ChooseFieldsOrdersAndTitle=فیلڈز آرڈر کا انتخاب کریں...
+FieldsTitle=فیلڈز کا عنوان
+FieldTitle=فیلڈ ٹائٹل
+NowClickToGenerateToBuildExportFile=اب، کومبو باکس میں فائل فارمیٹ کو منتخب کریں اور ایکسپورٹ فائل بنانے کے لیے "جنریٹ" پر کلک کریں۔
+AvailableFormats=دستیاب فارمیٹس
+LibraryShort=کتب خانہ
+ExportCsvSeparator=Csv کریکٹر الگ کرنے والا
+ImportCsvSeparator=Csv کریکٹر الگ کرنے والا
+Step=قدم
+FormatedImport=اسسٹنٹ درآمد کریں۔
+FormatedImportDesc1=یہ ماڈیول آپ کو اسسٹنٹ کا استعمال کرتے ہوئے، تکنیکی معلومات کے بغیر فائل سے موجودہ ڈیٹا کو اپ ڈیٹ کرنے یا ڈیٹا بیس میں نئی اشیاء شامل کرنے کی اجازت دیتا ہے۔
+FormatedImportDesc2=پہلا قدم یہ ہے کہ آپ جس قسم کے ڈیٹا کو درآمد کرنا چاہتے ہیں اس کا انتخاب کریں، پھر سورس فائل کا فارمیٹ، پھر وہ فیلڈز جو آپ درآمد کرنا چاہتے ہیں۔
+FormatedExport=ایکسپورٹ اسسٹنٹ
+FormatedExportDesc1=یہ ٹولز اسسٹنٹ کا استعمال کرتے ہوئے ذاتی ڈیٹا برآمد کرنے کی اجازت دیتے ہیں، تاکہ تکنیکی معلومات کی ضرورت کے بغیر آپ کو اس عمل میں مدد ملے۔
+FormatedExportDesc2=پہلا قدم پہلے سے طے شدہ ڈیٹاسیٹ کا انتخاب کرنا ہے، پھر آپ کن فیلڈز کو ایکسپورٹ کرنا چاہتے ہیں، اور کس ترتیب میں۔
+FormatedExportDesc3=جب برآمد کرنے کے لیے ڈیٹا منتخب کیا جاتا ہے، تو آپ آؤٹ پٹ فائل کا فارمیٹ منتخب کر سکتے ہیں۔
+Sheet=چادر
+NoImportableData=کوئی درآمدی ڈیٹا نہیں (ڈیٹا کی درآمد کی اجازت دینے کے لیے تعریفوں والا کوئی ماڈیول نہیں)
+FileSuccessfullyBuilt=فائل تیار کی گئی۔
+SQLUsedForExport=ڈیٹا نکالنے کے لیے استعمال ہونے والی SQL درخواست
+LineId=لائن کی شناخت
+LineLabel=لائن کا لیبل
+LineDescription=لائن کی تفصیل
+LineUnitPrice=لائن کی یونٹ قیمت
+LineVATRate=لائن کی VAT شرح
+LineQty=لائن کے لئے مقدار
+LineTotalHT=رقم کے علاوہ لائن کے لئے ٹیکس
+LineTotalTTC=لائن کے لیے ٹیکس کے ساتھ رقم
+LineTotalVAT=لائن کے لیے VAT کی رقم
+TypeOfLineServiceOrProduct=لائن کی قسم (0=پروڈکٹ، 1=سروس)
+FileWithDataToImport=درآمد کرنے کے لیے ڈیٹا کے ساتھ فائل کریں۔
+FileToImport=درآمد کرنے کے لیے سورس فائل
+FileMustHaveOneOfFollowingFormat=درآمد کرنے کے لیے فائل میں درج ذیل فارمیٹس میں سے ایک ہونا ضروری ہے۔
+DownloadEmptyExample=فیلڈ مواد کی معلومات کے ساتھ ٹیمپلیٹ فائل ڈاؤن لوڈ کریں۔
+StarAreMandatory=* لازمی فیلڈز ہیں۔
+ChooseFormatOfFileToImport=اسے منتخب کرنے کے لیے %s آئیکن پر کلک کرکے امپورٹ فائل فارمیٹ کے طور پر استعمال کرنے کے لیے فائل فارمیٹ کا انتخاب کریں...
+ChooseFileToImport=فائل اپ لوڈ کریں پھر %s آئیکن پر کلک کریں تاکہ فائل کو سورس امپورٹ فائل کے طور پر منتخب کیا جا سکے۔
+SourceFileFormat=ماخذ فائل کی شکل
+FieldsInSourceFile=سورس فائل میں فیلڈز
+FieldsInTargetDatabase=Dolibarr ڈیٹا بیس میں ٹارگٹ فیلڈز (بولڈ = لازمی)
+Field=میدان
+NoFields=کوئی فیلڈز نہیں۔
+MoveField=فیلڈ کالم نمبر %s منتقل کریں۔
+ExampleOfImportFile=امپورٹ_فائل کی_مثال
+SaveImportProfile=اس درآمدی پروفائل کو محفوظ کریں۔
+ErrorImportDuplicateProfil=اس نام کے ساتھ اس درآمدی پروفائل کو محفوظ کرنے میں ناکام۔ اس نام کے ساتھ ایک موجودہ پروفائل پہلے سے موجود ہے۔
+TablesTarget=ھدف شدہ میزیں۔
+FieldsTarget=ٹارگٹڈ فیلڈز
+FieldTarget=ٹارگٹڈ فیلڈ
+FieldSource=سورس فیلڈ
+NbOfSourceLines=سورس فائل میں لائنوں کی تعداد
+NowClickToTestTheImport=چیک کریں کہ آپ کی فائل کا فائل فارمیٹ (فیلڈ اور سٹرنگ ڈیلیمیٹر) دکھائے گئے آپشنز سے میل کھاتا ہے اور یہ کہ آپ نے ہیڈر لائن کو چھوڑ دیا ہے، یا ان کو درج ذیل سمولیشن میں غلطیوں کے طور پر نشان زد کیا جائے گا۔ <br> فائل کے ڈھانچے/مواد کی جانچ پڑتال کرنے اور درآمدی عمل کی نقل کرنے کے لیے "<b> %s </b>" بٹن پر کلک کریں۔ <br> <b> آپ کے ڈیٹا بیس میں کوئی ڈیٹا تبدیل نہیں کیا جائے گا </b>۔
+RunSimulateImportFile=امپورٹ سمولیشن چلائیں۔
+FieldNeedSource=اس فیلڈ کو سورس فائل سے ڈیٹا درکار ہے۔
+SomeMandatoryFieldHaveNoSource=کچھ لازمی فیلڈز کا ڈیٹا فائل کا کوئی ذریعہ نہیں ہے۔
+InformationOnSourceFile=سورس فائل پر معلومات
+InformationOnTargetTables=ٹارگٹ فیلڈز کے بارے میں معلومات
+SelectAtLeastOneField=ایکسپورٹ کرنے کے لیے فیلڈز کے کالم میں کم از کم ایک سورس فیلڈ کو سوئچ کریں۔
+SelectFormat=اس امپورٹ فائل فارمیٹ کو منتخب کریں۔
+RunImportFile=ڈیٹا درآمد کریں۔
+NowClickToRunTheImport=امپورٹ سمولیشن کے نتائج چیک کریں۔ کسی بھی غلطی کو درست کریں اور دوبارہ ٹیسٹ کریں۔ <br> جب تخروپن کسی غلطی کی اطلاع نہیں دیتا ہے تو آپ ڈیٹا بیس میں ڈیٹا درآمد کرنے کے لیے آگے بڑھ سکتے ہیں۔
+DataLoadedWithId=درآمد شدہ ڈیٹا میں اس درآمدی id کے ساتھ ہر ڈیٹابیس ٹیبل میں ایک اضافی فیلڈ ہوگی: <b> %s </b>، تاکہ اس درآمد سے متعلق کسی مسئلے کی تحقیقات کی صورت میں اسے قابل تلاش بنایا جاسکے۔
+ErrorMissingMandatoryValue=فیلڈ <b> %s </b> کے لیے سورس فائل میں لازمی ڈیٹا خالی ہے۔
+TooMuchErrors=اب بھی <b> %s </b> دیگر سورس لائنیں ہیں جن میں خامیاں ہیں لیکن آؤٹ پٹ محدود ہے۔
+TooMuchWarnings=اب بھی <b> %s </b> انتباہات کے ساتھ دیگر سورس لائنیں ہیں لیکن آؤٹ پٹ محدود ہے۔
+EmptyLine=خالی لائن (چھوڑ دی جائے گی)
+CorrectErrorBeforeRunningImport=آپ کو <b> کو </b> </b> کو حتمی درآمد چلانے سے پہلے <b> تمام خرابیوں کو درست کرنا ہوگا۔
+FileWasImported=فائل نمبر <b> %s </b> کے ساتھ درآمد کی گئی تھی۔
+YouCanUseImportIdToFindRecord=آپ فیلڈ میں فلٹر کرکے اپنے ڈیٹا بیس میں درآمد شدہ تمام ریکارڈز تلاش کرسکتے ہیں <b> import_key='%s' </b> ۔
+NbOfLinesOK=لائنوں کی تعداد جس میں کوئی غلطی اور کوئی انتباہ نہیں ہے: <b> %s </b> ۔
+NbOfLinesImported=کامیابی سے درآمد شدہ لائنوں کی تعداد: <b> %s </b> ۔
+DataComeFromNoWhere=داخل کرنے کی قدر سورس فائل میں کہیں سے نہیں آتی ہے۔
+DataComeFromFileFieldNb=داخل کرنے کی قدر سورس فائل میں فیلڈ نمبر <b> %s </b> سے آتی ہے۔
+DataComeFromIdFoundFromRef=ماخذ فائل کے فیلڈ نمبر <b> %s </b> سے آنے والی قدر کو استعمال کرنے کے لیے پیرنٹ آبجیکٹ کی id تلاش کرنے کے لیے استعمال کیا جائے گا (لہذا آبجیکٹ <b> a0ecb2ec87f49f49f77fz کے پاس موجود فائل میں موجود ڈیٹا ہے)۔
+DataComeFromIdFoundFromCodeId=کوڈ جو ماخذ فائل کے فیلڈ نمبر <b> %s </b> سے آتا ہے استعمال کرنے کے لیے پیرنٹ آبجیکٹ کی شناخت تلاش کرنے کے لیے استعمال کیا جائے گا (لہذا ماخذ فائل کا کوڈ لغت میں موجود ہونا چاہیے نوٹ کریں کہ اگر آپ کو آئی ڈی معلوم ہے تو آپ اسے کوڈ کے بجائے سورس فائل میں بھی استعمال کر سکتے ہیں۔ درآمد دونوں صورتوں میں کام کرنا چاہئے.
+DataIsInsertedInto=سورس فائل سے آنے والا ڈیٹا درج ذیل فیلڈ میں داخل کیا جائے گا:
+DataIDSourceIsInsertedInto=پیرنٹ آبجیکٹ کی آئی ڈی، جو سورس فائل میں ڈیٹا کا استعمال کرتے ہوئے پائی گئی تھی، درج ذیل فیلڈ میں ڈالی جائے گی:
+DataCodeIDSourceIsInsertedInto=پیرنٹ لائن کی آئی ڈی، جو کوڈ سے ملی تھی، درج ذیل فیلڈ میں ڈالی جائے گی:
+SourceRequired=ڈیٹا ویلیو لازمی ہے۔
+SourceExample=ممکنہ ڈیٹا ویلیو کی مثال
+ExampleAnyRefFoundIntoElement=عنصر <b> %s </b> کے لیے کوئی بھی حوالہ ملا
+ExampleAnyCodeOrIdFoundIntoDictionary=ڈکشنری <b> %s </b> میں کوئی کوڈ (یا id) ملا
+CSVFormatDesc= <b> کوما سے الگ کردہ قدر </b> فائل فارمیٹ (.csv)۔ <br> یہ ایک ٹیکسٹ فائل فارمیٹ ہے جہاں فیلڈز کو الگ کرنے والے کے ذریعے الگ کیا جاتا ہے [ %s ]۔ اگر الگ کرنے والا کسی فیلڈ کے مواد کے اندر پایا جاتا ہے، تو فیلڈ کو گول کریکٹر [ %s ] سے گول کیا جاتا ہے۔ گول کریکٹر سے بچنے کے لیے Escape کریکٹر ہے [ %s ]۔
+Excel95FormatDesc= <b> Excel </b> فائل فارمیٹ (.xls) <br> یہ مقامی Excel 95 فارمیٹ (BIFF5) ہے۔
+Excel2007FormatDesc= <b> Excel </b> فائل فارمیٹ (.xlsx) <br> یہ مقامی Excel 2007 فارمیٹ (SpreadsheetML) ہے۔
+TsvFormatDesc= <b> ٹیب الگ شدہ قدر </b> فائل فارمیٹ (.tsv) <br> یہ ایک ٹیکسٹ فائل فارمیٹ ہے جہاں فیلڈز کو ٹیبلیٹر [ٹیب] کے ذریعے الگ کیا جاتا ہے۔
+ExportFieldAutomaticallyAdded=فیلڈ <b> %s </b> خود بخود شامل ہو گیا۔ یہ آپ کو ڈپلیکیٹ ریکارڈ کے طور پر ماننے کے لیے ایک جیسی لائنیں رکھنے سے گریز کرے گا (اس فیلڈ کو شامل کرنے کے ساتھ، تمام لائنیں اپنی شناخت کی مالک ہوں گی اور مختلف ہوں گی)۔
+CsvOptions=CSV فارمیٹ کے اختیارات
+Separator=فیلڈ الگ کرنے والا
+Enclosure=سٹرنگ ڈیلیمیٹر
+SpecialCode=خصوصی کوڈ
+ExportStringFilter=%% متن میں ایک یا زیادہ حروف کو تبدیل کرنے کی اجازت دیتا ہے
+ExportDateFilter=YYYY، YYYYMM، YYYYMMDD: فلٹرز ایک سال/ماہ/دن کے حساب سے اگلے سال/مہینے/دن
+ExportNumericFilter=NNNNN فلٹرز ایک قدر کے لحاظ سے
+ImportFromLine=لائن نمبر سے شروع ہونے والی درآمد
+EndAtLineNb=لائن نمبر پر ختم کریں۔
+ImportFromToLine=حد کی حد (سے - تک)۔ مثلاً ہیڈر لائن کو چھوڑنے کے لیے۔
+SetThisValueTo2ToExcludeFirstLine=مثال کے طور پر، 2 پہلی لائنوں کو خارج کرنے کے لیے اس قدر کو 3 پر سیٹ کریں۔ <br> اگر ہیڈر لائنوں کو نہیں چھوڑا جاتا ہے، تو اس کے نتیجے میں امپورٹ سمولیشن میں متعدد خرابیاں پیدا ہوں گی۔
+KeepEmptyToGoToEndOfFile=فائل کے آخر تک تمام لائنوں پر کارروائی کرنے کے لیے اس فیلڈ کو خالی رکھیں۔
+SelectPrimaryColumnsForUpdateAttempt=اپ ڈیٹ درآمد کے لیے بنیادی کلید کے طور پر استعمال کرنے کے لیے کالم منتخب کریں۔
+UpdateNotYetSupportedForThisImport=اس قسم کی درآمد کے لیے اپ ڈیٹ تعاون یافتہ نہیں ہے (صرف داخل کریں)
+NoUpdateAttempt=اپ ڈیٹ کی کوئی کوشش نہیں کی گئی، صرف داخل کریں۔
+ImportDataset_user_1=صارفین (ملازمین یا نہیں) اور خصوصیات
+ComputedField=شمار شدہ فیلڈ
 ## filters
-SelectFilterFields=If you want to filter on some values, just input values here.
-FilteredFields=Filtered fields
-FilteredFieldsValues=Value for filter
-FormatControlRule=Format control rule
+SelectFilterFields=اگر آپ کچھ قدروں پر فلٹر کرنا چاہتے ہیں، تو یہاں صرف اقدار درج کریں۔
+FilteredFields=فلٹر شدہ فیلڈز
+FilteredFieldsValues=فلٹر کی قدر
+FormatControlRule=فارمیٹ کنٹرول اصول
 ## imports updates
-KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
-NbInsert=Number of inserted lines: %s
-NbUpdate=Number of updated lines: %s
-MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
-StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
+KeysToUseForUpdates=<b> </b> موجودہ ڈیٹا کو اپ ڈیٹ کرنے کے لیے استعمال کرنے کے لیے کلید (کالم)
+NbInsert=داخل کردہ لائنوں کی تعداد: %s
+NbUpdate=اپ ڈیٹ کردہ لائنوں کی تعداد: %s
+MultipleRecordFoundWithTheseFilters=ان فلٹرز کے ساتھ متعدد ریکارڈز ملے ہیں: %s
+StocksWithBatch=بیچ/سیریل نمبر والی مصنوعات کا اسٹاک اور مقام (گودام)
diff --git a/htdocs/langs/ur_PK/externalsite.lang b/htdocs/langs/ur_PK/externalsite.lang
index 452100c65b3..6663e35aa30 100644
--- a/htdocs/langs/ur_PK/externalsite.lang
+++ b/htdocs/langs/ur_PK/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=Setup link to external website
-ExternalSiteURL=External Site URL of HTML iframe content
-ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
-ExampleMyMenuEntry=My menu entry
+ExternalSiteSetup=بیرونی ویب سائٹ کا لنک سیٹ کریں۔
+ExternalSiteURL=HTML iframe مواد کا بیرونی سائٹ URL
+ExternalSiteModuleNotComplete=ماڈیول ExternalSite کو صحیح طریقے سے کنفیگر نہیں کیا گیا تھا۔
+ExampleMyMenuEntry=میرا مینو اندراج
diff --git a/htdocs/langs/ur_PK/ftp.lang b/htdocs/langs/ur_PK/ftp.lang
index 254a2a698ce..26c4647aa20 100644
--- a/htdocs/langs/ur_PK/ftp.lang
+++ b/htdocs/langs/ur_PK/ftp.lang
@@ -1,14 +1,14 @@
 # Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=FTP or SFTP Client module setup
-NewFTPClient=New FTP/FTPS connection setup
-FTPArea=FTP/FTPS Area
-FTPAreaDesc=This screen shows a view of an FTP et SFTP server.
-SetupOfFTPClientModuleNotComplete=The setup of the FTP or SFTP client module seems to be incomplete
-FTPFeatureNotSupportedByYourPHP=Your PHP does not support FTP or SFTP functions
-FailedToConnectToFTPServer=Failed to connect to server (server %s, port %s)
-FailedToConnectToFTPServerWithCredentials=Failed to login to server with defined login/password
-FTPFailedToRemoveFile=Failed to remove file <b>%s</b>.
-FTPFailedToRemoveDir=Failed to remove directory <b>%s</b>: check permissions and that the directory is empty.
-FTPPassiveMode=Passive mode
-ChooseAFTPEntryIntoMenu=Choose a FTP/SFTP site from the menu...
-FailedToGetFile=Failed to get files %s
+FTPClientSetup=FTP یا SFTP کلائنٹ ماڈیول سیٹ اپ
+NewFTPClient=نیا FTP/FTPS کنکشن سیٹ اپ
+FTPArea=FTP/FTPS ایریا
+FTPAreaDesc=یہ اسکرین FTP اور SFTP سرور کا منظر دکھاتی ہے۔
+SetupOfFTPClientModuleNotComplete=FTP یا SFTP کلائنٹ ماڈیول کا سیٹ اپ نامکمل لگتا ہے۔
+FTPFeatureNotSupportedByYourPHP=آپ کا پی ایچ پی FTP یا SFTP فنکشنز کو سپورٹ نہیں کرتا ہے۔
+FailedToConnectToFTPServer=سرور سے منسلک ہونے میں ناکام (سرور %s، پورٹ %s)
+FailedToConnectToFTPServerWithCredentials=متعین لاگ ان/پاس ورڈ کے ساتھ سرور میں لاگ ان کرنے میں ناکام
+FTPFailedToRemoveFile=فائل کو ہٹانے میں ناکام <b> %s </b> ۔
+FTPFailedToRemoveDir=ڈائرکٹری کو ہٹانے میں ناکام <b> %s </b> : اجازتیں چیک کریں اور یہ کہ ڈائرکٹری خالی ہے۔
+FTPPassiveMode=غیر فعال موڈ
+ChooseAFTPEntryIntoMenu=مینو سے ایک FTP/SFTP سائٹ منتخب کریں...
+FailedToGetFile=فائلیں %s حاصل کرنے میں ناکام
diff --git a/htdocs/langs/ur_PK/help.lang b/htdocs/langs/ur_PK/help.lang
index d699cb56fd2..d0408469009 100644
--- a/htdocs/langs/ur_PK/help.lang
+++ b/htdocs/langs/ur_PK/help.lang
@@ -1,23 +1,23 @@
 # Dolibarr language file - Source file is en_US - help
-CommunitySupport=Forum/Wiki support
-EMailSupport=Emails support
-RemoteControlSupport=Online real-time / remote support
-OtherSupport=Other support
-ToSeeListOfAvailableRessources=To contact/see available resources:
-HelpCenter=Help Center
-DolibarrHelpCenter=Dolibarr Help and Support Center
-ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
-TypeOfSupport=Type of support
-TypeSupportCommunauty=Community (free)
-TypeSupportCommercial=Commercial
-TypeOfHelp=Type
-NeedHelpCenter=Need help or support?
-Efficiency=Efficiency
-TypeHelpOnly=Help only
-TypeHelpDev=Help+Development
-TypeHelpDevForm=Help+Development+Training
-BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
-LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
-PossibleLanguages=Supported languages
-SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
-SeeOfficalSupport=For official Dolibarr support in your language: <br><b><a href="%s" target="_blank" rel="noopener noreferrer">%s</a></b>
+CommunitySupport=فورم/وکی سپورٹ
+EMailSupport=ای میلز سپورٹ
+RemoteControlSupport=آن لائن ریئل ٹائم / ریموٹ سپورٹ
+OtherSupport=دیگر سپورٹ
+ToSeeListOfAvailableRessources=دستیاب وسائل سے رابطہ کرنے/دیکھنے کے لیے:
+HelpCenter=مدداور تعاون کا مرکز
+DolibarrHelpCenter=ڈولیبر ہیلپ اینڈ سپورٹ سینٹر
+ToGoBackToDolibarr=دوسری صورت میں، <a href="%s"> Dolibarr </a> استعمال کرنا جاری رکھنے کے لیے یہاں کلک کریں۔
+TypeOfSupport=سپورٹ کی قسم
+TypeSupportCommunauty=کمیونٹی (مفت)
+TypeSupportCommercial=کمرشل
+TypeOfHelp=قسم
+NeedHelpCenter=مدد یا مدد کی ضرورت ہے؟
+Efficiency=کارکردگی
+TypeHelpOnly=صرف مدد کریں۔
+TypeHelpDev=مدد + ترقی
+TypeHelpDevForm=مدد + ترقی + تربیت
+BackToHelpCenter=بصورت دیگر، <a href="%s"> ہیلپ سنٹر کے ہوم پیج پر واپس جائیں </a>۔
+LinkToGoldMember=آپ اپنی زبان (%s) کے لیے Dolibarr کے منتخب کردہ ٹرینرز میں سے کسی ایک کو ان کے ویجیٹ پر کلک کر کے کال کر سکتے ہیں (اسٹیٹس اور زیادہ سے زیادہ قیمت خود بخود اپ ڈیٹ ہو جاتی ہے):
+PossibleLanguages=معاون زبانیں۔
+SubscribeToFoundation=Dolibarr پروجیکٹ میں مدد کریں، فاؤنڈیشن کو سبسکرائب کریں۔
+SeeOfficalSupport=آپ کی زبان میں آفیشل ڈولیبر سپورٹ کے لیے: <br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a> a09a4b739f170f
diff --git a/htdocs/langs/ur_PK/holiday.lang b/htdocs/langs/ur_PK/holiday.lang
index dceaef59081..ce82371e754 100644
--- a/htdocs/langs/ur_PK/holiday.lang
+++ b/htdocs/langs/ur_PK/holiday.lang
@@ -1,137 +1,137 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Leave
-CPTitreMenu=Leave
-MenuReportMonth=Monthly statement
-MenuAddCP=New leave request
-NotActiveModCP=You must enable the module Leave to view this page.
-AddCP=Make a leave request
-DateDebCP=Start date
-DateFinCP=End date
-DraftCP=Draft
-ToReviewCP=Awaiting approval
-ApprovedCP=Approved
-CancelCP=Canceled
-RefuseCP=Refused
-ValidatorCP=Approver
-ListeCP=List of leave
-Leave=Leave request
-LeaveId=Leave ID
-ReviewedByCP=Will be approved by
-UserID=User ID
-UserForApprovalID=User for approval ID
-UserForApprovalFirstname=First name of approval user
-UserForApprovalLastname=Last name of approval user
-UserForApprovalLogin=Login of approval user
-DescCP=Description
-SendRequestCP=Create leave request
-DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Balance of leave
-SoldeCPUser=Leave balance (in days) <b>%s</b>
-ErrorEndDateCP=You must select an end date greater than the start date.
-ErrorSQLCreateCP=An SQL error occurred during the creation:
-ErrorIDFicheCP=An error has occurred, the leave request does not exist.
-ReturnCP=Return to previous page
-ErrorUserViewCP=You are not authorized to read this leave request.
-InfosWorkflowCP=Information Workflow
-RequestByCP=Requested by
-TitreRequestCP=Leave request
-TypeOfLeaveId=Type of leave ID
-TypeOfLeaveCode=Type of leave code
-TypeOfLeaveLabel=Type of leave label
-NbUseDaysCP=Number of days of leave used
-NbUseDaysCPHelp=The calculation takes into account the non-working days and the holidays defined in the dictionary.
-NbUseDaysCPShort=Days of leave
-NbUseDaysCPShortInMonth=Days of leave in month
-DayIsANonWorkingDay=%s is a non-working day
-DateStartInMonth=Start date in month
-DateEndInMonth=End date in month
-EditCP=Edit
-DeleteCP=Delete
-ActionRefuseCP=Refuse
-ActionCancelCP=Cancel
-StatutCP=Status
-TitleDeleteCP=Delete the leave request
-ConfirmDeleteCP=Confirm the deletion of this leave request?
-ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
-CantCreateCP=You don't have the right to make leave requests.
-InvalidValidatorCP=You must choose the approver for your leave request.
-NoDateDebut=You must select a start date.
-NoDateFin=You must select an end date.
-ErrorDureeCP=Your leave request does not contain working day.
-TitleValidCP=Approve the leave request
-ConfirmValidCP=Are you sure you want to approve the leave request?
-DateValidCP=Date approved
-TitleToValidCP=Send leave request
-ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Refuse the leave request
-ConfirmRefuseCP=Are you sure you want to refuse the leave request?
-NoMotifRefuseCP=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the leave request
-ConfirmCancelCP=Are you sure you want to cancel the leave request?
-DetailRefusCP=Reason for refusal
-DateRefusCP=Date of refusal
-DateCancelCP=Date of cancellation
-DefineEventUserCP=Assign an exceptional leave for a user
-addEventToUserCP=Assign leave
-NotTheAssignedApprover=You are not the assigned approver
-MotifCP=Reason
-UserCP=User
-ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
-AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View change logs
-LogCP=Log of all updates made to "Balance of Leave"
-ActionByCP=Updated by
-UserUpdateCP=Updated for
-PrevSoldeCP=Previous Balance
-NewSoldeCP=New Balance
-alreadyCPexist=A leave request has already been done on this period.
-FirstDayOfHoliday=Beginning day of leave request
-LastDayOfHoliday=Ending day of leave request
-BoxTitleLastLeaveRequests=Latest %s modified leave requests
-HolidaysMonthlyUpdate=Monthly update
-ManualUpdate=Manual update
-HolidaysCancelation=Leave request cancelation
-EmployeeLastname=Employee last name
-EmployeeFirstname=Employee first name
-TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
-LastHolidays=Latest %s leave requests
-AllHolidays=All leave requests
-HalfDay=Half day
-NotTheAssignedApprover=You are not the assigned approver
-LEAVE_PAID=Paid vacation
-LEAVE_SICK=Sick leave
-LEAVE_OTHER=Other leave
-LEAVE_PAID_FR=Paid vacation
+Holidays=چھوڑو
+CPTitreMenu=چھوڑو
+MenuReportMonth=ماہانہ بیان
+MenuAddCP=چھٹی کی نئی درخواست
+NotActiveModCP=اس صفحہ کو دیکھنے کے لیے آپ کو ماڈیول Leave کو فعال کرنا ہوگا۔
+AddCP=چھٹی کی درخواست کریں۔
+DateDebCP=شروع کرنے کی تاریخ
+DateFinCP=آخری تاریخ
+DraftCP=مسودہ
+ToReviewCP=منظوری کا انتظار ہے۔
+ApprovedCP=منظورشدہ
+CancelCP=منسوخ
+RefuseCP=انکار کر دیا
+ValidatorCP=منظور کرنے والا
+ListeCP=رخصت کی فہرست
+Leave=درخواست چھوڑ دیں۔
+LeaveId=ID چھوڑ دیں۔
+ReviewedByCP=کی طرف سے منظور کیا جائے گا
+UserID=صارف کی شناخت
+UserForApprovalID=منظوری ID کے لیے صارف
+UserForApprovalFirstname=منظوری صارف کا پہلا نام
+UserForApprovalLastname=منظوری صارف کا آخری نام
+UserForApprovalLogin=منظوری صارف کا لاگ ان
+DescCP=تفصیل
+SendRequestCP=چھٹی کی درخواست بنائیں
+DelayToRequestCP=چھٹی کی درخواستیں کم از کم <b> %s دن (s) </b> سے پہلے کی جانی چاہئیں۔
+MenuConfCP=چھٹی کا توازن
+SoldeCPUser=بیلنس چھوڑیں (دنوں میں) <b> %s </b>
+ErrorEndDateCP=آپ کو ایک اختتامی تاریخ منتخب کرنا ہوگی جو تاریخ آغاز سے بڑی ہو۔
+ErrorSQLCreateCP=تخلیق کے دوران ایک ایس کیو ایل کی خرابی واقع ہوئی:
+ErrorIDFicheCP=ایک خرابی پیش آ گئی ہے، چھٹی کی درخواست موجود نہیں ہے۔
+ReturnCP=پچھلے صفحے پر واپس جائیں
+ErrorUserViewCP=آپ اس چھٹی کی درخواست کو پڑھنے کے مجاز نہیں ہیں۔
+InfosWorkflowCP=انفارمیشن ورک فلو
+RequestByCP=کی طرف سے درخواست
+TitreRequestCP=درخواست چھوڑ دیں۔
+TypeOfLeaveId=چھٹی کی شناخت کی قسم
+TypeOfLeaveCode=چھٹی کوڈ کی قسم
+TypeOfLeaveLabel=چھٹی کے لیبل کی قسم
+NbUseDaysCP=استعمال شدہ چھٹی کے دنوں کی تعداد
+NbUseDaysCPHelp=حساب کتاب غیر کام کے دنوں اور لغت میں بیان کردہ تعطیلات کو مدنظر رکھتا ہے۔
+NbUseDaysCPShort=چھٹی کے دن
+NbUseDaysCPShortInMonth=مہینے میں چھٹی کے دن
+DayIsANonWorkingDay=%s ایک غیر کام کا دن ہے۔
+DateStartInMonth=مہینے میں شروع ہونے کی تاریخ
+DateEndInMonth=مہینے میں اختتامی تاریخ
+EditCP=ترمیم
+DeleteCP=حذف کریں۔
+ActionRefuseCP=انکار
+ActionCancelCP=منسوخ کریں۔
+StatutCP=حالت
+TitleDeleteCP=چھٹی کی درخواست کو حذف کریں۔
+ConfirmDeleteCP=اس چھٹی کی درخواست کو حذف کرنے کی تصدیق کریں؟
+ErrorCantDeleteCP=غلطی آپ کو اس چھٹی کی درخواست کو حذف کرنے کا حق نہیں ہے۔
+CantCreateCP=آپ کو چھٹی کی درخواستیں کرنے کا حق نہیں ہے۔
+InvalidValidatorCP=آپ کو اپنی چھٹی کی درخواست کے لیے منظور کنندہ کا انتخاب کرنا چاہیے۔
+NoDateDebut=آپ کو شروع کی تاریخ کا انتخاب کرنا ہوگا۔
+NoDateFin=آپ کو ایک اختتامی تاریخ منتخب کرنی ہوگی۔
+ErrorDureeCP=آپ کی چھٹی کی درخواست میں کام کا دن شامل نہیں ہے۔
+TitleValidCP=چھٹی کی درخواست منظور کریں۔
+ConfirmValidCP=کیا آپ واقعی چھٹی کی درخواست کو منظور کرنا چاہتے ہیں؟
+DateValidCP=منظور شدہ تاریخ
+TitleToValidCP=چھٹی کی درخواست بھیجیں۔
+ConfirmToValidCP=کیا آپ واقعی چھٹی کی درخواست بھیجنا چاہتے ہیں؟
+TitleRefuseCP=چھٹی کی درخواست کو مسترد کریں۔
+ConfirmRefuseCP=کیا آپ واقعی چھٹی کی درخواست کو مسترد کرنا چاہتے ہیں؟
+NoMotifRefuseCP=آپ کو درخواست کو مسترد کرنے کی وجہ کا انتخاب کرنا ہوگا۔
+TitleCancelCP=چھٹی کی درخواست منسوخ کریں۔
+ConfirmCancelCP=کیا آپ واقعی چھٹی کی درخواست منسوخ کرنا چاہتے ہیں؟
+DetailRefusCP=انکار کی وجہ
+DateRefusCP=انکار کی تاریخ
+DateCancelCP=منسوخی کی تاریخ
+DefineEventUserCP=کسی صارف کے لیے غیر معمولی چھٹی تفویض کریں۔
+addEventToUserCP=چھٹی تفویض کریں۔
+NotTheAssignedApprover=آپ تفویض کردہ منظور کنندہ نہیں ہیں۔
+MotifCP=وجہ
+UserCP=صارف
+ErrorAddEventToUserCP=غیر معمولی چھٹی شامل کرتے وقت ایک خرابی پیش آگئی۔
+AddEventToUserOkCP=غیر معمولی چھٹی کا اضافہ مکمل ہو گیا ہے۔
+MenuLogCP=تبدیلی کے نوشتہ جات دیکھیں
+LogCP="بیلنس آف لیو" میں کی گئی تمام اپ ڈیٹس کا لاگ
+ActionByCP=کی طرف سے اپ ڈیٹ
+UserUpdateCP=کے لیے اپ ڈیٹ کیا گیا۔
+PrevSoldeCP=پچھلا بیلنس
+NewSoldeCP=نیا بیلنس
+alreadyCPexist=اس مدت پر چھٹی کی درخواست پہلے ہی کی جا چکی ہے۔
+FirstDayOfHoliday=چھٹی کی درخواست کا ابتدائی دن
+LastDayOfHoliday=چھٹی کی درخواست کا اختتامی دن
+BoxTitleLastLeaveRequests=تازہ ترین %s ترمیم شدہ چھٹی کی درخواستیں۔
+HolidaysMonthlyUpdate=ماہانہ اپ ڈیٹ
+ManualUpdate=دستی اپ ڈیٹ
+HolidaysCancelation=درخواست منسوخی چھوڑ دیں۔
+EmployeeLastname=ملازم کا آخری نام
+EmployeeFirstname=ملازم کا پہلا نام
+TypeWasDisabledOrRemoved=چھوڑنے کی قسم (id %s) کو غیر فعال یا ہٹا دیا گیا تھا۔
+LastHolidays=تازہ ترین %s چھٹی کی درخواستیں۔
+AllHolidays=تمام رخصت کی درخواستیں۔
+HalfDay=ادھا دن
+NotTheAssignedApprover=آپ تفویض کردہ منظور کنندہ نہیں ہیں۔
+LEAVE_PAID=ادا شدہ چھٹی
+LEAVE_SICK=بیماری کی چھٹی
+LEAVE_OTHER=دوسرے رخصت
+LEAVE_PAID_FR=ادا شدہ چھٹی
 ## Configuration du Module ##
-LastUpdateCP=Last automatic update of leave allocation
-MonthOfLastMonthlyUpdate=Month of last automatic update of leave allocation
-UpdateConfCPOK=Updated successfully.
-Module27130Name= Management of leave requests
-Module27130Desc= Management of leave requests
-ErrorMailNotSend=An error occurred while sending email:
-NoticePeriod=Notice period
+LastUpdateCP=چھٹی مختص کی آخری خودکار اپ ڈیٹ
+MonthOfLastMonthlyUpdate=چھٹی مختص کی آخری خودکار اپ ڈیٹ کا مہینہ
+UpdateConfCPOK=کامیابی سے اپ ڈیٹ ہو گیا۔
+Module27130Name= چھٹی کی درخواستوں کا انتظام
+Module27130Desc= چھٹی کی درخواستوں کا انتظام
+ErrorMailNotSend=ای میل بھیجتے وقت ایک خرابی پیش آگئی:
+NoticePeriod=نوٹس کی مدت
 #Messages
-HolidaysToValidate=Validate leave requests
-HolidaysToValidateBody=Below is a leave request to validate
-HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
-HolidaysValidated=Validated leave requests
-HolidaysValidatedBody=Your leave request for %s to %s has been validated.
-HolidaysRefused=Request denied
-HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
-HolidaysCanceled=Canceled leaved request
-HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
-FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
-NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
-GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
-HolidaySetup=Setup of module Leave
-HolidaysNumberingModules=Numbering models for leave requests
-TemplatePDFHolidays=Template for leave requests PDF
-FreeLegalTextOnHolidays=Free text on PDF
-WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
-HolidaysToApprove=Holidays to approve
-NobodyHasPermissionToValidateHolidays=Nobody has permission to validate holidays
-HolidayBalanceMonthlyUpdate=Monthly update of holiday balance
-XIsAUsualNonWorkingDay=%s is usualy a NON working day
-ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=Leave request %s must be draft, canceled or refused to be deleted
+HolidaysToValidate=چھٹی کی درخواستوں کی توثیق کریں۔
+HolidaysToValidateBody=ذیل میں توثیق کے لیے چھٹی کی درخواست ہے۔
+HolidaysToValidateDelay=چھٹی کی یہ درخواست %s دنوں سے کم مدت کے اندر ہو گی۔
+HolidaysToValidateAlertSolde=جس صارف نے یہ چھٹی کی درخواست کی ہے اس کے پاس کافی دن دستیاب نہیں ہیں۔
+HolidaysValidated=توثیق شدہ چھٹی کی درخواستیں۔
+HolidaysValidatedBody=%s سے %s کے لیے آپ کی چھٹی کی درخواست کی توثیق کر دی گئی ہے۔
+HolidaysRefused=درخواست مسترد کر دی گئی۔
+HolidaysRefusedBody=%s سے %s کے لیے آپ کی چھٹی کی درخواست درج ذیل وجہ سے مسترد کر دی گئی ہے۔
+HolidaysCanceled=چھوڑی ہوئی درخواست منسوخ کر دی گئی۔
+HolidaysCanceledBody=%s سے %s کے لیے آپ کی چھٹی کی درخواست منسوخ کر دی گئی ہے۔
+FollowedByACounter=1: اس قسم کی چھٹی کے بعد کاؤنٹر کی ضرورت ہوتی ہے۔ کاؤنٹر کو دستی طور پر یا خود بخود بڑھایا جاتا ہے اور جب چھٹی کی درخواست کی توثیق ہو جاتی ہے تو کاؤنٹر کو کم کر دیا جاتا ہے۔ <br> 0: کاؤنٹر کے بعد نہیں ہے۔
+NoLeaveWithCounterDefined=چھٹی کی کوئی قسم کی وضاحت نہیں کی گئی ہے جس کی پیروی کاؤنٹر کے ذریعے کی جائے۔
+GoIntoDictionaryHolidayTypes=<strong> ہوم - سیٹ اپ - ڈکشنری - چھٹی کی قسم </strong> پتیوں کی مختلف اقسام کو ترتیب دینے کے لیے جائیں۔
+HolidaySetup=ماڈیول لیو کا سیٹ اپ
+HolidaysNumberingModules=چھٹی کی درخواستوں کے لیے نمبرنگ ماڈل
+TemplatePDFHolidays=چھٹی کی درخواستوں کے لیے سانچہ PDF
+FreeLegalTextOnHolidays=پی ڈی ایف پر مفت متن
+WatermarkOnDraftHolidayCards=ڈرافٹ چھٹی کی درخواستوں پر واٹر مارکس
+HolidaysToApprove=منظوری کے لیے چھٹیاں
+NobodyHasPermissionToValidateHolidays=کسی کو بھی تعطیلات کی توثیق کرنے کی اجازت نہیں ہے۔
+HolidayBalanceMonthlyUpdate=چھٹیوں کے بیلنس کی ماہانہ اپ ڈیٹ
+XIsAUsualNonWorkingDay=%s عام طور پر غیر کام کا دن ہوتا ہے۔
+ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=چھوڑنے کی درخواست %s کو مسودہ، منسوخ یا حذف کرنے سے انکار کیا جانا چاہیے
diff --git a/htdocs/langs/ur_PK/hrm.lang b/htdocs/langs/ur_PK/hrm.lang
index c571ec6ca8a..dd5c8e817cd 100644
--- a/htdocs/langs/ur_PK/hrm.lang
+++ b/htdocs/langs/ur_PK/hrm.lang
@@ -2,80 +2,80 @@
 
 
 # Admin
-HRM_EMAIL_EXTERNAL_SERVICE=Email to prevent HRM external service
-Establishments=Establishments
-Establishment=Establishment
-NewEstablishment=New establishment
-DeleteEstablishment=Delete establishment
-ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment?
-OpenEtablishment=Open establishment
-CloseEtablishment=Close establishment
+HRM_EMAIL_EXTERNAL_SERVICE=HRM بیرونی سروس کو روکنے کے لیے ای میل
+Establishments=اسٹیبلشمنٹس
+Establishment=اسٹیبلشمنٹ
+NewEstablishment=نئی اسٹیبلشمنٹ
+DeleteEstablishment=اسٹیبلشمنٹ کو حذف کریں۔
+ConfirmDeleteEstablishment=کیا آپ واقعی اس اسٹیبلشمنٹ کو حذف کرنا چاہتے ہیں؟
+OpenEtablishment=کھلی اسٹیبلشمنٹ
+CloseEtablishment=بند اسٹیبلشمنٹ
 # Dictionary
-DictionaryPublicHolidays=Leave - Public holidays
-DictionaryDepartment=HRM - Department list
-DictionaryFunction=HRM - Job positions
+DictionaryPublicHolidays=چھٹی - عوامی تعطیلات
+DictionaryDepartment=HRM - محکمہ کی فہرست
+DictionaryFunction=HRM - ملازمت کی پوزیشنیں۔
 # Module
-Employees=Employees
-Employee=Employee
-NewEmployee=New employee
-ListOfEmployees=List of employees
-HrmSetup=HRM module setup
-SkillsManagement=Skills management
-HRM_MAXRANK=Maximum number of levels to rank a skill
-HRM_DEFAULT_SKILL_DESCRIPTION=Default description of ranks when skill is created
-deplacement=Shift
-DateEval=Evaluation date
-JobCard=Job card
-JobPosition=Job
-JobsPosition=Jobs
-NewSkill=New Skill
-SkillType=Skill type
-Skilldets=List of ranks for this skill
-Skilldet=Skill level
-rank=Rank
-ErrNoSkillSelected=No skill selected
-ErrSkillAlreadyAdded=This skill is already in the list
-SkillHasNoLines=This skill has no lines
-skill=Skill
-Skills=Skills
-SkillCard=Skill card
-EmployeeSkillsUpdated=Employee skills have been updated (see "Skills" tab of employee card)
-Eval=Evaluation
-Evals=Evaluations
-NewEval=New evaluation
-ValidateEvaluation=Validate evaluation
-ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with reference <b>%s</b>?
-EvaluationCard=Evaluation card
-RequiredRank=Required rank for this job
-EmployeeRank=Employee rank for this skill
-EmployeePosition=Employee position
-EmployeePositions=Employee positions
-EmployeesInThisPosition=Employees in this position
-group1ToCompare=Usergroup to analyze
-group2ToCompare=Second usergroup for comparison
-OrJobToCompare=Compare to job skills requirements
-difference=Difference
-CompetenceAcquiredByOneOrMore=Competence acquired by one or more users but not requested by the second comparator
-MaxlevelGreaterThan=Max level greater than the one requested
-MaxLevelEqualTo=Max level equal to that demand
-MaxLevelLowerThan=Max level lower than that demand
-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
-legend=Legend
-TypeSkill=Skill type
-AddSkill=Add skills to job
-RequiredSkills=Required skills for this job
-UserRank=User Rank
-SkillList=Skill list
-SaveRank=Save rank
-knowHow=Know how
-HowToBe=How to be
-knowledge=Knowledge
-AbandonmentComment=Abandonment comment
-DateLastEval=Date last evaluation
-NoEval=No evaluation done for this employee
-HowManyUserWithThisMaxNote=Number of users with this rank
-HighestRank=Highest rank
-SkillComparison=Skill comparison
+Employees=ملازمین
+Employee=ملازم
+NewEmployee=نیا کارکن
+ListOfEmployees=ملازمین کی فہرست
+HrmSetup=HRM ماڈیول سیٹ اپ
+SkillsManagement=ہنر کا انتظام
+HRM_MAXRANK=کسی مہارت کی درجہ بندی کرنے کے لیے لیولز کی زیادہ سے زیادہ تعداد
+HRM_DEFAULT_SKILL_DESCRIPTION=صفوں کی پہلے سے طے شدہ تفصیل جب مہارت بنائی جاتی ہے۔
+deplacement=شفٹ
+DateEval=تشخیص کی تاریخ
+JobCard=جاب کارڈ
+JobPosition=جاب
+JobsPosition=نوکریاں
+NewSkill=نیا ہنر
+SkillType=مہارت کی قسم
+Skilldets=اس مہارت کے لیے درجات کی فہرست
+Skilldet=مہارت کی سطح
+rank=رینک
+ErrNoSkillSelected=کوئی ہنر منتخب نہیں کیا گیا۔
+ErrSkillAlreadyAdded=یہ مہارت پہلے سے ہی فہرست میں ہے۔
+SkillHasNoLines=اس مہارت کی کوئی لکیر نہیں ہے۔
+skill=ہنر
+Skills=ہنر
+SkillCard=ہنر کارڈ
+EmployeeSkillsUpdated=ملازمین کی مہارتوں کو اپ ڈیٹ کر دیا گیا ہے (ملازمین کارڈ کا "ہنر" ٹیب دیکھیں)
+Eval=تشخیص
+Evals=تشخیصات
+NewEval=نئی تشخیص
+ValidateEvaluation=تشخیص کی توثیق کریں۔
+ConfirmValidateEvaluation=کیا آپ واقعی <b> %s </b> حوالہ کے ساتھ اس تشخیص کی توثیق کرنا چاہتے ہیں؟
+EvaluationCard=تشخیصی کارڈ
+RequiredRank=اس نوکری کے لیے مطلوبہ رینک
+EmployeeRank=اس مہارت کے لیے ملازم کا درجہ
+EmployeePosition=ملازم کی پوزیشن
+EmployeePositions=ملازمین کے عہدے
+EmployeesInThisPosition=اس عہدے پر ملازمین
+group1ToCompare=تجزیہ کرنے کے لیے صارف گروپ
+group2ToCompare=موازنہ کے لیے دوسرا صارف گروپ
+OrJobToCompare=ملازمت کی مہارت کی ضروریات کا موازنہ کریں۔
+difference=فرق
+CompetenceAcquiredByOneOrMore=قابلیت ایک یا زیادہ صارفین نے حاصل کی ہے لیکن دوسرے موازنہ کنندہ کے ذریعہ درخواست نہیں کی گئی ہے۔
+MaxlevelGreaterThan=درخواست کردہ سے زیادہ سے زیادہ سطح
+MaxLevelEqualTo=اس مانگ کے برابر زیادہ سے زیادہ سطح
+MaxLevelLowerThan=زیادہ سے زیادہ سطح اس مانگ سے کم ہے۔
+MaxlevelGreaterThanShort=ملازم کی سطح درخواست کردہ سے زیادہ
+MaxLevelEqualToShort=ملازمین کی سطح اس مانگ کے برابر ہے۔
+MaxLevelLowerThanShort=ملازمین کی سطح اس مانگ سے کم ہے۔
+SkillNotAcquired=مہارت تمام صارفین کے ذریعہ حاصل نہیں کی گئی ہے اور دوسرے موازنہ کنندہ کے ذریعہ درخواست کی گئی ہے۔
+legend=لیجنڈ
+TypeSkill=مہارت کی قسم
+AddSkill=ملازمت میں مہارتیں شامل کریں۔
+RequiredSkills=اس کام کے لیے درکار ہنر
+UserRank=صارف کی درجہ بندی
+SkillList=ہنر کی فہرست
+SaveRank=رینک محفوظ کریں۔
+knowHow=جانتے ہیں کہ کس طرح
+HowToBe=کیسے بننا ہے۔
+knowledge=علم
+AbandonmentComment=ترک تبصرہ
+DateLastEval=آخری تشخیص کی تاریخ
+NoEval=اس ملازم کی کوئی تشخیص نہیں کی گئی۔
+HowManyUserWithThisMaxNote=اس رینک والے صارفین کی تعداد
+HighestRank=اعلیٰ ترین عہدہ
+SkillComparison=مہارت کا موازنہ
diff --git a/htdocs/langs/ur_PK/install.lang b/htdocs/langs/ur_PK/install.lang
index 989f6aa9793..e8847af94c0 100644
--- a/htdocs/langs/ur_PK/install.lang
+++ b/htdocs/langs/ur_PK/install.lang
@@ -1,219 +1,219 @@
 # Dolibarr language file - Source file is en_US - install
-InstallEasy=Just follow the instructions step by step.
-MiscellaneousChecks=Prerequisites check
-ConfFileExists=Configuration file <b>%s</b> exists.
-ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
-ConfFileCouldBeCreated=Configuration file <b>%s</b> could be created.
-ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
-ConfFileIsWritable=Configuration file <b>%s</b> is writable.
-ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
-ConfFileReload=Reloading parameters from configuration file.
-PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
-PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
-PHPSupportSessions=This PHP supports sessions.
-PHPSupport=This PHP supports %s functions.
-PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
-PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
-Recheck=Click here for a more detailed test
-ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
-ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
-ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
-ErrorPHPDoesNotSupportCalendar=Your PHP installation does not support php calendar extensions.
-ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
-ErrorPHPDoesNotSupportIntl=Your PHP installation does not support Intl functions.
-ErrorPHPDoesNotSupportMbstring=Your PHP installation does not support mbstring functions.
-ErrorPHPDoesNotSupportxDebug=Your PHP installation does not support extend debug functions.
-ErrorPHPDoesNotSupport=Your PHP installation does not support %s functions.
-ErrorDirDoesNotExists=Directory %s does not exist.
-ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
-ErrorWrongValueForParameter=You may have typed a wrong value for parameter '%s'.
-ErrorFailedToCreateDatabase=Failed to create database '%s'.
-ErrorFailedToConnectToDatabase=Failed to connect to database '%s'.
-ErrorDatabaseVersionTooLow=Database version (%s) too old. Version %s or higher is required.
-ErrorPHPVersionTooLow=PHP version too old. Version %s is required.
-ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
-ErrorDatabaseAlreadyExists=Database '%s' already exists.
-IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
-IfDatabaseExistsGoBackAndCheckCreate=If database already exists, go back and uncheck "Create database" option.
-WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
-PHPVersion=PHP Version
-License=Using license
-ConfigurationFile=Configuration file
-WebPagesDirectory=Directory where web pages are stored
-DocumentsDirectory=Directory to store uploaded and generated documents
-URLRoot=URL Root
-ForceHttps=Force secure connections (https)
-CheckToForceHttps=Check this option to force secure connections (https).<br>This requires that the web server is configured with an SSL certificate.
-DolibarrDatabase=Dolibarr Database
-DatabaseType=Database type
-DriverType=Driver type
-Server=Server
-ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
-ServerPortDescription=Database server port. Keep empty if unknown.
-DatabaseServer=Database server
-DatabaseName=Database name
-DatabasePrefix=Database table prefix
-DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
-AdminLogin=User account for the Dolibarr database owner.
-PasswordAgain=Retype password confirmation
-AdminPassword=Password for Dolibarr database owner.
-CreateDatabase=Create database
-CreateUser=Create user account or grant user account permission on the Dolibarr database
-DatabaseSuperUserAccess=Database server - Superuser access
-CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
-CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
-DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
-KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
-SaveConfigurationFile=Saving parameters to
-ServerConnection=Server connection
-DatabaseCreation=Database creation
-CreateDatabaseObjects=Database objects creation
-ReferenceDataLoading=Reference data loading
-TablesAndPrimaryKeysCreation=Tables and Primary keys creation
-CreateTableAndPrimaryKey=Create table %s
-CreateOtherKeysForTable=Create foreign keys and indexes for table %s
-OtherKeysCreation=Foreign keys and indexes creation
-FunctionsCreation=Functions creation
-AdminAccountCreation=Administrator login creation
-PleaseTypePassword=Please type a password, empty passwords are not allowed!
-PleaseTypeALogin=Please type a login!
-PasswordsMismatch=Passwords differs, please try again!
-SetupEnd=End of setup
-SystemIsInstalled=This installation is complete.
-SystemIsUpgraded=Dolibarr has been upgraded successfully.
-YouNeedToPersonalizeSetup=You need to configure Dolibarr to suit your needs (appearance, features, ...). To do this, please follow the link below:
-AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
-GoToDolibarr=Go to Dolibarr
-GoToSetupArea=Go to Dolibarr (setup area)
-MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
-GoToUpgradePage=Go to upgrade page again
-WithNoSlashAtTheEnd=Without the slash "/" at the end
-DirectoryRecommendation=<span class="warning">IMPORTANT</span>: You must use a directory that is outside of the web pages (so do not use a subdirectory of previous parameter).
-LoginAlreadyExists=Already exists
-DolibarrAdminLogin=Dolibarr admin login
-AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
-FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
-WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
-FunctionNotAvailableInThisPHP=Not available in this PHP
-ChoosedMigrateScript=Choose migration script
-DataMigration=Database migration (data)
-DatabaseMigration=Database migration (structure + some data)
-ProcessMigrateScript=Script processing
-ChooseYourSetupMode=Choose your setup mode and click "Start"...
-FreshInstall=Fresh install
-FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
-Upgrade=Upgrade
-UpgradeDesc=Use this mode if you have replaced old Dolibarr files with files from a newer version. This will upgrade your database and data.
-Start=Start
-InstallNotAllowed=Setup not allowed by <b>conf.php</b> permissions
-YouMustCreateWithPermission=You must create file %s and set write permissions on it for the web server during install process.
-CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
-AlreadyDone=Already migrated
-DatabaseVersion=Database version
-ServerVersion=Database server version
-YouMustCreateItAndAllowServerToWrite=You must create this directory and allow for the web server to write into it.
-DBSortingCollation=Character sorting order
-YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
-OrphelinsPaymentsDetectedByMethod=Orphans payment detected by method %s
-RemoveItManuallyAndPressF5ToContinue=Remove it manually and press F5 to continue.
-FieldRenamed=Field renamed
-IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
-ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
-InstallChoiceRecommanded=Recommended choice to install version <b>%s</b> from your current version <b>%s</b>
-InstallChoiceSuggested=<b>Install choice suggested by installer</b>.
-MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
-CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
-IfAlreadyExistsCheckOption=If this name is correct and that database does not exist yet, you must check option "Create database".
-OpenBaseDir=PHP openbasedir parameter
-YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
-YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
-NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
-MigrationCustomerOrderShipping=Migrate shipping for sales orders storage
-MigrationShippingDelivery=Upgrade storage of shipping
-MigrationShippingDelivery2=Upgrade storage of shipping 2
-MigrationFinished=Migration finished
-LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
-ActivateModule=Activate module %s
-ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
-WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
-ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
-KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
-KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
-KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
-KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
-UpgradeExternalModule=Run dedicated upgrade process of external module
-SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
-NothingToDelete=Nothing to clean/delete
-NothingToDo=Nothing to do
+InstallEasy=صرف قدم بہ قدم ہدایات پر عمل کریں۔
+MiscellaneousChecks=پیشگی شرائط چیک کریں۔
+ConfFileExists=کنفیگریشن فائل <b> %s </b> موجود ہے۔
+ConfFileDoesNotExistsAndCouldNotBeCreated=کنفیگریشن فائل <b> %s </b> موجود نہیں ہے اور اسے بنایا نہیں جا سکتا!
+ConfFileCouldBeCreated=کنفیگریشن فائل <b> %s </b> بنائی جا سکتی ہے۔
+ConfFileIsNotWritable=کنفیگریشن فائل <b> %s </b> قابل تحریر نہیں ہے۔ اجازتیں چیک کریں۔ پہلے انسٹال کرنے کے لیے، آپ کے ویب سرور کو کنفیگریشن کے عمل کے دوران اس فائل میں لکھنے کے قابل ہونا چاہیے ("chmod 666" مثال کے طور پر OS جیسے Unix پر)۔
+ConfFileIsWritable=کنفیگریشن فائل <b> %s </b> قابل تحریر ہے۔
+ConfFileMustBeAFileNotADir=کنفیگریشن فائل <b> %s </b> فائل ہونی چاہیے، ڈائریکٹری نہیں۔
+ConfFileReload=کنفیگریشن فائل سے پیرامیٹرز کو دوبارہ لوڈ کرنا۔
+PHPSupportPOSTGETOk=یہ پی ایچ پی متغیر POST اور GET کو سپورٹ کرتا ہے۔
+PHPSupportPOSTGETKo=یہ ممکن ہے کہ آپ کا پی ایچ پی سیٹ اپ متغیرات POST اور/یا GET کو سپورٹ نہ کرے۔ php.ini میں <b> variables_order </b> پیرامیٹر چیک کریں۔
+PHPSupportSessions=یہ پی ایچ پی سیشن کو سپورٹ کرتا ہے۔
+PHPSupport=یہ پی ایچ پی %s فنکشنز کو سپورٹ کرتا ہے۔
+PHPMemoryOK=آپ کی پی ایچ پی کی زیادہ سے زیادہ سیشن میموری <b> %s </b> پر سیٹ ہے۔ یہ کافی ہونا چاہئے۔
+PHPMemoryTooLow=آپ کی پی ایچ پی کی زیادہ سے زیادہ سیشن میموری <b> %s </b> بائٹس پر سیٹ ہے۔ یہ بہت کم ہے۔ اپنے <b> php.ini </b> کو <b> memory_limit </b> پیرامیٹر کو کم از کم <b>87fz087fz907fz07fz07fz7fz097fz میں تبدیل کریں۔
+Recheck=مزید تفصیلی ٹیسٹ کے لیے یہاں کلک کریں۔
+ErrorPHPDoesNotSupportSessions=آپ کی پی ایچ پی کی تنصیب سیشن کو سپورٹ نہیں کرتی ہے۔ Dolibarr کو کام کرنے کی اجازت دینے کے لیے یہ خصوصیت درکار ہے۔ اپنے پی ایچ پی سیٹ اپ اور سیشن ڈائرکٹری کی اجازتوں کو چیک کریں۔
+ErrorPHPDoesNotSupportGD=آپ کی پی ایچ پی کی تنصیب جی ڈی گرافیکل فنکشنز کو سپورٹ نہیں کرتی ہے۔ کوئی گراف دستیاب نہیں ہوں گے۔
+ErrorPHPDoesNotSupportCurl=آپ کی پی ایچ پی کی تنصیب کرل کو سپورٹ نہیں کرتی ہے۔
+ErrorPHPDoesNotSupportCalendar=آپ کی پی ایچ پی کی تنصیب پی ایچ پی کیلنڈر کی توسیع کو سپورٹ نہیں کرتی ہے۔
+ErrorPHPDoesNotSupportUTF8=آپ کی پی ایچ پی کی تنصیب UTF8 فنکشنز کو سپورٹ نہیں کرتی ہے۔ Dolibarr صحیح طریقے سے کام نہیں کر سکتا. Dolibarr انسٹال کرنے سے پہلے اسے حل کریں۔
+ErrorPHPDoesNotSupportIntl=آپ کی پی ایچ پی کی تنصیب Intl افعال کو سپورٹ نہیں کرتی ہے۔
+ErrorPHPDoesNotSupportMbstring=آپ کی پی ایچ پی کی تنصیب mbstring فنکشنز کو سپورٹ نہیں کرتی ہے۔
+ErrorPHPDoesNotSupportxDebug=آپ کی پی ایچ پی کی تنصیب توسیعی ڈیبگ فنکشنز کو سپورٹ نہیں کرتی ہے۔
+ErrorPHPDoesNotSupport=آپ کی پی ایچ پی کی تنصیب %s فنکشنز کو سپورٹ نہیں کرتی ہے۔
+ErrorDirDoesNotExists=ڈائرکٹری %s موجود نہیں ہے۔
+ErrorGoBackAndCorrectParameters=واپس جائیں اور پیرامیٹرز کو چیک/درست کریں۔
+ErrorWrongValueForParameter=ہو سکتا ہے آپ نے پیرامیٹر '%s' کے لیے غلط ویلیو ٹائپ کی ہو۔
+ErrorFailedToCreateDatabase=ڈیٹا بیس '%s' بنانے میں ناکام۔
+ErrorFailedToConnectToDatabase=ڈیٹا بیس '%s' سے جڑنے میں ناکام۔
+ErrorDatabaseVersionTooLow=ڈیٹا بیس ورژن (%s) بہت پرانا ہے۔ ورژن %s یا اس سے زیادہ درکار ہے۔
+ErrorPHPVersionTooLow=پی ایچ پی ورژن بہت پرانا ہے۔ ورژن %s درکار ہے۔
+ErrorConnectedButDatabaseNotFound=سرور سے کنکشن کامیاب لیکن ڈیٹا بیس '%s' نہیں ملا۔
+ErrorDatabaseAlreadyExists=ڈیٹا بیس '%s' پہلے سے موجود ہے۔
+IfDatabaseNotExistsGoBackAndUncheckCreate=اگر ڈیٹا بیس موجود نہیں ہے تو واپس جائیں اور "Create database" کے آپشن کو چیک کریں۔
+IfDatabaseExistsGoBackAndCheckCreate=اگر ڈیٹا بیس پہلے سے موجود ہے تو واپس جائیں اور "ڈیٹا بیس بنائیں" کے آپشن کو غیر چیک کریں۔
+WarningBrowserTooOld=براؤزر کا ورژن بہت پرانا ہے۔ اپنے براؤزر کو Firefox، Chrome یا Opera کے حالیہ ورژن میں اپ گریڈ کرنے کی انتہائی سفارش کی جاتی ہے۔
+PHPVersion=پی ایچ پی ورژن
+License=لائسنس کا استعمال
+ConfigurationFile=کنفیگریشن فائل
+WebPagesDirectory=ڈائریکٹری جہاں ویب صفحات کو محفوظ کیا جاتا ہے۔
+DocumentsDirectory=اپ لوڈ کردہ اور تیار کردہ دستاویزات کو ذخیرہ کرنے کی ڈائرکٹری
+URLRoot=یو آر ایل روٹ
+ForceHttps=زبردستی محفوظ کنکشن (https)
+CheckToForceHttps=محفوظ کنکشنز (https) پر مجبور کرنے کے لیے اس اختیار کو چیک کریں۔ <br> اس کے لیے ضروری ہے کہ ویب سرور SSL سرٹیفکیٹ کے ساتھ کنفیگر ہو۔
+DolibarrDatabase=ڈولیبر ڈیٹا بیس
+DatabaseType=ڈیٹا بیس کی قسم
+DriverType=ڈرائیور کی قسم
+Server=سرور
+ServerAddressDescription=ڈیٹا بیس سرور کے لیے نام یا آئی پی ایڈریس۔ عام طور پر 'لوکل ہوسٹ' جب ڈیٹا بیس سرور اسی سرور پر ہوسٹ کیا جاتا ہے جس پر ویب سرور ہوتا ہے۔
+ServerPortDescription=ڈیٹا بیس سرور پورٹ۔ اگر نامعلوم ہو تو خالی رکھیں۔
+DatabaseServer=ڈیٹا بیس سرور
+DatabaseName=ڈیٹا بیس کا نام
+DatabasePrefix=ڈیٹا بیس ٹیبل کا سابقہ
+DatabasePrefixDescription=ڈیٹا بیس ٹیبل کا سابقہ۔ اگر خالی ہے تو، llx_ پر ڈیفالٹ۔
+AdminLogin=Dolibarr ڈیٹا بیس کے مالک کے لیے صارف کا اکاؤنٹ۔
+PasswordAgain=پاس ورڈ کی تصدیق کو دوبارہ ٹائپ کریں۔
+AdminPassword=Dolibarr ڈیٹا بیس کے مالک کے لیے پاس ورڈ۔
+CreateDatabase=ڈیٹا بیس بنائیں
+CreateUser=صارف اکاؤنٹ بنائیں یا Dolibarr ڈیٹا بیس پر صارف اکاؤنٹ کی اجازت دیں۔
+DatabaseSuperUserAccess=ڈیٹا بیس سرور - سپر یوزر تک رسائی
+CheckToCreateDatabase=باکس کو چیک کریں اگر ڈیٹا بیس ابھی تک موجود نہیں ہے اور اسے بنانا ضروری ہے۔ <br> اس صورت میں، آپ کو اس صفحہ کے نیچے سپر یوزر اکاؤنٹ کے لیے صارف کا نام اور پاس ورڈ بھی بھرنا ہوگا۔
+CheckToCreateUser=باکس کو نشان زد کریں اگر: <br> ڈیٹا بیس صارف کا اکاؤنٹ ابھی تک موجود نہیں ہے اور اسے بنانا ضروری ہے، یا <br> اگر صارف کا اکاؤنٹ موجود ہے لیکن ڈیٹا بیس موجود نہیں ہے اور اجازت دی جانی چاہیے۔ <br> اس صورت میں، آپ کو صارف کا اکاؤنٹ اور پاس ورڈ اور <b> بھی </b> سپر یوزر اکاؤنٹ کا نام اور اس صفحہ کے نیچے پاس ورڈ درج کرنا ہوگا۔ اگر یہ باکس غیر نشان زد ہے تو، ڈیٹا بیس کا مالک اور پاس ورڈ پہلے سے موجود ہونا چاہیے۔
+DatabaseRootLoginDescription=سپر یوزر اکاؤنٹ کا نام (نئے ڈیٹا بیس یا نئے صارفین بنانے کے لیے)، لازمی ہے اگر ڈیٹا بیس یا اس کا مالک پہلے سے موجود نہیں ہے۔
+KeepEmptyIfNoPassword=اگر سپر یوزر کے پاس پاس ورڈ نہیں ہے تو خالی چھوڑ دیں (تجویز نہیں کی گئی)
+SaveConfigurationFile=پیرامیٹرز کو محفوظ کرنا
+ServerConnection=سرور کنکشن
+DatabaseCreation=ڈیٹا بیس کی تخلیق
+CreateDatabaseObjects=ڈیٹا بیس آبجیکٹ کی تخلیق
+ReferenceDataLoading=حوالہ ڈیٹا لوڈنگ
+TablesAndPrimaryKeysCreation=ٹیبلز اور پرائمری کیز کی تخلیق
+CreateTableAndPrimaryKey=ٹیبل %s بنائیں
+CreateOtherKeysForTable=ٹیبل %s کے لیے غیر ملکی کلیدیں اور اشاریہ جات بنائیں
+OtherKeysCreation=غیر ملکی چابیاں اور اشاریہ جات کی تخلیق
+FunctionsCreation=افعال کی تخلیق
+AdminAccountCreation=ایڈمنسٹریٹر لاگ ان تخلیق
+PleaseTypePassword=براہ کرم پاس ورڈ ٹائپ کریں، خالی پاس ورڈ کی اجازت نہیں ہے!
+PleaseTypeALogin=براہ کرم لاگ ان ٹائپ کریں!
+PasswordsMismatch=پاس ورڈز مختلف ہیں، براہ کرم دوبارہ کوشش کریں!
+SetupEnd=سیٹ اپ کا اختتام
+SystemIsInstalled=یہ تنصیب مکمل ہو چکی ہے۔
+SystemIsUpgraded=Dolibarr کو کامیابی سے اپ گریڈ کر دیا گیا ہے۔
+YouNeedToPersonalizeSetup=آپ کو اپنی ضروریات کے مطابق Dolibarr کو ترتیب دینے کی ضرورت ہے (ظاہر، خصوصیات، ...)۔ ایسا کرنے کے لیے، براہ کرم نیچے دیے گئے لنک پر عمل کریں:
+AdminLoginCreatedSuccessfuly=Dolibarr ایڈمنسٹریٹر لاگ ان '<b> %s </b>' کامیابی سے بنا۔
+GoToDolibarr=ڈولیبر پر جائیں۔
+GoToSetupArea=Dolibarr پر جائیں (سیٹ اپ ایریا)
+MigrationNotFinished=ڈیٹا بیس ورژن مکمل طور پر اپ ٹو ڈیٹ نہیں ہے: اپ گریڈ کے عمل کو دوبارہ چلائیں۔
+GoToUpgradePage=اپ گریڈ پیج پر دوبارہ جائیں۔
+WithNoSlashAtTheEnd=آخر میں "/" سلیش کے بغیر
+DirectoryRecommendation= <span class="warning"> اہم </span> : آپ کو ایسی ڈائریکٹری استعمال کرنی چاہیے جو ویب صفحات سے باہر ہو (لہذا پچھلے پیرامیٹر کی ذیلی ڈائرکٹری استعمال نہ کریں)۔
+LoginAlreadyExists=پہلے سے موجود ہے
+DolibarrAdminLogin=Dolibarr ایڈمن لاگ ان
+AdminLoginAlreadyExists=Dolibarr ایڈمنسٹریٹر اکاؤنٹ '<b> %s </b>' پہلے سے موجود ہے۔ اگر آپ کوئی اور بنانا چاہتے ہیں تو واپس جائیں۔
+FailedToCreateAdminLogin=Dolibarr ایڈمنسٹریٹر اکاؤنٹ بنانے میں ناکام۔
+WarningRemoveInstallDir=تنبیہ، حفاظتی وجوہات کی بناء پر، ایک بار انسٹال یا اپ گریڈ مکمل ہونے کے بعد، آپ کو ایک فائل <b> install.lock </b> کو Dolibarr دستاویز ڈائرکٹری میں شامل کرنا چاہئے تاکہ انسٹال ٹولز کے حادثاتی/بد نیتی پر مبنی استعمال کو دوبارہ روکا جا سکے۔
+FunctionNotAvailableInThisPHP=اس پی ایچ پی میں دستیاب نہیں ہے۔
+ChoosedMigrateScript=منتقلی اسکرپٹ کا انتخاب کریں۔
+DataMigration=ڈیٹا بیس کی منتقلی (ڈیٹا)
+DatabaseMigration=ڈیٹا بیس کی منتقلی (سٹرکچر + کچھ ڈیٹا)
+ProcessMigrateScript=اسکرپٹ پروسیسنگ
+ChooseYourSetupMode=اپنا سیٹ اپ موڈ منتخب کریں اور "شروع کریں" پر کلک کریں...
+FreshInstall=تازہ انسٹال
+FreshInstallDesc=اگر یہ آپ کی پہلی انسٹال ہے تو اس موڈ کا استعمال کریں۔ اگر نہیں، تو یہ موڈ ایک نامکمل پچھلے انسٹال کو ٹھیک کر سکتا ہے۔ اگر آپ اپنا ورژن اپ گریڈ کرنا چاہتے ہیں تو "اپ گریڈ" موڈ کو منتخب کریں۔
+Upgrade=اپ گریڈ
+UpgradeDesc=اگر آپ نے پرانی Dolibarr فائلوں کو نئے ورژن کی فائلوں سے تبدیل کیا ہے تو اس موڈ کا استعمال کریں۔ یہ آپ کے ڈیٹا بیس اور ڈیٹا کو اپ گریڈ کرے گا۔
+Start=شروع کریں۔
+InstallNotAllowed=<b> conf.php </b> اجازتوں سے سیٹ اپ کی اجازت نہیں ہے
+YouMustCreateWithPermission=آپ کو فائل %s بنانا چاہیے اور انسٹال کرنے کے عمل کے دوران ویب سرور کے لیے اس پر لکھنے کی اجازتیں سیٹ کرنی ہوں گی۔
+CorrectProblemAndReloadPage=براہ کرم مسئلہ حل کریں اور صفحہ کو دوبارہ لوڈ کرنے کے لیے F5 دبائیں۔
+AlreadyDone=پہلے ہی ہجرت کر چکے ہیں۔
+DatabaseVersion=ڈیٹا بیس ورژن
+ServerVersion=ڈیٹا بیس سرور ورژن
+YouMustCreateItAndAllowServerToWrite=آپ کو یہ ڈائرکٹری بنانا چاہیے اور ویب سرور کو اس میں لکھنے کی اجازت دینی چاہیے۔
+DBSortingCollation=کریکٹر چھانٹنے کی ترتیب
+YouAskDatabaseCreationSoDolibarrNeedToConnect=آپ کے ڈیٹا بیس <b> %s </b> تخلیق کو منتخب کیا ہے، لیکن اس کے لئے، Dolibarr سرور <b> %s </b> سپر یوزر <b> %s </b> اجازت کے ساتھ سے رابطہ قائم کرنے کی ضرورت ہے.
+YouAskLoginCreationSoDolibarrNeedToConnect=آپ کے ڈیٹا بیس صارف تخلیق <b> %s </b> منتخب کیا، لیکن اس کے لئے، Dolibarr سرور <b> %s </b> سپر یوزر <b> %s </b> اجازت کے ساتھ سے رابطہ قائم کرنے کی ضرورت ہے.
+BecauseConnectionFailedParametersMayBeWrong=ڈیٹا بیس کنکشن ناکام ہو گیا: میزبان یا سپر صارف کے پیرامیٹرز غلط ہونے چاہئیں۔
+OrphelinsPaymentsDetectedByMethod=طریقہ %s کے ذریعے یتیموں کی ادائیگی کا پتہ چلا
+RemoveItManuallyAndPressF5ToContinue=اسے دستی طور پر ہٹائیں اور جاری رکھنے کے لیے F5 دبائیں۔
+FieldRenamed=فیلڈ کا نام تبدیل کر دیا گیا۔
+IfLoginDoesNotExistsCheckCreateUser=اگر صارف ابھی موجود نہیں ہے، تو آپ کو "صارف بنائیں" کے اختیار کو چیک کرنا ہوگا۔
+ErrorConnection=سرور "<b> %s </b>"، ڈیٹا بیس کا نام "<b> %s </b>"، لاگ ان "<b> %s </b>"، یا ڈیٹا بیس کے پاس غلط ہو سکتے ہیں یا پی ایچ پی کلائنٹ ورژن ڈیٹا بیس ورژن کے مقابلے میں بہت بوڑھا ہو سکتا ہے.
+InstallChoiceRecommanded=آپ کے موجودہ ورژن سے <b> %s </b> ورژن انسٹال کرنے کا تجویز کردہ انتخاب
+InstallChoiceSuggested= <b> انسٹالر کی طرف سے تجویز کردہ انتخاب انسٹال کریں </b>۔
+MigrateIsDoneStepByStep=ٹارگٹڈ ورژن (%s) میں کئی ورژنز کا فرق ہے۔ انسٹال کرنے والا وزرڈ واپس آ جائے گا تاکہ یہ مکمل ہو جانے کے بعد مزید منتقلی کی تجویز کرے۔
+CheckThatDatabasenameIsCorrect=چیک کریں کہ ڈیٹا بیس کا نام "<b> %s </b>" درست ہے۔
+IfAlreadyExistsCheckOption=اگر یہ نام درست ہے اور وہ ڈیٹا بیس ابھی تک موجود نہیں ہے تو آپ کو "Create database" کے آپشن کو چیک کرنا ہوگا۔
+OpenBaseDir=پی ایچ پی اوپن بیسڈیر پیرامیٹر
+YouAskToCreateDatabaseSoRootRequired=آپ نے "ڈیٹا بیس بنائیں" کے باکس کو نشان زد کیا۔ اس کے لیے، آپ کو سپر یوزر (فارم کے نیچے) کا لاگ ان/پاس ورڈ فراہم کرنا ہوگا۔
+YouAskToCreateDatabaseUserSoRootRequired=آپ نے "ڈیٹا بیس مالک بنائیں" والے باکس کو نشان زد کیا۔ اس کے لیے، آپ کو سپر یوزر (فارم کے نیچے) کا لاگ ان/پاس ورڈ فراہم کرنا ہوگا۔
+NextStepMightLastALongTime=موجودہ قدم میں کئی منٹ لگ سکتے ہیں۔ جاری رکھنے سے پہلے براہ کرم اگلی اسکرین کے مکمل طور پر ظاہر ہونے تک انتظار کریں۔
+MigrationCustomerOrderShipping=سیلز آرڈرز اسٹوریج کے لیے نقل مکانی کریں۔
+MigrationShippingDelivery=شپنگ کے اسٹوریج کو اپ گریڈ کریں۔
+MigrationShippingDelivery2=شپنگ 2 کے اسٹوریج کو اپ گریڈ کریں۔
+MigrationFinished=ہجرت ختم
+LastStepDesc= <strong> آخری مرحلہ </strong> : یہاں لاگ ان اور پاس ورڈ کی وضاحت کریں جسے آپ Dolibarr سے منسلک کرنے کے لیے استعمال کرنا چاہتے ہیں۔ <b> اسے ضائع نہ کریں کیونکہ یہ تمام دوسرے/اضافی صارف اکاؤنٹس کا انتظام کرنے کا ماسٹر اکاؤنٹ ہے۔ </b>
+ActivateModule=ماڈیول %s کو چالو کریں۔
+ShowEditTechnicalParameters=اعلی درجے کے پیرامیٹرز کو دکھانے/ترمیم کرنے کے لیے یہاں کلک کریں (ماہر موڈ)
+WarningUpgrade=انتباہ:\nکیا آپ نے پہلے ڈیٹا بیس کا بیک اپ چلایا؟\nیہ انتہائی سفارش کی جاتی ہے۔ ڈیٹا کا نقصان (مثال کے طور پر mysql ورژن 5.5.40/41/42/43 میں بگ کی وجہ سے) اس عمل کے دوران ممکن ہو سکتا ہے، اس لیے کسی بھی منتقلی کو شروع کرنے سے پہلے اپنے ڈیٹا بیس کا مکمل ڈمپ لینا ضروری ہے۔\n\nمنتقلی کا عمل شروع کرنے کے لیے ٹھیک ہے پر کلک کریں...
+ErrorDatabaseVersionForbiddenForMigration=آپ کا ڈیٹا بیس ورژن %s ہے۔ اس میں ایک اہم بگ ہے، اگر آپ اپنے ڈیٹا بیس میں ساختی تبدیلیاں کرتے ہیں، جیسا کہ منتقلی کے عمل کے لیے ضروری ہوتا ہے تو ڈیٹا کا نقصان ممکن ہو جاتا ہے۔ اس کی وجہ سے، اس وقت تک منتقلی کی اجازت نہیں دی جائے گی جب تک کہ آپ اپنے ڈیٹا بیس کو پرت (پیچ شدہ) ورژن میں اپ گریڈ نہیں کرتے (معلوم بگی ورژنز کی فہرست: %s)
+KeepDefaultValuesWamp=آپ نے DoliWamp سے Dolibarr سیٹ اپ وزرڈ استعمال کیا ہے، لہذا یہاں تجویز کردہ اقدار پہلے سے ہی بہتر ہیں۔ انہیں صرف اس صورت میں تبدیل کریں جب آپ جانتے ہوں کہ آپ کیا کر رہے ہیں۔
+KeepDefaultValuesDeb=آپ نے لینکس پیکیج (Ubuntu, Debian, Fedora...) سے Dolibarr سیٹ اپ وزرڈ استعمال کیا، اس لیے یہاں تجویز کردہ اقدار پہلے سے ہی آپٹمائز ہیں۔ بنانے کے لیے صرف ڈیٹابیس کے مالک کا پاس ورڈ درج کرنا ضروری ہے۔ دوسرے پیرامیٹرز کو صرف اس صورت میں تبدیل کریں جب آپ جانتے ہوں کہ آپ کیا کر رہے ہیں۔
+KeepDefaultValuesMamp=آپ نے DoliMamp سے Dolibarr سیٹ اپ وزرڈ استعمال کیا، اس لیے یہاں تجویز کردہ اقدار پہلے سے ہی آپٹمائز ہیں۔ انہیں صرف اس صورت میں تبدیل کریں جب آپ جانتے ہوں کہ آپ کیا کر رہے ہیں۔
+KeepDefaultValuesProxmox=آپ نے Dolibarr سیٹ اپ وزرڈ کو Proxmox ورچوئل ایپلائینس سے استعمال کیا، اس لیے یہاں تجویز کردہ اقدار پہلے سے ہی آپٹمائز ہو چکی ہیں۔ انہیں صرف اس صورت میں تبدیل کریں جب آپ جانتے ہوں کہ آپ کیا کر رہے ہیں۔
+UpgradeExternalModule=بیرونی ماڈیول کے سرشار اپ گریڈ کے عمل کو چلائیں۔
+SetAtLeastOneOptionAsUrlParameter=URL میں پیرامیٹر کے طور پر کم از کم ایک آپشن سیٹ کریں۔ مثال کے طور پر: '...repair.php?standard=confirmed'
+NothingToDelete=صاف کرنے / حذف کرنے کے لئے کچھ نہیں ہے۔
+NothingToDo=کرنے کیلئے کچھ نہیں
 #########
 # upgrade
-MigrationFixData=Fix for denormalized data
-MigrationOrder=Data migration for customer's orders
-MigrationSupplierOrder=Data migration for vendor's orders
-MigrationProposal=Data migration for commercial proposals
-MigrationInvoice=Data migration for customer's invoices
-MigrationContract=Data migration for contracts
-MigrationSuccessfullUpdate=Upgrade successful
-MigrationUpdateFailed=Failed upgrade process
-MigrationRelationshipTables=Data migration for relationship tables (%s)
-MigrationPaymentsUpdate=Payment data correction
-MigrationPaymentsNumberToUpdate=%s payment(s) to update
-MigrationProcessPaymentUpdate=Update payment(s) %s
-MigrationPaymentsNothingToUpdate=No more things to do
-MigrationPaymentsNothingUpdatable=No more payments that can be corrected
-MigrationContractsUpdate=Contract data correction
-MigrationContractsNumberToUpdate=%s contract(s) to update
-MigrationContractsLineCreation=Create contract line for contract ref %s
-MigrationContractsNothingToUpdate=No more things to do
-MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
-MigrationContractsEmptyDatesUpdate=Contract empty date correction
-MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
-MigrationContractsEmptyDatesNothingToUpdate=No contract empty date to correct
-MigrationContractsEmptyCreationDatesNothingToUpdate=No contract creation date to correct
-MigrationContractsInvalidDatesUpdate=Bad value date contract correction
-MigrationContractsInvalidDateFix=Correct contract %s (Contract date=%s, Starting service date min=%s)
-MigrationContractsInvalidDatesNumber=%s contracts modified
-MigrationContractsInvalidDatesNothingToUpdate=No date with bad value to correct
-MigrationContractsIncoherentCreationDateUpdate=Bad value contract creation date correction
-MigrationContractsIncoherentCreationDateUpdateSuccess=Bad value contract creation date correction done successfully
-MigrationContractsIncoherentCreationDateNothingToUpdate=No bad value for contract creation date to correct
-MigrationReopeningContracts=Open contract closed by error
-MigrationReopenThisContract=Reopen contract %s
-MigrationReopenedContractsNumber=%s contracts modified
-MigrationReopeningContractsNothingToUpdate=No closed contract to open
-MigrationBankTransfertsUpdate=Update links between bank entry and a bank transfer
-MigrationBankTransfertsNothingToUpdate=All links are up to date
-MigrationShipmentOrderMatching=Sendings receipt update
-MigrationDeliveryOrderMatching=Delivery receipt update
-MigrationDeliveryDetail=Delivery update
-MigrationStockDetail=Update stock value of products
-MigrationMenusDetail=Update dynamic menus tables
-MigrationDeliveryAddress=Update delivery address in shipments
-MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
-MigrationProjectUserResp=Data migration field fk_user_resp of llx_projet to llx_element_contact
-MigrationProjectTaskTime=Update time spent in seconds
-MigrationActioncommElement=Update data on actions
-MigrationPaymentMode=Data migration for payment type
-MigrationCategorieAssociation=Migration of categories
-MigrationEvents=Migration of events to add event owner into assignment table
-MigrationEventsContact=Migration of events to add event contact into assignment table
-MigrationRemiseEntity=Update entity field value of llx_societe_remise
-MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
-MigrationUserRightsEntity=Update entity field value of llx_user_rights
-MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
-MigrationUserPhotoPath=Migration of photo paths for users
-MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
-MigrationReloadModule=Reload module %s
-MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
-MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
-ShowNotAvailableOptions=Show unavailable options
-HideNotAvailableOptions=Hide unavailable options
-ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
-YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
-YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
-ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=If an upgrade is in progress, please wait. If not, click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
-Loaded=Loaded
-FunctionTest=Function test
+MigrationFixData=غیر معمولی ڈیٹا کے لیے درست کریں۔
+MigrationOrder=گاہک کے آرڈرز کے لیے ڈیٹا کی منتقلی
+MigrationSupplierOrder=وینڈر کے آرڈرز کے لیے ڈیٹا کی منتقلی
+MigrationProposal=تجارتی تجاویز کے لیے ڈیٹا کی منتقلی
+MigrationInvoice=گاہک کی رسیدوں کے لیے ڈیٹا کی منتقلی
+MigrationContract=معاہدوں کے لیے ڈیٹا کی منتقلی
+MigrationSuccessfullUpdate=اپ گریڈ کامیاب
+MigrationUpdateFailed=اپ گریڈ کرنے کا عمل ناکام ہو گیا۔
+MigrationRelationshipTables=تعلقات کی میزوں کے لیے ڈیٹا کی منتقلی (%s)
+MigrationPaymentsUpdate=ادائیگی کے ڈیٹا کی اصلاح
+MigrationPaymentsNumberToUpdate=%s ادائیگی(زبانیں) اپ ڈیٹ کرنے کے لیے
+MigrationProcessPaymentUpdate=ادائیگی(ز) کو اپ ڈیٹ کریں %s
+MigrationPaymentsNothingToUpdate=کرنے کے لیے مزید چیزیں نہیں ہیں۔
+MigrationPaymentsNothingUpdatable=مزید ادائیگیوں کو درست نہیں کیا جاسکتا
+MigrationContractsUpdate=معاہدہ ڈیٹا کی اصلاح
+MigrationContractsNumberToUpdate=اپ ڈیٹ کرنے کے لیے %s معاہدہ
+MigrationContractsLineCreation=معاہدہ ریف %s کے لئے معاہدہ لائن بنائیں
+MigrationContractsNothingToUpdate=کرنے کے لیے مزید چیزیں نہیں ہیں۔
+MigrationContractsFieldDontExist=فیلڈ fk_facture اب موجود نہیں ہے۔ کرنے کیلئے کچھ نہیں.
+MigrationContractsEmptyDatesUpdate=معاہدہ خالی تاریخ کی اصلاح
+MigrationContractsEmptyDatesUpdateSuccess=معاہدے کی خالی تاریخ کی اصلاح کامیابی سے ہو گئی۔
+MigrationContractsEmptyDatesNothingToUpdate=درست کرنے کے لیے کوئی معاہدہ خالی تاریخ نہیں ہے۔
+MigrationContractsEmptyCreationDatesNothingToUpdate=درست کرنے کے لیے کوئی معاہدہ تخلیق کی تاریخ نہیں ہے۔
+MigrationContractsInvalidDatesUpdate=خراب قیمت کی تاریخ کے معاہدے کی اصلاح
+MigrationContractsInvalidDateFix=درست معاہدہ %s (معاہدے کی تاریخ=%s، سروس شروع ہونے کی تاریخ min=%s)
+MigrationContractsInvalidDatesNumber=%s معاہدوں میں ترمیم کی گئی۔
+MigrationContractsInvalidDatesNothingToUpdate=درست کرنے کے لیے خراب قدر والی کوئی تاریخ نہیں۔
+MigrationContractsIncoherentCreationDateUpdate=خراب قدر کے معاہدے کی تخلیق کی تاریخ کی اصلاح
+MigrationContractsIncoherentCreationDateUpdateSuccess=خراب قدر کے معاہدے کی تخلیق کی تاریخ کی اصلاح کامیابی کے ساتھ ہو گئی۔
+MigrationContractsIncoherentCreationDateNothingToUpdate=ٹھیک کرنے کے لیے معاہدہ تخلیق کی تاریخ کے لیے کوئی بری قدر نہیں۔
+MigrationReopeningContracts=کھلا معاہدہ غلطی سے بند ہوگیا۔
+MigrationReopenThisContract=معاہدہ %s دوبارہ کھولیں۔
+MigrationReopenedContractsNumber=%s معاہدوں میں ترمیم کی گئی۔
+MigrationReopeningContractsNothingToUpdate=کھولنے کے لیے کوئی بند معاہدہ نہیں ہے۔
+MigrationBankTransfertsUpdate=بینک انٹری اور بینک ٹرانسفر کے درمیان روابط کو اپ ڈیٹ کریں۔
+MigrationBankTransfertsNothingToUpdate=تمام لنکس اپ ٹو ڈیٹ ہیں۔
+MigrationShipmentOrderMatching=رسید کی تازہ کاری بھیج رہا ہے۔
+MigrationDeliveryOrderMatching=ترسیل کی رسید کی تازہ کاری
+MigrationDeliveryDetail=ڈیلیوری اپ ڈیٹ
+MigrationStockDetail=مصنوعات کی اسٹاک ویلیو کو اپ ڈیٹ کریں۔
+MigrationMenusDetail=ڈائنامک مینو ٹیبلز کو اپ ڈیٹ کریں۔
+MigrationDeliveryAddress=ترسیل کا پتہ ترسیل میں اپ ڈیٹ کریں۔
+MigrationProjectTaskActors=ٹیبل llx_projet_task_actors کے لیے ڈیٹا کی منتقلی
+MigrationProjectUserResp=llx_projet سے llx_element_contact پر ڈیٹا کی منتقلی کی فیلڈ fk_user_resp
+MigrationProjectTaskTime=سیکنڈوں میں گزارے گئے وقت کو اپ ڈیٹ کریں۔
+MigrationActioncommElement=اعمال پر ڈیٹا کو اپ ڈیٹ کریں۔
+MigrationPaymentMode=ادائیگی کی قسم کے لیے ڈیٹا کی منتقلی
+MigrationCategorieAssociation=زمروں کی منتقلی
+MigrationEvents=ایونٹ کے مالک کو اسائنمنٹ ٹیبل میں شامل کرنے کے لیے ایونٹس کی منتقلی
+MigrationEventsContact=اسائنمنٹ ٹیبل میں ایونٹ کا رابطہ شامل کرنے کے لیے واقعات کی منتقلی
+MigrationRemiseEntity=llx_societe_remise کی entity فیلڈ ویلیو کو اپ ڈیٹ کریں۔
+MigrationRemiseExceptEntity=llx_societe_remise_except کی entity فیلڈ ویلیو کو اپ ڈیٹ کریں۔
+MigrationUserRightsEntity=llx_user_rights کی entity فیلڈ ویلیو کو اپ ڈیٹ کریں۔
+MigrationUserGroupRightsEntity=llx_usergroup_rights کی entity فیلڈ ویلیو کو اپ ڈیٹ کریں۔
+MigrationUserPhotoPath=صارفین کے لیے تصویری راستوں کی منتقلی۔
+MigrationFieldsSocialNetworks=صارفین کی منتقلی فیلڈز سوشل نیٹ ورکس (%s)
+MigrationReloadModule=ماڈیول %s کو دوبارہ لوڈ کریں۔
+MigrationResetBlockedLog=V7 الگورتھم کے لیے BlockedLog ماڈیول کو دوبارہ ترتیب دیں۔
+MigrationImportOrExportProfiles=امپورٹ یا ایکسپورٹ پروفائلز کی منتقلی (%s)
+ShowNotAvailableOptions=غیر دستیاب اختیارات دکھائیں۔
+HideNotAvailableOptions=غیر دستیاب اختیارات چھپائیں۔
+ErrorFoundDuringMigration=نقل مکانی کے عمل کے دوران خرابیوں کی اطلاع دی گئی تھی لہذا اگلا مرحلہ دستیاب نہیں ہے۔ غلطیوں کو نظر انداز کرنے کے لیے، آپ <a href="%s"> یہاں کلک کر سکتے ہیں </a>، لیکن ہو سکتا ہے ایپلیکیشن یا کچھ فیچرز درست طریقے سے کام نہ کریں جب تک کہ غلطیاں حل نہ ہو جائیں۔
+YouTryInstallDisabledByDirLock=ایپلیکیشن نے خود اپ گریڈ کرنے کی کوشش کی، لیکن انسٹال/اپ گریڈ پیجز کو سیکیورٹی کے لیے غیر فعال کر دیا گیا ہے (ڈائریکٹری کا نام .lock لاحقہ سے تبدیل کر دیا گیا ہے)۔ <br>
+YouTryInstallDisabledByFileLock=ایپلیکیشن نے خود اپ گریڈ کرنے کی کوشش کی، لیکن انسٹال/اپ گریڈ پیجز کو سیکیورٹی کے لیے غیر فعال کر دیا گیا ہے (ڈولیبر دستاویزات کی ڈائرکٹری میں ایک لاک فائل <strong> install.lock </strong> کی موجودگی سے)۔ <br>
+ClickHereToGoToApp=اپنی درخواست پر جانے کے لیے یہاں کلک کریں۔
+ClickOnLinkOrRemoveManualy=اگر اپ گریڈ جاری ہے تو براہ کرم انتظار کریں۔ اگر نہیں تو درج ذیل لنک پر کلک کریں۔ اگر آپ ہمیشہ یہی صفحہ دیکھتے ہیں، تو آپ کو دستاویزات کی ڈائرکٹری میں install.lock فائل کو ہٹانا/اس کا نام تبدیل کرنا ہوگا۔
+Loaded=بھری ہوئی
+FunctionTest=فنکشن ٹیسٹ
diff --git a/htdocs/langs/ur_PK/interventions.lang b/htdocs/langs/ur_PK/interventions.lang
index ef5df43e546..f6302271d88 100644
--- a/htdocs/langs/ur_PK/interventions.lang
+++ b/htdocs/langs/ur_PK/interventions.lang
@@ -1,68 +1,68 @@
 # Dolibarr language file - Source file is en_US - interventions
-Intervention=Intervention
-Interventions=Interventions
-InterventionCard=Intervention card
-NewIntervention=New intervention
-AddIntervention=Create intervention
-ChangeIntoRepeatableIntervention=Change to repeatable intervention
-ListOfInterventions=List of interventions
-ActionsOnFicheInter=Actions on intervention
-LastInterventions=Latest %s interventions
-AllInterventions=All interventions
-CreateDraftIntervention=Create draft
-InterventionContact=Intervention contact
-DeleteIntervention=Delete intervention
-ValidateIntervention=Validate intervention
-ModifyIntervention=Modify intervention
-DeleteInterventionLine=Delete intervention line
-ConfirmDeleteIntervention=Are you sure you want to delete this intervention?
-ConfirmValidateIntervention=Are you sure you want to validate this intervention under name <b>%s</b>?
-ConfirmModifyIntervention=Are you sure you want to modify this intervention?
-ConfirmDeleteInterventionLine=Are you sure you want to delete this intervention line?
-ConfirmCloneIntervention=Are you sure you want to clone this intervention?
-NameAndSignatureOfInternalContact=Name and signature of intervening:
-NameAndSignatureOfExternalContact=Name and signature of customer:
-DocumentModelStandard=Standard document model for interventions
-InterventionCardsAndInterventionLines=Interventions and lines of interventions
-InterventionClassifyBilled=Classify "Billed"
-InterventionClassifyUnBilled=Classify "Unbilled"
-InterventionClassifyDone=Classify "Done"
-StatusInterInvoiced=Billed
-SendInterventionRef=Submission of intervention %s
-SendInterventionByMail=Send intervention by email
-InterventionCreatedInDolibarr=Intervention %s created
-InterventionValidatedInDolibarr=Intervention %s validated
-InterventionModifiedInDolibarr=Intervention %s modified
-InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
-InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
-InterventionSentByEMail=Intervention %s sent by email
-InterventionDeletedInDolibarr=Intervention %s deleted
-InterventionsArea=Interventions area
-DraftFichinter=Draft interventions
-LastModifiedInterventions=Latest %s modified interventions
-FichinterToProcess=Interventions to process
-TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
-PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
-PrintProductsOnFichinterDetails=interventions generated from orders
-UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
-UseDurationOnFichinter=Hides the duration field for intervention records
-UseDateWithoutHourOnFichinter=Hides hours and minutes off the date field for intervention records
-InterventionStatistics=Statistics of interventions
-NbOfinterventions=No. of intervention cards
-NumberOfInterventionsByMonth=No. of intervention cards by month (date of validation)
-AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). Add option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT to 1 into home-setup-other to include them.
-InterId=Intervention id
-InterRef=Intervention ref.
-InterDateCreation=Date creation intervention
-InterDuration=Duration intervention
-InterStatus=Status intervention
-InterNote=Note intervention
-InterLine=Line of intervention
-InterLineId=Line id intervention
-InterLineDate=Line date intervention
-InterLineDuration=Line duration intervention
-InterLineDesc=Line description intervention
-RepeatableIntervention=Template of intervention
-ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
-ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
-GenerateInter=Generate intervention
+Intervention=مداخلت
+Interventions=مداخلتیں
+InterventionCard=مداخلت کارڈ
+NewIntervention=نئی مداخلت
+AddIntervention=مداخلت پیدا کریں۔
+ChangeIntoRepeatableIntervention=دوبارہ قابل مداخلت میں تبدیل کریں۔
+ListOfInterventions=مداخلتوں کی فہرست
+ActionsOnFicheInter=مداخلت پر اقدامات
+LastInterventions=تازہ ترین %s مداخلتیں۔
+AllInterventions=تمام مداخلتیں۔
+CreateDraftIntervention=ڈرافٹ بنائیں
+InterventionContact=مداخلت کا رابطہ
+DeleteIntervention=مداخلت کو حذف کریں۔
+ValidateIntervention=مداخلت کی توثیق کریں۔
+ModifyIntervention=مداخلت میں ترمیم کریں۔
+DeleteInterventionLine=مداخلت لائن کو حذف کریں۔
+ConfirmDeleteIntervention=کیا آپ واقعی اس مداخلت کو حذف کرنا چاہتے ہیں؟
+ConfirmValidateIntervention=کیا آپ واقعی <b> %s </b> کے نام سے اس مداخلت کی توثیق کرنا چاہتے ہیں؟
+ConfirmModifyIntervention=کیا آپ واقعی اس مداخلت میں ترمیم کرنا چاہتے ہیں؟
+ConfirmDeleteInterventionLine=کیا آپ واقعی اس مداخلتی لائن کو حذف کرنا چاہتے ہیں؟
+ConfirmCloneIntervention=کیا آپ واقعی اس مداخلت کو کلون کرنا چاہتے ہیں؟
+NameAndSignatureOfInternalContact=مداخلت کرنے والے کا نام اور دستخط:
+NameAndSignatureOfExternalContact=گاہک کا نام اور دستخط:
+DocumentModelStandard=مداخلت کے لیے معیاری دستاویز کا ماڈل
+InterventionCardsAndInterventionLines=مداخلتیں اور مداخلت کی لائنیں۔
+InterventionClassifyBilled=درجہ بندی "بل"
+InterventionClassifyUnBilled="غیر بل" کی درجہ بندی کریں
+InterventionClassifyDone="ہو گیا" کی درجہ بندی کریں
+StatusInterInvoiced=بل کیا گیا۔
+SendInterventionRef=مداخلت کا عرضی %s
+SendInterventionByMail=ای میل کے ذریعے مداخلت بھیجیں۔
+InterventionCreatedInDolibarr=مداخلت %s بنائی گئی۔
+InterventionValidatedInDolibarr=مداخلت %s کی توثیق کی گئی۔
+InterventionModifiedInDolibarr=مداخلت %s میں ترمیم کی گئی۔
+InterventionClassifiedBilledInDolibarr=مداخلت %s بل کے بطور سیٹ
+InterventionClassifiedUnbilledInDolibarr=مداخلت %s بغیر بل کے سیٹ کی گئی۔
+InterventionSentByEMail=مداخلت %s ای میل کے ذریعے بھیجی گئی۔
+InterventionDeletedInDolibarr=مداخلت %s کو حذف کر دیا گیا۔
+InterventionsArea=مداخلت کا علاقہ
+DraftFichinter=مداخلتوں کا مسودہ
+LastModifiedInterventions=تازہ ترین %s ترمیم شدہ مداخلتیں۔
+FichinterToProcess=عمل کرنے کے لئے مداخلت
+TypeContact_fichinter_external_CUSTOMER=فالو اپ کسٹمر رابطہ
+PrintProductsOnFichinter=انٹروینشن کارڈ پر "پروڈکٹ" (صرف خدمات ہی نہیں) کی لکیریں بھی پرنٹ کریں۔
+PrintProductsOnFichinterDetails=احکامات سے پیدا ہونے والی مداخلتیں
+UseServicesDurationOnFichinter=آرڈرز سے پیدا ہونے والی مداخلتوں کے لیے خدمات کا دورانیہ استعمال کریں۔
+UseDurationOnFichinter=مداخلت کے ریکارڈ کے لیے دورانیہ کی فیلڈ کو چھپاتا ہے۔
+UseDateWithoutHourOnFichinter=مداخلت کے ریکارڈ کے لیے تاریخ کے میدان سے دور گھنٹے اور منٹ چھپاتا ہے۔
+InterventionStatistics=مداخلت کے اعدادوشمار
+NbOfinterventions=مداخلتی کارڈز کی تعداد
+NumberOfInterventionsByMonth=ماہ کے لحاظ سے مداخلتی کارڈز کی تعداد (توثیق کی تاریخ)
+AmountOfInteventionNotIncludedByDefault=مداخلت کی رقم پہلے سے طے شدہ طور پر منافع میں شامل نہیں ہوتی ہے (زیادہ تر معاملات میں، ٹائم شیٹس کا استعمال وقت کی گنتی کے لیے کیا جاتا ہے)۔ ہوم سیٹ اپ میں 1 میں PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT اختیار شامل کریں-دوسرے کو شامل کرنے کے لیے۔
+InterId=مداخلت کی شناخت
+InterRef=مداخلت کا حوالہ
+InterDateCreation=تاریخ تخلیق مداخلت
+InterDuration=دورانیہ کی مداخلت
+InterStatus=حیثیت کی مداخلت
+InterNote=مداخلت نوٹ کریں۔
+InterLine=مداخلت کی لائن
+InterLineId=لائن آئی ڈی کی مداخلت
+InterLineDate=لائن کی تاریخ مداخلت
+InterLineDuration=لائن دورانیہ کی مداخلت
+InterLineDesc=لائن کی وضاحت مداخلت
+RepeatableIntervention=مداخلت کا سانچہ
+ToCreateAPredefinedIntervention=پہلے سے طے شدہ یا بار بار چلنے والی مداخلت بنانے کے لیے، ایک مشترکہ مداخلت بنائیں اور اسے مداخلت کے سانچے میں تبدیل کریں۔
+ConfirmReopenIntervention=کیا آپ واقعی مداخلت <b> %s </b> کو کھولنا چاہتے ہیں؟
+GenerateInter=مداخلت پیدا کریں۔
diff --git a/htdocs/langs/ur_PK/intracommreport.lang b/htdocs/langs/ur_PK/intracommreport.lang
index 93c46f112bb..43a3163f653 100644
--- a/htdocs/langs/ur_PK/intracommreport.lang
+++ b/htdocs/langs/ur_PK/intracommreport.lang
@@ -1,40 +1,40 @@
-Module68000Name = Intracomm report
-Module68000Desc = Intracomm report management (Support for French DEB/DES format)
-IntracommReportSetup = Intracommreport module setup
-IntracommReportAbout = About intracommreport
+Module68000Name = انٹرا کام رپورٹ
+Module68000Desc = انٹرا کام رپورٹ مینجمنٹ (فرانسیسی DEB/DES فارمیٹ کے لیے سپورٹ)
+IntracommReportSetup = انٹرا کامرپورٹ ماڈیول سیٹ اپ
+IntracommReportAbout = انٹرا کامرپورٹ کے بارے میں
 
 # Setup
 INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
-INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_TYPE_ACTEUR=اداکار کی قسم
 INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
 INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
 INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
-INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+INTRACOMMREPORT_CATEG_FRAISDEPORT="Frais de port" کی قسم کی خدمات کی زمرہ
 
 INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
 
 # Menu
-MenuIntracommReport=Intracomm report
-MenuIntracommReportNew=New declaration
-MenuIntracommReportList=List
+MenuIntracommReport=انٹرا کام رپورٹ
+MenuIntracommReportNew=نیا اعلان
+MenuIntracommReportList=فہرست
 
 # View
-NewDeclaration=New declaration
-Declaration=Declaration
-AnalysisPeriod=Analysis period
-TypeOfDeclaration=Type of declaration
-DEB=Goods exchange declaration (DEB)
-DES=Services exchange declaration (DES)
+NewDeclaration=نیا اعلان
+Declaration=اعلامیہ
+AnalysisPeriod=تجزیہ کی مدت
+TypeOfDeclaration=اعلان کی قسم
+DEB=گڈز ایکسچینج ڈیکلریشن (DEB)
+DES=خدمات کے تبادلے کا اعلان (DES)
 
 # Export page
-IntracommReportTitle=Preparation of an XML file in ProDouane format
+IntracommReportTitle=ProDouane فارمیٹ میں XML فائل کی تیاری
 
 # List
-IntracommReportList=List of generated declarations
-IntracommReportNumber=Numero of declaration
-IntracommReportPeriod=Period of analysis
-IntracommReportTypeDeclaration=Type of declaration
-IntracommReportDownload=download XML file
+IntracommReportList=تیار کردہ اعلانات کی فہرست
+IntracommReportNumber=اعلان کی تعداد
+IntracommReportPeriod=تجزیہ کی مدت
+IntracommReportTypeDeclaration=اعلان کی قسم
+IntracommReportDownload=XML فائل ڈاؤن لوڈ کریں۔
 
 # Invoice
-IntracommReportTransportMode=Transport mode
+IntracommReportTransportMode=ٹرانسپورٹ موڈ
diff --git a/htdocs/langs/ur_PK/knowledgemanagement.lang b/htdocs/langs/ur_PK/knowledgemanagement.lang
index 2426e0e7013..501a088d2e9 100644
--- a/htdocs/langs/ur_PK/knowledgemanagement.lang
+++ b/htdocs/langs/ur_PK/knowledgemanagement.lang
@@ -18,33 +18,33 @@
 #
 
 # Module label 'ModuleKnowledgeManagementName'
-ModuleKnowledgeManagementName = Knowledge Management System
+ModuleKnowledgeManagementName = نالج مینجمنٹ سسٹم
 # Module description 'ModuleKnowledgeManagementDesc'
-ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+ModuleKnowledgeManagementDesc=نالج مینجمنٹ (KM) یا ہیلپ ڈیسک بیس کا نظم کریں۔
 
 #
 # Admin page
 #
-KnowledgeManagementSetup = Knowledge Management System setup
-Settings = Settings
-KnowledgeManagementSetupPage = Knowledge Management System setup page
+KnowledgeManagementSetup = نالج مینجمنٹ سسٹم سیٹ اپ
+Settings = ترتیبات
+KnowledgeManagementSetupPage = نالج مینجمنٹ سسٹم سیٹ اپ صفحہ
 
 
 #
 # About page
 #
-About = About
-KnowledgeManagementAbout = About Knowledge Management
-KnowledgeManagementAboutPage = Knowledge Management about page
+About = کے بارے میں
+KnowledgeManagementAbout = نالج مینجمنٹ کے بارے میں
+KnowledgeManagementAboutPage = صفحہ کے بارے میں علم کا انتظام
 
-KnowledgeManagementArea = Knowledge Management
-MenuKnowledgeRecord = Knowledge base
-ListKnowledgeRecord = List of articles
-NewKnowledgeRecord = New article
-ValidateReply = Validate solution
-KnowledgeRecords = Articles
-KnowledgeRecord = Article
-KnowledgeRecordExtraFields = Extrafields for Article
-GroupOfTicket=Group of tickets
-YouCanLinkArticleToATicketCategory=You can link an article to a ticket group (so the article will be suggested during qualification of new tickets)
-SuggestedForTicketsInGroup=Suggested for tickets when group is
+KnowledgeManagementArea = نالج مینجمنٹ
+MenuKnowledgeRecord = علم کی بنیاد
+ListKnowledgeRecord = مضامین کی فہرست
+NewKnowledgeRecord = نیا مضمون
+ValidateReply = حل کی توثیق کریں۔
+KnowledgeRecords = مضامین
+KnowledgeRecord = مضمون
+KnowledgeRecordExtraFields = آرٹیکل کے لیے ایکسٹرا فیلڈز
+GroupOfTicket=ٹکٹوں کا گروپ
+YouCanLinkArticleToATicketCategory=آپ کسی مضمون کو ٹکٹ گروپ سے جوڑ سکتے ہیں (لہذا نئے ٹکٹوں کی اہلیت کے دوران مضمون تجویز کیا جائے گا)
+SuggestedForTicketsInGroup=جب گروپ ہوتا ہے تو ٹکٹوں کے لیے تجویز کیا جاتا ہے۔
diff --git a/htdocs/langs/ur_PK/languages.lang b/htdocs/langs/ur_PK/languages.lang
index 82dabbaeda2..1cdbfe54d37 100644
--- a/htdocs/langs/ur_PK/languages.lang
+++ b/htdocs/langs/ur_PK/languages.lang
@@ -1,114 +1,114 @@
 # Dolibarr language file - Source file is en_US - languages
-Language_am_ET=Ethiopian
-Language_ar_AR=Arabic
-Language_ar_DZ=Arabic (Algeria)
-Language_ar_EG=Arabic (Egypt)
-Language_ar_MA=Arabic (Moroco)
-Language_ar_SA=Arabic
-Language_ar_TN=Arabic (Tunisia)
-Language_ar_IQ=Arabic (Iraq)
-Language_as_IN=Assamese
-Language_az_AZ=Azerbaijani
-Language_bn_BD=Bengali
-Language_bn_IN=Bengali (India)
-Language_bg_BG=Bulgarian
-Language_bs_BA=Bosnian
-Language_ca_ES=Catalan
-Language_cs_CZ=Czech
-Language_da_DA=Danish
-Language_da_DK=Danish
-Language_de_DE=German
-Language_de_AT=German (Austria)
-Language_de_CH=German (Switzerland)
-Language_el_GR=Greek
-Language_el_CY=Greek (Cyprus)
-Language_en_AU=English (Australia)
-Language_en_CA=English (Canada)
-Language_en_GB=English (United Kingdom)
-Language_en_IN=English (India)
-Language_en_NZ=English (New Zealand)
-Language_en_SA=English (Saudi Arabia)
-Language_en_SG=English (Singapore)
-Language_en_US=English (United States)
-Language_en_ZA=English (South Africa)
-Language_es_ES=Spanish
-Language_es_AR=Spanish (Argentina)
-Language_es_BO=Spanish (Bolivia)
-Language_es_CL=Spanish (Chile)
-Language_es_CO=Spanish (Colombia)
-Language_es_DO=Spanish (Dominican Republic)
-Language_es_EC=Spanish (Ecuador)
-Language_es_GT=Spanish (Guatemala)
-Language_es_HN=Spanish (Honduras)
-Language_es_MX=Spanish (Mexico)
-Language_es_PA=Spanish (Panama)
-Language_es_PY=Spanish (Paraguay)
-Language_es_PE=Spanish (Peru)
-Language_es_PR=Spanish (Puerto Rico)
-Language_es_US=Spanish (USA)
-Language_es_UY=Spanish (Uruguay)
-Language_es_GT=Spanish (Guatemala)
-Language_es_VE=Spanish (Venezuela)
-Language_et_EE=Estonian
-Language_eu_ES=Basque
-Language_fa_IR=Persian
-Language_fi_FI=Finnish
-Language_fr_BE=French (Belgium)
-Language_fr_CA=French (Canada)
-Language_fr_CH=French (Switzerland)
-Language_fr_CI=French (Cost Ivory)
-Language_fr_CM=French (Cameroun)
-Language_fr_FR=French
-Language_fr_GA=French (Gabon)
-Language_fr_NC=French (New Caledonia)
-Language_fr_SN=French (Senegal)
-Language_fy_NL=Frisian
-Language_gl_ES=Galician
-Language_he_IL=Hebrew
-Language_hi_IN=Hindi (India)
-Language_hr_HR=Croatian
-Language_hu_HU=Hungarian
-Language_id_ID=Indonesian
-Language_is_IS=Icelandic
-Language_it_IT=Italian
-Language_it_CH=Italian (Switzerland)
-Language_ja_JP=Japanese
-Language_ka_GE=Georgian
-Language_kk_KZ=Kazakh
-Language_km_KH=Khmer
-Language_kn_IN=Kannada
-Language_ko_KR=Korean
-Language_lo_LA=Lao
-Language_lt_LT=Lithuanian
-Language_lv_LV=Latvian
-Language_mk_MK=Macedonian
-Language_mn_MN=Mongolian
-Language_nb_NO=Norwegian (Bokmål)
-Language_ne_NP=Nepali
-Language_nl_BE=Dutch (Belgium)
-Language_nl_NL=Dutch
-Language_pl_PL=Polish
-Language_pt_AO=Portuguese (Angola)
-Language_pt_BR=Portuguese (Brazil)
-Language_pt_PT=Portuguese
-Language_ro_MD=Romanian (Moldavia)
-Language_ro_RO=Romanian
-Language_ru_RU=Russian
-Language_ru_UA=Russian (Ukraine)
-Language_tg_TJ=Tajik
-Language_tr_TR=Turkish
-Language_sl_SI=Slovenian
-Language_sv_SV=Swedish
-Language_sv_SE=Swedish
-Language_sq_AL=Albanian
-Language_sk_SK=Slovakian
-Language_sr_RS=Serbian
-Language_sw_SW=Kiswahili
-Language_th_TH=Thai
-Language_uk_UA=Ukrainian
-Language_uz_UZ=Uzbek
-Language_vi_VN=Vietnamese
-Language_zh_CN=Chinese
-Language_zh_TW=Chinese (Traditional)
-Language_zh_HK=Chinese (Hong Kong)
-Language_bh_MY=Malay
+Language_am_ET=ایتھوپیا
+Language_ar_AR=عربی
+Language_ar_DZ=عربی (الجیریا)
+Language_ar_EG=عربی (مصر)
+Language_ar_MA=عربی (مراکو)
+Language_ar_SA=عربی
+Language_ar_TN=عربی (تیونس)
+Language_ar_IQ=عربی (عراق)
+Language_as_IN=آسامی
+Language_az_AZ=آذربائیجانی
+Language_bn_BD=بنگالی
+Language_bn_IN=بنگالی (بھارت)
+Language_bg_BG=بلغاریائی
+Language_bs_BA=بوسنیائی
+Language_ca_ES=کاتالان
+Language_cs_CZ=چیک
+Language_da_DA=ڈینش
+Language_da_DK=ڈینش
+Language_de_DE=جرمن
+Language_de_AT=جرمن (آسٹریا)
+Language_de_CH=جرمن (سوئٹزرلینڈ)
+Language_el_GR=یونانی
+Language_el_CY=یونانی (قبرص)
+Language_en_AU=انگریزی (آسٹریلیا)
+Language_en_CA=انگریزی (کینیڈا)
+Language_en_GB=انگریزی (برطانیہ)
+Language_en_IN=انگریزی (انڈیا)
+Language_en_NZ=انگریزی (نیوزی لینڈ)
+Language_en_SA=انگریزی (سعودی عرب)
+Language_en_SG=انگریزی (سنگاپور)
+Language_en_US=امریکی انگریزی)
+Language_en_ZA=انگریزی (جنوبی افریقہ)
+Language_es_ES=ہسپانوی
+Language_es_AR=ہسپانوی (ارجنٹینا)
+Language_es_BO=ہسپانوی (بولیویا)
+Language_es_CL=ہسپانوی (چلی)
+Language_es_CO=ہسپانوی (کولمبیا)
+Language_es_DO=ہسپانوی (ڈومینیکن ریپبلک)
+Language_es_EC=ہسپانوی (ایکواڈور)
+Language_es_GT=ہسپانوی (گوئٹے مالا)
+Language_es_HN=ہسپانوی (ہنڈراس)
+Language_es_MX=ہسپانوی (میکسیکو)
+Language_es_PA=ہسپانوی (پاناما)
+Language_es_PY=ہسپانوی (پیراگوئے)
+Language_es_PE=ہسپانوی (پیرو)
+Language_es_PR=ہسپانوی (پورٹو ریکو)
+Language_es_US=ہسپانوی (امریکہ)
+Language_es_UY=ہسپانوی (یوروگوئے)
+Language_es_GT=ہسپانوی (گوئٹے مالا)
+Language_es_VE=ہسپانوی (وینزویلا)
+Language_et_EE=اسٹونین
+Language_eu_ES=باسکی
+Language_fa_IR=فارسی
+Language_fi_FI=فنش
+Language_fr_BE=فرانسیسی (بیلجیم)
+Language_fr_CA=فرانسیسی (کینیڈا)
+Language_fr_CH=فرانسیسی (سوئٹزرلینڈ)
+Language_fr_CI=فرانسیسی (لاگت آئیوری)
+Language_fr_CM=فرانسیسی (کیمرون)
+Language_fr_FR=فرانسیسی
+Language_fr_GA=فرانسیسی (گیبون)
+Language_fr_NC=فرانسیسی (نیو کیلیڈونیا)
+Language_fr_SN=فرانسیسی (سینیگال)
+Language_fy_NL=فریسیئن
+Language_gl_ES=گالیشین
+Language_he_IL=عبرانی
+Language_hi_IN=ہندی (بھارت)
+Language_hr_HR=کروشین
+Language_hu_HU=ہنگری
+Language_id_ID=انڈونیشین
+Language_is_IS=آئس لینڈی
+Language_it_IT=اطالوی
+Language_it_CH=اطالوی (سوئٹزرلینڈ)
+Language_ja_JP=جاپانی
+Language_ka_GE=جارجیائی
+Language_kk_KZ=قازق
+Language_km_KH=خمیر
+Language_kn_IN=کنڑ
+Language_ko_KR=کورین
+Language_lo_LA=لاؤ
+Language_lt_LT=لتھوینیائی
+Language_lv_LV=لیٹوین
+Language_mk_MK=مقدونیائی
+Language_mn_MN=منگول
+Language_nb_NO=نارویجن (Bokmål)
+Language_ne_NP=نیپالی
+Language_nl_BE=ڈچ (بیلجیم)
+Language_nl_NL=ڈچ
+Language_pl_PL=پولش
+Language_pt_AO=پرتگالی (انگولا)
+Language_pt_BR=پرتگالی (برازیل)
+Language_pt_PT=پرتگالی
+Language_ro_MD=رومانیہ (مولداویا)
+Language_ro_RO=رومانیہ
+Language_ru_RU=روسی
+Language_ru_UA=روسی (یوکرین)
+Language_tg_TJ=تاجک
+Language_tr_TR=ترکی
+Language_sl_SI=سلووینیائی
+Language_sv_SV=سویڈش
+Language_sv_SE=سویڈش
+Language_sq_AL=البانوی
+Language_sk_SK=سلوواکین
+Language_sr_RS=سربیائی
+Language_sw_SW=کسوہلی
+Language_th_TH=تھائی
+Language_uk_UA=یوکرینی
+Language_uz_UZ=ازبک
+Language_vi_VN=ویتنامی
+Language_zh_CN=چینی
+Language_zh_TW=چینی (روایتی)
+Language_zh_HK=چینی (ہانگ کانگ)
+Language_bh_MY=مالائی
diff --git a/htdocs/langs/ur_PK/ldap.lang b/htdocs/langs/ur_PK/ldap.lang
index 62f90d795a4..e668872e8ae 100644
--- a/htdocs/langs/ur_PK/ldap.lang
+++ b/htdocs/langs/ur_PK/ldap.lang
@@ -1,31 +1,31 @@
 # Dolibarr language file - Source file is en_US - ldap
-YouMustChangePassNextLogon=Password for user <b>%s</b> on the domain <b>%s</b> must be changed.
-UserMustChangePassNextLogon=User must change password on the domain %s
-LDAPInformationsForThisContact=Information in LDAP database for this contact
-LDAPInformationsForThisUser=Information in LDAP database for this user
-LDAPInformationsForThisGroup=Information in LDAP database for this group
-LDAPInformationsForThisMember=Information in LDAP database for this member
-LDAPInformationsForThisMemberType=Information in LDAP database for this member type
-LDAPAttributes=LDAP attributes
-LDAPCard=LDAP card
-LDAPRecordNotFound=Record not found in LDAP database
-LDAPUsers=Users in LDAP database
-LDAPFieldStatus=Status
-LDAPFieldFirstSubscriptionDate=First subscription date
-LDAPFieldFirstSubscriptionAmount=First subscription amount
-LDAPFieldLastSubscriptionDate=Latest subscription date
-LDAPFieldLastSubscriptionAmount=Latest subscription amount
-LDAPFieldSkype=Skype id
-LDAPFieldSkypeExample=Example: skypeName
-UserSynchronized=User synchronized
-GroupSynchronized=Group synchronized
-MemberSynchronized=Member synchronized
-MemberTypeSynchronized=Member type synchronized
-ContactSynchronized=Contact synchronized
-ForceSynchronize=Force synchronizing Dolibarr -> LDAP
-ErrorFailedToReadLDAP=Failed to read LDAP database. Check LDAP module setup and database accessibility.
-PasswordOfUserInLDAP=Password of user in LDAP
-LDAPPasswordHashType=Password hash type
-LDAPPasswordHashTypeExample=Type of password hash used on the server
-SupportedForLDAPExportScriptOnly=Only supported by an ldap export script
-SupportedForLDAPImportScriptOnly=Only supported by an ldap import script
+YouMustChangePassNextLogon=<b> %s </b> ڈومین <b> %s a09a4b739f170z8 پر پاس ورڈ تبدیل کرنا ضروری ہے۔
+UserMustChangePassNextLogon=صارف کو ڈومین %s پر پاس ورڈ تبدیل کرنا ہوگا۔
+LDAPInformationsForThisContact=اس رابطے کے لیے LDAP ڈیٹا بیس میں معلومات
+LDAPInformationsForThisUser=اس صارف کے لیے LDAP ڈیٹا بیس میں معلومات
+LDAPInformationsForThisGroup=اس گروپ کے لیے LDAP ڈیٹا بیس میں معلومات
+LDAPInformationsForThisMember=اس ممبر کے لیے LDAP ڈیٹا بیس میں معلومات
+LDAPInformationsForThisMemberType=اس ممبر کی قسم کے لیے LDAP ڈیٹا بیس میں معلومات
+LDAPAttributes=LDAP کی خصوصیات
+LDAPCard=LDAP کارڈ
+LDAPRecordNotFound=LDAP ڈیٹا بیس میں ریکارڈ نہیں ملا
+LDAPUsers=LDAP ڈیٹا بیس میں صارفین
+LDAPFieldStatus=حالت
+LDAPFieldFirstSubscriptionDate=سبسکرپشن کی پہلی تاریخ
+LDAPFieldFirstSubscriptionAmount=سبسکرپشن کی پہلی رقم
+LDAPFieldLastSubscriptionDate=سبسکرپشن کی تازہ ترین تاریخ
+LDAPFieldLastSubscriptionAmount=سبسکرپشن کی تازہ ترین رقم
+LDAPFieldSkype=اسکائپ آئی ڈی
+LDAPFieldSkypeExample=مثال: اسکائپ نام
+UserSynchronized=صارف مطابقت پذیر
+GroupSynchronized=گروپ مطابقت پذیر
+MemberSynchronized=ممبر مطابقت پذیر
+MemberTypeSynchronized=ممبر کی قسم مطابقت پذیر
+ContactSynchronized=رابطہ مطابقت پذیر
+ForceSynchronize=Dolibarr -> LDAP کو زبردستی ہم آہنگ کریں۔
+ErrorFailedToReadLDAP=LDAP ڈیٹا بیس کو پڑھنے میں ناکام۔ LDAP ماڈیول سیٹ اپ اور ڈیٹا بیس کی رسائی کو چیک کریں۔
+PasswordOfUserInLDAP=LDAP میں صارف کا پاس ورڈ
+LDAPPasswordHashType=پاس ورڈ ہیش کی قسم
+LDAPPasswordHashTypeExample=سرور پر استعمال ہونے والے پاس ورڈ ہیش کی قسم
+SupportedForLDAPExportScriptOnly=صرف ایل ڈی اے پی ایکسپورٹ اسکرپٹ سے تعاون یافتہ ہے۔
+SupportedForLDAPImportScriptOnly=صرف ایک ldap امپورٹ اسکرپٹ سے تعاون یافتہ ہے۔
diff --git a/htdocs/langs/ur_PK/link.lang b/htdocs/langs/ur_PK/link.lang
index 1ffcd41a18b..256f4dc462b 100644
--- a/htdocs/langs/ur_PK/link.lang
+++ b/htdocs/langs/ur_PK/link.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
-LinkANewFile=Link a new file/document
-LinkedFiles=Linked files and documents
-NoLinkFound=No registered links
-LinkComplete=The file has been linked successfully
-ErrorFileNotLinked=The file could not be linked
-LinkRemoved=The link %s has been removed
-ErrorFailedToDeleteLink= Failed to remove link '<b>%s</b>'
-ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
-URLToLink=URL to link
-OverwriteIfExists=Overwrite file if exists
+LinkANewFile=ایک نئی فائل/دستاویز سے لنک کریں۔
+LinkedFiles=منسلک فائلیں اور دستاویزات
+NoLinkFound=کوئی رجسٹرڈ لنکس نہیں۔
+LinkComplete=فائل کو کامیابی سے جوڑ دیا گیا ہے۔
+ErrorFileNotLinked=فائل کو لنک نہیں کیا جا سکا
+LinkRemoved=لنک %s ہٹا دیا گیا ہے۔
+ErrorFailedToDeleteLink= لنک '<b> %s </b>' کو ہٹانے میں ناکام
+ErrorFailedToUpdateLink= لنک '<b> %s </b>' کو اپ ڈیٹ کرنے میں ناکام
+URLToLink=لنک کرنے کے لیے URL
+OverwriteIfExists=اگر موجود ہو تو فائل کو اوور رائٹ کریں۔
diff --git a/htdocs/langs/ur_PK/loan.lang b/htdocs/langs/ur_PK/loan.lang
index d271ed0c140..0bfd57d77e7 100644
--- a/htdocs/langs/ur_PK/loan.lang
+++ b/htdocs/langs/ur_PK/loan.lang
@@ -1,34 +1,34 @@
 # Dolibarr language file - Source file is en_US - loan
-Loan=Loan
-Loans=Loans
-NewLoan=New Loan
-ShowLoan=Show Loan
-PaymentLoan=Loan payment
-LoanPayment=Loan payment
-ShowLoanPayment=Show Loan Payment
-LoanCapital=Capital
-Insurance=Insurance
-Interest=Interest
-Nbterms=Number of terms
-Term=Term
-LoanAccountancyCapitalCode=Accounting account capital
-LoanAccountancyInsuranceCode=Accounting account insurance
-LoanAccountancyInterestCode=Accounting account interest
-ConfirmDeleteLoan=Confirm deleting this loan
-LoanDeleted=Loan Deleted Successfully
-ConfirmPayLoan=Confirm classify paid this loan
-LoanPaid=Loan Paid
-ListLoanAssociatedProject=List of loan associated with the project
-AddLoan=Create loan
-FinancialCommitment=Financial commitment
-InterestAmount=Interest
-CapitalRemain=Capital remain
-TermPaidAllreadyPaid = This term is allready paid
-CantUseScheduleWithLoanStartedToPaid = Can't use scheduler for a loan with payment started
-CantModifyInterestIfScheduleIsUsed = You can't modify interest if you use schedule
+Loan=قرض
+Loans=قرضے
+NewLoan=نیا قرض
+ShowLoan=قرض دکھائیں۔
+PaymentLoan=قرض کی ادائیگی
+LoanPayment=قرض کی ادائیگی
+ShowLoanPayment=قرض کی ادائیگی دکھائیں۔
+LoanCapital=سرمایہ
+Insurance=انشورنس
+Interest=دلچسپی
+Nbterms=شرائط کی تعداد
+Term=مدت
+LoanAccountancyCapitalCode=اکاؤنٹنگ اکاؤنٹ کیپٹل
+LoanAccountancyInsuranceCode=اکاؤنٹنگ اکاؤنٹ انشورنس
+LoanAccountancyInterestCode=اکاؤنٹنگ اکاؤنٹنگ سود
+ConfirmDeleteLoan=اس قرض کو حذف کرنے کی تصدیق کریں۔
+LoanDeleted=قرض کامیابی سے حذف ہو گیا۔
+ConfirmPayLoan=اس قرض کی ادائیگی کی درجہ بندی کی تصدیق کریں۔
+LoanPaid=ادا شدہ قرض
+ListLoanAssociatedProject=منصوبے سے وابستہ قرض کی فہرست
+AddLoan=قرض بنائیں
+FinancialCommitment=مالی وابستگی
+InterestAmount=دلچسپی
+CapitalRemain=سرمایہ باقی ہے۔
+TermPaidAllreadyPaid = یہ اصطلاح پہلے سے ادا کی جاتی ہے۔
+CantUseScheduleWithLoanStartedToPaid = ادائیگی شروع ہونے کے ساتھ قرض کے لیے شیڈیولر استعمال نہیں کر سکتے
+CantModifyInterestIfScheduleIsUsed = اگر آپ شیڈول استعمال کرتے ہیں تو آپ دلچسپی میں ترمیم نہیں کر سکتے
 # Admin
-ConfigLoan=Configuration of the module loan
-LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
-LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
-LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-CreateCalcSchedule=Edit financial commitment
+ConfigLoan=ماڈیول قرض کی ترتیب
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=ڈیفالٹ کے حساب سے اکاؤنٹنگ کا سرمایہ
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=ڈیفالٹ کے حساب سے اکاؤنٹنگ سود
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=اکاؤنٹنگ اکاؤنٹ انشورنس بطور ڈیفالٹ
+CreateCalcSchedule=مالی وابستگی میں ترمیم کریں۔
diff --git a/htdocs/langs/ur_PK/mailmanspip.lang b/htdocs/langs/ur_PK/mailmanspip.lang
index bab4b3576b4..966c6d94059 100644
--- a/htdocs/langs/ur_PK/mailmanspip.lang
+++ b/htdocs/langs/ur_PK/mailmanspip.lang
@@ -1,27 +1,27 @@
 # Dolibarr language file - Source file is en_US - mailmanspip
-MailmanSpipSetup=Mailman and SPIP module Setup
-MailmanTitle=Mailman mailing list system
-TestSubscribe=To test subscription to Mailman lists
-TestUnSubscribe=To test unsubscribe from Mailman lists
-MailmanCreationSuccess=Subscription test was executed successfully
-MailmanDeletionSuccess=Unsubscription test was executed successfully
-SynchroMailManEnabled=A Mailman update will be performed
-SynchroSpipEnabled=A Spip update will be performed
-DescADHERENT_MAILMAN_ADMINPW=Mailman administrator password
-DescADHERENT_MAILMAN_URL=URL for Mailman subscriptions
-DescADHERENT_MAILMAN_UNSUB_URL=URL for Mailman unsubscriptions
-DescADHERENT_MAILMAN_LISTS=List(s) for automatic inscription of new members (separated by a comma)
-SPIPTitle=SPIP Content Management System
-DescADHERENT_SPIP_SERVEUR=SPIP Server
-DescADHERENT_SPIP_DB=SPIP database name
-DescADHERENT_SPIP_USER=SPIP database login
-DescADHERENT_SPIP_PASS=SPIP database password
-AddIntoSpip=Add into SPIP
-AddIntoSpipConfirmation=Are you sure you want to add this member into SPIP?
-AddIntoSpipError=Failed to add the user in SPIP
-DeleteIntoSpip=Remove from SPIP
-DeleteIntoSpipConfirmation=Are you sure you want to remove this member from SPIP?
-DeleteIntoSpipError=Failed to suppress the user from SPIP
-SPIPConnectionFailed=Failed to connect to SPIP
-SuccessToAddToMailmanList=%s successfully added to mailman list %s or SPIP database
-SuccessToRemoveToMailmanList=%s successfully removed from mailman list %s or SPIP database
+MailmanSpipSetup=میل مین اور SPIP ماڈیول سیٹ اپ
+MailmanTitle=میل مین میلنگ لسٹ سسٹم
+TestSubscribe=میل مین کی فہرستوں کی رکنیت کی جانچ کرنے کے لیے
+TestUnSubscribe=میل مین کی فہرستوں سے رکنیت ختم کرنے کی جانچ کرنے کے لیے
+MailmanCreationSuccess=سبسکرپشن ٹیسٹ کامیابی کے ساتھ انجام دیا گیا۔
+MailmanDeletionSuccess=ان سبسکرپشن ٹیسٹ کو کامیابی کے ساتھ انجام دیا گیا۔
+SynchroMailManEnabled=میل مین اپ ڈیٹ کیا جائے گا۔
+SynchroSpipEnabled=ایک سپپ اپ ڈیٹ کیا جائے گا۔
+DescADHERENT_MAILMAN_ADMINPW=میل مین ایڈمنسٹریٹر کا پاس ورڈ
+DescADHERENT_MAILMAN_URL=میل مین سبسکرپشنز کے لیے URL
+DescADHERENT_MAILMAN_UNSUB_URL=میل مین کی رکنیت ختم کرنے کے لیے URL
+DescADHERENT_MAILMAN_LISTS=نئے اراکین کی خودکار تحریر کے لیے فہرست (کوما سے الگ)
+SPIPTitle=SPIP کنٹینٹ مینجمنٹ سسٹم
+DescADHERENT_SPIP_SERVEUR=SPIP سرور
+DescADHERENT_SPIP_DB=SPIP ڈیٹا بیس کا نام
+DescADHERENT_SPIP_USER=SPIP ڈیٹا بیس لاگ ان
+DescADHERENT_SPIP_PASS=SPIP ڈیٹا بیس پاس ورڈ
+AddIntoSpip=SPIP میں شامل کریں۔
+AddIntoSpipConfirmation=کیا آپ واقعی اس ممبر کو SPIP میں شامل کرنا چاہتے ہیں؟
+AddIntoSpipError=صارف کو SPIP میں شامل کرنے میں ناکام
+DeleteIntoSpip=SPIP سے ہٹا دیں۔
+DeleteIntoSpipConfirmation=کیا آپ واقعی اس ممبر کو SPIP سے ہٹانا چاہتے ہیں؟
+DeleteIntoSpipError=SPIP سے صارف کو دبانے میں ناکام
+SPIPConnectionFailed=SPIP سے جڑنے میں ناکام
+SuccessToAddToMailmanList=%s میل مین کی فہرست %s یا SPIP ڈیٹا بیس میں کامیابی کے ساتھ شامل کیا گیا
+SuccessToRemoveToMailmanList=%s میل مین کی فہرست %s یا SPIP ڈیٹا بیس سے کامیابی کے ساتھ ہٹا دیا گیا
diff --git a/htdocs/langs/ur_PK/mails.lang b/htdocs/langs/ur_PK/mails.lang
index 52c4d4dbf69..978752c091a 100644
--- a/htdocs/langs/ur_PK/mails.lang
+++ b/htdocs/langs/ur_PK/mails.lang
@@ -1,180 +1,180 @@
 # Dolibarr language file - Source file is en_US - mails
-Mailing=EMailing
-EMailing=EMailing
-EMailings=EMailings
-AllEMailings=All eMailings
-MailCard=EMailing card
-MailRecipients=Recipients
-MailRecipient=Recipient
-MailTitle=Description
-MailFrom=Sender
-MailErrorsTo=Errors to
-MailReply=Reply to
-MailTo=Receiver(s)
-MailToUsers=To user(s)
-MailCC=Copy to
-MailToCCUsers=Copy to users(s)
-MailCCC=Cached copy to
-MailTopic=Email subject
-MailText=Message
-MailFile=Attached files
-MailMessage=Email body
-SubjectNotIn=Not in Subject
-BodyNotIn=Not in Body
-ShowEMailing=Show emailing
-ListOfEMailings=List of emailings
-NewMailing=New emailing
-EditMailing=Edit emailing
-ResetMailing=Resend emailing
-DeleteMailing=Delete emailing
-DeleteAMailing=Delete an emailing
-PreviewMailing=Preview emailing
-CreateMailing=Create emailing
-TestMailing=Test email
-ValidMailing=Valid emailing
-MailingStatusDraft=Draft
-MailingStatusValidated=Validated
-MailingStatusSent=Sent
-MailingStatusSentPartialy=Sent partially
-MailingStatusSentCompletely=Sent completely
-MailingStatusError=Error
-MailingStatusNotSent=Not sent
-MailSuccessfulySent=Email (from %s to %s) successfully accepted for delivery
-MailingSuccessfullyValidated=EMailing successfully validated
-MailUnsubcribe=Unsubscribe
-MailingStatusNotContact=Don't contact anymore
-MailingStatusReadAndUnsubscribe=Read and unsubscribe
-ErrorMailRecipientIsEmpty=Email recipient is empty
-WarningNoEMailsAdded=No new Email to add to recipient's list.
-ConfirmValidMailing=Are you sure you want to validate this emailing?
-ConfirmResetMailing=Warning, by re-initializing emailing <b>%s</b>, you will allow the re-sending this email in a bulk mailing. Are you sure you want to do this?
-ConfirmDeleteMailing=Are you sure you want to delete this emailing?
-NbOfUniqueEMails=No. of unique emails
-NbOfEMails=No. of EMails
-TotalNbOfDistinctRecipients=Number of distinct recipients
-NoTargetYet=No recipients defined yet (Go on tab 'Recipients')
-NoRecipientEmail=No recipient email for %s
-RemoveRecipient=Remove recipient
-YouCanAddYourOwnPredefindedListHere=To create your email selector module, see htdocs/core/modules/mailings/README.
-EMailTestSubstitutionReplacedByGenericValues=When using test mode, substitutions variables are replaced by generic values
-MailingAddFile=Attach this file
-NoAttachedFiles=No attached files
-BadEMail=Bad value for Email
-EMailNotDefined=Email not defined
-ConfirmCloneEMailing=Are you sure you want to clone this emailing?
-CloneContent=Clone message
-CloneReceivers=Cloner recipients
-DateLastSend=Date of latest sending
-DateSending=Date sending
-SentTo=Sent to <b>%s</b>
-MailingStatusRead=Read
-YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubscribe from mailing list
-ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubscribe" feature
-EMailSentToNRecipients=Email sent to %s recipients.
-EMailSentForNElements=Email sent for %s elements.
-XTargetsAdded=<b>%s</b> recipients added into target list
-OnlyPDFattachmentSupported=If the PDF documents were already generated for the objects to send, they will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachments in mass sending in this version).
-AllRecipientSelected=The recipients of the %s record selected (if their email is known).
-GroupEmails=Group emails
-OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
-WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
-ResultOfMailSending=Result of mass Email sending
-NbSelected=Number selected
-NbIgnored=Number ignored
-NbSent=Number sent
-SentXXXmessages=%s message(s) sent.
-ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
-MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
-MailingModuleDescContactsByCompanyCategory=Contacts by third-party category
-MailingModuleDescContactsByCategory=Contacts by categories
-MailingModuleDescContactsByFunction=Contacts by position
-MailingModuleDescEmailsFromFile=Emails from file
-MailingModuleDescEmailsFromUser=Emails input by user
-MailingModuleDescDolibarrUsers=Users with Emails
-MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
-SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
-EmailCollectorFilterDesc=All filters must match to have an email being collected
+Mailing=ای میل کرنا
+EMailing=ای میل کرنا
+EMailings=ای میلز
+AllEMailings=تمام ای میلز
+MailCard=ای میل کارڈ
+MailRecipients=وصول کنندگان
+MailRecipient=وصول کنندہ
+MailTitle=تفصیل
+MailFrom=بھیجنے والا
+MailErrorsTo=کی خرابیاں
+MailReply=کا جواب دیں
+MailTo=وصول کنندہ
+MailToUsers=صارف (صارفین) کو
+MailCC=میں کاپی کریں۔
+MailToCCUsers=صارفین کو کاپی کریں
+MailCCC=میں کیش شدہ کاپی
+MailTopic=ای میل کے موضوع
+MailText=پیغام
+MailFile=منسلک فائلوں
+MailMessage=ای میل باڈی
+SubjectNotIn=سبجیکٹ میں نہیں۔
+BodyNotIn=جسم میں نہیں۔
+ShowEMailing=ای میل دکھائیں۔
+ListOfEMailings=ای میلز کی فہرست
+NewMailing=نئی ای میلنگ
+EditMailing=ای میل میں ترمیم کریں۔
+ResetMailing=ای میل دوبارہ بھیجیں۔
+DeleteMailing=ای میل کو حذف کریں۔
+DeleteAMailing=ایک ای میل کو حذف کریں۔
+PreviewMailing=ای میل کا پیش نظارہ کریں۔
+CreateMailing=ای میل بنائیں
+TestMailing=ای میل کی جانچ کریں۔
+ValidMailing=درست ای میلنگ
+MailingStatusDraft=مسودہ
+MailingStatusValidated=تصدیق شدہ
+MailingStatusSent=بھیجا
+MailingStatusSentPartialy=جزوی طور پر بھیجا گیا۔
+MailingStatusSentCompletely=مکمل طور پر بھیج دیا گیا۔
+MailingStatusError=خرابی
+MailingStatusNotSent=بھیجا نہیں۔
+MailSuccessfulySent=ای میل (%s سے %s تک) ڈیلیوری کے لیے کامیابی کے ساتھ قبول کر لی گئی
+MailingSuccessfullyValidated=ای میل کی توثیق کامیابی سے ہو گئی۔
+MailUnsubcribe=ان سبسکرائب کریں۔
+MailingStatusNotContact=اب رابطہ مت کرنا
+MailingStatusReadAndUnsubscribe=پڑھیں اور ان سبسکرائب کریں۔
+ErrorMailRecipientIsEmpty=ای میل وصول کنندہ خالی ہے۔
+WarningNoEMailsAdded=وصول کنندہ کی فہرست میں شامل کرنے کے لیے کوئی نیا ای میل نہیں ہے۔
+ConfirmValidMailing=کیا آپ واقعی اس ای میل کی توثیق کرنا چاہتے ہیں؟
+ConfirmResetMailing=انتباہ، <b> %s </b> ای میل کو دوبارہ شروع کرکے، آپ اس ای میل کو بلک میلنگ میں دوبارہ بھیجنے کی اجازت دیں گے۔ کیا آپ واقعی یہ کرنا چاہتے ہیں؟
+ConfirmDeleteMailing=کیا آپ واقعی اس ای میل کو حذف کرنا چاہتے ہیں؟
+NbOfUniqueEMails=منفرد ای میلز کی تعداد
+NbOfEMails=ای میلز کی تعداد
+TotalNbOfDistinctRecipients=مختلف وصول کنندگان کی تعداد
+NoTargetYet=ابھی تک کوئی وصول کنندگان کی وضاحت نہیں کی گئی (ٹیب 'وصول کنندگان' پر جائیں)
+NoRecipientEmail=%s کے لیے کوئی وصول کنندہ ای میل نہیں ہے۔
+RemoveRecipient=وصول کنندہ کو ہٹا دیں۔
+YouCanAddYourOwnPredefindedListHere=اپنا ای میل سلیکٹر ماڈیول بنانے کے لیے، htdocs/core/modules/mailings/README دیکھیں۔
+EMailTestSubstitutionReplacedByGenericValues=ٹیسٹ موڈ استعمال کرتے وقت، متبادل متغیرات کو عام اقدار سے بدل دیا جاتا ہے۔
+MailingAddFile=اس فائل کو منسلک کریں۔
+NoAttachedFiles=کوئی منسلک فائلیں نہیں۔
+BadEMail=ای میل کے لیے خراب قدر
+EMailNotDefined=ای میل کی وضاحت نہیں کی گئی۔
+ConfirmCloneEMailing=کیا آپ واقعی اس ای میل کو کلون کرنا چاہتے ہیں؟
+CloneContent=کلون پیغام
+CloneReceivers=کلونر وصول کنندگان
+DateLastSend=تازہ ترین بھیجنے کی تاریخ
+DateSending=بھیجنے کی تاریخ
+SentTo=<b> %s </b> پر بھیجا
+MailingStatusRead=پڑھیں
+YourMailUnsubcribeOK=ای میل <b> %s </b> درست طریقے سے میلنگ لسٹ سے ان سبسکرائب کیا گیا ہے
+ActivateCheckReadKey="ریڈ رسید" اور "ان سبسکرائب" خصوصیت کے لیے استعمال ہونے والی یو آر ایل کو خفیہ کرنے کے لیے استعمال ہونے والی کلید
+EMailSentToNRecipients=%s وصول کنندگان کو ای میل بھیجی گئی۔
+EMailSentForNElements=%s عناصر کے لیے ای میل بھیجی گئی۔
+XTargetsAdded= <b> %s </b> وصول کنندگان کو ہدف کی فہرست میں شامل کیا گیا
+OnlyPDFattachmentSupported=اگر پی ڈی ایف دستاویزات اشیاء کو بھیجنے کے لیے پہلے ہی تیار کی گئی ہیں، تو وہ ای میل کے ساتھ منسلک کر دی جائیں گی۔ اگر نہیں، تو کوئی ای میل نہیں بھیجا جائے گا (یہ بھی نوٹ کریں کہ اس ورژن میں بڑے پیمانے پر بھیجنے میں صرف پی ڈی ایف دستاویزات ہی منسلکات کے طور پر معاون ہیں)۔
+AllRecipientSelected=%s ریکارڈ کے وصول کنندگان نے منتخب کیا (اگر ان کا ای میل معلوم ہو)۔
+GroupEmails=گروپ ای میلز
+OneEmailPerRecipient=فی وصول کنندہ ایک ای میل (بطور ڈیفالٹ، ایک ای میل فی ریکارڈ منتخب)
+WarningIfYouCheckOneRecipientPerEmail=وارننگ، اگر آپ اس باکس کو نشان زد کرتے ہیں، تو اس کا مطلب ہے کہ منتخب کردہ کئی مختلف ریکارڈز کے لیے صرف ایک ای میل بھیجی جائے گی، اس لیے، اگر آپ کے پیغام میں متبادل متغیرات ہیں جو ریکارڈ کے ڈیٹا کا حوالہ دیتے ہیں، تو ان کو تبدیل کرنا ممکن نہیں ہوگا۔
+ResultOfMailSending=بڑے پیمانے پر ای میل بھیجنے کا نتیجہ
+NbSelected=نمبر منتخب کیا گیا۔
+NbIgnored=نمبر نظر انداز کر دیا گیا۔
+NbSent=نمبر بھیجا گیا۔
+SentXXXmessages=%s پیغام بھیجے گئے۔
+ConfirmUnvalidateEmailing=کیا آپ واقعی ای میل <b> %s </b> کو ڈرافٹ اسٹیٹس میں تبدیل کرنا چاہتے ہیں؟
+MailingModuleDescContactsWithThirdpartyFilter=کسٹمر فلٹرز سے رابطہ کریں۔
+MailingModuleDescContactsByCompanyCategory=تیسرے فریق کے زمرے کے لحاظ سے رابطے
+MailingModuleDescContactsByCategory=زمرے کے لحاظ سے رابطے
+MailingModuleDescContactsByFunction=پوزیشن کے لحاظ سے رابطے
+MailingModuleDescEmailsFromFile=فائل سے ای میلز
+MailingModuleDescEmailsFromUser=صارف کے ذریعے ای میلز کا ان پٹ
+MailingModuleDescDolibarrUsers=ای میلز والے صارفین
+MailingModuleDescThirdPartiesByCategories=تیسرے فریق (زمرے کے لحاظ سے)
+SendingFromWebInterfaceIsNotAllowed=ویب انٹرفیس سے بھیجنے کی اجازت نہیں ہے۔
+EmailCollectorFilterDesc=ای میل جمع کرنے کے لیے تمام فلٹرز کا مماثل ہونا چاہیے۔
 
 # Libelle des modules de liste de destinataires mailing
-LineInFile=Line %s in file
-RecipientSelectionModules=Defined requests for recipient's selection
-MailSelectedRecipients=Selected recipients
-MailingArea=EMailings area
-LastMailings=Latest %s emailings
-TargetsStatistics=Targets statistics
-NbOfCompaniesContacts=Unique contacts/addresses
-MailNoChangePossible=Recipients for validated emailing can't be changed
-SearchAMailing=Search mailing
-SendMailing=Send emailing
-SentBy=Sent by
-MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
-MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
-ConfirmSendingEmailing=If you want to send emailing directly from this screen, please confirm you are sure you want to send emailing now from your browser ?
-LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
-TargetsReset=Clear list
-ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing
-ToAddRecipientsChooseHere=Add recipients by choosing from the lists
-NbOfEMailingsReceived=Mass emailings received
-NbOfEMailingsSend=Mass emailings sent
-IdRecord=ID record
-DeliveryReceipt=Delivery Ack.
-YouCanUseCommaSeparatorForSeveralRecipients=You can use the <b>comma</b> separator to specify several recipients.
-TagCheckMail=Track mail opening
-TagUnsubscribe=Unsubscribe link
-TagSignature=Signature of sending user
-EMailRecipient=Recipient Email
-TagMailtoEmail=Recipient Email (including html "mailto:" link)
-NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
+LineInFile=فائل میں لائن %s
+RecipientSelectionModules=وصول کنندہ کے انتخاب کے لیے وضاحتی درخواستیں۔
+MailSelectedRecipients=منتخب وصول کنندگان
+MailingArea=ای میلنگ ایریا
+LastMailings=تازہ ترین %s ای میلز
+TargetsStatistics=اہداف کے اعدادوشمار
+NbOfCompaniesContacts=منفرد رابطے/پتے
+MailNoChangePossible=تصدیق شدہ ای میل کے وصول کنندگان کو تبدیل نہیں کیا جا سکتا
+SearchAMailing=میلنگ تلاش کریں۔
+SendMailing=ای میل بھیجیں۔
+SentBy=کی طرف سے بھیجا
+MailingNeedCommand=ای میل بھیجنا کمانڈ لائن سے انجام دیا جاسکتا ہے۔ اپنے سرور کے منتظم سے تمام وصول کنندگان کو ای میل بھیجنے کے لیے درج ذیل کمانڈ شروع کرنے کو کہیں۔
+MailingNeedCommand2=تاہم آپ MAILING_LIMIT_SENDBYWEB پیرامیٹر شامل کرکے انہیں آن لائن بھیج سکتے ہیں جس کی قیمت آپ سیشن کے ذریعے بھیجنا چاہتے ہیں۔ اس کے لیے ہوم - سیٹ اپ - دیگر پر جائیں۔
+ConfirmSendingEmailing=اگر آپ اس اسکرین سے براہ راست ای میل بھیجنا چاہتے ہیں، تو براہ کرم تصدیق کریں کہ آپ کو یقین ہے کہ آپ ابھی اپنے براؤزر سے ای میل بھیجنا چاہتے ہیں؟
+LimitSendingEmailing=نوٹ: ویب انٹرفیس سے ای میل بھیجنا سیکیورٹی اور ٹائم آؤٹ وجوہات کی بناء پر کئی بار کیا جاتا ہے، <b> %s </b> وصول کنندگان ہر بھیجنے والے سیشن کے لیے ایک وقت میں۔
+TargetsReset=فہرست صاف کریں۔
+ToClearAllRecipientsClickHere=اس ای میل کے لیے وصول کنندگان کی فہرست کو صاف کرنے کے لیے یہاں کلک کریں۔
+ToAddRecipientsChooseHere=فہرستوں میں سے انتخاب کرکے وصول کنندگان کو شامل کریں۔
+NbOfEMailingsReceived=بڑے پیمانے پر ای میلز موصول ہوئیں
+NbOfEMailingsSend=بڑے پیمانے پر ای میلز بھیجی گئیں۔
+IdRecord=شناختی ریکارڈ
+DeliveryReceipt=ڈیلیوری Ack.
+YouCanUseCommaSeparatorForSeveralRecipients=آپ متعدد وصول کنندگان کی وضاحت کرنے کے لیے <b> کوما </b> الگ کرنے والا استعمال کر سکتے ہیں۔
+TagCheckMail=میل کھولنے کو ٹریک کریں۔
+TagUnsubscribe=لنک ان سبسکرائب کریں۔
+TagSignature=بھیجنے والے صارف کے دستخط
+EMailRecipient=وصول کنندہ کا ای میل
+TagMailtoEmail=وصول کنندہ کا ای میل (بشمول html "mailto:" لنک)
+NoEmailSentBadSenderOrRecipientEmail=کوئی ای میل نہیں بھیجی گئی۔ برا بھیجنے والا یا وصول کنندہ کا ای میل۔ صارف کے پروفائل کی تصدیق کریں۔
 # Module Notifications
-Notifications=Notifications
-NotificationsAuto=Notifications Auto.
-NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
-ANotificationsWillBeSent=1 automatic notification will be sent by email
-SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
-AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List of all automatic email notifications sent
-MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
-MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
-MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
-YouCanAlsoUseSupervisorKeyword=You can also add the keyword <strong>__SUPERVISOREMAIL__</strong> to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
-NbOfTargetedContacts=Current number of targeted contact emails
-UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
-UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
-MailAdvTargetRecipients=Recipients (advanced selection)
-AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
-AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
-AdvTgtSearchIntHelp=Use interval to select int or float value
-AdvTgtMinVal=Minimum value
-AdvTgtMaxVal=Maximum value
-AdvTgtSearchDtHelp=Use interval to select date value
-AdvTgtStartDt=Start dt.
-AdvTgtEndDt=End dt.
-AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third-party email or just contact email
-AdvTgtTypeOfIncude=Type of targeted email
-AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
-AddAll=Add all
-RemoveAll=Remove all
-ItemsCount=Item(s)
-AdvTgtNameTemplate=Filter name
-AdvTgtAddContact=Add emails according to criteria
-AdvTgtLoadFilter=Load filter
-AdvTgtDeleteFilter=Delete filter
-AdvTgtSaveFilter=Save filter
-AdvTgtCreateFilter=Create filter
-AdvTgtOrCreateNewFilter=Name of new filter
-NoContactWithCategoryFound=No category found linked to some contacts/addresses
-NoContactLinkedToThirdpartieWithCategoryFound=No category found linked to some thirdparties
-OutGoingEmailSetup=Outgoing emails
-InGoingEmailSetup=Incoming emails
-OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
-DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
-Information=Information
-ContactsWithThirdpartyFilter=Contacts with third-party filter
-Unanswered=Unanswered
-Answered=Answered
-IsNotAnAnswer=Is not answer (initial email)
-IsAnAnswer=Is an answer of an initial email
-RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
-DefaultBlacklistMailingStatus=Default value for field '%s' when creating a new contact
-DefaultStatusEmptyMandatory=Empty but mandatory
+Notifications=اطلاعات
+NotificationsAuto=اطلاعات آٹو۔
+NoNotificationsWillBeSent=اس ایونٹ کی قسم اور کمپنی کے لیے کوئی خودکار ای میل اطلاعات کا منصوبہ نہیں ہے۔
+ANotificationsWillBeSent=1 خودکار اطلاع بذریعہ ای میل بھیجی جائے گی۔
+SomeNotificationsWillBeSent=%s خودکار اطلاعات بذریعہ ای میل بھیجی جائیں گی۔
+AddNewNotification=ایک نئے خودکار ای میل نوٹیفکیشن کو سبسکرائب کریں (ٹارگٹ/ایونٹ)
+ListOfActiveNotifications=خودکار ای میل اطلاع کے لیے تمام فعال سبسکرپشنز (اہداف/ایونٹس) کی فہرست
+ListOfNotificationsDone=بھیجے گئے تمام خودکار ای میل اطلاعات کی فہرست
+MailSendSetupIs=ای میل بھیجنے کی ترتیب کو '%s' پر ترتیب دیا گیا ہے۔ یہ موڈ بڑے پیمانے پر ای میل بھیجنے کے لیے استعمال نہیں کیا جا سکتا۔
+MailSendSetupIs2=آپ کو پہلے ایڈمن اکاؤنٹ کے ساتھ مینو میں جانا چاہیے اس موڈ کے ساتھ، آپ اپنے انٹرنیٹ سروس پرووائیڈر کی طرف سے فراہم کردہ SMTP سرور کا سیٹ اپ درج کر سکتے ہیں اور ماس ای میلنگ فیچر استعمال کر سکتے ہیں۔
+MailSendSetupIs3=اگر آپ کے پاس اپنے SMTP سرور کو سیٹ اپ کرنے کے بارے میں کوئی سوال ہے، تو آپ %s سے پوچھ سکتے ہیں۔
+YouCanAlsoUseSupervisorKeyword=صارف کے نگران کو ای میل بھیجنے کے لیے آپ کلیدی لفظ <strong> __SUPERVISOREMAIL__ </strong> بھی شامل کر سکتے ہیں (صرف اس صورت میں کام کرتا ہے جب اس سپروائزر کے لیے ای میل کی وضاحت کی گئی ہو)
+NbOfTargetedContacts=ھدف بنائے گئے رابطہ ای میلز کی موجودہ تعداد
+UseFormatFileEmailToTarget=درآمد شدہ فائل میں <strong> ای میل؛ نام؛ پہلا نام؛ دیگر </strong> فارمیٹ ہونا ضروری ہے
+UseFormatInputEmailToTarget=فارمیٹ <strong> ای میل؛ نام؛ پہلا نام؛ دیگر </strong> کے ساتھ ایک سٹرنگ درج کریں
+MailAdvTargetRecipients=وصول کنندگان (جدید انتخاب)
+AdvTgtTitle=تیسرے فریقوں یا رابطوں/پتے کو ہدف بنانے کے لیے پہلے سے منتخب کرنے کے لیے ان پٹ فیلڈز کو پُر کریں۔
+AdvTgtSearchTextHelp=%% کو وائلڈ کارڈ کے طور پر استعمال کریں۔ مثال کے طور پر <b> jean, joe, jim </b> جیسے تمام آئٹم کو تلاش کرنے کے لیے، آپ <b> j%% a09a4b739f17f18 بھی ان پٹ کر سکتے ہیں؛ قدر کے لیے جداکار کے طور پر، اور استعمال کریں! اس قدر کے علاوہ۔ مثال کے طور پر <b> jean;joe;jim%%;!jimo;!jima%% </b> تمام جین کو نشانہ بنائے گا، جو، جم سے شروع کرے گا لیکن ہر چیز کو جی سے شروع نہیں کرے گا۔
+AdvTgtSearchIntHelp=int یا فلوٹ ویلیو کو منتخب کرنے کے لیے وقفہ استعمال کریں۔
+AdvTgtMinVal=کم از کم قدر
+AdvTgtMaxVal=زیادہ سے زیادہ قدر
+AdvTgtSearchDtHelp=تاریخ کی قدر منتخب کرنے کے لیے وقفہ استعمال کریں۔
+AdvTgtStartDt=تاریخ شروع کریں۔
+AdvTgtEndDt=اختتام dt.
+AdvTgtTypeOfIncudeHelp=تھرڈ پارٹی کا ٹارگٹ ای میل اور تھرڈ پارٹی کے رابطے کا ای میل، یا صرف تھرڈ پارٹی ای میل یا صرف ای میل سے رابطہ کریں
+AdvTgtTypeOfIncude=ھدف شدہ ای میل کی قسم
+AdvTgtContactHelp=صرف اس صورت میں استعمال کریں جب آپ رابطے کو "ٹارگیٹڈ ای میل کی قسم" میں نشانہ بناتے ہیں۔
+AddAll=سب شامل کریں۔
+RemoveAll=سب کو ہٹا دیں
+ItemsCount=اشیاء)
+AdvTgtNameTemplate=فلٹر کا نام
+AdvTgtAddContact=معیار کے مطابق ای میلز شامل کریں۔
+AdvTgtLoadFilter=فلٹر لوڈ کریں۔
+AdvTgtDeleteFilter=فلٹر کو حذف کریں۔
+AdvTgtSaveFilter=فلٹر محفوظ کریں۔
+AdvTgtCreateFilter=فلٹر بنائیں
+AdvTgtOrCreateNewFilter=نئے فلٹر کا نام
+NoContactWithCategoryFound=کچھ رابطوں/پتوں سے منسلک کوئی زمرہ نہیں ملا
+NoContactLinkedToThirdpartieWithCategoryFound=کچھ تھرڈ پارٹیز سے منسلک کوئی زمرہ نہیں ملا
+OutGoingEmailSetup=باہر جانے والی ای میلز
+InGoingEmailSetup=آنے والی ای میلز
+OutGoingEmailSetupForEmailing=باہر جانے والی ای میلز (ماڈیول %s کے لیے)
+DefaultOutgoingEmailSetup=عالمی آؤٹ گوئنگ ای میل سیٹ اپ سے ایک جیسی ترتیب
+Information=معلومات
+ContactsWithThirdpartyFilter=تھرڈ پارٹی فلٹر کے ساتھ رابطے
+Unanswered=لا جواب
+Answered=جواب دیا۔
+IsNotAnAnswer=جواب نہیں ہے (ابتدائی ای میل)
+IsAnAnswer=ابتدائی ای میل کا جواب ہے۔
+RecordCreatedByEmailCollector=ای میل کلکٹر %s ای میل %s سے ریکارڈ بنایا گیا
+DefaultBlacklistMailingStatus=نیا رابطہ بناتے وقت فیلڈ '%s' کے لیے ڈیفالٹ قدر
+DefaultStatusEmptyMandatory=خالی لیکن لازمی
diff --git a/htdocs/langs/ur_PK/main.lang b/htdocs/langs/ur_PK/main.lang
index c59da9aabec..8e3147fb32f 100644
--- a/htdocs/langs/ur_PK/main.lang
+++ b/htdocs/langs/ur_PK/main.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - main
-DIRECTION=ltr
+DIRECTION=rtl
 # Note for Chinese:
 # msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader)
 # stsongstdlight or cid0cs are for simplified Chinese
 # To read Chinese pdf with Linux: sudo apt-get install poppler-data
-FONTFORPDF=helvetica
+FONTFORPDF=DejaVuSans
 FONTSIZEFORPDF=10
 SeparatorDecimal=.
 SeparatorThousand=,
@@ -23,1142 +23,1144 @@ FormatDateHourShort=%m/%d/%Y %I:%M %p
 FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
 FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
-DatabaseConnection=Database connection
-NoTemplateDefined=No template available for this email type
-AvailableVariables=Available substitution variables
-NoTranslation=No translation
-Translation=Translation
-CurrentTimeZone=TimeZone PHP (server)
-EmptySearchString=Enter non empty search criterias
-EnterADateCriteria=Enter a date criteria
-NoRecordFound=No record found
-NoRecordDeleted=No record deleted
-NotEnoughDataYet=Not enough data
-NoError=No error
-Error=Error
-Errors=Errors
-ErrorFieldRequired=Field '%s' is required
-ErrorFieldFormat=Field '%s' has a bad value
-ErrorFileDoesNotExists=File %s does not exist
-ErrorFailedToOpenFile=Failed to open file %s
-ErrorCanNotCreateDir=Cannot create dir %s
-ErrorCanNotReadDir=Cannot read dir %s
-ErrorConstantNotDefined=Parameter %s not defined
-ErrorUnknown=Unknown error
-ErrorSQL=SQL Error
-ErrorLogoFileNotFound=Logo file '%s' was not found
-ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
-ErrorGoToModuleSetup=Go to Module setup to fix this
-ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
-ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
-ErrorInternalErrorDetected=Error detected
-ErrorWrongHostParameter=Wrong host parameter
-ErrorYourCountryIsNotDefined=Your country is not defined. Go to Home-Setup-Edit and post the form again.
-ErrorRecordIsUsedByChild=Failed to delete this record. This record is used by at least one child record.
-ErrorWrongValue=Wrong value
-ErrorWrongValueForParameterX=Wrong value for parameter %s
-ErrorNoRequestInError=No request in error
-ErrorServiceUnavailableTryLater=Service not available at the moment. Try again later.
-ErrorDuplicateField=Duplicate value in a unique field
-ErrorSomeErrorWereFoundRollbackIsDone=Some errors were found. Changes have been rolled back.
-ErrorConfigParameterNotDefined=Parameter <b>%s</b> is not defined in the Dolibarr config file <b>conf.php</b>.
-ErrorCantLoadUserFromDolibarrDatabase=Failed to find user <b>%s</b> in Dolibarr database.
-ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'.
-ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
-ErrorFailedToSaveFile=Error, failed to save file.
-ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of a existing warehouse
-FieldCannotBeNegative=Field "%s" cannot be negative
-MaxNbOfRecordPerPage=Max. number of records per page
-NotAuthorized=You are not authorized to do that.
-SetDate=Set date
-SelectDate=Select a date
-SeeAlso=See also %s
-SeeHere=See here
-ClickHere=Click here
-Here=Here
-Apply=Apply
-BackgroundColorByDefault=Default background color
-FileRenamed=The file was successfully renamed
-FileGenerated=The file was successfully generated
-FileSaved=The file was successfully saved
-FileUploaded=The file was successfully uploaded
-FileTransferComplete=File(s) uploaded successfully
-FilesDeleted=File(s) successfully deleted
-FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
-NbOfEntries=No. of entries
-GoToWikiHelpPage=Read online help (Internet access needed)
-GoToHelpPage=Read help
-DedicatedPageAvailable=Dedicated help page related to your current screen
-HomePage=Home Page
-RecordSaved=Record saved
-RecordDeleted=Record deleted
-RecordGenerated=Record generated
-LevelOfFeature=Level of features
-NotDefined=Not defined
-DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is set to <b>%s</b> in configuration file <b>conf.php</b>.<br>This means that the password database is external to Dolibarr, so changing this field may have no effect.
-Administrator=Administrator
-Undefined=Undefined
-PasswordForgotten=Password forgotten?
-NoAccount=No account?
-SeeAbove=See above
-HomeArea=Home
-LastConnexion=Last login
-PreviousConnexion=Previous login
-PreviousValue=Previous value
-ConnectedOnMultiCompany=Connected on environment
-ConnectedSince=Connected since
-AuthenticationMode=Authentication mode
-RequestedUrl=Requested URL
-DatabaseTypeManager=Database type manager
-RequestLastAccessInError=Latest database access request error
-ReturnCodeLastAccessInError=Return code for latest database access request error
-InformationLastAccessInError=Information for latest database access request error
-DolibarrHasDetectedError=Dolibarr has detected a technical error
-YouCanSetOptionDolibarrMainProdToZero=You can read log file or set option $dolibarr_main_prod to '0' in your config file to get more information.
-InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to hide sensitive information)
-MoreInformation=More information
-TechnicalInformation=Technical information
-TechnicalID=Technical ID
-LineID=Line ID
-NotePublic=Note (public)
-NotePrivate=Note (private)
-PrecisionUnitIsLimitedToXDecimals=Dolibarr was setup to limit precision of unit prices to <b>%s</b> decimals.
-DoTest=Test
-ToFilter=Filter
-NoFilter=No filter
-WarningYouHaveAtLeastOneTaskLate=Warning, you have at least one element that has exceeded the tolerance time.
-yes=yes
-Yes=Yes
-no=no
-No=No
-All=All
-Home=Home
-Help=Help
-OnlineHelp=Online help
-PageWiki=Wiki page
-MediaBrowser=Media browser
-Always=Always
-Never=Never
-Under=under
-Period=Period
-PeriodEndDate=End date for period
-SelectedPeriod=Selected period
-PreviousPeriod=Previous period
-Activate=Activate
-Activated=Activated
-Closed=Closed
-Closed2=Closed
-NotClosed=Not closed
-Enabled=Enabled
-Enable=Enable
-Deprecated=Deprecated
-Disable=Disable
-Disabled=Disabled
-Add=Add
-AddLink=Add link
-RemoveLink=Remove link
-AddToDraft=Add to draft
-Update=Update
-Close=Close
-CloseAs=Set status to
-CloseBox=Remove widget from your dashboard
-Confirm=Confirm
-ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
-Delete=Delete
-Remove=Remove
-Resiliate=Terminate
-Cancel=Cancel
-Modify=Modify
-Edit=Edit
-Validate=Validate
-ValidateAndApprove=Validate and Approve
-ToValidate=To validate
-NotValidated=Not validated
-Save=Save
-SaveAs=Save As
-SaveAndStay=Save and stay
-SaveAndNew=Save and new
-TestConnection=Test connection
-ToClone=Clone
-ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
-ConfirmClone=Choose the data you want to clone:
-NoCloneOptionsSpecified=No data to clone defined.
-Of=of
-Go=Go
-Run=Run
-CopyOf=Copy of
-Show=Show
-Hide=Hide
-ShowCardHere=Show card
-Search=Search
-SearchOf=Search
+DatabaseConnection=ڈیٹا بیس کنکشن
+NoTemplateDefined=اس ای میل کی قسم کے لیے کوئی ٹیمپلیٹ دستیاب نہیں ہے۔
+AvailableVariables=دستیاب متبادل متغیرات
+NoTranslation=کوئی ترجمہ نہیں
+Translation=ترجمہ
+CurrentTimeZone=ٹائم زون پی ایچ پی (سرور)
+EmptySearchString=غیر خالی تلاش کے معیارات درج کریں۔
+EnterADateCriteria=تاریخ کا معیار درج کریں۔
+NoRecordFound=کوئی ریکارڈ نہیں ملا
+NoRecordDeleted=کوئی ریکارڈ حذف نہیں ہوا۔
+NotEnoughDataYet=کافی ڈیٹا نہیں ہے۔
+NoError=کوئی غلطی نہیں۔
+Error=خرابی
+Errors=غلطیاں
+ErrorFieldRequired=فیلڈ '%s' درکار ہے۔
+ErrorFieldFormat=فیلڈ '%s' کی قدر خراب ہے۔
+ErrorFileDoesNotExists=فائل %s موجود نہیں ہے۔
+ErrorFailedToOpenFile=فائل %s کھولنے میں ناکام
+ErrorCanNotCreateDir=dir %s نہیں بنا سکتے
+ErrorCanNotReadDir=dir %s نہیں پڑھ سکتا
+ErrorConstantNotDefined=پیرامیٹر %s کی وضاحت نہیں کی گئی ہے۔
+ErrorUnknown=نامعلوم خامی
+ErrorSQL=ایس کیو ایل کی خرابی۔
+ErrorLogoFileNotFound=لوگو فائل '%s' نہیں ملی
+ErrorGoToGlobalSetup=اسے ٹھیک کرنے کے لیے 'کمپنی/تنظیم' سیٹ اپ پر جائیں۔
+ErrorGoToModuleSetup=اسے ٹھیک کرنے کے لیے ماڈیول سیٹ اپ پر جائیں۔
+ErrorFailedToSendMail=میل بھیجنے میں ناکام (بھیجنے والا=%s, وصول کنندہ=%s)
+ErrorFileNotUploaded=فائل اپ لوڈ نہیں ہوئی تھی۔ چیک کریں کہ سائز زیادہ سے زیادہ اجازت سے زیادہ نہیں ہے، وہ خالی جگہ ڈسک پر دستیاب ہے اور یہ کہ اس ڈائرکٹری میں پہلے سے ہی اسی نام کی کوئی فائل موجود نہیں ہے۔
+ErrorInternalErrorDetected=خرابی کا پتہ چلا
+ErrorWrongHostParameter=غلط میزبان پیرامیٹر
+ErrorYourCountryIsNotDefined=آپ کا ملک متعین نہیں ہے۔ Home-Setup-Edit پر جائیں اور فارم کو دوبارہ پوسٹ کریں۔
+ErrorRecordIsUsedByChild=اس ریکارڈ کو حذف کرنے میں ناکام۔ یہ ریکارڈ کم از کم ایک بچے کے ریکارڈ کے ذریعے استعمال کیا جاتا ہے۔
+ErrorWrongValue=غلط قدر
+ErrorWrongValueForParameterX=پیرامیٹر %s کے لیے غلط قدر
+ErrorNoRequestInError=غلطی سے کوئی درخواست نہیں۔
+ErrorServiceUnavailableTryLater=سروس اس وقت دستیاب نہیں ہے۔ بعد میں دوبارہ کوشش کریں۔
+ErrorDuplicateField=ایک منفرد فیلڈ میں ڈپلیکیٹ قدر
+ErrorSomeErrorWereFoundRollbackIsDone=کچھ غلطیاں پائی گئیں۔ تبدیلیاں واپس کر دی گئی ہیں۔
+ErrorConfigParameterNotDefined=پیرامیٹر <b> %s </b> Dolibarr کنفگ فائل <b> conf.php </b> میں بیان نہیں کیا گیا ہے۔
+ErrorCantLoadUserFromDolibarrDatabase=Dolibarr ڈیٹا بیس میں <b> %s </b> صارف کو تلاش کرنے میں ناکام۔
+ErrorNoVATRateDefinedForSellerCountry=خرابی، ملک '%s' کے لیے کوئی وٹ ریٹ متعین نہیں ہے۔
+ErrorNoSocialContributionForSellerCountry=خرابی، ملک '%s' کے لیے سماجی/مالیاتی ٹیکس کی قسم کی وضاحت نہیں کی گئی ہے۔
+ErrorFailedToSaveFile=خرابی، فائل کو محفوظ کرنے میں ناکام۔
+ErrorCannotAddThisParentWarehouse=آپ پیرنٹ گودام کو شامل کرنے کی کوشش کر رہے ہیں جو پہلے سے موجود گودام کا بچہ ہے۔
+FieldCannotBeNegative=فیلڈ "%s" منفی نہیں ہو سکتی
+MaxNbOfRecordPerPage=زیادہ سے زیادہ فی صفحہ ریکارڈز کی تعداد
+NotAuthorized=آپ ایسا کرنے کے مجاز نہیں ہیں۔
+SetDate=تاریخ مقرر کریں۔
+SelectDate=ایک تاریخ منتخب کریں۔
+SeeAlso=%s بھی دیکھیں
+SeeHere=یہاں دیکھیں
+ClickHere=یہاں کلک کریں
+Here=یہاں
+Apply=درخواست دیں
+BackgroundColorByDefault=پہلے سے طے شدہ پس منظر کا رنگ
+FileRenamed=فائل کا نام کامیابی کے ساتھ بدل دیا گیا۔
+FileGenerated=فائل کامیابی کے ساتھ تیار ہو گئی۔
+FileSaved=فائل کامیابی کے ساتھ محفوظ ہو گئی۔
+FileUploaded=فائل کامیابی کے ساتھ اپ لوڈ ہو گئی۔
+FileTransferComplete=فائل (فائلیں) کامیابی کے ساتھ اپ لوڈ ہو گئیں۔
+FilesDeleted=فائل (فائلیں) کامیابی کے ساتھ حذف ہو گئیں۔
+FileWasNotUploaded=منسلکہ کے لیے ایک فائل کا انتخاب کیا گیا ہے لیکن ابھی تک اپ لوڈ نہیں کیا گیا تھا۔ اس کے لیے "اٹیچ فائل" پر کلک کریں۔
+NbOfEntries=اندراج کی تعداد
+GoToWikiHelpPage=آن لائن مدد پڑھیں (انٹرنیٹ تک رسائی درکار ہے)
+GoToHelpPage=مدد پڑھیں
+DedicatedPageAvailable=آپ کی موجودہ اسکرین سے متعلق سرشار مدد کا صفحہ
+HomePage=ہوم پیج
+RecordSaved=ریکارڈ محفوظ ہو گیا۔
+RecordDeleted=ریکارڈ حذف کر دیا گیا۔
+RecordGenerated=ریکارڈ بنایا
+LevelOfFeature=خصوصیات کی سطح
+NotDefined=متعین نہیں۔
+DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr توثیق کا موڈ <b> %s </b> کنفیگریشن فائل میں <b> conf.php a09a4b739f17f17f پر سیٹ ہے۔ <br> اس کا مطلب ہے کہ پاس ورڈ ڈیٹا بیس Dolibarr سے باہر ہے، اس لیے اس فیلڈ کو تبدیل کرنے کا کوئی اثر نہیں ہو سکتا۔
+Administrator=ایڈمنسٹریٹر
+Undefined=غیر متعینہ
+PasswordForgotten=پاس ورڈ بھول گئے؟
+NoAccount=کوئی اکاؤنٹ نہیں؟
+SeeAbove=اوپر ملاحظہ کریں
+HomeArea=گھر
+LastConnexion=آخری لاگ ان
+PreviousConnexion=پچھلا لاگ ان
+PreviousValue=پچھلی قدر
+ConnectedOnMultiCompany=ماحولیات سے جڑا ہوا ہے۔
+ConnectedSince=تب سے جڑا ہوا ہے۔
+AuthenticationMode=توثیق کا موڈ
+RequestedUrl=درخواست کردہ URL
+DatabaseTypeManager=ڈیٹا بیس ٹائپ مینیجر
+RequestLastAccessInError=تازہ ترین ڈیٹا بیس تک رسائی کی درخواست کی خرابی۔
+ReturnCodeLastAccessInError=تازہ ترین ڈیٹا بیس تک رسائی کی درخواست کی خرابی کے لیے واپسی کوڈ
+InformationLastAccessInError=تازہ ترین ڈیٹا بیس تک رسائی کی درخواست کی خرابی کی معلومات
+DolibarrHasDetectedError=Dolibarr کو تکنیکی خرابی کا پتہ چلا ہے۔
+YouCanSetOptionDolibarrMainProdToZero=آپ لاگ فائل پڑھ سکتے ہیں یا مزید معلومات حاصل کرنے کے لیے اپنی کنفگ فائل میں آپشن $dolibarr_main_prod کو '0' پر سیٹ کر سکتے ہیں۔
+InformationToHelpDiagnose=یہ معلومات تشخیصی مقاصد کے لیے کارآمد ہو سکتی ہے (حساس معلومات کو چھپانے کے لیے آپ اختیار $dolibarr_main_prod کو '1' پر سیٹ کر سکتے ہیں)
+MoreInformation=مزید معلومات
+TechnicalInformation=تکنیکی معلومات
+TechnicalID=تکنیکی ID
+LineID=لائن ID
+NotePublic=نوٹ (عوامی)
+NotePrivate=نوٹ (نجی)
+PrecisionUnitIsLimitedToXDecimals=Dolibarr کو یونٹ کی قیمتوں کی درستگی کو <b> %s </b> اعشاریہ تک محدود کرنے کے لیے ترتیب دیا گیا تھا۔
+DoTest=پرکھ
+ToFilter=فلٹر
+NoFilter=کوئی فلٹر نہیں۔
+WarningYouHaveAtLeastOneTaskLate=تنبیہ، آپ کے پاس کم از کم ایک عنصر ہے جو برداشت کے وقت سے تجاوز کر گیا ہے۔
+yes=جی ہاں
+Yes=جی ہاں
+no=نہیں
+No=نہیں
+All=تمام
+Home=گھر
+Help=مدد
+OnlineHelp=آن لائن مدد
+PageWiki=ویکی پیج
+MediaBrowser=میڈیا براؤزر
+Always=ہمیشہ
+Never=کبھی نہیں
+Under=کے تحت
+Period=مدت
+PeriodEndDate=مدت کے لیے آخری تاریخ
+SelectedPeriod=منتخب مدت
+PreviousPeriod=پچھلی مدت
+Activate=محرک کریں
+Activated=چالو
+Closed=بند
+Closed2=بند
+NotClosed=بند نہیں ہوا۔
+Enabled=فعال
+Enable=فعال
+Deprecated=فرسودہ
+Disable=غیر فعال کریں۔
+Disabled=معذور
+Add=شامل کریں۔
+AddLink=لنک شامل کریں۔
+RemoveLink=لنک ہٹا دیں۔
+AddToDraft=مسودے میں شامل کریں۔
+Update=اپ ڈیٹ
+Close=بند کریں
+CloseAs=اسٹیٹس کو سیٹ کریں۔
+CloseBox=اپنے ڈیش بورڈ سے ویجیٹ کو ہٹا دیں۔
+Confirm=تصدیق کریں۔
+ConfirmSendCardByMail=کیا آپ واقعی اس کارڈ کا مواد بذریعہ ڈاک <b> %s </b> پر بھیجنا چاہتے ہیں؟
+Delete=حذف کریں۔
+Remove=دور
+Resiliate=ختم کرنا
+Cancel=منسوخ کریں۔
+Modify=ترمیم کریں۔
+Edit=ترمیم
+Validate=تصدیق کریں۔
+ValidateAndApprove=توثیق کریں اور منظور کریں۔
+ToValidate=توثیق کرنا
+NotValidated=تصدیق شدہ نہیں۔
+Save=محفوظ کریں۔
+SaveAs=ایسے محفوظ کریں
+SaveAndStay=محفوظ کریں اور رہیں
+SaveAndNew=محفوظ کریں اور نیا
+TestConnection=ٹیسٹ کنکشن
+ToClone=کلون
+ConfirmCloneAsk=کیا آپ واقعی <b> %s </b> آبجیکٹ کلون کرنا چاہتے ہیں؟
+ConfirmClone=وہ ڈیٹا منتخب کریں جسے آپ کلون کرنا چاہتے ہیں:
+NoCloneOptionsSpecified=کلون کرنے کے لیے کوئی ڈیٹا متعین نہیں ہے۔
+Of=کی
+Go=جاؤ
+Run=رن
+CopyOf=کی کاپی
+Show=دکھائیں۔
+Hide=چھپائیں
+ShowCardHere=کارڈ دکھائیں۔
+Search=تلاش کریں۔
+SearchOf=تلاش کریں۔
 SearchMenuShortCut=Ctrl + shift + f
-QuickAdd=Quick add
+QuickAdd=جلدی شامل کریں۔
 QuickAddMenuShortCut=Ctrl + shift + l
-Valid=Valid
-Approve=Approve
-Disapprove=Disapprove
-ReOpen=Re-Open
-Upload=Upload
-ToLink=Link
-Select=Select
-SelectAll=Select all
-Choose=Choose
-Resize=Resize
-ResizeOrCrop=Resize or Crop
-Recenter=Recenter
-Author=Author
-User=User
-Users=Users
-Group=Group
-Groups=Groups
-NoUserGroupDefined=No user group defined
-Password=Password
-PasswordRetype=Retype your password
-NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration.
-Name=Name
-NameSlashCompany=Name / Company
-Person=Person
-Parameter=Parameter
-Parameters=Parameters
-Value=Value
-PersonalValue=Personal value
-NewObject=New %s
-NewValue=New value
-OldValue=Old value %s
-CurrentValue=Current value
-Code=Code
-Type=Type
-Language=Language
-MultiLanguage=Multi-language
-Note=Note
-Title=Title
-Label=Label
-RefOrLabel=Ref. or label
-Info=Log
-Family=Family
-Description=Description
-Designation=Description
-DescriptionOfLine=Description of line
-DateOfLine=Date of line
-DurationOfLine=Duration of line
-Model=Doc template
-DefaultModel=Default doc template
-Action=Event
-About=About
-Number=Number
-NumberByMonth=Total reports by month
-AmountByMonth=Amount by month
-Numero=Number
-Limit=Limit
-Limits=Limits
-Logout=Logout
-NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
-Connection=Login
-Setup=Setup
-Alert=Alert
-MenuWarnings=Alerts
-Previous=Previous
-Next=Next
-Cards=Cards
-Card=Card
-Now=Now
-HourStart=Start hour
-Deadline=Deadline
-Date=Date
-DateAndHour=Date and hour
-DateToday=Today's date
-DateReference=Reference date
-DateStart=Start date
-DateEnd=End date
-DateCreation=Creation date
-DateCreationShort=Creat. date
-IPCreation=Creation IP
-DateModification=Modification date
-DateModificationShort=Modif. date
-IPModification=Modification IP
-DateLastModification=Latest modification date
-DateValidation=Validation date
-DateSigning=Signing date
-DateClosing=Closing date
-DateDue=Due date
-DateValue=Value date
-DateValueShort=Value date
-DateOperation=Operation date
-DateOperationShort=Oper. Date
-DateLimit=Limit date
-DateRequest=Request date
-DateProcess=Process date
-DateBuild=Report build date
-DatePayment=Date of payment
-DateApprove=Approving date
-DateApprove2=Approving date (second approval)
-RegistrationDate=Registration date
-UserCreation=Creation user
-UserModification=Modification user
-UserValidation=Validation user
-UserCreationShort=Creat. user
-UserModificationShort=Modif. user
-UserValidationShort=Valid. user
-DurationYear=year
-DurationMonth=month
-DurationWeek=week
-DurationDay=day
-DurationYears=years
-DurationMonths=months
-DurationWeeks=weeks
-DurationDays=days
-Year=Year
-Month=Month
-Week=Week
-WeekShort=Week
-Day=Day
-Hour=Hour
-Minute=Minute
-Second=Second
-Years=Years
-Months=Months
-Days=Days
-days=days
-Hours=Hours
-Minutes=Minutes
-Seconds=Seconds
-Weeks=Weeks
-Today=Today
-Yesterday=Yesterday
-Tomorrow=Tomorrow
-Morning=Morning
-Afternoon=Afternoon
-Quadri=Quadri
-MonthOfDay=Month of the day
-DaysOfWeek=Days of week
-HourShort=H
+Valid=درست
+Approve=منظور کرو
+Disapprove=نامنظور کرنا
+ReOpen=دوبارہ کھولیں۔
+Upload=اپ لوڈ کریں۔
+ToLink=لنک
+Select=منتخب کریں۔
+SelectAll=تمام منتخب کریں
+Choose=منتخب کریں۔
+Resize=سائز تبدیل کریں۔
+ResizeOrCrop=سائز تبدیل کریں یا کاٹیں۔
+Recenter=دوبارہ مرکز کرنا
+Author=مصنف
+User=صارف
+Users=صارفین
+Group=گروپ
+Groups=گروپس
+UserGroup=User group
+UserGroups=User groups
+NoUserGroupDefined=کسی صارف گروپ کی وضاحت نہیں کی گئی۔
+Password=پاس ورڈ
+PasswordRetype=اپنا پاس ورڈ دوبارہ ٹائپ کریں۔
+NoteSomeFeaturesAreDisabled=نوٹ کریں کہ اس مظاہرے میں بہت ساری خصوصیات/ماڈیولز غیر فعال ہیں۔
+Name=نام
+NameSlashCompany=نام / کمپنی
+Person=شخص
+Parameter=پیرامیٹر
+Parameters=پیرامیٹرز
+Value=قدر
+PersonalValue=ذاتی قدر
+NewObject=نیا %s
+NewValue=نئی قدر
+OldValue=پرانی قدر %s
+CurrentValue=موجودہ قیمت
+Code=کوڈ
+Type=قسم
+Language=زبان
+MultiLanguage=کثیر زبان
+Note=نوٹ
+Title=عنوان
+Label=لیبل
+RefOrLabel=حوالہ یا لیبل
+Info=لاگ
+Family=خاندان
+Description=تفصیل
+Designation=تفصیل
+DescriptionOfLine=لائن کی تفصیل
+DateOfLine=لائن کی تاریخ
+DurationOfLine=لائن کا دورانیہ
+Model=دستاویز ٹیمپلیٹ
+DefaultModel=ڈیفالٹ دستاویز ٹیمپلیٹ
+Action=تقریب
+About=کے بارے میں
+Number=نمبر
+NumberByMonth=ماہ کے لحاظ سے کل رپورٹس
+AmountByMonth=ماہ کے حساب سے رقم
+Numero=نمبر
+Limit=حد
+Limits=حدود
+Logout=لاگ آوٹ
+NoLogoutProcessWithAuthMode=تصدیق موڈ کے ساتھ کوئی قابل اطلاق منقطع خصوصیت <b> %s </b>
+Connection=لاگ ان کریں
+Setup=سیٹ اپ
+Alert=الرٹ
+MenuWarnings=انتباہات
+Previous=پچھلا
+Next=اگلے
+Cards=کارڈز
+Card=کارڈ
+Now=ابھی
+HourStart=آغاز کا وقت
+Deadline=ڈیڈ لائن
+Date=تاریخ
+DateAndHour=تاریخ اور گھنٹہ
+DateToday=آج کی تاریخ
+DateReference=حوالہ تاریخ
+DateStart=شروع کرنے کی تاریخ
+DateEnd=آخری تاریخ
+DateCreation=بنانے کی تاریخ
+DateCreationShort=بنائیں۔ تاریخ
+IPCreation=تخلیق آئی پی
+DateModification=ترمیم کی تاریخ
+DateModificationShort=موڈیف تاریخ
+IPModification=ترمیم آئی پی
+DateLastModification=تازہ ترین ترمیم کی تاریخ
+DateValidation=توثیق کی تاریخ
+DateSigning=دستخط کرنے کی تاریخ
+DateClosing=آخری تاریخ
+DateDue=واجب الادا تاریخ
+DateValue=قیمت کی تاریخ
+DateValueShort=قیمت کی تاریخ
+DateOperation=آپریشن کی تاریخ
+DateOperationShort=اوپری تاریخ
+DateLimit=حد کی تاریخ
+DateRequest=درخواست کی تاریخ
+DateProcess=عمل کی تاریخ
+DateBuild=تعمیر کی تاریخ کی اطلاع دیں۔
+DatePayment=ادائیگی کی تاریخ
+DateApprove=منظوری کی تاریخ
+DateApprove2=منظوری کی تاریخ (دوسری منظوری)
+RegistrationDate=رجسٹریشن کی تاریخ
+UserCreation=تخلیق صارف
+UserModification=ترمیم کرنے والا صارف
+UserValidation=توثیق کرنے والا صارف
+UserCreationShort=بنائیں۔ صارف
+UserModificationShort=موڈیف صارف
+UserValidationShort=درست صارف
+DurationYear=سال
+DurationMonth=مہینہ
+DurationWeek=ہفتہ
+DurationDay=دن
+DurationYears=سال
+DurationMonths=مہینے
+DurationWeeks=ہفتے
+DurationDays=دن
+Year=سال
+Month=مہینہ
+Week=ہفتہ
+WeekShort=ہفتہ
+Day=دن
+Hour=گھنٹہ
+Minute=منٹ
+Second=دوسرا
+Years=سال
+Months=مہینے
+Days=دن
+days=دن
+Hours=گھنٹے
+Minutes=منٹ
+Seconds=سیکنڈز
+Weeks=ہفتے
+Today=آج
+Yesterday=کل
+Tomorrow=کل
+Morning=صبح
+Afternoon=دوپہر
+Quadri=قادری
+MonthOfDay=دن کا مہینہ
+DaysOfWeek=ہفتے کے دن
+HourShort=ایچ
 MinuteShort=mn
-Rate=Rate
-CurrencyRate=Currency conversion rate
-UseLocalTax=Include tax
-Bytes=Bytes
-KiloBytes=Kilobytes
-MegaBytes=Megabytes
-GigaBytes=Gigabytes
-TeraBytes=Terabytes
-UserAuthor=Ceated by
-UserModif=Updated by
-b=b.
+Rate=شرح
+CurrencyRate=کرنسی کی تبدیلی کی شرح
+UseLocalTax=ٹیکس شامل کریں۔
+Bytes=بائٹس
+KiloBytes=کلو بائٹس
+MegaBytes=میگا بائٹس
+GigaBytes=گیگا بائٹس
+TeraBytes=ٹیرا بائٹس
+UserAuthor=کی طرف سے مقرر
+UserModif=کی طرف سے اپ ڈیٹ
+b=ب
 Kb=Kb
-Mb=Mb
-Gb=Gb
-Tb=Tb
-Cut=Cut
-Copy=Copy
-Paste=Paste
-Default=Default
-DefaultValue=Default value
-DefaultValues=Default values/filters/sorting
-Price=Price
-PriceCurrency=Price (currency)
-UnitPrice=Unit price
-UnitPriceHT=Unit price (excl.)
-UnitPriceHTCurrency=Unit price (excl.) (currency)
-UnitPriceTTC=Unit price
-PriceU=U.P.
-PriceUHT=U.P. (net)
-PriceUHTCurrency=U.P (net) (currency)
-PriceUTTC=U.P. (inc. tax)
-Amount=Amount
-AmountInvoice=Invoice amount
-AmountInvoiced=Amount invoiced
-AmountInvoicedHT=Amount invoiced (excl. tax)
-AmountInvoicedTTC=Amount invoiced (inc. tax)
-AmountPayment=Payment amount
-AmountHTShort=Amount (excl.)
-AmountTTCShort=Amount (inc. tax)
-AmountHT=Amount (excl. tax)
-AmountTTC=Amount (inc. tax)
-AmountVAT=Amount tax
-MulticurrencyAlreadyPaid=Already paid, original currency
-MulticurrencyRemainderToPay=Remain to pay, original currency
-MulticurrencyPaymentAmount=Payment amount, original currency
-MulticurrencyAmountHT=Amount (excl. tax), original currency
-MulticurrencyAmountTTC=Amount (inc. of tax), original currency
-MulticurrencyAmountVAT=Amount tax, original currency
-MulticurrencySubPrice=Amount sub price multi currency
-AmountLT1=Amount tax 2
-AmountLT2=Amount tax 3
-AmountLT1ES=Amount RE
-AmountLT2ES=Amount IRPF
-AmountTotal=Total amount
-AmountAverage=Average amount
-PriceQtyMinHT=Price quantity min. (excl. tax)
-PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
-PercentOfOriginalObject=Percent of original object
-AmountOrPercent=Amount or percent
-Percentage=Percentage
-Total=Total
-SubTotal=Subtotal
-TotalHTShort=Total (excl.)
-TotalHT100Short=Total 100%% (excl.)
-TotalHTShortCurrency=Total (excl. in currency)
-TotalTTCShort=Total (inc. tax)
-TotalHT=Total (excl. tax)
-TotalHTforthispage=Total (excl. tax) for this page
-Totalforthispage=Total for this page
-TotalTTC=Total (inc. tax)
-TotalTTCToYourCredit=Total (inc. tax) to your credit
-TotalVAT=Total tax
-TotalVATIN=Total IGST
-TotalLT1=Total tax 2
-TotalLT2=Total tax 3
-TotalLT1ES=Total RE
-TotalLT2ES=Total IRPF
-TotalLT1IN=Total CGST
-TotalLT2IN=Total SGST
-HT=Excl. tax
-TTC=Inc. tax
+Mb=ایم بی
+Gb=جی بی
+Tb=ٹی بی
+Cut=کاٹنا
+Copy=کاپی کریں۔
+Paste=چسپاں کریں۔
+Default=طے شدہ
+DefaultValue=پہلے سے طے شدہ قیمت
+DefaultValues=پہلے سے طے شدہ اقدار/فلٹرز/چھانٹنا
+Price=قیمت
+PriceCurrency=قیمت (کرنسی)
+UnitPrice=اکائی قیمت
+UnitPriceHT=یونٹ کی قیمت (سوائے)
+UnitPriceHTCurrency=یونٹ کی قیمت (ماسوائے) (کرنسی)
+UnitPriceTTC=اکائی قیمت
+PriceU=U.P
+PriceUHT=U.P (جال)
+PriceUHTCurrency=U.P (نیٹ) (کرنسی)
+PriceUTTC=U.P (inc. ٹیکس)
+Amount=رقم
+AmountInvoice=بل کی رقم
+AmountInvoiced=رسید کی رقم
+AmountInvoicedHT=انوائس کی رقم (ٹیکس کے علاوہ)
+AmountInvoicedTTC=انوائس کی رقم (انک ٹیکس)
+AmountPayment=ادائیگی کی رقم
+AmountHTShort=رقم (ماسوائے)
+AmountTTCShort=رقم (انک ٹیکس)
+AmountHT=رقم (ٹیکس کے علاوہ)
+AmountTTC=رقم (انک ٹیکس)
+AmountVAT=ٹیکس کی رقم
+MulticurrencyAlreadyPaid=پہلے سے ادا شدہ، اصل کرنسی
+MulticurrencyRemainderToPay=ادا کرنا باقی رہو، اصل کرنسی
+MulticurrencyPaymentAmount=ادائیگی کی رقم، اصل کرنسی
+MulticurrencyAmountHT=رقم (ٹیکس کے علاوہ)، اصل کرنسی
+MulticurrencyAmountTTC=رقم (ٹیکس کی رقم)، اصل کرنسی
+MulticurrencyAmountVAT=ٹیکس کی رقم، اصل کرنسی
+MulticurrencySubPrice=رقم ذیلی قیمت کثیر کرنسی
+AmountLT1=ٹیکس کی رقم 2
+AmountLT2=ٹیکس کی رقم 3
+AmountLT1ES=رقم RE
+AmountLT2ES=رقم IRPF
+AmountTotal=کل رقم
+AmountAverage=اوسط رقم
+PriceQtyMinHT=قیمت کی مقدار کم از کم (ٹیکس کے علاوہ)
+PriceQtyMinHTCurrency=قیمت کی مقدار کم از کم (ٹیکس کے علاوہ) (کرنسی)
+PercentOfOriginalObject=اصل چیز کا فیصد
+AmountOrPercent=رقم یا فیصد
+Percentage=فیصد
+Total=کل
+SubTotal=ذیلی کل
+TotalHTShort=کل (ماسوائے)
+TotalHT100Short=ٹوٹل 100%% (ماسوائے)
+TotalHTShortCurrency=کل (ماسوائے کرنسی میں)
+TotalTTCShort=کل (انک ٹیکس)
+TotalHT=کل (ٹیکس کے علاوہ)
+TotalHTforthispage=اس صفحہ کے لیے کل (ٹیکس کے علاوہ)
+Totalforthispage=اس صفحہ کے لیے کل
+TotalTTC=کل (انک ٹیکس)
+TotalTTCToYourCredit=آپ کے کریڈٹ پر کل (انک ٹیکس)
+TotalVAT=کل ٹیکس
+TotalVATIN=کل IGST
+TotalLT1=کل ٹیکس 2
+TotalLT2=کل ٹیکس 3
+TotalLT1ES=کل RE
+TotalLT2ES=کل آئی آر پی ایف
+TotalLT1IN=کل CGST
+TotalLT2IN=کل SGST
+HT=Excl. ٹیکس
+TTC=Inc. ٹیکس
 INCVATONLY=Inc. VAT
-INCT=Inc. all taxes
-VAT=Sales tax
-VATIN=IGST
-VATs=Sales taxes
-VATINs=IGST taxes
-LT1=Sales tax 2
-LT1Type=Sales tax 2 type
-LT2=Sales tax 3
-LT2Type=Sales tax 3 type
+INCT=Inc. تمام ٹیکس
+VAT=سیلز ٹیکس
+VATIN=آئی جی ایس ٹی
+VATs=سیلز ٹیکس
+VATINs=IGST ٹیکس
+LT1=سیلز ٹیکس 2
+LT1Type=سیلز ٹیکس 2 قسم
+LT2=سیلز ٹیکس 3
+LT2Type=سیلز ٹیکس 3 قسم
 LT1ES=RE
-LT2ES=IRPF
-LT1IN=CGST
-LT2IN=SGST
-LT1GC=Additionnal cents
-VATRate=Tax Rate
-RateOfTaxN=Rate of tax %s
-VATCode=Tax Rate code
-VATNPR=Tax Rate NPR
-DefaultTaxRate=Default tax rate
-Average=Average
-Sum=Sum
-Delta=Delta
-StatusToPay=To pay
-RemainToPay=Remain to pay
-Module=Module/Application
-Modules=Modules/Applications
-Option=Option
-Filters=Filters
-List=List
-FullList=Full list
-FullConversation=Full conversation
-Statistics=Statistics
-OtherStatistics=Other statistics
-Status=Status
-Favorite=Favorite
-ShortInfo=Info.
-Ref=Ref.
-ExternalRef=Ref. extern
-RefSupplier=Ref. vendor
-RefPayment=Ref. payment
-CommercialProposalsShort=Commercial proposals
-Comment=Comment
-Comments=Comments
-ActionsToDo=Events to do
-ActionsToDoShort=To do
-ActionsDoneShort=Done
-ActionNotApplicable=Not applicable
-ActionRunningNotStarted=To start
-ActionRunningShort=In progress
-ActionDoneShort=Finished
-ActionUncomplete=Incomplete
-LatestLinkedEvents=Latest %s linked events
-CompanyFoundation=Company/Organization
-Accountant=Accountant
-ContactsForCompany=Contacts for this third party
-ContactsAddressesForCompany=Contacts/addresses for this third party
-AddressesForCompany=Addresses for this third party
-ActionsOnCompany=Events for this third party
-ActionsOnContact=Events for this contact/address
-ActionsOnContract=Events for this contract
-ActionsOnMember=Events about this member
-ActionsOnProduct=Events about this product
-NActionsLate=%s late
-ToDo=To do
-Completed=Completed
-Running=In progress
-RequestAlreadyDone=Request already recorded
-Filter=Filter
-FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
-RemoveFilter=Remove filter
-ChartGenerated=Chart generated
-ChartNotGenerated=Chart not generated
-GeneratedOn=Build on %s
-Generate=Generate
-Duration=Duration
-TotalDuration=Total duration
-Summary=Summary
-DolibarrStateBoard=Database Statistics
-DolibarrWorkBoard=Open Items
-NoOpenedElementToProcess=No open element to process
-Available=Available
-NotYetAvailable=Not yet available
-NotAvailable=Not available
-Categories=Tags/categories
-Category=Tag/category
-By=By
-From=From
-FromDate=From
-FromLocation=From
-to=to
-To=to
-ToDate=to
-ToLocation=to
-at=at
-and=and
-or=or
-Other=Other
-Others=Others
-OtherInformations=Other information
-Quantity=Quantity
-Qty=Qty
-ChangedBy=Changed by
-ApprovedBy=Approved by
-ApprovedBy2=Approved by (second approval)
-Approved=Approved
-Refused=Refused
-ReCalculate=Recalculate
-ResultKo=Failure
-Reporting=Reporting
-Reportings=Reporting
-Draft=Draft
-Drafts=Drafts
-StatusInterInvoiced=Invoiced
-Validated=Validated
-ValidatedToProduce=Validated (To produce)
-Opened=Open
-OpenAll=Open (All)
-ClosedAll=Closed (All)
-New=New
-Discount=Discount
-Unknown=Unknown
-General=General
-Size=Size
-OriginalSize=Original size
-Received=Received
-Paid=Paid
-Topic=Subject
-ByCompanies=By third parties
-ByUsers=By user
-Links=Links
-Link=Link
-Rejects=Rejects
-Preview=Preview
-NextStep=Next step
-Datas=Data
-None=None
-NoneF=None
-NoneOrSeveral=None or several
-Late=Late
-LateDesc=An item is defined as Delayed as per the system configuration in menu Home - Setup - Alerts.
-NoItemLate=No late item
-Photo=Picture
-Photos=Pictures
-AddPhoto=Add picture
-DeletePicture=Picture delete
-ConfirmDeletePicture=Confirm picture deletion?
-Login=Login
-LoginEmail=Login (email)
-LoginOrEmail=Login or Email
-CurrentLogin=Current login
-EnterLoginDetail=Enter login details
-January=January
-February=February
-March=March
-April=April
-May=May
-June=June
-July=July
-August=August
-September=September
-October=October
-November=November
-December=December
-Month01=January
-Month02=February
-Month03=March
-Month04=April
-Month05=May
-Month06=June
-Month07=July
-Month08=August
-Month09=September
-Month10=October
-Month11=November
-Month12=December
-MonthShort01=Jan
-MonthShort02=Feb
-MonthShort03=Mar
-MonthShort04=Apr
-MonthShort05=May
-MonthShort06=Jun
-MonthShort07=Jul
-MonthShort08=Aug
-MonthShort09=Sep
-MonthShort10=Oct
-MonthShort11=Nov
-MonthShort12=Dec
-MonthVeryShort01=J
-MonthVeryShort02=F
-MonthVeryShort03=M
-MonthVeryShort04=A
-MonthVeryShort05=M
-MonthVeryShort06=J
-MonthVeryShort07=J
-MonthVeryShort08=A
-MonthVeryShort09=S
-MonthVeryShort10=O
-MonthVeryShort11=N
-MonthVeryShort12=D
-AttachedFiles=Attached files and documents
-JoinMainDoc=Join main document
+LT2ES=آئی آر پی ایف
+LT1IN=سی جی ایس ٹی
+LT2IN=ایس جی ایس ٹی
+LT1GC=اضافی سینٹ
+VATRate=ٹیکس کی شرح
+RateOfTaxN=ٹیکس کی شرح %s
+VATCode=ٹیکس کی شرح کوڈ
+VATNPR=ٹیکس کی شرح این پی آر
+DefaultTaxRate=پہلے سے طے شدہ ٹیکس کی شرح
+Average=اوسط
+Sum=رقم
+Delta=ڈیلٹا
+StatusToPay=قیمت ادا کرنا
+RemainToPay=ادا کرنا باقی ہے۔
+Module=ماڈیول/ایپلی کیشن
+Modules=ماڈیولز/ایپلی کیشنز
+Option=اختیار
+Filters=فلٹرز
+List=فہرست
+FullList=مکمل فہرست
+FullConversation=مکمل گفتگو
+Statistics=شماریات
+OtherStatistics=دوسرے اعدادوشمار
+Status=حالت
+Favorite=پسندیدہ
+ShortInfo=معلومات
+Ref=حوالہ
+ExternalRef=حوالہ بیرونی
+RefSupplier=حوالہ فروش
+RefPayment=حوالہ ادائیگی
+CommercialProposalsShort=تجارتی تجاویز
+Comment=تبصرہ
+Comments=تبصرے
+ActionsToDo=کرنے کے لیے واقعات
+ActionsToDoShort=ایسا کرنے کے لئے
+ActionsDoneShort=ہو گیا
+ActionNotApplicable=قابل اطلاق نہیں۔
+ActionRunningNotStarted=شروع کرنے کے لئے
+ActionRunningShort=کام جاری ہے
+ActionDoneShort=ختم
+ActionUncomplete=نامکمل
+LatestLinkedEvents=تازہ ترین %s منسلک واقعات
+CompanyFoundation=کمپنی/تنظیم
+Accountant=اکاؤنٹنٹ
+ContactsForCompany=اس تیسرے فریق کے لیے رابطے
+ContactsAddressesForCompany=اس تیسرے فریق کے لیے رابطے/پتے
+AddressesForCompany=اس تیسرے فریق کے لیے پتے
+ActionsOnCompany=اس تیسرے فریق کے واقعات
+ActionsOnContact=اس رابطہ/پتہ کے لیے واقعات
+ActionsOnContract=اس معاہدے کے لیے تقریبات
+ActionsOnMember=اس رکن کے بارے میں واقعات
+ActionsOnProduct=اس پروڈکٹ کے بارے میں واقعات
+NActionsLate=%s دیر سے
+ToDo=ایسا کرنے کے لئے
+Completed=مکمل
+Running=کام جاری ہے
+RequestAlreadyDone=درخواست پہلے ہی ریکارڈ کی گئی ہے۔
+Filter=فلٹر
+FilterOnInto=تلاش کا معیار '<strong> %s </strong>' فیلڈز میں %s
+RemoveFilter=فلٹر کو ہٹا دیں۔
+ChartGenerated=چارٹ تیار کیا گیا۔
+ChartNotGenerated=چارٹ تیار نہیں ہوا۔
+GeneratedOn=%s پر بنائیں
+Generate=پیدا کریں۔
+Duration=دورانیہ
+TotalDuration=کل دورانیہ
+Summary=خلاصہ
+DolibarrStateBoard=ڈیٹا بیس کے اعدادوشمار
+DolibarrWorkBoard=آئٹمز کھولیں۔
+NoOpenedElementToProcess=کارروائی کے لیے کوئی کھلا عنصر نہیں ہے۔
+Available=دستیاب
+NotYetAvailable=ابھی تک دستیاب نہیں ہے۔
+NotAvailable=دستیاب نہیں ہے
+Categories=ٹیگز/زمرے
+Category=ٹیگ/زمرہ
+By=کی طرف سے
+From=سے
+FromDate=سے
+FromLocation=سے
+to=کو
+To=کو
+ToDate=کو
+ToLocation=کو
+at=پر
+and=اور
+or=یا
+Other=دیگر
+Others=دوسرے
+OtherInformations=دوسری معلومات
+Quantity=مقدار
+Qty=مقدار
+ChangedBy=کی طرف سے تبدیل
+ApprovedBy=کی طرف سے منظور
+ApprovedBy2=منظور شدہ (دوسری منظوری)
+Approved=منظورشدہ
+Refused=انکار کر دیا
+ReCalculate=دوبارہ حساب لگانا
+ResultKo=ناکامی
+Reporting=رپورٹنگ
+Reportings=رپورٹنگ
+Draft=مسودہ
+Drafts=ڈرافٹ
+StatusInterInvoiced=انوائس
+Validated=تصدیق شدہ
+ValidatedToProduce=تصدیق شدہ (پیدا کرنے کے لئے)
+Opened=کھولیں۔
+OpenAll=کھولیں (تمام)
+ClosedAll=بند (تمام)
+New=نئی
+Discount=رعایت
+Unknown=نامعلوم
+General=جنرل
+Size=سائز
+OriginalSize=اصل سائز
+Received=موصول ہوا۔
+Paid=ادا کیا
+Topic=مضمون
+ByCompanies=تیسرے فریق کے ذریعہ
+ByUsers=صارف کے ذریعہ
+Links=لنکس
+Link=لنک
+Rejects=رد کرتا ہے۔
+Preview=پیش نظارہ
+NextStep=اگلا قدم
+Datas=ڈیٹا
+None=کوئی نہیں۔
+NoneF=کوئی نہیں۔
+NoneOrSeveral=کوئی نہیں یا کئی
+Late=دیر
+LateDesc=مینو ہوم - سیٹ اپ - الرٹس میں سسٹم کنفیگریشن کے مطابق ایک آئٹم کو Delayed کے طور پر بیان کیا گیا ہے۔
+NoItemLate=کوئی لیٹ آئٹم نہیں۔
+Photo=تصویر
+Photos=تصویریں
+AddPhoto=تصویر شامل کریں۔
+DeletePicture=تصویر حذف کریں۔
+ConfirmDeletePicture=تصویر کو حذف کرنے کی تصدیق کریں؟
+Login=لاگ ان کریں
+LoginEmail=لاگ ان (ای میل)
+LoginOrEmail=لاگ ان یا ای میل کریں۔
+CurrentLogin=موجودہ لاگ ان
+EnterLoginDetail=لاگ ان کی تفصیلات درج کریں۔
+January=جنوری
+February=فروری
+March=مارچ
+April=اپریل
+May=مئی
+June=جون
+July=جولائی
+August=اگست
+September=ستمبر
+October=اکتوبر
+November=نومبر
+December=دسمبر
+Month01=جنوری
+Month02=فروری
+Month03=مارچ
+Month04=اپریل
+Month05=مئی
+Month06=جون
+Month07=جولائی
+Month08=اگست
+Month09=ستمبر
+Month10=اکتوبر
+Month11=نومبر
+Month12=دسمبر
+MonthShort01=جنوری
+MonthShort02=فروری
+MonthShort03=مارچ
+MonthShort04=اپریل
+MonthShort05=مئی
+MonthShort06=جون
+MonthShort07=جولائی
+MonthShort08=اگست
+MonthShort09=ستمبر
+MonthShort10=اکتوبر
+MonthShort11=نومبر
+MonthShort12=دسمبر
+MonthVeryShort01=جے
+MonthVeryShort02=ایف
+MonthVeryShort03=ایم
+MonthVeryShort04=اے
+MonthVeryShort05=ایم
+MonthVeryShort06=جے
+MonthVeryShort07=جے
+MonthVeryShort08=اے
+MonthVeryShort09=ایس
+MonthVeryShort10=اے
+MonthVeryShort11=ن
+MonthVeryShort12=ڈی
+AttachedFiles=منسلک فائلیں اور دستاویزات
+JoinMainDoc=مرکزی دستاویز میں شامل ہوں۔
 DateFormatYYYYMM=YYYY-MM
 DateFormatYYYYMMDD=YYYY-MM-DD
 DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
-ReportName=Report name
-ReportPeriod=Report period
-ReportDescription=Description
-Report=Report
-Keyword=Keyword
-Origin=Origin
-Legend=Legend
-Fill=Fill
-Reset=Reset
-File=File
-Files=Files
-NotAllowed=Not allowed
-ReadPermissionNotAllowed=Read permission not allowed
-AmountInCurrency=Amount in %s currency
-Example=Example
-Examples=Examples
-NoExample=No example
-FindBug=Report a bug
-NbOfThirdParties=Number of third parties
-NbOfLines=Number of lines
-NbOfObjects=Number of objects
-NbOfObjectReferers=Number of related items
-Referers=Related items
-TotalQuantity=Total quantity
-DateFromTo=From %s to %s
-DateFrom=From %s
-DateUntil=Until %s
-Check=Check
-Uncheck=Uncheck
-Internal=Internal
-External=External
-Internals=Internal
-Externals=External
-Warning=Warning
-Warnings=Warnings
-BuildDoc=Build Doc
-Entity=Environment
-Entities=Entities
-CustomerPreview=Customer preview
-SupplierPreview=Vendor preview
-ShowCustomerPreview=Show customer preview
-ShowSupplierPreview=Show vendor preview
-RefCustomer=Ref. customer
-InternalRef=Internal ref.
-Currency=Currency
-InfoAdmin=Information for administrators
-Undo=Undo
-Redo=Redo
-ExpandAll=Expand all
-UndoExpandAll=Undo expand
-SeeAll=See all
-Reason=Reason
-FeatureNotYetSupported=Feature not yet supported
-CloseWindow=Close window
-Response=Response
-Priority=Priority
-SendByMail=Send by email
-MailSentBy=Email sent by
-NotSent=Not sent
-TextUsedInTheMessageBody=Email body
-SendAcknowledgementByMail=Send confirmation email
-SendMail=Send email
-Email=Email
-NoEMail=No email
-AlreadyRead=Already read
-NotRead=Unread
-NoMobilePhone=No mobile phone
-Owner=Owner
-FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
-Refresh=Refresh
-BackToList=Back to list
-BackToTree=Back to tree
-GoBack=Go back
-CanBeModifiedIfOk=Can be modified if valid
-CanBeModifiedIfKo=Can be modified if not valid
-ValueIsValid=Value is valid
-ValueIsNotValid=Value is not valid
-RecordCreatedSuccessfully=Record created successfully
-RecordModifiedSuccessfully=Record modified successfully
-RecordsModified=%s record(s) modified
-RecordsDeleted=%s record(s) deleted
-RecordsGenerated=%s record(s) generated
-AutomaticCode=Automatic code
-FeatureDisabled=Feature disabled
-MoveBox=Move widget
-Offered=Offered
-NotEnoughPermissions=You don't have permission for this action
-SessionName=Session name
-Method=Method
-Receive=Receive
-CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
-ExpectedValue=Expected Value
-ExpectedQty=Expected Qty
-PartialWoman=Partial
-TotalWoman=Total
-NeverReceived=Never received
-Canceled=Canceled
-YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu Setup - Dictionaries
-YouCanChangeValuesForThisListFrom=You can change values for this list from menu %s
-YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record in module setup
-Color=Color
-Documents=Linked files
-Documents2=Documents
-UploadDisabled=Upload disabled
-MenuAccountancy=Accounting
-MenuECM=Documents
+ReportName=رپورٹ کا نام
+ReportPeriod=رپورٹ کی مدت
+ReportDescription=تفصیل
+Report=رپورٹ
+Keyword=کلیدی لفظ
+Origin=اصل
+Legend=لیجنڈ
+Fill=بھرنا
+Reset=دوبارہ ترتیب دیں۔
+File=فائل
+Files=فائلوں
+NotAllowed=اجازت نہیں ہے
+ReadPermissionNotAllowed=پڑھنے کی اجازت نہیں ہے۔
+AmountInCurrency=%s کرنسی میں رقم
+Example=مثال
+Examples=مثالیں
+NoExample=کوئی مثال نہیں۔
+FindBug=ایک بگ کی اطلاع دیں۔
+NbOfThirdParties=تیسرے فریق کی تعداد
+NbOfLines=لائنوں کی تعداد
+NbOfObjects=اشیاء کی تعداد
+NbOfObjectReferers=متعلقہ اشیاء کی تعداد
+Referers=متعلقہ اشیاء
+TotalQuantity=کل مقدار
+DateFromTo=%s سے %s تک
+DateFrom=%s سے
+DateUntil=%s تک
+Check=چیک کریں۔
+Uncheck=غیر چیک کریں۔
+Internal=اندرونی
+External=بیرونی
+Internals=اندرونی
+Externals=بیرونی
+Warning=وارننگ
+Warnings=انتباہات
+BuildDoc=دستاویز بنائیں
+Entity=ماحولیات
+Entities=ادارے
+CustomerPreview=کسٹمر کا پیش نظارہ
+SupplierPreview=وینڈر کا پیش نظارہ
+ShowCustomerPreview=کسٹمر کا پیش نظارہ دکھائیں۔
+ShowSupplierPreview=وینڈر کا پیش نظارہ دکھائیں۔
+RefCustomer=حوالہ صارف
+InternalRef=اندرونی حوالہ۔
+Currency=کرنسی
+InfoAdmin=منتظمین کے لیے معلومات
+Undo=کالعدم
+Redo=دوبارہ کریں۔
+ExpandAll=سبھی کو پھیلائیں۔
+UndoExpandAll=توسیع کو کالعدم کریں۔
+SeeAll=تمام دیکھیں
+Reason=وجہ
+FeatureNotYetSupported=فیچر ابھی تک تعاون یافتہ نہیں ہے۔
+CloseWindow=بند کھڑکی
+Response=جواب
+Priority=ترجیح
+SendByMail=بذریعہ ای میل بھیجین
+MailSentBy=ای میل بھیجی گئی۔
+NotSent=بھیجا نہیں۔
+TextUsedInTheMessageBody=ای میل باڈی
+SendAcknowledgementByMail=تصدیقی ای میل بھیجیں۔
+SendMail=ای میل بھیجیں
+Email=ای میل
+NoEMail=کوئی ای میل نہیں۔
+AlreadyRead=پہلے ہی پڑھ چکے ہیں۔
+NotRead=ان پڑھ
+NoMobilePhone=کوئی موبائل فون نہیں۔
+Owner=مالک
+FollowingConstantsWillBeSubstituted=درج ذیل کنسٹینٹس کو متعلقہ قدر سے بدل دیا جائے گا۔
+Refresh=تازہ دم کریں۔
+BackToList=فہرست پر واپس جائیں۔
+BackToTree=واپس درخت پر
+GoBack=واپس جاو
+CanBeModifiedIfOk=اگر درست ہو تو ترمیم کی جا سکتی ہے۔
+CanBeModifiedIfKo=درست نہ ہونے کی صورت میں ترمیم کی جا سکتی ہے۔
+ValueIsValid=قدر درست ہے۔
+ValueIsNotValid=قدر درست نہیں ہے۔
+RecordCreatedSuccessfully=ریکارڈ کامیابی کے ساتھ بنایا گیا۔
+RecordModifiedSuccessfully=ریکارڈ میں کامیابی کے ساتھ ترمیم کی گئی۔
+RecordsModified=%s ریکارڈ (ریکارڈز) میں ترمیم کی گئی۔
+RecordsDeleted=%s ریکارڈ حذف کر دیا گیا۔
+RecordsGenerated=%s ریکارڈ تیار کیا گیا۔
+AutomaticCode=خودکار کوڈ
+FeatureDisabled=خصوصیت غیر فعال ہے۔
+MoveBox=ویجیٹ کو منتقل کریں۔
+Offered=کی پیشکش کی
+NotEnoughPermissions=آپ کو اس کارروائی کی اجازت نہیں ہے۔
+SessionName=سیشن کا نام
+Method=طریقہ
+Receive=وصول کریں۔
+CompleteOrNoMoreReceptionExpected=مکمل یا کچھ زیادہ متوقع نہیں۔
+ExpectedValue=متوقع قدر
+ExpectedQty=متوقع مقدار
+PartialWoman=جزوی
+TotalWoman=کل
+NeverReceived=کبھی موصول نہیں ہوا۔
+Canceled=منسوخ
+YouCanChangeValuesForThisListFromDictionarySetup=آپ مینو سیٹ اپ - ڈکشنریوں سے اس فہرست کے لیے اقدار کو تبدیل کر سکتے ہیں۔
+YouCanChangeValuesForThisListFrom=آپ مینو %s سے اس فہرست کی قدریں تبدیل کر سکتے ہیں۔
+YouCanSetDefaultValueInModuleSetup=آپ ماڈیول سیٹ اپ میں نیا ریکارڈ بناتے وقت استعمال ہونے والی ڈیفالٹ ویلیو سیٹ کر سکتے ہیں۔
+Color=رنگ
+Documents=منسلک فائلیں۔
+Documents2=دستاویزات
+UploadDisabled=اپ لوڈ غیر فعال ہے۔
+MenuAccountancy=حساب کتاب
+MenuECM=دستاویزات
 MenuAWStats=AWStats
-MenuMembers=Members
-MenuAgendaGoogle=Google agenda
-MenuTaxesAndSpecialExpenses=Taxes | Special expenses
-ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
-ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
-NoFileFound=No documents uploaded
-CurrentUserLanguage=Current language
-CurrentTheme=Current theme
-CurrentMenuManager=Current menu manager
-Browser=Browser
-Layout=Layout
-Screen=Screen
-DisabledModules=Disabled modules
-For=For
-ForCustomer=For customer
-Signature=Signature
-DateOfSignature=Date of signature
-HidePassword=Show command with password hidden
-UnHidePassword=Show real command with clear password
-Root=Root
-RootOfMedias=Root of public medias (/medias)
-Informations=Information
-Page=Page
-Notes=Notes
-AddNewLine=Add new line
-AddFile=Add file
-FreeZone=Free-text product
-FreeLineOfType=Free-text item, type:
-CloneMainAttributes=Clone object with its main attributes
-ReGeneratePDF=Re-generate PDF
-PDFMerge=PDF Merge
-Merge=Merge
-DocumentModelStandardPDF=Standard PDF template
-PrintContentArea=Show page to print main content area
-MenuManager=Menu manager
-WarningYouAreInMaintenanceMode=Warning, you are in maintenance mode: only login <b>%s</b> is allowed to use the application in this mode.
-CoreErrorTitle=System error
-CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
-CreditCard=Credit card
-ValidatePayment=Validate payment
-CreditOrDebitCard=Credit or debit card
-FieldsWithAreMandatory=Fields with <b>%s</b> are mandatory
-FieldsWithIsForPublic=Fields with <b>%s</b> are shown in public list of members. If you don't want this, uncheck the "public" box.
-AccordingToGeoIPDatabase=(according to GeoIP conversion)
-Line=Line
-NotSupported=Not supported
-RequiredField=Required field
-Result=Result
-ToTest=Test
-ValidateBefore=Item must be validated before using this feature
-Visibility=Visibility
-Totalizable=Totalizable
-TotalizableDesc=This field is totalizable in list
-Private=Private
-Hidden=Hidden
-Resources=Resources
-Source=Source
-Prefix=Prefix
-Before=Before
-After=After
-IPAddress=IP address
-Frequency=Frequency
-IM=Instant messaging
-NewAttribute=New attribute
-AttributeCode=Attribute code
-URLPhoto=URL of photo/logo
-SetLinkToAnotherThirdParty=Link to another third party
-LinkTo=Link to
-LinkToProposal=Link to proposal
-LinkToOrder=Link to order
-LinkToInvoice=Link to invoice
-LinkToTemplateInvoice=Link to template invoice
-LinkToSupplierOrder=Link to purchase order
-LinkToSupplierProposal=Link to vendor proposal
-LinkToSupplierInvoice=Link to vendor invoice
-LinkToContract=Link to contract
-LinkToIntervention=Link to intervention
-LinkToTicket=Link to ticket
-LinkToMo=Link to Mo
-CreateDraft=Create draft
-SetToDraft=Back to draft
-ClickToEdit=Click to edit
-ClickToRefresh=Click to refresh
-EditWithEditor=Edit with CKEditor
-EditWithTextEditor=Edit with Text editor
-EditHTMLSource=Edit HTML Source
-ObjectDeleted=Object %s deleted
-ByCountry=By country
-ByTown=By town
-ByDate=By date
-ByMonthYear=By month/year
-ByYear=By year
-ByMonth=By month
-ByDay=By day
-BySalesRepresentative=By sales representative
-LinkedToSpecificUsers=Linked to a particular user contact
-NoResults=No results
-AdminTools=Admin Tools
-SystemTools=System tools
-ModulesSystemTools=Modules tools
-Test=Test
-Element=Element
-NoPhotoYet=No pictures available yet
-Dashboard=Dashboard
-MyDashboard=My Dashboard
-Deductible=Deductible
-from=from
-toward=toward
-Access=Access
-SelectAction=Select action
-SelectTargetUser=Select target user/employee
-HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
-SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
-OriginFileName=Original filename
-SetDemandReason=Set source
-SetBankAccount=Define Bank Account
-AccountCurrency=Account currency
-ViewPrivateNote=View notes
-XMoreLines=%s line(s) hidden
-ShowMoreLines=Show more/less lines
-PublicUrl=Public URL
-AddBox=Add box
-SelectElementAndClick=Select an element and click on %s
-PrintFile=Print File %s
-ShowTransaction=Show entry on bank account
-ShowIntervention=Show intervention
-ShowContract=Show contract
-GoIntoSetupToChangeLogo=Go to Home - Setup - Company to change logo or go to Home - Setup - Display to hide.
-Deny=Deny
-Denied=Denied
-ListOf=List of %s
-ListOfTemplates=List of templates
-Gender=Gender
-Genderman=Male
-Genderwoman=Female
-Genderother=Other
-ViewList=List view
-ViewGantt=Gantt view
-ViewKanban=Kanban view
-Mandatory=Mandatory
-Hello=Hello
-GoodBye=GoodBye
-Sincerely=Sincerely
-ConfirmDeleteObject=Are you sure you want to delete this object?
-DeleteLine=Delete line
-ConfirmDeleteLine=Are you sure you want to delete this line?
-ErrorPDFTkOutputFileNotFound=Error: the file was not generated. Please check that the 'pdftk' command is installed in a directory included in the $PATH environment variable (linux/unix only) or contact your system administrator.
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
-TooManyRecordForMassAction=Too many records selected for mass action. The action is restricted to a list of %s records.
-NoRecordSelected=No record selected
-MassFilesArea=Area for files built by mass actions
-ShowTempMassFilesArea=Show area of files built by mass actions
-ConfirmMassDeletion=Bulk Delete confirmation
-ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record(s)?
-RelatedObjects=Related Objects
-ClassifyBilled=Classify billed
-ClassifyUnbilled=Classify unbilled
-Progress=Progress
-ProgressShort=Progr.
-FrontOffice=Front office
-BackOffice=Back office
-Submit=Submit
-View=View
-Export=Export
-Exports=Exports
-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
-AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
-NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
-Miscellaneous=Miscellaneous
-Calendar=Calendar
-GroupBy=Group by...
-ViewFlatList=View flat list
-ViewAccountList=View ledger
-ViewSubAccountList=View subaccount ledger
-RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank" rel="noopener noreferrer external">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
-DirectDownloadLink=Public download link
-PublicDownloadLinkDesc=Only the link is required to download the file
-DirectDownloadInternalLink=Private download link
-PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
-Download=Download
-DownloadDocument=Download document
-ActualizeCurrency=Update currency rate
-Fiscalyear=Fiscal year
-ModuleBuilder=Module and Application Builder
-SetMultiCurrencyCode=Set currency
-BulkActions=Bulk actions
-ClickToShowHelp=Click to show tooltip help
-WebSite=Website
-WebSites=Websites
-WebSiteAccounts=Website accounts
-ExpenseReport=Expense report
-ExpenseReports=Expense reports
+MenuMembers=ممبران
+MenuAgendaGoogle=گوگل ایجنڈا
+MenuTaxesAndSpecialExpenses=ٹیکسز | خصوصی اخراجات
+ThisLimitIsDefinedInSetup=Dolibarr کی حد (مینو ہوم سیٹ اپ-سیکیورٹی): %s Kb، PHP کی حد: %s Kb
+ThisLimitIsDefinedInSetupAt=Dolibarr کی حد (مینو %s): %s Kb، PHP کی حد (Param %s): %s Kb
+NoFileFound=کوئی دستاویزات اپ لوڈ نہیں کی گئیں۔
+CurrentUserLanguage=موجودہ زبان
+CurrentTheme=موجودہ تھیم
+CurrentMenuManager=موجودہ مینو مینیجر
+Browser=براؤزر
+Layout=ترتیب
+Screen=سکرین
+DisabledModules=غیر فعال ماڈیولز
+For=کے لیے
+ForCustomer=گاہک کے لیے
+Signature=دستخط
+DateOfSignature=دستخط کی تاریخ
+HidePassword=پوشیدہ پاس ورڈ کے ساتھ کمانڈ دکھائیں۔
+UnHidePassword=واضح پاس ورڈ کے ساتھ اصلی کمانڈ دکھائیں۔
+Root=جڑ
+RootOfMedias=عوامی میڈیا کی جڑ (/میڈیا)
+Informations=معلومات
+Page=صفحہ
+Notes=نوٹس
+AddNewLine=نئی لائن شامل کریں۔
+AddFile=فائل شامل کریں
+FreeZone=مفت ٹیکسٹ پروڈکٹ
+FreeLineOfType=مفت ٹیکسٹ آئٹم، قسم:
+CloneMainAttributes=کلون آبجیکٹ کو اس کی اہم صفات کے ساتھ
+ReGeneratePDF=پی ڈی ایف دوبارہ بنائیں
+PDFMerge=پی ڈی ایف ضم کریں۔
+Merge=ضم
+DocumentModelStandardPDF=معیاری پی ڈی ایف ٹیمپلیٹ
+PrintContentArea=مرکزی مواد کے علاقے کو پرنٹ کرنے کے لیے صفحہ دکھائیں۔
+MenuManager=مینو مینیجر
+WarningYouAreInMaintenanceMode=وارننگ، آپ مینٹیننس موڈ میں ہیں: صرف لاگ ان <b> %s </b> کو اس موڈ میں ایپلیکیشن استعمال کرنے کی اجازت ہے۔
+CoreErrorTitle=سسٹم کی خرابی۔
+CoreErrorMessage=معذرت، ایک خرابی پیش آگئی۔ لاگز کو چیک کرنے کے لیے اپنے سسٹم ایڈمنسٹریٹر سے رابطہ کریں یا مزید معلومات حاصل کرنے کے لیے $dolibarr_main_prod=1 کو غیر فعال کریں۔
+CreditCard=کریڈٹ کارڈ
+ValidatePayment=ادائیگی کی توثیق کریں۔
+CreditOrDebitCard=کریڈٹ یا ڈیبٹ کارڈ
+FieldsWithAreMandatory=<b> %s </b> والے فیلڈز لازمی ہیں
+FieldsWithIsForPublic=<b> %s </b> والے فیلڈز کو اراکین کی عوامی فہرست میں دکھایا گیا ہے۔ اگر آپ یہ نہیں چاہتے ہیں، تو "عوامی" باکس سے نشان ہٹا دیں۔
+AccordingToGeoIPDatabase=(جیو آئی پی کی تبدیلی کے مطابق)
+Line=لائن
+NotSupported=سہولت مہیا نہیں
+RequiredField=مطلوب خانہ
+Result=نتیجہ
+ToTest=پرکھ
+ValidateBefore=اس خصوصیت کو استعمال کرنے سے پہلے آئٹم کی تصدیق ہونی چاہیے۔
+Visibility=مرئیت
+Totalizable=مکمل طور پر قابل
+TotalizableDesc=یہ فیلڈ فہرست میں مکمل ہے۔
+Private=نجی
+Hidden=پوشیدہ
+Resources=حوالہ جات
+Source=ذریعہ
+Prefix=سابقہ
+Before=اس سے پہلے
+After=کے بعد
+IPAddress=IP پتہ
+Frequency=تعدد
+IM=فوری پیغام رسانی
+NewAttribute=نئی صفت
+AttributeCode=انتساب کوڈ
+URLPhoto=تصویر/لوگو کا URL
+SetLinkToAnotherThirdParty=کسی اور تیسرے فریق سے لنک کریں۔
+LinkTo=سے لنک کریں۔
+LinkToProposal=تجویز کا لنک
+LinkToOrder=آرڈر کے لیے لنک
+LinkToInvoice=انوائس سے لنک کریں۔
+LinkToTemplateInvoice=ٹیمپلیٹ انوائس کا لنک
+LinkToSupplierOrder=خریداری کے آرڈر کے لیے لنک
+LinkToSupplierProposal=وینڈر کی تجویز کا لنک
+LinkToSupplierInvoice=وینڈر انوائس سے لنک کریں۔
+LinkToContract=معاہدہ سے لنک کریں۔
+LinkToIntervention=مداخلت کا لنک
+LinkToTicket=ٹکٹ کا لنک
+LinkToMo=مو سے لنک کریں۔
+CreateDraft=ڈرافٹ بنائیں
+SetToDraft=ڈرافٹ پر واپس جائیں۔
+ClickToEdit=ترمیم کرنے کے لیے کلک کریں۔
+ClickToRefresh=ریفریش کرنے کے لیے کلک کریں۔
+EditWithEditor=CKEditor کے ساتھ ترمیم کریں۔
+EditWithTextEditor=ٹیکسٹ ایڈیٹر کے ساتھ ترمیم کریں۔
+EditHTMLSource=HTML ماخذ میں ترمیم کریں۔
+ObjectDeleted=آبجیکٹ %s حذف کر دیا گیا۔
+ByCountry=ملک کے لحاظ سے
+ByTown=شہر سے
+ByDate=تاریخ کے لحاظ سے
+ByMonthYear=ماہ/سال کے حساب سے
+ByYear=سال کے حساب سے
+ByMonth=مہینے کے حساب سے
+ByDay=دن کی طرف سے
+BySalesRepresentative=سیلز کے نمائندے کے ذریعہ
+LinkedToSpecificUsers=کسی خاص صارف کے رابطے سے منسلک
+NoResults=کوئی نتیجہ نہیں نکلا۔
+AdminTools=ایڈمن ٹولز
+SystemTools=نظام کے اوزار
+ModulesSystemTools=ماڈیولز ٹولز
+Test=پرکھ
+Element=عنصر
+NoPhotoYet=ابھی تک کوئی تصویر دستیاب نہیں ہے۔
+Dashboard=ڈیش بورڈ
+MyDashboard=میرا ڈیش بورڈ
+Deductible=قابل کٹوتی
+from=سے
+toward=کی طرف
+Access=رسائی
+SelectAction=عمل کو منتخب کریں۔
+SelectTargetUser=ہدف صارف/ملازم کو منتخب کریں۔
+HelpCopyToClipboard=کلپ بورڈ پر کاپی کرنے کے لیے Ctrl+C استعمال کریں۔
+SaveUploadedFileWithMask=سرور پر فائل کو "<strong> %s </strong>" کے ساتھ محفوظ کریں (بصورت دیگر "%s")
+OriginFileName=اصل فائل کا نام
+SetDemandReason=ذریعہ مقرر کریں۔
+SetBankAccount=بینک اکاؤنٹ کی وضاحت کریں۔
+AccountCurrency=اکاؤنٹ کی کرنسی
+ViewPrivateNote=نوٹس دیکھیں
+XMoreLines=%s لائن (لائنیں) چھپی ہوئی ہیں۔
+ShowMoreLines=زیادہ/کم لائنیں دکھائیں۔
+PublicUrl=عوامی URL
+AddBox=باکس شامل کریں۔
+SelectElementAndClick=ایک عنصر منتخب کریں اور %s پر کلک کریں۔
+PrintFile=پرنٹ فائل %s
+ShowTransaction=بینک اکاؤنٹ پر اندراج دکھائیں۔
+ShowIntervention=مداخلت دکھائیں۔
+ShowContract=معاہدہ دکھائیں۔
+GoIntoSetupToChangeLogo=ہوم - سیٹ اپ - کمپنی کا لوگو تبدیل کرنے کے لیے جائیں یا ہوم - سیٹ اپ - چھپانے کے لیے ڈسپلے پر جائیں۔
+Deny=انکار کرنا
+Denied=انکار کر دیا۔
+ListOf=%s کی فہرست
+ListOfTemplates=ٹیمپلیٹس کی فہرست
+Gender=صنف
+Genderman=مرد
+Genderwoman=عورت
+Genderother=دیگر
+ViewList=فہرست دیکھیں
+ViewGantt=گانٹ کا نظارہ
+ViewKanban=کنبن کا منظر
+Mandatory=لازمی
+Hello=ہیلو
+GoodBye=خدا حافظ
+Sincerely=مخلص
+ConfirmDeleteObject=کیا آپ واقعی اس آبجیکٹ کو حذف کرنا چاہتے ہیں؟
+DeleteLine=لائن کو حذف کریں۔
+ConfirmDeleteLine=کیا آپ واقعی اس لائن کو حذف کرنا چاہتے ہیں؟
+ErrorPDFTkOutputFileNotFound=خرابی: فائل تیار نہیں ہوئی تھی۔ براہ کرم چیک کریں کہ 'pdftk' کمانڈ $PATH ماحولیاتی متغیر (صرف linux/unix) میں شامل ڈائریکٹری میں انسٹال ہے یا اپنے سسٹم ایڈمنسٹریٹر سے رابطہ کریں۔
+NoPDFAvailableForDocGenAmongChecked=چیک شدہ ریکارڈ کے درمیان دستاویز کی تیاری کے لیے کوئی پی ڈی ایف دستیاب نہیں تھی۔
+TooManyRecordForMassAction=بڑے پیمانے پر کارروائی کے لیے بہت سارے ریکارڈ منتخب کیے گئے ہیں۔ کارروائی %s ریکارڈز کی فہرست تک محدود ہے۔
+NoRecordSelected=کوئی ریکارڈ منتخب نہیں کیا گیا۔
+MassFilesArea=بڑے پیمانے پر کارروائیوں کے ذریعے بنائی گئی فائلوں کا علاقہ
+ShowTempMassFilesArea=بڑے پیمانے پر کارروائیوں سے بنی فائلوں کا علاقہ دکھائیں۔
+ConfirmMassDeletion=بلک ڈیلیٹ کی تصدیق
+ConfirmMassDeletionQuestion=کیا آپ واقعی %s منتخب کردہ ریکارڈ (ریکارڈز) کو حذف کرنا چاہتے ہیں؟
+RelatedObjects=متعلقہ اشیاء
+ClassifyBilled=بل کی درجہ بندی کریں۔
+ClassifyUnbilled=بغیر بل کی درجہ بندی کریں۔
+Progress=پیش رفت
+ProgressShort=پروگرام
+FrontOffice=سامنے والا دفتر
+BackOffice=واپس دفتر
+Submit=جمع کرائیں
+View=دیکھیں
+Export=برآمد کریں۔
+Exports=برآمدات
+ExportFilteredList=فلٹر شدہ فہرست برآمد کریں۔
+ExportList=برآمد کی فہرست
+ExportOptions=برآمد کے اختیارات
+IncludeDocsAlreadyExported=پہلے سے برآمد شدہ دستاویزات شامل کریں۔
+ExportOfPiecesAlreadyExportedIsEnable=پہلے سے برآمد شدہ ٹکڑوں کی برآمد قابل ہے۔
+ExportOfPiecesAlreadyExportedIsDisable=پہلے سے برآمد شدہ ٹکڑوں کی برآمد غیر فعال ہے۔
+AllExportedMovementsWereRecordedAsExported=تمام برآمد شدہ نقل و حرکت بطور برآمد ریکارڈ کی گئیں۔
+NotAllExportedMovementsCouldBeRecordedAsExported=تمام برآمد شدہ نقل و حرکت کو برآمد کے طور پر ریکارڈ نہیں کیا جا سکتا
+Miscellaneous=متفرق
+Calendar=کیلنڈر
+GroupBy=گروپ بذریعہ...
+ViewFlatList=فلیٹ کی فہرست دیکھیں
+ViewAccountList=لیجر دیکھیں
+ViewSubAccountList=ذیلی اکاؤنٹ لیجر دیکھیں
+RemoveString=سٹرنگ '%s' کو ہٹا دیں
+SomeTranslationAreUncomplete=پیش کردہ زبانوں میں سے کچھ کا صرف جزوی ترجمہ ہو سکتا ہے یا ان میں غلطیاں ہو سکتی ہیں۔ اپنی بہتری کو شامل کرنے کے لیے براہ کرم <a href="https://transifex.com/projects/p/dolibarr/" target="_blank" rel="noopener noreferrer external"> https://transifex.com/projects/p/dolibarr/ </a> پر رجسٹر کر کے اپنی زبان کو درست کرنے میں مدد کریں۔
+DirectDownloadLink=عوامی ڈاؤن لوڈ لنک
+PublicDownloadLinkDesc=فائل کو ڈاؤن لوڈ کرنے کے لیے صرف لنک درکار ہے۔
+DirectDownloadInternalLink=نجی ڈاؤن لوڈ لنک
+PrivateDownloadLinkDesc=آپ کو لاگ ان ہونے کی ضرورت ہے اور آپ کو فائل دیکھنے یا ڈاؤن لوڈ کرنے کے لیے اجازت کی ضرورت ہے۔
+Download=ڈاؤن لوڈ کریں
+DownloadDocument=دستاویز ڈاؤن لوڈ کریں۔
+ActualizeCurrency=کرنسی کی شرح کو اپ ڈیٹ کریں۔
+Fiscalyear=مالی سال
+ModuleBuilder=ماڈیول اور ایپلیکیشن بلڈر
+SetMultiCurrencyCode=کرنسی سیٹ کریں۔
+BulkActions=بڑی تعداد میں کارروائیاں
+ClickToShowHelp=ٹول ٹپ مدد دکھانے کے لیے کلک کریں۔
+WebSite=ویب سائٹ
+WebSites=ویب سائٹس
+WebSiteAccounts=ویب سائٹ اکاؤنٹس
+ExpenseReport=اخراجات کی رپورٹ
+ExpenseReports=اخراجات کی رپورٹ
 HR=HR
-HRAndBank=HR and Bank
-AutomaticallyCalculated=Automatically calculated
-TitleSetToDraft=Go back to draft
-ConfirmSetToDraft=Are you sure you want to go back to Draft status?
-ImportId=Import id
-Events=Events
-EMailTemplates=Email templates
-FileNotShared=File not shared to external public
-Project=Project
-Projects=Projects
-LeadOrProject=Lead | Project
-LeadsOrProjects=Leads | Projects
-Lead=Lead
-Leads=Leads
-ListOpenLeads=List open leads
-ListOpenProjects=List open projects
-NewLeadOrProject=New lead or project
-Rights=Permissions
-LineNb=Line no.
-IncotermLabel=Incoterms
-TabLetteringCustomer=Customer lettering
-TabLetteringSupplier=Vendor lettering
-Monday=Monday
-Tuesday=Tuesday
-Wednesday=Wednesday
-Thursday=Thursday
-Friday=Friday
-Saturday=Saturday
-Sunday=Sunday
-MondayMin=Mo
-TuesdayMin=Tu
-WednesdayMin=We
-ThursdayMin=Th
+HRAndBank=HR اور بینک
+AutomaticallyCalculated=خود بخود حساب لگایا جاتا ہے۔
+TitleSetToDraft=ڈرافٹ پر واپس جائیں۔
+ConfirmSetToDraft=کیا آپ واقعی ڈرافٹ اسٹیٹس پر واپس جانا چاہتے ہیں؟
+ImportId=آئی ڈی درآمد کریں۔
+Events=تقریبات
+EMailTemplates=ای میل ٹیمپلیٹس
+FileNotShared=فائل بیرونی عوام کے ساتھ شیئر نہیں کی گئی۔
+Project=پروجیکٹ
+Projects=پروجیکٹس
+LeadOrProject=لیڈ | پروجیکٹ
+LeadsOrProjects=لیڈز | پروجیکٹس
+Lead=لیڈ
+Leads=لیڈز
+ListOpenLeads=کھلی لیڈز کی فہرست بنائیں
+ListOpenProjects=کھلے منصوبوں کی فہرست بنائیں
+NewLeadOrProject=نئی لیڈ یا پروجیکٹ
+Rights=اجازتیں
+LineNb=لائن نمبر
+IncotermLabel=انکوٹرمز
+TabLetteringCustomer=گاہک کا خط
+TabLetteringSupplier=وینڈر کا خط
+Monday=پیر
+Tuesday=منگل
+Wednesday=بدھ
+Thursday=جمعرات
+Friday=جمعہ
+Saturday=ہفتہ
+Sunday=اتوار
+MondayMin=مو
+TuesdayMin=ٹو
+WednesdayMin=ہم
+ThursdayMin=ویں
 FridayMin=Fr
-SaturdayMin=Sa
-SundayMin=Su
-Day1=Monday
-Day2=Tuesday
-Day3=Wednesday
-Day4=Thursday
-Day5=Friday
-Day6=Saturday
-Day0=Sunday
-ShortMonday=M
-ShortTuesday=T
-ShortWednesday=W
-ShortThursday=T
-ShortFriday=F
-ShortSaturday=S
-ShortSunday=S
-one=one
-two=two
-three=three
-four=four
-five=five
-six=six
-seven=seven
-eight=eight
-nine=nine
-ten=ten
-eleven=eleven
-twelve=twelve
-thirteen=thirdteen
-fourteen=fourteen
-fifteen=fifteen
-sixteen=sixteen
-seventeen=seventeen
-eighteen=eighteen
-nineteen=nineteen
-twenty=twenty
-thirty=thirty
-forty=forty
-fifty=fifty
-sixty=sixty
-seventy=seventy
-eighty=eighty
-ninety=ninety
-hundred=hundred
-thousand=thousand
-million=million
-billion=billion
-trillion=trillion
+SaturdayMin=ص
+SundayMin=ایس یو
+Day1=پیر
+Day2=منگل
+Day3=بدھ
+Day4=جمعرات
+Day5=جمعہ
+Day6=ہفتہ
+Day0=اتوار
+ShortMonday=ایم
+ShortTuesday=ٹی
+ShortWednesday=ڈبلیو
+ShortThursday=ٹی
+ShortFriday=ایف
+ShortSaturday=ایس
+ShortSunday=ایس
+one=ایک
+two=دو
+three=تین
+four=چار
+five=پانچ
+six=چھ
+seven=سات
+eight=آٹھ
+nine=نو
+ten=دس
+eleven=گیارہ
+twelve=بارہ
+thirteen=تیسرا
+fourteen=چودہ
+fifteen=پندرہ
+sixteen=سولہ
+seventeen=سترہ
+eighteen=اٹھارہ
+nineteen=انیس
+twenty=بیس
+thirty=تیس
+forty=چالیس
+fifty=پچاس
+sixty=ساٹھ
+seventy=ستر
+eighty=اسی
+ninety=نوے
+hundred=سو
+thousand=ہزار
+million=دس لاکھ
+billion=ارب
+trillion=ٹریلین
 quadrillion=quadrillion
-SelectMailModel=Select an email template
-SetRef=Set ref
-Select2ResultFoundUseArrows=Some results found. Use arrows to select.
-Select2NotFound=No result found
-Select2Enter=Enter
-Select2MoreCharacter=or more character
-Select2MoreCharacters=or more characters
-Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br>
-Select2LoadingMoreResults=Loading more results...
-Select2SearchInProgress=Search in progress...
-SearchIntoThirdparties=Third parties
-SearchIntoContacts=Contacts
-SearchIntoMembers=Members
-SearchIntoUsers=Users
-SearchIntoProductsOrServices=Products or services
-SearchIntoBatch=Lots / Serials
-SearchIntoProjects=Projects
-SearchIntoMO=Manufacturing Orders
-SearchIntoTasks=Tasks
-SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Vendor invoices
-SearchIntoCustomerOrders=Sales orders
-SearchIntoSupplierOrders=Purchase orders
-SearchIntoCustomerProposals=Commercial proposals
-SearchIntoSupplierProposals=Vendor proposals
-SearchIntoInterventions=Interventions
-SearchIntoContracts=Contracts
-SearchIntoCustomerShipments=Customer shipments
-SearchIntoExpenseReports=Expense reports
-SearchIntoLeaves=Leave
-SearchIntoTickets=Tickets
-SearchIntoCustomerPayments=Customer payments
-SearchIntoVendorPayments=Vendor payments
-SearchIntoMiscPayments=Miscellaneous payments
-CommentLink=Comments
-NbComments=Number of comments
-CommentPage=Comments space
-CommentAdded=Comment added
-CommentDeleted=Comment deleted
-Everybody=Everybody
-PayedBy=Paid by
-PayedTo=Paid to
-Monthly=Monthly
-Quarterly=Quarterly
-Annual=Annual
-Local=Local
-Remote=Remote
-LocalAndRemote=Local and Remote
-KeyboardShortcut=Keyboard shortcut
-AssignedTo=Assigned to
-Deletedraft=Delete draft
-ConfirmMassDraftDeletion=Draft mass delete confirmation
-FileSharedViaALink=File shared with a public link
-SelectAThirdPartyFirst=Select a third party first...
-YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
-Inventory=Inventory
-AnalyticCode=Analytic code
-TMenuMRP=MRP
-ShowCompanyInfos=Show company infos
-ShowMoreInfos=Show More Infos
-NoFilesUploadedYet=Please upload a document first
-SeePrivateNote=See private note
-PaymentInformation=Payment information
-ValidFrom=Valid from
-ValidUntil=Valid until
-NoRecordedUsers=No users
-ToClose=To close
-ToRefuse=To refuse
-ToProcess=To process
-ToApprove=To approve
-GlobalOpenedElemView=Global view
-NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
-NoArticlesFoundForTheCategory=No article found for the category
-ToAcceptRefuse=To accept | refuse
-ContactDefault_agenda=Event
-ContactDefault_commande=Order
-ContactDefault_contrat=Contract
-ContactDefault_facture=Invoice
-ContactDefault_fichinter=Intervention
-ContactDefault_invoice_supplier=Supplier Invoice
-ContactDefault_order_supplier=Purchase Order
-ContactDefault_project=Project
-ContactDefault_project_task=Task
-ContactDefault_propal=Proposal
-ContactDefault_supplier_proposal=Supplier Proposal
-ContactDefault_ticket=Ticket
-ContactAddedAutomatically=Contact added from contact thirdparty roles
-More=More
-ShowDetails=Show details
-CustomReports=Custom reports
-StatisticsOn=Statistics on
-SelectYourGraphOptionsFirst=Select your graph options to build a graph
-Measures=Measures
-XAxis=X-Axis
+SelectMailModel=ایک ای میل ٹیمپلیٹ منتخب کریں۔
+SetRef=ریف سیٹ کریں۔
+Select2ResultFoundUseArrows=کچھ نتائج ملے۔ منتخب کرنے کے لیے تیر کا استعمال کریں۔
+Select2NotFound=کوئی نتیجہ نہیں ملا
+Select2Enter=درج کریں۔
+Select2MoreCharacter=یا اس سے زیادہ کردار
+Select2MoreCharacters=یا اس سے زیادہ کردار
+Select2MoreCharactersMore= <strong> نحو تلاش کریں: </strong> <br> <kbd> <strong> | </strong> </kbd> <kbd> OR </kbd> (A | B) <br> <kbd> <strong> * </strong> </kbd> <kbd> کوئی کردار </kbd> (ایک * ب) <br> <kbd> <strong> ^ </strong> </kbd> <kbd> شروع کریں </kbd> </kbd> ساتھ (^ AB) <br> <kbd> <strong> $ </strong> </kbd> <kbd> اختتام کے ساتھ ( ab$) <br>
+Select2LoadingMoreResults=مزید نتائج لوڈ ہو رہے ہیں...
+Select2SearchInProgress=تلاش جاری ہے...
+SearchIntoThirdparties=تیسرے فریقوں
+SearchIntoContacts=رابطے
+SearchIntoMembers=ممبران
+SearchIntoUsers=صارفین
+SearchIntoProductsOrServices=مصنوعات یا خدمات
+SearchIntoBatch=لاٹس/سیریلز
+SearchIntoProjects=پروجیکٹس
+SearchIntoMO=مینوفیکچرنگ آرڈرز
+SearchIntoTasks=کام
+SearchIntoCustomerInvoices=کسٹمر کی رسیدیں
+SearchIntoSupplierInvoices=وینڈر کی رسیدیں
+SearchIntoCustomerOrders=سیلز آرڈرز
+SearchIntoSupplierOrders=خریداری کے احکامات
+SearchIntoCustomerProposals=تجارتی تجاویز
+SearchIntoSupplierProposals=وینڈر کی تجاویز
+SearchIntoInterventions=مداخلتیں
+SearchIntoContracts=معاہدے
+SearchIntoCustomerShipments=گاہک کی ترسیل
+SearchIntoExpenseReports=اخراجات کی رپورٹ
+SearchIntoLeaves=چھوڑو
+SearchIntoTickets=ٹکٹ
+SearchIntoCustomerPayments=گاہک کی ادائیگی
+SearchIntoVendorPayments=وینڈر کی ادائیگی
+SearchIntoMiscPayments=متفرق ادائیگیاں
+CommentLink=تبصرے
+NbComments=تبصروں کی تعداد
+CommentPage=تبصرے کی جگہ
+CommentAdded=تبصرہ شامل کیا گیا۔
+CommentDeleted=تبصرہ حذف کر دیا گیا۔
+Everybody=ہر کوئی
+PayedBy=کی طرف سے ادا کیا
+PayedTo=کو ادائیگی
+Monthly=ماہانہ
+Quarterly=سہ ماہی
+Annual=سالانہ
+Local=مقامی
+Remote=دور دراز
+LocalAndRemote=مقامی اور دور دراز
+KeyboardShortcut=کی بورڈ شارٹ کٹ
+AssignedTo=مقرر کیا، مقرر کرنا
+Deletedraft=مسودہ حذف کریں۔
+ConfirmMassDraftDeletion=ڈرافٹ بڑے پیمانے پر حذف کرنے کی تصدیق
+FileSharedViaALink=فائل عوامی لنک کے ساتھ شیئر کی گئی۔
+SelectAThirdPartyFirst=پہلے کسی تیسرے فریق کو منتخب کریں...
+YouAreCurrentlyInSandboxMode=آپ فی الحال %s "سینڈ باکس" موڈ میں ہیں۔
+Inventory=انوینٹری
+AnalyticCode=تجزیاتی کوڈ
+TMenuMRP=ایم آر پی
+ShowCompanyInfos=کمپنی کی معلومات دکھائیں۔
+ShowMoreInfos=مزید معلومات دکھائیں۔
+NoFilesUploadedYet=براہ کرم پہلے ایک دستاویز اپ لوڈ کریں۔
+SeePrivateNote=نجی نوٹ دیکھیں
+PaymentInformation=ادائیگی کی معلومات
+ValidFrom=سے درست
+ValidUntil=قابل قبول جب تک
+NoRecordedUsers=کوئی صارف نہیں۔
+ToClose=بہت کریب
+ToRefuse=انکار کرنا
+ToProcess=عمل کے لئے
+ToApprove=منظور کرنے
+GlobalOpenedElemView=عالمی منظر
+NoArticlesFoundForTheKeyword=کلیدی لفظ '<strong> %s </strong>' کے لیے کوئی مضمون نہیں ملا۔
+NoArticlesFoundForTheCategory=زمرہ کے لیے کوئی مضمون نہیں ملا
+ToAcceptRefuse=قبول کرنا | انکار
+ContactDefault_agenda=تقریب
+ContactDefault_commande=ترتیب
+ContactDefault_contrat=معاہدہ
+ContactDefault_facture=رسید
+ContactDefault_fichinter=مداخلت
+ContactDefault_invoice_supplier=سپلائر انوائس
+ContactDefault_order_supplier=خریداری کے آرڈر
+ContactDefault_project=پروجیکٹ
+ContactDefault_project_task=کام
+ContactDefault_propal=تجویز
+ContactDefault_supplier_proposal=سپلائر کی تجویز
+ContactDefault_ticket=ٹکٹ
+ContactAddedAutomatically=رابطہ تیسرے فریق کے کرداروں سے شامل کیا گیا۔
+More=مزید
+ShowDetails=تفصیلات دکھائیں
+CustomReports=حسب ضرورت رپورٹس
+StatisticsOn=اعدادوشمار آن
+SelectYourGraphOptionsFirst=گراف بنانے کے لیے اپنے گراف کے اختیارات منتخب کریں۔
+Measures=اقدامات
+XAxis=ایکس محور
 YAxis=Y-Axis
-StatusOfRefMustBe=Status of %s must be %s
-DeleteFileHeader=Confirm file delete
-DeleteFileText=Do you really want delete this file?
-ShowOtherLanguages=Show other languages
-SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for this language
-NotUsedForThisCustomer=Not used for this customer
-AmountMustBePositive=Amount must be positive
-ByStatus=By status
-InformationMessage=Information
-Used=Used
-ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s created
-MODIFYInDolibarr=Record %s modified
-DELETEInDolibarr=Record %s deleted
-VALIDATEInDolibarr=Record %s validated
-APPROVEDInDolibarr=Record %s approved
-DefaultMailModel=Default Mail Model
-PublicVendorName=Public name of vendor
-DateOfBirth=Date of birth
-SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
-UpToDate=Up-to-date
-OutOfDate=Out-of-date
-EventReminder=Event Reminder
-UpdateForAllLines=Update for all lines
-OnHold=On hold
-Civility=Civility
-AffectTag=Affect Tag
-CreateExternalUser=Create external user
-ConfirmAffectTag=Bulk Tag Affect
-ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
-CategTypeNotFound=No tag type found for type of records
-CopiedToClipboard=Copied to clipboard
-InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
-ConfirmCancel=Are you sure you want to cancel
-EmailMsgID=Email MsgID
-SetToEnabled=Set to enabled
-SetToDisabled=Set to disabled
-ConfirmMassEnabling=mass enabling confirmation
-ConfirmMassEnablingQuestion=Are you sure you want to enable the %s selected record(s)?
-ConfirmMassDisabling=mass disabling confirmation
-ConfirmMassDisablingQuestion=Are you sure you want to disable the %s selected record(s)?
-RecordsEnabled=%s record(s) enabled
-RecordsDisabled=%s record(s) disabled
-RecordEnabled=Record enabled
-RecordDisabled=Record disabled
-Forthcoming=Forthcoming
-Currently=Currently
-ConfirmMassLeaveApprovalQuestion=Are you sure you want to approve the %s selected record(s)?
-ConfirmMassLeaveApproval=Mass leave approval confirmation
-RecordAproved=Record approved
-RecordsApproved=%s Record(s) approved
-Properties=Properties
-hasBeenValidated=%s has been validated
-ClientTZ=Client Time Zone (user)
-NotClosedYet=Not yet closed
-ClearSignature=Reset signature
-CanceledHidden=Canceled hidden
-CanceledShown=Canceled shown
+StatusOfRefMustBe=%s کی حیثیت %s ہونی چاہیے
+DeleteFileHeader=فائل کو حذف کرنے کی تصدیق کریں۔
+DeleteFileText=کیا آپ واقعی اس فائل کو حذف کرنا چاہتے ہیں؟
+ShowOtherLanguages=دوسری زبانیں دکھائیں۔
+SwitchInEditModeToAddTranslation=اس زبان کے لیے ترجمے شامل کرنے کے لیے ترمیم کے موڈ میں جائیں۔
+NotUsedForThisCustomer=اس گاہک کے لیے استعمال نہیں کیا گیا۔
+AmountMustBePositive=رقم مثبت ہونی چاہیے۔
+ByStatus=حیثیت سے
+InformationMessage=معلومات
+Used=استعمال کیا جاتا ہے
+ASAP=جتنی جلدی ہو سکے
+CREATEInDolibarr=ریکارڈ %s بنایا گیا۔
+MODIFYInDolibarr=ریکارڈ %s میں ترمیم کی گئی۔
+DELETEInDolibarr=ریکارڈ %s حذف کر دیا گیا۔
+VALIDATEInDolibarr=ریکارڈ %s کی توثیق ہو گئی۔
+APPROVEDInDolibarr=ریکارڈ %s کی منظوری دی گئی۔
+DefaultMailModel=ڈیفالٹ میل ماڈل
+PublicVendorName=فروخت کنندہ کا عوامی نام
+DateOfBirth=پیدائش کی تاریخ
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=سیکیورٹی ٹوکن کی میعاد ختم ہو گئی ہے، اس لیے کارروائی منسوخ کر دی گئی ہے۔ دوبارہ کوشش کریں.
+UpToDate=سب سے نیا
+OutOfDate=تاریخ سے باہر
+EventReminder=واقعہ کی یاد دہانی
+UpdateForAllLines=تمام لائنوں کے لیے اپ ڈیٹ کریں۔
+OnHold=ہولڈ پر
+Civility=تہذیب
+AffectTag=ٹیگ کو متاثر کریں۔
+CreateExternalUser=بیرونی صارف بنائیں
+ConfirmAffectTag=بلک ٹیگ کا اثر
+ConfirmAffectTagQuestion=کیا آپ واقعی %s منتخب کردہ ریکارڈ (ریکارڈز) پر ٹیگز کو متاثر کرنا چاہتے ہیں؟
+CategTypeNotFound=ریکارڈ کی قسم کے لیے کوئی ٹیگ کی قسم نہیں ملی
+CopiedToClipboard=کلپ بورڈ پر کاپی ہو گیا۔
+InformationOnLinkToContract=یہ رقم صرف معاہدے کی تمام لائنوں کا کل ہے۔ وقت کا کوئی خیال نہیں رکھا جاتا۔
+ConfirmCancel=کیا تمہیں یقین ہے تم اسے ملتوی کرنا چاہتے ہو
+EmailMsgID=MsgID کو ای میل کریں۔
+SetToEnabled=فعال پر سیٹ کریں۔
+SetToDisabled=غیر فعال پر سیٹ کریں۔
+ConfirmMassEnabling=بڑے پیمانے پر چالو کرنے کی تصدیق
+ConfirmMassEnablingQuestion=کیا آپ واقعی %s منتخب کردہ ریکارڈ (ریکارڈز) کو فعال کرنا چاہتے ہیں؟
+ConfirmMassDisabling=بڑے پیمانے پر غیر فعال کرنے کی تصدیق
+ConfirmMassDisablingQuestion=کیا آپ واقعی %s منتخب کردہ ریکارڈ کو غیر فعال کرنا چاہتے ہیں؟
+RecordsEnabled=%s ریکارڈ فعال
+RecordsDisabled=%s ریکارڈ غیر فعال
+RecordEnabled=ریکارڈ فعال ہے۔
+RecordDisabled=ریکارڈ کو غیر فعال کر دیا گیا۔
+Forthcoming=آئندہ
+Currently=فی الحال
+ConfirmMassLeaveApprovalQuestion=کیا آپ واقعی %s منتخب کردہ ریکارڈ (ریکارڈز) کو منظور کرنا چاہتے ہیں؟
+ConfirmMassLeaveApproval=بڑے پیمانے پر چھٹی کی منظوری کی تصدیق
+RecordAproved=ریکارڈ منظور
+RecordsApproved=%s ریکارڈ (ریکارڈز) کی منظوری دی گئی۔
+Properties=پراپرٹیز
+hasBeenValidated=%s کی توثیق کر دی گئی ہے۔
+ClientTZ=کلائنٹ ٹائم زون (صارف)
+NotClosedYet=ابھی بند نہیں ہوا۔
+ClearSignature=دستخط دوبارہ ترتیب دیں۔
+CanceledHidden=چھپا ہوا منسوخ کر دیا گیا۔
+CanceledShown=منسوخ شدہ دکھایا گیا ہے۔
diff --git a/htdocs/langs/ur_PK/margins.lang b/htdocs/langs/ur_PK/margins.lang
index a91b139ec7b..47cef686608 100644
--- a/htdocs/langs/ur_PK/margins.lang
+++ b/htdocs/langs/ur_PK/margins.lang
@@ -1,45 +1,45 @@
 # Dolibarr language file - Source file is en_US - marges
 
-Margin=Margin
-Margins=Margins
-TotalMargin=Total Margin
-MarginOnProducts=Margin / Products
-MarginOnServices=Margin / Services
-MarginRate=Margin rate
-MarkRate=Mark rate
-DisplayMarginRates=Display margin rates
-DisplayMarkRates=Display mark rates
-InputPrice=Input price
-margin=Profit margins management
-margesSetup=Profit margins management setup
-MarginDetails=Margin details
-ProductMargins=Product margins
-CustomerMargins=Customer margins
-SalesRepresentativeMargins=Sales representative margins
-ContactOfInvoice=Contact of invoice
-UserMargins=User margins
-ProductService=Product or Service
-AllProducts=All products and services
-ChooseProduct/Service=Choose product or service
-ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
-ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0%% on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100%% if no default value can be found).
-MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
-UseDiscountAsProduct=As a product
-UseDiscountAsService=As a service
-UseDiscountOnTotal=On subtotal
-MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
-MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
-MargeType1=Margin on Best vendor price
-MargeType2=Margin on Weighted Average Price (WAP)
-MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best vendor price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best vendor price if WAP not yet defined
-CostPrice=Cost price
-UnitCharges=Unit charges
-Charges=Charges
-AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per contact/address. Note that reading statistics on a contact is not reliable since in most cases the contact may not be defined explicitely on the invoices.
-rateMustBeNumeric=Rate must be a numeric value
-markRateShouldBeLesserThan100=Mark rate should be lower than 100
-ShowMarginInfos=Show margin infos
-CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any dedicated sale representative and some third parties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+Margin=حاشیہ
+Margins=حاشیہ
+TotalMargin=ٹوٹل مارجن
+MarginOnProducts=مارجن / مصنوعات
+MarginOnServices=مارجن/سروسز
+MarginRate=مارجن کی شرح
+MarkRate=مارک ریٹ
+DisplayMarginRates=مارجن کی شرحیں دکھائیں۔
+DisplayMarkRates=ڈسپلے مارک ریٹ
+InputPrice=ان پٹ کی قیمت
+margin=منافع کے مارجن کا انتظام
+margesSetup=منافع کے مارجن مینجمنٹ سیٹ اپ
+MarginDetails=مارجن کی تفصیلات
+ProductMargins=پروڈکٹ مارجنز
+CustomerMargins=کسٹمر مارجن
+SalesRepresentativeMargins=سیلز نمائندہ مارجنز
+ContactOfInvoice=رسید کا رابطہ
+UserMargins=صارف مارجن
+ProductService=پروڈکٹ یا سروس
+AllProducts=تمام مصنوعات اور خدمات
+ChooseProduct/Service=پروڈکٹ یا سروس کا انتخاب کریں۔
+ForceBuyingPriceIfNull=اگر وضاحت نہ کی گئی ہو تو خرید/قیمت کی قیمت کو فروخت کی قیمت پر مجبور کریں۔
+ForceBuyingPriceIfNullDetails=اگر ہم ایک نئی لائن کو شامل کرتے وقت خریدنا/قیمت کی قیمت فراہم نہیں کرتے ہیں، اور یہ اختیار "آن" ہے، تو نئی لائن پر مارجن 0%% ہوگا (خرید/قیمت قیمت = فروخت کی قیمت)۔ اگر یہ آپشن "آف" (تجویز کردہ) ہے، تو مارجن بطور ڈیفالٹ تجویز کردہ قدر کے برابر ہو گا (اور اگر کوئی ڈیفالٹ ویلیو نہیں مل سکتی ہے تو 100%% ہو سکتا ہے)۔
+MARGIN_METHODE_FOR_DISCOUNT=عالمی چھوٹ کے لیے مارجن کا طریقہ
+UseDiscountAsProduct=ایک مصنوعات کے طور پر
+UseDiscountAsService=خدمت کے طور پر
+UseDiscountOnTotal=ذیلی ٹوٹل پر
+MARGIN_METHODE_FOR_DISCOUNT_DETAILS=اس بات کی وضاحت کرتا ہے کہ کیا عالمی رعایت کو پروڈکٹ، سروس، یا مارجن کے حساب کے لیے صرف ذیلی ٹوٹل کے طور پر سمجھا جاتا ہے۔
+MARGIN_TYPE=مارجن کے حساب کتاب کے لیے بطور ڈیفالٹ تجویز کردہ خریدنا/قیمت کی قیمت
+MargeType1=بہترین وینڈر قیمت پر مارجن
+MargeType2=وزنی اوسط قیمت پر مارجن (WAP)
+MargeType3=لاگت کی قیمت پر مارجن
+MarginTypeDesc=* بہترین خرید قیمت پر مارجن = فروخت کی قیمت - پروڈکٹ کارڈ <br> پر بیان کردہ بہترین وینڈر قیمت * وزنی اوسط قیمت (WAP) پر مارجن = فروخت کی قیمت - پروڈکٹ کی وزنی اوسط قیمت (WAP) یا بہترین وینڈر کی قیمت اگر WAP نے ابھی تک <br> کی وضاحت نہیں کی ہے لاگت کی قیمت پر = فروخت کی قیمت - قیمت کی قیمت پروڈکٹ کارڈ یا WAP پر بیان کی گئی ہے اگر لاگت کی قیمت کی وضاحت نہیں کی گئی ہے، یا بہترین وینڈر کی قیمت اگر WAP کی ابھی تک وضاحت نہیں کی گئی ہے
+CostPrice=لاگت کی قیمت
+UnitCharges=یونٹ چارجز
+Charges=چارجز
+AgentContactType=تجارتی ایجنٹ کے رابطے کی قسم
+AgentContactTypeDetails=اس بات کی وضاحت کریں کہ کس رابطے کی قسم (انوائس پر منسلک) مارجن رپورٹ فی رابطہ/پتہ کے لیے استعمال کی جائے گی۔ نوٹ کریں کہ کسی رابطے کے اعدادوشمار کو پڑھنا قابل بھروسہ نہیں ہے کیونکہ زیادہ تر معاملات میں انوائسز پر رابطے کی واضح وضاحت نہیں کی جا سکتی ہے۔
+rateMustBeNumeric=شرح ایک عددی قدر ہونی چاہیے۔
+markRateShouldBeLesserThan100=مارک کی شرح 100 سے کم ہونی چاہیے۔
+ShowMarginInfos=مارجن کی معلومات دکھائیں۔
+CheckMargins=مارجن کی تفصیل
+MarginPerSaleRepresentativeWarning=مارجن فی صارف کی رپورٹ ہر سیلز نمائندے کے مارجن کا حساب لگانے کے لیے فریق ثالث اور فروخت کے نمائندوں کے درمیان لنک کا استعمال کرتی ہے۔ چونکہ کچھ فریق ثالث کا کوئی وقف شدہ سیل نمائندہ نہیں ہو سکتا ہے اور کچھ فریق ثالث متعدد سے منسلک ہو سکتے ہیں، اس لیے کچھ رقوم اس رپورٹ میں شامل نہیں کی جا سکتی ہیں (اگر کوئی سیلز نمائندہ نہیں ہے) اور کچھ مختلف خطوط پر ظاہر ہو سکتی ہیں (ہر سیل کے نمائندے کے لیے) .
diff --git a/htdocs/langs/ur_PK/members.lang b/htdocs/langs/ur_PK/members.lang
index 332fe9665d2..990e0431813 100644
--- a/htdocs/langs/ur_PK/members.lang
+++ b/htdocs/langs/ur_PK/members.lang
@@ -1,220 +1,220 @@
 # Dolibarr language file - Source file is en_US - members
-MembersArea=Members area
-MemberCard=Member card
-SubscriptionCard=Subscription card
-Member=Member
-Members=Members
-ShowMember=Show member card
-UserNotLinkedToMember=User not linked to a member
-ThirdpartyNotLinkedToMember=Third party not linked to a member
-MembersTickets=Membership address sheet
-FundationMembers=Foundation members
-ListOfValidatedPublicMembers=List of validated public members
-ErrorThisMemberIsNotPublic=This member is not public
-ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
-ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
-SetLinkToUser=Link to a Dolibarr user
-SetLinkToThirdParty=Link to a Dolibarr third party
-MembersCards=Business cards for members
-MembersList=List of members
-MembersListToValid=List of draft members (to be validated)
-MembersListValid=List of valid members
-MembersListUpToDate=List of valid members with up-to-date contribution
-MembersListNotUpToDate=List of valid members with out-of-date contribution
-MembersListExcluded=List of excluded members
-MembersListResiliated=List of terminated members
-MembersListQualified=List of qualified members
-MenuMembersToValidate=Draft members
-MenuMembersValidated=Validated members
-MenuMembersExcluded=Excluded members
-MenuMembersResiliated=Terminated members
-MembersWithSubscriptionToReceive=Members with contribution to receive
-MembersWithSubscriptionToReceiveShort=Contributions to receive
-DateSubscription=Date of membership
-DateEndSubscription=End date of membership
-EndSubscription=End of membership
-SubscriptionId=Contribution ID
-WithoutSubscription=Without contribution
-MemberId=Member id
-NewMember=New member
-MemberType=Member type
-MemberTypeId=Member type id
-MemberTypeLabel=Member type label
-MembersTypes=Members types
-MemberStatusDraft=Draft (needs to be validated)
-MemberStatusDraftShort=Draft
-MemberStatusActive=Validated (waiting contribution)
-MemberStatusActiveShort=Validated
-MemberStatusActiveLate=Contribution expired
-MemberStatusActiveLateShort=Expired
-MemberStatusPaid=Subscription up to date
-MemberStatusPaidShort=Up to date
-MemberStatusExcluded=Excluded member
-MemberStatusExcludedShort=Excluded
-MemberStatusResiliated=Terminated member
-MemberStatusResiliatedShort=Terminated
-MembersStatusToValid=Draft members
-MembersStatusExcluded=Excluded members
-MembersStatusResiliated=Terminated members
-MemberStatusNoSubscription=Validated (no contribution required)
-MemberStatusNoSubscriptionShort=Validated
-SubscriptionNotNeeded=No contribution required
-NewCotisation=New contribution
-PaymentSubscription=New contribution payment
-SubscriptionEndDate=Subscription's end date
-MembersTypeSetup=Members type setup
-MemberTypeModified=Member type modified
-DeleteAMemberType=Delete a member type
-ConfirmDeleteMemberType=Are you sure you want to delete this member type?
-MemberTypeDeleted=Member type deleted
-MemberTypeCanNotBeDeleted=Member type can not be deleted
-NewSubscription=New contribution
-NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s.
-Subscription=Contribution
-Subscriptions=Contributions
-SubscriptionLate=Late
-SubscriptionNotReceived=Contribution never received
-ListOfSubscriptions=List of contributions
-SendCardByMail=Send card by email
-AddMember=Create member
-NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
-NewMemberType=New member type
-WelcomeEMail=Welcome email
-SubscriptionRequired=Contribution required
-DeleteType=Delete
-VoteAllowed=Vote allowed
-Physical=Individual
-Moral=Corporation
-MorAndPhy=Corporation and Individual
-Reenable=Re-Enable
-ExcludeMember=Exclude a member
-Exclude=Exclude
-ConfirmExcludeMember=Are you sure you want to exclude this member ?
-ResiliateMember=Terminate a member
-ConfirmResiliateMember=Are you sure you want to terminate this member?
-DeleteMember=Delete a member
-ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his contributions)?
-DeleteSubscription=Delete a subscription
-ConfirmDeleteSubscription=Are you sure you want to delete this contribution?
-Filehtpasswd=htpasswd file
-ValidateMember=Validate a member
-ConfirmValidateMember=Are you sure you want to validate this member?
-FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
-PublicMemberList=Public member list
-BlankSubscriptionForm=Public self-registration form
-BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
-EnablePublicSubscriptionForm=Enable the public website with self-subscription form
-ForceMemberType=Force the member type
-ExportDataset_member_1=Members and contributions
-ImportDataset_member_1=Members
-LastMembersModified=Latest %s modified members
-LastSubscriptionsModified=Latest %s modified contributions
-String=String
-Text=Text
-Int=Int
-DateAndTime=Date and time
-PublicMemberCard=Member public card
-SubscriptionNotRecorded=Contribution not recorded
-AddSubscription=Create contribution
-ShowSubscription=Show contribution
+MembersArea=ممبران کا علاقہ
+MemberCard=ممبر کارڈ
+SubscriptionCard=سبسکرپشن کارڈ
+Member=رکن
+Members=ممبران
+ShowMember=ممبر کارڈ دکھائیں۔
+UserNotLinkedToMember=صارف کسی رکن سے منسلک نہیں ہے۔
+ThirdpartyNotLinkedToMember=تھرڈ پارٹی کسی ممبر سے منسلک نہیں ہے۔
+MembersTickets=ممبرشپ ایڈریس شیٹ
+FundationMembers=فاؤنڈیشن کے اراکین
+ListOfValidatedPublicMembers=توثیق شدہ عوامی اراکین کی فہرست
+ErrorThisMemberIsNotPublic=یہ رکن عوامی نہیں ہے۔
+ErrorMemberIsAlreadyLinkedToThisThirdParty=ایک اور رکن (نام: <b> %s </b>، لاگ ان: <b> %s </b>) پہلے ہی ایک تیسری پارٹی <b> %s </b> سے منسلک ہے. پہلے اس لنک کو ہٹا دیں کیونکہ تھرڈ پارٹی کو صرف ممبر سے نہیں جوڑا جا سکتا (اور اس کے برعکس)۔
+ErrorUserPermissionAllowsToLinksToItselfOnly=حفاظتی وجوہات کی بناء پر، آپ کو تمام صارفین میں ترمیم کرنے کی اجازت دی جانی چاہیے تاکہ کسی رکن کو کسی ایسے صارف سے جوڑ سکیں جو آپ کا نہیں ہے۔
+SetLinkToUser=Dolibarr صارف سے لنک کریں۔
+SetLinkToThirdParty=ڈولیبر تھرڈ پارٹی سے لنک کریں۔
+MembersCards=ممبروں کے لیے بزنس کارڈ
+MembersList=ممبران کی فہرست
+MembersListToValid=مسودہ کے ارکان کی فہرست (توثیق کی جائے گی)
+MembersListValid=درست اراکین کی فہرست
+MembersListUpToDate=تازہ ترین شراکت کے ساتھ درست اراکین کی فہرست
+MembersListNotUpToDate=پرانی شراکت کے ساتھ درست اراکین کی فہرست
+MembersListExcluded=خارج کیے گئے اراکین کی فہرست
+MembersListResiliated=برطرف اراکین کی فہرست
+MembersListQualified=اہل اراکین کی فہرست
+MenuMembersToValidate=ڈرافٹ ممبران
+MenuMembersValidated=تصدیق شدہ ممبران
+MenuMembersExcluded=خارج کیے گئے اراکین
+MenuMembersResiliated=برطرف اراکین
+MembersWithSubscriptionToReceive=وصول کرنے کے لئے شراکت کے ساتھ اراکین
+MembersWithSubscriptionToReceiveShort=وصول کرنے کے لیے تعاون
+DateSubscription=رکنیت کی تاریخ
+DateEndSubscription=رکنیت کی آخری تاریخ
+EndSubscription=رکنیت کا خاتمہ
+SubscriptionId=تعاون کی شناخت
+WithoutSubscription=شراکت کے بغیر
+MemberId=رکن کی شناخت
+NewMember=نیا رکن
+MemberType=ممبر کی قسم
+MemberTypeId=ممبر کی قسم کی شناخت
+MemberTypeLabel=ممبر کی قسم کا لیبل
+MembersTypes=اراکین کی اقسام
+MemberStatusDraft=مسودہ (توثیق کرنے کی ضرورت ہے)
+MemberStatusDraftShort=مسودہ
+MemberStatusActive=تصدیق شدہ (انتظار میں شراکت)
+MemberStatusActiveShort=تصدیق شدہ
+MemberStatusActiveLate=شراکت کی میعاد ختم ہو گئی۔
+MemberStatusActiveLateShort=میعاد ختم
+MemberStatusPaid=سبسکرپشن اپ ٹو ڈیٹ
+MemberStatusPaidShort=سب سے نیا
+MemberStatusExcluded=خارج شدہ ممبر
+MemberStatusExcludedShort=خارج
+MemberStatusResiliated=ختم شدہ رکن
+MemberStatusResiliatedShort=ختم
+MembersStatusToValid=ڈرافٹ ممبران
+MembersStatusExcluded=خارج کیے گئے اراکین
+MembersStatusResiliated=برطرف اراکین
+MemberStatusNoSubscription=تصدیق شدہ (کوئی شراکت درکار نہیں)
+MemberStatusNoSubscriptionShort=تصدیق شدہ
+SubscriptionNotNeeded=کوئی شراکت درکار نہیں۔
+NewCotisation=نئی شراکت
+PaymentSubscription=نئی شراکت کی ادائیگی
+SubscriptionEndDate=سبسکرپشن کی آخری تاریخ
+MembersTypeSetup=ممبران ٹائپ سیٹ اپ
+MemberTypeModified=ممبر کی قسم میں ترمیم کی گئی۔
+DeleteAMemberType=ممبر کی قسم کو حذف کریں۔
+ConfirmDeleteMemberType=کیا آپ واقعی اس رکن کی قسم کو حذف کرنا چاہتے ہیں؟
+MemberTypeDeleted=رکن کی قسم حذف کر دی گئی۔
+MemberTypeCanNotBeDeleted=ممبر کی قسم کو حذف نہیں کیا جا سکتا
+NewSubscription=نئی شراکت
+NewSubscriptionDesc=یہ فارم آپ کو فاؤنڈیشن کے نئے رکن کے طور پر اپنی رکنیت کو ریکارڈ کرنے کی اجازت دیتا ہے۔ اگر آپ اپنی سبسکرپشن کی تجدید کرنا چاہتے ہیں (اگر پہلے ہی ممبر ہیں)، تو براہ کرم اس کے بجائے فاؤنڈیشن بورڈ سے ای میل %s سے رابطہ کریں۔
+Subscription=شراکت
+Subscriptions=شراکتیں
+SubscriptionLate=دیر
+SubscriptionNotReceived=شراکت کبھی نہیں ملی
+ListOfSubscriptions=شراکتوں کی فہرست
+SendCardByMail=ای میل کے ذریعے کارڈ بھیجیں۔
+AddMember=ممبر بنائیں
+NoTypeDefinedGoToSetup=کسی رکن کی قسم کی وضاحت نہیں کی گئی ہے۔ مینو "ممبر اقسام" پر جائیں
+NewMemberType=نئے ممبر کی قسم
+WelcomeEMail=خوش آمدید ای میل
+SubscriptionRequired=شراکت درکار ہے۔
+DeleteType=حذف کریں۔
+VoteAllowed=ووٹ دینے کی اجازت ہے۔
+Physical=انفرادی
+Moral=کارپوریشن
+MorAndPhy=کارپوریشن اور انفرادی
+Reenable=دوبارہ فعال کریں۔
+ExcludeMember=ایک ممبر کو خارج کر دیں۔
+Exclude=خارج کرنا
+ConfirmExcludeMember=کیا آپ واقعی اس ممبر کو خارج کرنا چاہتے ہیں؟
+ResiliateMember=ممبر کو ختم کریں۔
+ConfirmResiliateMember=کیا آپ واقعی اس رکن کو ختم کرنا چاہتے ہیں؟
+DeleteMember=ایک ممبر کو حذف کریں۔
+ConfirmDeleteMember=کیا آپ واقعی اس رکن کو حذف کرنا چاہتے ہیں (ایک رکن کو حذف کرنے سے اس کی تمام شراکتیں حذف ہو جائیں گی)؟
+DeleteSubscription=سبسکرپشن کو حذف کریں۔
+ConfirmDeleteSubscription=کیا آپ واقعی اس شراکت کو حذف کرنا چاہتے ہیں؟
+Filehtpasswd=htpasswd فائل
+ValidateMember=ممبر کی تصدیق کریں۔
+ConfirmValidateMember=کیا آپ واقعی اس رکن کی توثیق کرنا چاہتے ہیں؟
+FollowingLinksArePublic=درج ذیل لنکس کھلے ہوئے صفحات ہیں جو کسی بھی Dolibarr کی اجازت سے محفوظ نہیں ہیں۔ وہ فارمیٹ شدہ صفحات نہیں ہیں، یہ بتانے کے لیے مثال کے طور پر فراہم کیے گئے ہیں کہ ممبران کے ڈیٹا بیس کی فہرست کیسے بنائی جائے۔
+PublicMemberList=پبلک ممبر لسٹ
+BlankSubscriptionForm=عوامی خود رجسٹریشن فارم
+BlankSubscriptionFormDesc=Dolibarr آپ کو ایک عوامی URL/ویب سائٹ فراہم کر سکتا ہے تاکہ بیرونی زائرین فاؤنڈیشن کو سبسکرائب کرنے کے لیے کہیں۔ اگر آن لائن ادائیگی کا ماڈیول فعال ہے، تو ادائیگی کا فارم خود بخود بھی فراہم کیا جا سکتا ہے۔
+EnablePublicSubscriptionForm=خود سبسکرپشن فارم کے ساتھ عوامی ویب سائٹ کو فعال کریں۔
+ForceMemberType=ممبر کی قسم کو مجبور کریں۔
+ExportDataset_member_1=ممبران اور تعاون
+ImportDataset_member_1=ممبران
+LastMembersModified=تازہ ترین %s ترمیم شدہ ممبران
+LastSubscriptionsModified=تازہ ترین %s ترمیم شدہ شراکتیں۔
+String=تار
+Text=متن
+Int=انٹر
+DateAndTime=تاریخ اور وقت
+PublicMemberCard=ممبر پبلک کارڈ
+SubscriptionNotRecorded=شراکت ریکارڈ نہیں کی گئی۔
+AddSubscription=شراکت بنائیں
+ShowSubscription=شراکت دکھائیں۔
 # Label of email templates
-SendingAnEMailToMember=Sending information email to member
-SendingEmailOnAutoSubscription=Sending email on auto registration
-SendingEmailOnMemberValidation=Sending email on new member validation
-SendingEmailOnNewSubscription=Sending email on new contribution
-SendingReminderForExpiredSubscription=Sending reminder for expired contributions
-SendingEmailOnCancelation=Sending email on cancelation
-SendingReminderActionComm=Sending reminder for agenda event
+SendingAnEMailToMember=ممبر کو معلوماتی ای میل بھیجنا
+SendingEmailOnAutoSubscription=آٹو رجسٹریشن پر ای میل بھیج رہا ہے۔
+SendingEmailOnMemberValidation=نئے ممبر کی توثیق پر ای میل بھیجنا
+SendingEmailOnNewSubscription=نئی شراکت پر ای میل بھیج رہا ہے۔
+SendingReminderForExpiredSubscription=میعاد ختم ہونے والے تعاون کے لیے یاد دہانی بھیجنا
+SendingEmailOnCancelation=منسوخی پر ای میل بھیج رہا ہے۔
+SendingReminderActionComm=ایجنڈا ایونٹ کے لیے یاد دہانی بھیج رہا ہے۔
 # Topic of email templates
-YourMembershipRequestWasReceived=Your membership was received.
-YourMembershipWasValidated=Your membership was validated
-YourSubscriptionWasRecorded=Your new contribution was recorded
-SubscriptionReminderEmail=contribution reminder
-YourMembershipWasCanceled=Your membership was canceled
-CardContent=Content of your member card
+YourMembershipRequestWasReceived=آپ کی رکنیت موصول ہو گئی۔
+YourMembershipWasValidated=آپ کی رکنیت کی توثیق کر دی گئی تھی۔
+YourSubscriptionWasRecorded=آپ کا نیا تعاون ریکارڈ کیا گیا۔
+SubscriptionReminderEmail=شراکت کی یاد دہانی
+YourMembershipWasCanceled=آپ کی رکنیت منسوخ کر دی گئی تھی۔
+CardContent=آپ کے ممبر کارڈ کا مواد
 # Text of email templates
-ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
-ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
-ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
-ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
-ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member auto-registration
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new contribution recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when contribution is about to expire
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
-DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
-DescADHERENT_MAIL_FROM=Sender Email for automatic emails
-DescADHERENT_ETIQUETTE_TYPE=Format of labels page
-DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
-DescADHERENT_CARD_TYPE=Format of cards page
-DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards
-DescADHERENT_CARD_TEXT=Text printed on member cards (align on left)
-DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right)
-DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards
-ShowTypeCard=Show type '%s'
-HTPasswordExport=htpassword file generation
-NoThirdPartyAssociatedToMember=No third party associated with this member
-MembersAndSubscriptions=Members and Contributions
-MoreActions=Complementary action on recording
-MoreActionsOnSubscription=Complementary action, suggested by default when recording a contribution
-MoreActionBankDirect=Create a direct entry on bank account
-MoreActionBankViaInvoice=Create an invoice, and a payment on bank account
-MoreActionInvoiceOnly=Create an invoice with no payment
-LinkToGeneratedPages=Generate visit cards
-LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member.
-DocForAllMembersCards=Generate business cards for all members
-DocForOneMemberCards=Generate business cards for a particular member
-DocForLabels=Generate address sheets
-SubscriptionPayment=Contribution payment
-LastSubscriptionDate=Date of latest contribution payment
-LastSubscriptionAmount=Amount of latest contribution
-LastMemberType=Last Member type
-MembersStatisticsByCountries=Members statistics by country
-MembersStatisticsByState=Members statistics by state/province
-MembersStatisticsByTown=Members statistics by town
-MembersStatisticsByRegion=Members statistics by region
-NbOfMembers=Total number of members
-NbOfActiveMembers=Total number of current active members
-NoValidatedMemberYet=No validated members found
-MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
-MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
-MembersByTownDesc=This screen show you statistics of members by town.
-MembersByNature=This screen show you statistics of members by nature.
-MembersByRegion=This screen show you statistics of members by region.
-MembersStatisticsDesc=Choose statistics you want to read...
-MenuMembersStats=Statistics
-LastMemberDate=Latest membership date
-LatestSubscriptionDate=Latest contribution date
-MemberNature=Nature of the member
-MembersNature=Nature of the members
-Public=Information is public
-NewMemberbyWeb=New member added. Awaiting approval
-NewMemberForm=New member form
-SubscriptionsStatistics=Contributions statistics
-NbOfSubscriptions=Number of contributions
-AmountOfSubscriptions=Amount collected from contributions
-TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
-DefaultAmount=Default amount of contribution
-CanEditAmount=Visitor can choose/edit amount of its contribution
-MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
-ByProperties=By nature
-MembersStatisticsByProperties=Members statistics by nature
-VATToUseForSubscriptions=VAT rate to use for contributionss
-NoVatOnSubscription=No VAT for contributions
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for contribution line into invoice: %s
-NameOrCompany=Name or company
-SubscriptionRecorded=Contribution recorded
-NoEmailSentToMember=No email sent to member
-EmailSentToMember=Email sent to member at %s
-SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired contributions
-SendReminderForExpiredSubscription=Send reminder by email to members when contribution is about to expire (parameter is number of days before end of membership to send the remind. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
-MembershipPaid=Membership paid for current period (until %s)
-YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
-XMembersClosed=%s member(s) closed
-XExternalUserCreated=%s external user(s) created
-ForceMemberNature=Force member nature (Individual or Corporation)
-CreateDolibarrLoginDesc=The creation of a user login for members allows them to connect to the application. Depending on the authorizations granted, they will be able, for example, to consult or modify their file themselves.
-CreateDolibarrThirdPartyDesc=A thirdparty is the legal entity that will be used on the invoice if you decide to generate invoice for each contribution. You will be able to create it later during the process of recording the contribution.
+ThisIsContentOfYourMembershipRequestWasReceived=ہم آپ کو بتانا چاہتے ہیں کہ آپ کی رکنیت کی درخواست موصول ہو گئی ہے۔ <br> <br>
+ThisIsContentOfYourMembershipWasValidated=ہم آپ کو بتانا چاہتے ہیں کہ آپ کی رکنیت کی توثیق درج ذیل معلومات کے ساتھ کی گئی تھی: <br> <br>
+ThisIsContentOfYourSubscriptionWasRecorded=ہم آپ کو بتانا چاہتے ہیں کہ آپ کی نئی رکنیت ریکارڈ کی گئی تھی۔ <br> <br>
+ThisIsContentOfSubscriptionReminderEmail=ہم آپ کو بتانا چاہتے ہیں کہ آپ کی رکنیت ختم ہونے والی ہے یا پہلے ہی ختم ہو چکی ہے (__MEMBER_LAST_SUBSCRIPTION_DATE_END__)۔ ہمیں امید ہے کہ آپ اس کی تجدید کریں گے۔ <br> <br>
+ThisIsContentOfYourCard=یہ آپ کے بارے میں ہمارے پاس موجود معلومات کا خلاصہ ہے۔ اگر کچھ غلط ہے تو براہ کرم ہم سے رابطہ کریں۔ <br> <br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=کسی مہمان کے خودکار تحریر کی صورت میں موصول ہونے والی اطلاعی ای میل کا موضوع
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=کسی مہمان کے خودکار تحریر کی صورت میں موصول ہونے والی اطلاعی ای میل کا مواد
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=ممبر آٹو رجسٹریشن پر ممبر کو ای میل بھیجنے کے لیے استعمال کرنے کے لیے ای میل ٹیمپلیٹ
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=ممبر کی توثیق پر ممبر کو ای میل بھیجنے کے لیے استعمال کرنے کے لیے ای میل ٹیمپلیٹ
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=ای میل ٹیمپلیٹ جسے نئے شراکت کی ریکارڈنگ پر ممبر کو ای میل بھیجنے کے لیے استعمال کیا جائے۔
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=ای میل ٹیمپلیٹ ای میل یاد دہانی بھیجنے کے لیے استعمال کیا جائے جب شراکت کی میعاد ختم ہونے والی ہو۔
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=رکن کی منسوخی پر ممبر کو ای میل بھیجنے کے لیے استعمال کرنے کے لیے ای میل ٹیمپلیٹ
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=ای میل ٹیمپلیٹ جو ممبر کو خارج کرنے پر ممبر کو ای میل بھیجنے کے لیے استعمال کیا جائے۔
+DescADHERENT_MAIL_FROM=خودکار ای میلز کے لیے بھیجنے والا ای میل
+DescADHERENT_ETIQUETTE_TYPE=لیبل صفحہ کی شکل
+DescADHERENT_ETIQUETTE_TEXT=ممبر ایڈریس شیٹس پر چھپی ہوئی عبارت
+DescADHERENT_CARD_TYPE=کارڈز کے صفحے کی شکل
+DescADHERENT_CARD_HEADER_TEXT=ممبر کارڈز کے اوپر چھپی ہوئی عبارت
+DescADHERENT_CARD_TEXT=ممبر کارڈز پر پرنٹ شدہ متن (بائیں طرف سیدھ میں کریں)
+DescADHERENT_CARD_TEXT_RIGHT=ممبر کارڈز پر پرنٹ شدہ متن (دائیں طرف سیدھ میں کریں)
+DescADHERENT_CARD_FOOTER_TEXT=ممبر کارڈز کے نیچے چھپی ہوئی عبارت
+ShowTypeCard=قسم '%s' دکھائیں
+HTPasswordExport=htpassword فائل جنریشن
+NoThirdPartyAssociatedToMember=اس رکن کے ساتھ کوئی تیسرا فریق وابستہ نہیں ہے۔
+MembersAndSubscriptions=اراکین اور تعاون
+MoreActions=ریکارڈنگ پر تکمیلی کارروائی
+MoreActionsOnSubscription=کسی شراکت کو ریکارڈ کرتے وقت بطور ڈیفالٹ تجویز کردہ تکمیلی کارروائی
+MoreActionBankDirect=بینک اکاؤنٹ پر براہ راست اندراج بنائیں
+MoreActionBankViaInvoice=ایک انوائس بنائیں، اور بینک اکاؤنٹ پر ادائیگی کریں۔
+MoreActionInvoiceOnly=بغیر ادائیگی کے ایک رسید بنائیں
+LinkToGeneratedPages=وزٹ کارڈز بنائیں
+LinkToGeneratedPagesDesc=یہ اسکرین آپ کو اپنے تمام ممبران یا کسی خاص ممبر کے لیے بزنس کارڈ کے ساتھ پی ڈی ایف فائلیں بنانے کی اجازت دیتی ہے۔
+DocForAllMembersCards=تمام اراکین کے لیے بزنس کارڈ بنائیں
+DocForOneMemberCards=کسی خاص ممبر کے لیے بزنس کارڈ بنائیں
+DocForLabels=ایڈریس شیٹس بنائیں
+SubscriptionPayment=شراکت کی ادائیگی
+LastSubscriptionDate=تازہ ترین شراکت کی ادائیگی کی تاریخ
+LastSubscriptionAmount=تازہ ترین تعاون کی رقم
+LastMemberType=آخری ممبر کی قسم
+MembersStatisticsByCountries=اراکین کے اعداد و شمار بلحاظ ملک
+MembersStatisticsByState=ریاست/صوبے کے لحاظ سے اراکین کے اعداد و شمار
+MembersStatisticsByTown=اراکین کے اعدادوشمار بلحاظ شہر
+MembersStatisticsByRegion=علاقے کے لحاظ سے اراکین کے اعدادوشمار
+NbOfMembers=اراکین کی کل تعداد
+NbOfActiveMembers=موجودہ فعال اراکین کی کل تعداد
+NoValidatedMemberYet=کوئی توثیق شدہ اراکین نہیں ملے
+MembersByCountryDesc=یہ اسکرین آپ کو ممالک کے لحاظ سے اراکین کے اعدادوشمار دکھاتی ہے۔ گراف اور چارٹس گوگل کی آن لائن گراف سروس کی دستیابی کے ساتھ ساتھ کام کرنے والے انٹرنیٹ کنکشن کی دستیابی پر منحصر ہیں۔
+MembersByStateDesc=یہ اسکرین آپ کو ریاست/صوبوں/کینٹن کے لحاظ سے اراکین کے اعدادوشمار دکھاتی ہے۔
+MembersByTownDesc=یہ اسکرین آپ کو شہر کے لحاظ سے اراکین کے اعدادوشمار دکھاتی ہے۔
+MembersByNature=یہ اسکرین آپ کو فطرت کے لحاظ سے اراکین کے اعدادوشمار دکھاتی ہے۔
+MembersByRegion=یہ اسکرین آپ کو علاقے کے لحاظ سے اراکین کے اعدادوشمار دکھاتی ہے۔
+MembersStatisticsDesc=وہ اعدادوشمار منتخب کریں جنہیں آپ پڑھنا چاہتے ہیں...
+MenuMembersStats=شماریات
+LastMemberDate=تازہ ترین رکنیت کی تاریخ
+LatestSubscriptionDate=تعاون کی تازہ ترین تاریخ
+MemberNature=ممبر کی نوعیت
+MembersNature=ارکان کی نوعیت
+Public=معلومات عام ہیں۔
+NewMemberbyWeb=نیا ممبر شامل کیا گیا۔ منظوری کا انتظار ہے۔
+NewMemberForm=نیا ممبر فارم
+SubscriptionsStatistics=شراکت کے اعدادوشمار
+NbOfSubscriptions=تعاون کی تعداد
+AmountOfSubscriptions=عطیات سے جمع کی گئی رقم
+TurnoverOrBudget=ٹرن اوور (کمپنی کے لیے) یا بجٹ (فاؤنڈیشن کے لیے)
+DefaultAmount=شراکت کی طے شدہ رقم
+CanEditAmount=وزیٹر اپنی شراکت کی رقم کا انتخاب/ترمیم کر سکتا ہے۔
+MEMBER_NEWFORM_PAYONLINE=مربوط آن لائن ادائیگی کے صفحے پر جائیں۔
+ByProperties=فطرت سے
+MembersStatisticsByProperties=اراکین کے اعداد و شمار فطرت کے لحاظ سے
+VATToUseForSubscriptions=شراکت کے لیے استعمال کرنے کے لیے VAT کی شرح
+NoVatOnSubscription=شراکت کے لیے کوئی VAT نہیں ہے۔
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=انوائس میں کنٹری بیوشن لائن کے لیے استعمال ہونے والی پروڈکٹ: %s
+NameOrCompany=نام یا کمپنی
+SubscriptionRecorded=شراکت ریکارڈ کی گئی۔
+NoEmailSentToMember=ممبر کو کوئی ای میل نہیں بھیجی گئی۔
+EmailSentToMember=رکن کو ای میل %s پر بھیجی گئی۔
+SendReminderForExpiredSubscriptionTitle=میعاد ختم ہونے والے تعاون کے لیے ای میل کے ذریعے یاد دہانی بھیجیں۔
+SendReminderForExpiredSubscription=جب شراکت کی میعاد ختم ہونے والی ہو تو اراکین کو ای میل کے ذریعے یاد دہانی بھیجیں (پیرامیٹر یاد دہانی بھیجنے کے لیے رکنیت ختم ہونے سے پہلے دنوں کی تعداد ہے۔ یہ سیمی کالون سے الگ کیے گئے دنوں کی فہرست ہو سکتی ہے، مثال کے طور پر '10;5;0;-5 ')
+MembershipPaid=موجودہ مدت کے لیے ادا کی گئی رکنیت (%s تک)
+YouMayFindYourInvoiceInThisEmail=آپ کو اس ای میل کے ساتھ اپنی رسید منسلک مل سکتی ہے۔
+XMembersClosed=%s ممبران بند
+XExternalUserCreated=%s بیرونی صارف (صارفین) بنائے گئے۔
+ForceMemberNature=فورس ممبر کی نوعیت (انفرادی یا کارپوریشن)
+CreateDolibarrLoginDesc=اراکین کے لیے صارف لاگ ان کی تخلیق انہیں ایپلی کیشن سے منسلک ہونے کی اجازت دیتی ہے۔ دی گئی اجازتوں پر انحصار کرتے ہوئے، وہ، مثال کے طور پر، خود اپنی فائل سے مشورہ کرنے یا اس میں ترمیم کرنے کے قابل ہوں گے۔
+CreateDolibarrThirdPartyDesc=فریق ثالث قانونی ادارہ ہے جو انوائس پر استعمال کیا جائے گا اگر آپ ہر شراکت کے لیے انوائس بنانے کا فیصلہ کرتے ہیں۔ آپ شراکت کو ریکارڈ کرنے کے عمل کے دوران بعد میں اسے تخلیق کر سکیں گے۔
diff --git a/htdocs/langs/ur_PK/modulebuilder.lang b/htdocs/langs/ur_PK/modulebuilder.lang
index 61b5c939d12..d5ebc19f4a4 100644
--- a/htdocs/langs/ur_PK/modulebuilder.lang
+++ b/htdocs/langs/ur_PK/modulebuilder.lang
@@ -1,147 +1,147 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank" rel="noopener noreferrer">manual development is here</a>.
-EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
-EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
-ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
-ModuleBuilderDesc3=Generated/editable modules found: <strong>%s</strong>
-ModuleBuilderDesc4=A module is detected as 'editable' when the file <strong>%s</strong> exists in root of module directory
-NewModule=New module
-NewObjectInModulebuilder=New object
-ModuleKey=Module key
-ObjectKey=Object key
-ModuleInitialized=Module initialized
-FilesForObjectInitialized=Files for new object '%s' initialized
-FilesForObjectUpdated=Files for object '%s' updated (.sql files and .class.php file)
-ModuleBuilderDescdescription=Enter here all general information that describe your module.
-ModuleBuilderDescspecifications=You can enter here a detailed description of the specifications of your module that is not already structured into other tabs. So you have within easy reach all the rules to develop. Also this text content will be included into the generated documentation (see last tab). You can use Markdown format, but it is recommended to use Asciidoc format (comparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown).
-ModuleBuilderDescobjects=Define here the objects you want to manage with your module. A CRUD DAO class, SQL files, page to list record of objects, to create/edit/view a record and an API will be generated.
-ModuleBuilderDescmenus=This tab is dedicated to define menu entries provided by your module.
-ModuleBuilderDescpermissions=This tab is dedicated to define the new permissions you want to provide with your module.
-ModuleBuilderDesctriggers=This is the view of triggers provided by your module. To include code executed when a triggered business event is launched, just edit this file.
-ModuleBuilderDeschooks=This tab is dedicated to hooks.
-ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
-ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
-EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
-DangerZone=Danger zone
-BuildPackage=Build package
-BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
-BuildDocumentation=Build documentation
-ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here
-ModuleIsLive=This module has been activated. Any change may break a current live feature.
-DescriptionLong=Long description
-EditorName=Name of editor
-EditorUrl=URL of editor
-DescriptorFile=Descriptor file of module
-ClassFile=File for PHP DAO CRUD class
-ApiClassFile=File for PHP API class
-PageForList=PHP page for list of record
-PageForCreateEditView=PHP page to create/edit/view a record
-PageForAgendaTab=PHP page for event tab
-PageForDocumentTab=PHP page for document tab
-PageForNoteTab=PHP page for note tab
-PageForContactTab=PHP page for contact tab
-PathToModulePackage=Path to zip of module/application package
-PathToModuleDocumentation=Path to file of module/application documentation (%s)
-SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
-FileNotYetGenerated=File not yet generated
-RegenerateClassAndSql=Force update of .class and .sql files
-RegenerateMissingFiles=Generate missing files
-SpecificationFile=File of documentation
-LanguageFile=File for language
-ObjectProperties=Object Properties
-ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
-NotNull=Not NULL
-NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
-SearchAll=Used for 'search all'
-DatabaseIndex=Database index
-FileAlreadyExists=File %s already exists
-TriggersFile=File for triggers code
-HooksFile=File for hooks code
-ArrayOfKeyValues=Array of key-val
-ArrayOfKeyValuesDesc=Array of keys and values if field is a combo list with fixed values
-WidgetFile=Widget file
-CSSFile=CSS file
-JSFile=Javascript file
-ReadmeFile=Readme file
-ChangeLog=ChangeLog file
-TestClassFile=File for PHP Unit Test class
-SqlFile=Sql file
-PageForLib=File for the common PHP library
-PageForObjLib=File for the PHP library dedicated to object
-SqlFileExtraFields=Sql file for complementary attributes
-SqlFileKey=Sql file for keys
-SqlFileKeyExtraFields=Sql file for keys of complementary attributes
-AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
-UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
-IsAMeasure=Is a measure
-DirScanned=Directory scanned
-NoTrigger=No trigger
-NoWidget=No widget
-GoToApiExplorer=API explorer
-ListOfMenusEntries=List of menu entries
-ListOfDictionariesEntries=List of dictionaries entries
-ListOfPermissionsDefined=List of defined permissions
-SeeExamples=See examples here
-EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
-DisplayOnPdf=Display on PDF
-IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
-SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
-SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
-LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
-MenusDefDesc=Define here the menus provided by your module
-DictionariesDefDesc=Define here the dictionaries provided by your module
-PermissionsDefDesc=Define here the new permissions provided by your module
-MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
-DictionariesDefDescTooltip=The dictionaries provided by your module/application are defined into the array <strong>$this->dictionaries</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), dictionaries are also visible into the setup area to administrator users on %s.
-PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
-HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
-TriggerDefDesc=Define in the trigger file the code that you want to execute when a business event external to your module is executed (events triggered by other modules).
-SeeIDsInUse=See IDs in use in your installation
-SeeReservedIDsRangeHere=See range of reserved IDs
-ToolkitForDevelopers=Toolkit for Dolibarr developers
-TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the native module builder wizard.<br>Enable the module <strong>%s</strong> and use the wizard by clicking the <span class="fa fa-bug"></span> on the top right menu.<br>Warning: This is an advanced developer feature, do <b>not</b> experiment on your production site!
-SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
-AddLanguageFile=Add language file
-YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
-DropTableIfEmpty=(Destroy table if empty)
-TableDoesNotExists=The table %s does not exists
-TableDropped=Table %s deleted
-InitStructureFromExistingTable=Build the structure array string of an existing table
-UseAboutPage=Disable the about page
-UseDocFolder=Disable the documentation folder
-UseSpecificReadme=Use a specific ReadMe
-ContentOfREADMECustomized=Note: The content of the README.md file has been replaced with the specific value defined into setup of ModuleBuilder.
-RealPathOfModule=Real path of module
-ContentCantBeEmpty=Content of file can't be empty
-WidgetDesc=You can generate and edit here the widgets that will be embedded with your module.
-CSSDesc=You can generate and edit here a file with personalized CSS embedded with your module.
-JSDesc=You can generate and edit here a file with personalized Javascript embedded with your module.
-CLIDesc=You can generate here some command line scripts you want to provide with your module.
-CLIFile=CLI File
-NoCLIFile=No CLI files
-UseSpecificEditorName = Use a specific editor name
-UseSpecificEditorURL = Use a specific editor URL
-UseSpecificFamily = Use a specific family
-UseSpecificAuthor = Use a specific author
-UseSpecificVersion = Use a specific initial version
-IncludeRefGeneration=The reference of object must be generated automatically
-IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
-IncludeDocGeneration=I want to generate some documents from the object
-IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
-ShowOnCombobox=Show value into combobox
-KeyForTooltip=Key for tooltip
-CSSClass=CSS for edit/create form
-CSSViewClass=CSS for read form
-CSSListClass=CSS for list
-NotEditable=Not editable
-ForeignKey=Foreign key
-TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
-AsciiToHtmlConverter=Ascii to HTML converter
-AsciiToPdfConverter=Ascii to PDF converter
-TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
-ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
-ImportExportProfiles=Import and export profiles
-ValidateModBuilderDesc=Put 1 if this field need to be validated with $this->validateField() or 0 if validation required
+ModuleBuilderDesc=یہ ٹول صرف تجربہ کار صارفین یا ڈویلپرز کے ذریعہ استعمال کیا جانا چاہئے۔ یہ آپ کے اپنے ماڈیول کو بنانے یا اس میں ترمیم کرنے کے لیے افادیت فراہم کرتا ہے۔ متبادل <a href="%s" target="_blank" rel="noopener noreferrer"> مینوئل ڈویلپمنٹ کے لیے دستاویزات یہاں </a> ہے۔
+EnterNameOfModuleDesc=بغیر اسپیس کے تخلیق کرنے کے لیے ماڈیول/ایپلی کیشن کا نام درج کریں۔ الفاظ کو الگ کرنے کے لیے بڑے حروف کا استعمال کریں (مثال کے طور پر: MyModule, EcommerceForShop, SyncWithMySystem...)
+EnterNameOfObjectDesc=بغیر اسپیس کے تخلیق کرنے کے لیے آبجیکٹ کا نام درج کریں۔ الفاظ کو الگ کرنے کے لیے بڑے کا استعمال کریں (مثال کے طور پر: MyObject، طالب علم، استاد...)۔ CRUD کلاس فائل، بلکہ API فائل، آبجیکٹ کی فہرست/شامل/ترمیم/حذف کرنے کے لیے صفحات اور SQL فائلیں تیار کی جائیں گی۔
+ModuleBuilderDesc2=وہ راستہ جہاں ماڈیولز تیار/ترمیم کیے جاتے ہیں (بیرونی ماڈیولز کے لیے پہلی ڈائریکٹری %s میں بیان کی گئی ہے): <strong> %s </strong>
+ModuleBuilderDesc3=تیار کردہ/ قابل تدوین ماڈیولز ملے: <strong> %s </strong>
+ModuleBuilderDesc4=جب فائل <strong> %s </strong> ماڈیول ڈائرکٹری کے روٹ میں موجود ہوتی ہے تو ایک ماڈیول کو 'ایڈیٹ ایبل' کے طور پر پایا جاتا ہے۔
+NewModule=نیا ماڈیول
+NewObjectInModulebuilder=نیا اعتراض
+ModuleKey=ماڈیول کلید
+ObjectKey=آبجیکٹ کلید
+ModuleInitialized=ماڈیول شروع کر دیا گیا۔
+FilesForObjectInitialized=نئی آبجیکٹ '%s' کے لیے فائلیں شروع کی گئیں۔
+FilesForObjectUpdated=آبجیکٹ '%s' کے لیے فائلیں اپ ڈیٹ ہو گئیں (.sql فائلیں اور .class.php فائل)
+ModuleBuilderDescdescription=یہاں تمام عمومی معلومات درج کریں جو آپ کے ماڈیول کی وضاحت کرتی ہیں۔
+ModuleBuilderDescspecifications=آپ یہاں اپنے ماڈیول کی خصوصیات کی تفصیلی وضاحت درج کر سکتے ہیں جو پہلے سے دوسرے ٹیبز میں تشکیل نہیں دی گئی ہے۔ لہذا آپ کو ترقی کے تمام اصولوں تک آسانی سے رسائی حاصل ہے۔ نیز یہ متن مواد تیار کردہ دستاویزات میں شامل کیا جائے گا (آخری ٹیب دیکھیں)۔ آپ مارک ڈاؤن فارمیٹ استعمال کر سکتے ہیں، لیکن Asciidoc فارمیٹ استعمال کرنے کی سفارش کی جاتی ہے (.md اور .asciidoc کے درمیان موازنہ: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)۔
+ModuleBuilderDescobjects=یہاں ان اشیاء کی وضاحت کریں جن کا آپ اپنے ماڈیول کے ساتھ انتظام کرنا چاہتے ہیں۔ ایک CRUD DAO کلاس، SQL فائلیں، اشیاء کے ریکارڈ کی فہرست کے لیے صفحہ، ریکارڈ بنانے/ترمیم کرنے/دیکھنے کے لیے اور ایک API تیار کیا جائے گا۔
+ModuleBuilderDescmenus=یہ ٹیب آپ کے ماڈیول کے ذریعہ فراہم کردہ مینو اندراجات کی وضاحت کے لیے وقف ہے۔
+ModuleBuilderDescpermissions=یہ ٹیب ان نئی اجازتوں کی وضاحت کے لیے وقف ہے جو آپ اپنے ماڈیول کے ساتھ فراہم کرنا چاہتے ہیں۔
+ModuleBuilderDesctriggers=یہ آپ کے ماڈیول کے ذریعہ فراہم کردہ محرکات کا منظر ہے۔ کوڈ کو شامل کرنے کے لیے جب ایک ٹرگرڈ بزنس ایونٹ شروع ہوتا ہے، بس اس فائل میں ترمیم کریں۔
+ModuleBuilderDeschooks=یہ ٹیب ہکس کے لیے وقف ہے۔
+ModuleBuilderDescwidgets=یہ ٹیب ویجٹ کے انتظام/تعمیر کے لیے وقف ہے۔
+ModuleBuilderDescbuildpackage=آپ یہاں اپنے ماڈیول کی "تقسیم کرنے کے لیے تیار" پیکیج فائل (ایک نارملائزڈ .zip فائل) اور "تقسیم کے لیے تیار" دستاویزی فائل بنا سکتے ہیں۔ پیکیج یا دستاویزات کی فائل بنانے کے لیے بس بٹن پر کلک کریں۔
+EnterNameOfModuleToDeleteDesc=آپ اپنے ماڈیول کو حذف کر سکتے ہیں۔ انتباہ: ماڈیول کی تمام کوڈنگ فائلیں (دستی طور پر تیار کردہ یا تخلیق کردہ) اور سٹرکچرڈ ڈیٹا اور دستاویزات کو حذف کر دیا جائے گا!
+EnterNameOfObjectToDeleteDesc=آپ کسی چیز کو حذف کر سکتے ہیں۔ انتباہ: آبجیکٹ سے متعلق تمام کوڈنگ فائلز (دستی طور پر تیار کردہ یا تخلیق کردہ) حذف کر دی جائیں گی!
+DangerZone=خطرہ زون
+BuildPackage=پیکج بنائیں
+BuildPackageDesc=آپ اپنی درخواست کا زپ پیکج بنا سکتے ہیں تاکہ آپ اسے کسی بھی Dolibarr پر تقسیم کرنے کے لیے تیار ہوں۔ آپ اسے تقسیم بھی کر سکتے ہیں یا بازار میں فروخت کر سکتے ہیں جیسے <a href="https://www.dolistore.com"> DoliStore.com </a>۔
+BuildDocumentation=دستاویزات بنائیں
+ModuleIsNotActive=یہ ماڈیول ابھی چالو نہیں ہوا ہے۔ اسے لائیو بنانے کے لیے %s پر جائیں یا یہاں کلک کریں۔
+ModuleIsLive=اس ماڈیول کو چالو کر دیا گیا ہے۔ کوئی بھی تبدیلی موجودہ لائیو خصوصیت کو توڑ سکتی ہے۔
+DescriptionLong=لمبی تفصیل
+EditorName=ایڈیٹر کا نام
+EditorUrl=ایڈیٹر کا URL
+DescriptorFile=ماڈیول کی وضاحتی فائل
+ClassFile=PHP DAO CRUD کلاس کے لیے فائل
+ApiClassFile=پی ایچ پی API کلاس کے لیے فائل
+PageForList=ریکارڈ کی فہرست کے لیے پی ایچ پی کا صفحہ
+PageForCreateEditView=ریکارڈ بنانے/ترمیم کرنے/دیکھنے کے لیے پی ایچ پی کا صفحہ
+PageForAgendaTab=ایونٹ ٹیب کے لیے پی ایچ پی کا صفحہ
+PageForDocumentTab=دستاویز کے ٹیب کے لیے پی ایچ پی کا صفحہ
+PageForNoteTab=نوٹ ٹیب کے لیے پی ایچ پی کا صفحہ
+PageForContactTab=رابطہ ٹیب کے لیے پی ایچ پی کا صفحہ
+PathToModulePackage=ماڈیول/ایپلی کیشن پیکج کی زپ کا راستہ
+PathToModuleDocumentation=ماڈیول/ایپلی کیشن دستاویزات کی فائل کا راستہ (%s)
+SpaceOrSpecialCharAreNotAllowed=خالی جگہوں یا خصوصی حروف کی اجازت نہیں ہے۔
+FileNotYetGenerated=فائل ابھی تک تیار نہیں ہوئی۔
+RegenerateClassAndSql=کلاس اور .sql فائلوں کو زبردستی اپ ڈیٹ کریں۔
+RegenerateMissingFiles=گمشدہ فائلیں بنائیں
+SpecificationFile=دستاویزات کی فائل
+LanguageFile=زبان کے لیے فائل
+ObjectProperties=آبجیکٹ پراپرٹیز
+ConfirmDeleteProperty=کیا آپ واقعی <strong> %s </strong> پراپرٹی کو حذف کرنا چاہتے ہیں؟ یہ پی ایچ پی کلاس میں کوڈ کو تبدیل کرے گا لیکن آبجیکٹ کی ٹیبل تعریف سے کالم کو بھی ہٹا دے گا۔
+NotNull=NULL نہیں۔
+NotNullDesc=1= ڈیٹا بیس کو NOT NULL پر سیٹ کریں۔ -1=نل ویلیوز کی اجازت دیں اور اگر خالی ہو تو NULL (''یا 0) پر مجبور کریں۔
+SearchAll='تمام تلاش کریں' کے لیے استعمال کیا جاتا ہے
+DatabaseIndex=ڈیٹا بیس انڈیکس
+FileAlreadyExists=فائل %s پہلے سے موجود ہے۔
+TriggersFile=ٹرگرز کوڈ کے لیے فائل
+HooksFile=ہکس کوڈ کے لیے فائل
+ArrayOfKeyValues=کلیدی ویل کی صف
+ArrayOfKeyValuesDesc=کلیدوں اور اقدار کی صف اگر فیلڈ مقررہ اقدار کے ساتھ ایک کومبو فہرست ہے۔
+WidgetFile=ویجیٹ فائل
+CSSFile=سی ایس ایس فائل
+JSFile=جاوا اسکرپٹ فائل
+ReadmeFile=ریڈمی فائل
+ChangeLog=تبدیلی لاگ فائل
+TestClassFile=پی ایچ پی یونٹ ٹیسٹ کلاس کے لیے فائل
+SqlFile=ایس کیو ایل فائل
+PageForLib=عام پی ایچ پی لائبریری کے لیے فائل
+PageForObjLib=اعتراض کے لیے وقف پی ایچ پی لائبریری کے لیے فائل
+SqlFileExtraFields=تکمیلی صفات کے لیے ایس کیو ایل فائل
+SqlFileKey=چابیاں کے لیے ایس کیو ایل فائل
+SqlFileKeyExtraFields=تکمیلی صفات کی کلیدوں کے لیے ایس کیو ایل فائل
+AnObjectAlreadyExistWithThisNameAndDiffCase=اس نام کے ساتھ ایک شے پہلے سے موجود ہے اور ایک مختلف کیس
+UseAsciiDocFormat=آپ مارک ڈاؤن فارمیٹ استعمال کر سکتے ہیں، لیکن Asciidoc فارمیٹ استعمال کرنے کی سفارش کی جاتی ہے (.md اور .asciidoc کے درمیان موازنہ: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
+IsAMeasure=ایک پیمانہ ہے۔
+DirScanned=ڈائرکٹری اسکین کی گئی۔
+NoTrigger=کوئی محرک نہیں۔
+NoWidget=کوئی ویجیٹ نہیں۔
+GoToApiExplorer=API ایکسپلورر
+ListOfMenusEntries=مینو اندراجات کی فہرست
+ListOfDictionariesEntries=لغات کے اندراجات کی فہرست
+ListOfPermissionsDefined=متعین اجازتوں کی فہرست
+SeeExamples=یہاں مثالیں دیکھیں
+EnabledDesc=اس فیلڈ کو فعال رکھنے کی شرط (مثالیں: 1 یا $conf->global->MYMODULE_MYOPTION)
+VisibleDesc=کیا میدان نظر آتا ہے؟ (مثالیں: 0=کبھی نظر نہیں آتا، 1=فہرست میں دکھائی دیتا ہے اور فارمز کو تخلیق/اپ ڈیٹ/دیکھتا ہے، 2=صرف فہرست میں مرئی، 3=صرف بنانے/اپ ڈیٹ کرنے/دیکھنے کے فارم پر نظر آتا ہے (فہرست نہیں)، 4=فہرست پر نظر آتا ہے اور اپ ڈیٹ/دیکھیں فارم صرف (تخلیق نہیں)، 5=صرف لسٹ اینڈ ویو فارم پر نظر آتا ہے (تخلیق نہیں، اپ ڈیٹ نہیں)۔ <br> <br> یہ ایک اظہار ہو سکتا ہے، مثال کے طور پر: <br> preg_match('/public/', $_SERVER['PHP_SELF'])?0:1 <br>>
+DisplayOnPdfDesc=اس فیلڈ کو مطابقت پذیر پی ڈی ایف دستاویزات پر ڈسپلے کریں، آپ "پوزیشن" فیلڈ کے ساتھ پوزیشن کا نظم کر سکتے ہیں۔ <br> فی الحال، نام سے جانا جاتا پر compatibles PDF ماڈل ہیں: eratosthene (کے حکم) espadon (جہاز)، سپنج (رسید)، لاجوردی (propal / کوٹیشن)، cornas (سپلائر حکم) <br> <br> <strong> دستاویز کے طور پر: </strong> <br> 0 = <br> 1 دکھایا = ڈسپلے <br> 2 = ڈسپلے صرف خالی نہیں ہے تو <br> <br> <strong> لئے دستاویز لائنز: </strong> <br> 0 = نہیں دکھایا <br> 1 = بعد تفصیل کالم میں <br> 4 = ڈسپلے وضاحت کے بعد <br> لائن کی تفصیل کالم میں 3 = ڈسپلے ایک کالم میں دکھائے تفصیل صرف اس صورت میں جب خالی نہ ہو۔
+DisplayOnPdf=پی ڈی ایف پر ڈسپلے کریں۔
+IsAMeasureDesc=کیا فہرست میں کل حاصل کرنے کے لیے فیلڈ کی قدر کو جمع کیا جا سکتا ہے؟ (مثالیں: 1 یا 0)
+SearchAllDesc=کیا کوئیک سرچ ٹول سے تلاش کرنے کے لیے فیلڈ کا استعمال کیا جاتا ہے؟ (مثالیں: 1 یا 0)
+SpecDefDesc=یہاں وہ تمام دستاویزات درج کریں جو آپ اپنے ماڈیول کے ساتھ فراہم کرنا چاہتے ہیں جو پہلے سے دوسرے ٹیبز کے ذریعہ بیان نہیں کیے گئے ہیں۔ آپ .md یا اس سے بہتر، امیر .asciidoc نحو استعمال کر سکتے ہیں۔
+LanguageDefDesc=اس فائل میں درج کریں، تمام کلید اور ہر زبان کی فائل کا ترجمہ۔
+MenusDefDesc=اپنے ماڈیول کے ذریعہ فراہم کردہ مینو کی وضاحت یہاں کریں۔
+DictionariesDefDesc=یہاں آپ کے ماڈیول کے ذریعہ فراہم کردہ لغات کی وضاحت کریں۔
+PermissionsDefDesc=یہاں آپ کے ماڈیول کے ذریعہ فراہم کردہ نئی اجازتوں کی وضاحت کریں۔
+MenusDefDescTooltip=آپ کے ماڈیول/ایپلی کیشن کے ذریعہ فراہم کردہ مینو کی تعریف <strong> $this->مینوز </strong> میں ماڈیول ڈسکرپٹر فائل میں کی گئی ہے۔ آپ اس فائل کو دستی طور پر ترمیم کرسکتے ہیں یا ایمبیڈڈ ایڈیٹر استعمال کرسکتے ہیں۔ <br> <br> نوٹ: ایک بار وضاحت (اور ماڈیول دوبارہ چالو) ہو جانے کے بعد، مینیو ایڈمنسٹریٹر صارفین کے لیے %s پر دستیاب مینیو ایڈیٹر میں بھی نظر آتے ہیں۔
+DictionariesDefDescTooltip=آپ کے ماڈیول/ایپلی کیشن کے ذریعے فراہم کردہ لغات کی تعریف <strong> $this->ڈکشنریز </strong> میں ماڈیول ڈسکرپٹر فائل میں کی گئی ہے۔ آپ اس فائل کو دستی طور پر ایڈٹ کرسکتے ہیں یا ایمبیڈڈ ایڈیٹر استعمال کرسکتے ہیں۔ <br> <br> نوٹ: ایک بار وضاحت (اور ماڈیول دوبارہ چالو) ہونے کے بعد، لغات بھی سیٹ اپ ایریا میں %s پر ایڈمنسٹریٹر صارفین کو دکھائی دیتی ہیں۔
+PermissionsDefDescTooltip=آپ کے ماڈیول/ایپلی کیشن کے ذریعے فراہم کردہ اجازتوں کی تعریف <strong> $this->Rights </strong> میں ماڈیول ڈسکرپٹر فائل میں کی گئی ہے۔ آپ اس فائل کو دستی طور پر ترمیم کرسکتے ہیں یا ایمبیڈڈ ایڈیٹر استعمال کرسکتے ہیں۔ <br> <br> نوٹ: ایک بار وضاحت (اور ماڈیول دوبارہ چالو) ہونے کے بعد، اجازتیں پہلے سے طے شدہ اجازت سیٹ اپ %s میں نظر آتی ہیں۔
+HooksDefDesc=<b> module_parts['hooks'] </b> پراپرٹی میں وضاحت کریں، ماڈیول ڈسکرپٹر میں، ہکس کا سیاق و سباق جس کا آپ نظم کرنا چاہتے ہیں (سیاق و سباق کی فہرست '<b>' کوڈ <b> کوڈ میں تلاش کرکے تلاش کی جاسکتی ہے ہک فائل آپ کے ہکڈ فنکشنز کا کوڈ شامل کرنے کے لیے (ہک ایبل فنکشنز کو کور کوڈ میں '<b> executeHooks </b>' پر تلاش کرکے تلاش کیا جاسکتا ہے)۔
+TriggerDefDesc=ٹرگر فائل میں اس کوڈ کی وضاحت کریں جسے آپ اس وقت انجام دینا چاہتے ہیں جب آپ کے ماڈیول سے باہر کوئی کاروباری واقعہ انجام دیا جاتا ہے (دوسرے ماڈیولز کے ذریعے متحرک ہونے والے واقعات)۔
+SeeIDsInUse=اپنی انسٹالیشن میں استعمال میں آئی آئی ڈی دیکھیں
+SeeReservedIDsRangeHere=مخصوص IDs کی رینج دیکھیں
+ToolkitForDevelopers=Dolibarr ڈویلپرز کے لیے ٹول کٹ
+TryToUseTheModuleBuilder=اگر آپ کو SQL اور PHP کا علم ہے تو آپ مقامی ماڈیول بلڈر وزرڈ استعمال کر سکتے ہیں۔ <br> ماڈیول <strong> %s </strong> کو فعال کریں اور <span class="fa fa-bug"> a014f17 کے اوپری دائیں پر کلک کرکے وزرڈ کا استعمال کریں۔ <br> انتباہ: یہ ایک اعلی درجے کی ڈویلپر خصوصیت ہے، اپنی پروڈکشن سائٹ پر <b> نہیں </b> تجربہ کریں!
+SeeTopRightMenu=اوپر دائیں مینو میں <span class="fa fa-bug"> </span> دیکھیں
+AddLanguageFile=زبان کی فائل شامل کریں۔
+YouCanUseTranslationKey=آپ یہاں ایک کلید استعمال کر سکتے ہیں جو کہ زبان کی فائل میں پائی جانے والی ترجمے کی کلید ہے (ٹیب "Languages" دیکھیں)
+DropTableIfEmpty=(اگر خالی ہو تو میز کو تباہ کر دیں)
+TableDoesNotExists=ٹیبل %s موجود نہیں ہے۔
+TableDropped=ٹیبل %s حذف کر دیا گیا۔
+InitStructureFromExistingTable=موجودہ ٹیبل کے ڈھانچے کی صف کی سٹرنگ بنائیں
+UseAboutPage=کے بارے میں صفحہ کو غیر فعال کریں۔
+UseDocFolder=دستاویزات کے فولڈر کو غیر فعال کریں۔
+UseSpecificReadme=ایک مخصوص ReadMe استعمال کریں۔
+ContentOfREADMECustomized=نوٹ: README.md فائل کے مواد کو ModuleBuilder کے سیٹ اپ میں بیان کردہ مخصوص قدر سے تبدیل کر دیا گیا ہے۔
+RealPathOfModule=ماڈیول کا حقیقی راستہ
+ContentCantBeEmpty=فائل کا مواد خالی نہیں ہو سکتا
+WidgetDesc=آپ یہاں وہ وجیٹس تیار اور ترمیم کرسکتے ہیں جو آپ کے ماڈیول کے ساتھ سرایت کیے جائیں گے۔
+CSSDesc=آپ یہاں اپنے ماڈیول کے ساتھ ایمبیڈڈ پرسنلائزڈ سی ایس ایس کے ساتھ فائل بنا اور اس میں ترمیم کر سکتے ہیں۔
+JSDesc=آپ اپنے ماڈیول کے ساتھ ایمبیڈڈ پرسنلائزڈ جاوا اسکرپٹ کے ساتھ یہاں ایک فائل بنا اور اس میں ترمیم کر سکتے ہیں۔
+CLIDesc=آپ یہاں کچھ کمانڈ لائن اسکرپٹس بنا سکتے ہیں جو آپ اپنے ماڈیول کے ساتھ فراہم کرنا چاہتے ہیں۔
+CLIFile=CLI فائل
+NoCLIFile=کوئی CLI فائلیں نہیں ہیں۔
+UseSpecificEditorName = ایک مخصوص ایڈیٹر کا نام استعمال کریں۔
+UseSpecificEditorURL = ایک مخصوص ایڈیٹر URL استعمال کریں۔
+UseSpecificFamily = ایک مخصوص خاندان کا استعمال کریں
+UseSpecificAuthor = کسی مخصوص مصنف کا استعمال کریں۔
+UseSpecificVersion = ایک مخصوص ابتدائی ورژن استعمال کریں۔
+IncludeRefGeneration=آبجیکٹ کا حوالہ خود بخود تیار ہونا چاہیے۔
+IncludeRefGenerationHelp=اگر آپ حوالہ کے خودکار طور پر جنریشن کا نظم کرنے کے لیے کوڈ شامل کرنا چاہتے ہیں تو اسے چیک کریں۔
+IncludeDocGeneration=میں آبجیکٹ سے کچھ دستاویزات بنانا چاہتا ہوں۔
+IncludeDocGenerationHelp=اگر آپ اسے چیک کرتے ہیں تو ریکارڈ پر "دستاویز تیار کریں" کے باکس کو شامل کرنے کے لیے کچھ کوڈ تیار کیا جائے گا۔
+ShowOnCombobox=کومبو باکس میں قدر دکھائیں۔
+KeyForTooltip=ٹول ٹپ کے لیے کلید
+CSSClass=فارم میں ترمیم/تخلیق کے لیے CSS
+CSSViewClass=پڑھنے کے فارم کے لیے CSS
+CSSListClass=فہرست کے لیے سی ایس ایس
+NotEditable=قابل تدوین نہیں۔
+ForeignKey=غیر ملکی چابی
+TypeOfFieldsHelp=فیلڈز کی قسم: <br> varchar(99)، ڈبل(24,8)، اصلی، متن، HTML، ڈیٹ ٹائم، ٹائم اسٹیمپ، انٹیجر، انٹیجر:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' کا مطلب ہے کہ ہم ریکارڈ بنانے کے لیے کومبو کے بعد ایک + بٹن شامل کرتے ہیں، 'فلٹر' 'status=1 اور fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' ہو سکتا ہے مثال کے طور پر)
+AsciiToHtmlConverter=Ascii سے HTML کنورٹر
+AsciiToPdfConverter=Ascii سے پی ڈی ایف کنورٹر
+TableNotEmptyDropCanceled=ٹیبل خالی نہیں ہے۔ ڈراپ منسوخ کر دیا گیا ہے۔
+ModuleBuilderNotAllowed=ماڈیول بلڈر دستیاب ہے لیکن آپ کے صارف کو اس کی اجازت نہیں ہے۔
+ImportExportProfiles=پروفائلز درآمد اور برآمد کریں۔
+ValidateModBuilderDesc=اگر اس فیلڈ کو $this->validateField() یا 0 سے توثیق کرنے کی ضرورت ہو تو 1 ڈالیں
diff --git a/htdocs/langs/ur_PK/mrp.lang b/htdocs/langs/ur_PK/mrp.lang
index 3f1aac53340..d9158d60f19 100644
--- a/htdocs/langs/ur_PK/mrp.lang
+++ b/htdocs/langs/ur_PK/mrp.lang
@@ -1,109 +1,109 @@
-Mrp=Manufacturing Orders
-MOs=Manufacturing orders
-ManufacturingOrder=Manufacturing Order
-MRPDescription=Module to manage production and Manufacturing Orders (MO).
-MRPArea=MRP Area
-MrpSetupPage=Setup of module MRP
-MenuBOM=Bills of material
-LatestBOMModified=Latest %s Bills of materials modified
-LatestMOModified=Latest %s Manufacturing Orders modified
-Bom=Bills of Material
-BillOfMaterials=Bill of Materials
-BillOfMaterialsLines=Bill of Materials lines
-BOMsSetup=Setup of module BOM
-ListOfBOMs=List of bills of material - BOM
-ListOfManufacturingOrders=List of Manufacturing Orders
-NewBOM=New bill of materials
-ProductBOMHelp=Product to create (or disassemble) with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
-BOMsNumberingModules=BOM numbering templates
-BOMsModelModule=BOM document templates
-MOsNumberingModules=MO numbering templates
-MOsModelModule=MO document templates
-FreeLegalTextOnBOMs=Free text on document of BOM
-WatermarkOnDraftBOMs=Watermark on draft BOM
-FreeLegalTextOnMOs=Free text on document of MO
-WatermarkOnDraftMOs=Watermark on draft MO
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials %s ?
-ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
-ManufacturingEfficiency=Manufacturing efficiency
-ConsumptionEfficiency=Consumption efficiency
-ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
-ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
-DeleteBillOfMaterials=Delete Bill Of Materials
-DeleteMo=Delete Manufacturing Order
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Materials?
-ConfirmDeleteMo=Are you sure you want to delete this Manufacturing Order?
-MenuMRP=Manufacturing Orders
-NewMO=New Manufacturing Order
-QtyToProduce=Qty to produce
-DateStartPlannedMo=Date start planned
-DateEndPlannedMo=Date end planned
-KeepEmptyForAsap=Empty means 'As Soon As Possible'
-EstimatedDuration=Estimated duration
-EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
-ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
-ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
-ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
-StatusMOProduced=Produced
-QtyFrozen=Frozen Qty
-QuantityFrozen=Frozen Quantity
-QuantityConsumedInvariable=When this flag is set, the quantity consumed is always the value defined and is not relative to the quantity produced.
-DisableStockChange=Stock change disabled
-DisableStockChangeHelp=When this flag is set, there is no stock change on this product, whatever is the quantity consumed
-BomAndBomLines=Bills Of Material and lines
-BOMLine=Line of BOM
-WarehouseForProduction=Warehouse for production
-CreateMO=Create MO
-ToConsume=To consume
-ToProduce=To produce
-ToObtain=To obtain
-QtyAlreadyConsumed=Qty already consumed
-QtyAlreadyProduced=Qty already produced
-QtyRequiredIfNoLoss=Qty required if there is no loss (Manufacturing efficiency is 100%%)
-ConsumeOrProduce=Consume or Produce
-ConsumeAndProduceAll=Consume and Produce All
-Manufactured=Manufactured
-TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
-ForAQuantityOf=For a quantity to produce of %s
-ForAQuantityToConsumeOf=For a quantity to disassemble of %s
-ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
-ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
-ProductionForRef=Production of %s
-AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
-NoStockChangeOnServices=No stock change on services
-ProductQtyToConsumeByMO=Product quantity still to consume by open MO
-ProductQtyToProduceByMO=Product quantity still to produce by open MO
-AddNewConsumeLines=Add new line to consume
-AddNewProduceLines=Add new line to produce
-ProductsToConsume=Products to consume
-ProductsToProduce=Products to produce
-UnitCost=Unit cost
-TotalCost=Total cost
-BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
-GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
-ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
-Workstation=Workstation
-Workstations=Workstations
-WorkstationsDescription=Workstations management
-WorkstationSetup = Workstations setup
-WorkstationSetupPage = Workstations setup page
-WorkstationList=Workstation list
-WorkstationCreate=Add new workstation
-ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
-EnableAWorkstation=Enable a workstation
-ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
-DisableAWorkstation=Disable a workstation
-DeleteWorkstation=Delete
-NbOperatorsRequired=Number of operators required
-THMOperatorEstimated=Estimated operator THM
-THMMachineEstimated=Estimated machine THM
-WorkstationType=Workstation type
-Human=Human
-Machine=Machine
-HumanMachine=Human / Machine
-WorkstationArea=Workstation area
-Machines=Machines
-THMEstimatedHelp=This rate makes it possible to define a forecast cost of the item
-BOM=Bill Of Materials
-CollapseBOMHelp=You can define the default display of the details of the nomenclature in the configuration of the BOM module
-MOAndLines=Manufacturing Orders and lines
+Mrp=مینوفیکچرنگ آرڈرز
+MOs=مینوفیکچرنگ آرڈرز
+ManufacturingOrder=مینوفیکچرنگ آرڈر
+MRPDescription=پیداوار اور مینوفیکچرنگ آرڈرز (MO) کو منظم کرنے کے لیے ماڈیول۔
+MRPArea=ایم آر پی ایریا
+MrpSetupPage=ماڈیول MRP کا سیٹ اپ
+MenuBOM=مواد کے بل
+LatestBOMModified=تازہ ترین %s ترمیم شدہ مواد کے بل
+LatestMOModified=تازہ ترین %s مینوفیکچرنگ آرڈرز میں ترمیم کی گئی۔
+Bom=مواد کے بل
+BillOfMaterials=سامان کا بل
+BillOfMaterialsLines=مواد کی لائنوں کا بل
+BOMsSetup=ماڈیول BOM کا سیٹ اپ
+ListOfBOMs=مواد کے بلوں کی فہرست - BOM
+ListOfManufacturingOrders=مینوفیکچرنگ آرڈرز کی فہرست
+NewBOM=مواد کا نیا بل
+ProductBOMHelp=اس BOM کے ساتھ بنانے (یا جدا کرنے) کے لیے پروڈکٹ۔ <br> نوٹ: 'نیچر آف پروڈکٹ' = 'خام مال' کی خاصیت والی مصنوعات اس فہرست میں نظر نہیں آتیں۔
+BOMsNumberingModules=BOM نمبری ٹیمپلیٹس
+BOMsModelModule=BOM دستاویز کے سانچے
+MOsNumberingModules=MO نمبری ٹیمپلیٹس
+MOsModelModule=MO دستاویز کے سانچے
+FreeLegalTextOnBOMs=BOM کی دستاویز پر مفت متن
+WatermarkOnDraftBOMs=ڈرافٹ BOM پر واٹر مارک
+FreeLegalTextOnMOs=ایم او کی دستاویز پر مفت متن
+WatermarkOnDraftMOs=ڈرافٹ MO پر واٹر مارک
+ConfirmCloneBillOfMaterials=کیا آپ واقعی مواد کے بل کو کلون کرنا چاہتے ہیں %s؟
+ConfirmCloneMo=کیا آپ واقعی مینوفیکچرنگ آرڈر %s کو کلون کرنا چاہتے ہیں؟
+ManufacturingEfficiency=مینوفیکچرنگ کی کارکردگی
+ConsumptionEfficiency=کھپت کی کارکردگی
+ValueOfMeansLoss=0.95 کی قدر کا مطلب ہے پیداوار کے دوران نقصان کا اوسط 5%%
+ValueOfMeansLossForProductProduced=0.95 کی قدر کا مطلب ہے پیدا شدہ مصنوعات کے نقصان کا اوسط 5%%
+DeleteBillOfMaterials=مواد کا بل حذف کریں۔
+DeleteMo=مینوفیکچرنگ آرڈر کو حذف کریں۔
+ConfirmDeleteBillOfMaterials=کیا آپ واقعی اس بل آف میٹریلز کو حذف کرنا چاہتے ہیں؟
+ConfirmDeleteMo=کیا آپ واقعی اس مینوفیکچرنگ آرڈر کو حذف کرنا چاہتے ہیں؟
+MenuMRP=مینوفیکچرنگ آرڈرز
+NewMO=نیا مینوفیکچرنگ آرڈر
+QtyToProduce=پیدا کرنے کے لئے مقدار
+DateStartPlannedMo=تاریخ شروع کرنے کا منصوبہ ہے۔
+DateEndPlannedMo=تاریخ کے اختتام کا منصوبہ ہے۔
+KeepEmptyForAsap=خالی کا مطلب ہے 'جتنا جلد ممکن ہو'
+EstimatedDuration=متوقع دورانیہ
+EstimatedDurationDesc=اس BOM کا استعمال کرتے ہوئے اس پروڈکٹ کو تیار کرنے (یا جدا کرنے) کی تخمینی مدت
+ConfirmValidateBom=کیا آپ واقعی BOM کی تصدیق <strong> %s </strong> کے ساتھ کرنا چاہتے ہیں (آپ اسے نئے مینوفیکچرنگ آرڈرز بنانے کے لیے استعمال کر سکیں گے)
+ConfirmCloseBom=کیا آپ واقعی اس BOM کو منسوخ کرنا چاہتے ہیں (اب آپ اسے نئے مینوفیکچرنگ آرڈرز بنانے کے لیے استعمال نہیں کر سکیں گے)؟
+ConfirmReopenBom=کیا آپ واقعی اس BOM کو دوبارہ کھولنا چاہتے ہیں (آپ اسے نئے مینوفیکچرنگ آرڈرز بنانے کے لیے استعمال کر سکیں گے)
+StatusMOProduced=پیدا کیا
+QtyFrozen=منجمد مقدار
+QuantityFrozen=منجمد مقدار
+QuantityConsumedInvariable=جب یہ جھنڈا سیٹ کیا جاتا ہے، استعمال کی جانے والی مقدار ہمیشہ متعین قدر ہوتی ہے اور پیدا شدہ مقدار سے متعلق نہیں ہوتی ہے۔
+DisableStockChange=اسٹاک کی تبدیلی غیر فعال ہے۔
+DisableStockChangeHelp=جب یہ جھنڈا سیٹ ہو جاتا ہے، تو اس پراڈکٹ پر کوئی بھی سٹاک تبدیلی نہیں ہوتی، چاہے جو بھی مقدار استعمال کی گئی ہو۔
+BomAndBomLines=مواد اور لائنوں کے بل
+BOMLine=BOM کی لائن
+WarehouseForProduction=پیداوار کے لیے گودام
+CreateMO=MO بنائیں
+ToConsume=استعمال کرنا
+ToProduce=پیدا کرنے کے لئے
+ToObtain=حاصل کرنے کے لئے
+QtyAlreadyConsumed=مقدار پہلے ہی استعمال ہو چکی ہے۔
+QtyAlreadyProduced=مقدار پہلے ہی تیار کی گئی ہے۔
+QtyRequiredIfNoLoss=اگر کوئی نقصان نہ ہو تو مقدار درکار ہے (مینوفیکچرنگ کی کارکردگی 100%% ہے)
+ConsumeOrProduce=استعمال کریں یا پیدا کریں۔
+ConsumeAndProduceAll=استعمال کریں اور سب پیدا کریں۔
+Manufactured=تیار کردہ
+TheProductXIsAlreadyTheProductToProduce=جو پروڈکٹ شامل کرنا ہے وہ پہلے سے ہی پیدا کرنے والی پروڈکٹ ہے۔
+ForAQuantityOf=%s کی پیداوار کی مقدار کے لیے
+ForAQuantityToConsumeOf=%s کو جدا کرنے کی مقدار کے لیے
+ConfirmValidateMo=کیا آپ واقعی اس مینوفیکچرنگ آرڈر کی توثیق کرنا چاہتے ہیں؟
+ConfirmProductionDesc='%s' پر کلک کرنے سے، آپ سیٹ کی مقدار کے لیے کھپت اور/یا پیداوار کی توثیق کریں گے۔ یہ اسٹاک کو بھی اپ ڈیٹ کرے گا اور اسٹاک کی نقل و حرکت کو ریکارڈ کرے گا۔
+ProductionForRef=%s کی پیداوار
+AutoCloseMO=مینوفیکچرنگ آرڈر کو خود بخود بند کر دیں اگر استعمال کرنے اور پیدا کرنے کی مقدار پوری ہو جائے۔
+NoStockChangeOnServices=خدمات پر اسٹاک میں کوئی تبدیلی نہیں۔
+ProductQtyToConsumeByMO=پروڈکٹ کی مقدار ابھی بھی اوپن ایم او کے ذریعے استعمال کرنا ہے۔
+ProductQtyToProduceByMO=پروڈکٹ کی مقدار ابھی بھی اوپن ایم او کے ذریعہ تیار کرنا ہے۔
+AddNewConsumeLines=استعمال کرنے کے لیے نئی لائن شامل کریں۔
+AddNewProduceLines=پیدا کرنے کے لیے نئی لائن شامل کریں۔
+ProductsToConsume=استعمال کرنے کے لیے مصنوعات
+ProductsToProduce=پیدا کرنے کے لئے مصنوعات
+UnitCost=یونٹ لاگت
+TotalCost=کل لاگت
+BOMTotalCost=اس BOM کو تیار کرنے کی لاگت ہر ایک مقدار اور استعمال کی مصنوعات کی لاگت پر مبنی ہے (اگر وضاحت کی گئی ہو تو لاگت کی قیمت کا استعمال کریں، ورنہ اوسط وزنی قیمت اگر وضاحت کی گئی ہو، ورنہ بہترین خریداری کی قیمت)
+GoOnTabProductionToProduceFirst=مینوفیکچرنگ آرڈر کو بند کرنے کے لیے آپ نے پہلے پروڈکشن شروع کی ہوگی (ٹیب '%s' دیکھیں)۔ لیکن آپ اسے منسوخ کر سکتے ہیں۔
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=ایک کٹ کو BOM یا MO میں استعمال نہیں کیا جا سکتا
+Workstation=ورک سٹیشن
+Workstations=ورک سٹیشنز
+WorkstationsDescription=ورک سٹیشنز کا انتظام
+WorkstationSetup = ورک سٹیشن سیٹ اپ
+WorkstationSetupPage = ورک سٹیشن سیٹ اپ صفحہ
+WorkstationList=ورک سٹیشن کی فہرست
+WorkstationCreate=نیا ورک سٹیشن شامل کریں۔
+ConfirmEnableWorkstation=کیا آپ واقعی ورک سٹیشن <b> %s </b> کو فعال کرنا چاہتے ہیں؟
+EnableAWorkstation=ورک سٹیشن کو فعال کریں۔
+ConfirmDisableWorkstation=کیا آپ واقعی ورک سٹیشن <b> %s </b> کو غیر فعال کرنا چاہتے ہیں؟
+DisableAWorkstation=ورک سٹیشن کو غیر فعال کریں۔
+DeleteWorkstation=حذف کریں۔
+NbOperatorsRequired=آپریٹرز کی تعداد درکار ہے۔
+THMOperatorEstimated=تخمینہ شدہ آپریٹر THM
+THMMachineEstimated=تخمینہ شدہ مشین THM
+WorkstationType=ورک سٹیشن کی قسم
+Human=انسان
+Machine=آلہ
+HumanMachine=انسان/مشین
+WorkstationArea=ورک سٹیشن کا علاقہ
+Machines=مشینیں
+THMEstimatedHelp=یہ شرح آئٹم کی پیشن گوئی کی قیمت کی وضاحت کرنا ممکن بناتی ہے۔
+BOM=سامان کا بل
+CollapseBOMHelp=آپ BOM ماڈیول کی ترتیب میں نام کی تفصیلات کے پہلے سے طے شدہ ڈسپلے کی وضاحت کر سکتے ہیں
+MOAndLines=مینوفیکچرنگ آرڈرز اور لائنز
diff --git a/htdocs/langs/ur_PK/multicurrency.lang b/htdocs/langs/ur_PK/multicurrency.lang
index 26313c6bfb9..797b70ac74a 100644
--- a/htdocs/langs/ur_PK/multicurrency.lang
+++ b/htdocs/langs/ur_PK/multicurrency.lang
@@ -1,38 +1,38 @@
 # Dolibarr language file - Source file is en_US - multicurrency
-MultiCurrency=Multi currency
-ErrorAddRateFail=Error in added rate
-ErrorAddCurrencyFail=Error in added currency
-ErrorDeleteCurrencyFail=Error delete fail
-multicurrency_syncronize_error=Synchronization error: %s
-MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Use the date of the document to find the currency rate, instead of using the latest known rate
-multicurrency_useOriginTx=When an object is created from another, keep the original rate from the source object (otherwise use the latest known rate)
-CurrencyLayerAccount=CurrencyLayer API
-CurrencyLayerAccount_help_to_synchronize=You must create an account on website %s to use this functionality.<br>Get your <b>API key</b>.<br>If you use a free account, you can't change the <b>source currency</b> (USD by default).<br>If your main currency is not USD, the application will automatically recalculate it.<br><br>You are limited to 1000 synchronizations per month.
-multicurrency_appId=API key
-multicurrency_appCurrencySource=Source currency
-multicurrency_alternateCurrencySource=Alternate source currency
-CurrenciesUsed=Currencies used
-CurrenciesUsed_help_to_add=Add the different currencies and rates you need to use on your <b>proposals</b>, <b>orders</b> etc.
-rate=rate
-MulticurrencyReceived=Received, original currency
-MulticurrencyRemainderToTake=Remaining amount, original currency
-MulticurrencyPaymentAmount=Payment amount, original currency
-AmountToOthercurrency=Amount To (in currency of receiving account)
-CurrencyRateSyncSucceed=Currency rate synchronization done successfuly
-MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Use the currency of the document for online payments
-TabTitleMulticurrencyRate=Rate list
-ListCurrencyRate=List of exchange rates for the currency
-CreateRate=Create a rate
-FormCreateRate=Rate creation
-FormUpdateRate=Rate modification
-successRateCreate=Rate for currency %s has been added to the database
-ConfirmDeleteLineRate=Are you sure you want to remove the %s rate for currency %s on %s date?
-DeleteLineRate=Clear rate
-successRateDelete=Rate deleted
-errorRateDelete=Error when deleting the rate
-successUpdateRate=Modification made
-ErrorUpdateRate=Error when changing the rate
-Codemulticurrency=currency code
-UpdateRate=change the rate
-CancelUpdate=cancel
-NoEmptyRate=The rate field must not be empty
+MultiCurrency=کثیر کرنسی
+ErrorAddRateFail=اضافی شرح میں خرابی۔
+ErrorAddCurrencyFail=شامل کرنسی میں خرابی۔
+ErrorDeleteCurrencyFail=خرابی حذف کرنے میں ناکام
+multicurrency_syncronize_error=مطابقت پذیری کی خرابی: %s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=کرنسی کی شرح معلوم کرنے کے لیے دستاویز کی تاریخ کا استعمال کریں، بجائے اس کے کہ تازہ ترین معلوم شرح استعمال کریں۔
+multicurrency_useOriginTx=جب کوئی چیز کسی دوسرے سے بنائی جائے تو اصل شرح کو ماخذ آبجیکٹ سے رکھیں (ورنہ تازہ ترین معلوم شرح کا استعمال کریں)
+CurrencyLayerAccount=کرنسی لیئر API
+CurrencyLayerAccount_help_to_synchronize=اس فعالیت کو استعمال کرنے کے لیے آپ کو ویب سائٹ %s پر ایک اکاؤنٹ بنانا ہوگا۔ <br> اپنی <b> API کلید </b> حاصل کریں۔ <br> اگر آپ مفت اکاؤنٹ استعمال کرتے ہیں، تو آپ <b> سورس کرنسی </b> (USD بذریعہ ڈیفالٹ) تبدیل نہیں کر سکتے۔ <br> اگر آپ کی اصل کرنسی USD نہیں ہے تو ایپلیکیشن خود بخود اس کا دوبارہ حساب کرے گی۔ <br> <br> آپ ہر ماہ 1000 مطابقت پذیری تک محدود ہیں۔
+multicurrency_appId=API کلید
+multicurrency_appCurrencySource=ماخذ کرنسی
+multicurrency_alternateCurrencySource=متبادل ذریعہ کرنسی
+CurrenciesUsed=استعمال شدہ کرنسیاں
+CurrenciesUsed_help_to_add=اپنی <b> تجاویز </b> , <b> آرڈرز </b> وغیرہ پر مختلف کرنسیوں اور نرخوں کو شامل کریں۔
+rate=شرح
+MulticurrencyReceived=موصول ہوئی، اصل کرنسی
+MulticurrencyRemainderToTake=باقی رقم، اصل کرنسی
+MulticurrencyPaymentAmount=ادائیگی کی رقم، اصل کرنسی
+AmountToOthercurrency=رقم (وصول کرنے والے اکاؤنٹ کی کرنسی میں)
+CurrencyRateSyncSucceed=کرنسی کی شرح کی مطابقت پذیری کامیابی سے ہو گئی۔
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=آن لائن ادائیگیوں کے لیے دستاویز کی کرنسی استعمال کریں۔
+TabTitleMulticurrencyRate=ریٹ لسٹ
+ListCurrencyRate=کرنسی کے لیے شرح مبادلہ کی فہرست
+CreateRate=شرح بنائیں
+FormCreateRate=تخلیق کی شرح کریں۔
+FormUpdateRate=شرح میں ترمیم
+successRateCreate=کرنسی %s کی شرح ڈیٹا بیس میں شامل کر دی گئی ہے۔
+ConfirmDeleteLineRate=کیا آپ واقعی %s تاریخ کو کرنسی %s کی شرح %s کو ہٹانا چاہتے ہیں؟
+DeleteLineRate=واضح شرح
+successRateDelete=شرح حذف کر دی گئی۔
+errorRateDelete=شرح کو حذف کرتے وقت خرابی۔
+successUpdateRate=ترمیم کی گئی۔
+ErrorUpdateRate=شرح تبدیل کرتے وقت خرابی۔
+Codemulticurrency=رقم کا کوڈ
+UpdateRate=شرح کو تبدیل کریں
+CancelUpdate=منسوخ
+NoEmptyRate=شرح کا میدان خالی نہیں ہونا چاہیے۔
diff --git a/htdocs/langs/ur_PK/oauth.lang b/htdocs/langs/ur_PK/oauth.lang
index 2afc3870f29..229279e4a47 100644
--- a/htdocs/langs/ur_PK/oauth.lang
+++ b/htdocs/langs/ur_PK/oauth.lang
@@ -1,32 +1,32 @@
 # Dolibarr language file - Source file is en_US - oauth
-ConfigOAuth=OAuth Configuration
-OAuthServices=OAuth Services
-ManualTokenGeneration=Manual token generation
-TokenManager=Token Manager
-IsTokenGenerated=Is token generated ?
-NoAccessToken=No access token saved into local database
-HasAccessToken=A token was generated and saved into local database
-NewTokenStored=Token received and saved
-ToCheckDeleteTokenOnProvider=Click here to check/delete authorization saved by %s OAuth provider
-TokenDeleted=Token deleted
-RequestAccess=Click here to request/renew access and receive a new token to save
-DeleteAccess=Click here to delete token
-UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credentials with your OAuth provider:
-ListOfSupportedOauthProviders=Enter the credentials provided by your OAuth2 provider. Only supported OAuth2 providers are listedd here. These services may be used by other modules that need OAuth2 authentication.
-OAuthSetupForLogin=Page to generate an OAuth token
-SeePreviousTab=See previous tab
-OAuthIDSecret=OAuth ID and Secret
-TOKEN_REFRESH=Token Refresh Present
-TOKEN_EXPIRED=Token expired
-TOKEN_EXPIRE_AT=Token expire at
-TOKEN_DELETE=Delete saved token
-OAUTH_GOOGLE_NAME=OAuth Google service
-OAUTH_GOOGLE_ID=OAuth Google Id
-OAUTH_GOOGLE_SECRET=OAuth Google Secret
-OAUTH_GOOGLE_DESC=Go to <a class="notasortlink" href="https://console.developers.google.com/" target="_blank" rel="noopener noreferrer external">this page</a> then "Credentials" to create OAuth credentials
-OAUTH_GITHUB_NAME=OAuth GitHub service
+ConfigOAuth=OAuth کنفیگریشن
+OAuthServices=OAuth سروسز
+ManualTokenGeneration=دستی ٹوکن جنریشن
+TokenManager=ٹوکن مینیجر
+IsTokenGenerated=کیا ٹوکن تیار ہوتا ہے؟
+NoAccessToken=مقامی ڈیٹا بیس میں رسائی کا کوئی ٹوکن محفوظ نہیں ہے۔
+HasAccessToken=ایک ٹوکن تیار کیا گیا اور مقامی ڈیٹا بیس میں محفوظ کیا گیا۔
+NewTokenStored=ٹوکن موصول ہوا اور محفوظ کیا گیا۔
+ToCheckDeleteTokenOnProvider=%s OAuth فراہم کنندہ کے ذریعہ محفوظ کردہ اجازت کو چیک کرنے / حذف کرنے کے لیے یہاں کلک کریں
+TokenDeleted=ٹوکن حذف ہو گیا۔
+RequestAccess=رسائی کی درخواست/ تجدید کے لیے یہاں کلک کریں اور محفوظ کرنے کے لیے ایک نیا ٹوکن وصول کریں۔
+DeleteAccess=ٹوکن کو حذف کرنے کے لیے یہاں کلک کریں۔
+UseTheFollowingUrlAsRedirectURI=اپنے OAuth فراہم کنندہ کے ساتھ اپنی اسناد بناتے وقت درج ذیل URL کو ری ڈائریکٹ URI کے بطور استعمال کریں:
+ListOfSupportedOauthProviders=اپنے OAuth2 فراہم کنندہ کے ذریعہ فراہم کردہ اسناد درج کریں۔ صرف تعاون یافتہ OAuth2 فراہم کنندگان یہاں درج ہیں۔ یہ خدمات دوسرے ماڈیولز کے ذریعہ استعمال کی جا سکتی ہیں جن کو OAuth2 کی توثیق کی ضرورت ہے۔
+OAuthSetupForLogin=OAuth ٹوکن بنانے کے لیے صفحہ
+SeePreviousTab=پچھلا ٹیب دیکھیں
+OAuthIDSecret=OAuth ID اور خفیہ
+TOKEN_REFRESH=ٹوکن ریفریش پیش کریں۔
+TOKEN_EXPIRED=ٹوکن کی میعاد ختم ہو گئی۔
+TOKEN_EXPIRE_AT=ٹوکن کی میعاد ختم ہونے پر
+TOKEN_DELETE=محفوظ کردہ ٹوکن کو حذف کریں۔
+OAUTH_GOOGLE_NAME=OAuth گوگل سروس
+OAUTH_GOOGLE_ID=OAuth گوگل آئی ڈی
+OAUTH_GOOGLE_SECRET=OAuth گوگل سیکریٹ
+OAUTH_GOOGLE_DESC=<a class="notasortlink" href="https://console.developers.google.com/" target="_blank" rel="noopener noreferrer external"> اس صفحہ </a> پر جائیں پھر OAuth اسناد بنانے کے لیے "Credentials" پر جائیں
+OAUTH_GITHUB_NAME=OAuth GitHub سروس
 OAUTH_GITHUB_ID=OAuth GitHub Id
-OAUTH_GITHUB_SECRET=OAuth GitHub Secret
-OAUTH_GITHUB_DESC=Go to <a class="notasortlink" href="https://github.com/settings/developers" target="_blank" rel="noopener noreferrer external">this page</a> then "Register a new application" to create OAuth credentials
-OAUTH_STRIPE_TEST_NAME=OAuth Stripe Test
-OAUTH_STRIPE_LIVE_NAME=OAuth Stripe Live
+OAUTH_GITHUB_SECRET=OAuth GitHub سیکریٹ
+OAUTH_GITHUB_DESC=<a class="notasortlink" href="https://github.com/settings/developers" target="_blank" rel="noopener noreferrer external"> اس صفحہ </a> پر جائیں پھر OAuth اسناد بنانے کے لیے "نئی درخواست رجسٹر کریں"
+OAUTH_STRIPE_TEST_NAME=OAuth اسٹرائپ ٹیسٹ
+OAUTH_STRIPE_LIVE_NAME=OAuth اسٹرائپ لائیو
diff --git a/htdocs/langs/ur_PK/opensurvey.lang b/htdocs/langs/ur_PK/opensurvey.lang
index 9fafacaf8bf..ab75ec29902 100644
--- a/htdocs/langs/ur_PK/opensurvey.lang
+++ b/htdocs/langs/ur_PK/opensurvey.lang
@@ -1,63 +1,63 @@
 # Dolibarr language file - Source file is en_US - opensurvey
-Survey=Poll
-Surveys=Polls
-OrganizeYourMeetingEasily=Organize your meetings and polls easily. First select the type of poll...
-NewSurvey=New poll
-OpenSurveyArea=Polls area
-AddACommentForPoll=You can add a comment into poll...
-AddComment=Add comment
-CreatePoll=Create poll
-PollTitle=Poll title
-ToReceiveEMailForEachVote=Receive an email for each vote
-TypeDate=Type date
-TypeClassic=Type standard
-OpenSurveyStep2=Select your dates among the free days (grey). The selected days are green. You can unselect a day previously selected by clicking again on it
-RemoveAllDays=Remove all days
-CopyHoursOfFirstDay=Copy hours of first day
-RemoveAllHours=Remove all hours
-SelectedDays=Selected days
-TheBestChoice=The best choice currently is
-TheBestChoices=The best choices currently are
-with=with
-OpenSurveyHowTo=If you agree to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line.
-CommentsOfVoters=Comments of voters
-ConfirmRemovalOfPoll=Are you sure you want to remove this poll (and all votes)
-RemovePoll=Remove poll
-UrlForSurvey=URL to communicate to get a direct access to poll
-PollOnChoice=You are creating a poll to make a multi-choice for a poll. First enter all possible choices for your poll:
-CreateSurveyDate=Create a date poll
-CreateSurveyStandard=Create a standard poll
-CheckBox=Simple checkbox
-YesNoList=List (empty/yes/no)
-PourContreList=List (empty/for/against)
-AddNewColumn=Add new column
-TitleChoice=Choice label
-ExportSpreadsheet=Export result spreadsheet
-ExpireDate=Limit date
-NbOfSurveys=Number of polls
-NbOfVoters=No. of voters
-SurveyResults=Results
-PollAdminDesc=You are allowed to change all vote lines of this poll with button "Edit". You can, as well, remove a column or a line with %s. You can also add a new column with %s.
-5MoreChoices=5 more choices
-Against=Against
-YouAreInivitedToVote=You are invited to vote for this poll
-VoteNameAlreadyExists=This name was already used for this poll
-AddADate=Add a date
-AddStartHour=Add start hour
-AddEndHour=Add end hour
-votes=vote(s)
-NoCommentYet=No comments have been posted for this poll yet
-CanComment=Voters can comment in the poll
-YourVoteIsPrivate=This poll is private, nobody can see your vote.
-YourVoteIsPublic=This poll is public, anybody with the link can see your vote.
-CanSeeOthersVote=Voters can see other people's vote
-SelectDayDesc=For each selected day, you can choose, or not, meeting hours in the following format:<br>- empty,<br>- "8h", "8H" or "8:00" to give a meeting's start hour,<br>- "8-11", "8h-11h", "8H-11H" or "8:00-11:00" to give a meeting's start and end hour,<br>- "8h15-11h15", "8H15-11H15" or "8:15-11:15" for the same thing but with minutes.
-BackToCurrentMonth=Back to current month
-ErrorOpenSurveyFillFirstSection=You haven't filled the first section of the poll creation
-ErrorOpenSurveyOneChoice=Enter at least one choice
-ErrorInsertingComment=There was an error while inserting your comment
-MoreChoices=Enter more choices for the voters
-SurveyExpiredInfo=The poll has been closed or voting delay has expired.
-EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
-ShowSurvey=Show survey
-UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
+Survey=رائے شماری
+Surveys=پولز
+OrganizeYourMeetingEasily=اپنی میٹنگز اور پولز کو آسانی سے منظم کریں۔ پہلے پول کی قسم منتخب کریں...
+NewSurvey=نیا سروے
+OpenSurveyArea=پولز ایریا
+AddACommentForPoll=آپ رائے شماری میں ایک تبصرہ شامل کر سکتے ہیں...
+AddComment=تبصرہ شامل کریں
+CreatePoll=پول بنائیں
+PollTitle=رائے شماری کا عنوان
+ToReceiveEMailForEachVote=ہر ووٹ کے لیے ایک ای میل موصول کریں۔
+TypeDate=تاریخ ٹائپ کریں۔
+TypeClassic=معیاری ٹائپ کریں۔
+OpenSurveyStep2=مفت دنوں میں سے اپنی تاریخیں منتخب کریں (گرے)۔ منتخب دن سبز ہیں۔ آپ اس پر دوبارہ کلک کرکے پہلے منتخب کردہ دن کو غیر منتخب کرسکتے ہیں۔
+RemoveAllDays=تمام دنوں کو ہٹا دیں۔
+CopyHoursOfFirstDay=پہلے دن کے اوقات کاپی کریں۔
+RemoveAllHours=تمام گھنٹے ہٹا دیں۔
+SelectedDays=منتخب دن
+TheBestChoice=فی الحال بہترین انتخاب ہے۔
+TheBestChoices=فی الحال بہترین انتخاب ہیں۔
+with=کے ساتھ
+OpenSurveyHowTo=اگر آپ اس رائے شماری میں ووٹ دینے سے اتفاق کرتے ہیں، تو آپ کو اپنا نام دینا ہوگا، ان اقدار کا انتخاب کرنا ہوگا جو آپ کے لیے موزوں ہوں اور لائن کے آخر میں پلس بٹن سے توثیق کریں۔
+CommentsOfVoters=ووٹرز کے تبصرے۔
+ConfirmRemovalOfPoll=کیا آپ واقعی اس پول کو ہٹانا چاہتے ہیں (اور تمام ووٹ)
+RemovePoll=رائے شماری کو ہٹا دیں۔
+UrlForSurvey=رائے شماری تک براہ راست رسائی حاصل کرنے کے لیے بات چیت کرنے کے لیے URL
+PollOnChoice=آپ رائے شماری کے لیے کثیر انتخاب کرنے کے لیے ایک پول بنا رہے ہیں۔ پہلے اپنے پول کے لیے تمام ممکنہ انتخاب درج کریں:
+CreateSurveyDate=ڈیٹ پول بنائیں
+CreateSurveyStandard=ایک معیاری پول بنائیں
+CheckBox=سادہ چیک باکس
+YesNoList=فہرست (خالی/ہاں/نہیں)
+PourContreList=فہرست (خالی/کے لیے/خلاف)
+AddNewColumn=نیا کالم شامل کریں۔
+TitleChoice=انتخاب کا لیبل
+ExportSpreadsheet=نتیجہ کی اسپریڈشیٹ برآمد کریں۔
+ExpireDate=حد کی تاریخ
+NbOfSurveys=پولز کی تعداد
+NbOfVoters=ووٹرز کی تعداد
+SurveyResults=نتائج
+PollAdminDesc=آپ کو "ترمیم" بٹن کے ساتھ اس پول کی تمام ووٹ لائنوں کو تبدیل کرنے کی اجازت ہے۔ آپ %s کے ساتھ کالم یا لائن کو بھی ہٹا سکتے ہیں۔ آپ %s کے ساتھ ایک نیا کالم بھی شامل کر سکتے ہیں۔
+5MoreChoices=5 مزید انتخاب
+Against=خلاف
+YouAreInivitedToVote=آپ کو اس رائے شماری کے لیے ووٹ دینے کی دعوت دی جاتی ہے۔
+VoteNameAlreadyExists=یہ نام اس رائے شماری کے لیے پہلے ہی استعمال ہو چکا تھا۔
+AddADate=ایک تاریخ شامل کریں۔
+AddStartHour=آغاز کا وقت شامل کریں۔
+AddEndHour=اختتامی گھنٹہ شامل کریں۔
+votes=ووٹ
+NoCommentYet=اس پول کے لیے ابھی تک کوئی تبصرہ پوسٹ نہیں کیا گیا ہے۔
+CanComment=رائے دہندگان رائے شماری میں رائے دے سکتے ہیں۔
+YourVoteIsPrivate=یہ پول نجی ہے، کوئی بھی آپ کا ووٹ نہیں دیکھ سکتا۔
+YourVoteIsPublic=یہ پول عوامی ہے، کوئی بھی جس کے پاس لنک ہے آپ کا ووٹ دیکھ سکتا ہے۔
+CanSeeOthersVote=ووٹر دوسرے لوگوں کا ووٹ دیکھ سکتے ہیں۔
+SelectDayDesc=ہر منتخب دن کے لیے، آپ مندرجہ ذیل فارمیٹ میں میٹنگ کے اوقات کا انتخاب کر سکتے ہیں، یا نہیں: <br> - خالی، <br> - "8h"، "8H" یا "8:00" میٹنگ کا وقت دینے کے لیے، <br> - "8- 11، "8h-11h"، "8H-11H" یا "8:00-11:00" میٹنگ کے آغاز اور اختتام کا وقت بتانے کے لیے، <br> - "8h15-11h15"، "8H15-11H15" یا "8: 15-11:15" اسی چیز کے لیے لیکن منٹوں کے ساتھ۔
+BackToCurrentMonth=موجودہ مہینے پر واپس جائیں۔
+ErrorOpenSurveyFillFirstSection=آپ نے پول تخلیق کا پہلا حصہ نہیں بھرا ہے۔
+ErrorOpenSurveyOneChoice=کم از کم ایک انتخاب درج کریں۔
+ErrorInsertingComment=آپ کا تبصرہ داخل کرتے وقت ایک خامی تھی۔
+MoreChoices=ووٹرز کے لیے مزید انتخاب درج کریں۔
+SurveyExpiredInfo=پول بند کر دیا گیا ہے یا ووٹنگ میں تاخیر کی میعاد ختم ہو گئی ہے۔
+EmailSomeoneVoted=%s نے ایک لائن بھر دی ہے۔\nآپ اپنا پول اس لنک پر دیکھ سکتے ہیں:\n%s
+ShowSurvey=سروے دکھائیں۔
+UserMustBeSameThanUserUsedToVote=آپ نے ووٹ دیا ہوگا اور ایک تبصرہ پوسٹ کرنے کے لیے وہی صارف نام استعمال کیا ہوگا جسے ووٹ دینے والے نے استعمال کیا تھا۔
diff --git a/htdocs/langs/ur_PK/orders.lang b/htdocs/langs/ur_PK/orders.lang
index 11220633d61..b67979e0f18 100644
--- a/htdocs/langs/ur_PK/orders.lang
+++ b/htdocs/langs/ur_PK/orders.lang
@@ -1,196 +1,196 @@
 # Dolibarr language file - Source file is en_US - orders
-OrdersArea=Customers orders area
-SuppliersOrdersArea=Purchase orders area
-OrderCard=Order card
-OrderId=Order Id
-Order=Order
-PdfOrderTitle=Order
-Orders=Orders
-OrderLine=Order line
-OrderDate=Order date
-OrderDateShort=Order date
-OrderToProcess=Order to process
-NewOrder=New order
-NewSupplierOrderShort=New order
-NewOrderSupplier=New Purchase Order
-ToOrder=Make order
-MakeOrder=Make order
-SupplierOrder=Purchase order
-SuppliersOrders=Purchase orders
-SaleOrderLines=Sales order lines
-PurchaseOrderLines=Puchase order lines
-SuppliersOrdersRunning=Current purchase orders
-CustomerOrder=Sales Order
-CustomersOrders=Sales Orders
-CustomersOrdersRunning=Current sales orders
-CustomersOrdersAndOrdersLines=Sales orders and order details
-OrdersDeliveredToBill=Sales orders delivered to bill
-OrdersToBill=Sales orders delivered
-OrdersInProcess=Sales orders in process
-OrdersToProcess=Sales orders to process
-SuppliersOrdersToProcess=Purchase orders to process
-SuppliersOrdersAwaitingReception=Purchase orders awaiting reception
-AwaitingReception=Awaiting reception
-StatusOrderCanceledShort=Canceled
-StatusOrderDraftShort=Draft
-StatusOrderValidatedShort=Validated
-StatusOrderSentShort=In process
-StatusOrderSent=Shipment in process
-StatusOrderOnProcessShort=Ordered
-StatusOrderProcessedShort=Processed
-StatusOrderDelivered=Delivered
-StatusOrderDeliveredShort=Delivered
-StatusOrderToBillShort=Delivered
-StatusOrderApprovedShort=Approved
-StatusOrderRefusedShort=Refused
-StatusOrderToProcessShort=To process
-StatusOrderReceivedPartiallyShort=Partially received
-StatusOrderReceivedAllShort=Products received
-StatusOrderCanceled=Canceled
-StatusOrderDraft=Draft (needs to be validated)
-StatusOrderValidated=Validated
-StatusOrderOnProcess=Ordered - Standby reception
-StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
-StatusOrderProcessed=Processed
-StatusOrderToBill=Delivered
-StatusOrderApproved=Approved
-StatusOrderRefused=Refused
-StatusOrderReceivedPartially=Partially received
-StatusOrderReceivedAll=All products received
-ShippingExist=A shipment exists
-QtyOrdered=Qty ordered
-ProductQtyInDraft=Product quantity into draft orders
-ProductQtyInDraftOrWaitingApproved=Product quantity into draft or approved orders, not yet ordered
-MenuOrdersToBill=Orders delivered
-MenuOrdersToBill2=Billable orders
-ShipProduct=Ship product
-CreateOrder=Create Order
-RefuseOrder=Refuse order
-ApproveOrder=Approve order
-Approve2Order=Approve order (second level)
-ValidateOrder=Validate order
-UnvalidateOrder=Unvalidate order
-DeleteOrder=Delete order
-CancelOrder=Cancel order
-OrderReopened= Order %s re-open
-AddOrder=Create order
-AddSupplierOrderShort=Create order
-AddPurchaseOrder=Create purchase order
-AddToDraftOrders=Add to draft order
-ShowOrder=Show order
-OrdersOpened=Orders to process
-NoDraftOrders=No draft orders
-NoOrder=No order
-NoSupplierOrder=No purchase order
-LastOrders=Latest %s sales orders
-LastCustomerOrders=Latest %s sales orders
-LastSupplierOrders=Latest %s purchase orders
-LastModifiedOrders=Latest %s modified orders
-AllOrders=All orders
-NbOfOrders=Number of orders
-OrdersStatistics=Order's statistics
-OrdersStatisticsSuppliers=Purchase order statistics
-NumberOfOrdersByMonth=Number of orders by month
-AmountOfOrdersByMonthHT=Amount of orders by month (excl. tax)
-ListOfOrders=List of orders
-CloseOrder=Close order
-ConfirmCloseOrder=Are you sure you want to set this order to delivered? Once an order is delivered, it can be set to billed.
-ConfirmDeleteOrder=Are you sure you want to delete this order?
-ConfirmValidateOrder=Are you sure you want to validate this order under name <b>%s</b>?
-ConfirmUnvalidateOrder=Are you sure you want to restore order <b>%s</b> to draft status?
-ConfirmCancelOrder=Are you sure you want to cancel this order?
-ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</b>?
-GenerateBill=Generate invoice
-ClassifyShipped=Classify delivered
-DraftOrders=Draft orders
-DraftSuppliersOrders=Draft purchase orders
-OnProcessOrders=In process orders
-RefOrder=Ref. order
-RefCustomerOrder=Ref. order for customer
-RefOrderSupplier=Ref. order for vendor
-RefOrderSupplierShort=Ref. order vendor
-SendOrderByMail=Send order by mail
-ActionsOnOrder=Events on order
-NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order
-OrderMode=Order method
-AuthorRequest=Request author
-UserWithApproveOrderGrant=Users granted with "approve orders" permission.
-PaymentOrderRef=Payment of order %s
-ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b>?
-DispatchSupplierOrder=Receiving purchase order %s
-FirstApprovalAlreadyDone=First approval already done
-SecondApprovalAlreadyDone=Second approval already done
-SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
-SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted
-SupplierOrderClassifiedBilled=Purchase Order %s set billed
-OtherOrders=Other orders
-SupplierOrderValidatedAndApproved=Supplier order is validated and approved : %s
-SupplierOrderValidated=Supplier order is validated : %s
+OrdersArea=صارفین کے آرڈر کے علاقے
+SuppliersOrdersArea=خریداری کے آرڈر کا علاقہ
+OrderCard=آرڈر کارڈ
+OrderId=آرڈر کی شناخت
+Order=ترتیب
+PdfOrderTitle=ترتیب
+Orders=احکامات
+OrderLine=آرڈر لائن
+OrderDate=آرڈر کی تاریخ
+OrderDateShort=آرڈر کی تاریخ
+OrderToProcess=عمل کرنے کا حکم
+NewOrder=نیا حکم
+NewSupplierOrderShort=نیا حکم
+NewOrderSupplier=نیا پرچیز آرڈر
+ToOrder=آرڈر کریں۔
+MakeOrder=آرڈر کریں۔
+SupplierOrder=خریداری کے آرڈر
+SuppliersOrders=خریداری کے احکامات
+SaleOrderLines=سیلز آرڈر لائنز
+PurchaseOrderLines=آرڈر لائنیں خریدیں۔
+SuppliersOrdersRunning=موجودہ خریداری کے آرڈر
+CustomerOrder=سیلز آرڈر
+CustomersOrders=سیلز آرڈرز
+CustomersOrdersRunning=موجودہ سیلز آرڈرز
+CustomersOrdersAndOrdersLines=سیلز آرڈرز اور آرڈر کی تفصیلات
+OrdersDeliveredToBill=سیلز آرڈر بل میں بھیجے گئے۔
+OrdersToBill=سیلز آرڈرز کی فراہمی
+OrdersInProcess=سیلز آرڈرز عمل میں ہیں۔
+OrdersToProcess=کارروائی کرنے کے لئے فروخت کے احکامات
+SuppliersOrdersToProcess=کارروائی کے لیے آرڈرز خریدیں۔
+SuppliersOrdersAwaitingReception=خریداری کے آرڈرز استقبال کے منتظر ہیں۔
+AwaitingReception=استقبال کے منتظر
+StatusOrderCanceledShort=منسوخ
+StatusOrderDraftShort=مسودہ
+StatusOrderValidatedShort=تصدیق شدہ
+StatusOrderSentShort=اس عمل میں
+StatusOrderSent=کھیپ عمل میں ہے۔
+StatusOrderOnProcessShort=حکم دیا
+StatusOrderProcessedShort=پروسیس شدہ
+StatusOrderDelivered=پہنچایا
+StatusOrderDeliveredShort=پہنچایا
+StatusOrderToBillShort=پہنچایا
+StatusOrderApprovedShort=منظورشدہ
+StatusOrderRefusedShort=انکار کر دیا
+StatusOrderToProcessShort=عمل کے لئے
+StatusOrderReceivedPartiallyShort=جزوی طور پر موصول ہوا۔
+StatusOrderReceivedAllShort=مصنوعات موصول ہوئیں
+StatusOrderCanceled=منسوخ
+StatusOrderDraft=مسودہ (توثیق کرنے کی ضرورت ہے)
+StatusOrderValidated=تصدیق شدہ
+StatusOrderOnProcess=آرڈر کیا گیا - اسٹینڈ بائی استقبالیہ
+StatusOrderOnProcessWithValidation=آرڈر کیا گیا - اسٹینڈ بائی استقبالیہ یا توثیق
+StatusOrderProcessed=پروسیس شدہ
+StatusOrderToBill=پہنچایا
+StatusOrderApproved=منظورشدہ
+StatusOrderRefused=انکار کر دیا
+StatusOrderReceivedPartially=جزوی طور پر موصول ہوا۔
+StatusOrderReceivedAll=تمام مصنوعات موصول ہوئیں
+ShippingExist=ایک کھیپ موجود ہے۔
+QtyOrdered=مقدار کا حکم دیا۔
+ProductQtyInDraft=ڈرافٹ آرڈرز میں پروڈکٹ کی مقدار
+ProductQtyInDraftOrWaitingApproved=پروڈکٹ کی مقدار مسودہ یا منظور شدہ آرڈرز میں، ابھی تک آرڈر نہیں کیا گیا ہے۔
+MenuOrdersToBill=آرڈرز کی فراہمی
+MenuOrdersToBill2=قابل بل آرڈرز
+ShipProduct=جہاز کی مصنوعات
+CreateOrder=آرڈر بنائیں
+RefuseOrder=حکم سے انکار
+ApproveOrder=آرڈر منظور کریں۔
+Approve2Order=آرڈر منظور کریں (دوسری سطح)
+ValidateOrder=آرڈر کی توثیق کریں۔
+UnvalidateOrder=آرڈر کو غیر درست کریں۔
+DeleteOrder=آرڈر کو حذف کریں۔
+CancelOrder=آرڈر منسوخ کر دیں
+OrderReopened= آرڈر %s دوبارہ کھولیں۔
+AddOrder=آرڈر بنائیں
+AddSupplierOrderShort=آرڈر بنائیں
+AddPurchaseOrder=خریداری کا آرڈر بنائیں
+AddToDraftOrders=ڈرافٹ آرڈر میں شامل کریں۔
+ShowOrder=آرڈر دکھائیں۔
+OrdersOpened=کارروائی کرنے کے احکامات
+NoDraftOrders=کوئی ڈرافٹ آرڈر نہیں۔
+NoOrder=کوئی حکم نہیں۔
+NoSupplierOrder=کوئی پرچیز آرڈر نہیں۔
+LastOrders=تازہ ترین %s سیلز آرڈرز
+LastCustomerOrders=تازہ ترین %s سیلز آرڈرز
+LastSupplierOrders=تازہ ترین %s خریداری کے آرڈر
+LastModifiedOrders=تازہ ترین %s ترمیم شدہ آرڈرز
+AllOrders=تمام احکامات
+NbOfOrders=آرڈرز کی تعداد
+OrdersStatistics=آرڈر کے اعدادوشمار
+OrdersStatisticsSuppliers=خریداری کے آرڈر کے اعدادوشمار
+NumberOfOrdersByMonth=مہینے کے حساب سے آرڈرز کی تعداد
+AmountOfOrdersByMonthHT=ماہ کے لحاظ سے آرڈرز کی مقدار (ٹیکس کے علاوہ)
+ListOfOrders=احکامات کی فہرست
+CloseOrder=آرڈر بند کریں۔
+ConfirmCloseOrder=کیا آپ واقعی اس آرڈر کو ڈیلیوری پر سیٹ کرنا چاہتے ہیں؟ ایک بار آرڈر ڈیلیور ہونے کے بعد، اسے بل پر سیٹ کیا جا سکتا ہے۔
+ConfirmDeleteOrder=کیا آپ واقعی اس آرڈر کو حذف کرنا چاہتے ہیں؟
+ConfirmValidateOrder=کیا آپ واقعی <b> %s </b> کے نام سے اس آرڈر کی توثیق کرنا چاہتے ہیں؟
+ConfirmUnvalidateOrder=کیا آپ واقعی آرڈر <b> %s </b> کو ڈرافٹ اسٹیٹس میں بحال کرنا چاہتے ہیں؟
+ConfirmCancelOrder=کیا آپ واقعی اس آرڈر کو منسوخ کرنا چاہتے ہیں؟
+ConfirmMakeOrder=کیا آپ واقعی اس بات کی تصدیق کرنا چاہتے ہیں کہ آپ نے یہ آرڈر <b> %s </b> پر کیا ہے؟
+GenerateBill=رسید تیار کریں۔
+ClassifyShipped=درجہ بندی کی فراہمی
+DraftOrders=ڈرافٹ آرڈرز
+DraftSuppliersOrders=خریداری کے آرڈر کا مسودہ
+OnProcessOrders=عمل کے احکامات میں
+RefOrder=حوالہ ترتیب
+RefCustomerOrder=حوالہ گاہک کے لئے آرڈر
+RefOrderSupplier=حوالہ فروش کے لئے آرڈر
+RefOrderSupplierShort=حوالہ آرڈر فروش
+SendOrderByMail=بذریعہ ڈاک آرڈر بھیجیں۔
+ActionsOnOrder=آرڈر پر واقعات
+NoArticleOfTypeProduct='پروڈکٹ' کی قسم کا کوئی مضمون نہیں ہے لہذا اس آرڈر کے لیے بھیجنے کے قابل مضمون نہیں۔
+OrderMode=آرڈر کا طریقہ
+AuthorRequest=مصنف کی درخواست کریں۔
+UserWithApproveOrderGrant=صارفین کو "منظوری آرڈرز" کی اجازت دی گئی۔
+PaymentOrderRef=آرڈر کی ادائیگی %s
+ConfirmCloneOrder=کیا آپ واقعی اس آرڈر کو کلون کرنا چاہتے ہیں <b> %s </b>؟
+DispatchSupplierOrder=خریداری کا آرڈر %s وصول کرنا
+FirstApprovalAlreadyDone=پہلی منظوری ہو چکی ہے۔
+SecondApprovalAlreadyDone=دوسری منظوری پہلے ہی ہو چکی ہے۔
+SupplierOrderReceivedInDolibarr=خریداری کا آرڈر %s موصول ہوا %s
+SupplierOrderSubmitedInDolibarr=خریداری کا آرڈر %s جمع کرایا گیا۔
+SupplierOrderClassifiedBilled=پرچیز آرڈر %s سیٹ بل کر دیا گیا۔
+OtherOrders=دوسرے احکامات
+SupplierOrderValidatedAndApproved=سپلائر آرڈر کی توثیق اور منظوری دی گئی ہے: %s
+SupplierOrderValidated=سپلائر آرڈر کی توثیق کی گئی ہے: %s
 ##### Types de contacts #####
-TypeContact_commande_internal_SALESREPFOLL=Representative following-up sales order
-TypeContact_commande_internal_SHIPPING=Representative following-up shipping
-TypeContact_commande_external_BILLING=Customer invoice contact
-TypeContact_commande_external_SHIPPING=Customer shipping contact
-TypeContact_commande_external_CUSTOMER=Customer contact following-up order
-TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
-TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping
-TypeContact_order_supplier_external_BILLING=Vendor invoice contact
-TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
-TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
-Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined
-Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined
-Error_OrderNotChecked=No orders to invoice selected
+TypeContact_commande_internal_SALESREPFOLL=نمائندہ مندرجہ ذیل سیلز آرڈر
+TypeContact_commande_internal_SHIPPING=نمائندہ فالو اپ شپنگ
+TypeContact_commande_external_BILLING=کسٹمر انوائس رابطہ
+TypeContact_commande_external_SHIPPING=کسٹمر شپنگ رابطہ
+TypeContact_commande_external_CUSTOMER=کسٹمر رابطہ فالو اپ آرڈر
+TypeContact_order_supplier_internal_SALESREPFOLL=نمائندہ پیروی اپ خریداری آرڈر
+TypeContact_order_supplier_internal_SHIPPING=نمائندہ فالو اپ شپنگ
+TypeContact_order_supplier_external_BILLING=وینڈر انوائس رابطہ
+TypeContact_order_supplier_external_SHIPPING=وینڈر شپنگ رابطہ
+TypeContact_order_supplier_external_CUSTOMER=فروش سے رابطہ کریں فالو اپ آرڈر
+Error_COMMANDE_SUPPLIER_ADDON_NotDefined=مستقل COMMANDE_SUPPLIER_ADDON کی وضاحت نہیں کی گئی ہے۔
+Error_COMMANDE_ADDON_NotDefined=مستقل COMMANDE_ADDON کی وضاحت نہیں کی گئی ہے۔
+Error_OrderNotChecked=انوائس کے لیے کوئی آرڈر نہیں منتخب کیا گیا۔
 # Order modes (how we receive order). Not the "why" are keys stored into dict.lang
-OrderByMail=Mail
-OrderByFax=Fax
-OrderByEMail=Email
-OrderByWWW=Online
-OrderByPhone=Phone
+OrderByMail=میل
+OrderByFax=فیکس
+OrderByEMail=ای میل
+OrderByWWW=آن لائن
+OrderByPhone=فون
 # Documents models
-PDFEinsteinDescription=A complete order model (old implementation of Eratosthene template)
-PDFEratostheneDescription=A complete order model
-PDFEdisonDescription=A simple order model
-PDFProformaDescription=A complete Proforma invoice template
-CreateInvoiceForThisCustomer=Bill orders
-CreateInvoiceForThisSupplier=Bill orders
-CreateInvoiceForThisReceptions=Bill receptions
-NoOrdersToInvoice=No orders billable
-CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
-OrderCreation=Order creation
-Ordered=Ordered
-OrderCreated=Your orders have been created
-OrderFail=An error happened during your orders creation
-CreateOrders=Create orders
-ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
-OptionToSetOrderBilledNotEnabled=Option from module Workflow, to set order to 'Billed' automatically when invoice is validated, is not enabled, so you will have to set the status of orders to 'Billed' manually after the invoice has been generated.
-IfValidateInvoiceIsNoOrderStayUnbilled=If invoice validation is 'No', the order will remain to status 'Unbilled' until the invoice is validated.
-CloseReceivedSupplierOrdersAutomatically=Close order to status "%s" automatically if all products are received.
-SetShippingMode=Set shipping mode
-WithReceptionFinished=With reception finished
+PDFEinsteinDescription=ایک مکمل آرڈر ماڈل (Eratosthene ٹیمپلیٹ کا پرانا نفاذ)
+PDFEratostheneDescription=ایک مکمل آرڈر ماڈل
+PDFEdisonDescription=ایک سادہ آرڈر ماڈل
+PDFProformaDescription=ایک مکمل پروفارما انوائس ٹیمپلیٹ
+CreateInvoiceForThisCustomer=بل کے احکامات
+CreateInvoiceForThisSupplier=بل کے احکامات
+CreateInvoiceForThisReceptions=بل ریسپشنز
+NoOrdersToInvoice=کوئی آرڈر قابل بل نہیں ہے۔
+CloseProcessedOrdersAutomatically=تمام منتخب کردہ آرڈرز کو "پروسیسڈ" کی درجہ بندی کریں۔
+OrderCreation=ترتیب تخلیق
+Ordered=حکم دیا
+OrderCreated=آپ کے آرڈرز بن چکے ہیں۔
+OrderFail=آپ کے آرڈرز بنانے کے دوران ایک خرابی پیش آگئی
+CreateOrders=آرڈرز بنائیں
+ToBillSeveralOrderSelectCustomer=کئی آرڈرز کے لیے انوائس بنانے کے لیے، پہلے کسٹمر پر کلک کریں، پھر "%s" کو منتخب کریں۔
+OptionToSetOrderBilledNotEnabled=ماڈیول ورک فلو سے آپشن، انوائس کی توثیق ہونے پر آرڈر کو خود بخود 'بلڈ' پر سیٹ کرنے کے لیے، فعال نہیں ہے، لہذا آپ کو انوائس تیار ہونے کے بعد دستی طور پر آرڈرز کی حیثیت 'بلڈ' پر سیٹ کرنی ہوگی۔
+IfValidateInvoiceIsNoOrderStayUnbilled=اگر انوائس کی توثیق 'نہیں' ہے، تو انوائس کی توثیق ہونے تک آرڈر 'بغیر بل' کا درجہ برقرار رہے گا۔
+CloseReceivedSupplierOrdersAutomatically=تمام پروڈکٹس موصول ہونے کی صورت میں خود بخود "%s" کی حیثیت کا آرڈر بند کریں۔
+SetShippingMode=شپنگ موڈ سیٹ کریں۔
+WithReceptionFinished=استقبالیہ ختم ہونے کے ساتھ
 #### supplier orders status
-StatusSupplierOrderCanceledShort=Canceled
-StatusSupplierOrderDraftShort=Draft
-StatusSupplierOrderValidatedShort=Validated
-StatusSupplierOrderSentShort=In process
-StatusSupplierOrderSent=Shipment in process
-StatusSupplierOrderOnProcessShort=Ordered
-StatusSupplierOrderProcessedShort=Processed
-StatusSupplierOrderDelivered=Delivered
-StatusSupplierOrderDeliveredShort=Delivered
-StatusSupplierOrderToBillShort=Delivered
-StatusSupplierOrderApprovedShort=Approved
-StatusSupplierOrderRefusedShort=Refused
-StatusSupplierOrderToProcessShort=To process
-StatusSupplierOrderReceivedPartiallyShort=Partially received
-StatusSupplierOrderReceivedAllShort=Products received
-StatusSupplierOrderCanceled=Canceled
-StatusSupplierOrderDraft=Draft (needs to be validated)
-StatusSupplierOrderValidated=Validated
-StatusSupplierOrderOnProcess=Ordered - Standby reception
-StatusSupplierOrderOnProcessWithValidation=Ordered - Standby reception or validation
-StatusSupplierOrderProcessed=Processed
-StatusSupplierOrderToBill=Delivered
-StatusSupplierOrderApproved=Approved
-StatusSupplierOrderRefused=Refused
-StatusSupplierOrderReceivedPartially=Partially received
-StatusSupplierOrderReceivedAll=All products received
+StatusSupplierOrderCanceledShort=منسوخ
+StatusSupplierOrderDraftShort=مسودہ
+StatusSupplierOrderValidatedShort=تصدیق شدہ
+StatusSupplierOrderSentShort=اس عمل میں
+StatusSupplierOrderSent=کھیپ عمل میں ہے۔
+StatusSupplierOrderOnProcessShort=حکم دیا
+StatusSupplierOrderProcessedShort=پروسیس شدہ
+StatusSupplierOrderDelivered=پہنچایا
+StatusSupplierOrderDeliveredShort=پہنچایا
+StatusSupplierOrderToBillShort=پہنچایا
+StatusSupplierOrderApprovedShort=منظورشدہ
+StatusSupplierOrderRefusedShort=انکار کر دیا
+StatusSupplierOrderToProcessShort=عمل کے لئے
+StatusSupplierOrderReceivedPartiallyShort=جزوی طور پر موصول ہوا۔
+StatusSupplierOrderReceivedAllShort=مصنوعات موصول ہوئیں
+StatusSupplierOrderCanceled=منسوخ
+StatusSupplierOrderDraft=مسودہ (توثیق کرنے کی ضرورت ہے)
+StatusSupplierOrderValidated=تصدیق شدہ
+StatusSupplierOrderOnProcess=آرڈر کیا گیا - اسٹینڈ بائی استقبالیہ
+StatusSupplierOrderOnProcessWithValidation=آرڈر کیا گیا - اسٹینڈ بائی استقبالیہ یا توثیق
+StatusSupplierOrderProcessed=پروسیس شدہ
+StatusSupplierOrderToBill=پہنچایا
+StatusSupplierOrderApproved=منظورشدہ
+StatusSupplierOrderRefused=انکار کر دیا
+StatusSupplierOrderReceivedPartially=جزوی طور پر موصول ہوا۔
+StatusSupplierOrderReceivedAll=تمام مصنوعات موصول ہوئیں
diff --git a/htdocs/langs/ur_PK/other.lang b/htdocs/langs/ur_PK/other.lang
index 9bc68dc3678..f72d7d97c85 100644
--- a/htdocs/langs/ur_PK/other.lang
+++ b/htdocs/langs/ur_PK/other.lang
@@ -1,300 +1,304 @@
 # Dolibarr language file - Source file is en_US - other
-SecurityCode=Security code
+SecurityCode=سیکیورٹی کوڈ
 NumberingShort=N°
-Tools=Tools
-TMenuTools=Tools
-ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
-Birthday=Birthday
-BirthdayAlertOn=birthday alert active
-BirthdayAlertOff=birthday alert inactive
-TransKey=Translation of the key TransKey
-MonthOfInvoice=Month (number 1-12) of invoice date
-TextMonthOfInvoice=Month (text) of invoice date
-PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
-TextPreviousMonthOfInvoice=Previous month (text) of invoice date
-NextMonthOfInvoice=Following month (number 1-12) of invoice date
-TextNextMonthOfInvoice=Following month (text) of invoice date
-PreviousMonth=Previous month
-CurrentMonth=Current month
-ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
-DocFileGeneratedInto=Doc file generated into <b>%s</b>.
-JumpToLogin=Disconnected. Go to login page...
-MessageForm=Message on online payment form
-MessageOK=Message on the return page for a validated payment
-MessageKO=Message on the return page for a canceled payment
-ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
-DeleteAlsoContentRecursively=Check to delete all content recursively
-PoweredBy=Powered by
-YearOfInvoice=Year of invoice date
-PreviousYearOfInvoice=Previous year of invoice date
-NextYearOfInvoice=Following year of invoice date
-DateNextInvoiceBeforeGen=Date of next invoice (before generation)
-DateNextInvoiceAfterGen=Date of next invoice (after generation)
-GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mode. The mode 'Lines' was automatically selected instead.
-OnlyOneFieldForXAxisIsPossible=Only 1 field is currently possible as X-Axis. Only the first selected field has been selected.
-AtLeastOneMeasureIsRequired=At least 1 field for measure is required
-AtLeastOneXAxisIsRequired=At least 1 field for X-Axis is required
-LatestBlogPosts=Latest Blog Posts
-notiftouser=To users
-notiftofixedemail=To fixed mail
-notiftouserandtofixedemail=To user and fixed mail
-Notify_ORDER_VALIDATE=Sales order validated
-Notify_ORDER_SENTBYMAIL=Sales order sent by mail
-Notify_ORDER_SUPPLIER_SENTBYMAIL=Purchase order sent by email
-Notify_ORDER_SUPPLIER_VALIDATE=Purchase order recorded
-Notify_ORDER_SUPPLIER_APPROVE=Purchase order approved
-Notify_ORDER_SUPPLIER_REFUSE=Purchase order refused
-Notify_PROPAL_VALIDATE=Customer proposal validated
-Notify_PROPAL_CLOSE_SIGNED=Customer proposal closed signed
-Notify_PROPAL_CLOSE_REFUSED=Customer proposal closed refused
-Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail
-Notify_WITHDRAW_TRANSMIT=Transmission withdrawal
-Notify_WITHDRAW_CREDIT=Credit withdrawal
-Notify_WITHDRAW_EMIT=Perform withdrawal
-Notify_COMPANY_CREATE=Third party created
-Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
-Notify_BILL_VALIDATE=Customer invoice validated
-Notify_BILL_UNVALIDATE=Customer invoice unvalidated
-Notify_BILL_PAYED=Customer invoice paid
-Notify_BILL_CANCEL=Customer invoice canceled
-Notify_BILL_SENTBYMAIL=Customer invoice sent by mail
-Notify_BILL_SUPPLIER_VALIDATE=Vendor invoice validated
-Notify_BILL_SUPPLIER_PAYED=Vendor invoice paid
-Notify_BILL_SUPPLIER_SENTBYMAIL=Vendor invoice sent by mail
-Notify_BILL_SUPPLIER_CANCELED=Vendor invoice cancelled
-Notify_CONTRACT_VALIDATE=Contract validated
-Notify_FICHINTER_VALIDATE=Intervention validated
-Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
-Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
-Notify_SHIPPING_VALIDATE=Shipping validated
-Notify_SHIPPING_SENTBYMAIL=Shipping sent by mail
-Notify_MEMBER_VALIDATE=Member validated
-Notify_MEMBER_MODIFY=Member modified
-Notify_MEMBER_SUBSCRIPTION=Member subscribed
-Notify_MEMBER_RESILIATE=Member terminated
-Notify_MEMBER_DELETE=Member deleted
-Notify_PROJECT_CREATE=Project creation
-Notify_TASK_CREATE=Task created
-Notify_TASK_MODIFY=Task modified
-Notify_TASK_DELETE=Task deleted
-Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
-Notify_EXPENSE_REPORT_APPROVE=Expense report approved
-Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
-Notify_HOLIDAY_APPROVE=Leave request approved
-Notify_ACTION_CREATE=Added action to Agenda
-SeeModuleSetup=See setup of module %s
-NbOfAttachedFiles=Number of attached files/documents
-TotalSizeOfAttachedFiles=Total size of attached files/documents
-MaxSize=Maximum size
-AttachANewFile=Attach a new file/document
-LinkedObject=Linked object
-NbOfActiveNotifications=Number of notifications (no. of recipient emails)
-PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe lines are separated by a carriage return.\n\n__USER_SIGNATURE__
-PredefinedMailTestHtml=__(Hello)__<br>This is a <b>test</b> mail sent to __EMAIL__ (the word test must be in bold).<br>The lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached \n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to remind you that the invoice  __REF__ seems to have not been paid. A copy of the invoice is attached as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find commercial proposal __REF__ attached \n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nPlease find price request __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendOrder=__(Hello)__\n\nPlease find order __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
-PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
-ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
-ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
-DemoFundation=Manage members of a foundation
-DemoFundation2=Manage members and bank account of a foundation
-DemoCompanyServiceOnly=Company or freelance selling service only
-DemoCompanyShopWithCashDesk=Manage a shop with a cash desk
-DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
-DemoCompanyManufacturing=Company manufacturing products
-DemoCompanyAll=Company with multiple activities (all main modules)
-CreatedBy=Created by %s
-ModifiedBy=Modified by %s
-ValidatedBy=Validated by %s
-SignedBy=Signed by %s
-ClosedBy=Closed by %s
-CreatedById=User id who created
-ModifiedById=User id who made latest change
-ValidatedById=User id who validated
-CanceledById=User id who canceled
-ClosedById=User id who closed
-CreatedByLogin=User login who created
-ModifiedByLogin=User login who made latest change
-ValidatedByLogin=User login who validated
-CanceledByLogin=User login who canceled
-ClosedByLogin=User login who closed
-FileWasRemoved=File %s was removed
-DirWasRemoved=Directory %s was removed
-FeatureNotYetAvailable=Feature not yet available in the current version
-FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
-FeaturesSupported=Supported features
-Width=Width
-Height=Height
-Depth=Depth
-Top=Top
-Bottom=Bottom
-Left=Left
-Right=Right
-CalculatedWeight=Calculated weight
-CalculatedVolume=Calculated volume
-Weight=Weight
-WeightUnitton=ton
-WeightUnitkg=kg
-WeightUnitg=g
-WeightUnitmg=mg
-WeightUnitpound=pound
-WeightUnitounce=ounce
-Length=Length
+Tools=اوزار
+TMenuTools=اوزار
+ToolsDesc=دیگر مینو اندراجات میں شامل نہیں تمام ٹولز کو یہاں گروپ کیا گیا ہے۔ <br> تمام ٹولز تک بائیں مینو سے رسائی حاصل کی جا سکتی ہے۔
+Birthday=سالگرہ
+BirthdayAlertOn=سالگرہ کا الرٹ فعال
+BirthdayAlertOff=سالگرہ کا الرٹ غیر فعال
+TransKey=کلیدی TransKey کا ترجمہ
+MonthOfInvoice=انوائس کی تاریخ کا مہینہ (نمبر 1-12)
+TextMonthOfInvoice=انوائس کی تاریخ کا مہینہ (متن)
+PreviousMonthOfInvoice=انوائس کی تاریخ کا پچھلا مہینہ (نمبر 1-12)
+TextPreviousMonthOfInvoice=انوائس کی تاریخ کا پچھلا مہینہ (متن)
+NextMonthOfInvoice=انوائس کی تاریخ کے بعد کا مہینہ (نمبر 1-12)
+TextNextMonthOfInvoice=انوائس کی تاریخ کے بعد کا مہینہ (متن)
+PreviousMonth=پچھلے مہینے
+CurrentMonth=موجودہ مہینہ
+ZipFileGeneratedInto=زپ فائل <b> %s </b> میں تیار کی گئی۔
+DocFileGeneratedInto=دستاویز فائل <b> %s </b> میں تیار کی گئی۔
+JumpToLogin=منقطع لاگ ان پیج پر جائیں...
+MessageForm=آن لائن ادائیگی کے فارم پر پیغام
+MessageOK=تصدیق شدہ ادائیگی کے لیے واپسی کے صفحے پر پیغام بھیجیں۔
+MessageKO=منسوخ شدہ ادائیگی کے لیے واپسی کے صفحے پر پیغام بھیجیں۔
+ContentOfDirectoryIsNotEmpty=اس ڈائریکٹری کا مواد خالی نہیں ہے۔
+DeleteAlsoContentRecursively=تمام مواد کو بار بار حذف کرنے کے لیے چیک کریں۔
+PoweredBy=کی طرف سے طاقت
+YearOfInvoice=رسید کی تاریخ کا سال
+PreviousYearOfInvoice=انوائس کی تاریخ کے پچھلے سال
+NextYearOfInvoice=انوائس کی تاریخ کے بعد کا سال
+DateNextInvoiceBeforeGen=اگلی انوائس کی تاریخ (جنریشن سے پہلے)
+DateNextInvoiceAfterGen=اگلی رسید کی تاریخ (جنریشن کے بعد)
+GraphInBarsAreLimitedToNMeasures=گرافکس 'بارز' موڈ میں %s اقدامات تک محدود ہیں۔ اس کی بجائے موڈ 'لائنز' خود بخود منتخب ہو گیا تھا۔
+OnlyOneFieldForXAxisIsPossible=X-Axis کے طور پر فی الحال صرف 1 فیلڈ ممکن ہے۔ صرف پہلا منتخب فیلڈ منتخب کیا گیا ہے۔
+AtLeastOneMeasureIsRequired=پیمائش کے لیے کم از کم 1 فیلڈ درکار ہے۔
+AtLeastOneXAxisIsRequired=X-Axis کے لیے کم از کم 1 فیلڈ درکار ہے۔
+LatestBlogPosts=تازہ ترین بلاگ پوسٹس
+notiftouser=صارفین کو
+notiftofixedemail=فکسڈ میل کے لیے
+notiftouserandtofixedemail=صارف اور فکسڈ میل کو
+Notify_ORDER_VALIDATE=سیلز آرڈر کی توثیق کر دی گئی۔
+Notify_ORDER_SENTBYMAIL=سیلز آرڈر بذریعہ ڈاک بھیجا گیا۔
+Notify_ORDER_SUPPLIER_SENTBYMAIL=خریداری کا آرڈر بذریعہ ای میل بھیجا گیا۔
+Notify_ORDER_SUPPLIER_VALIDATE=خریداری کا آرڈر ریکارڈ کیا گیا۔
+Notify_ORDER_SUPPLIER_APPROVE=خریداری کے آرڈر کی منظوری دے دی گئی۔
+Notify_ORDER_SUPPLIER_REFUSE=خریداری کے آرڈر سے انکار کر دیا گیا۔
+Notify_PROPAL_VALIDATE=گاہک کی تجویز کی توثیق کی گئی۔
+Notify_PROPAL_CLOSE_SIGNED=گاہک کی تجویز پر دستخط شدہ بند
+Notify_PROPAL_CLOSE_REFUSED=گاہک کی تجویز بند کر دی گئی۔
+Notify_PROPAL_SENTBYMAIL=تجارتی تجویز بذریعہ ڈاک بھیجی گئی۔
+Notify_WITHDRAW_TRANSMIT=ٹرانسمیشن واپسی
+Notify_WITHDRAW_CREDIT=کریڈٹ نکالنا
+Notify_WITHDRAW_EMIT=واپسی انجام دیں۔
+Notify_COMPANY_CREATE=تیسری پارٹی بنائی گئی۔
+Notify_COMPANY_SENTBYMAIL=تھرڈ پارٹی کارڈ سے بھیجے گئے میل
+Notify_BILL_VALIDATE=کسٹمر انوائس کی توثیق ہو گئی۔
+Notify_BILL_UNVALIDATE=کسٹمر انوائس کی توثیق نہیں کی گئی۔
+Notify_BILL_PAYED=کسٹمر انوائس ادا کر دی گئی۔
+Notify_BILL_CANCEL=کسٹمر کی رسید منسوخ کر دی گئی۔
+Notify_BILL_SENTBYMAIL=گاہک کی رسید بذریعہ ڈاک بھیجی گئی۔
+Notify_BILL_SUPPLIER_VALIDATE=وینڈر انوائس کی توثیق ہو گئی۔
+Notify_BILL_SUPPLIER_PAYED=وینڈر انوائس ادا کر دی گئی۔
+Notify_BILL_SUPPLIER_SENTBYMAIL=وینڈر انوائس بذریعہ ڈاک بھیجی گئی۔
+Notify_BILL_SUPPLIER_CANCELED=وینڈر کی رسید منسوخ کر دی گئی۔
+Notify_CONTRACT_VALIDATE=معاہدہ کی توثیق ہو گئی۔
+Notify_FICHINTER_VALIDATE=مداخلت کی توثیق کی گئی۔
+Notify_FICHINTER_ADD_CONTACT=مداخلت میں رابطہ شامل کیا گیا۔
+Notify_FICHINTER_SENTBYMAIL=مداخلت بذریعہ ڈاک بھیجی گئی۔
+Notify_SHIPPING_VALIDATE=شپنگ کی توثیق کر دی گئی۔
+Notify_SHIPPING_SENTBYMAIL=شپنگ بذریعہ ڈاک بھیجی گئی۔
+Notify_MEMBER_VALIDATE=ممبر نے تصدیق کر دی۔
+Notify_MEMBER_MODIFY=ممبر میں ترمیم کی گئی۔
+Notify_MEMBER_SUBSCRIPTION=ممبر نے سبسکرائب کیا۔
+Notify_MEMBER_RESILIATE=رکن ختم کر دیا گیا۔
+Notify_MEMBER_DELETE=رکن کو حذف کر دیا گیا۔
+Notify_PROJECT_CREATE=پروجیکٹ کی تخلیق
+Notify_TASK_CREATE=ٹاسک بنایا گیا۔
+Notify_TASK_MODIFY=کام میں ترمیم کی گئی۔
+Notify_TASK_DELETE=ٹاسک حذف کر دیا گیا۔
+Notify_EXPENSE_REPORT_VALIDATE=اخراجات کی رپورٹ کی توثیق (منظوری درکار)
+Notify_EXPENSE_REPORT_APPROVE=اخراجات کی رپورٹ منظور کر لی گئی۔
+Notify_HOLIDAY_VALIDATE=چھوڑنے کی درخواست کی توثیق ہو گئی (منظوری درکار ہے)
+Notify_HOLIDAY_APPROVE=چھٹی کی درخواست منظور کر لی گئی۔
+Notify_ACTION_CREATE=ایجنڈے میں کارروائی شامل کی گئی۔
+SeeModuleSetup=ماڈیول %s کا سیٹ اپ دیکھیں
+NbOfAttachedFiles=منسلک فائلوں/دستاویزات کی تعداد
+TotalSizeOfAttachedFiles=منسلک فائلوں/دستاویزات کا کل سائز
+MaxSize=زیادہ سے زیادہ سائز
+AttachANewFile=ایک نئی فائل/دستاویز منسلک کریں۔
+LinkedObject=منسلک آبجیکٹ
+NbOfActiveNotifications=اطلاعات کی تعداد (وصول کنندگان کی ای میلز کی تعداد)
+PredefinedMailTest=__(ہیلو)__\nیہ ایک ٹیسٹ میل ہے جسے __EMAIL__ پر بھیجا گیا ہے۔\nلائنوں کو گاڑی کی واپسی کے ذریعے الگ کیا جاتا ہے۔\n\n__USER_SIGNATURE__
+PredefinedMailTestHtml=__(ہیلو)__ <br> یہ <b> ٹیسٹ ہے <br> لائنوں کو کیریج ریٹرن کے ذریعے الگ کیا جاتا ہے۔ <br> <br> __USER_SIGNATURE__
+PredefinedMailContentContract=__(ہیلو)__\n\n\n__(مخلص)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(ہیلو)__\n\nبراہ کرم انوائس __REF__ منسلک تلاش کریں۔\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(مخلص)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(ہیلو)__\n\nہم آپ کو یاد دلانا چاہیں گے کہ ایسا لگتا ہے کہ رسید __REF__ کی ادائیگی نہیں ہوئی ہے۔ رسید کی ایک کاپی یاد دہانی کے طور پر منسلک ہے۔\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(مخلص)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(ہیلو)__\n\nبراہ کرم تجارتی تجویز __REF__ منسلک تلاش کریں۔\n\n\n__(مخلص)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__(ہیلو)__\n\nبراہ کرم قیمت کی درخواست __REF__ منسلک تلاش کریں۔\n\n\n__(مخلص)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendOrder=__(ہیلو)__\n\nبراہ کرم منسلک آرڈر __REF__ تلاش کریں۔\n\n\n__(مخلص)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierOrder=__(ہیلو)__\n\nبراہ کرم ہمارا آرڈر __REF__ منسلک تلاش کریں۔\n\n\n__(مخلص)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierInvoice=__(ہیلو)__\n\nبراہ کرم انوائس __REF__ منسلک تلاش کریں۔\n\n\n__(مخلص)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendShipping=__(ہیلو)__\n\nبراہ کرم شپنگ __REF__ منسلک تلاش کریں۔\n\n\n__(مخلص)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendFichInter=__(ہیلو)__\n\nبراہ کرم __REF__ منسلک مداخلت تلاش کریں۔\n\n\n__(مخلص)__\n\n__USER_SIGNATURE__
+PredefinedMailContentLink=اگر آپ نے ادائیگی نہیں کی ہے تو آپ نیچے دیئے گئے لنک پر کلک کر سکتے ہیں۔\n\n%s\n\n
+PredefinedMailContentGeneric=__(ہیلو)__\n\n\n__(مخلص)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=ایونٹ کی یاددہانی "__EVENT_DATE__ کو __EVENT_DATE__ کو __EVENT_TIME__ <br> <br> یہ ایک خودکار پیغام ہے، براہ کرم جواب نہ دیں۔
+DemoDesc=Dolibarr ایک کمپیکٹ ERP/CRM ہے جو کئی کاروباری ماڈیولز کو سپورٹ کرتا ہے۔ تمام ماڈیولز کی نمائش کرنے والا ڈیمو کوئی معنی نہیں رکھتا کیونکہ یہ منظر کبھی نہیں ہوتا (کئی سو دستیاب)۔ لہذا، کئی ڈیمو پروفائلز دستیاب ہیں۔
+ChooseYourDemoProfil=ڈیمو پروفائل کا انتخاب کریں جو آپ کی ضروریات کے مطابق ہو...
+ChooseYourDemoProfilMore=یا اپنا پروفائل بنائیں <br> (دستی ماڈیول کا انتخاب)
+DemoFundation=فاؤنڈیشن کے ممبروں کا نظم کریں۔
+DemoFundation2=فاؤنڈیشن کے ممبران اور بینک اکاؤنٹ کا نظم کریں۔
+DemoCompanyServiceOnly=صرف کمپنی یا فری لانس سیلنگ سروس
+DemoCompanyShopWithCashDesk=کیش ڈیسک کے ساتھ دکان کا انتظام کریں۔
+DemoCompanyProductAndStocks=پوائنٹ آف سیلز کے ساتھ مصنوعات کی فروخت کی خریداری کریں۔
+DemoCompanyManufacturing=کمپنی کی تیاری کی مصنوعات
+DemoCompanyAll=متعدد سرگرمیوں والی کمپنی (تمام اہم ماڈیولز)
+CreatedBy=%s کے ذریعہ تخلیق کیا گیا۔
+ModifiedBy=ترمیم شدہ بذریعہ %s
+ValidatedBy=%s سے تصدیق شدہ
+SignedBy=%s کے ذریعے دستخط شدہ
+ClosedBy=%s کے ذریعہ بند
+CreatedById=یوزر آئی ڈی جس نے بنایا
+ModifiedById=صارف کی شناخت جس نے تازہ ترین تبدیلی کی ہے۔
+ValidatedById=یوزر آئی ڈی جس نے تصدیق کی۔
+CanceledById=یوزر آئی ڈی جس نے منسوخ کیا۔
+ClosedById=یوزر آئی ڈی جس نے بند کیا۔
+CreatedByLogin=صارف لاگ ان جس نے بنایا
+ModifiedByLogin=صارف لاگ ان جس نے تازہ ترین تبدیلی کی۔
+ValidatedByLogin=صارف لاگ ان جس نے توثیق کی۔
+CanceledByLogin=صارف لاگ ان جس نے منسوخ کیا۔
+ClosedByLogin=صارف لاگ ان جس نے بند کیا۔
+FileWasRemoved=فائل %s کو ہٹا دیا گیا تھا۔
+DirWasRemoved=ڈائرکٹری %s کو ہٹا دیا گیا تھا۔
+FeatureNotYetAvailable=فیچر ابھی موجودہ ورژن میں دستیاب نہیں ہے۔
+FeatureNotAvailableOnDevicesWithoutMouse=خصوصیت ماؤس کے بغیر آلات پر دستیاب نہیں ہے۔
+FeaturesSupported=تائید شدہ خصوصیات
+Width=چوڑائی
+Height=اونچائی
+Depth=گہرائی
+Top=اوپر
+Bottom=نیچے
+Left=بائیں
+Right=صحیح
+CalculatedWeight=حساب شدہ وزن
+CalculatedVolume=حساب شدہ حجم
+Weight=وزن
+WeightUnitton=ٹن
+WeightUnitkg=کلو
+WeightUnitg=جی
+WeightUnitmg=ملی گرام
+WeightUnitpound=پونڈ
+WeightUnitounce=اونس
+Length=لمبائی
 LengthUnitm=m
-LengthUnitdm=dm
-LengthUnitcm=cm
-LengthUnitmm=mm
-Surface=Area
+LengthUnitdm=ڈی ایم
+LengthUnitcm=سینٹی میٹر
+LengthUnitmm=ملی میٹر
+Surface=رقبہ
 SurfaceUnitm2=m²
 SurfaceUnitdm2=dm²
 SurfaceUnitcm2=cm²
 SurfaceUnitmm2=mm²
 SurfaceUnitfoot2=ft²
-SurfaceUnitinch2=in²
-Volume=Volume
+SurfaceUnitinch2=میں²
+Volume=حجم
 VolumeUnitm3=m³
 VolumeUnitdm3=dm³ (L)
 VolumeUnitcm3=cm³ (ml)
 VolumeUnitmm3=mm³ (µl)
 VolumeUnitfoot3=ft³
 VolumeUnitinch3=in³
-VolumeUnitounce=ounce
-VolumeUnitlitre=litre
-VolumeUnitgallon=gallon
+VolumeUnitounce=اونس
+VolumeUnitlitre=لیٹر
+VolumeUnitgallon=گیلن
 SizeUnitm=m
-SizeUnitdm=dm
-SizeUnitcm=cm
-SizeUnitmm=mm
-SizeUnitinch=inch
-SizeUnitfoot=foot
-SizeUnitpoint=point
-BugTracker=Bug tracker
-SendNewPasswordDesc=This form allows you to request a new password. It will be sent to your email address.<br>Change will become effective once you click on the confirmation link in the email.<br>Check your inbox.
-BackToLoginPage=Back to login page
-AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br>In this mode, Dolibarr can't know nor change your password.<br>Contact your system administrator if you want to change your password.
-EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
-ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
-DolibarrDemo=Dolibarr ERP/CRM demo
-StatsByNumberOfUnits=Statistics for sum of qty of products/services
-StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
-NumberOfProposals=Number of proposals
-NumberOfCustomerOrders=Number of sales orders
-NumberOfCustomerInvoices=Number of customer invoices
-NumberOfSupplierProposals=Number of vendor proposals
-NumberOfSupplierOrders=Number of purchase orders
-NumberOfSupplierInvoices=Number of vendor invoices
-NumberOfContracts=Number of contracts
-NumberOfMos=Number of manufacturing orders
-NumberOfUnitsProposals=Number of units on proposals
-NumberOfUnitsCustomerOrders=Number of units on sales orders
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices
-NumberOfUnitsSupplierProposals=Number of units on vendor proposals
-NumberOfUnitsSupplierOrders=Number of units on purchase orders
-NumberOfUnitsSupplierInvoices=Number of units on vendor invoices
-NumberOfUnitsContracts=Number of units on contracts
-NumberOfUnitsMos=Number of units to produce in manufacturing orders
-EMailTextInterventionAddedContact=A new intervention %s has been assigned to you.
-EMailTextInterventionValidated=The intervention %s has been validated.
-EMailTextInvoiceValidated=Invoice %s has been validated.
-EMailTextInvoicePayed=Invoice %s has been paid.
-EMailTextProposalValidated=Proposal %s has been validated.
-EMailTextProposalClosedSigned=Proposal %s has been closed signed.
-EMailTextOrderValidated=Order %s has been validated.
-EMailTextOrderApproved=Order %s has been approved.
-EMailTextOrderValidatedBy=Order %s has been recorded by %s.
-EMailTextOrderApprovedBy=Order %s has been approved by %s.
-EMailTextOrderRefused=Order %s has been refused.
-EMailTextOrderRefusedBy=Order %s has been refused by %s.
-EMailTextExpeditionValidated=Shipping %s has been validated.
-EMailTextExpenseReportValidated=Expense report %s has been validated.
-EMailTextExpenseReportApproved=Expense report %s has been approved.
-EMailTextHolidayValidated=Leave request %s has been validated.
-EMailTextHolidayApproved=Leave request %s has been approved.
-EMailTextActionAdded=The action %s has been added to the Agenda.
-ImportedWithSet=Importation data set
-DolibarrNotification=Automatic notification
-ResizeDesc=Enter new width <b>OR</b> new height. Ratio will be kept during resizing...
-NewLength=New width
-NewHeight=New height
-NewSizeAfterCropping=New size after cropping
-DefineNewAreaToPick=Define new area on image to pick (left click on image then drag until you reach the opposite corner)
-CurrentInformationOnImage=This tool was designed to help you to resize or crop an image. This is the information on the current edited image
-ImageEditor=Image editor
-YouReceiveMailBecauseOfNotification=You receive this message because your email has been added to list of targets to be informed of particular events into %s software of %s.
-YouReceiveMailBecauseOfNotification2=This event is the following:
-ThisIsListOfModules=This is a list of modules preselected by this demo profile (only most common modules are visible in this demo). Edit this to have a more personalized demo and click on "Start".
-UseAdvancedPerms=Use the advanced permissions of some modules
-FileFormat=File format
-SelectAColor=Choose a color
-AddFiles=Add Files
-StartUpload=Start upload
-CancelUpload=Cancel upload
-FileIsTooBig=Files is too big
-PleaseBePatient=Please be patient...
-NewPassword=New password
-ResetPassword=Reset password
-RequestToResetPasswordReceived=A request to change your password has been received.
-NewKeyIs=This is your new keys to login
-NewKeyWillBe=Your new key to login to software will be
-ClickHereToGoTo=Click here to go to %s
-YouMustClickToChange=You must however first click on the following link to validate this password change
-ConfirmPasswordChange=Confirm password change
-ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
-IfAmountHigherThan=If amount higher than <strong>%s</strong>
-SourcesRepository=Repository for sources
-Chart=Chart
-PassEncoding=Password encoding
-PermissionsAdd=Permissions added
-PermissionsDelete=Permissions removed
-YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
-YourPasswordHasBeenReset=Your password has been reset successfully
-ApplicantIpAddress=IP address of applicant
-SMSSentTo=SMS sent to %s
-MissingIds=Missing ids
-ThirdPartyCreatedByEmailCollector=Third party created by email collector from email MSGID %s
-ContactCreatedByEmailCollector=Contact/address created by email collector from email MSGID %s
-ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
-TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
-OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
-SuffixSessionName=Suffix for session name
+SizeUnitdm=ڈی ایم
+SizeUnitcm=سینٹی میٹر
+SizeUnitmm=ملی میٹر
+SizeUnitinch=انچ
+SizeUnitfoot=پاؤں
+SizeUnitpoint=نقطہ
+BugTracker=بگ ٹریکر
+SendNewPasswordDesc=یہ فارم آپ کو نئے پاس ورڈ کی درخواست کرنے کی اجازت دیتا ہے۔ یہ آپ کے ای میل ایڈریس پر بھیجا جائے گا۔ <br> ای میل میں تصدیقی لنک پر کلک کرنے کے بعد تبدیلی موثر ہو جائے گی۔ <br> اپنا ان باکس چیک کریں۔
+BackToLoginPage=لاگ ان صفحہ پر واپس جائیں۔
+AuthenticationDoesNotAllowSendNewPassword=توثیق کا موڈ <b> %s </b> ہے۔ <br> اس موڈ میں، Dolibarr آپ کا پاس ورڈ نہ جان سکتا ہے اور نہ ہی تبدیل کر سکتا ہے۔ <br> اگر آپ اپنا پاس ورڈ تبدیل کرنا چاہتے ہیں تو اپنے سسٹم ایڈمنسٹریٹر سے رابطہ کریں۔
+EnableGDLibraryDesc=اس اختیار کو استعمال کرنے کے لیے اپنی پی ایچ پی کی تنصیب پر جی ڈی لائبریری کو انسٹال یا فعال کریں۔
+ProfIdShortDesc= <b> Prof Id %s </b> تیسری پارٹی کے ملک پر منحصر ایک معلومات ہے۔ <br> مثال کے طور پر، ملک کے لیے <b> %s </b>، اس کا کوڈ <b> a0ecb2ec87f4987f49fz0a07f49fz0 ہے۔
+DolibarrDemo=Dolibarr ERP/CRM ڈیمو
+StatsByNumberOfUnits=پروڈکٹس/سروسز کی مقدار کے مجموعے کے اعدادوشمار
+StatsByNumberOfEntities=حوالہ دینے والے اداروں کی تعداد کے اعداد و شمار (انوائسز یا آرڈرز کی تعداد...)
+NumberOfProposals=تجاویز کی تعداد
+NumberOfCustomerOrders=سیلز آرڈرز کی تعداد
+NumberOfCustomerInvoices=کسٹمر کی رسیدوں کی تعداد
+NumberOfSupplierProposals=فروخت کنندگان کی تجاویز کی تعداد
+NumberOfSupplierOrders=خریداری کے آرڈرز کی تعداد
+NumberOfSupplierInvoices=وینڈر انوائسز کی تعداد
+NumberOfContracts=معاہدوں کی تعداد
+NumberOfMos=مینوفیکچرنگ آرڈرز کی تعداد
+NumberOfUnitsProposals=تجاویز پر اکائیوں کی تعداد
+NumberOfUnitsCustomerOrders=سیلز آرڈر پر یونٹس کی تعداد
+NumberOfUnitsCustomerInvoices=کسٹمر انوائس پر اکائیوں کی تعداد
+NumberOfUnitsSupplierProposals=وینڈر کی تجاویز پر اکائیوں کی تعداد
+NumberOfUnitsSupplierOrders=خریداری کے آرڈر پر یونٹوں کی تعداد
+NumberOfUnitsSupplierInvoices=وینڈر انوائس پر اکائیوں کی تعداد
+NumberOfUnitsContracts=معاہدوں پر اکائیوں کی تعداد
+NumberOfUnitsMos=مینوفیکچرنگ آرڈرز میں تیار کرنے والے یونٹوں کی تعداد
+EMailTextInterventionAddedContact=ایک نئی مداخلت %s آپ کو تفویض کی گئی ہے۔
+EMailTextInterventionValidated=مداخلت %s کی توثیق کر دی گئی ہے۔
+EMailTextInvoiceValidated=انوائس %s کی توثیق کر دی گئی ہے۔
+EMailTextInvoicePayed=انوائس %s ادا کر دی گئی ہے۔
+EMailTextProposalValidated=تجویز %s کی توثیق کر دی گئی ہے۔
+EMailTextProposalClosedSigned=تجویز %s دستخط شدہ بند کر دی گئی ہے۔
+EMailTextOrderValidated=آرڈر %s کی توثیق کر دی گئی ہے۔
+EMailTextOrderApproved=آرڈر %s منظور کر لیا گیا ہے۔
+EMailTextOrderValidatedBy=آرڈر %s کو %s نے ریکارڈ کیا ہے۔
+EMailTextOrderApprovedBy=آرڈر %s کو %s نے منظور کیا ہے۔
+EMailTextOrderRefused=آرڈر %s سے انکار کر دیا گیا ہے۔
+EMailTextOrderRefusedBy=آرڈر %s کو %s نے انکار کر دیا ہے۔
+EMailTextExpeditionValidated=شپنگ %s کی توثیق کر دی گئی ہے۔
+EMailTextExpenseReportValidated=اخراجات کی رپورٹ %s کی توثیق کر دی گئی ہے۔
+EMailTextExpenseReportApproved=اخراجات کی رپورٹ %s منظور کر لی گئی ہے۔
+EMailTextHolidayValidated=چھوڑنے کی درخواست %s کی توثیق کر دی گئی ہے۔
+EMailTextHolidayApproved=چھٹی کی درخواست %s منظور کر لی گئی ہے۔
+EMailTextActionAdded=کارروائی %s کو ایجنڈے میں شامل کر دیا گیا ہے۔
+ImportedWithSet=درآمدی ڈیٹا سیٹ
+DolibarrNotification=خودکار اطلاع
+ResizeDesc=نئی چوڑائی <b> یا </b> نئی اونچائی درج کریں۔ سائز تبدیل کرنے کے دوران تناسب رکھا جائے گا...
+NewLength=نئی چوڑائی
+NewHeight=نئی اونچائی
+NewSizeAfterCropping=کٹائی کے بعد نیا سائز
+DefineNewAreaToPick=منتخب کرنے کے لیے تصویر پر نئے علاقے کی وضاحت کریں (تصویر پر بائیں کلک کریں پھر اس وقت تک گھسیٹیں جب تک آپ مخالف کونے تک نہ پہنچ جائیں)
+CurrentInformationOnImage=یہ ٹول تصویر کا سائز تبدیل کرنے یا تراشنے میں آپ کی مدد کے لیے ڈیزائن کیا گیا تھا۔ یہ موجودہ ترمیم شدہ تصویر کی معلومات ہے۔
+ImageEditor=تصویری ایڈیٹر
+YouReceiveMailBecauseOfNotification=آپ کو یہ پیغام اس لیے موصول ہوا ہے کہ آپ کی ای میل کو %s کے %s سافٹ ویئر میں مخصوص واقعات سے آگاہ کرنے کے لیے اہداف کی فہرست میں شامل کیا گیا ہے۔
+YouReceiveMailBecauseOfNotification2=یہ واقعہ درج ذیل ہے:
+ThisIsListOfModules=یہ اس ڈیمو پروفائل کے ذریعہ پہلے سے منتخب کردہ ماڈیولز کی فہرست ہے (اس ڈیمو میں صرف سب سے عام ماڈیول نظر آتے ہیں)۔ مزید ذاتی نوعیت کا ڈیمو حاصل کرنے کے لیے اس میں ترمیم کریں اور "اسٹارٹ" پر کلک کریں۔
+UseAdvancedPerms=کچھ ماڈیولز کی جدید اجازتیں استعمال کریں۔
+FileFormat=فائل کی شکل
+SelectAColor=ایک رنگ منتخب کریں۔
+AddFiles=فائلیں شامل کریں
+StartUpload=اپ لوڈ شروع کریں۔
+CancelUpload=اپ لوڈ منسوخ کریں۔
+FileIsTooBig=فائلیں بہت بڑی ہیں۔
+PleaseBePatient=برائے مہربانی صبر کریں...
+NewPassword=نیا پاس ورڈ
+ResetPassword=پاس ورڈ ری سیٹ
+RequestToResetPasswordReceived=آپ کا پاس ورڈ تبدیل کرنے کی درخواست موصول ہوئی ہے۔
+NewKeyIs=لاگ ان کرنے کے لیے یہ آپ کی نئی کلیدیں ہیں۔
+NewKeyWillBe=سافٹ ویئر میں لاگ ان کرنے کے لیے آپ کی نئی کلید ہوگی۔
+ClickHereToGoTo=%s پر جانے کے لیے یہاں کلک کریں۔
+YouMustClickToChange=تاہم آپ کو اس پاس ورڈ کی تبدیلی کی توثیق کرنے کے لیے پہلے درج ذیل لنک پر کلک کرنا چاہیے۔
+ConfirmPasswordChange=پاس ورڈ کی تبدیلی کی تصدیق کریں۔
+ForgetIfNothing=اگر آپ نے اس تبدیلی کی درخواست نہیں کی ہے تو بس اس ای میل کو بھول جائیں۔ آپ کی اسناد محفوظ ہیں۔
+IfAmountHigherThan=اگر رقم <strong> %s </strong> سے زیادہ ہے
+SourcesRepository=ذرائع کے لیے ذخیرہ
+Chart=چارٹ
+PassEncoding=پاس ورڈ انکوڈنگ
+PermissionsAdd=اجازتیں شامل کی گئیں۔
+PermissionsDelete=اجازتیں ہٹا دی گئیں۔
+YourPasswordMustHaveAtLeastXChars=آپ کے پاس ورڈ میں کم از کم <strong> %s </strong> حروف ہونے چاہئیں
+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
+YourPasswordHasBeenReset=آپ کا پاس ورڈ کامیابی سے دوبارہ ترتیب دیا گیا ہے۔
+ApplicantIpAddress=درخواست دہندہ کا IP پتہ
+SMSSentTo=SMS %s پر بھیجا گیا۔
+MissingIds=غائب آئی ڈیز
+ThirdPartyCreatedByEmailCollector=ای میل MSGID %s سے ای میل کلکٹر کے ذریعہ تیار کردہ تیسری پارٹی
+ContactCreatedByEmailCollector=ای میل MSGID %s سے ای میل کلکٹر کے ذریعہ بنایا گیا رابطہ/ پتہ
+ProjectCreatedByEmailCollector=ای میل MSGID %s سے ای میل کلکٹر کے ذریعہ بنایا گیا پروجیکٹ
+TicketCreatedByEmailCollector=ای میل MSGID %s سے ای میل کلکٹر کے ذریعہ تیار کردہ ٹکٹ
+OpeningHoursFormatDesc=کھلنے اور بند ہونے کے اوقات کو الگ کرنے کے لیے - کا استعمال کریں۔ <br> مختلف حدود میں داخل ہونے کے لیے اسپیس کا استعمال کریں۔ <br> مثال: 8-12 14-18
+SuffixSessionName=سیشن کے نام کے لیے لاحقہ
 
 ##### Export #####
-ExportsArea=Exports area
-AvailableFormats=Available formats
-LibraryUsed=Library used
-LibraryVersion=Library version
-ExportableDatas=Exportable data
-NoExportableData=No exportable data (no modules with exportable data loaded, or missing permissions)
+ExportsArea=برآمدات کا علاقہ
+AvailableFormats=دستیاب فارمیٹس
+LibraryUsed=لائبریری استعمال کی گئی۔
+LibraryVersion=لائبریری ورژن
+ExportableDatas=قابل برآمد ڈیٹا
+NoExportableData=کوئی قابل برآمد ڈیٹا نہیں (برآمد کے قابل ڈیٹا کے ساتھ کوئی ماڈیول لوڈ نہیں، یا اجازتیں غائب ہیں)
 ##### External sites #####
-WebsiteSetup=Setup of module website
-WEBSITE_PAGEURL=URL of page
-WEBSITE_TITLE=Title
-WEBSITE_DESCRIPTION=Description
-WEBSITE_IMAGE=Image
-WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a thumbnail in a list of blog posts). Use __WEBSITE_KEY__ in the path if path depends on website name (for example: image/__WEBSITE_KEY__/stories/myimage.png).
-WEBSITE_KEYWORDS=Keywords
-LinesToImport=Lines to import
+WebsiteSetup=ماڈیول ویب سائٹ کا سیٹ اپ
+WEBSITE_PAGEURL=صفحہ کا URL
+WEBSITE_TITLE=عنوان
+WEBSITE_DESCRIPTION=تفصیل
+WEBSITE_IMAGE=تصویر
+WEBSITE_IMAGEDesc=تصویری میڈیا کا رشتہ دار راستہ۔ آپ اسے خالی رکھ سکتے ہیں کیونکہ یہ شاذ و نادر ہی استعمال ہوتا ہے (بلاگ پوسٹس کی فہرست میں تھمب نیل دکھانے کے لیے اسے متحرک مواد کے ذریعے استعمال کیا جا سکتا ہے)۔ اگر راستہ ویب سائٹ کے نام پر منحصر ہے تو راستے میں __WEBSITE_KEY__ استعمال کریں (مثال کے طور پر: image/__WEBSITE_KEY__/stories/myimage.png)۔
+WEBSITE_KEYWORDS=مطلوبہ الفاظ
+LinesToImport=درآمد کرنے کے لیے لائنیں
 
-MemoryUsage=Memory usage
-RequestDuration=Duration of request
-ProductsPerPopularity=Products/Services by popularity
-PopuProp=Products/Services by popularity in Proposals
-PopuCom=Products/Services by popularity in Orders
-ProductStatistics=Products/Services Statistics
-NbOfQtyInOrders=Qty in orders
-SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
+MemoryUsage=استعمال یاد داشت
+RequestDuration=درخواست کی مدت
+ProductsPerPopularity=مقبولیت کے لحاظ سے مصنوعات/خدمات
+PopuProp=پروپوزل میں مقبولیت کے لحاظ سے پروڈکٹس/سروسز
+PopuCom=آرڈرز میں مقبولیت کے لحاظ سے پروڈکٹس/سروسز
+ProductStatistics=مصنوعات/خدمات کے اعدادوشمار
+NbOfQtyInOrders=آرڈرز میں مقدار
+SelectTheTypeOfObjectToAnalyze=اس کے اعدادوشمار دیکھنے کے لیے کسی چیز کو منتخب کریں...
 
-ConfirmBtnCommonContent = Are you sure you want to "%s" ?
-ConfirmBtnCommonTitle = Confirm your action
-CloseDialog = Close
+ConfirmBtnCommonContent = کیا آپ واقعی "%s" کرنا چاہتے ہیں؟
+ConfirmBtnCommonTitle = اپنے عمل کی تصدیق کریں۔
+CloseDialog = بند کریں
diff --git a/htdocs/langs/ur_PK/partnership.lang b/htdocs/langs/ur_PK/partnership.lang
index c755ec8591d..5bfffcb9200 100644
--- a/htdocs/langs/ur_PK/partnership.lang
+++ b/htdocs/langs/ur_PK/partnership.lang
@@ -16,77 +16,77 @@
 #
 # Generic
 #
-ModulePartnershipName=Partnership management
-PartnershipDescription=Module Partnership management
-PartnershipDescriptionLong= Module Partnership management
-Partnership=Partnership
-AddPartnership=Add partnership
-CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
-PartnershipCheckBacklink=Partnership: Check referring backlink
+ModulePartnershipName=شراکت داری کا انتظام
+PartnershipDescription=ماڈیول پارٹنرشپ مینجمنٹ
+PartnershipDescriptionLong= ماڈیول پارٹنرشپ مینجمنٹ
+Partnership=شراکت داری
+AddPartnership=شراکت داری شامل کریں۔
+CancelPartnershipForExpiredMembers=شراکت: میعاد ختم ہونے والی سبسکرپشنز والے ممبران کی شراکت کو منسوخ کریں۔
+PartnershipCheckBacklink=شراکت: حوالہ دینے والے بیک لنک کو چیک کریں۔
 
 #
 # Menu
 #
-NewPartnership=New Partnership
-ListOfPartnerships=List of partnership
+NewPartnership=نئی شراکت داری
+ListOfPartnerships=شراکت کی فہرست
 
 #
 # Admin page
 #
-PartnershipSetup=Partnership setup
-PartnershipAbout=About Partnership
-PartnershipAboutPage=Partnership about page
-partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
-PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
-PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
-PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
-ReferingWebsiteCheck=Check of website referring
-ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
+PartnershipSetup=پارٹنرشپ سیٹ اپ
+PartnershipAbout=شراکت داری کے بارے میں
+PartnershipAboutPage=صفحہ کے بارے میں شراکت داری
+partnershipforthirdpartyormember=پارٹنر کی حیثیت 'تھرڈ پارٹی' یا 'ممبر' پر سیٹ ہونی چاہیے
+PARTNERSHIP_IS_MANAGED_FOR=شراکت داری کا انتظام کیا گیا۔
+PARTNERSHIP_BACKLINKS_TO_CHECK=چیک کرنے کے لیے بیک لنکس
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=سبسکرپشن کی میعاد ختم ہونے پر شراکت کی حیثیت کو منسوخ کرنے سے پہلے دن کا نوٹ
+ReferingWebsiteCheck=ویب سائٹ کا حوالہ دیتے ہوئے چیک کریں۔
+ReferingWebsiteCheckDesc=آپ یہ چیک کرنے کے لیے ایک خصوصیت کو فعال کر سکتے ہیں کہ آپ کے شراکت داروں نے اپنی ویب سائٹ پر آپ کی ویب سائٹ کے ڈومینز میں بیک لنک شامل کیا ہے۔
 
 #
 # Object
 #
-DeletePartnership=Delete a partnership
-PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
-PartnershipDedicatedToThisMember=Partnership dedicated to this member
-DatePartnershipStart=Start date
-DatePartnershipEnd=End date
-ReasonDecline=Decline reason
-ReasonDeclineOrCancel=Decline reason
-PartnershipAlreadyExist=Partnership already exist
-ManagePartnership=Manage partnership
-BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
-ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
-PartnershipType=Partnership type
-PartnershipRefApproved=Partnership %s approved
+DeletePartnership=شراکت کو حذف کریں۔
+PartnershipDedicatedToThisThirdParty=شراکت داری اس تیسرے فریق کے لیے وقف ہے۔
+PartnershipDedicatedToThisMember=شراکت داری اس رکن کے لیے وقف ہے۔
+DatePartnershipStart=شروع کرنے کی تاریخ
+DatePartnershipEnd=آخری تاریخ
+ReasonDecline=انکار کی وجہ
+ReasonDeclineOrCancel=انکار کی وجہ
+PartnershipAlreadyExist=شراکت داری پہلے سے موجود ہے۔
+ManagePartnership=شراکت کا انتظام کریں۔
+BacklinkNotFoundOnPartnerWebsite=بیک لنک پارٹنر ویب سائٹ پر نہیں ملا
+ConfirmClosePartnershipAsk=کیا آپ واقعی اس شراکت کو منسوخ کرنا چاہتے ہیں؟
+PartnershipType=شراکت کی قسم
+PartnershipRefApproved=شراکت %s کی منظوری دے دی گئی۔
 
 #
 # Template Mail
 #
-SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
-SendingEmailOnPartnershipRefused=Partnership refused
-SendingEmailOnPartnershipAccepted=Partnership accepted
-SendingEmailOnPartnershipCanceled=Partnership canceled
+SendingEmailOnPartnershipWillSoonBeCanceled=شراکت جلد ہی منسوخ کر دی جائے گی۔
+SendingEmailOnPartnershipRefused=شراکت سے انکار کر دیا۔
+SendingEmailOnPartnershipAccepted=شراکت قبول کر لی
+SendingEmailOnPartnershipCanceled=شراکت منسوخ کر دی گئی۔
 
-YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
-YourPartnershipRefusedTopic=Partnership refused
-YourPartnershipAcceptedTopic=Partnership accepted
-YourPartnershipCanceledTopic=Partnership canceled
+YourPartnershipWillSoonBeCanceledTopic=شراکت جلد ہی منسوخ کر دی جائے گی۔
+YourPartnershipRefusedTopic=شراکت سے انکار کر دیا۔
+YourPartnershipAcceptedTopic=شراکت قبول کر لی
+YourPartnershipCanceledTopic=شراکت منسوخ کر دی گئی۔
 
-YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
-YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
-YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
-YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
+YourPartnershipWillSoonBeCanceledContent=ہم آپ کو مطلع کرتے ہیں کہ آپ کی شراکت جلد ہی منسوخ کر دی جائے گی (بیک لنک نہیں ملا)
+YourPartnershipRefusedContent=ہم آپ کو مطلع کرتے ہیں کہ آپ کی شراکت کی درخواست مسترد کر دی گئی ہے۔
+YourPartnershipAcceptedContent=ہم آپ کو مطلع کرتے ہیں کہ آپ کی شراکت کی درخواست قبول کر لی گئی ہے۔
+YourPartnershipCanceledContent=ہم آپ کو مطلع کرتے ہیں کہ آپ کی شراکت منسوخ کر دی گئی ہے۔
 
-CountLastUrlCheckError=Number of errors for last URL check
-LastCheckBacklink=Date of last URL check
-ReasonDeclineOrCancel=Decline reason
+CountLastUrlCheckError=آخری URL چیک کے لیے غلطیوں کی تعداد
+LastCheckBacklink=آخری URL چیک کی تاریخ
+ReasonDeclineOrCancel=انکار کی وجہ
 
 #
 # Status
 #
-PartnershipDraft=Draft
-PartnershipAccepted=Accepted
-PartnershipRefused=Refused
-PartnershipCanceled=Canceled
-PartnershipManagedFor=Partners are
+PartnershipDraft=مسودہ
+PartnershipAccepted=قبول کر لیا
+PartnershipRefused=انکار کر دیا
+PartnershipCanceled=منسوخ
+PartnershipManagedFor=شراکت دار ہیں۔
diff --git a/htdocs/langs/ur_PK/paybox.lang b/htdocs/langs/ur_PK/paybox.lang
index a2bfb1773e4..b534a5041cb 100644
--- a/htdocs/langs/ur_PK/paybox.lang
+++ b/htdocs/langs/ur_PK/paybox.lang
@@ -1,30 +1,30 @@
 # Dolibarr language file - Source file is en_US - paybox
-PayBoxSetup=PayBox module setup
-PayBoxDesc=This module offer pages to allow payment on <a href="https://www.paybox.com" target="_blank" rel="noopener noreferrer external">Paybox</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
-FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
-PaymentForm=Payment form
-WelcomeOnPaymentPage=Welcome to our online payment service
-ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
-ThisIsInformationOnPayment=This is information on payment to do
-ToComplete=To complete
-YourEMail=Email to receive payment confirmation
-Creditor=Creditor
-PaymentCode=Payment code
-PayBoxDoPayment=Pay with Paybox
-YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
-Continue=Next
-SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
-YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
-YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
-AccountParameter=Account parameters
-UsageParameter=Usage parameters
-InformationToFindParameters=Help to find your %s account information
-PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment
-CSSUrlForPaymentForm=CSS style sheet url for payment form
-NewPayboxPaymentReceived=New Paybox payment received
-NewPayboxPaymentFailed=New Paybox payment tried but failed
-PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
-PAYBOX_PBX_SITE=Value for PBX SITE
-PAYBOX_PBX_RANG=Value for PBX Rang
-PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
-PAYBOX_HMAC_KEY=HMAC key
+PayBoxSetup=پے باکس ماڈیول سیٹ اپ
+PayBoxDesc=یہ ماڈیول صارفین کو <a href="https://www.paybox.com" target="_blank" rel="noopener noreferrer external"> Paybox </a> پر ادائیگی کی اجازت دینے کے لیے صفحات پیش کرتا ہے۔ اسے مفت ادائیگی کے لیے یا کسی خاص Dolibarr چیز (انوائس، آرڈر، ...) پر ادائیگی کے لیے استعمال کیا جا سکتا ہے۔
+FollowingUrlAreAvailableToMakePayments=Dolibarr اشیاء پر ادائیگی کرنے کے لیے صارف کو صفحہ پیش کرنے کے لیے درج ذیل URLs دستیاب ہیں۔
+PaymentForm=ادائیگی کا فارم
+WelcomeOnPaymentPage=ہماری آن لائن ادائیگی کی خدمت میں خوش آمدید
+ThisScreenAllowsYouToPay=یہ اسکرین آپ کو %s پر آن لائن ادائیگی کرنے کی اجازت دیتی ہے۔
+ThisIsInformationOnPayment=یہ ادائیگی کے بارے میں معلومات ہے۔
+ToComplete=مکمل کرنا
+YourEMail=ادائیگی کی تصدیق حاصل کرنے کے لیے ای میل کریں۔
+Creditor=قرض دینے والا
+PaymentCode=ادائیگی کا کوڈ
+PayBoxDoPayment=پے باکس کے ساتھ ادائیگی کریں۔
+YouWillBeRedirectedOnPayBox=آپ کو کریڈٹ کارڈ کی معلومات داخل کرنے کے لیے محفوظ پے باکس صفحہ پر بھیج دیا جائے گا۔
+Continue=اگلے
+SetupPayBoxToHavePaymentCreatedAutomatically=اپنے پے باکس کو url <b> %s </b> کے ساتھ سیٹ اپ کریں تاکہ پے باکس کی توثیق ہونے پر ادائیگی خود بخود بن جائے۔
+YourPaymentHasBeenRecorded=یہ صفحہ تصدیق کرتا ہے کہ آپ کی ادائیگی ریکارڈ کی گئی ہے۔ شکریہ
+YourPaymentHasNotBeenRecorded=آپ کی ادائیگی ریکارڈ نہیں کی گئی ہے اور لین دین منسوخ کر دیا گیا ہے۔ شکریہ
+AccountParameter=اکاؤنٹ کے پیرامیٹرز
+UsageParameter=استعمال کے پیرامیٹرز
+InformationToFindParameters=اپنے %s اکاؤنٹ کی معلومات تلاش کرنے میں مدد کریں۔
+PAYBOX_CGI_URL_V2=ادائیگی کے لیے پے باکس سی جی آئی ماڈیول کا یو آر ایل
+CSSUrlForPaymentForm=ادائیگی کے فارم کے لیے سی ایس ایس اسٹائل شیٹ یو آر ایل
+NewPayboxPaymentReceived=نئی پے باکس ادائیگی موصول ہوئی۔
+NewPayboxPaymentFailed=نئی پے باکس ادائیگی کی کوشش کی لیکن ناکام ہوگئی
+PAYBOX_PAYONLINE_SENDEMAIL=ادائیگی کی کوشش کے بعد ای میل اطلاع (کامیابی یا ناکام)
+PAYBOX_PBX_SITE=PBX SITE کے لیے قدر
+PAYBOX_PBX_RANG=PBX رنگ کی قدر
+PAYBOX_PBX_IDENTIFIANT=PBX ID کی قدر
+PAYBOX_HMAC_KEY=HMAC کلید
diff --git a/htdocs/langs/ur_PK/paypal.lang b/htdocs/langs/ur_PK/paypal.lang
index beaf9a5ea3f..b268339fcd5 100644
--- a/htdocs/langs/ur_PK/paypal.lang
+++ b/htdocs/langs/ur_PK/paypal.lang
@@ -1,36 +1,36 @@
 # Dolibarr language file - Source file is en_US - paypal
-PaypalSetup=PayPal module setup
-PaypalDesc=This module allows payment by customers via <a href="https://www.paypal.com" target="_blank" rel="noopener noreferrer external">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
-PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
-PaypalDoPayment=Pay with PayPal
-PAYPAL_API_SANDBOX=Mode test/sandbox
-PAYPAL_API_USER=API username
-PAYPAL_API_PASSWORD=API password
-PAYPAL_API_SIGNATURE=API signature
-PAYPAL_SSLVERSION=Curl SSL Version
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
-PaypalModeIntegral=Integral
-PaypalModeOnlyPaypal=PayPal only
-ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
-ThisIsTransactionId=This is id of transaction: <b>%s</b>
-PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
-NewOnlinePaymentReceived=New online payment received
-NewOnlinePaymentFailed=New online payment tried but failed
-ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
-ReturnURLAfterPayment=Return URL after payment
-ValidationOfOnlinePaymentFailed=Validation of online payment failed
-PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
-SetExpressCheckoutAPICallFailed=SetExpressCheckout API call failed.
-DoExpressCheckoutPaymentAPICallFailed=DoExpressCheckoutPayment API call failed.
-DetailedErrorMessage=Detailed Error Message
-ShortErrorMessage=Short Error Message
-ErrorCode=Error Code
-ErrorSeverityCode=Error Severity Code
-OnlinePaymentSystem=Online payment system
-PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
-PaypalImportPayment=Import PayPal payments
-PostActionAfterPayment=Post actions after payments
-ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
-ValidationOfPaymentFailed=Validation of payment has failed
-CardOwner=Card holder
-PayPalBalance=Paypal credit
+PaypalSetup=پے پال ماڈیول سیٹ اپ
+PaypalDesc=یہ ماڈیول صارفین کو <a href="https://www.paypal.com" target="_blank" rel="noopener noreferrer external"> PayPal </a> کے ذریعے ادائیگی کی اجازت دیتا ہے۔ اسے ایڈہاک ادائیگی کے لیے یا Dolibarr آبجیکٹ (انوائس، آرڈر، ...) سے متعلق ادائیگی کے لیے استعمال کیا جا سکتا ہے۔
+PaypalOrCBDoPayment=پے پال (کارڈ یا پے پال) سے ادائیگی کریں
+PaypalDoPayment=پے پال کے ساتھ ادائیگی کریں۔
+PAYPAL_API_SANDBOX=موڈ ٹیسٹ/سینڈ باکس
+PAYPAL_API_USER=API صارف نام
+PAYPAL_API_PASSWORD=API پاس ورڈ
+PAYPAL_API_SIGNATURE=API دستخط
+PAYPAL_SSLVERSION=کرل SSL ورژن
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY="انٹیگرل" ادائیگی (کریڈٹ کارڈ+پے پال) یا صرف "پے پال" پیش کریں۔
+PaypalModeIntegral=لازمی
+PaypalModeOnlyPaypal=صرف پے پال
+ONLINE_PAYMENT_CSS_URL=آن لائن ادائیگی کے صفحے پر CSS اسٹائل شیٹ کا اختیاری URL
+ThisIsTransactionId=یہ ٹرانزیکشن کی شناخت ہے: <b> %s </b>
+PAYPAL_ADD_PAYMENT_URL=جب آپ ای میل کے ذریعے کوئی دستاویز بھیجیں تو پے پال کی ادائیگی کا یو آر ایل شامل کریں۔
+NewOnlinePaymentReceived=نئی آن لائن ادائیگی موصول ہوئی۔
+NewOnlinePaymentFailed=نئی آن لائن ادائیگی کی کوشش کی لیکن ناکام ہوگئی
+ONLINE_PAYMENT_SENDEMAIL=ہر ادائیگی کی کوشش کے بعد اطلاعات کے لیے ای میل ایڈریس (کامیابی اور ناکامی کے لیے)
+ReturnURLAfterPayment=ادائیگی کے بعد URL واپس کریں۔
+ValidationOfOnlinePaymentFailed=آن لائن ادائیگی کی توثیق ناکام ہوگئی
+PaymentSystemConfirmPaymentPageWasCalledButFailed=ادائیگی کی تصدیق کے صفحے کو ادائیگی کے نظام کی طرف سے بلایا گیا تھا ایک خرابی واپس آ گئی
+SetExpressCheckoutAPICallFailed=SetExpressCheckout API کال ناکام ہوگئی۔
+DoExpressCheckoutPaymentAPICallFailed=DoExpressCheckoutPayment API کال ناکام ہوگئی۔
+DetailedErrorMessage=خرابی کا تفصیلی پیغام
+ShortErrorMessage=شارٹ ایرر میسج
+ErrorCode=غلط کوڈ
+ErrorSeverityCode=خرابی کی شدت کا کوڈ
+OnlinePaymentSystem=آن لائن ادائیگی کا نظام
+PaypalLiveEnabled=پے پال "لائیو" موڈ فعال ہے (بصورت دیگر ٹیسٹ/سینڈ باکس موڈ)
+PaypalImportPayment=پے پال کی ادائیگی درآمد کریں۔
+PostActionAfterPayment=ادائیگی کے بعد کارروائیاں پوسٹ کریں۔
+ARollbackWasPerformedOnPostActions=تمام پوسٹ ایکشنز پر ایک رول بیک کیا گیا تھا۔ اگر ضروری ہو تو آپ کو پوسٹ کے اعمال کو دستی طور پر مکمل کرنا چاہیے۔
+ValidationOfPaymentFailed=ادائیگی کی توثیق ناکام ہوگئی ہے۔
+CardOwner=کارڈ ہولڈر
+PayPalBalance=پے پال کریڈٹ
diff --git a/htdocs/langs/ur_PK/printing.lang b/htdocs/langs/ur_PK/printing.lang
index bd9094f213d..a59e357a6b4 100644
--- a/htdocs/langs/ur_PK/printing.lang
+++ b/htdocs/langs/ur_PK/printing.lang
@@ -1,54 +1,54 @@
 # Dolibarr language file - Source file is en_US - printing
-Module64000Name=One click Printing
-Module64000Desc=Enable One click Printing System
-PrintingSetup=Setup of One click Printing System
-PrintingDesc=This module adds a Print button to various modules to allow documents to be printed directly to a printer with no need to open the document into another application.
-MenuDirectPrinting=One click Printing jobs
-DirectPrint=One click Print
-PrintingDriverDesc=Configuration variables for printing driver.
-ListDrivers=List of drivers
-PrintTestDesc=List of Printers.
-FileWasSentToPrinter=File %s was sent to printer
-ViaModule=via the module
-NoActivePrintingModuleFound=No active driver to print document. Check setup of module %s.
-PleaseSelectaDriverfromList=Please select a driver from list.
-PleaseConfigureDriverfromList=Please configure the selected driver from list.
-SetupDriver=Driver setup
-TargetedPrinter=Targeted printer
-UserConf=Setup per user
-PRINTGCP_INFO=Google OAuth API setup
-PRINTGCP_AUTHLINK=Authentication
-PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
-PrintGCPDesc=This driver allows sending documents directly to a printer using Google Cloud Print.
-GCP_Name=Name
-GCP_displayName=Display Name
-GCP_Id=Printer Id
-GCP_OwnerName=Owner Name
-GCP_State=Printer State
-GCP_connectionStatus=Online State
-GCP_Type=Printer Type
-PrintIPPDesc=This driver allows sending of documents directly to a printer. It requires a Linux system with CUPS installed.
-PRINTIPP_HOST=Print server
-PRINTIPP_PORT=Port
-PRINTIPP_USER=Login
-PRINTIPP_PASSWORD=Password
-NoDefaultPrinterDefined=No default printer defined
-DefaultPrinter=Default printer
-Printer=Printer
-IPP_Uri=Printer Uri
-IPP_Name=Printer Name
-IPP_State=Printer State
-IPP_State_reason=State reason
-IPP_State_reason1=State reason1
-IPP_BW=BW
-IPP_Color=Color
-IPP_Device=Device
-IPP_Media=Printer media
-IPP_Supported=Type of media
-DirectPrintingJobsDesc=This page lists printing jobs found for available printers.
-GoogleAuthNotConfigured=Google OAuth has not been setup. Enable module OAuth and set a Google ID/Secret.
-GoogleAuthConfigured=Google OAuth credentials were found into setup of module OAuth.
-PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print.
-PrintingDriverDescprintipp=Configuration variables for printing driver Cups.
-PrintTestDescprintgcp=List of Printers for Google Cloud Print.
-PrintTestDescprintipp=List of Printers for Cups.
+Module64000Name=ایک کلک پرنٹنگ
+Module64000Desc=ایک کلک پرنٹنگ سسٹم کو فعال کریں۔
+PrintingSetup=ایک کلک پرنٹنگ سسٹم کا سیٹ اپ
+PrintingDesc=یہ ماڈیول مختلف ماڈیولز میں ایک پرنٹ بٹن کا اضافہ کرتا ہے تاکہ دستاویزات کو براہ راست پرنٹر پر پرنٹ کیا جا سکے بغیر کسی اور ایپلیکیشن میں دستاویز کو کھولنے کی ضرورت نہیں ہے۔
+MenuDirectPrinting=ایک کلک پرنٹنگ جابز
+DirectPrint=ایک کلک پرنٹ کریں۔
+PrintingDriverDesc=پرنٹنگ ڈرائیور کے لیے کنفیگریشن متغیر۔
+ListDrivers=ڈرائیوروں کی فہرست
+PrintTestDesc=پرنٹرز کی فہرست۔
+FileWasSentToPrinter=فائل %s پرنٹر کو بھیجی گئی۔
+ViaModule=ماڈیول کے ذریعے
+NoActivePrintingModuleFound=دستاویز پرنٹ کرنے کے لیے کوئی فعال ڈرائیور نہیں ہے۔ ماڈیول %s کا سیٹ اپ چیک کریں۔
+PleaseSelectaDriverfromList=براہ کرم فہرست سے ڈرائیور منتخب کریں۔
+PleaseConfigureDriverfromList=براہ کرم فہرست سے منتخب ڈرائیور کو ترتیب دیں۔
+SetupDriver=ڈرائیور سیٹ اپ
+TargetedPrinter=ٹارگٹڈ پرنٹر
+UserConf=فی صارف سیٹ اپ
+PRINTGCP_INFO=Google OAuth API سیٹ اپ
+PRINTGCP_AUTHLINK=تصدیق
+PRINTGCP_TOKEN_ACCESS=گوگل کلاؤڈ پرنٹ OAuth ٹوکن
+PrintGCPDesc=یہ ڈرائیور گوگل کلاؤڈ پرنٹ کا استعمال کرتے ہوئے دستاویزات کو براہ راست پرنٹر پر بھیجنے کی اجازت دیتا ہے۔
+GCP_Name=نام
+GCP_displayName=ڈسپلے کا نام
+GCP_Id=پرنٹر کی شناخت
+GCP_OwnerName=مالک کا نام
+GCP_State=پرنٹر اسٹیٹ
+GCP_connectionStatus=آن لائن ریاست
+GCP_Type=پرنٹر کی قسم
+PrintIPPDesc=یہ ڈرائیور دستاویزات کو براہ راست پرنٹر پر بھیجنے کی اجازت دیتا ہے۔ اس کے لیے ایک لینکس سسٹم کی ضرورت ہے جس میں CUPS انسٹال ہو۔
+PRINTIPP_HOST=پرنٹ سرور
+PRINTIPP_PORT=بندرگاہ
+PRINTIPP_USER=لاگ ان کریں
+PRINTIPP_PASSWORD=پاس ورڈ
+NoDefaultPrinterDefined=کوئی ڈیفالٹ پرنٹر متعین نہیں ہے۔
+DefaultPrinter=ڈیفالٹ پرنٹر
+Printer=پرنٹر
+IPP_Uri=پرنٹر Uri
+IPP_Name=پرنٹر کا نام
+IPP_State=پرنٹر اسٹیٹ
+IPP_State_reason=ریاستی وجہ
+IPP_State_reason1=ریاستی وجہ 1
+IPP_BW=بی ڈبلیو
+IPP_Color=رنگ
+IPP_Device=ڈیوائس
+IPP_Media=پرنٹر میڈیا
+IPP_Supported=میڈیا کی قسم
+DirectPrintingJobsDesc=یہ صفحہ دستیاب پرنٹرز کے لیے دستیاب پرنٹنگ جابز کی فہرست دیتا ہے۔
+GoogleAuthNotConfigured=Google OAuth سیٹ اپ نہیں کیا گیا ہے۔ ماڈیول OAuth کو فعال کریں اور ایک Google ID/Secret سیٹ کریں۔
+GoogleAuthConfigured=Google OAuth کی اسناد ماڈیول OAuth کے سیٹ اپ میں پائی گئیں۔
+PrintingDriverDescprintgcp=پرنٹنگ ڈرائیور گوگل کلاؤڈ پرنٹ کے لیے کنفیگریشن متغیر۔
+PrintingDriverDescprintipp=ڈرائیور کپ پرنٹ کرنے کے لیے کنفیگریشن متغیر۔
+PrintTestDescprintgcp=گوگل کلاؤڈ پرنٹ کے لیے پرنٹرز کی فہرست۔
+PrintTestDescprintipp=کپ کے لیے پرنٹرز کی فہرست۔
diff --git a/htdocs/langs/ur_PK/productbatch.lang b/htdocs/langs/ur_PK/productbatch.lang
index ddf3eab9f3f..f70edc0c12c 100644
--- a/htdocs/langs/ur_PK/productbatch.lang
+++ b/htdocs/langs/ur_PK/productbatch.lang
@@ -1,45 +1,45 @@
 # ProductBATCH language file - Source file is en_US - ProductBATCH
-ManageLotSerial=Use lot/serial number
-ProductStatusOnBatch=Yes (lot required)
-ProductStatusOnSerial=Yes (unique serial number required)
-ProductStatusNotOnBatch=No (lot/serial not used)
-ProductStatusOnBatchShort=Lot
-ProductStatusOnSerialShort=Serial
-ProductStatusNotOnBatchShort=No
-Batch=Lot/Serial
-atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
-batch_number=Lot/Serial number
-BatchNumberShort=Lot/Serial
-EatByDate=Eat-by date
-SellByDate=Sell-by date
-DetailBatchNumber=Lot/Serial details
-printBatch=Lot/Serial: %s
+ManageLotSerial=لاٹ/سیریل نمبر استعمال کریں۔
+ProductStatusOnBatch=ہاں (بہت ضرورت ہے)
+ProductStatusOnSerial=ہاں (منفرد سیریل نمبر درکار ہے)
+ProductStatusNotOnBatch=نہیں (لاٹ/سیریل استعمال نہیں کیا گیا)
+ProductStatusOnBatchShort=لاٹ
+ProductStatusOnSerialShort=سیریل
+ProductStatusNotOnBatchShort=نہیں
+Batch=لاٹ/سیریل
+atleast1batchfield=تاریخ کے حساب سے کھائیں یا تاریخ کے حساب سے فروخت کریں یا لاٹ/سیریل نمبر
+batch_number=لاٹ/سیریل نمبر
+BatchNumberShort=لاٹ/سیریل
+EatByDate=تاریخ کے حساب سے کھائیں۔
+SellByDate=تاریخ کے لحاظ سے فروخت کریں۔
+DetailBatchNumber=لاٹ/سیریل کی تفصیلات
+printBatch=لاٹ/سیریل: %s
 printEatby=Eat-by: %s
-printSellby=Sell-by: %s
-printQty=Qty: %d
-AddDispatchBatchLine=Add a line for Shelf Life dispatching
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
-ProductDoesNotUseBatchSerial=This product does not use lot/serial number
-ProductLotSetup=Setup of module lot/serial
-ShowCurrentStockOfLot=Show current stock for couple product/lot
-ShowLogOfMovementIfLot=Show log of movements for couple product/lot
-StockDetailPerBatch=Stock detail per lot
-SerialNumberAlreadyInUse=Serial number %s is already used for product %s
-TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-ManageLotMask=Custom mask
-CustomMasks=Option to define a different numbering mask for each product
-BatchLotNumberingModules=Numbering rule for automatic generation of lot number
-BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
-QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
-LifeTime=Life span (in days)
-EndOfLife=End of life
-ManufacturingDate=Manufacturing date
-DestructionDate=Destruction date
-FirstUseDate=First use date
-QCFrequency=Quality control frequency (in days)
-ShowAllLots=Show all lots
-HideLots=Hide lots
+printSellby=بذریعہ فروخت: %s
+printQty=مقدار: %d
+AddDispatchBatchLine=شیلف لائف ڈسپیچنگ کے لیے ایک لائن شامل کریں۔
+WhenProductBatchModuleOnOptionAreForced=جب ماڈیول لاٹ/سیریل آن ہوتا ہے، تو خودکار سٹاک کمی کو مجبور کیا جاتا ہے کہ 'شپنگ کی توثیق پر حقیقی اسٹاک کو کم کریں' اور خودکار اضافہ موڈ کو 'گوداموں میں دستی بھیجنے پر حقیقی اسٹاک میں اضافہ' کرنے پر مجبور کیا جاتا ہے اور اس میں ترمیم نہیں کی جا سکتی ہے۔ دوسرے آپشنز کی تعریف آپ کی مرضی کے مطابق کی جا سکتی ہے۔
+ProductDoesNotUseBatchSerial=اس پروڈکٹ میں لاٹ/سیریل نمبر استعمال نہیں ہوتا ہے۔
+ProductLotSetup=ماڈیول لاٹ/سیریل کا سیٹ اپ
+ShowCurrentStockOfLot=جوڑے کی مصنوعات/لاٹ کے لیے موجودہ اسٹاک دکھائیں۔
+ShowLogOfMovementIfLot=جوڑے کی مصنوعات/لاٹ کے لیے نقل و حرکت کا لاگ دکھائیں۔
+StockDetailPerBatch=فی لاٹ اسٹاک کی تفصیل
+SerialNumberAlreadyInUse=سیریل نمبر %s پہلے ہی پروڈکٹ %s کے لیے استعمال ہو چکا ہے
+TooManyQtyForSerialNumber=آپ کے پاس سیریل نمبر %s کے لیے صرف ایک پروڈکٹ %s ہو سکتا ہے۔
+ManageLotMask=حسب ضرورت ماسک
+CustomMasks=ہر پروڈکٹ کے لیے مختلف نمبرنگ ماسک کی وضاحت کرنے کا اختیار
+BatchLotNumberingModules=لاٹ نمبر کی خودکار جنریشن کے لیے نمبرنگ کا اصول
+BatchSerialNumberingModules=سیریل نمبر کی خودکار جنریشن کے لیے نمبرنگ کا اصول (ہر پروڈکٹ کے لیے 1 منفرد لاٹ/سیریل پراپرٹی والی مصنوعات کے لیے)
+QtyToAddAfterBarcodeScan=اسکین کردہ ہر بارکوڈ/لاٹ/سیریل کے لیے مقدار سے %s
+LifeTime=زندگی کا دورانیہ (دنوں میں)
+EndOfLife=زندگی کا خاتمہ
+ManufacturingDate=مینوفیکچرنگ کی تاریخ
+DestructionDate=تباہی کی تاریخ
+FirstUseDate=پہلے استعمال کی تاریخ
+QCFrequency=کوالٹی کنٹرول فریکوئنسی (دنوں میں)
+ShowAllLots=تمام لاٹ دکھائیں۔
+HideLots=لاٹ چھپائیں۔
 #Traceability - qc status
-OutOfOrder=Out of order
-InWorkingOrder=In working order
-ToReplace=Replace
+OutOfOrder=حکم سے باہر
+InWorkingOrder=ورکنگ آرڈر میں
+ToReplace=بدل دیں۔
diff --git a/htdocs/langs/ur_PK/products.lang b/htdocs/langs/ur_PK/products.lang
index a8942bd337f..e5e075a46f5 100644
--- a/htdocs/langs/ur_PK/products.lang
+++ b/htdocs/langs/ur_PK/products.lang
@@ -1,412 +1,412 @@
 # Dolibarr language file - Source file is en_US - products
-ProductRef=Product ref.
-ProductLabel=Product label
-ProductLabelTranslated=Translated product label
-ProductDescription=Product description
-ProductDescriptionTranslated=Translated product description
-ProductNoteTranslated=Translated product note
-ProductServiceCard=Products/Services card
-TMenuProducts=Products
-TMenuServices=Services
-Products=Products
-Services=Services
-Product=Product
-Service=Service
-ProductId=Product/service id
-Create=Create
-Reference=Reference
-NewProduct=New product
-NewService=New service
-ProductVatMassChange=Global VAT Update
-ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u></b> products and services!
-MassBarcodeInit=Mass barcode init
-MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
-ProductAccountancyBuyCode=Accounting code (purchase)
-ProductAccountancyBuyIntraCode=Accounting code (purchase intra-community)
-ProductAccountancyBuyExportCode=Accounting code (purchase import)
-ProductAccountancySellCode=Accounting code (sale)
-ProductAccountancySellIntraCode=Accounting code (sale intra-Community)
-ProductAccountancySellExportCode=Accounting code (sale export)
-ProductOrService=Product or Service
-ProductsAndServices=Products and Services
-ProductsOrServices=Products or Services
-ProductsPipeServices=Products | Services
-ProductsOnSale=Products for sale
-ProductsOnPurchase=Products for purchase
-ProductsOnSaleOnly=Products for sale only
-ProductsOnPurchaseOnly=Products for purchase only
-ProductsNotOnSell=Products not for sale and not for purchase
-ProductsOnSellAndOnBuy=Products for sale and for purchase
-ServicesOnSale=Services for sale
-ServicesOnPurchase=Services for purchase
-ServicesOnSaleOnly=Services for sale only
-ServicesOnPurchaseOnly=Services for purchase only
-ServicesNotOnSell=Services not for sale and not for purchase
-ServicesOnSellAndOnBuy=Services for sale and for purchase
-LastModifiedProductsAndServices=Latest %s products/services which were modified
-LastRecordedProducts=Latest %s recorded products
-LastRecordedServices=Latest %s recorded services
-CardProduct0=Product
-CardProduct1=Service
-Stock=Stock
-MenuStocks=Stocks
-Stocks=Stocks and location (warehouse) of products
-Movements=Movements
-Sell=Sell
-Buy=Purchase
-OnSell=For sale
-OnBuy=For purchase
-NotOnSell=Not for sale
-ProductStatusOnSell=For sale
-ProductStatusNotOnSell=Not for sale
-ProductStatusOnSellShort=For sale
-ProductStatusNotOnSellShort=Not for sale
-ProductStatusOnBuy=For purchase
-ProductStatusNotOnBuy=Not for purchase
-ProductStatusOnBuyShort=For purchase
-ProductStatusNotOnBuyShort=Not for purchase
-UpdateVAT=Update vat
-UpdateDefaultPrice=Update default price
-UpdateLevelPrices=Update prices for each level
-AppliedPricesFrom=Applied from
-SellingPrice=Selling price
-SellingPriceHT=Selling price (excl. tax)
-SellingPriceTTC=Selling price (inc. tax)
-SellingMinPriceTTC=Minimum Selling price (inc. tax)
-CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
-CostPriceUsage=This value could be used for margin calculation.
-ManufacturingPrice=Manufacturing price
-SoldAmount=Sold amount
-PurchasedAmount=Purchased amount
-NewPrice=New price
-MinPrice=Min. selling price
-EditSellingPriceLabel=Edit selling price label
-CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
-ContractStatusClosed=Closed
-ErrorProductAlreadyExists=A product with reference %s already exists.
-ErrorProductBadRefOrLabel=Wrong value for reference or label.
-ErrorProductClone=There was a problem while trying to clone the product or service.
-ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
-Suppliers=Vendors
-SupplierRef=Vendor SKU
-ShowProduct=Show product
-ShowService=Show service
-ProductsAndServicesArea=Product and Services area
-ProductsArea=Product area
-ServicesArea=Services area
-ListOfStockMovements=List of stock movements
-BuyingPrice=Buying price
-PriceForEachProduct=Products with specific prices
-SupplierCard=Vendor card
-PriceRemoved=Price removed
-BarCode=Barcode
-BarcodeType=Barcode type
-SetDefaultBarcodeType=Set barcode type
-BarcodeValue=Barcode value
-NoteNotVisibleOnBill=Note (not visible on invoices, proposals...)
-ServiceLimitedDuration=If product is a service with limited duration:
-FillWithLastServiceDates=Fill with last service line dates
-MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
-MultiPricesNumPrices=Number of prices
-DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Enable Kits (set of several products)
-VariantsAbility=Enable Variants (variations of products, for example color, size)
-AssociatedProducts=Kits
-AssociatedProductsNumber=Number of products composing this kit
-ParentProductsNumber=Number of parent packaging product
-ParentProducts=Parent products
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
-KeywordFilter=Keyword filter
-CategoryFilter=Category filter
-ProductToAddSearch=Search product to add
-NoMatchFound=No match found
-ListOfProductsServices=List of products/services
-ProductAssociationList=List of products/services that are component(s) of this kit
-ProductParentList=List of kits with this product as a component
-ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
-DeleteProduct=Delete a product/service
-ConfirmDeleteProduct=Are you sure you want to delete this product/service?
-ProductDeleted=Product/Service "%s" deleted from database.
-ExportDataset_produit_1=Products
-ExportDataset_service_1=Services
-ImportDataset_produit_1=Products
-ImportDataset_service_1=Services
-DeleteProductLine=Delete product line
-ConfirmDeleteProductLine=Are you sure you want to delete this product line?
-ProductSpecial=Special
-QtyMin=Min. purchase quantity
-PriceQtyMin=Price quantity min.
-PriceQtyMinCurrency=Price (currency) for this qty. (no discount)
-VATRateForSupplierProduct=VAT Rate (for this vendor/product)
-DiscountQtyMin=Discount for this qty.
-NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
-NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
-PredefinedItem=Predefined item
-PredefinedProductsToSell=Predefined Product
-PredefinedServicesToSell=Predefined Service
-PredefinedProductsAndServicesToSell=Predefined products/services to sell
-PredefinedProductsToPurchase=Predefined product to purchase
-PredefinedServicesToPurchase=Predefined services to purchase
-PredefinedProductsAndServicesToPurchase=Predefined products/services to purchase
-NotPredefinedProducts=Not predefined products/services
-GenerateThumb=Generate thumb
-ServiceNb=Service #%s
-ListProductServiceByPopularity=List of products/services by popularity
-ListProductByPopularity=List of products by popularity
-ListServiceByPopularity=List of services by popularity
-Finished=Manufactured product
-RowMaterial=Raw Material
-ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
-CloneContentProduct=Clone all main information of the product/service
-ClonePricesProduct=Clone prices
-CloneCategoriesProduct=Clone linked tags/categories
-CloneCompositionProduct=Clone virtual products/services
-CloneCombinationsProduct=Clone the product variants
-ProductIsUsed=This product is used
-NewRefForClone=Ref. of new product/service
-SellingPrices=Selling prices
-BuyingPrices=Buying prices
-CustomerPrices=Customer prices
-SuppliersPrices=Vendor prices
-SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs|Commodity|HS code
-CountryOrigin=Country of origin
-RegionStateOrigin=Region of origin
-StateOrigin=State|Province of origin
-Nature=Nature of product (raw/manufactured)
-NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or manufactured product
-ShortLabel=Short label
-Unit=Unit
-p=u.
-set=set
-se=set
-second=second
+ProductRef=پروڈکٹ کا حوالہ
+ProductLabel=پروڈکٹ کا لیبل
+ProductLabelTranslated=ترجمہ شدہ پروڈکٹ لیبل
+ProductDescription=مصنوعات کی وضاحت
+ProductDescriptionTranslated=ترجمہ شدہ مصنوعات کی تفصیل
+ProductNoteTranslated=ترجمہ شدہ پروڈکٹ نوٹ
+ProductServiceCard=پروڈکٹس/سروسز کارڈ
+TMenuProducts=مصنوعات
+TMenuServices=خدمات
+Products=مصنوعات
+Services=خدمات
+Product=پروڈکٹ
+Service=سروس
+ProductId=پروڈکٹ/سروس آئی ڈی
+Create=بنانا
+Reference=حوالہ
+NewProduct=نئی بنائی گئی چیز
+NewService=نئی سروس
+ProductVatMassChange=عالمی VAT اپ ڈیٹ
+ProductVatMassChangeDesc=یہ ٹول <b> <u> ALL </u> </b> مصنوعات اور خدمات پر بیان کردہ VAT کی شرح کو اپ ڈیٹ کرتا ہے!
+MassBarcodeInit=بڑے پیمانے پر بارکوڈ init
+MassBarcodeInitDesc=اس صفحہ کو ان اشیاء پر بار کوڈ شروع کرنے کے لیے استعمال کیا جا سکتا ہے جن میں بار کوڈ کی وضاحت نہیں کی گئی ہے۔ ماڈیول بارکوڈ کا سیٹ اپ مکمل ہونے سے پہلے چیک کریں۔
+ProductAccountancyBuyCode=اکاؤنٹنگ کوڈ (خریداری)
+ProductAccountancyBuyIntraCode=اکاؤنٹنگ کوڈ (انٹرا کمیونٹی خریدیں)
+ProductAccountancyBuyExportCode=اکاؤنٹنگ کوڈ (خرید درآمد)
+ProductAccountancySellCode=اکاؤنٹنگ کوڈ (فروخت)
+ProductAccountancySellIntraCode=اکاؤنٹنگ کوڈ (فروخت انٹرا کمیونٹی)
+ProductAccountancySellExportCode=اکاؤنٹنگ کوڈ (فروخت کی برآمد)
+ProductOrService=پروڈکٹ یا سروس
+ProductsAndServices=مصنوعات اور خدمات
+ProductsOrServices=مصنوعات یا خدمات
+ProductsPipeServices=مصنوعات | خدمات
+ProductsOnSale=مصنوعات برائے فروخت
+ProductsOnPurchase=خریداری کے لیے مصنوعات
+ProductsOnSaleOnly=صرف فروخت کے لیے مصنوعات
+ProductsOnPurchaseOnly=صرف خریداری کے لیے مصنوعات
+ProductsNotOnSell=مصنوعات برائے فروخت اور نہ ہی خریداری کے لیے
+ProductsOnSellAndOnBuy=مصنوعات برائے فروخت اور خریداری
+ServicesOnSale=خدمات برائے فروخت
+ServicesOnPurchase=خریداری کے لیے خدمات
+ServicesOnSaleOnly=خدمات صرف فروخت کے لیے
+ServicesOnPurchaseOnly=خدمات صرف خریداری کے لیے
+ServicesNotOnSell=خدمات فروخت کے لیے نہیں اور نہ ہی خریداری کے لیے
+ServicesOnSellAndOnBuy=فروخت اور خریداری کے لیے خدمات
+LastModifiedProductsAndServices=تازہ ترین %s مصنوعات/خدمات جن میں ترمیم کی گئی تھی۔
+LastRecordedProducts=تازہ ترین %s ریکارڈ شدہ مصنوعات
+LastRecordedServices=تازہ ترین %s ریکارڈ شدہ خدمات
+CardProduct0=پروڈکٹ
+CardProduct1=سروس
+Stock=اسٹاک
+MenuStocks=اسٹاکس
+Stocks=مصنوعات کا ذخیرہ اور مقام (گودام)
+Movements=حرکتیں
+Sell=بیچنا
+Buy=خریداری
+OnSell=فروخت کے لئے
+OnBuy=خریداری کے لیے
+NotOnSell=فروخت کے لئے نہیں
+ProductStatusOnSell=فروخت کے لئے
+ProductStatusNotOnSell=فروخت کے لئے نہیں
+ProductStatusOnSellShort=فروخت کے لئے
+ProductStatusNotOnSellShort=فروخت کے لئے نہیں
+ProductStatusOnBuy=خریداری کے لیے
+ProductStatusNotOnBuy=خریداری کے لیے نہیں۔
+ProductStatusOnBuyShort=خریداری کے لیے
+ProductStatusNotOnBuyShort=خریداری کے لیے نہیں۔
+UpdateVAT=vat کو اپ ڈیٹ کریں۔
+UpdateDefaultPrice=پہلے سے طے شدہ قیمت کو اپ ڈیٹ کریں۔
+UpdateLevelPrices=ہر سطح کے لیے قیمتیں اپ ڈیٹ کریں۔
+AppliedPricesFrom=سے اپلائی کیا گیا۔
+SellingPrice=قیمت فروخت
+SellingPriceHT=فروخت کی قیمت (ٹیکس کے علاوہ)
+SellingPriceTTC=فروخت کی قیمت (انک ٹیکس)
+SellingMinPriceTTC=کم از کم فروخت کی قیمت (انک ٹیکس)
+CostPriceDescription=اس پرائس فیلڈ (ٹیکس کے علاوہ) کا استعمال آپ کی کمپنی کے لیے اس پروڈکٹ کی اوسط رقم کو حاصل کرنے کے لیے کیا جا سکتا ہے۔ یہ کوئی بھی قیمت ہو سکتی ہے جس کا آپ خود حساب لگاتے ہیں، مثال کے طور پر، خرید کی اوسط قیمت کے علاوہ اوسط پیداوار اور تقسیم کی لاگت سے۔
+CostPriceUsage=اس قدر کو مارجن کے حساب کتاب کے لیے استعمال کیا جا سکتا ہے۔
+ManufacturingPrice=مینوفیکچرنگ کی قیمت
+SoldAmount=فروخت شدہ رقم
+PurchasedAmount=خریدی ہوئی رقم
+NewPrice=نئی قیمت
+MinPrice=کم سے کم قیمت فروخت
+EditSellingPriceLabel=فروخت کی قیمت کے لیبل میں ترمیم کریں۔
+CantBeLessThanMinPrice=فروخت کی قیمت اس پروڈکٹ کے لیے اجازت شدہ کم از کم سے کم نہیں ہو سکتی (بغیر ٹیکس کے %s)۔ اگر آپ بہت اہم رعایت ٹائپ کرتے ہیں تو یہ پیغام بھی ظاہر ہو سکتا ہے۔
+ContractStatusClosed=بند
+ErrorProductAlreadyExists=حوالہ %s کے ساتھ ایک پروڈکٹ پہلے سے موجود ہے۔
+ErrorProductBadRefOrLabel=حوالہ یا لیبل کے لیے غلط قدر۔
+ErrorProductClone=پروڈکٹ یا سروس کو کلون کرنے کی کوشش کرتے وقت ایک مسئلہ تھا۔
+ErrorPriceCantBeLowerThanMinPrice=خرابی، قیمت کم از کم قیمت سے کم نہیں ہو سکتی۔
+Suppliers=فروش
+SupplierRef=وینڈر SKU
+ShowProduct=پروڈکٹ دکھائیں۔
+ShowService=سروس دکھائیں۔
+ProductsAndServicesArea=مصنوعات اور خدمات کا علاقہ
+ProductsArea=پروڈکٹ کا علاقہ
+ServicesArea=خدمات کا علاقہ
+ListOfStockMovements=اسٹاک کی نقل و حرکت کی فہرست
+BuyingPrice=قیمت خریدنا
+PriceForEachProduct=مخصوص قیمتوں کے ساتھ مصنوعات
+SupplierCard=وینڈر کارڈ
+PriceRemoved=قیمت ہٹا دی گئی۔
+BarCode=بارکوڈ
+BarcodeType=بارکوڈ کی قسم
+SetDefaultBarcodeType=بارکوڈ کی قسم سیٹ کریں۔
+BarcodeValue=بارکوڈ ویلیو
+NoteNotVisibleOnBill=نوٹ (انوائسز، تجاویز پر نظر نہیں آتا...)
+ServiceLimitedDuration=اگر پروڈکٹ محدود مدت کے ساتھ سروس ہے:
+FillWithLastServiceDates=آخری سروس لائن کی تاریخوں کے ساتھ پُر کریں۔
+MultiPricesAbility=ایک سے زیادہ قیمت کے حصے فی پروڈکٹ/سروس (ہر صارف ایک قیمت کے حصے میں ہے)
+MultiPricesNumPrices=قیمتوں کی تعداد
+DefaultPriceType=نئی فروخت کی قیمتیں شامل کرتے وقت فی ڈیفالٹ قیمتوں کی بنیاد (بمقابلہ ٹیکس کے ساتھ)
+AssociatedProductsAbility=کٹس کو فعال کریں (متعدد مصنوعات کا سیٹ)
+VariantsAbility=متغیرات کو فعال کریں (مصنوعات کی مختلف حالتیں، مثال کے طور پر رنگ، سائز)
+AssociatedProducts=کٹس
+AssociatedProductsNumber=اس کٹ کو بنانے والی مصنوعات کی تعداد
+ParentProductsNumber=پیرنٹ پیکیجنگ پروڈکٹ کی تعداد
+ParentProducts=والدین کی مصنوعات
+IfZeroItIsNotAVirtualProduct=اگر 0، تو یہ پروڈکٹ کٹ نہیں ہے۔
+IfZeroItIsNotUsedByVirtualProduct=اگر 0، تو یہ پروڈکٹ کسی بھی کٹ کے ذریعے استعمال نہیں ہوتی ہے۔
+KeywordFilter=مطلوبہ الفاظ کا فلٹر
+CategoryFilter=زمرہ فلٹر
+ProductToAddSearch=شامل کرنے کے لیے پروڈکٹ تلاش کریں۔
+NoMatchFound=کوئی مماثلت نہیں ملی
+ListOfProductsServices=مصنوعات/خدمات کی فہرست
+ProductAssociationList=پروڈکٹس/سروسز کی فہرست جو اس کٹ کے جزو(زبانیں) ہیں۔
+ProductParentList=ایک جزو کے طور پر اس پروڈکٹ کے ساتھ کٹس کی فہرست
+ErrorAssociationIsFatherOfThis=منتخب کردہ پروڈکٹ میں سے ایک موجودہ پروڈکٹ کا پیرنٹ ہے۔
+DeleteProduct=ایک پروڈکٹ/سروس کو حذف کریں۔
+ConfirmDeleteProduct=کیا آپ واقعی اس پروڈکٹ/سروس کو حذف کرنا چاہتے ہیں؟
+ProductDeleted=پروڈکٹ/سروس "%s" کو ڈیٹا بیس سے حذف کر دیا گیا۔
+ExportDataset_produit_1=مصنوعات
+ExportDataset_service_1=خدمات
+ImportDataset_produit_1=مصنوعات
+ImportDataset_service_1=خدمات
+DeleteProductLine=پروڈکٹ لائن کو حذف کریں۔
+ConfirmDeleteProductLine=کیا آپ واقعی اس پروڈکٹ لائن کو حذف کرنا چاہتے ہیں؟
+ProductSpecial=خاص
+QtyMin=کم از کم خریداری کی مقدار
+PriceQtyMin=قیمت کی مقدار کم از کم
+PriceQtyMinCurrency=اس مقدار کے لیے قیمت (کرنسی)۔ (کوئی رعایت نہیں)
+VATRateForSupplierProduct=VAT کی شرح (اس وینڈر/پروڈکٹ کے لیے)
+DiscountQtyMin=اس مقدار کے لیے رعایت۔
+NoPriceDefinedForThisSupplier=اس وینڈر/ پروڈکٹ کے لیے کوئی قیمت/ مقدار متعین نہیں ہے۔
+NoSupplierPriceDefinedForThisProduct=اس پروڈکٹ کے لیے کوئی وینڈر قیمت/ مقدار کی وضاحت نہیں کی گئی ہے۔
+PredefinedItem=پہلے سے طے شدہ آئٹم
+PredefinedProductsToSell=پہلے سے طے شدہ مصنوعات
+PredefinedServicesToSell=پہلے سے طے شدہ سروس
+PredefinedProductsAndServicesToSell=فروخت کے لیے پیش وضاحتی مصنوعات/خدمات
+PredefinedProductsToPurchase=خریداری کے لیے پہلے سے طے شدہ پروڈکٹ
+PredefinedServicesToPurchase=خریداری کے لیے پہلے سے طے شدہ خدمات
+PredefinedProductsAndServicesToPurchase=خریداری کے لیے پہلے سے طے شدہ مصنوعات/خدمات
+NotPredefinedProducts=پہلے سے طے شدہ مصنوعات/خدمات نہیں۔
+GenerateThumb=انگوٹھا بنائیں
+ServiceNb=سروس #%s
+ListProductServiceByPopularity=مقبولیت کے لحاظ سے مصنوعات/خدمات کی فہرست
+ListProductByPopularity=مقبولیت کے لحاظ سے مصنوعات کی فہرست
+ListServiceByPopularity=فہرست خدمات بلحاظ مقبولیت
+Finished=تیار شدہ مصنوعات
+RowMaterial=خام مال
+ConfirmCloneProduct=کیا آپ واقعی پروڈکٹ یا سروس <b> %s </b> کلون کرنا چاہتے ہیں؟
+CloneContentProduct=پروڈکٹ/سروس کی تمام اہم معلومات کو کلون کریں۔
+ClonePricesProduct=کلون کی قیمتیں۔
+CloneCategoriesProduct=منسلک ٹیگز/زمرے کلون کریں۔
+CloneCompositionProduct=ورچوئل پروڈکٹس/سروسز کو کلون کریں۔
+CloneCombinationsProduct=مصنوعات کی مختلف حالتوں کو کلون کریں۔
+ProductIsUsed=اس کی مصنوعات کو استعمال کیا جاتا ہے
+NewRefForClone=حوالہ نئی مصنوعات/سروس کا
+SellingPrices=قیمتیں فروخت کرنا
+BuyingPrices=قیمتیں خریدنا
+CustomerPrices=گاہک کی قیمتیں۔
+SuppliersPrices=فروش کی قیمتیں۔
+SuppliersPricesOfProductsOrServices=وینڈر کی قیمتیں (مصنوعات یا خدمات کی)
+CustomCode=کسٹمز|کموڈٹی|HS کوڈ
+CountryOrigin=پیدائشی ملک
+RegionStateOrigin=اصل کا علاقہ
+StateOrigin=ریاست | اصل کا صوبہ
+Nature=مصنوعات کی نوعیت (خام / تیار شدہ)
+NatureOfProductShort=مصنوعات کی نوعیت
+NatureOfProductDesc=خام مال یا تیار کردہ مصنوعات
+ShortLabel=مختصر لیبل
+Unit=یونٹ
+p=u
+set=سیٹ
+se=سیٹ
+second=دوسرا
 s=s
-hour=hour
+hour=گھنٹہ
 h=h
-day=day
+day=دن
 d=d
-kilogram=kilogram
-kg=Kg
-gram=gram
-g=g
-meter=meter
+kilogram=کلوگرام
+kg=کلو
+gram=چنا
+g=جی
+meter=میٹر
 m=m
 lm=lm
 m2=m²
 m3=m³
-liter=liter
-l=L
-unitP=Piece
-unitSET=Set
-unitS=Second
-unitH=Hour
-unitD=Day
-unitG=Gram
-unitM=Meter
-unitLM=Linear meter
-unitM2=Square meter
-unitM3=Cubic meter
-unitL=Liter
-unitT=ton
-unitKG=kg
-unitG=Gram
-unitMG=mg
-unitLB=pound
-unitOZ=ounce
-unitM=Meter
-unitDM=dm
-unitCM=cm
-unitMM=mm
-unitFT=ft
-unitIN=in
-unitM2=Square meter
+liter=لیٹر
+l=ایل
+unitP=ٹکڑا
+unitSET=سیٹ
+unitS=دوسرا
+unitH=گھنٹہ
+unitD=دن
+unitG=چنے
+unitM=میٹر
+unitLM=لکیری میٹر
+unitM2=مربع میٹر
+unitM3=کیوبک میٹر
+unitL=لیٹر
+unitT=ٹن
+unitKG=کلو
+unitG=چنے
+unitMG=ملی گرام
+unitLB=پونڈ
+unitOZ=اونس
+unitM=میٹر
+unitDM=ڈی ایم
+unitCM=سینٹی میٹر
+unitMM=ملی میٹر
+unitFT=فٹ
+unitIN=میں
+unitM2=مربع میٹر
 unitDM2=dm²
 unitCM2=cm²
 unitMM2=mm²
 unitFT2=ft²
-unitIN2=in²
-unitM3=Cubic meter
+unitIN2=میں²
+unitM3=کیوبک میٹر
 unitDM3=dm³
 unitCM3=cm³
 unitMM3=mm³
 unitFT3=ft³
 unitIN3=in³
-unitOZ3=ounce
-unitgallon=gallon
-ProductCodeModel=Product ref template
-ServiceCodeModel=Service ref template
-CurrentProductPrice=Current price
-AlwaysUseNewPrice=Always use current price of product/service
-AlwaysUseFixedPrice=Use the fixed price
-PriceByQuantity=Different prices by quantity
-DisablePriceByQty=Disable prices by quantity
-PriceByQuantityRange=Quantity range
-MultipriceRules=Automatic prices for segment
-UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
-PercentVariationOver=%% variation over %s
-PercentDiscountOver=%% discount over %s
-KeepEmptyForAutoCalculation=Keep empty to have this calculated automatically from weight or volume of products
-VariantRefExample=Examples: COL, SIZE
-VariantLabelExample=Examples: Color, Size
+unitOZ3=اونس
+unitgallon=گیلن
+ProductCodeModel=پروڈکٹ ریف ٹیمپلیٹ
+ServiceCodeModel=سروس ریف ٹیمپلیٹ
+CurrentProductPrice=موجودہ قیمت
+AlwaysUseNewPrice=ہمیشہ پروڈکٹ/سروس کی موجودہ قیمت استعمال کریں۔
+AlwaysUseFixedPrice=مقررہ قیمت استعمال کریں۔
+PriceByQuantity=مقدار کے لحاظ سے مختلف قیمتیں۔
+DisablePriceByQty=مقدار کے لحاظ سے قیمتوں کو غیر فعال کریں۔
+PriceByQuantityRange=مقدار کی حد
+MultipriceRules=سیگمنٹ کے لیے خودکار قیمتیں۔
+UseMultipriceRules=پہلے سیگمنٹ کے مطابق دیگر تمام سیگمنٹس کی قیمتوں کا خود بخود حساب لگانے کے لیے پرائس سیگمنٹ رولز (پروڈکٹ ماڈیول سیٹ اپ میں بیان کردہ) استعمال کریں۔
+PercentVariationOver=%% %s پر تغیر
+PercentDiscountOver=%% ڈسکاؤنٹ %s پر
+KeepEmptyForAutoCalculation=مصنوعات کے وزن یا حجم سے خود بخود اس کا حساب لگانے کے لیے خالی رکھیں
+VariantRefExample=مثالیں: COL، SIZE
+VariantLabelExample=مثالیں: رنگ، سائز
 ### composition fabrication
-Build=Produce
-ProductsMultiPrice=Products and prices for each price segment
-ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
-ProductSellByQuarterHT=Products turnover quarterly before tax
-ServiceSellByQuarterHT=Services turnover quarterly before tax
-Quarter1=1st. Quarter
-Quarter2=2nd. Quarter
-Quarter3=3rd. Quarter
-Quarter4=4th. Quarter
-BarCodePrintsheet=Print barcode
-PageToGenerateBarCodeSheets=With this tool, you can print sheets of barcode stickers. Choose format of your sticker page, type of barcode and value of barcode, then click on button <b>%s</b>.
-NumberOfStickers=Number of stickers to print on page
-PrintsheetForOneBarCode=Print several stickers for one barcode
-BuildPageToPrint=Generate page to print
-FillBarCodeTypeAndValueManually=Fill barcode type and value manually.
-FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product.
-FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
-DefinitionOfBarCodeForProductNotComplete=Definition of type or value of barcode not complete for product %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of barcode non complete for third party %s.
-BarCodeDataForProduct=Barcode information of product %s:
-BarCodeDataForThirdparty=Barcode information of third party %s:
-ResetBarcodeForAllRecords=Define barcode value for all record (this will also reset barcode value already defined with new values)
-PriceByCustomer=Different prices for each customer
-PriceCatalogue=A single sell price per product/service
-PricingRule=Rules for selling prices
-AddCustomerPrice=Add price by customer
-ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
-PriceByCustomerLog=Log of previous customer prices
-MinimumPriceLimit=Minimum price can't be lower then %s
-MinimumRecommendedPrice=Minimum recommended price is: %s
-PriceExpressionEditor=Price expression editor
-PriceExpressionSelected=Selected price expression
-PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like <b>#extrafield_myextrafieldkey#</b> and global variables with <b>#global_mycode#</b>
-PriceExpressionEditorHelp3=In both product/service and vendor prices there are these variables available:<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
-PriceExpressionEditorHelp4=In product/service price only: <b>#supplier_min_price#</b><br>In vendor prices only: <b>#supplier_quantity# and #supplier_tva_tx#</b>
-PriceExpressionEditorHelp5=Available global values:
-PriceMode=Price mode
-PriceNumeric=Number
-DefaultPrice=Default price
-DefaultPriceLog=Log of previous default prices
-ComposedProductIncDecStock=Increase/Decrease stock on parent change
-ComposedProduct=Child products
-MinSupplierPrice=Minimum buying price
-MinCustomerPrice=Minimum selling price
-NoDynamicPrice=No dynamic price
-DynamicPriceConfiguration=Dynamic price configuration
-DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
-AddVariable=Add Variable
-AddUpdater=Add Updater
-GlobalVariables=Global variables
-VariableToUpdate=Variable to update
-GlobalVariableUpdaters=External updaters for variables
-GlobalVariableUpdaterType0=JSON data
-GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
-GlobalVariableUpdaterHelpFormat0=Format for request {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
-GlobalVariableUpdaterType1=WebService data
-GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
-GlobalVariableUpdaterHelpFormat1=Format for request is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data", "to": "send"}}
-UpdateInterval=Update interval (minutes)
-LastUpdated=Latest update
-CorrectlyUpdated=Correctly updated
-PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
-PropalMergePdfProductChooseFile=Select PDF files
-IncludingProductWithTag=Including products/services with the tag
-DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
-WarningSelectOneDocument=Please select at least one document
-DefaultUnitToShow=Unit
-NbOfQtyInProposals=Qty in proposals
-ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
-ProductsOrServicesTranslations=Products/Services translations
-TranslatedLabel=Translated label
-TranslatedDescription=Translated description
-TranslatedNote=Translated notes
-ProductWeight=Weight for 1 product
-ProductVolume=Volume for 1 product
-WeightUnits=Weight unit
-VolumeUnits=Volume unit
-WidthUnits=Width unit
-LengthUnits=Length unit
-HeightUnits=Height unit
-SurfaceUnits=Surface unit
-SizeUnits=Size unit
-DeleteProductBuyPrice=Delete buying price
-ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
-SubProduct=Sub product
-ProductSheet=Product sheet
-ServiceSheet=Service sheet
-PossibleValues=Possible values
-GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
-UseProductFournDesc=Add a feature to define the product description defined by the vendors (for each vendor reference) in addition to the description for customers
-ProductSupplierDescription=Vendor description for the product
-UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
-PackagingForThisProduct=Packaging
-PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
-QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
+Build=پیدا کرنا
+ProductsMultiPrice=ہر قیمت والے حصے کے لیے پروڈکٹس اور قیمتیں۔
+ProductsOrServiceMultiPrice=کسٹمر کی قیمتیں (مصنوعات یا خدمات کی، کثیر قیمتیں)
+ProductSellByQuarterHT=ٹیکس سے پہلے سہ ماہی مصنوعات کا کاروبار
+ServiceSellByQuarterHT=ٹیکس سے پہلے سہ ماہی خدمات کا کاروبار
+Quarter1=1st. کوارٹر
+Quarter2=2nd کوارٹر
+Quarter3=3rd کوارٹر
+Quarter4=4th. کوارٹر
+BarCodePrintsheet=بارکوڈ پرنٹ کریں۔
+PageToGenerateBarCodeSheets=اس ٹول کے ذریعے، آپ بارکوڈ اسٹیکرز کی شیٹ پرنٹ کر سکتے ہیں۔ اپنے اسٹیکر پیج کا فارمیٹ، بارکوڈ کی قسم اور بارکوڈ کی قدر کا انتخاب کریں، پھر بٹن <b> %s </b> پر کلک کریں۔
+NumberOfStickers=صفحہ پر پرنٹ کرنے کے لیے اسٹیکرز کی تعداد
+PrintsheetForOneBarCode=ایک بار کوڈ کے لیے کئی اسٹیکرز پرنٹ کریں۔
+BuildPageToPrint=پرنٹ کرنے کے لیے صفحہ بنائیں
+FillBarCodeTypeAndValueManually=بار کوڈ کی قسم اور قیمت دستی طور پر پُر کریں۔
+FillBarCodeTypeAndValueFromProduct=کسی پروڈکٹ کے بارکوڈ سے بارکوڈ کی قسم اور قیمت بھریں۔
+FillBarCodeTypeAndValueFromThirdParty=کسی تیسرے فریق کے بارکوڈ سے بارکوڈ کی قسم اور قدر کو پُر کریں۔
+DefinitionOfBarCodeForProductNotComplete=بار کوڈ کی قسم یا قدر کی تعریف %s پروڈکٹ کے لیے مکمل نہیں ہے۔
+DefinitionOfBarCodeForThirdpartyNotComplete=بار کوڈ کی قسم یا قدر کی تعریف تھرڈ پارٹی %s کے لیے مکمل نہیں۔
+BarCodeDataForProduct=%s پروڈکٹ کے بارکوڈ کی معلومات:
+BarCodeDataForThirdparty=فریق ثالث کی بارکوڈ کی معلومات %s:
+ResetBarcodeForAllRecords=تمام ریکارڈ کے لیے بارکوڈ ویلیو کی وضاحت کریں (یہ بارکوڈ ویلیو کو بھی ری سیٹ کر دے گا جو پہلے سے نئی قدروں کے ساتھ بیان کی گئی ہے)
+PriceByCustomer=ہر گاہک کے لیے مختلف قیمتیں۔
+PriceCatalogue=فی پروڈکٹ/سروس ایک واحد فروخت قیمت
+PricingRule=قیمت فروخت کرنے کے قواعد
+AddCustomerPrice=گاہک کے حساب سے قیمت شامل کریں۔
+ForceUpdateChildPriceSoc=گاہک کے ذیلی اداروں پر ایک ہی قیمت مقرر کریں۔
+PriceByCustomerLog=سابقہ کسٹمر کی قیمتوں کا لاگ
+MinimumPriceLimit=کم از کم قیمت %s سے کم نہیں ہو سکتی
+MinimumRecommendedPrice=کم از کم تجویز کردہ قیمت ہے: %s
+PriceExpressionEditor=قیمت اظہار ایڈیٹر
+PriceExpressionSelected=منتخب کردہ قیمت کا اظہار
+PriceExpressionEditorHelp1=قیمت مقرر کرنے کے لیے "قیمت = 2 + 2" یا "2 + 2"۔ استعمال کریں؛ اظہار کو الگ کرنے کے لیے
+PriceExpressionEditorHelp2=آپ متغیرات جیسے <b> #extrafield_myextrafieldkey# </b> اور عالمی متغیرات کے ساتھ <b> #global_mycode# a09a4b739f17f17 کے ساتھ ExtraFields تک رسائی حاصل کر سکتے ہیں۔
+PriceExpressionEditorHelp3=پروڈکٹ/سروس اور وینڈر دونوں کی قیمتوں میں یہ متغیرات دستیاب ہیں: <br> <b> #tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_19bz788#
+PriceExpressionEditorHelp4=صرف پروڈکٹ/سروس کی قیمتوں میں: <b> #supplier_min_price# </b> <br> صرف وینڈر کی قیمتوں میں: <b> #supplier_squantity_19837fz0 #supplier_squantity_19837fz0#
+PriceExpressionEditorHelp5=دستیاب عالمی اقدار:
+PriceMode=قیمت موڈ
+PriceNumeric=نمبر
+DefaultPrice=پہلے سے طے شدہ قیمت
+DefaultPriceLog=پچھلی ڈیفالٹ قیمتوں کا لاگ
+ComposedProductIncDecStock=والدین کی تبدیلی پر اسٹاک میں اضافہ/کم کریں۔
+ComposedProduct=بچوں کی مصنوعات
+MinSupplierPrice=کم از کم قیمت خرید
+MinCustomerPrice=کم از کم فروخت کی قیمت
+NoDynamicPrice=کوئی متحرک قیمت نہیں۔
+DynamicPriceConfiguration=متحرک قیمت کی ترتیب
+DynamicPriceDesc=آپ کسٹمر یا وینڈر کی قیمتوں کا حساب لگانے کے لیے ریاضی کے فارمولوں کی وضاحت کر سکتے ہیں۔ ایسے فارمولے تمام ریاضیاتی آپریٹرز، کچھ مستقل اور متغیرات استعمال کر سکتے ہیں۔ آپ یہاں ان متغیرات کی وضاحت کر سکتے ہیں جنہیں آپ استعمال کرنا چاہتے ہیں۔ اگر متغیر کو خودکار اپ ڈیٹ کی ضرورت ہے، تو آپ Dolibarr کو قدر کو خود بخود اپ ڈیٹ کرنے کی اجازت دینے کے لیے بیرونی URL کی وضاحت کر سکتے ہیں۔
+AddVariable=متغیر شامل کریں۔
+AddUpdater=اپڈیٹر شامل کریں۔
+GlobalVariables=عالمی متغیرات
+VariableToUpdate=اپ ڈیٹ کرنے کے لیے متغیر
+GlobalVariableUpdaters=متغیرات کے لیے بیرونی اپڈیٹرز
+GlobalVariableUpdaterType0=JSON ڈیٹا
+GlobalVariableUpdaterHelp0=مخصوص URL سے JSON ڈیٹا کو پارس کرتا ہے، VALUE متعلقہ قدر کا مقام بتاتا ہے،
+GlobalVariableUpdaterHelpFormat0=درخواست کے لیے فارمیٹ {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=ویب سروس ڈیٹا
+GlobalVariableUpdaterHelp1=مخصوص URL سے WebService ڈیٹا کو پارس کرتا ہے، NS نام کی جگہ بتاتا ہے، 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=درست طریقے سے اپ ڈیٹ کیا گیا۔
+PropalMergePdfProductActualFile=PDF Azur میں شامل کرنے کے لیے فائلیں استعمال ہوتی ہیں۔
+PropalMergePdfProductChooseFile=پی ڈی ایف فائلوں کو منتخب کریں۔
+IncludingProductWithTag=ٹیگ کے ساتھ پروڈکٹس/سروسز سمیت
+DefaultPriceRealPriceMayDependOnCustomer=پہلے سے طے شدہ قیمت، اصل قیمت گاہک پر منحصر ہو سکتی ہے۔
+WarningSelectOneDocument=براہ کرم کم از کم ایک دستاویز منتخب کریں۔
+DefaultUnitToShow=یونٹ
+NbOfQtyInProposals=تجاویز میں مقدار
+ClinkOnALinkOfColumn=تفصیلی نظارہ حاصل کرنے کے لیے کالم %s کے لنک پر کلک کریں۔
+ProductsOrServicesTranslations=مصنوعات/خدمات کا ترجمہ
+TranslatedLabel=ترجمہ شدہ لیبل
+TranslatedDescription=ترجمہ شدہ تفصیل
+TranslatedNote=ترجمہ شدہ نوٹس
+ProductWeight=1 پروڈکٹ کا وزن
+ProductVolume=1 پروڈکٹ کا حجم
+WeightUnits=وزن کی اکائی
+VolumeUnits=حجم یونٹ
+WidthUnits=چوڑائی یونٹ
+LengthUnits=لمبائی یونٹ
+HeightUnits=اونچائی یونٹ
+SurfaceUnits=سطح کی اکائی
+SizeUnits=سائز یونٹ
+DeleteProductBuyPrice=خرید قیمت کو حذف کریں۔
+ConfirmDeleteProductBuyPrice=کیا آپ واقعی اس خرید قیمت کو حذف کرنا چاہتے ہیں؟
+SubProduct=ذیلی مصنوعات
+ProductSheet=پروڈکٹ شیٹ
+ServiceSheet=سروس شیٹ
+PossibleValues=ممکنہ اقدار
+GoOnMenuToCreateVairants=انتساب کی قسمیں تیار کرنے کے لیے مینو %s - %s پر جائیں (جیسے رنگ، سائز، ...)
+UseProductFournDesc=صارفین کے لیے تفصیل کے علاوہ وینڈرز (ہر وینڈر کے حوالے کے لیے) کے ذریعے بیان کردہ پروڈکٹ کی تفصیل کی وضاحت کرنے کے لیے ایک خصوصیت شامل کریں۔
+ProductSupplierDescription=پروڈکٹ کے لیے وینڈر کی تفصیل
+UseProductSupplierPackaging=سپلائر کی قیمتوں پر پیکیجنگ کا استعمال کریں (سپلائر کی دستاویزات میں لائن شامل/اپ ڈیٹ کرتے وقت سپلائر کی قیمت پر سیٹ کردہ پیکیجنگ کے مطابق مقدار کا دوبارہ حساب لگائیں)
+PackagingForThisProduct=پیکیجنگ
+PackagingForThisProductDesc=سپلائر کے آرڈر پر، آپ خود بخود اس مقدار (یا اس مقدار کا ایک کثیر) آرڈر کریں گے۔ کم از کم خریداری کی مقدار سے کم نہیں ہو سکتی
+QtyRecalculatedWithPackaging=لائن کی مقدار کو سپلائر پیکیجنگ کے مطابق دوبارہ شمار کیا گیا تھا۔
 
 #Attributes
-VariantAttributes=Variant attributes
-ProductAttributes=Variant attributes for products
-ProductAttributeName=Variant attribute %s
-ProductAttribute=Variant attribute
-ProductAttributeDeleteDialog=Are you sure you want to delete this attribute? All values will be deleted
-ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with reference "%s" of this attribute?
-ProductCombinationDeleteDialog=Are you sure want to delete the variant of the product "<strong>%s</strong>"?
-ProductCombinationAlreadyUsed=There was an error while deleting the variant. Please check it is not being used in any object
-ProductCombinations=Variants
-PropagateVariant=Propagate variants
-HideProductCombinations=Hide products variant in the products selector
-ProductCombination=Variant
-NewProductCombination=New variant
-EditProductCombination=Editing variant
-NewProductCombinations=New variants
-EditProductCombinations=Editing variants
-SelectCombination=Select combination
-ProductCombinationGenerator=Variants generator
-Features=Features
-PriceImpact=Price impact
-ImpactOnPriceLevel=Impact on price level %s
-ApplyToAllPriceImpactLevel= Apply to all levels
-ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
-WeightImpact=Weight impact
-NewProductAttribute=New attribute
-NewProductAttributeValue=New attribute value
-ErrorCreatingProductAttributeValue=There was an error while creating the attribute value. It could be because there is already an existing value with that reference
-ProductCombinationGeneratorWarning=If you continue, before generating new variants, all previous ones will be DELETED. Already existing ones will be updated with the new values
-TooMuchCombinationsWarning=Generating lots of variants may result in high CPU, memory usage and Dolibarr not able to create them. Enabling the option "%s" may help reduce memory usage.
-DoNotRemovePreviousCombinations=Do not remove previous variants
-UsePercentageVariations=Use percentage variations
-PercentageVariation=Percentage variation
-ErrorDeletingGeneratedProducts=There was an error while trying to delete existing product variants
-NbOfDifferentValues=No. of different values
-NbProducts=Number of products
-ParentProduct=Parent product
-HideChildProducts=Hide variant products
-ShowChildProducts=Show variant products
-NoEditVariants=Go to Parent product card and edit variants price impact in the variants tab
-ConfirmCloneProductCombinations=Would you like to copy all the product variants to the other parent product with the given reference?
-CloneDestinationReference=Destination product reference
-ErrorCopyProductCombinations=There was an error while copying the product variants
-ErrorDestinationProductNotFound=Destination product not found
-ErrorProductCombinationNotFound=Product variant not found
-ActionAvailableOnVariantProductOnly=Action only available on the variant of product
-ProductsPricePerCustomer=Product prices per customers
-ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
-DeleteLinkedProduct=Delete the child product linked to the combination
-AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
-PMPValue=Weighted average price
+VariantAttributes=متغیر صفات
+ProductAttributes=مصنوعات کے لیے متغیر صفات
+ProductAttributeName=متغیر وصف %s
+ProductAttribute=متغیر وصف
+ProductAttributeDeleteDialog=کیا آپ واقعی اس وصف کو حذف کرنا چاہتے ہیں؟ تمام اقدار کو حذف کر دیا جائے گا۔
+ProductAttributeValueDeleteDialog=کیا آپ واقعی اس انتساب کے حوالہ "%s" کے ساتھ قدر "%s" کو حذف کرنا چاہتے ہیں؟
+ProductCombinationDeleteDialog=کیا آپ یقینی طور پر پروڈکٹ کے مختلف قسم کو حذف کرنا چاہتے ہیں " <strong> %s </strong>"؟
+ProductCombinationAlreadyUsed=متغیر کو حذف کرتے وقت ایک خامی تھی۔ براہ کرم چیک کریں کہ یہ کسی چیز میں استعمال نہیں ہو رہا ہے۔
+ProductCombinations=متغیرات
+PropagateVariant=متغیرات کا پرچار کریں۔
+HideProductCombinations=پروڈکٹ سلیکٹر میں پروڈکٹس کے مختلف قسم کو چھپائیں۔
+ProductCombination=متغیر
+NewProductCombination=نیا ویرینٹ
+EditProductCombination=ایڈیٹنگ ویرینٹ
+NewProductCombinations=نئے متغیرات
+EditProductCombinations=تغیرات میں ترمیم کرنا
+SelectCombination=مجموعہ منتخب کریں۔
+ProductCombinationGenerator=متغیرات جنریٹر
+Features=خصوصیات
+PriceImpact=قیمت کا اثر
+ImpactOnPriceLevel=قیمت کی سطح %s پر اثر
+ApplyToAllPriceImpactLevel= تمام سطحوں پر لاگو کریں۔
+ApplyToAllPriceImpactLevelHelp=یہاں کلک کرکے آپ تمام سطحوں پر یکساں قیمت کا اثر مرتب کرتے ہیں۔
+WeightImpact=وزن کا اثر
+NewProductAttribute=نئی صفت
+NewProductAttributeValue=نئی خصوصیت کی قدر
+ErrorCreatingProductAttributeValue=انتساب کی قدر بناتے وقت ایک خرابی تھی۔ یہ اس لیے ہو سکتا ہے کہ اس حوالے کے ساتھ پہلے سے ہی ایک موجودہ قدر موجود ہے۔
+ProductCombinationGeneratorWarning=اگر آپ جاری رکھتے ہیں تو، نئی قسمیں بنانے سے پہلے، تمام سابقہ حذف کر دیے جائیں گے۔ پہلے سے موجود کو نئی اقدار کے ساتھ اپ ڈیٹ کیا جائے گا۔
+TooMuchCombinationsWarning=بہت ساری قسمیں پیدا کرنے کے نتیجے میں زیادہ CPU، میموری کا استعمال اور Dolibarr انہیں بنانے کے قابل نہیں ہو سکتا ہے۔ آپشن "%s" کو فعال کرنے سے میموری کے استعمال کو کم کرنے میں مدد مل سکتی ہے۔
+DoNotRemovePreviousCombinations=سابقہ متغیرات کو نہ ہٹائیں
+UsePercentageVariations=فیصد تغیرات کا استعمال کریں۔
+PercentageVariation=فیصد کی تبدیلی
+ErrorDeletingGeneratedProducts=موجودہ پروڈکٹ کی مختلف حالتوں کو حذف کرنے کی کوشش کے دوران ایک خامی تھی۔
+NbOfDifferentValues=مختلف اقدار کی تعداد
+NbProducts=مصنوعات کی تعداد
+ParentProduct=پیرنٹ پروڈکٹ
+HideChildProducts=مختلف مصنوعات چھپائیں۔
+ShowChildProducts=مختلف مصنوعات دکھائیں۔
+NoEditVariants=پیرنٹ پروڈکٹ کارڈ پر جائیں اور ویریئنٹس ٹیب میں مختلف قیمتوں کے اثرات میں ترمیم کریں۔
+ConfirmCloneProductCombinations=کیا آپ دیے گئے حوالہ کے ساتھ پروڈکٹ کی تمام اقسام کو دوسرے پیرنٹ پروڈکٹ میں کاپی کرنا چاہیں گے؟
+CloneDestinationReference=منزل مقصود پروڈکٹ کا حوالہ
+ErrorCopyProductCombinations=پروڈکٹ کی مختلف قسمیں کاپی کرتے وقت ایک خرابی تھی۔
+ErrorDestinationProductNotFound=منزل مقصود پروڈکٹ نہیں ملا
+ErrorProductCombinationNotFound=پروڈکٹ ویرینٹ نہیں ملا
+ActionAvailableOnVariantProductOnly=کارروائی صرف پروڈکٹ کے مختلف قسم پر دستیاب ہے۔
+ProductsPricePerCustomer=مصنوعات کی قیمتیں فی گاہک
+ProductSupplierExtraFields=اضافی خصوصیات (سپلائر کی قیمتیں)
+DeleteLinkedProduct=امتزاج سے منسلک چائلڈ پروڈکٹ کو حذف کریں۔
+AmountUsedToUpdateWAP=وزنی اوسط قیمت کو اپ ڈیٹ کرنے کے لیے استعمال کی جانے والی رقم
+PMPValue=وزنی اوسط قیمت
 PMPValueShort=WAP
-mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
-mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
-DefaultBOM=Default BOM
-DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
-Rank=Rank
-SwitchOnSaleStatus=Switch on sale status
-SwitchOnPurchaseStatus=Switch on purchase status
+mandatoryperiod=لازمی ادوار
+mandatoryPeriodNeedTobeSet=نوٹ: مدت (شروع اور اختتامی تاریخ) کی وضاحت ہونی چاہیے۔
+mandatoryPeriodNeedTobeSetMsgValidate=سروس کے لیے شروع اور اختتام کی مدت درکار ہوتی ہے۔
+mandatoryHelper=اس کو چیک کریں اگر آپ انوائس، تجارتی تجویز، سیلز آرڈر بناتے وقت اس سروس کے ساتھ شروع اور اختتامی تاریخ درج کیے بغیر صارف کو کوئی پیغام دینا چاہتے ہیں۔ <br> نوٹ کریں کہ پیغام ایک انتباہ ہے نہ کہ بلاک کرنے کی غلطی۔
+DefaultBOM=ڈیفالٹ BOM
+DefaultBOMDesc=پہلے سے طے شدہ BOM اس پروڈکٹ کو تیار کرنے کے لیے استعمال کرنے کی تجویز کرتا ہے۔ یہ فیلڈ صرف اس صورت میں سیٹ کی جا سکتی ہے جب پروڈکٹ کی نوعیت '%s' ہو۔
+Rank=رینک
+SwitchOnSaleStatus=فروخت کی حالت پر سوئچ کریں۔
+SwitchOnPurchaseStatus=خریداری کی حیثیت کو آن کریں۔
diff --git a/htdocs/langs/ur_PK/projects.lang b/htdocs/langs/ur_PK/projects.lang
index 5a2911bac0b..5342ff3c30e 100644
--- a/htdocs/langs/ur_PK/projects.lang
+++ b/htdocs/langs/ur_PK/projects.lang
@@ -1,286 +1,287 @@
 # Dolibarr language file - Source file is en_US - projects
-RefProject=Ref. project
-ProjectRef=Project ref.
-ProjectId=Project Id
-ProjectLabel=Project label
-ProjectsArea=Projects Area
-ProjectStatus=Project status
-SharedProject=Everybody
-PrivateProject=Project contacts
-ProjectsImContactFor=Projects for which I am explicitly a contact
-AllAllowedProjects=All project I can read (mine + public)
-AllProjects=All projects
-MyProjectsDesc=This view is limited to the projects that you are a contact for
-ProjectsPublicDesc=This view presents all projects you are allowed to read.
-TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
-ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
-ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
-TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
-MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
-OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
-ClosedProjectsAreHidden=Closed projects are not visible.
-TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
-TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
-AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
-ImportDatasetTasks=Tasks of projects
-ProjectCategories=Project tags/categories
-NewProject=New project
-AddProject=Create project
-DeleteAProject=Delete a project
-DeleteATask=Delete a task
-ConfirmDeleteAProject=Are you sure you want to delete this project?
-ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Open projects
-OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Leads amount of open projects by status
-OpportunitiesStatusForProjects=Leads amount of projects by status
-ShowProject=Show project
-ShowTask=Show task
-SetProject=Set project
-NoProject=No project defined or owned
-NbOfProjects=Number of projects
-NbOfTasks=Number of tasks
-TimeSpent=Time spent
-TimeSpentByYou=Time spent by you
-TimeSpentByUser=Time spent by user
-TimesSpent=Time spent
-TaskId=Task ID
-RefTask=Task ref.
-LabelTask=Task label
-TaskTimeSpent=Time spent on tasks
-TaskTimeUser=User
-TaskTimeNote=Note
-TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on open projects
-WorkloadNotDefined=Workload not defined
-NewTimeSpent=Time spent
-MyTimeSpent=My time spent
-BillTime=Bill the time spent
-BillTimeShort=Bill time
-TimeToBill=Time not billed
-TimeBilled=Time billed
-Tasks=Tasks
-Task=Task
-TaskDateStart=Task start date
-TaskDateEnd=Task end date
-TaskDescription=Task description
-NewTask=New task
-AddTask=Create task
-AddTimeSpent=Create time spent
-AddHereTimeSpentForDay=Add here time spent for this day/task
-AddHereTimeSpentForWeek=Add here time spent for this week/task
-Activity=Activity
-Activities=Tasks/activities
-MyActivities=My tasks/activities
-MyProjects=My projects
-MyProjectsArea=My projects Area
-DurationEffective=Effective duration
-ProgressDeclared=Declared real progress
-TaskProgressSummary=Task progress
-CurentlyOpenedTasks=Curently open tasks
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared real progress is less %s than the progress on consumption
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared real progress is more %s than the progress on consumption
-ProgressCalculated=Progress on consumption
-WhichIamLinkedTo=which I'm linked to
-WhichIamLinkedToProject=which I'm linked to project
-Time=Time
-TimeConsumed=Consumed
-ListOfTasks=List of tasks
-GoToListOfTimeConsumed=Go to list of time consumed
-GanttView=Gantt View
-ListWarehouseAssociatedProject=List of warehouses associated to the project
-ListProposalsAssociatedProject=List of the commercial proposals related to the project
-ListOrdersAssociatedProject=List of sales orders related to the project
-ListInvoicesAssociatedProject=List of customer invoices related to the project
-ListPredefinedInvoicesAssociatedProject=List of customer template invoices related to the project
-ListSupplierOrdersAssociatedProject=List of purchase orders related to the project
-ListSupplierInvoicesAssociatedProject=List of vendor invoices related to the project
-ListContractAssociatedProject=List of contracts related to the project
-ListShippingAssociatedProject=List of shippings related to the project
-ListFichinterAssociatedProject=List of interventions related to the project
-ListExpenseReportsAssociatedProject=List of expense reports related to the project
-ListDonationsAssociatedProject=List of donations related to the project
-ListVariousPaymentsAssociatedProject=List of miscellaneous payments related to the project
-ListSalariesAssociatedProject=List of payments of salaries related to the project
-ListActionsAssociatedProject=List of events related to the project
-ListMOAssociatedProject=List of manufacturing orders related to the project
-ListTaskTimeUserProject=List of time consumed on tasks of project
-ListTaskTimeForTask=List of time consumed on task
-ActivityOnProjectToday=Activity on project today
-ActivityOnProjectYesterday=Activity on project yesterday
-ActivityOnProjectThisWeek=Activity on project this week
-ActivityOnProjectThisMonth=Activity on project this month
-ActivityOnProjectThisYear=Activity on project this year
-ChildOfProjectTask=Child of project/task
-ChildOfTask=Child of task
-TaskHasChild=Task has child
-NotOwnerOfProject=Not owner of this private project
-AffectedTo=Allocated to
-CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See tab '%s'.
-ValidateProject=Validate projet
-ConfirmValidateProject=Are you sure you want to validate this project?
-CloseAProject=Close project
-ConfirmCloseAProject=Are you sure you want to close this project?
-AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
-ReOpenAProject=Open project
-ConfirmReOpenAProject=Are you sure you want to re-open this project?
-ProjectContact=Contacts of project
-TaskContact=Task contacts
-ActionsOnProject=Events on project
-YouAreNotContactOfProject=You are not a contact of this private project
-UserIsNotContactOfProject=User is not a contact of this private project
-DeleteATimeSpent=Delete time spent
-ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
-DoNotShowMyTasksOnly=See also tasks not assigned to me
-ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Contacts of task
-ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
-NoTasks=No tasks for this project
-LinkedToAnotherCompany=Linked to other third party
-TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
-ErrorTimeSpentIsEmpty=Time spent is empty
-TimeRecordingRestrictedToNMonthsBack=Time recording is restricted to %s months back
-ThisWillAlsoRemoveTasks=This action will also delete all tasks of project (<b>%s</b> tasks at the moment) and all inputs of time spent.
-IfNeedToUseOtherObjectKeepEmpty=If some objects (invoice, order, ...), belonging to another third party, must be linked to the project to create, keep this empty to have the project being multi third parties.
-CloneTasks=Clone tasks
-CloneContacts=Clone contacts
-CloneNotes=Clone notes
-CloneProjectFiles=Clone project joined files
-CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
-CloneMoveDate=Update project/tasks dates from now?
-ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=Change task dates according to new project start date
-ErrorShiftTaskDate=Impossible to shift task date according to new project start date
-ProjectsAndTasksLines=Projects and tasks
-ProjectCreatedInDolibarr=Project %s created
-ProjectValidatedInDolibarr=Project %s validated
-ProjectModifiedInDolibarr=Project %s modified
-TaskCreatedInDolibarr=Task %s created
-TaskModifiedInDolibarr=Task %s modified
-TaskDeletedInDolibarr=Task %s deleted
-OpportunityStatus=Lead status
-OpportunityStatusShort=Lead status
-OpportunityProbability=Lead probability
-OpportunityProbabilityShort=Lead probab.
-OpportunityAmount=Lead amount
-OpportunityAmountShort=Lead amount
-OpportunityWeightedAmount=Opportunity weighted amount
-OpportunityWeightedAmountShort=Opp. weighted amount
-OpportunityAmountAverageShort=Average lead amount
-OpportunityAmountWeigthedShort=Weighted lead amount
-WonLostExcluded=Won/Lost excluded
+RefProject=حوالہ پروجیکٹ
+ProjectRef=پروجیکٹ کا حوالہ
+ProjectId=پروجیکٹ کی شناخت
+ProjectLabel=پروجیکٹ لیبل
+ProjectsArea=پروجیکٹس ایریا
+ProjectStatus=پروجیکٹ کی حیثیت
+SharedProject=ہر کوئی
+PrivateProject=پروجیکٹ کے رابطے
+ProjectsImContactFor=پروجیکٹس جن کے لیے میں واضح طور پر ایک رابطہ ہوں۔
+AllAllowedProjects=تمام پروجیکٹ جو میں پڑھ سکتا ہوں (میرا + عوامی)
+AllProjects=تمام منصوبے
+MyProjectsDesc=یہ نقطہ نظر ان منصوبوں تک محدود ہے جن کے لیے آپ رابطہ کر رہے ہیں۔
+ProjectsPublicDesc=یہ منظر ان تمام منصوبوں کو پیش کرتا ہے جن کو پڑھنے کی آپ کو اجازت ہے۔
+TasksOnProjectsPublicDesc=یہ منظر ان پروجیکٹس کے تمام کاموں کو پیش کرتا ہے جن کو پڑھنے کی آپ کو اجازت ہے۔
+ProjectsPublicTaskDesc=یہ منظر ان تمام منصوبوں اور کاموں کو پیش کرتا ہے جن کو پڑھنے کی آپ کو اجازت ہے۔
+ProjectsDesc=یہ منظر تمام منصوبوں کو پیش کرتا ہے (آپ کی صارف کی اجازت آپ کو ہر چیز کو دیکھنے کی اجازت دیتی ہے)۔
+TasksOnProjectsDesc=یہ منظر تمام پروجیکٹس کے تمام کاموں کو پیش کرتا ہے (آپ کے صارف کی اجازت آپ کو ہر چیز کو دیکھنے کی اجازت دیتی ہے)۔
+MyTasksDesc=یہ نقطہ نظر صرف ان منصوبوں یا کاموں تک محدود ہے جن کے لیے آپ رابطہ کر رہے ہیں۔
+OnlyOpenedProject=صرف کھلے منصوبے ہی نظر آتے ہیں (مسودہ یا بند اسٹیٹس میں پروجیکٹس نظر نہیں آتے)۔
+ClosedProjectsAreHidden=بند منصوبے نظر نہیں آتے۔
+TasksPublicDesc=یہ منظر ان تمام منصوبوں اور کاموں کو پیش کرتا ہے جن کو پڑھنے کی آپ کو اجازت ہے۔
+TasksDesc=یہ منظر تمام منصوبوں اور کاموں کو پیش کرتا ہے (آپ کے صارف کی اجازت آپ کو سب کچھ دیکھنے کی اجازت دیتی ہے)۔
+AllTaskVisibleButEditIfYouAreAssigned=اہل پروجیکٹس کے تمام کام نظر آتے ہیں، لیکن آپ صرف منتخب صارف کو تفویض کردہ کام کے لیے وقت درج کر سکتے ہیں۔ اگر آپ کو اس پر وقت داخل کرنے کی ضرورت ہو تو کام تفویض کریں۔
+OnlyYourTaskAreVisible=صرف آپ کو تفویض کردہ کام نظر آتے ہیں۔ اگر آپ کو کسی ٹاسک پر وقت دینے کی ضرورت ہے اور اگر ٹاسک یہاں نظر نہیں آ رہا ہے، تو آپ کو اپنے آپ کو ٹاسک تفویض کرنے کی ضرورت ہے۔
+ImportDatasetTasks=منصوبوں کے کام
+ProjectCategories=پروجیکٹ ٹیگز/زمرے
+NewProject=نیا کام
+AddProject=پروجیکٹ بنائیں
+DeleteAProject=ایک پروجیکٹ کو حذف کریں۔
+DeleteATask=ایک کام کو حذف کریں۔
+ConfirmDeleteAProject=کیا آپ واقعی اس پروجیکٹ کو حذف کرنا چاہتے ہیں؟
+ConfirmDeleteATask=کیا آپ واقعی اس کام کو حذف کرنا چاہتے ہیں؟
+OpenedProjects=پروجیکٹس کھولیں۔
+OpenedTasks=کام کھولیں۔
+OpportunitiesStatusForOpenedProjects=اسٹیٹس کے لحاظ سے کھلے پروجیکٹس کی مقدار لیڈ کرتا ہے۔
+OpportunitiesStatusForProjects=اسٹیٹس کے لحاظ سے پروجیکٹس کی مقدار لیڈ کرتا ہے۔
+ShowProject=پروجیکٹ دکھائیں۔
+ShowTask=کام دکھائیں۔
+SetProject=پروجیکٹ سیٹ کریں۔
+NoProject=کوئی پروجیکٹ متعین یا ملکیت نہیں ہے۔
+NbOfProjects=منصوبوں کی تعداد
+NbOfTasks=کاموں کی تعداد
+TimeSpent=وقت گزارا۔
+TimeSpentByYou=آپ کا گزارا ہوا وقت
+TimeSpentByUser=صارف کے ذریعہ خرچ کردہ وقت
+TimesSpent=وقت گزارا۔
+TaskId=ٹاسک ID
+RefTask=ٹاسک ریف.
+LabelTask=ٹاسک لیبل
+TaskTimeSpent=کاموں میں وقت گزارا۔
+TaskTimeUser=صارف
+TaskTimeNote=نوٹ
+TaskTimeDate=تاریخ
+TasksOnOpenedProject=کھلے منصوبوں پر کام
+WorkloadNotDefined=کام کا بوجھ متعین نہیں ہے۔
+NewTimeSpent=وقت گزارا۔
+MyTimeSpent=میرا وقت گزرا۔
+BillTime=گزارے ہوئے وقت کا بل
+BillTimeShort=بل کا وقت
+TimeToBill=وقت کا بل نہیں دیا گیا۔
+TimeBilled=وقت کا بل
+Tasks=کام
+Task=کام
+TaskDateStart=کام شروع ہونے کی تاریخ
+TaskDateEnd=ٹاسک کی آخری تاریخ
+TaskDescription=کام کی تفصیل
+NewTask=نیا کام
+AddTask=کام بنائیں
+AddTimeSpent=گزارا ہوا وقت بنائیں
+AddHereTimeSpentForDay=اس دن/کام کے لیے گزارا ہوا وقت یہاں شامل کریں۔
+AddHereTimeSpentForWeek=اس ہفتے/کام کے لیے گزارا ہوا وقت یہاں شامل کریں۔
+Activity=سرگرمی
+Activities=کام / سرگرمیاں
+MyActivities=میرے کام / سرگرمیاں
+MyProjects=میرے پروجیکٹس
+MyProjectsArea=میرے پروجیکٹس کا علاقہ
+DurationEffective=مؤثر مدت
+ProgressDeclared=حقیقی پیش رفت کا اعلان کیا۔
+TaskProgressSummary=کام کی پیشرفت
+CurentlyOpenedTasks=فی الحال کھلے کام
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=اعلان کردہ حقیقی پیشرفت کھپت میں ہونے والی پیشرفت سے کم %s ہے
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=اعلان کردہ حقیقی پیشرفت کھپت میں ہونے والی پیشرفت سے زیادہ %s ہے
+ProgressCalculated=کھپت پر پیشرفت
+WhichIamLinkedTo=جس سے میں منسلک ہوں۔
+WhichIamLinkedToProject=جس کا میں پروجیکٹ سے منسلک ہوں۔
+Time=وقت
+TimeConsumed=کھایا
+ListOfTasks=کاموں کی فہرست
+GoToListOfTimeConsumed=استعمال شدہ وقت کی فہرست پر جائیں۔
+GanttView=گینٹ ویو
+ListWarehouseAssociatedProject=منصوبے سے وابستہ گوداموں کی فہرست
+ListProposalsAssociatedProject=منصوبے سے متعلق تجارتی تجاویز کی فہرست
+ListOrdersAssociatedProject=پروجیکٹ سے متعلق سیلز آرڈرز کی فہرست
+ListInvoicesAssociatedProject=پروجیکٹ سے متعلق کسٹمر انوائسز کی فہرست
+ListPredefinedInvoicesAssociatedProject=پروجیکٹ سے متعلق کسٹمر ٹیمپلیٹ انوائسز کی فہرست
+ListSupplierOrdersAssociatedProject=پراجیکٹ سے متعلق خریداری کے آرڈرز کی فہرست
+ListSupplierInvoicesAssociatedProject=پروجیکٹ سے متعلق وینڈر انوائسز کی فہرست
+ListContractAssociatedProject=منصوبے سے متعلق معاہدوں کی فہرست
+ListShippingAssociatedProject=منصوبے سے متعلق شپنگز کی فہرست
+ListFichinterAssociatedProject=منصوبے سے متعلق مداخلتوں کی فہرست
+ListExpenseReportsAssociatedProject=منصوبے سے متعلق اخراجات کی رپورٹوں کی فہرست
+ListDonationsAssociatedProject=منصوبے سے متعلق عطیات کی فہرست
+ListVariousPaymentsAssociatedProject=منصوبے سے متعلق متفرق ادائیگیوں کی فہرست
+ListSalariesAssociatedProject=منصوبے سے متعلق تنخواہوں کی ادائیگیوں کی فہرست
+ListActionsAssociatedProject=منصوبے سے متعلق واقعات کی فہرست
+ListMOAssociatedProject=منصوبے سے متعلق مینوفیکچرنگ آرڈرز کی فہرست
+ListTaskTimeUserProject=منصوبے کے کاموں پر لگنے والے وقت کی فہرست
+ListTaskTimeForTask=کام پر لگنے والے وقت کی فہرست
+ActivityOnProjectToday=پروجیکٹ پر آج کی سرگرمی
+ActivityOnProjectYesterday=کل منصوبے پر سرگرمی
+ActivityOnProjectThisWeek=اس ہفتے منصوبے پر سرگرمی
+ActivityOnProjectThisMonth=اس ماہ منصوبے پر سرگرمی
+ActivityOnProjectThisYear=اس سال منصوبے پر سرگرمی
+ChildOfProjectTask=پروجیکٹ/ٹاسک کا بچہ
+ChildOfTask=کام کا بچہ
+TaskHasChild=کام کا بچہ ہے۔
+NotOwnerOfProject=اس پرائیویٹ پروجیکٹ کا مالک نہیں ہے۔
+AffectedTo=کو مختص کیا گیا۔
+CantRemoveProject=اس پروجیکٹ کو ہٹایا نہیں جا سکتا کیونکہ اس کا حوالہ کچھ دیگر اشیاء (انوائس، آرڈرز یا دیگر) کے ذریعے دیا گیا ہے۔ ٹیب '%s' دیکھیں۔
+ValidateProject=پروجیکٹ کی توثیق کریں۔
+ConfirmValidateProject=کیا آپ واقعی اس پروجیکٹ کی توثیق کرنا چاہتے ہیں؟
+CloseAProject=پروجیکٹ بند کریں۔
+ConfirmCloseAProject=کیا آپ واقعی اس پروجیکٹ کو بند کرنا چاہتے ہیں؟
+AlsoCloseAProject=پروجیکٹ کو بھی بند کریں (اگر آپ کو ابھی بھی اس پر پیداواری کاموں کی پیروی کرنے کی ضرورت ہے تو اسے کھلا رکھیں)
+ReOpenAProject=پروجیکٹ کھولیں۔
+ConfirmReOpenAProject=کیا آپ واقعی اس پروجیکٹ کو دوبارہ کھولنا چاہتے ہیں؟
+ProjectContact=پروجیکٹ کے رابطے
+TaskContact=ٹاسک رابطے
+ActionsOnProject=منصوبے پر واقعات
+YouAreNotContactOfProject=آپ اس نجی پروجیکٹ کے رابطہ نہیں ہیں۔
+UserIsNotContactOfProject=صارف اس نجی پروجیکٹ کا رابطہ نہیں ہے۔
+DeleteATimeSpent=گزارے ہوئے وقت کو حذف کریں۔
+ConfirmDeleteATimeSpent=کیا آپ واقعی اس وقت کو حذف کرنا چاہتے ہیں؟
+DoNotShowMyTasksOnly=وہ کام بھی دیکھیں جو مجھے تفویض نہیں کیے گئے ہیں۔
+ShowMyTasksOnly=صرف مجھے تفویض کردہ کام دیکھیں
+TaskRessourceLinks=کام کے رابطے
+ProjectsDedicatedToThisThirdParty=اس تیسرے فریق کے لیے وقف منصوبے
+NoTasks=اس پروجیکٹ کے لیے کوئی کام نہیں ہے۔
+LinkedToAnotherCompany=دوسرے تیسرے فریق سے منسلک
+TaskIsNotAssignedToUser=صارف کو کام تفویض نہیں کیا گیا ہے۔ ابھی کام تفویض کرنے کے لیے بٹن '<strong> %s </strong>' استعمال کریں۔
+ErrorTimeSpentIsEmpty=گزارا ہوا وقت خالی ہے۔
+TimeRecordingRestrictedToNMonthsBack=وقت کی ریکارڈنگ %s مہینے پہلے تک محدود ہے۔
+ThisWillAlsoRemoveTasks=یہ عمل پروجیکٹ کے تمام کاموں کو بھی حذف کردے گا (<b> %s </b> اس وقت کام) اور گزارے گئے وقت کے تمام ان پٹ۔
+IfNeedToUseOtherObjectKeepEmpty=اگر کچھ اشیاء (انوائس، آرڈر، ...)، جو کسی دوسرے تیسرے فریق سے تعلق رکھتے ہیں، کو بنانے کے لیے پروجیکٹ سے منسلک ہونا ضروری ہے، تو اسے خالی رکھیں تاکہ پروجیکٹ ملٹی تھرڈ پارٹی ہو۔
+CloneTasks=کلون کے کام
+CloneContacts=رابطوں کو کلون کریں۔
+CloneNotes=کلون نوٹ
+CloneProjectFiles=کلون پروجیکٹ فائلوں میں شامل ہوا۔
+CloneTaskFiles=کلون ٹاسک (زبانیں) جوائنڈ فائلز (اگر کام کلون کیے گئے ہیں)
+CloneMoveDate=ابھی سے پروجیکٹ/ٹاسک کی تاریخیں اپ ڈیٹ کریں؟
+ConfirmCloneProject=کیا آپ اس پروجیکٹ کو کلون کرنے کا یقین رکھتے ہیں؟
+ProjectReportDate=نئے پراجیکٹ کے آغاز کی تاریخ کے مطابق کام کی تاریخوں کو تبدیل کریں۔
+ErrorShiftTaskDate=نئے پراجیکٹ کے آغاز کی تاریخ کے مطابق ٹاسک کی تاریخ کو تبدیل کرنا ناممکن ہے۔
+ProjectsAndTasksLines=منصوبے اور کام
+ProjectCreatedInDolibarr=پروجیکٹ %s بنایا گیا۔
+ProjectValidatedInDolibarr=پروجیکٹ %s کی توثیق کی گئی۔
+ProjectModifiedInDolibarr=پروجیکٹ %s میں ترمیم کی گئی۔
+TaskCreatedInDolibarr=ٹاسک %s بنایا گیا۔
+TaskModifiedInDolibarr=ٹاسک %s میں ترمیم کی گئی۔
+TaskDeletedInDolibarr=ٹاسک %s حذف کر دیا گیا۔
+OpportunityStatus=لیڈ کی حیثیت
+OpportunityStatusShort=لیڈ کی حیثیت
+OpportunityProbability=لیڈ کا امکان
+OpportunityProbabilityShort=لیڈ پروباب۔
+OpportunityAmount=لیڈ کی مقدار
+OpportunityAmountShort=لیڈ کی مقدار
+OpportunityWeightedAmount=مواقع وزنی رقم
+OpportunityWeightedAmountShort=بالمقابل وزنی رقم
+OpportunityAmountAverageShort=لیڈ کی اوسط رقم
+OpportunityAmountWeigthedShort=وزنی لیڈ کی مقدار
+WonLostExcluded=جیت گیا/ہار دیا گیا۔
 ##### Types de contacts #####
-TypeContact_project_internal_PROJECTLEADER=Project leader
-TypeContact_project_external_PROJECTLEADER=Project leader
-TypeContact_project_internal_PROJECTCONTRIBUTOR=Contributor
-TypeContact_project_external_PROJECTCONTRIBUTOR=Contributor
-TypeContact_project_task_internal_TASKEXECUTIVE=Task executive
-TypeContact_project_task_external_TASKEXECUTIVE=Task executive
-TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
-TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
-SelectElement=Select element
-AddElement=Link to element
-LinkToElementShort=Link to
+TypeContact_project_internal_PROJECTLEADER=رہنماء منصوبہ
+TypeContact_project_external_PROJECTLEADER=رہنماء منصوبہ
+TypeContact_project_internal_PROJECTCONTRIBUTOR=تعاون کرنے والا
+TypeContact_project_external_PROJECTCONTRIBUTOR=تعاون کرنے والا
+TypeContact_project_task_internal_TASKEXECUTIVE=ٹاسک ایگزیکٹو
+TypeContact_project_task_external_TASKEXECUTIVE=ٹاسک ایگزیکٹو
+TypeContact_project_task_internal_TASKCONTRIBUTOR=تعاون کرنے والا
+TypeContact_project_task_external_TASKCONTRIBUTOR=تعاون کرنے والا
+SelectElement=عنصر منتخب کریں۔
+AddElement=عنصر سے لنک کریں۔
+LinkToElementShort=سے لنک کریں۔
 # Documents models
-DocumentModelBeluga=Project document template for linked objects overview
-DocumentModelBaleine=Project document template for tasks
-DocumentModelTimeSpent=Project report template for time spent
-PlannedWorkload=Planned workload
-PlannedWorkloadShort=Workload
-ProjectReferers=Related items
-ProjectMustBeValidatedFirst=Project must be validated first
-FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
-InputPerDay=Input per day
-InputPerWeek=Input per week
-InputPerMonth=Input per month
-InputDetail=Input detail
-TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
-ProjectsWithThisUserAsContact=Projects with this user as contact
-TasksWithThisUserAsContact=Tasks assigned to this user
-ResourceNotAssignedToProject=Not assigned to project
-ResourceNotAssignedToTheTask=Not assigned to the task
-NoUserAssignedToTheProject=No users assigned to this project
-TimeSpentBy=Time spent by
-TasksAssignedTo=Tasks assigned to
-AssignTaskToMe=Assign task to myself
-AssignTaskToUser=Assign task to %s
-SelectTaskToAssign=Select task to assign...
-AssignTask=Assign
-ProjectOverview=Overview
-ManageTasks=Use projects to follow tasks and/or report time spent (timesheets)
-ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
-ProjectNbProjectByMonth=No. of created projects by month
-ProjectNbTaskByMonth=No. of created tasks by month
-ProjectOppAmountOfProjectsByMonth=Amount of leads by month
-ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
-ProjectOpenedProjectByOppStatus=Open project|lead by lead status
-ProjectsStatistics=Statistics on projects or leads
-TasksStatistics=Statistics on tasks of projects or leads
-TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
-IdTaskTime=Id task time
-YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
-OpenedProjectsByThirdparties=Open projects by third parties
-OnlyOpportunitiesShort=Only leads
-OpenedOpportunitiesShort=Open leads
-NotOpenedOpportunitiesShort=Not an open lead
-NotAnOpportunityShort=Not a lead
-OpportunityTotalAmount=Total amount of leads
-OpportunityPonderatedAmount=Weighted amount of leads
-OpportunityPonderatedAmountDesc=Leads amount weighted with probability
-OppStatusPROSP=Prospection
-OppStatusQUAL=Qualification
-OppStatusPROPO=Proposal
-OppStatusNEGO=Negociation
-OppStatusPENDING=Pending
-OppStatusWON=Won
-OppStatusLOST=Lost
-Budget=Budget
-AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>Supported values:</u><br>- Keep empty: Can link any project of the company (default)<br>- "all": Can link any projects, even projects of other companies<br>- A list of third-party ids separated by commas: can link all projects of these third partys (Example: 123,4795,53)<br>
-LatestProjects=Latest %s projects
-LatestModifiedProjects=Latest %s modified projects
-OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks found (assign project/tasks to the current user from the top select box to enter time on it)
-ThirdPartyRequiredToGenerateInvoice=A third party must be defined on project to be able to invoice it.
-ThirdPartyRequiredToGenerateInvoice=A third party must be defined on project to be able to invoice it.
-ChooseANotYetAssignedTask=Choose a task not yet assigned to you
+DocumentModelBeluga=منسلک آبجیکٹ کے جائزہ کے لیے پروجیکٹ دستاویز ٹیمپلیٹ
+DocumentModelBaleine=کاموں کے لیے پروجیکٹ دستاویز ٹیمپلیٹ
+DocumentModelTimeSpent=گزارے ہوئے وقت کے لیے پروجیکٹ رپورٹ ٹیمپلیٹ
+PlannedWorkload=منصوبہ بند کام کا بوجھ
+PlannedWorkloadShort=کام کا بوجھ
+ProjectReferers=متعلقہ اشیاء
+ProjectMustBeValidatedFirst=پہلے پروجیکٹ کی توثیق ہونی چاہیے۔
+FirstAddRessourceToAllocateTime=وقت مختص کرنے کے لیے صارف کے وسائل کو پروجیکٹ کے رابطے کے طور پر تفویض کریں۔
+InputPerDay=ان پٹ فی دن
+InputPerWeek=ان پٹ فی ہفتہ
+InputPerMonth=ان پٹ فی مہینہ
+InputDetail=ان پٹ کی تفصیل
+TimeAlreadyRecorded=یہ اس کام/دن اور صارف %s کے لیے پہلے ہی ریکارڈ شدہ وقت ہے
+ProjectsWithThisUserAsContact=اس صارف کے ساتھ پروجیکٹس بطور رابطہ
+TasksWithThisUserAsContact=اس صارف کو تفویض کردہ کام
+ResourceNotAssignedToProject=پروجیکٹ کو تفویض نہیں کیا گیا۔
+ResourceNotAssignedToTheTask=کام کے لیے تفویض نہیں کیا گیا ہے۔
+NoUserAssignedToTheProject=اس پروجیکٹ کے لیے کوئی صارف تفویض نہیں کیا گیا ہے۔
+TimeSpentBy=کی طرف سے خرچ وقت
+TasksAssignedTo=تفویض کردہ کام
+AssignTaskToMe=اپنے آپ کو کام تفویض کریں۔
+AssignTaskToUser=%s کو کام تفویض کریں۔
+SelectTaskToAssign=تفویض کرنے کے لیے کام منتخب کریں...
+AssignTask=تفویض
+ProjectOverview=جائزہ
+ManageTasks=کاموں کی پیروی کرنے اور/یا گزارے ہوئے وقت کی اطلاع دینے کے لیے پروجیکٹس کا استعمال کریں (ٹائم شیٹس)
+ManageOpportunitiesStatus=لیڈز/مواقع کی پیروی کرنے کے لیے پروجیکٹس کا استعمال کریں۔
+ProjectNbProjectByMonth=ماہ کے لحاظ سے بنائے گئے پروجیکٹس کی تعداد
+ProjectNbTaskByMonth=ماہ کے لحاظ سے تخلیق کردہ کاموں کی تعداد
+ProjectOppAmountOfProjectsByMonth=ماہ کے لحاظ سے لیڈز کی مقدار
+ProjectWeightedOppAmountOfProjectsByMonth=ماہ کے لحاظ سے لیڈز کی وزنی مقدار
+ProjectOpenedProjectByOppStatus=کھولیں پروجیکٹ|لیڈ کی حیثیت سے لیڈ
+ProjectsStatistics=منصوبوں یا لیڈز کے اعدادوشمار
+TasksStatistics=منصوبوں یا لیڈز کے کاموں کے اعدادوشمار
+TaskAssignedToEnterTime=کام تفویض کر دیا گیا۔ اس کام پر وقت داخل کرنا ممکن ہونا چاہیے۔
+IdTaskTime=آئی ڈی ٹاسک ٹائم
+YouCanCompleteRef=اگر آپ ریف کو کچھ لاحقہ کے ساتھ مکمل کرنا چاہتے ہیں، تو اسے الگ کرنے کے لیے ایک - حرف شامل کرنے کی سفارش کی جاتی ہے، لہذا خودکار نمبرنگ اب بھی اگلے پروجیکٹس کے لیے صحیح طریقے سے کام کرے گی۔ مثال کے طور پر %s-MYSUFFIX
+OpenedProjectsByThirdparties=تیسرے فریق کے ذریعہ کھولیں پروجیکٹس
+OnlyOpportunitiesShort=صرف لیڈز
+OpenedOpportunitiesShort=کھلی لیڈز
+NotOpenedOpportunitiesShort=کھلی برتری نہیں۔
+NotAnOpportunityShort=لیڈ نہیں۔
+OpportunityTotalAmount=لیڈز کی کل مقدار
+OpportunityPonderatedAmount=لیڈز کی وزنی مقدار
+OpportunityPonderatedAmountDesc=امکان کے ساتھ وزنی لیڈز کی مقدار
+OppStatusPROSP=پراسپیکشن
+OppStatusQUAL=قابلیت
+OppStatusPROPO=تجویز
+OppStatusNEGO=مذاکرات
+OppStatusPENDING=زیر التواء
+OppStatusWON=جیت گیا۔
+OppStatusLOST=کھو دیا
+Budget=بجٹ
+AllowToLinkFromOtherCompany=دیگر کمپنی سے لنک منصوبے کی اجازت دیں <br> <br> <u> تائید اقدار: </u> <br> - خالی رکھیں: کمپنی (ڈیفالٹ) میں سے کسی منصوبے <br> جوڑ سکتی ہے - "تمام": کسی بھی منصوبوں، دیگر کمپنیوں کی بھی پروجیکٹس <br> جوڑ سکتی ہے - کی ایک فہرست فریق ثالث کی آئی ڈیز کو کوما سے الگ کیا گیا ہے: ان تھرڈ پارٹیز کے تمام پروجیکٹس کو لنک کر سکتے ہیں (مثال: 123,4795,53) <br>
+LatestProjects=تازہ ترین %s پروجیکٹس
+LatestModifiedProjects=تازہ ترین %s ترمیم شدہ پروجیکٹس
+OtherFilteredTasks=دیگر فلٹر شدہ کام
+NoAssignedTasks=کوئی تفویض کردہ کام نہیں ملے (موجودہ صارف کو اس پر وقت داخل کرنے کے لیے اوپر والے سلیکٹ باکس سے پروجیکٹ/ٹاسک تفویض کریں)
+ThirdPartyRequiredToGenerateInvoice=انوائس کرنے کے قابل ہونے کے لیے پروجیکٹ پر کسی تیسرے فریق کی تعریف ہونی چاہیے۔
+ThirdPartyRequiredToGenerateInvoice=انوائس کرنے کے قابل ہونے کے لیے پروجیکٹ پر کسی تیسرے فریق کی تعریف ہونی چاہیے۔
+ChooseANotYetAssignedTask=ایک کام کا انتخاب کریں جو ابھی تک آپ کو تفویض نہیں کیا گیا ہے۔
 # Comments trans
-AllowCommentOnTask=Allow user comments on tasks
-AllowCommentOnProject=Allow user comments on projects
-DontHavePermissionForCloseProject=You do not have permissions to close the project %s
-DontHaveTheValidateStatus=The project %s must be open to be closed
-RecordsClosed=%s project(s) closed
-SendProjectRef=Information project %s
-ModuleSalaryToDefineHourlyRateMustBeEnabled=Module 'Salaries' must be enabled to define employee hourly rate to have time spent valorized
-NewTaskRefSuggested=Task ref already used, a new task ref is required
-TimeSpentInvoiced=Time spent billed
-TimeSpentForIntervention=Time spent
-TimeSpentForInvoice=Time spent
-OneLinePerUser=One line per user
-ServiceToUseOnLines=Service to use on lines
-InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
-InterventionGeneratedFromTimeSpent=Intervention %s has been generated from time spent on project
-ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
-ProjectFollowOpportunity=Follow opportunity
-ProjectFollowTasks=Follow tasks or time spent
-Usage=Usage
-UsageOpportunity=Usage: Opportunity
-UsageTasks=Usage: Tasks
-UsageBillTimeShort=Usage: Bill time
-InvoiceToUse=Draft invoice to use
-InterToUse=Draft intervention to use
-NewInvoice=New invoice
-NewInter=New intervention
-OneLinePerTask=One line per task
-OneLinePerPeriod=One line per period
-OneLinePerTimeSpentLine=One line for each time spent declaration
-AddDetailDateAndDuration=With date and duration into line description
-RefTaskParent=Ref. Parent Task
-ProfitIsCalculatedWith=Profit is calculated using
-AddPersonToTask=Add also to tasks
-UsageOrganizeEvent=Usage: Event Organization
-PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
-PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
-SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
-ProjectTasksWithoutTimeSpent=Project tasks without time spent
-FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+AllowCommentOnTask=کاموں پر صارف کے تبصروں کی اجازت دیں۔
+AllowCommentOnProject=منصوبوں پر صارف کے تبصرے کی اجازت دیں۔
+DontHavePermissionForCloseProject=آپ کو پروجیکٹ %s کو بند کرنے کی اجازت نہیں ہے۔
+DontHaveTheValidateStatus=بند ہونے کے لیے پروجیکٹ %s کھلا ہونا چاہیے۔
+RecordsClosed=%s پروجیکٹ بند
+SendProjectRef=معلوماتی پروجیکٹ %s
+ModuleSalaryToDefineHourlyRateMustBeEnabled=ماڈیول 'تنخواہوں' کو ملازم کی فی گھنٹہ کی شرح کی وضاحت کرنے کے لیے فعال ہونا چاہیے
+NewTaskRefSuggested=ٹاسک ریف پہلے ہی استعمال ہوا ہے، ایک نیا ٹاسک ریف درکار ہے۔
+TimeSpentInvoiced=وقت گزارا ہوا بل
+TimeSpentForIntervention=وقت گزارا۔
+TimeSpentForInvoice=وقت گزارا۔
+OneLinePerUser=فی صارف ایک لائن
+ServiceToUseOnLines=لائنوں پر استعمال کرنے کے لیے سروس
+InvoiceGeneratedFromTimeSpent=انوائس %s پروجیکٹ پر خرچ کیے گئے وقت سے تیار کیا گیا ہے
+InterventionGeneratedFromTimeSpent=مداخلت %s پروجیکٹ پر خرچ کیے گئے وقت سے پیدا کی گئی ہے۔
+ProjectBillTimeDescription=چیک کریں کہ آیا آپ پروجیکٹ کے کاموں پر ٹائم شیٹ درج کرتے ہیں اور آپ پروجیکٹ کے کسٹمر کو بل دینے کے لیے ٹائم شیٹ سے انوائس (انوائسز) بنانے کا ارادہ رکھتے ہیں (یہ چیک نہ کریں کہ آیا آپ انوائس بنانے کا ارادہ رکھتے ہیں جو درج کردہ ٹائم شیٹ پر مبنی نہیں ہے)۔ نوٹ: انوائس بنانے کے لیے، پراجیکٹ کے 'وقت گزارا ہوا' ٹیب پر جائیں اور شامل کرنے کے لیے لائنوں کو منتخب کریں۔
+ProjectFollowOpportunity=موقع کی پیروی کریں۔
+ProjectFollowTasks=کاموں یا وقت پر عمل کریں۔
+Usage=استعمال
+UsageOpportunity=استعمال: موقع
+UsageTasks=استعمال: کام
+UsageBillTimeShort=استعمال: بل کا وقت
+InvoiceToUse=استعمال کرنے کے لیے انوائس کا مسودہ
+InterToUse=استعمال کرنے کے لئے ڈرافٹ مداخلت
+NewInvoice=نئی رسید
+NewInter=نئی مداخلت
+OneLinePerTask=فی کام ایک لائن
+OneLinePerPeriod=فی مدت ایک لائن
+OneLinePerTimeSpentLine=ہر بار خرچ کیے گئے اعلان کے لیے ایک لائن
+AddDetailDateAndDuration=لائن کی تفصیل میں تاریخ اور مدت کے ساتھ
+RefTaskParent=حوالہ والدین کا کام
+ProfitIsCalculatedWith=منافع کا استعمال کرتے ہوئے شمار کیا جاتا ہے۔
+AddPersonToTask=کاموں میں بھی شامل کریں۔
+UsageOrganizeEvent=استعمال: ایونٹ آرگنائزیشن
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=پروجیکٹ کو بند کے طور پر درجہ بندی کریں جب اس کے تمام کام مکمل ہوجائیں (100%% پیش رفت)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=نوٹ: 100%% پر تمام ٹاسک والے موجودہ پروجیکٹس پر کوئی اثر نہیں پڑے گا: آپ کو انہیں دستی طور پر بند کرنا پڑے گا۔ یہ اختیار صرف کھلے منصوبوں کو متاثر کرتا ہے۔
+SelectLinesOfTimeSpentToInvoice=گزارے گئے وقت کی لائنیں منتخب کریں جن کا بل نہیں ہے، پھر ان کو بل کرنے کے لیے بڑی تعداد میں "انوائس تیار کریں"
+ProjectTasksWithoutTimeSpent=بغیر وقت کے پروجیکٹ کے کام
+FormForNewLeadDesc=ہم سے رابطہ کرنے کے لیے درج ذیل فارم کو پُر کرنے کا شکریہ۔ آپ ہمیں براہ راست <b> %s </b> پر ای میل بھی بھیج سکتے ہیں۔
+StartDateCannotBeAfterEndDate=End date cannot be before start date
diff --git a/htdocs/langs/ur_PK/propal.lang b/htdocs/langs/ur_PK/propal.lang
index db7b559a8a7..e91871ae533 100644
--- a/htdocs/langs/ur_PK/propal.lang
+++ b/htdocs/langs/ur_PK/propal.lang
@@ -1,99 +1,99 @@
 # Dolibarr language file - Source file is en_US - propal
-Proposals=Commercial proposals
-Proposal=Commercial proposal
-ProposalShort=Proposal
-ProposalsDraft=Draft commercial proposals
-ProposalsOpened=Open commercial proposals
-CommercialProposal=Commercial proposal
-PdfCommercialProposalTitle=Proposal
-ProposalCard=Proposal card
-NewProp=New commercial proposal
-NewPropal=New proposal
-Prospect=Prospect
-DeleteProp=Delete commercial proposal
-ValidateProp=Validate commercial proposal
-AddProp=Create proposal
-ConfirmDeleteProp=Are you sure you want to delete this commercial proposal?
-ConfirmValidateProp=Are you sure you want to validate this commercial proposal under name <b>%s</b>?
-LastPropals=Latest %s proposals
-LastModifiedProposals=Latest %s modified proposals
-AllPropals=All proposals
-SearchAProposal=Search a proposal
-NoProposal=No proposal
-ProposalsStatistics=Commercial proposal's statistics
-NumberOfProposalsByMonth=Number by month
-AmountOfProposalsByMonthHT=Amount by month (excl. tax)
-NbOfProposals=Number of commercial proposals
-ShowPropal=Show proposal
-PropalsDraft=Drafts
-PropalsOpened=Open
-PropalStatusDraft=Draft (needs to be validated)
-PropalStatusValidated=Validated (proposal is open)
-PropalStatusSigned=Signed (needs billing)
-PropalStatusNotSigned=Not signed (closed)
-PropalStatusBilled=Billed
-PropalStatusDraftShort=Draft
-PropalStatusValidatedShort=Validated (open)
-PropalStatusClosedShort=Closed
-PropalStatusSignedShort=Signed
-PropalStatusNotSignedShort=Not signed
-PropalStatusBilledShort=Billed
-PropalsToClose=Commercial proposals to close
-PropalsToBill=Signed commercial proposals to bill
-ListOfProposals=List of commercial proposals
-ActionsOnPropal=Events on proposal
-RefProposal=Commercial proposal ref
-SendPropalByMail=Send commercial proposal by mail
-DatePropal=Date of proposal
-DateEndPropal=Validity ending date
-ValidityDuration=Validity duration
-SetAcceptedRefused=Set accepted/refused
-ErrorPropalNotFound=Propal %s not found
-AddToDraftProposals=Add to draft proposal
-NoDraftProposals=No draft proposals
-CopyPropalFrom=Create commercial proposal by copying existing proposal
-CreateEmptyPropal=Create empty commercial proposal or from list of products/services
-DefaultProposalDurationValidity=Default commercial proposal validity duration (in days)
-UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
-ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
-ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
-ProposalsAndProposalsLines=Commercial proposal and lines
-ProposalLine=Proposal line
-ProposalLines=Proposal lines
-AvailabilityPeriod=Availability delay
-SetAvailability=Set availability delay
-AfterOrder=after order
-OtherProposals=Other proposals
+Proposals=تجارتی تجاویز
+Proposal=کاروباری تجویز
+ProposalShort=تجویز
+ProposalsDraft=تجارتی تجاویز کا مسودہ
+ProposalsOpened=تجارتی تجاویز کھولیں۔
+CommercialProposal=کاروباری تجویز
+PdfCommercialProposalTitle=تجویز
+ProposalCard=تجویز کارڈ
+NewProp=نئی تجارتی تجویز
+NewPropal=نئی تجویز
+Prospect=امکان
+DeleteProp=تجارتی تجویز کو حذف کریں۔
+ValidateProp=تجارتی تجویز کی توثیق کریں۔
+AddProp=تجویز بنائیں
+ConfirmDeleteProp=کیا آپ واقعی اس تجارتی تجویز کو حذف کرنا چاہتے ہیں؟
+ConfirmValidateProp=کیا آپ واقعی <b> %s </b> کے نام سے اس تجارتی تجویز کی توثیق کرنا چاہتے ہیں؟
+LastPropals=تازہ ترین %s تجاویز
+LastModifiedProposals=تازہ ترین %s ترمیم شدہ تجاویز
+AllPropals=تمام تجاویز
+SearchAProposal=ایک تجویز تلاش کریں۔
+NoProposal=کوئی تجویز نہیں۔
+ProposalsStatistics=تجارتی تجویز کے اعدادوشمار
+NumberOfProposalsByMonth=مہینے کے حساب سے نمبر
+AmountOfProposalsByMonthHT=ماہانہ رقم (ٹیکس کے علاوہ)
+NbOfProposals=تجارتی تجاویز کی تعداد
+ShowPropal=تجویز دکھائیں۔
+PropalsDraft=ڈرافٹ
+PropalsOpened=کھولیں۔
+PropalStatusDraft=مسودہ (توثیق کرنے کی ضرورت ہے)
+PropalStatusValidated=تصدیق شدہ (تجویز کھلی ہے)
+PropalStatusSigned=دستخط شدہ (بلنگ کی ضرورت ہے)
+PropalStatusNotSigned=دستخط شدہ نہیں (بند)
+PropalStatusBilled=بل کیا گیا۔
+PropalStatusDraftShort=مسودہ
+PropalStatusValidatedShort=توثیق شدہ (کھلا)
+PropalStatusClosedShort=بند
+PropalStatusSignedShort=دستخط شدہ
+PropalStatusNotSignedShort=دستخط نہیں کئے
+PropalStatusBilledShort=بل کیا گیا۔
+PropalsToClose=بند کرنے کے لیے تجارتی تجاویز
+PropalsToBill=بل کے لیے تجارتی تجاویز پر دستخط کیے گئے۔
+ListOfProposals=تجارتی تجاویز کی فہرست
+ActionsOnPropal=تجویز پر واقعات
+RefProposal=تجارتی تجویز کا حوالہ
+SendPropalByMail=تجارتی تجویز بذریعہ ڈاک بھیجیں۔
+DatePropal=تجویز کی تاریخ
+DateEndPropal=میعاد ختم ہونے کی تاریخ
+ValidityDuration=درستگی کی مدت
+SetAcceptedRefused=سیٹ قبول / انکار
+ErrorPropalNotFound=Propal %s نہیں ملا
+AddToDraftProposals=مسودہ تجویز میں شامل کریں۔
+NoDraftProposals=کوئی مسودہ تجویز نہیں ہے۔
+CopyPropalFrom=موجودہ تجویز کو کاپی کرکے تجارتی تجویز بنائیں
+CreateEmptyPropal=خالی تجارتی تجویز یا مصنوعات/خدمات کی فہرست سے بنائیں
+DefaultProposalDurationValidity=پہلے سے طے شدہ تجارتی تجویز کی درستگی کا دورانیہ (دنوں میں)
+UseCustomerContactAsPropalRecipientIfExist=اگر تھرڈ پارٹی ایڈریس کی بجائے پروپوزل وصول کنندہ کے ایڈریس کے طور پر بیان کیا جائے تو 'رابطہ کی پیروی کی تجویز' کی قسم کے ساتھ رابطہ/پتہ استعمال کریں۔
+ConfirmClonePropal=کیا آپ واقعی تجارتی تجویز <b> %s </b> کلون کرنا چاہتے ہیں؟
+ConfirmReOpenProp=کیا آپ واقعی تجارتی تجویز <b> %s </b> کو کھولنا چاہتے ہیں؟
+ProposalsAndProposalsLines=تجارتی تجویز اور لائنیں۔
+ProposalLine=پروپوزل لائن
+ProposalLines=تجویز کی لکیریں۔
+AvailabilityPeriod=دستیابی میں تاخیر
+SetAvailability=دستیابی میں تاخیر سیٹ کریں۔
+AfterOrder=حکم کے بعد
+OtherProposals=دیگر تجاویز
 ##### Availability #####
-AvailabilityTypeAV_NOW=Immediate
-AvailabilityTypeAV_1W=1 week
-AvailabilityTypeAV_2W=2 weeks
-AvailabilityTypeAV_3W=3 weeks
-AvailabilityTypeAV_1M=1 month
+AvailabilityTypeAV_NOW=فوری
+AvailabilityTypeAV_1W=1 ہفتہ
+AvailabilityTypeAV_2W=2 ہفتے
+AvailabilityTypeAV_3W=3 ہفتے
+AvailabilityTypeAV_1M=1 مہینہ
 ##### Types de contacts #####
-TypeContact_propal_internal_SALESREPFOLL=Representative following-up proposal
-TypeContact_propal_external_BILLING=Customer invoice contact
-TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal
-TypeContact_propal_external_SHIPPING=Customer contact for delivery
+TypeContact_propal_internal_SALESREPFOLL=نمائندہ پیروی کی تجویز
+TypeContact_propal_external_BILLING=کسٹمر انوائس رابطہ
+TypeContact_propal_external_CUSTOMER=کسٹمر رابطہ فالو اپ تجویز
+TypeContact_propal_external_SHIPPING=ڈیلیوری کے لیے کسٹمر رابطہ کریں۔
 # Document models
-DocModelAzurDescription=A complete proposal model (old implementation of Cyan template)
-DocModelCyanDescription=A complete proposal model
-DefaultModelPropalCreate=Default model creation
-DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
-DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
-ProposalCustomerSignature=Written acceptance, company stamp, date and signature
-ProposalsStatisticsSuppliers=Vendor proposals statistics
-CaseFollowedBy=Case followed by
-SignedOnly=Signed only
-IdProposal=Proposal ID
-IdProduct=Product ID
-PrParentLine=Proposal Parent Line
-LineBuyPriceHT=Buy Price Amount net of tax for line
-SignPropal=Accept proposal
-RefusePropal=Refuse proposal
-Sign=Sign
-PropalAlreadySigned=Proposal already accepted
-PropalAlreadyRefused=Proposal already refused
-PropalSigned=Proposal accepted
-PropalRefused=Proposal refused
-ConfirmRefusePropal=Are you sure you want to refuse this commercial proposal?
+DocModelAzurDescription=ایک مکمل تجویز ماڈل (سیان ٹیمپلیٹ کا پرانا نفاذ)
+DocModelCyanDescription=ایک مکمل تجویز ماڈل
+DefaultModelPropalCreate=پہلے سے طے شدہ ماڈل کی تخلیق
+DefaultModelPropalToBill=کاروباری تجویز کو بند کرتے وقت ڈیفالٹ ٹیمپلیٹ (انوائس کی جائے گی)
+DefaultModelPropalClosed=کاروباری تجویز کو بند کرتے وقت ڈیفالٹ ٹیمپلیٹ (بغیر بل)
+ProposalCustomerSignature=تحریری قبولیت، کمپنی کا مہر، تاریخ اور دستخط
+ProposalsStatisticsSuppliers=وینڈر کی تجویز کے اعدادوشمار
+CaseFollowedBy=اس کے بعد کیس
+SignedOnly=صرف دستخط شدہ
+IdProposal=تجویز کی شناخت
+IdProduct=پروڈکٹ کی شناخت
+PrParentLine=پروپوزل پیرنٹ لائن
+LineBuyPriceHT=لائن کے لیے ٹیکس کی قیمت کی رقم خریدیں۔
+SignPropal=تجویز قبول کریں۔
+RefusePropal=تجویز سے انکار
+Sign=دستخط
+PropalAlreadySigned=تجویز پہلے ہی قبول کر لی گئی ہے۔
+PropalAlreadyRefused=تجویز پہلے ہی مسترد کر دی گئی۔
+PropalSigned=تجویز منظور کر لی گئی۔
+PropalRefused=تجویز مسترد کر دی گئی۔
+ConfirmRefusePropal=کیا آپ واقعی اس تجارتی تجویز کو مسترد کرنا چاہتے ہیں؟
diff --git a/htdocs/langs/ur_PK/receiptprinter.lang b/htdocs/langs/ur_PK/receiptprinter.lang
index 746d175e0c6..3bbf2a1e3fd 100644
--- a/htdocs/langs/ur_PK/receiptprinter.lang
+++ b/htdocs/langs/ur_PK/receiptprinter.lang
@@ -1,82 +1,82 @@
 # Dolibarr language file - Source file is en_US - receiptprinter
-ReceiptPrinterSetup=Setup of module ReceiptPrinter
-PrinterAdded=Printer %s added
-PrinterUpdated=Printer %s updated
-PrinterDeleted=Printer %s deleted
-TestSentToPrinter=Test Sent To Printer %s
-ReceiptPrinter=Receipt printers
-ReceiptPrinterDesc=Setup of receipt printers
-ReceiptPrinterTemplateDesc=Setup of Templates
-ReceiptPrinterTypeDesc=Description of Receipt Printer's type
-ReceiptPrinterProfileDesc=Description of Receipt Printer's Profile
-ListPrinters=List of Printers
-SetupReceiptTemplate=Template Setup
-CONNECTOR_DUMMY=Dummy Printer
-CONNECTOR_NETWORK_PRINT=Network Printer
-CONNECTOR_FILE_PRINT=Local Printer
-CONNECTOR_WINDOWS_PRINT=Local Windows Printer
-CONNECTOR_CUPS_PRINT=Cups Printer
-CONNECTOR_DUMMY_HELP=Fake Printer for test, does nothing
+ReceiptPrinterSetup=ماڈیول ReceiptPrinter کا سیٹ اپ
+PrinterAdded=پرنٹر %s شامل کیا گیا۔
+PrinterUpdated=پرنٹر %s اپ ڈیٹ ہو گیا۔
+PrinterDeleted=پرنٹر %s حذف کر دیا گیا۔
+TestSentToPrinter=ٹیسٹ پرنٹر %s کو بھیجا گیا۔
+ReceiptPrinter=رسید پرنٹرز
+ReceiptPrinterDesc=رسید پرنٹرز کا سیٹ اپ
+ReceiptPrinterTemplateDesc=ٹیمپلیٹس کا سیٹ اپ
+ReceiptPrinterTypeDesc=رسید پرنٹر کی قسم کی تفصیل
+ReceiptPrinterProfileDesc=رسید پرنٹر کے پروفائل کی تفصیل
+ListPrinters=پرنٹرز کی فہرست
+SetupReceiptTemplate=ٹیمپلیٹ سیٹ اپ
+CONNECTOR_DUMMY=ڈمی پرنٹر
+CONNECTOR_NETWORK_PRINT=نیٹ ورک پرنٹر
+CONNECTOR_FILE_PRINT=مقامی پرنٹر
+CONNECTOR_WINDOWS_PRINT=مقامی ونڈوز پرنٹر
+CONNECTOR_CUPS_PRINT=کپ پرنٹر
+CONNECTOR_DUMMY_HELP=ٹیسٹ کے لیے جعلی پرنٹر، کچھ نہیں کرتا
 CONNECTOR_NETWORK_PRINT_HELP=10.x.x.x:9100
 CONNECTOR_FILE_PRINT_HELP=/dev/usb/lp0, /dev/usb/lp1
 CONNECTOR_WINDOWS_PRINT_HELP=LPT1, COM1, smb://FooUser:secret@computername/workgroup/Receipt Printer
-CONNECTOR_CUPS_PRINT_HELP=CUPS printer name, example: HPRT_TP805L
-PROFILE_DEFAULT=Default Profile
-PROFILE_SIMPLE=Simple Profile
-PROFILE_EPOSTEP=Epos Tep Profile
-PROFILE_P822D=P822D Profile
-PROFILE_STAR=Star Profile
-PROFILE_DEFAULT_HELP=Default Profile suitable for Epson printers
-PROFILE_SIMPLE_HELP=Simple Profile No Graphics
-PROFILE_EPOSTEP_HELP=Epos Tep Profile
-PROFILE_P822D_HELP=P822D Profile No Graphics
-PROFILE_STAR_HELP=Star Profile
-DOL_LINE_FEED=Skip line
-DOL_ALIGN_LEFT=Left align text
-DOL_ALIGN_CENTER=Center text
-DOL_ALIGN_RIGHT=Right align text
-DOL_USE_FONT_A=Use font A of printer
-DOL_USE_FONT_B=Use font B of printer
-DOL_USE_FONT_C=Use font C of printer
-DOL_PRINT_BARCODE=Print barcode
-DOL_PRINT_BARCODE_CUSTOMER_ID=Print barcode customer id
-DOL_CUT_PAPER_FULL=Cut ticket completely
-DOL_CUT_PAPER_PARTIAL=Cut ticket partially
-DOL_OPEN_DRAWER=Open cash drawer
-DOL_ACTIVATE_BUZZER=Activate buzzer
-DOL_PRINT_QRCODE=Print QR Code
-DOL_PRINT_LOGO=Print logo of my company
-DOL_PRINT_LOGO_OLD=Print logo of my company (old printers)
-DOL_BOLD=Bold
-DOL_BOLD_DISABLED=Disable bold
-DOL_DOUBLE_HEIGHT=Double height size
-DOL_DOUBLE_WIDTH=Double width size
-DOL_DEFAULT_HEIGHT_WIDTH=Default height and width size
-DOL_UNDERLINE=Enable underline
-DOL_UNDERLINE_DISABLED=Disable underline
-DOL_BEEP=Beep sound
-DOL_PRINT_TEXT=Print text
-DateInvoiceWithTime=Invoice date and time
-YearInvoice=Invoice year
-DOL_VALUE_MONTH_LETTERS=Invoice month in letters
-DOL_VALUE_MONTH=Invoice month
-DOL_VALUE_DAY=Invoice day
-DOL_VALUE_DAY_LETTERS=Inovice day in letters
-DOL_LINE_FEED_REVERSE=Line feed reverse
-InvoiceID=Invoice ID
-InvoiceRef=Invoice ref
-DOL_PRINT_OBJECT_LINES=Invoice lines
-DOL_VALUE_CUSTOMER_FIRSTNAME=Customer first name
-DOL_VALUE_CUSTOMER_LASTNAME=Customer last name
-DOL_VALUE_CUSTOMER_MAIL=Customer mail
-DOL_VALUE_CUSTOMER_PHONE=Customer phone
-DOL_VALUE_CUSTOMER_MOBILE=Customer mobile
-DOL_VALUE_CUSTOMER_SKYPE=Customer Skype
-DOL_VALUE_CUSTOMER_TAX_NUMBER=Customer tax number
-DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE=Customer account balance
-DOL_VALUE_MYSOC_NAME=Your company name
-VendorLastname=Vendor last name
-VendorFirstname=Vendor first name
-VendorEmail=Vendor email
-DOL_VALUE_CUSTOMER_POINTS=Customer points
-DOL_VALUE_OBJECT_POINTS=Object points
+CONNECTOR_CUPS_PRINT_HELP=CUPS پرنٹر کا نام، مثال: HPRT_TP805L
+PROFILE_DEFAULT=ڈیفالٹ پروفائل
+PROFILE_SIMPLE=سادہ پروفائل
+PROFILE_EPOSTEP=ایپوس ٹیپ پروفائل
+PROFILE_P822D=P822D پروفائل
+PROFILE_STAR=اسٹار پروفائل
+PROFILE_DEFAULT_HELP=ایپسن پرنٹرز کے لیے ڈیفالٹ پروفائل موزوں ہے۔
+PROFILE_SIMPLE_HELP=سادہ پروفائل کوئی گرافکس نہیں۔
+PROFILE_EPOSTEP_HELP=ایپوس ٹیپ پروفائل
+PROFILE_P822D_HELP=P822D پروفائل کوئی گرافکس نہیں۔
+PROFILE_STAR_HELP=اسٹار پروفائل
+DOL_LINE_FEED=لائن کو چھوڑیں۔
+DOL_ALIGN_LEFT=متن کو بائیں طرف سیدھ کریں۔
+DOL_ALIGN_CENTER=مرکزی متن
+DOL_ALIGN_RIGHT=متن کو دائیں سیدھ میں کریں۔
+DOL_USE_FONT_A=پرنٹر کا فونٹ A استعمال کریں۔
+DOL_USE_FONT_B=پرنٹر کا فونٹ B استعمال کریں۔
+DOL_USE_FONT_C=پرنٹر کا فونٹ C استعمال کریں۔
+DOL_PRINT_BARCODE=بارکوڈ پرنٹ کریں۔
+DOL_PRINT_BARCODE_CUSTOMER_ID=بارکوڈ کسٹمر آئی ڈی پرنٹ کریں۔
+DOL_CUT_PAPER_FULL=ٹکٹ مکمل طور پر کاٹ دیں۔
+DOL_CUT_PAPER_PARTIAL=ٹکٹ جزوی طور پر کاٹ دیں۔
+DOL_OPEN_DRAWER=کیش دراز کھولیں۔
+DOL_ACTIVATE_BUZZER=بزر کو چالو کریں۔
+DOL_PRINT_QRCODE=QR کوڈ پرنٹ کریں۔
+DOL_PRINT_LOGO=میری کمپنی کا لوگو پرنٹ کریں۔
+DOL_PRINT_LOGO_OLD=میری کمپنی کا لوگو پرنٹ کریں (پرانے پرنٹرز)
+DOL_BOLD=بولڈ
+DOL_BOLD_DISABLED=بولڈ کو غیر فعال کریں۔
+DOL_DOUBLE_HEIGHT=ڈبل اونچائی کا سائز
+DOL_DOUBLE_WIDTH=ڈبل چوڑائی کا سائز
+DOL_DEFAULT_HEIGHT_WIDTH=پہلے سے طے شدہ اونچائی اور چوڑائی کا سائز
+DOL_UNDERLINE=انڈر لائن کو فعال کریں۔
+DOL_UNDERLINE_DISABLED=انڈر لائن کو غیر فعال کریں۔
+DOL_BEEP=بیپ کی آواز
+DOL_PRINT_TEXT=متن پرنٹ کریں۔
+DateInvoiceWithTime=رسید کی تاریخ اور وقت
+YearInvoice=رسید کا سال
+DOL_VALUE_MONTH_LETTERS=خطوط میں رسید کا مہینہ
+DOL_VALUE_MONTH=انوائس کا مہینہ
+DOL_VALUE_DAY=رسید کا دن
+DOL_VALUE_DAY_LETTERS=انوائس ڈے خطوط میں
+DOL_LINE_FEED_REVERSE=لائن فیڈ ریورس
+InvoiceID=انوائس ID
+InvoiceRef=انوائس کا حوالہ
+DOL_PRINT_OBJECT_LINES=انوائس لائنز
+DOL_VALUE_CUSTOMER_FIRSTNAME=گاہک کا پہلا نام
+DOL_VALUE_CUSTOMER_LASTNAME=گاہک کا آخری نام
+DOL_VALUE_CUSTOMER_MAIL=کسٹمر میل
+DOL_VALUE_CUSTOMER_PHONE=گاہک کا فون
+DOL_VALUE_CUSTOMER_MOBILE=کسٹمر موبائل
+DOL_VALUE_CUSTOMER_SKYPE=کسٹمر اسکائپ
+DOL_VALUE_CUSTOMER_TAX_NUMBER=کسٹمر ٹیکس نمبر
+DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE=کسٹمر اکاؤنٹ بیلنس
+DOL_VALUE_MYSOC_NAME=آپ کی کمپنی کا نام
+VendorLastname=فروش کا آخری نام
+VendorFirstname=فروش کا پہلا نام
+VendorEmail=وینڈر ای میل
+DOL_VALUE_CUSTOMER_POINTS=کسٹمر پوائنٹس
+DOL_VALUE_OBJECT_POINTS=آبجیکٹ پوائنٹس
diff --git a/htdocs/langs/ur_PK/receptions.lang b/htdocs/langs/ur_PK/receptions.lang
index 2ea629689b4..539caccac5a 100644
--- a/htdocs/langs/ur_PK/receptions.lang
+++ b/htdocs/langs/ur_PK/receptions.lang
@@ -1,53 +1,53 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Product Reception setup
-RefReception=Ref. reception
-Reception=Reception
-Receptions=Receptions
-AllReceptions=All Receptions
-Reception=Reception
-Receptions=Receptions
-ShowReception=Show Receptions
-ReceptionsArea=Receptions area
-ListOfReceptions=List of receptions
-ReceptionMethod=Reception method
-LastReceptions=Latest %s receptions
-StatisticsOfReceptions=Statistics for receptions
-NbOfReceptions=Number of receptions
-NumberOfReceptionsByMonth=Number of receptions by month
-ReceptionCard=Reception card
-NewReception=New reception
-CreateReception=Create reception
-QtyInOtherReceptions=Qty in other receptions
-OtherReceptionsForSameOrder=Other receptions for this order
-ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
-ReceptionsToValidate=Receptions to validate
-StatusReceptionCanceled=Canceled
-StatusReceptionDraft=Draft
-StatusReceptionValidated=Validated (products to receive or already received)
-StatusReceptionValidatedToReceive=Validated (products to receive)
-StatusReceptionValidatedReceived=Validated (products received)
-StatusReceptionProcessed=Processed
-StatusReceptionDraftShort=Draft
-StatusReceptionValidatedShort=Validated
-StatusReceptionProcessedShort=Processed
-ReceptionSheet=Reception sheet
-ConfirmDeleteReception=Are you sure you want to delete this reception?
-ConfirmValidateReception=Are you sure you want to validate this reception with reference <b>%s</b>?
-ConfirmCancelReception=Are you sure you want to cancel this reception?
-StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated. Date used is date of validation of reception (planed delivery date is not always known).
-SendReceptionByEMail=Send reception by email
-SendReceptionRef=Submission of reception %s
-ActionsOnReception=Events on reception
-ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the Purchase Order.
-ReceptionLine=Reception line
-ProductQtyInReceptionAlreadySent=Product quantity from open sales order already sent
-ProductQtyInSuppliersReceptionAlreadyRecevied=Product quantity from open supplier order already received
-ValidateOrderFirstBeforeReception=You must first validate the order before being able to make receptions.
-ReceptionsNumberingModules=Numbering module for receptions
-ReceptionsReceiptModel=Document templates for receptions
-NoMorePredefinedProductToDispatch=No more predefined products to dispatch
-ReceptionExist=A reception exists
-ByingPrice=Bying price
-ReceptionBackToDraftInDolibarr=Reception %s back to draft
-ReceptionClassifyClosedInDolibarr=Reception %s classified Closed
-ReceptionUnClassifyCloseddInDolibarr=Reception %s re-open
+ReceptionsSetup=پروڈکٹ ریسپشن سیٹ اپ
+RefReception=حوالہ استقبالیہ
+Reception=استقبالیہ
+Receptions=استقبالیہ
+AllReceptions=تمام استقبالیہ
+Reception=استقبالیہ
+Receptions=استقبالیہ
+ShowReception=استقبالیہ دکھائیں۔
+ReceptionsArea=استقبالیہ علاقہ
+ListOfReceptions=استقبالیوں کی فہرست
+ReceptionMethod=استقبال کا طریقہ
+LastReceptions=تازہ ترین %s استقبالیہ
+StatisticsOfReceptions=استقبالیہ کے اعدادوشمار
+NbOfReceptions=استقبالیوں کی تعداد
+NumberOfReceptionsByMonth=مہینے کے لحاظ سے استقبالیوں کی تعداد
+ReceptionCard=استقبالیہ کارڈ
+NewReception=نیا استقبال
+CreateReception=استقبالیہ بنائیں
+QtyInOtherReceptions=دیگر استقبالیوں میں مقدار
+OtherReceptionsForSameOrder=اس آرڈر کے لیے دیگر استقبالیہ
+ReceptionsAndReceivingForSameOrder=اس آرڈر کے لیے استقبالیہ اور رسیدیں
+ReceptionsToValidate=توثیق کرنے کے لئے استقبالیہ
+StatusReceptionCanceled=منسوخ
+StatusReceptionDraft=مسودہ
+StatusReceptionValidated=توثیق شدہ (مصنوعات موصول ہونے کے لیے یا پہلے سے موصول ہوئی ہیں)
+StatusReceptionValidatedToReceive=توثیق شدہ (مصنوعات حاصل کرنے کے لیے)
+StatusReceptionValidatedReceived=تصدیق شدہ (مصنوعات موصول)
+StatusReceptionProcessed=پروسیس شدہ
+StatusReceptionDraftShort=مسودہ
+StatusReceptionValidatedShort=تصدیق شدہ
+StatusReceptionProcessedShort=پروسیس شدہ
+ReceptionSheet=استقبالیہ شیٹ
+ConfirmDeleteReception=کیا آپ واقعی اس استقبالیہ کو حذف کرنا چاہتے ہیں؟
+ConfirmValidateReception=کیا آپ واقعی <b> %s </b> حوالہ کے ساتھ اس استقبالیہ کی توثیق کرنا چاہتے ہیں؟
+ConfirmCancelReception=کیا آپ واقعی اس استقبالیہ کو منسوخ کرنا چاہتے ہیں؟
+StatsOnReceptionsOnlyValidated=صرف استقبالیہ پر کئے گئے اعدادوشمار کی توثیق کی گئی۔ استعمال ہونے والی تاریخ استقبالیہ کی توثیق کی تاریخ ہے (منصوبہ بندی کی ترسیل کی تاریخ ہمیشہ معلوم نہیں ہوتی ہے)۔
+SendReceptionByEMail=ای میل کے ذریعے استقبالیہ بھیجیں۔
+SendReceptionRef=استقبالیہ %s جمع کروانا
+ActionsOnReception=استقبالیہ پر تقریبات
+ReceptionCreationIsDoneFromOrder=اس لمحے کے لیے، ایک نئے استقبالیہ کی تخلیق پرچیز آرڈر سے کی گئی ہے۔
+ReceptionLine=استقبالیہ لائن
+ProductQtyInReceptionAlreadySent=کھلے سیلز آرڈر سے پروڈکٹ کی مقدار پہلے ہی بھیج دی گئی ہے۔
+ProductQtyInSuppliersReceptionAlreadyRecevied=اوپن سپلائر آرڈر سے پروڈکٹ کی مقدار پہلے ہی موصول ہو چکی ہے۔
+ValidateOrderFirstBeforeReception=استقبالیہ کرنے کے قابل ہونے سے پہلے آپ کو پہلے آرڈر کی توثیق کرنی ہوگی۔
+ReceptionsNumberingModules=استقبالیہ کے لیے نمبرنگ ماڈیول
+ReceptionsReceiptModel=استقبالیہ کے لیے دستاویز کے سانچے
+NoMorePredefinedProductToDispatch=بھیجنے کے لیے مزید پہلے سے طے شدہ مصنوعات نہیں۔
+ReceptionExist=ایک استقبالیہ موجود ہے۔
+ByingPrice=قیمت کے حساب سے
+ReceptionBackToDraftInDolibarr=استقبالیہ %s ڈرافٹ پر واپس
+ReceptionClassifyClosedInDolibarr=استقبالیہ %s کلاسیفائیڈ بند
+ReceptionUnClassifyCloseddInDolibarr=استقبالیہ %s دوبارہ کھولیں۔
diff --git a/htdocs/langs/ur_PK/recruitment.lang b/htdocs/langs/ur_PK/recruitment.lang
index 6b0e8117254..29e986d3d59 100644
--- a/htdocs/langs/ur_PK/recruitment.lang
+++ b/htdocs/langs/ur_PK/recruitment.lang
@@ -18,59 +18,59 @@
 #
 
 # Module label 'ModuleRecruitmentName'
-ModuleRecruitmentName = Recruitment
+ModuleRecruitmentName = بھرتی
 # Module description 'ModuleRecruitmentDesc'
-ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+ModuleRecruitmentDesc = نئی ملازمت کے عہدوں کے لیے بھرتی مہم کا نظم کریں اور ان کی پیروی کریں۔
 
 #
 # Admin page
 #
-RecruitmentSetup = Recruitment setup
-Settings = Settings
-RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
-RecruitmentArea=Recruitement area
-PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
-EnablePublicRecruitmentPages=Enable public pages of open jobs
+RecruitmentSetup = بھرتی سیٹ اپ
+Settings = ترتیبات
+RecruitmentSetupPage = ریکروٹمنٹ ماڈیول کے لیے مین آپشنز کا سیٹ اپ یہاں درج کریں۔
+RecruitmentArea=بھرتی کا علاقہ
+PublicInterfaceRecruitmentDesc=نوکریوں کے عوامی صفحات عوامی یو آر ایل ہیں جو نوکریوں کو دکھانے اور جواب دینے کے لیے ہیں۔ ہر اوپن جاب کے لیے ایک مختلف لنک ہوتا ہے، جو ہر جاب ریکارڈ پر پایا جاتا ہے۔
+EnablePublicRecruitmentPages=کھلی ملازمتوں کے عوامی صفحات کو فعال کریں۔
 
 #
 # About page
 #
-About = About
-RecruitmentAbout = About Recruitment
-RecruitmentAboutPage = Recruitment about page
-NbOfEmployeesExpected=Expected nb of employees
-JobLabel=Label of job position
-WorkPlace=Work place
-DateExpected=Expected date
-FutureManager=Future manager
-ResponsibleOfRecruitement=Responsible of recruitment
-IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job position
-PositionsToBeFilled=Job positions
-ListOfPositionsToBeFilled=List of job positions
-NewPositionToBeFilled=New job positions
+About = کے بارے میں
+RecruitmentAbout = بھرتی کے بارے میں
+RecruitmentAboutPage = صفحہ کے بارے میں بھرتی
+NbOfEmployeesExpected=ملازمین کی متوقع تعداد
+JobLabel=ملازمت کی پوزیشن کا لیبل
+WorkPlace=کام کی جگہ
+DateExpected=متوقع تاریخ
+FutureManager=مستقبل کے مینیجر
+ResponsibleOfRecruitement=بھرتی کے ذمہ دار
+IfJobIsLocatedAtAPartner=اگر ملازمت کسی ساتھی کی جگہ پر ہے۔
+PositionToBeFilled=عہدہ
+PositionsToBeFilled=ملازمت کے عہدے
+ListOfPositionsToBeFilled=ملازمت کے عہدوں کی فہرست
+NewPositionToBeFilled=نوکری کی نئی پوزیشنیں
 
-JobOfferToBeFilled=Job position to be filled
-ThisIsInformationOnJobPosition=Information of the job position to be filled
-ContactForRecruitment=Contact for recruitment
-EmailRecruiter=Email recruiter
-ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New application
-ListOfCandidatures=List of applications
-RequestedRemuneration=Requested remuneration
-ProposedRemuneration=Proposed remuneration
-ContractProposed=Contract proposed
-ContractSigned=Contract signed
-ContractRefused=Contract refused
-RecruitmentCandidature=Application
-JobPositions=Job positions
-RecruitmentCandidatures=Applications
-InterviewToDo=Interview to do
-AnswerCandidature=Application answer
-YourCandidature=Your application
-YourCandidatureAnswerMessage=Thanks you for your application.<br>...
-JobClosedTextCandidateFound=The job position is closed. The position has been filled.
-JobClosedTextCanceled=The job position is closed.
-ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsApplication=Complementary attributes (job applications)
-MakeOffer=Make an offer
+JobOfferToBeFilled=ملازمت کی پوزیشن کو پُر کرنا ہے۔
+ThisIsInformationOnJobPosition=پُر کی جانے والی ملازمت کی پوزیشن کی معلومات
+ContactForRecruitment=بھرتی کے لیے رابطہ کریں۔
+EmailRecruiter=ای میل بھرتی کرنے والا
+ToUseAGenericEmail=ایک عام ای میل استعمال کرنے کے لیے۔ اگر وضاحت نہیں کی گئی ہے تو، بھرتی کے ذمہ دار کا ای میل استعمال کیا جائے گا۔
+NewCandidature=نئی درخواست
+ListOfCandidatures=درخواستوں کی فہرست
+RequestedRemuneration=معاوضے کی درخواست کی۔
+ProposedRemuneration=مجوزہ معاوضہ
+ContractProposed=معاہدہ تجویز کیا گیا۔
+ContractSigned=معاہدے پر دستخط کیے گئے۔
+ContractRefused=معاہدہ کرنے سے انکار کر دیا۔
+RecruitmentCandidature=درخواست
+JobPositions=ملازمت کے عہدے
+RecruitmentCandidatures=ایپلی کیشنز
+InterviewToDo=انٹرویو کرنا ہے۔
+AnswerCandidature=درخواست کا جواب
+YourCandidature=آپ کی درخواست
+YourCandidatureAnswerMessage=آپ کی درخواست کے لیے آپ کا شکریہ۔ <br>...
+JobClosedTextCandidateFound=ملازمت کی پوزیشن بند ہے۔ عہدہ پُر ہو چکا ہے۔
+JobClosedTextCanceled=ملازمت کی پوزیشن بند ہے۔
+ExtrafieldsJobPosition=تکمیلی صفات (ملازمت کی پوزیشنیں)
+ExtrafieldsApplication=تکمیلی صفات (نوکری کی درخواستیں)
+MakeOffer=ایک پیشکش کریں۔
diff --git a/htdocs/langs/ur_PK/resource.lang b/htdocs/langs/ur_PK/resource.lang
index e8574dc680f..1d9c7d8ae8c 100644
--- a/htdocs/langs/ur_PK/resource.lang
+++ b/htdocs/langs/ur_PK/resource.lang
@@ -1,39 +1,39 @@
 # Dolibarr language file - Source file is en_US - resource
-MenuResourceIndex=Resources
-MenuResourceAdd=New resource
-DeleteResource=Delete resource
-ConfirmDeleteResourceElement=Confirm delete the resource for this element
-NoResourceInDatabase=No resource in database.
-NoResourceLinked=No resource linked
-ActionsOnResource=Events about this resource
-ResourcePageIndex=Resources list
-ResourceSingular=Resource
-ResourceCard=Resource card
-AddResource=Create a resource
-ResourceFormLabel_ref=Resource name
-ResourceType=Resource type
-ResourceFormLabel_description=Resource description
+MenuResourceIndex=حوالہ جات
+MenuResourceAdd=نیا وسیلہ
+DeleteResource=وسائل کو حذف کریں۔
+ConfirmDeleteResourceElement=اس عنصر کے وسائل کو حذف کرنے کی تصدیق کریں۔
+NoResourceInDatabase=ڈیٹا بیس میں کوئی وسیلہ نہیں ہے۔
+NoResourceLinked=کوئی وسیلہ منسلک نہیں ہے۔
+ActionsOnResource=اس وسائل کے بارے میں واقعات
+ResourcePageIndex=وسائل کی فہرست
+ResourceSingular=وسیلہ
+ResourceCard=ریسورس کارڈ
+AddResource=ایک وسیلہ بنائیں
+ResourceFormLabel_ref=وسائل کا نام
+ResourceType=وسائل کی قسم
+ResourceFormLabel_description=وسائل کی تفصیل
 
-ResourcesLinkedToElement=Resources linked to element
+ResourcesLinkedToElement=عنصر سے منسلک وسائل
 
-ShowResource=Show resource
+ShowResource=وسائل دکھائیں۔
 
-ResourceElementPage=Element resources
-ResourceCreatedWithSuccess=Resource successfully created
-RessourceLineSuccessfullyDeleted=Resource line successfully deleted
-RessourceLineSuccessfullyUpdated=Resource line successfully updated
-ResourceLinkedWithSuccess=Resource linked with success
+ResourceElementPage=عنصر کے وسائل
+ResourceCreatedWithSuccess=وسیلہ کامیابی کے ساتھ بنایا گیا۔
+RessourceLineSuccessfullyDeleted=ریسورس لائن کامیابی کے ساتھ حذف کر دی گئی۔
+RessourceLineSuccessfullyUpdated=ریسورس لائن کامیابی کے ساتھ اپ ڈیٹ ہو گئی۔
+ResourceLinkedWithSuccess=کامیابی سے منسلک وسائل
 
-ConfirmDeleteResource=Confirm to delete this resource
-RessourceSuccessfullyDeleted=Resource successfully deleted
-DictionaryResourceType=Type of resources
+ConfirmDeleteResource=اس وسائل کو حذف کرنے کی تصدیق کریں۔
+RessourceSuccessfullyDeleted=وسیلہ کامیابی کے ساتھ حذف ہو گیا۔
+DictionaryResourceType=وسائل کی قسم
 
-SelectResource=Select resource
+SelectResource=وسیلہ منتخب کریں۔
 
-IdResource=Id resource
-AssetNumber=Serial number
-ResourceTypeCode=Resource type code
-ImportDataset_resource_1=Resources
+IdResource=آئی ڈی کا وسیلہ
+AssetNumber=سیریل نمبر
+ResourceTypeCode=ریسورس ٹائپ کوڈ
+ImportDataset_resource_1=حوالہ جات
 
-ErrorResourcesAlreadyInUse=Some resources are in use
-ErrorResourceUseInEvent=%s used in %s event
+ErrorResourcesAlreadyInUse=کچھ وسائل استعمال میں ہیں۔
+ErrorResourceUseInEvent=%s %s ایونٹ میں استعمال کیا گیا
diff --git a/htdocs/langs/ur_PK/salaries.lang b/htdocs/langs/ur_PK/salaries.lang
index 20a10694500..3c6e18296f4 100644
--- a/htdocs/langs/ur_PK/salaries.lang
+++ b/htdocs/langs/ur_PK/salaries.lang
@@ -1,27 +1,27 @@
 # Dolibarr language file - Source file is en_US - salaries
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
-SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
-CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
-Salary=Salary
-Salaries=Salaries
-NewSalary=New salary
-AddSalary=Add salary
-NewSalaryPayment=New salary card
-AddSalaryPayment=Add salary payment
-SalaryPayment=Salary payment
-SalariesPayments=Salaries payments
-SalariesPaymentsOf=Salaries payments of %s
-ShowSalaryPayment=Show salary payment
-THM=Average hourly rate
-TJM=Average daily rate
-CurrentSalary=Current salary
-THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
-TJMDescription=This value is currently for information only and is not used for any calculation
-LastSalaries=Latest %s salaries
-AllSalaries=All salaries
-SalariesStatistics=Salary statistics
-SalariesAndPayments=Salaries and payments
-ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
-FillFieldFirst=Fill employee field first
-UpdateAmountWithLastSalary=Set amount with last salary
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=اکاؤنٹنگ اکاؤنٹ صارف تیسرے فریق کے لیے استعمال کیا جاتا ہے۔
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=صارف کارڈ پر بیان کردہ وقف اکاؤنٹنگ اکاؤنٹ صرف Subledger اکاؤنٹنگ کے لیے استعمال کیا جائے گا۔ یہ جنرل لیجر کے لیے اور سبلیجر اکاؤنٹنگ کی ڈیفالٹ ویلیو کے طور پر استعمال کیا جائے گا اگر صارف پر وقف صارف اکاؤنٹنگ اکاؤنٹ کی وضاحت نہیں کی گئی ہے۔
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=اجرت کی ادائیگی کے لیے بطور ڈیفالٹ اکاؤنٹنگ اکاؤنٹ
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=بطور ڈیفالٹ، تنخواہ بناتے وقت "خودکار طور پر کل ادائیگی بنائیں" کے آپشن کو خالی چھوڑ دیں۔
+Salary=تنخواہ
+Salaries=تنخواہیں
+NewSalary=نئی تنخواہ
+AddSalary=تنخواہ شامل کریں۔
+NewSalaryPayment=نیا تنخواہ کارڈ
+AddSalaryPayment=تنخواہ کی ادائیگی شامل کریں۔
+SalaryPayment=تنخواہ کی ادائیگی
+SalariesPayments=تنخواہوں کی ادائیگی
+SalariesPaymentsOf=%s کی تنخواہوں کی ادائیگی
+ShowSalaryPayment=تنخواہ کی ادائیگی دکھائیں۔
+THM=اوسط فی گھنٹہ کی شرح
+TJM=روزانہ کی اوسط شرح
+CurrentSalary=موجودہ تنخواہ
+THMDescription=اگر ماڈیول پروجیکٹ استعمال کیا جاتا ہے تو اس قدر کا استعمال صارفین کے داخل کردہ پروجیکٹ پر خرچ ہونے والے وقت کی لاگت کا حساب لگانے کے لیے کیا جا سکتا ہے۔
+TJMDescription=یہ قیمت فی الحال صرف معلومات کے لیے ہے اور کسی حساب کتاب کے لیے استعمال نہیں ہوتی ہے۔
+LastSalaries=تازہ ترین %s تنخواہیں۔
+AllSalaries=تمام تنخواہیں۔
+SalariesStatistics=تنخواہ کے اعدادوشمار
+SalariesAndPayments=تنخواہیں اور ادائیگیاں
+ConfirmDeleteSalaryPayment=کیا آپ اس تنخواہ کی ادائیگی کو حذف کرنا چاہتے ہیں؟
+FillFieldFirst=پہلے ملازم کی فیلڈ کو بھریں۔
+UpdateAmountWithLastSalary=آخری تنخواہ کے ساتھ رقم مقرر کریں۔
diff --git a/htdocs/langs/ur_PK/sendings.lang b/htdocs/langs/ur_PK/sendings.lang
index 8f10b1e9404..c7ec10207e9 100644
--- a/htdocs/langs/ur_PK/sendings.lang
+++ b/htdocs/langs/ur_PK/sendings.lang
@@ -1,76 +1,76 @@
 # Dolibarr language file - Source file is en_US - sendings
-RefSending=Ref. shipment
-Sending=Shipment
-Sendings=Shipments
-AllSendings=All Shipments
-Shipment=Shipment
-Shipments=Shipments
-ShowSending=Show Shipments
-Receivings=Delivery Receipts
-SendingsArea=Shipments area
-ListOfSendings=List of shipments
-SendingMethod=Shipping method
-LastSendings=Latest %s shipments
-StatisticsOfSendings=Statistics for shipments
-NbOfSendings=Number of shipments
-NumberOfShipmentsByMonth=Number of shipments by month
-SendingCard=Shipment card
-NewSending=New shipment
-CreateShipment=Create shipment
-QtyShipped=Qty shipped
-QtyShippedShort=Qty ship.
-QtyPreparedOrShipped=Qty prepared or shipped
-QtyToShip=Qty to ship
-QtyToReceive=Qty to receive
-QtyReceived=Qty received
-QtyInOtherShipments=Qty in other shipments
-KeepToShip=Remain to ship
-KeepToShipShort=Remain
-OtherSendingsForSameOrder=Other shipments for this order
-SendingsAndReceivingForSameOrder=Shipments and receipts for this order
-SendingsToValidate=Shipments to validate
-StatusSendingCanceled=Canceled
-StatusSendingCanceledShort=Canceled
-StatusSendingDraft=Draft
-StatusSendingValidated=Validated (products to ship or already shipped)
-StatusSendingProcessed=Processed
-StatusSendingDraftShort=Draft
-StatusSendingValidatedShort=Validated
-StatusSendingProcessedShort=Processed
-SendingSheet=Shipment sheet
-ConfirmDeleteSending=Are you sure you want to delete this shipment?
-ConfirmValidateSending=Are you sure you want to validate this shipment with reference <b>%s</b>?
-ConfirmCancelSending=Are you sure you want to cancel this shipment?
-DocumentModelMerou=Merou A5 model
-WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
-StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
-DateDeliveryPlanned=Planned date of delivery
-RefDeliveryReceipt=Ref delivery receipt
-StatusReceipt=Status delivery receipt
-DateReceived=Date delivery received
-ClassifyReception=Classify reception
-SendShippingByEMail=Send shipment by email
-SendShippingRef=Submission of shipment %s
-ActionsOnShipping=Events on shipment
-LinkToTrackYourPackage=Link to track your package
-ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the Sales Order record.
-ShipmentLine=Shipment line
-ProductQtyInCustomersOrdersRunning=Product quantity from open sales orders
-ProductQtyInSuppliersOrdersRunning=Product quantity from open purchase orders
-ProductQtyInShipmentAlreadySent=Product quantity from open sales order already sent
-ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from open purchase orders already received
-NoProductToShipFoundIntoStock=No product to ship found in warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
-WeightVolShort=Weight/Vol.
-ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
+RefSending=حوالہ شپمنٹ
+Sending=کھیپ
+Sendings=شپمنٹس
+AllSendings=تمام کھیپ
+Shipment=کھیپ
+Shipments=شپمنٹس
+ShowSending=کھیپ دکھائیں۔
+Receivings=ترسیل کی رسیدیں
+SendingsArea=ترسیل کے علاقے
+ListOfSendings=ترسیل کی فہرست
+SendingMethod=بھیجنے کا طریقہ
+LastSendings=تازہ ترین %s ترسیل
+StatisticsOfSendings=ترسیل کے اعدادوشمار
+NbOfSendings=ترسیل کی تعداد
+NumberOfShipmentsByMonth=ماہ کے لحاظ سے ترسیل کی تعداد
+SendingCard=شپمنٹ کارڈ
+NewSending=نئی کھیپ
+CreateShipment=شپمنٹ بنائیں
+QtyShipped=مقدار بھیج دی گئی۔
+QtyShippedShort=مقدار کا جہاز۔
+QtyPreparedOrShipped=مقدار تیار یا بھیجی گئی۔
+QtyToShip=بھیجنے کی مقدار
+QtyToReceive=وصول کرنے کی مقدار
+QtyReceived=مقدار موصول ہوئی۔
+QtyInOtherShipments=دیگر ترسیلوں میں مقدار
+KeepToShip=جہاز کے لیے رہو
+KeepToShipShort=رہو
+OtherSendingsForSameOrder=اس آرڈر کے لیے دیگر ترسیلات
+SendingsAndReceivingForSameOrder=اس آرڈر کی ترسیل اور رسیدیں
+SendingsToValidate=توثیق کرنے کے لئے ترسیل
+StatusSendingCanceled=منسوخ
+StatusSendingCanceledShort=منسوخ
+StatusSendingDraft=مسودہ
+StatusSendingValidated=توثیق شدہ (پروڈکٹس بھیجنے کے لیے یا پہلے سے بھیجے گئے)
+StatusSendingProcessed=پروسیس شدہ
+StatusSendingDraftShort=مسودہ
+StatusSendingValidatedShort=تصدیق شدہ
+StatusSendingProcessedShort=پروسیس شدہ
+SendingSheet=شپمنٹ شیٹ
+ConfirmDeleteSending=کیا آپ واقعی اس کھیپ کو حذف کرنا چاہتے ہیں؟
+ConfirmValidateSending=کیا آپ واقعی <b> %s </b> حوالہ کے ساتھ اس کھیپ کی توثیق کرنا چاہتے ہیں؟
+ConfirmCancelSending=کیا آپ واقعی اس کھیپ کو منسوخ کرنا چاہتے ہیں؟
+DocumentModelMerou=میرو A5 ماڈل
+WarningNoQtyLeftToSend=انتباہ، کوئی پروڈکٹس بھیجے جانے کا انتظار نہیں۔
+StatsOnShipmentsOnlyValidated=اعداد و شمار صرف تصدیق شدہ ترسیل کے لیے ہیں۔ استعمال شدہ تاریخ شپمنٹ کی توثیق کی تاریخ ہے (منصوبہ بند ترسیل کی تاریخ ہمیشہ معلوم نہیں ہوتی ہے)
+DateDeliveryPlanned=ترسیل کی منصوبہ بند تاریخ
+RefDeliveryReceipt=حوالگی کی رسید
+StatusReceipt=حیثیت کی ترسیل کی رسید
+DateReceived=موصول ہونے کی تاریخ
+ClassifyReception=استقبالیہ کی درجہ بندی کریں۔
+SendShippingByEMail=ای میل کے ذریعے کھیپ بھیجیں۔
+SendShippingRef=کھیپ جمع کروانا %s
+ActionsOnShipping=شپمنٹ پر واقعات
+LinkToTrackYourPackage=اپنے پیکج کو ٹریک کرنے کے لیے لنک کریں۔
+ShipmentCreationIsDoneFromOrder=اس وقت، سیلز آرڈر ریکارڈ سے ایک نئی کھیپ کی تخلیق کی جاتی ہے۔
+ShipmentLine=شپمنٹ لائن
+ProductQtyInCustomersOrdersRunning=کھلے سیلز آرڈرز سے پروڈکٹ کی مقدار
+ProductQtyInSuppliersOrdersRunning=کھلے خریداری کے آرڈر سے پروڈکٹ کی مقدار
+ProductQtyInShipmentAlreadySent=کھلے سیلز آرڈر سے پروڈکٹ کی مقدار پہلے ہی بھیج دی گئی ہے۔
+ProductQtyInSuppliersShipmentAlreadyRecevied=کھلے خریداری کے آرڈرز سے پروڈکٹ کی مقدار پہلے ہی موصول ہو چکی ہے۔
+NoProductToShipFoundIntoStock=گودام <b> %s </b> میں بھیجنے کے لیے کوئی پروڈکٹ نہیں ملا۔ اسٹاک کو درست کریں یا دوسرا گودام منتخب کرنے کے لیے واپس جائیں۔
+WeightVolShort=وزن/جلد
+ValidateOrderFirstBeforeShipment=ترسیل کرنے کے قابل ہونے سے پہلے آپ کو پہلے آرڈر کی توثیق کرنی ہوگی۔
 
 # Sending methods
 # ModelDocument
-DocumentModelTyphon=More complete document model for delivery receipts (logo...)
-DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
-Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
-SumOfProductVolumes=Sum of product volumes
-SumOfProductWeights=Sum of product weights
+DocumentModelTyphon=ترسیل کی رسیدوں کے لیے مزید مکمل دستاویز کا ماڈل (لوگو...)
+DocumentModelStorm=ترسیل کی رسیدوں اور ایکسٹرا فیلڈز کی مطابقت کے لیے مزید مکمل دستاویز کا ماڈل (لوگو...)
+Error_EXPEDITION_ADDON_NUMBER_NotDefined=مستقل EXPEDITION_ADDON_NUMBER کی وضاحت نہیں کی گئی ہے۔
+SumOfProductVolumes=مصنوعات کے حجم کا مجموعہ
+SumOfProductWeights=مصنوعات کے وزن کا مجموعہ
 
 # warehouse details
-DetailWarehouseNumber= Warehouse details
+DetailWarehouseNumber= گودام کی تفصیلات
 DetailWarehouseFormat= W:%s (Qty: %d)
diff --git a/htdocs/langs/ur_PK/sms.lang b/htdocs/langs/ur_PK/sms.lang
index 055085eb16a..d833124d4ea 100644
--- a/htdocs/langs/ur_PK/sms.lang
+++ b/htdocs/langs/ur_PK/sms.lang
@@ -1,51 +1,51 @@
 # Dolibarr language file - Source file is en_US - sms
-Sms=Sms
-SmsSetup=SMS setup
-SmsDesc=This page allows you to define global options on SMS features
-SmsCard=SMS Card
-AllSms=All SMS campaigns
-SmsTargets=Targets
-SmsRecipients=Targets
-SmsRecipient=Target
-SmsTitle=Description
-SmsFrom=Sender
-SmsTo=Target
-SmsTopic=Topic of SMS
-SmsText=Message
-SmsMessage=SMS Message
-ShowSms=Show SMS
-ListOfSms=List SMS campaigns
-NewSms=New SMS campaign
-EditSms=Edit SMS
-ResetSms=New sending
-DeleteSms=Delete SMS campaign
-DeleteASms=Remove a SMS campaign
+Sms=پیغام
+SmsSetup=ایس ایم ایس سیٹ اپ
+SmsDesc=یہ صفحہ آپ کو SMS کی خصوصیات پر عالمی اختیارات کی وضاحت کرنے کی اجازت دیتا ہے۔
+SmsCard=ایس ایم ایس کارڈ
+AllSms=تمام SMS مہمات
+SmsTargets=اہداف
+SmsRecipients=اہداف
+SmsRecipient=ہدف
+SmsTitle=تفصیل
+SmsFrom=بھیجنے والا
+SmsTo=ہدف
+SmsTopic=SMS کا موضوع
+SmsText=پیغام
+SmsMessage=ایس ایم ایس پیغام
+ShowSms=ایس ایم ایس دکھائیں۔
+ListOfSms=ایس ایم ایس مہمات کی فہرست بنائیں
+NewSms=نئی SMS مہم
+EditSms=ایس ایم ایس میں ترمیم کریں۔
+ResetSms=نیا بھیجنا
+DeleteSms=ایس ایم ایس مہم کو حذف کریں۔
+DeleteASms=ایس ایم ایس مہم کو ہٹا دیں۔
 PreviewSms=Previuw SMS
-PrepareSms=Prepare SMS
-CreateSms=Create SMS
-SmsResult=Result of SMS sending
-TestSms=Test SMS
-ValidSms=Validate SMS
-ApproveSms=Approve SMS
-SmsStatusDraft=Draft
-SmsStatusValidated=Validated
-SmsStatusApproved=Approved
-SmsStatusSent=Sent
-SmsStatusSentPartialy=Sent partially
-SmsStatusSentCompletely=Sent completely
-SmsStatusError=Error
-SmsStatusNotSent=Not sent
-SmsSuccessfulySent=SMS correctly sent (from %s to %s)
-ErrorSmsRecipientIsEmpty=Number of target is empty
-WarningNoSmsAdded=No new phone number to add to target list
-ConfirmValidSms=Do you confirm validation of this campaign?
-NbOfUniqueSms=No. of unique phone numbers
-NbOfSms=No. of phone numbers
-ThisIsATestMessage=This is a test message
-SendSms=Send SMS
-SmsInfoCharRemain=No. of remaining characters
-SmsInfoNumero= (international format i.e.: +33899701761)
-DelayBeforeSending=Delay before sending (minutes)
-SmsNoPossibleSenderFound=No sender available. Check setup of your SMS provider.
-SmsNoPossibleRecipientFound=No target available. Check setup of your SMS provider.
-DisableStopIfSupported=Disable STOP message (if supported)
+PrepareSms=ایس ایم ایس تیار کریں۔
+CreateSms=ایس ایم ایس بنائیں
+SmsResult=ایس ایم ایس بھیجنے کا نتیجہ
+TestSms=ٹیسٹ ایس ایم ایس
+ValidSms=ایس ایم ایس کی توثیق کریں۔
+ApproveSms=ایس ایم ایس کو منظور کریں۔
+SmsStatusDraft=مسودہ
+SmsStatusValidated=تصدیق شدہ
+SmsStatusApproved=منظورشدہ
+SmsStatusSent=بھیجا
+SmsStatusSentPartialy=جزوی طور پر بھیجا گیا۔
+SmsStatusSentCompletely=مکمل طور پر بھیج دیا گیا۔
+SmsStatusError=خرابی
+SmsStatusNotSent=بھیجا نہیں۔
+SmsSuccessfulySent=SMS درست طریقے سے بھیجا گیا (%s سے %s تک)
+ErrorSmsRecipientIsEmpty=ہدف کی تعداد خالی ہے۔
+WarningNoSmsAdded=ہدف کی فہرست میں شامل کرنے کے لیے کوئی نیا فون نمبر نہیں۔
+ConfirmValidSms=کیا آپ اس مہم کی توثیق کی تصدیق کرتے ہیں؟
+NbOfUniqueSms=منفرد فون نمبرز کی تعداد
+NbOfSms=فون نمبرز کی تعداد
+ThisIsATestMessage=یہ ایک امتحانی پیغام ہے۔
+SendSms=ایس ایم ایس بھیجیں۔
+SmsInfoCharRemain=باقی حروف کی تعداد
+SmsInfoNumero= (بین الاقوامی شکل یعنی: +33899701761)
+DelayBeforeSending=بھیجنے سے پہلے تاخیر (منٹ)
+SmsNoPossibleSenderFound=کوئی بھیجنے والا دستیاب نہیں ہے۔ اپنے SMS فراہم کنندہ کا سیٹ اپ چیک کریں۔
+SmsNoPossibleRecipientFound=کوئی ہدف دستیاب نہیں ہے۔ اپنے SMS فراہم کنندہ کا سیٹ اپ چیک کریں۔
+DisableStopIfSupported=STOP پیغام کو غیر فعال کریں (اگر تعاون یافتہ ہو)
diff --git a/htdocs/langs/ur_PK/stocks.lang b/htdocs/langs/ur_PK/stocks.lang
index 599c9649b18..a776633222b 100644
--- a/htdocs/langs/ur_PK/stocks.lang
+++ b/htdocs/langs/ur_PK/stocks.lang
@@ -1,273 +1,273 @@
 # Dolibarr language file - Source file is en_US - stocks
-WarehouseCard=Warehouse card
-Warehouse=Warehouse
-Warehouses=Warehouses
-ParentWarehouse=Parent warehouse
-NewWarehouse=New warehouse / Stock Location
-WarehouseEdit=Modify warehouse
-MenuNewWarehouse=New warehouse
-WarehouseSource=Source warehouse
-WarehouseSourceNotDefined=No warehouse defined,
-AddWarehouse=Create warehouse
-AddOne=Add one
-DefaultWarehouse=Default warehouse
-WarehouseTarget=Target warehouse
-ValidateSending=Confirm shipment
-CancelSending=Cancel shipment
-DeleteSending=Delete shipment
-Stock=Stock
-Stocks=Stocks
-MissingStocks=Missing stocks
-StockAtDate=Stocks at date
-StockAtDateInPast=Date in the past
-StockAtDateInFuture=Date in the future
-StocksByLotSerial=Stocks by lot/serial
-LotSerial=Lots/Serials
-LotSerialList=List of lot/serials
-Movements=Movements
-ErrorWarehouseRefRequired=Warehouse reference name is required
-ListOfWarehouses=List of warehouses
-ListOfStockMovements=List of stock movements
-ListOfInventories=List of inventories
-MovementId=Movement ID
-StockMovementForId=Movement ID %d
-ListMouvementStockProject=List of stock movements associated to project
-StocksArea=Warehouses area
-AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
-IncludeAlsoDraftOrders=Include also draft orders
-Location=Location
-LocationSummary=Short name of location
-NumberOfDifferentProducts=Number of unique products
-NumberOfProducts=Total number of products
-LastMovement=Latest movement
-LastMovements=Latest movements
-Units=Units
-Unit=Unit
-StockCorrection=Stock correction
-CorrectStock=Correct stock
-StockTransfer=Stock transfer
-TransferStock=Transfer stock
-MassStockTransferShort=Mass stock transfer
-StockMovement=Stock movement
-StockMovements=Stock movements
-NumberOfUnit=Number of units
-UnitPurchaseValue=Unit purchase price
-StockTooLow=Stock too low
-StockLowerThanLimit=Stock lower than alert limit (%s)
-EnhancedValue=Value
-EnhancedValueOfWarehouses=Warehouses value
-UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
-AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
-RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseOnThirparty=Set a warehouse on Third-parties
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
-WarehouseAskWarehouseDuringOrder=Set a warehouse on Sales Orders
-WarehouseAskWarehouseDuringProject=Set a warehouse on Projects
-UserDefaultWarehouse=Set a warehouse on Users
-MainDefaultWarehouse=Default warehouse
-MainDefaultWarehouseUser=Use a default warehouse for each user
-MainDefaultWarehouseUserDesc=By activating this option, during creation of a product, the warehouse assigned to the product will be defined on this one. If no warehouse is defined on the user, the default warehouse is defined.
-IndependantSubProductStock=Product stock and subproduct stock are independent
-QtyDispatched=Quantity dispatched
-QtyDispatchedShort=Qty dispatched
-QtyToDispatchShort=Qty to dispatch
-OrderDispatch=Item receipts
-RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
-RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
-DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
-DeStockOnValidateOrder=Decrease real stocks on validation of sales order
-DeStockOnShipment=Decrease real stocks on shipping validation
-DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
-ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
-ReStockOnValidateOrder=Increase real stocks on purchase order approval
-ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
-StockOnReception=Increase real stocks on validation of reception
-StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
-OrderStatusNotReadyToDispatch=Order has not yet or no more a status that allows dispatching of products in stock warehouses.
-StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
-NoPredefinedProductToDispatch=No predefined products for this object. So no dispatching in stock is required.
-DispatchVerb=Dispatch
-StockLimitShort=Limit for alert
-StockLimit=Stock limit for alert
-StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
-PhysicalStock=Physical Stock
-RealStock=Real Stock
-RealStockDesc=Physical/real stock is the stock currently in the warehouses.
-RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
-VirtualStock=Virtual stock
-VirtualStockAtDate=Virtual stock at a future date
-VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
-AtDate=At date
-IdWarehouse=Id warehouse
-DescWareHouse=Description warehouse
-LieuWareHouse=Localisation warehouse
-WarehousesAndProducts=Warehouses and products
-WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
-AverageUnitPricePMPShort=Weighted average price
-AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
-SellPriceMin=Selling Unit Price
-EstimatedStockValueSellShort=Value for sell
-EstimatedStockValueSell=Value for sell
-EstimatedStockValueShort=Input stock value
-EstimatedStockValue=Input stock value
-DeleteAWarehouse=Delete a warehouse
-ConfirmDeleteWarehouse=Are you sure you want to delete the warehouse <b>%s</b>?
-PersonalStock=Personal stock %s
-ThisWarehouseIsPersonalStock=This warehouse represents personal stock of %s %s
-SelectWarehouseForStockDecrease=Choose warehouse to use for stock decrease
-SelectWarehouseForStockIncrease=Choose warehouse to use for stock increase
-NoStockAction=No stock action
-DesiredStock=Desired Stock
-DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
-StockToBuy=To order
-Replenishment=Replenishment
-ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
-UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
-ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
-UseVirtualStock=Use virtual stock
-UsePhysicalStock=Use physical stock
-CurentSelectionMode=Current selection mode
-CurentlyUsingVirtualStock=Virtual stock
-CurentlyUsingPhysicalStock=Physical stock
-RuleForStockReplenishment=Rule for stocks replenishment
-SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
-AlertOnly= Alerts only
-IncludeProductWithUndefinedAlerts = Include also negative stock for products with no desired quantity defined, to restore them to 0
-WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
-WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
-ForThisWarehouse=For this warehouse
-ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
-ReplenishmentStatusDescPerWarehouse=If you want a replenishment based on desired quantity defined per warehouse, you must add a filter on the warehouse.
-ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
-Replenishments=Replenishments
-NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
-NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
-MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
-RecordMovement=Record transfer
-ReceivingForSameOrder=Receipts for this order
-StockMovementRecorded=Stock movements recorded
-RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change)
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
-MovementLabel=Label of movement
-TypeMovement=Direction of movement
-DateMovement=Date of movement
-InventoryCode=Movement or inventory code
-IsInPackage=Contained into package
-WarehouseAllowNegativeTransfer=Stock can be negative
-qtyToTranferIsNotEnough=You don't have enough stock from your source warehouse and your setup does not allow negative stocks.
-qtyToTranferLotIsNotEnough=You don't have enough stock, for this lot number, from your source warehouse and your setup does not allow negative stocks (Qty for product '%s' with lot '%s' is %s in warehouse '%s').
-ShowWarehouse=Show warehouse
-MovementCorrectStock=Stock correction for product %s
-MovementTransferStock=Stock transfer of product %s into another warehouse
-InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
-ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
-OpenAnyMovement=Open (all movement)
-OpenInternal=Open (only internal movement)
-UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
-OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
-ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
-ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
-ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock correctly deleted
-AddNewProductStockWarehouse=Set new limit for alert and desired optimal stock
-AddStockLocationLine=Decrease quantity then click to add another warehouse for this product
-InventoryDate=Inventory date
-Inventories=Inventories
-NewInventory=New inventory
-inventorySetup = Inventory Setup
-inventoryCreatePermission=Create new inventory
-inventoryReadPermission=View inventories
-inventoryWritePermission=Update inventories
-inventoryValidatePermission=Validate inventory
-inventoryDeletePermission=Delete inventory
-inventoryTitle=Inventory
-inventoryListTitle=Inventories
-inventoryListEmpty=No inventory in progress
-inventoryCreateDelete=Create/Delete inventory
-inventoryCreate=Create new
-inventoryEdit=Edit
-inventoryValidate=Validated
-inventoryDraft=Running
-inventorySelectWarehouse=Warehouse choice
-inventoryConfirmCreate=Create
-inventoryOfWarehouse=Inventory for warehouse: %s
-inventoryErrorQtyAdd=Error: one quantity is less than zero
-inventoryMvtStock=By inventory
-inventoryWarningProductAlreadyExists=This product is already into list
-SelectCategory=Category filter
-SelectFournisseur=Vendor filter
-inventoryOnDate=Inventory
-INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
-inventoryChangePMPPermission=Allow to change PMP value for a product
-ColumnNewPMP=New unit PMP
-OnlyProdsInStock=Do not add product without stock
-TheoricalQty=Theorical qty
-TheoricalValue=Theorical qty
-LastPA=Last BP
-CurrentPA=Curent BP
-RecordedQty=Recorded Qty
-RealQty=Real Qty
-RealValue=Real Value
-RegulatedQty=Regulated Qty
-AddInventoryProduct=Add product to inventory
-AddProduct=Add
-ApplyPMP=Apply PMP
-FlushInventory=Flush inventory
-ConfirmFlushInventory=Do you confirm this action?
-InventoryFlushed=Inventory flushed
-ExitEditMode=Exit edition
-inventoryDeleteLine=Delete line
-RegulateStock=Regulate Stock
-ListInventory=List
-StockSupportServices=Stock management supports Services
-StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
-ReceiveProducts=Receive items
-StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
-StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
-StockIncrease=Stock increase
-StockDecrease=Stock decrease
-InventoryForASpecificWarehouse=Inventory for a specific warehouse
-InventoryForASpecificProduct=Inventory for a specific product
-StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to use
-ForceTo=Force to
-AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (Warning: This may decrease dramatically performances)
-StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
-CurrentStock=Current stock
-InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Complete real qty by scaning
-UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|serial barcode)
-DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
-ImportFromCSV=Import CSV list of movement
-ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
-SelectAStockMovementFileToImport=select a stock movement file to import
-InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
-LabelOfInventoryMovemement=Inventory %s
-ReOpen=Reopen
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
-ObjectNotFound=%s not found
-MakeMovementsAndClose=Generate movements and close
-AutofillWithExpected=Replace real quantity with expected quantity
-ShowAllBatchByDefault=By default, show batch details on product "stock" tab
-CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
-ErrorWrongBarcodemode=Unknown Barcode mode
-ProductDoesNotExist=Product does not exist
-ErrorSameBatchNumber=Several record for the batch number were found in the inventory sheet. No way to know which one to increase.
-ProductBatchDoesNotExist=Product with batch/serial does not exist
-ProductBarcodeDoesNotExist=Product with barcode does not exist
-WarehouseId=Warehouse ID
-WarehouseRef=Warehouse Ref
-SaveQtyFirst=Save the real inventoried quantities first, before asking creation of the stock movement.
-InventoryStartedShort=Started
-ErrorOnElementsInventory=Operation canceled for the following reason:
-ErrorCantFindCodeInInventory=Can't find the following code in inventory
-QtyWasAddedToTheScannedBarcode=Success !! The quantity was added to all the requested barcode. You can close the Scanner tool.
-StockChangeDisabled=Change on stock disabled
-NoWarehouseDefinedForTerminal=No warehouse defined for terminal
+WarehouseCard=گودام کارڈ
+Warehouse=گودام
+Warehouses=گودام
+ParentWarehouse=والدین کا گودام
+NewWarehouse=نیا گودام / اسٹاک کا مقام
+WarehouseEdit=گودام میں ترمیم کریں۔
+MenuNewWarehouse=نیا گودام
+WarehouseSource=ماخذ گودام
+WarehouseSourceNotDefined=کوئی گودام متعین نہیں،
+AddWarehouse=گودام بنائیں
+AddOne=ایک شامل کریں۔
+DefaultWarehouse=پہلے سے طے شدہ گودام
+WarehouseTarget=گودام کو نشانہ بنائیں
+ValidateSending=شپمنٹ کی تصدیق کریں۔
+CancelSending=شپمنٹ منسوخ کریں۔
+DeleteSending=شپمنٹ کو حذف کریں۔
+Stock=اسٹاک
+Stocks=اسٹاکس
+MissingStocks=لاپتہ اسٹاک
+StockAtDate=تاریخ پر اسٹاک
+StockAtDateInPast=ماضی میں تاریخ
+StockAtDateInFuture=مستقبل میں تاریخ
+StocksByLotSerial=لاٹ/سیریل کے حساب سے اسٹاک
+LotSerial=لاٹس/سیریلز
+LotSerialList=لاٹ/سیریلز کی فہرست
+Movements=حرکتیں
+ErrorWarehouseRefRequired=گودام کے حوالے کا نام درکار ہے۔
+ListOfWarehouses=گوداموں کی فہرست
+ListOfStockMovements=اسٹاک کی نقل و حرکت کی فہرست
+ListOfInventories=انوینٹریوں کی فہرست
+MovementId=موومنٹ آئی ڈی
+StockMovementForId=موومنٹ ID %d
+ListMouvementStockProject=پروجیکٹ سے وابستہ اسٹاک کی نقل و حرکت کی فہرست
+StocksArea=گوداموں کا علاقہ
+AllWarehouses=تمام گودام
+IncludeEmptyDesiredStock=غیر متعینہ مطلوبہ اسٹاک کے ساتھ منفی اسٹاک بھی شامل کریں۔
+IncludeAlsoDraftOrders=ڈرافٹ آرڈرز بھی شامل کریں۔
+Location=مقام
+LocationSummary=مقام کا مختصر نام
+NumberOfDifferentProducts=منفرد مصنوعات کی تعداد
+NumberOfProducts=مصنوعات کی کل تعداد
+LastMovement=تازہ ترین تحریک
+LastMovements=تازہ ترین حرکات
+Units=یونٹس
+Unit=یونٹ
+StockCorrection=اسٹاک کی اصلاح
+CorrectStock=درست اسٹاک
+StockTransfer=اسٹاک کی منتقلی
+TransferStock=اسٹاک منتقل کریں۔
+MassStockTransferShort=بڑے پیمانے پر اسٹاک کی منتقلی
+StockMovement=اسٹاک کی نقل و حرکت
+StockMovements=اسٹاک کی نقل و حرکت
+NumberOfUnit=یونٹوں کی تعداد
+UnitPurchaseValue=یونٹ کی خریداری کی قیمت
+StockTooLow=اسٹاک بہت کم ہے۔
+StockLowerThanLimit=انتباہ کی حد سے کم اسٹاک (%s)
+EnhancedValue=قدر
+EnhancedValueOfWarehouses=گوداموں کی قدر
+UserWarehouseAutoCreate=صارف بناتے وقت خود بخود صارف گودام بنائیں
+AllowAddLimitStockByWarehouse=کم از کم اور مطلوبہ سٹاک فی جوڑی (مصنوعات کے گودام) کی قیمت کے علاوہ کم از کم اور مطلوبہ سٹاک فی پروڈکٹ کی قدر کا بھی انتظام کریں۔
+RuleForWarehouse=گوداموں کے لیے اصول
+WarehouseAskWarehouseOnThirparty=فریق ثالث پر گودام سیٹ کریں۔
+WarehouseAskWarehouseDuringPropal=تجارتی تجاویز پر گودام قائم کریں۔
+WarehouseAskWarehouseDuringOrder=سیلز آرڈرز پر گودام سیٹ کریں۔
+WarehouseAskWarehouseDuringProject=پروجیکٹس پر ایک گودام سیٹ کریں۔
+UserDefaultWarehouse=صارفین پر ایک گودام سیٹ کریں۔
+MainDefaultWarehouse=پہلے سے طے شدہ گودام
+MainDefaultWarehouseUser=ہر صارف کے لیے ڈیفالٹ گودام استعمال کریں۔
+MainDefaultWarehouseUserDesc=اس آپشن کو چالو کرنے سے، پروڈکٹ کی تخلیق کے دوران، پروڈکٹ کو تفویض کردہ گودام کی اس پر تعریف کی جائے گی۔ اگر صارف پر کسی گودام کی وضاحت نہیں کی گئی ہے تو، پہلے سے طے شدہ گودام کی وضاحت کی جاتی ہے۔
+IndependantSubProductStock=پروڈکٹ اسٹاک اور ذیلی پروڈکٹ اسٹاک آزاد ہیں۔
+QtyDispatched=مقدار بھیج دی گئی۔
+QtyDispatchedShort=مقدار بھیج دی گئی۔
+QtyToDispatchShort=بھیجنے کے لیے مقدار
+OrderDispatch=آئٹم کی رسیدیں
+RuleForStockManagementDecrease=خودکار سٹاک میں کمی کے لیے قاعدہ کا انتخاب کریں (دستی کمی ہمیشہ ممکن ہے، چاہے خودکار کمی کا قاعدہ فعال ہو)
+RuleForStockManagementIncrease=خودکار سٹاک میں اضافے کے لیے اصول کا انتخاب کریں (دستی اضافہ ہمیشہ ممکن ہوتا ہے، چاہے خودکار اضافہ کا اصول فعال ہو)
+DeStockOnBill=کسٹمر انوائس/کریڈٹ نوٹ کی توثیق پر حقیقی اسٹاک کو کم کریں۔
+DeStockOnValidateOrder=سیلز آرڈر کی توثیق پر حقیقی اسٹاک کو کم کریں۔
+DeStockOnShipment=شپنگ کی توثیق پر حقیقی اسٹاک کو کم کریں۔
+DeStockOnShipmentOnClosing=جب شپنگ بند ہونے پر سیٹ ہو تو اصلی اسٹاک کو کم کریں۔
+ReStockOnBill=وینڈر انوائس/کریڈٹ نوٹ کی توثیق پر حقیقی اسٹاک میں اضافہ کریں۔
+ReStockOnValidateOrder=خریداری کے آرڈر کی منظوری پر حقیقی اسٹاک میں اضافہ کریں۔
+ReStockOnDispatchOrder=سامان کی خریداری کے آرڈر کی وصولی کے بعد، گودام میں دستی ترسیل پر حقیقی اسٹاک میں اضافہ کریں
+StockOnReception=استقبالیہ کی توثیق پر حقیقی اسٹاک میں اضافہ کریں۔
+StockOnReceptionOnClosing=استقبالیہ بند ہونے پر حقیقی اسٹاک میں اضافہ کریں۔
+OrderStatusNotReadyToDispatch=آرڈر کی ابھی تک کوئی حیثیت نہیں ہے یا کوئی ایسی حیثیت نہیں ہے جو اسٹاک گوداموں میں مصنوعات کی ترسیل کی اجازت دیتی ہو۔
+StockDiffPhysicTeoric=فزیکل اور ورچوئل اسٹاک کے درمیان فرق کی وضاحت
+NoPredefinedProductToDispatch=اس آبجیکٹ کے لیے کوئی پیش وضاحتی مصنوعات نہیں۔ لہذا اسٹاک میں بھیجنے کی ضرورت نہیں ہے۔
+DispatchVerb=ڈسپیچ
+StockLimitShort=انتباہ کی حد
+StockLimit=انتباہ کے لیے اسٹاک کی حد
+StockLimitDesc=(خالی) کا مطلب ہے کوئی انتباہ نہیں۔ <br> 0 سٹاک کے خالی ہوتے ہی وارننگ کو متحرک کرنے کے لیے استعمال کیا جا سکتا ہے۔
+PhysicalStock=فزیکل اسٹاک
+RealStock=اصلی اسٹاک
+RealStockDesc=فزیکل/اصلی اسٹاک وہ اسٹاک ہے جو فی الحال گوداموں میں ہے۔
+RealStockWillAutomaticallyWhen=اصلی اسٹاک میں اس اصول کے مطابق ترمیم کی جائے گی (جیسا کہ اسٹاک ماڈیول میں بیان کیا گیا ہے):
+VirtualStock=ورچوئل اسٹاک
+VirtualStockAtDate=مستقبل کی تاریخ پر ورچوئل اسٹاک
+VirtualStockAtDateDesc=ورچوئل اسٹاک ایک بار تمام زیر التواء آرڈرز جن پر عمل درآمد کی منصوبہ بندی کی گئی ہے منتخب تاریخ سے پہلے ختم ہو جائے گی۔
+VirtualStockDesc=ورچوئل اسٹاک وہ حسابی اسٹاک ہوتا ہے جب تمام کھلی/ زیر التواء کارروائیاں (جو اسٹاک کو متاثر کرتی ہیں) بند ہو جانے کے بعد دستیاب ہوتی ہیں (خریداری کے آرڈر موصول ہوتے ہیں، سیلز آرڈرز بھیجے جاتے ہیں، مینوفیکچرنگ آرڈرز تیار ہوتے ہیں، وغیرہ)
+AtDate=تاریخ میں
+IdWarehouse=آئی ڈی گودام
+DescWareHouse=تفصیل گودام
+LieuWareHouse=لوکلائزیشن گودام
+WarehousesAndProducts=گودام اور مصنوعات
+WarehousesAndProductsBatchDetail=گودام اور مصنوعات (تفصیل کے ساتھ فی لاٹ/سیریل)
+AverageUnitPricePMPShort=وزنی اوسط قیمت
+AverageUnitPricePMPDesc=ان پٹ اوسط یونٹ کی قیمت جو ہمیں اپنے اسٹاک میں پروڈکٹ کی 1 یونٹ حاصل کرنے کے لیے خرچ کرنا پڑتی ہے۔
+SellPriceMin=فروخت یونٹ کی قیمت
+EstimatedStockValueSellShort=قیمت برائے فروخت
+EstimatedStockValueSell=قیمت برائے فروخت
+EstimatedStockValueShort=ان پٹ اسٹاک کی قیمت
+EstimatedStockValue=ان پٹ اسٹاک کی قیمت
+DeleteAWarehouse=گودام کو حذف کریں۔
+ConfirmDeleteWarehouse=کیا آپ واقعی گودام <b> %s </b> کو حذف کرنا چاہتے ہیں؟
+PersonalStock=ذاتی اسٹاک %s
+ThisWarehouseIsPersonalStock=یہ گودام %s %s کے ذاتی اسٹاک کی نمائندگی کرتا ہے
+SelectWarehouseForStockDecrease=اسٹاک میں کمی کے لیے استعمال کرنے کے لیے گودام کا انتخاب کریں۔
+SelectWarehouseForStockIncrease=اسٹاک میں اضافے کے لیے گودام کا انتخاب کریں۔
+NoStockAction=کوئی اسٹاک ایکشن نہیں۔
+DesiredStock=مطلوبہ اسٹاک
+DesiredStockDesc=اسٹاک کی یہ رقم وہ قیمت ہوگی جو اسٹاک کو بھرنے کی خصوصیت سے بھرنے کے لیے استعمال ہوتی ہے۔
+StockToBuy=منگوانا
+Replenishment=دوبارہ بھرنا
+ReplenishmentOrders=دوبارہ بھرنے کے احکامات
+VirtualDiffersFromPhysical=اسٹاک میں اضافہ/کمی کے اختیارات کے مطابق، فزیکل اسٹاک اور ورچوئل اسٹاک (فزیکل اسٹاک + اوپن آرڈرز) مختلف ہوسکتے ہیں
+UseRealStockByDefault=دوبارہ بھرنے کی خصوصیت کے لیے ورچوئل اسٹاک کے بجائے اصلی اسٹاک استعمال کریں۔
+ReplenishmentCalculation=آرڈر کی رقم (مطلوبہ مقدار - ورچوئل اسٹاک) کے بجائے (مطلوبہ مقدار - اصلی اسٹاک) ہوگی۔
+UseVirtualStock=ورچوئل اسٹاک استعمال کریں۔
+UsePhysicalStock=فزیکل اسٹاک استعمال کریں۔
+CurentSelectionMode=موجودہ سلیکشن موڈ
+CurentlyUsingVirtualStock=ورچوئل اسٹاک
+CurentlyUsingPhysicalStock=فزیکل اسٹاک
+RuleForStockReplenishment=اسٹاک کو دوبارہ بھرنے کا اصول
+SelectProductWithNotNullQty=کم از کم ایک پروڈکٹ کا انتخاب کریں جس میں quty نہ ہو اور ایک وینڈر ہو۔
+AlertOnly= صرف انتباہات
+IncludeProductWithUndefinedAlerts = ان مصنوعات کے لیے منفی اسٹاک بھی شامل کریں جن کی مطلوبہ مقدار کی وضاحت نہیں کی گئی ہے، تاکہ انہیں 0 پر بحال کیا جا سکے۔
+WarehouseForStockDecrease=گودام <b> %s </b> اسٹاک میں کمی کے لیے استعمال کیا جائے گا
+WarehouseForStockIncrease=گودام <b> %s </b> اسٹاک میں اضافے کے لیے استعمال کیا جائے گا۔
+ForThisWarehouse=اس گودام کے لیے
+ReplenishmentStatusDesc=یہ ان تمام مصنوعات کی فہرست ہے جس کا اسٹاک مطلوبہ اسٹاک سے کم ہے (یا الرٹ ویلیو سے کم اگر چیک باکس "صرف الرٹ" کو نشان زد کیا گیا ہے)۔ چیک باکس کا استعمال کرتے ہوئے، آپ فرق کو پُر کرنے کے لیے خریداری کے آرڈر بنا سکتے ہیں۔
+ReplenishmentStatusDescPerWarehouse=اگر آپ فی گودام میں متعین مطلوبہ مقدار کی بنیاد پر دوبارہ بھرنا چاہتے ہیں، تو آپ کو گودام پر ایک فلٹر شامل کرنا ہوگا۔
+ReplenishmentOrdersDesc=یہ پہلے سے طے شدہ مصنوعات سمیت تمام کھلے خریداری کے آرڈرز کی فہرست ہے۔ صرف پہلے سے طے شدہ پروڈکٹس کے ساتھ کھلے آرڈرز، اس لیے وہ آرڈرز جو اسٹاک کو متاثر کر سکتے ہیں، یہاں نظر آتے ہیں۔
+Replenishments=دوبارہ بھرنے
+NbOfProductBeforePeriod=منتخب مدت سے پہلے اسٹاک میں پروڈکٹ %s کی مقدار (<%s)
+NbOfProductAfterPeriod=منتخب مدت کے بعد اسٹاک میں پروڈکٹ %s کی مقدار (> %s)
+MassMovement=عوامی تحریک
+SelectProductInAndOutWareHouse=ایک ذریعہ گودام اور ہدف گودام، ایک پروڈکٹ اور مقدار منتخب کریں پھر "%s" پر کلک کریں۔ ایک بار جب یہ تمام مطلوبہ حرکتوں کے لیے ہو جائے تو "%s" پر کلک کریں۔
+RecordMovement=ریکارڈ کی منتقلی
+ReceivingForSameOrder=اس آرڈر کی رسیدیں
+StockMovementRecorded=اسٹاک کی نقل و حرکت ریکارڈ کی گئی۔
+RuleForStockAvailability=اسٹاک کی ضروریات پر قواعد
+StockMustBeEnoughForInvoice=انوائس میں پروڈکٹ/سروس کو شامل کرنے کے لیے اسٹاک کی سطح کافی ہونی چاہیے (انوائس میں لائن شامل کرتے وقت چیک موجودہ اصلی اسٹاک پر کیا جاتا ہے جو بھی خودکار اسٹاک کی تبدیلی کے لیے اصول ہو)
+StockMustBeEnoughForOrder=آرڈر کرنے کے لیے پروڈکٹ/سروس کو شامل کرنے کے لیے اسٹاک کی سطح کافی ہونی چاہیے (خودکار اسٹاک کی تبدیلی کے لیے جو بھی اصول ترتیب میں شامل کرتے وقت موجودہ اصلی اسٹاک پر چیک کیا جاتا ہے)
+StockMustBeEnoughForShipment= سٹاک کی سطح شپمنٹ میں پروڈکٹ/سروس کو شامل کرنے کے لیے کافی ہونی چاہیے (شیپمنٹ میں لائن شامل کرتے وقت چیک موجودہ اصلی اسٹاک پر کیا جاتا ہے جو بھی خودکار اسٹاک کی تبدیلی کا اصول ہو)
+MovementLabel=تحریک کا لیبل
+TypeMovement=حرکت کی سمت
+DateMovement=نقل و حرکت کی تاریخ
+InventoryCode=نقل و حرکت یا انوینٹری کوڈ
+IsInPackage=پیکیج میں شامل ہے۔
+WarehouseAllowNegativeTransfer=اسٹاک منفی ہوسکتا ہے۔
+qtyToTranferIsNotEnough=آپ کے پاس اپنے سورس گودام سے کافی اسٹاک نہیں ہے اور آپ کا سیٹ اپ منفی اسٹاک کی اجازت نہیں دیتا ہے۔
+qtyToTranferLotIsNotEnough=آپ کے پاس کافی سٹاک نہیں ہے، اس لاٹ نمبر کے لیے، آپ کے سورس گودام سے اور آپ کا سیٹ اپ منفی اسٹاک کی اجازت نہیں دیتا ہے (گودام '%s' کے ساتھ '%s' پروڈکٹ کی مقدار '%s' گودام میں %s ہے)۔
+ShowWarehouse=گودام دکھائیں۔
+MovementCorrectStock=پروڈکٹ %s کے لیے اسٹاک کی اصلاح
+MovementTransferStock=پراڈکٹ %s کو دوسرے گودام میں سٹاک منتقل کرنا
+InventoryCodeShort=Inv./Mov. کوڈ
+NoPendingReceptionOnSupplierOrder=اوپن پرچیز آرڈر کی وجہ سے کوئی زیر التواء استقبالیہ
+ThisSerialAlreadyExistWithDifferentDate=یہ بہت / سیریل نمبر (<strong> %s </strong>) پہلے سے موجود ہے لیکن مختلف eatby یا sellby تاریخ کے ساتھ (مل گیا <strong> %s </strong> لیکن آپ <strong> %s </strong> درج کریں).
+OpenAnyMovement=کھولیں (تمام حرکت)
+OpenInternal=کھولیں (صرف اندرونی نقل و حرکت)
+UseDispatchStatus=خریداری کے آرڈر کے استقبال پر پروڈکٹ لائنوں کے لیے ڈسپیچ سٹیٹس (منظور/انکار) کا استعمال کریں۔
+OptionMULTIPRICESIsOn=آپشن "کئی قیمتیں فی سیگمنٹ" آن ہے۔ اس کا مطلب ہے کہ ایک پروڈکٹ کی فروخت کی کئی قیمتیں ہوتی ہیں لہذا فروخت کی قیمت کا حساب نہیں لگایا جا سکتا
+ProductStockWarehouseCreated=انتباہ کے لیے اسٹاک کی حد اور مطلوبہ بہترین اسٹاک درست طریقے سے بنایا گیا ہے۔
+ProductStockWarehouseUpdated=الرٹ کے لیے اسٹاک کی حد اور مطلوبہ بہترین اسٹاک کو درست طریقے سے اپ ڈیٹ کیا گیا۔
+ProductStockWarehouseDeleted=الرٹ کے لیے اسٹاک کی حد اور مطلوبہ بہترین اسٹاک کو صحیح طریقے سے حذف کر دیا گیا۔
+AddNewProductStockWarehouse=الرٹ اور مطلوبہ بہترین اسٹاک کے لیے نئی حد مقرر کریں۔
+AddStockLocationLine=مقدار کو کم کریں پھر اس پروڈکٹ کے لیے دوسرا گودام شامل کرنے کے لیے کلک کریں۔
+InventoryDate=انوینٹری کی تاریخ
+Inventories=انوینٹریز
+NewInventory=نئی انوینٹری
+inventorySetup = انوینٹری سیٹ اپ
+inventoryCreatePermission=نئی انوینٹری بنائیں
+inventoryReadPermission=انوینٹری دیکھیں
+inventoryWritePermission=انوینٹری کو اپ ڈیٹ کریں۔
+inventoryValidatePermission=انوینٹری کی توثیق کریں۔
+inventoryDeletePermission=انوینٹری کو حذف کریں۔
+inventoryTitle=انوینٹری
+inventoryListTitle=انوینٹریز
+inventoryListEmpty=کوئی انوینٹری جاری نہیں ہے۔
+inventoryCreateDelete=انوینٹری بنائیں / حذف کریں۔
+inventoryCreate=نیا بنائیں
+inventoryEdit=ترمیم
+inventoryValidate=تصدیق شدہ
+inventoryDraft=چل رہا ہے۔
+inventorySelectWarehouse=گودام کا انتخاب
+inventoryConfirmCreate=بنانا
+inventoryOfWarehouse=گودام کے لیے انوینٹری: %s
+inventoryErrorQtyAdd=خرابی: ایک مقدار صفر سے کم ہے۔
+inventoryMvtStock=انوینٹری کے ذریعہ
+inventoryWarningProductAlreadyExists=یہ پروڈکٹ پہلے ہی فہرست میں ہے۔
+SelectCategory=زمرہ فلٹر
+SelectFournisseur=وینڈر فلٹر
+inventoryOnDate=انوینٹری
+INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=اسٹاک کی نقل و حرکت میں انوینٹری کی تاریخ ہوگی (انوینٹری کی توثیق کی تاریخ کے بجائے)
+inventoryChangePMPPermission=کسی پروڈکٹ کے لیے پی ایم پی ویلیو کو تبدیل کرنے کی اجازت دیں۔
+ColumnNewPMP=نیا یونٹ PMP
+OnlyProdsInStock=اسٹاک کے بغیر پروڈکٹ شامل نہ کریں۔
+TheoricalQty=نظریاتی مقدار
+TheoricalValue=نظریاتی مقدار
+LastPA=آخری بی پی
+CurrentPA=موجودہ بی پی
+RecordedQty=ریکارڈ شدہ مقدار
+RealQty=اصلی مقدار
+RealValue=حقیقی قدر
+RegulatedQty=ریگولیٹڈ مقدار
+AddInventoryProduct=انوینٹری میں پروڈکٹ شامل کریں۔
+AddProduct=شامل کریں۔
+ApplyPMP=PMP لاگو کریں۔
+FlushInventory=فلش انوینٹری
+ConfirmFlushInventory=کیا آپ اس کارروائی کی تصدیق کرتے ہیں؟
+InventoryFlushed=انوینٹری فلش ہوگئی
+ExitEditMode=ایڈیشن سے باہر نکلیں۔
+inventoryDeleteLine=لائن کو حذف کریں۔
+RegulateStock=اسٹاک کو منظم کریں۔
+ListInventory=فہرست
+StockSupportServices=اسٹاک مینجمنٹ سروسز کو سپورٹ کرتا ہے۔
+StockSupportServicesDesc=پہلے سے طے شدہ طور پر، آپ صرف "پروڈکٹ" کی قسم کی مصنوعات کو اسٹاک کر سکتے ہیں۔ اگر ماڈیول سروسز اور یہ آپشن دونوں فعال ہیں تو آپ "سروس" قسم کی پروڈکٹ بھی اسٹاک کر سکتے ہیں۔
+ReceiveProducts=اشیاء وصول کریں۔
+StockIncreaseAfterCorrectTransfer=تصحیح/منتقلی کے ذریعے اضافہ
+StockDecreaseAfterCorrectTransfer=تصحیح/منتقلی سے کمی
+StockIncrease=اسٹاک میں اضافہ
+StockDecrease=اسٹاک میں کمی
+InventoryForASpecificWarehouse=مخصوص گودام کے لیے انوینٹری
+InventoryForASpecificProduct=کسی مخصوص پروڈکٹ کے لیے انوینٹری
+StockIsRequiredToChooseWhichLotToUse=کون سا لاٹ استعمال کرنا ہے اس کا انتخاب کرنے کے لیے اسٹاک کی ضرورت ہے۔
+ForceTo=کرنے پر مجبور کریں۔
+AlwaysShowFullArbo=گودام کے لنکس کے پاپ اپ پر گودام کا پورا درخت دکھائیں (انتباہ: یہ ڈرامائی طور پر کارکردگی کو کم کر سکتا ہے)
+StockAtDatePastDesc=آپ یہاں ماضی میں دی گئی تاریخ پر اسٹاک (اصلی اسٹاک) دیکھ سکتے ہیں۔
+StockAtDateFutureDesc=آپ یہاں مستقبل میں دی گئی تاریخ پر اسٹاک (ورچوئل اسٹاک) دیکھ سکتے ہیں۔
+CurrentStock=موجودہ اسٹاک
+InventoryRealQtyHelp=qty <br> کو ری سیٹ کرنے کے لیے قدر کو 0 پر سیٹ کریں فیلڈ کو خالی رکھیں یا لائن کو ہٹا دیں، کوئی تبدیلی نہیں
+UpdateByScaning=اسکین کرکے اصلی مقدار کو مکمل کریں۔
+UpdateByScaningProductBarcode=اسکین کے ذریعے اپ ڈیٹ کریں (پروڈکٹ بارکوڈ)
+UpdateByScaningLot=اسکین کے ذریعے اپ ڈیٹ کریں (لاٹ | سیریل بارکوڈ)
+DisableStockChangeOfSubProduct=اس تحریک کے دوران اس کٹ کے تمام ذیلی مصنوعات کے لیے اسٹاک کی تبدیلی کو غیر فعال کریں۔
+ImportFromCSV=نقل و حرکت کی CSV فہرست درآمد کریں۔
+ChooseFileToImport=فائل اپ لوڈ کریں پھر %s آئیکن پر کلک کریں تاکہ فائل کو سورس امپورٹ فائل کے طور پر منتخب کیا جا سکے۔
+SelectAStockMovementFileToImport=درآمد کرنے کے لیے اسٹاک موومنٹ فائل منتخب کریں۔
+InfoTemplateImport=اپ لوڈ کردہ فائل میں یہ فارمیٹ ہونا ضروری ہے (* لازمی فیلڈز ہیں): <br> Source Warehouse* | ہدف گودام* | پروڈکٹ* | مقدار* | لاٹ/سیریل نمبر <br> CSV کریکٹر الگ کرنے والا "<b> %s </b>" ہونا چاہیے
+LabelOfInventoryMovemement=انوینٹری %s
+ReOpen=دوبارہ کھولیں۔
+ConfirmFinish=کیا آپ انوینٹری کے بند ہونے کی تصدیق کرتے ہیں؟ یہ آپ کے اسٹاک کو آپ کی انوینٹری میں داخل کردہ اصلی مقدار میں اپ ڈیٹ کرنے کے لیے تمام اسٹاک کی نقل و حرکت پیدا کرے گا۔
+ObjectNotFound=%s نہیں ملا
+MakeMovementsAndClose=نقل و حرکت پیدا کریں اور بند کریں۔
+AutofillWithExpected=حقیقی مقدار کو متوقع مقدار سے بدل دیں۔
+ShowAllBatchByDefault=بطور ڈیفالٹ، پروڈکٹ "اسٹاک" ٹیب پر بیچ کی تفصیلات دکھائیں۔
+CollapseBatchDetailHelp=آپ اسٹاک ماڈیول کنفیگریشن میں بیچ ڈیٹیل ڈیفالٹ ڈسپلے سیٹ کر سکتے ہیں۔
+ErrorWrongBarcodemode=نامعلوم بارکوڈ وضع
+ProductDoesNotExist=پروڈکٹ موجود نہیں ہے۔
+ErrorSameBatchNumber=انوینٹری شیٹ میں بیچ نمبر کے کئی ریکارڈ ملے۔ یہ جاننے کا کوئی طریقہ نہیں کہ کس میں اضافہ کرنا ہے۔
+ProductBatchDoesNotExist=بیچ/سیریل کے ساتھ پروڈکٹ موجود نہیں ہے۔
+ProductBarcodeDoesNotExist=بارکوڈ والا پروڈکٹ موجود نہیں ہے۔
+WarehouseId=گودام کی شناخت
+WarehouseRef=گودام ریف
+SaveQtyFirst=سٹاک کی نقل و حرکت کے بارے میں پوچھنے سے پہلے پہلے اصلی انوینٹری شدہ مقداروں کو محفوظ کریں۔
+InventoryStartedShort=شروع
+ErrorOnElementsInventory=مندرجہ ذیل وجہ سے آپریشن منسوخ کر دیا گیا:
+ErrorCantFindCodeInInventory=انوینٹری میں درج ذیل کوڈ نہیں مل سکتا
+QtyWasAddedToTheScannedBarcode=کامیابی !! مقدار کو تمام درخواست کردہ بار کوڈ میں شامل کیا گیا تھا۔ آپ سکینر ٹول کو بند کر سکتے ہیں۔
+StockChangeDisabled=اسٹاک پر تبدیلی غیر فعال ہے۔
+NoWarehouseDefinedForTerminal=ٹرمینل کے لیے کوئی گودام متعین نہیں ہے۔
diff --git a/htdocs/langs/ur_PK/stripe.lang b/htdocs/langs/ur_PK/stripe.lang
index 2c95bcfce27..0c93b87f81c 100644
--- a/htdocs/langs/ur_PK/stripe.lang
+++ b/htdocs/langs/ur_PK/stripe.lang
@@ -1,71 +1,71 @@
 # Dolibarr language file - Source file is en_US - stripe
-StripeSetup=Stripe module setup
-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, ...)
-StripeOrCBDoPayment=Pay with credit card or Stripe
-FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
-PaymentForm=Payment form
-WelcomeOnPaymentPage=Welcome to our online payment service
-ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
-ThisIsInformationOnPayment=This is information on payment to do
-ToComplete=To complete
-YourEMail=Email to receive payment confirmation
-STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
-Creditor=Creditor
-PaymentCode=Payment code
-StripeDoPayment=Pay with Stripe
-YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
-Continue=Next
-ToOfferALinkForOnlinePayment=URL for %s payment
-ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment page for a sales order
-ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment page for a customer invoice
-ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment page for a contract line
-ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment page of any amount with no existing object
-ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment page for a member subscription
-ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment page for payment of a donation
-YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (mandatory only for payment not linked to an object) to add your own payment comment tag.<br>For the URL of payments with no existing object, you may also add the parameter <strong>&noidempotency=1</strong> so the same link with same tag can be used several times (some payment mode may limit the payment to 1 for each different link without this parameter)
-SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe.
-AccountParameter=Account parameters
-UsageParameter=Usage parameters
-InformationToFindParameters=Help to find your %s account information
-STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
-CSSUrlForPaymentForm=CSS style sheet url for payment form
-NewStripePaymentReceived=New Stripe payment received
-NewStripePaymentFailed=New Stripe payment tried but failed
-FailedToChargeCard=Failed to charge card
-STRIPE_TEST_SECRET_KEY=Secret test key
-STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
-STRIPE_TEST_WEBHOOK_KEY=Webhook test key
-STRIPE_LIVE_SECRET_KEY=Secret live key
-STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
-STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
-ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
-StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
-StripeImportPayment=Import Stripe payments
-ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
-StripeGateways=Stripe gateways
-OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
-OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
-BankAccountForBankTransfer=Bank account for fund payouts
-StripeAccount=Stripe account
-StripeChargeList=List of Stripe charges
-StripeTransactionList=List of Stripe transactions
-StripeCustomerId=Stripe customer id
-StripePaymentModes=Stripe payment modes
-LocalID=Local ID
-StripeID=Stripe ID
-NameOnCard=Name on card
-CardNumber=Card Number
-ExpiryDate=Expiry Date
-CVN=CVN
-DeleteACard=Delete Card
-ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
-CreateCustomerOnStripe=Create customer on Stripe
-CreateCardOnStripe=Create card on Stripe
-ShowInStripe=Show in Stripe
-StripeUserAccountForActions=User account to use for email notification of some Stripe events (Stripe payouts)
-StripePayoutList=List of Stripe payouts
-ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mode)
-ToOfferALinkForLiveWebhook=Link to setup Stripe WebHook to call the IPN (live mode)
-PaymentWillBeRecordedForNextPeriod=Payment will be recorded for the next period.
-ClickHereToTryAgain=<a href="%s">Click here to try again...</a>
-CreationOfPaymentModeMustBeDoneFromStripeInterface=Due to Strong Customer Authentication rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
+StripeSetup=پٹی ماڈیول سیٹ اپ
+StripeDesc=اپنے صارفین کو کریڈٹ/ڈیبٹ کارڈز کے ذریعے ادائیگیوں کے لیے ایک آن لائن ادائیگی کا صفحہ پیش کریں <a href="https://www.stripe.com" target="_blank" rel="noopener noreferrer external"> Stripe </a>۔ اس کا استعمال آپ کے صارفین کو ایڈہاک ادائیگیوں کی اجازت دینے کے لیے یا کسی خاص Dolibarr آبجیکٹ (انوائس، آرڈر، ...) سے متعلق ادائیگیوں کے لیے کیا جا سکتا ہے۔
+StripeOrCBDoPayment=کریڈٹ کارڈ یا پٹی سے ادائیگی کریں۔
+FollowingUrlAreAvailableToMakePayments=Dolibarr اشیاء پر ادائیگی کرنے کے لیے صارف کو صفحہ پیش کرنے کے لیے درج ذیل URLs دستیاب ہیں۔
+PaymentForm=ادائیگی کا فارم
+WelcomeOnPaymentPage=ہماری آن لائن ادائیگی کی خدمت میں خوش آمدید
+ThisScreenAllowsYouToPay=یہ اسکرین آپ کو %s پر آن لائن ادائیگی کرنے کی اجازت دیتی ہے۔
+ThisIsInformationOnPayment=یہ ادائیگی کے بارے میں معلومات ہے۔
+ToComplete=مکمل کرنا
+YourEMail=ادائیگی کی تصدیق حاصل کرنے کے لیے ای میل کریں۔
+STRIPE_PAYONLINE_SENDEMAIL=ادائیگی کی کوشش کے بعد ای میل اطلاع (کامیابی یا ناکام)
+Creditor=قرض دینے والا
+PaymentCode=ادائیگی کا کوڈ
+StripeDoPayment=پٹی کے ساتھ ادائیگی کریں۔
+YouWillBeRedirectedOnStripe=آپ کو کریڈٹ کارڈ کی معلومات داخل کرنے کے لیے محفوظ پٹی والے صفحہ پر بھیج دیا جائے گا۔
+Continue=اگلے
+ToOfferALinkForOnlinePayment=%s ادائیگی کے لیے URL
+ToOfferALinkForOnlinePaymentOnOrder=سیلز آرڈر کے لیے %s آن لائن ادائیگی کا صفحہ پیش کرنے کے لیے URL
+ToOfferALinkForOnlinePaymentOnInvoice=کسٹمر انوائس کے لیے %s آن لائن ادائیگی کا صفحہ پیش کرنے کے لیے URL
+ToOfferALinkForOnlinePaymentOnContractLine=کنٹریکٹ لائن کے لیے %s آن لائن ادائیگی کا صفحہ پیش کرنے کے لیے URL
+ToOfferALinkForOnlinePaymentOnFreeAmount=کسی بھی رقم کا %s آن لائن ادائیگی کا صفحہ پیش کرنے کے لیے URL
+ToOfferALinkForOnlinePaymentOnMemberSubscription=ممبر کی رکنیت کے لیے %s آن لائن ادائیگی کا صفحہ پیش کرنے کے لیے URL
+ToOfferALinkForOnlinePaymentOnDonation=عطیہ کی ادائیگی کے لیے %s آن لائن ادائیگی کا صفحہ پیش کرنے کے لیے URL
+YouCanAddTagOnUrl=آپ ان میں سے کسی یو آر ایل میں url پیرامیٹر <b> &tag=<i> ویلیو </i> </b> کو بھی شامل کر سکتے ہیں (صرف ادائیگی کے لیے لازمی ہے جو کسی چیز سے منسلک نہیں ہے) اپنا پیمنٹ ٹیگ شامل کرنے کے لیے۔ <br> ادائیگیوں کے URL کے لیے جس میں کوئی شے موجود نہیں ہے، آپ <strong> &noidempotency=1 </strong> پیرامیٹر بھی شامل کر سکتے ہیں تاکہ ایک ہی ٹیگ کے ساتھ ایک ہی لنک کو کئی بار استعمال کیا جا سکے (کچھ ادائیگی کا موڈ ہر ایک لنک کے بغیر ادائیگی کو محدود کر سکتا ہے۔ پیرامیٹر)
+SetupStripeToHavePaymentCreatedAutomatically=اپنی اسٹرائپ کو url <b> %s </b> کے ساتھ سیٹ اپ کریں تاکہ اسٹرائپ کی توثیق ہونے پر ادائیگی خود بخود بن جائے۔
+AccountParameter=اکاؤنٹ کے پیرامیٹرز
+UsageParameter=استعمال کے پیرامیٹرز
+InformationToFindParameters=اپنے %s اکاؤنٹ کی معلومات تلاش کرنے میں مدد کریں۔
+STRIPE_CGI_URL_V2=ادائیگی کے لیے سٹرائپ CGI ماڈیول کا یو آر ایل
+CSSUrlForPaymentForm=ادائیگی کے فارم کے لیے سی ایس ایس اسٹائل شیٹ یو آر ایل
+NewStripePaymentReceived=نئی پٹی کی ادائیگی موصول ہوئی۔
+NewStripePaymentFailed=نئی اسٹرائپ ادائیگی کی کوشش کی لیکن ناکام ہوگئی
+FailedToChargeCard=کارڈ چارج کرنے میں ناکام
+STRIPE_TEST_SECRET_KEY=خفیہ ٹیسٹ کی کلید
+STRIPE_TEST_PUBLISHABLE_KEY=قابل اشاعت ٹیسٹ کلید
+STRIPE_TEST_WEBHOOK_KEY=ویب ہُک ٹیسٹ کلید
+STRIPE_LIVE_SECRET_KEY=خفیہ لائیو کلید
+STRIPE_LIVE_PUBLISHABLE_KEY=قابل اشاعت لائیو کلید
+STRIPE_LIVE_WEBHOOK_KEY=ویب ہُک لائیو کلید
+ONLINE_PAYMENT_WAREHOUSE=جب آن لائن ادائیگی کی جاتی ہے تو اسٹاک کو کم کرنے کے لیے استعمال کیا جائے گا
+StripeLiveEnabled=اسٹرائپ لائیو فعال (بصورت دیگر ٹیسٹ/سینڈ باکس موڈ)
+StripeImportPayment=پٹی کی ادائیگی درآمد کریں۔
+ExampleOfTestCreditCard=ٹیسٹ کے لیے کریڈٹ کارڈ کی مثال: %s => درست، %s => غلطی CVC، %s => میعاد ختم، %s => چارج ناکام
+StripeGateways=پٹی والے دروازے
+OAUTH_STRIPE_TEST_ID=اسٹرائپ کنیکٹ کلائنٹ آئی ڈی (ca_...)
+OAUTH_STRIPE_LIVE_ID=اسٹرائپ کنیکٹ کلائنٹ آئی ڈی (ca_...)
+BankAccountForBankTransfer=فنڈ کی ادائیگی کے لیے بینک اکاؤنٹ
+StripeAccount=پٹی کھاتہ
+StripeChargeList=اسٹرائپ چارجز کی فہرست
+StripeTransactionList=پٹی کے لین دین کی فہرست
+StripeCustomerId=پٹی کسٹمر آئی ڈی
+StripePaymentModes=پٹی ادائیگی کے طریقوں
+LocalID=لوکل آئی ڈی
+StripeID=پٹی کی شناخت
+NameOnCard=کارڈ پہ درج نام
+CardNumber=کارڈ نمبر
+ExpiryDate=خاتمے کی تاریخ
+CVN=سی وی این
+DeleteACard=کارڈ حذف کریں۔
+ConfirmDeleteCard=کیا آپ واقعی اس کریڈٹ یا ڈیبٹ کارڈ کو حذف کرنا چاہتے ہیں؟
+CreateCustomerOnStripe=پٹی پر گاہک بنائیں
+CreateCardOnStripe=پٹی پر کارڈ بنائیں
+ShowInStripe=پٹی میں دکھائیں۔
+StripeUserAccountForActions=کچھ اسٹرائپ ایونٹس کی ای میل اطلاع کے لیے استعمال کرنے والا صارف اکاؤنٹ (سٹرائپ ادائیگی)
+StripePayoutList=پٹی کی ادائیگیوں کی فہرست
+ToOfferALinkForTestWebhook=IPN (ٹیسٹ موڈ) کو کال کرنے کے لیے سٹرائپ ویب ہُک سیٹ اپ کرنے کا لنک
+ToOfferALinkForLiveWebhook=IPN (لائیو موڈ) کو کال کرنے کے لیے اسٹرائپ ویب ہُک کو سیٹ اپ کرنے کا لنک
+PaymentWillBeRecordedForNextPeriod=ادائیگی اگلی مدت کے لیے ریکارڈ کی جائے گی۔
+ClickHereToTryAgain= <a href="%s"> دوبارہ کوشش کرنے کے لیے یہاں کلک کریں... </a>
+CreationOfPaymentModeMustBeDoneFromStripeInterface=مضبوط کسٹمر تصدیقی اصولوں کی وجہ سے، کارڈ کی تخلیق اسٹرائپ بیک آفس سے ہونی چاہیے۔ آپ اسٹرائپ کسٹمر ریکارڈ پر سوئچ کرنے کے لیے یہاں کلک کر سکتے ہیں: %s
diff --git a/htdocs/langs/ur_PK/supplier_proposal.lang b/htdocs/langs/ur_PK/supplier_proposal.lang
index a68319fb2df..2d2601cc187 100644
--- a/htdocs/langs/ur_PK/supplier_proposal.lang
+++ b/htdocs/langs/ur_PK/supplier_proposal.lang
@@ -1,58 +1,58 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Vendor commercial proposals
-supplier_proposalDESC=Manage price requests to suppliers
-SupplierProposalNew=New price request
-CommRequest=Price request
-CommRequests=Price requests
-SearchRequest=Find a request
-DraftRequests=Draft requests
-SupplierProposalsDraft=Draft vendor proposals
-LastModifiedRequests=Latest %s modified price requests
-RequestsOpened=Open price requests
-SupplierProposalArea=Vendor proposals area
-SupplierProposalShort=Vendor proposal
-SupplierProposals=Vendor proposals
-SupplierProposalsShort=Vendor proposals
-AskPrice=Price request
-NewAskPrice=New price request
-ShowSupplierProposal=Show price request
-AddSupplierProposal=Create a price request
-SupplierProposalRefFourn=Vendor ref
-SupplierProposalDate=Delivery date
-SupplierProposalRefFournNotice=Before closing to "Accepted", think to grasp suppliers references.
-ConfirmValidateAsk=Are you sure you want to validate this price request under name <b>%s</b>?
-DeleteAsk=Delete request
-ValidateAsk=Validate request
-SupplierProposalStatusDraft=Draft (needs to be validated)
-SupplierProposalStatusValidated=Validated (request is open)
-SupplierProposalStatusClosed=Closed
-SupplierProposalStatusSigned=Accepted
-SupplierProposalStatusNotSigned=Refused
-SupplierProposalStatusDraftShort=Draft
-SupplierProposalStatusValidatedShort=Validated
-SupplierProposalStatusClosedShort=Closed
-SupplierProposalStatusSignedShort=Accepted
-SupplierProposalStatusNotSignedShort=Refused
-CopyAskFrom=Create a price request by copying an existing request
-CreateEmptyAsk=Create blank request
-ConfirmCloneAsk=Are you sure you want to clone the price request <b>%s</b>?
-ConfirmReOpenAsk=Are you sure you want to open back the price request <b>%s</b>?
-SendAskByMail=Send price request by mail
-SendAskRef=Sending the price request %s
-SupplierProposalCard=Request card
-ConfirmDeleteAsk=Are you sure you want to delete this price request <b>%s</b>?
-ActionsOnSupplierProposal=Events on price request
-DocModelAuroreDescription=A complete request model (logo...)
-CommercialAsk=Price request
-DefaultModelSupplierProposalCreate=Default model creation
-DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
-DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
-ListOfSupplierProposals=List of vendor proposal requests
-ListSupplierProposalsAssociatedProject=List of vendor proposals associated with project
-SupplierProposalsToClose=Vendor proposals to close
-SupplierProposalsToProcess=Vendor proposals to process
-LastSupplierProposals=Latest %s price requests
-AllPriceRequests=All requests
-TypeContact_supplier_proposal_external_SHIPPING=Vendor contact for delivery
-TypeContact_supplier_proposal_external_BILLING=Vendor contact for billing
-TypeContact_supplier_proposal_external_SERVICE=Representative following-up proposal
+SupplierProposal=وینڈر تجارتی تجاویز
+supplier_proposalDESC=سپلائرز کو قیمت کی درخواستوں کا نظم کریں۔
+SupplierProposalNew=نئی قیمت کی درخواست
+CommRequest=قیمت کی درخواست
+CommRequests=قیمت کی درخواستیں۔
+SearchRequest=ایک درخواست تلاش کریں۔
+DraftRequests=درخواستوں کا مسودہ
+SupplierProposalsDraft=ڈرافٹ وینڈر کی تجاویز
+LastModifiedRequests=تازہ ترین %s ترمیم شدہ قیمت کی درخواستیں۔
+RequestsOpened=قیمت کی درخواستیں کھولیں۔
+SupplierProposalArea=وینڈر کی تجاویز کا علاقہ
+SupplierProposalShort=وینڈر کی تجویز
+SupplierProposals=وینڈر کی تجاویز
+SupplierProposalsShort=وینڈر کی تجاویز
+AskPrice=قیمت کی درخواست
+NewAskPrice=نئی قیمت کی درخواست
+ShowSupplierProposal=قیمت کی درخواست دکھائیں۔
+AddSupplierProposal=قیمت کی درخواست بنائیں
+SupplierProposalRefFourn=وینڈر ریفری
+SupplierProposalDate=ادئیگی کی تاریخ
+SupplierProposalRefFournNotice="قبول شدہ" کو بند کرنے سے پہلے، سپلائرز کے حوالہ جات کو سمجھنے کے لیے سوچیں۔
+ConfirmValidateAsk=کیا آپ واقعی اس قیمت کی درخواست کو <b> %s </b> کے نام سے درست کرنا چاہتے ہیں؟
+DeleteAsk=درخواست کو حذف کریں۔
+ValidateAsk=درخواست کی توثیق کریں۔
+SupplierProposalStatusDraft=مسودہ (توثیق کرنے کی ضرورت ہے)
+SupplierProposalStatusValidated=تصدیق شدہ (درخواست کھلی ہے)
+SupplierProposalStatusClosed=بند
+SupplierProposalStatusSigned=قبول کر لیا
+SupplierProposalStatusNotSigned=انکار کر دیا
+SupplierProposalStatusDraftShort=مسودہ
+SupplierProposalStatusValidatedShort=تصدیق شدہ
+SupplierProposalStatusClosedShort=بند
+SupplierProposalStatusSignedShort=قبول کر لیا
+SupplierProposalStatusNotSignedShort=انکار کر دیا
+CopyAskFrom=موجودہ درخواست کو کاپی کرکے قیمت کی درخواست بنائیں
+CreateEmptyAsk=خالی درخواست بنائیں
+ConfirmCloneAsk=کیا آپ واقعی قیمت کی درخواست <b> %s </b> کلون کرنا چاہتے ہیں؟
+ConfirmReOpenAsk=کیا آپ واقعی قیمت کی درخواست <b> %s </b> کھولنا چاہتے ہیں؟
+SendAskByMail=میل کے ذریعے قیمت کی درخواست بھیجیں۔
+SendAskRef=قیمت کی درخواست %s بھیج رہا ہے۔
+SupplierProposalCard=کارڈ کی درخواست کریں۔
+ConfirmDeleteAsk=کیا آپ واقعی اس قیمت کی درخواست <b> %s </b> کو حذف کرنا چاہتے ہیں؟
+ActionsOnSupplierProposal=قیمت کی درخواست پر واقعات
+DocModelAuroreDescription=ایک مکمل درخواست ماڈل (لوگو...)
+CommercialAsk=قیمت کی درخواست
+DefaultModelSupplierProposalCreate=پہلے سے طے شدہ ماڈل کی تخلیق
+DefaultModelSupplierProposalToBill=قیمت کی درخواست کو بند کرتے وقت ڈیفالٹ ٹیمپلیٹ (قبول شدہ)
+DefaultModelSupplierProposalClosed=قیمت کی درخواست کو بند کرتے وقت ڈیفالٹ ٹیمپلیٹ (انکار کر دیا گیا)
+ListOfSupplierProposals=وینڈر پروپوزل کی درخواستوں کی فہرست
+ListSupplierProposalsAssociatedProject=پروجیکٹ سے وابستہ وینڈر کی تجاویز کی فہرست
+SupplierProposalsToClose=دکانداروں کو بند کرنے کی تجویز
+SupplierProposalsToProcess=پروسیسنگ کے لیے وینڈر کی تجاویز
+LastSupplierProposals=تازہ ترین %s قیمت کی درخواستیں۔
+AllPriceRequests=تمام درخواستیں۔
+TypeContact_supplier_proposal_external_SHIPPING=ڈیلیوری کے لیے دکاندار رابطہ کریں۔
+TypeContact_supplier_proposal_external_BILLING=بلنگ کے لیے دکاندار رابطہ کریں۔
+TypeContact_supplier_proposal_external_SERVICE=نمائندہ پیروی کی تجویز
diff --git a/htdocs/langs/ur_PK/suppliers.lang b/htdocs/langs/ur_PK/suppliers.lang
index ca9ee174d29..c013c54d2e6 100644
--- a/htdocs/langs/ur_PK/suppliers.lang
+++ b/htdocs/langs/ur_PK/suppliers.lang
@@ -1,49 +1,49 @@
 # Dolibarr language file - Source file is en_US - vendors
-Suppliers=Vendors
-SuppliersInvoice=Vendor invoice
-SupplierInvoices=Vendor invoices
-ShowSupplierInvoice=Show Vendor Invoice
-NewSupplier=New vendor
-History=History
-ListOfSuppliers=List of vendors
-ShowSupplier=Show vendor
-OrderDate=Order date
-BuyingPriceMin=Best buying price
-BuyingPriceMinShort=Best buying price
-TotalBuyingPriceMinShort=Total of subproducts buying prices
-TotalSellingPriceMinShort=Total of subproducts selling prices
-SomeSubProductHaveNoPrices=Some sub-products have no price defined
-AddSupplierPrice=Add buying price
-ChangeSupplierPrice=Change buying price
-SupplierPrices=Vendor prices
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=This vendor reference is already associated with a product: %s
-NoRecordedSuppliers=No vendor recorded
-SupplierPayment=Vendor payment
-SuppliersArea=Vendor area
-RefSupplierShort=Ref. vendor
-Availability=Availability
-ExportDataset_fournisseur_1=Vendor invoices and invoice details
-ExportDataset_fournisseur_2=Vendor invoices and payments
-ExportDataset_fournisseur_3=Purchase orders and order details
-ApproveThisOrder=Approve this order
-ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
-DenyingThisOrder=Deny this order
-ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
-ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
-AddSupplierOrder=Create Purchase Order
-AddSupplierInvoice=Create vendor invoice
-ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
-SentToSuppliers=Sent to vendors
-ListOfSupplierOrders=List of purchase orders
-MenuOrdersSupplierToBill=Purchase orders to invoice
-NbDaysToDelivery=Delivery delay (days)
-DescNbDaysToDelivery=The longest delivery delay of the products from this order
-SupplierReputation=Vendor reputation
-ReferenceReputation=Reference reputation
-DoNotOrderThisProductToThisSupplier=Do not order
-NotTheGoodQualitySupplier=Low quality
-ReputationForThisProduct=Reputation
-BuyerName=Buyer name
-AllProductServicePrices=All product / service prices
-AllProductReferencesOfSupplier=All references of vendor
-BuyingPriceNumShort=Vendor prices
+Suppliers=فروش
+SuppliersInvoice=وینڈر رسید
+SupplierInvoices=وینڈر انوائسز
+ShowSupplierInvoice=وینڈر انوائس دکھائیں۔
+NewSupplier=نیا فروش
+History=تاریخ
+ListOfSuppliers=دکانداروں کی فہرست
+ShowSupplier=فروش دکھائیں۔
+OrderDate=آرڈر کی تاریخ
+BuyingPriceMin=بہترین خرید قیمت
+BuyingPriceMinShort=بہترین خرید قیمت
+TotalBuyingPriceMinShort=ذیلی مصنوعات کی خرید قیمتوں کا کل
+TotalSellingPriceMinShort=فروخت ہونے والی ذیلی مصنوعات کی کل قیمت
+SomeSubProductHaveNoPrices=کچھ ذیلی مصنوعات کی کوئی قیمت متعین نہیں ہے۔
+AddSupplierPrice=خرید قیمت شامل کریں۔
+ChangeSupplierPrice=خرید قیمت تبدیل کریں۔
+SupplierPrices=وینڈر کی قیمتیں۔
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=یہ وینڈر حوالہ پہلے ہی ایک پروڈکٹ کے ساتھ منسلک ہے: %s
+NoRecordedSuppliers=کوئی وینڈر ریکارڈ نہیں ہے۔
+SupplierPayment=وینڈر کی ادائیگی
+SuppliersArea=وینڈر ایریا
+RefSupplierShort=حوالہ فروش
+Availability=دستیابی
+ExportDataset_fournisseur_1=وینڈر انوائس اور انوائس کی تفصیلات
+ExportDataset_fournisseur_2=وینڈر کی رسیدیں اور ادائیگیاں
+ExportDataset_fournisseur_3=خریداری کے آرڈر اور آرڈر کی تفصیلات
+ApproveThisOrder=اس حکم کو منظور کریں۔
+ConfirmApproveThisOrder=کیا آپ واقعی آرڈر <b> %s </b> کو منظور کرنا چاہتے ہیں؟
+DenyingThisOrder=اس حکم کی تردید کریں۔
+ConfirmDenyingThisOrder=کیا آپ واقعی اس آرڈر سے انکار کرنا چاہتے ہیں <b> %s </b>؟
+ConfirmCancelThisOrder=کیا آپ واقعی اس آرڈر کو منسوخ کرنا چاہتے ہیں <b> %s </b>؟
+AddSupplierOrder=پرچیز آرڈر بنائیں
+AddSupplierInvoice=وینڈر انوائس بنائیں
+ListOfSupplierProductForSupplier=وینڈر کے لیے مصنوعات اور قیمتوں کی فہرست <b> %s </b>
+SentToSuppliers=دکانداروں کو بھیجا گیا۔
+ListOfSupplierOrders=خریداری کے آرڈر کی فہرست
+MenuOrdersSupplierToBill=انوائس پر آرڈرز خریدیں۔
+NbDaysToDelivery=ترسیل میں تاخیر (دن)
+DescNbDaysToDelivery=اس آرڈر سے مصنوعات کی ترسیل میں سب سے طویل تاخیر
+SupplierReputation=دکاندار کی ساکھ
+ReferenceReputation=حوالہ ساکھ
+DoNotOrderThisProductToThisSupplier=حکم نہ دیں۔
+NotTheGoodQualitySupplier=کم معیار
+ReputationForThisProduct=شہرت
+BuyerName=خریدار کا نام
+AllProductServicePrices=تمام مصنوعات/سروس کی قیمتیں۔
+AllProductReferencesOfSupplier=فروش کے تمام حوالہ جات
+BuyingPriceNumShort=فروش کی قیمتیں۔
diff --git a/htdocs/langs/ur_PK/ticket.lang b/htdocs/langs/ur_PK/ticket.lang
index 9bcdcb341fd..10ccf19600c 100644
--- a/htdocs/langs/ur_PK/ticket.lang
+++ b/htdocs/langs/ur_PK/ticket.lang
@@ -18,307 +18,307 @@
 # Generic
 #
 
-Module56000Name=Tickets
-Module56000Desc=Ticket system for issue or request management
+Module56000Name=ٹکٹ
+Module56000Desc=ایشو یا درخواست کے انتظام کے لیے ٹکٹ کا نظام
 
-Permission56001=See tickets
-Permission56002=Modify tickets
-Permission56003=Delete tickets
-Permission56004=Manage tickets
-Permission56005=See tickets of all third parties (not effective for external users, always be limited to the third party they depend on)
+Permission56001=ٹکٹیں دیکھیں
+Permission56002=ٹکٹوں میں ترمیم کریں۔
+Permission56003=ٹکٹیں حذف کریں۔
+Permission56004=ٹکٹوں کا انتظام کریں۔
+Permission56005=تمام فریق ثالث کے ٹکٹ دیکھیں (بیرونی صارفین کے لیے موثر نہیں، ہمیشہ ان تیسرے فریق تک محدود رہیں جس پر وہ انحصار کرتے ہیں)
 
-TicketDictType=Ticket - Types
-TicketDictCategory=Ticket - Groupes
-TicketDictSeverity=Ticket - Severities
-TicketDictResolution=Ticket - Resolution
+TicketDictType=ٹکٹ - اقسام
+TicketDictCategory=ٹکٹ - گروپس
+TicketDictSeverity=ٹکٹ - شدت
+TicketDictResolution=ٹکٹ - قرارداد
 
-TicketTypeShortCOM=Commercial question
-TicketTypeShortHELP=Request for functionnal help
-TicketTypeShortISSUE=Issue or bug
-TicketTypeShortPROBLEM=Problem
-TicketTypeShortREQUEST=Change or enhancement request
-TicketTypeShortPROJET=Project
-TicketTypeShortOTHER=Other
+TicketTypeShortCOM=تجارتی سوال
+TicketTypeShortHELP=فنکشنل مدد کی درخواست کریں۔
+TicketTypeShortISSUE=مسئلہ یا بگ
+TicketTypeShortPROBLEM=مسئلہ
+TicketTypeShortREQUEST=تبدیلی یا اضافہ کی درخواست
+TicketTypeShortPROJET=پروجیکٹ
+TicketTypeShortOTHER=دیگر
 
-TicketSeverityShortLOW=Low
-TicketSeverityShortNORMAL=Normal
-TicketSeverityShortHIGH=High
-TicketSeverityShortBLOCKING=Critical, Blocking
+TicketSeverityShortLOW=کم
+TicketSeverityShortNORMAL=نارمل
+TicketSeverityShortHIGH=اعلی
+TicketSeverityShortBLOCKING=تنقیدی، مسدود کرنا
 
-TicketCategoryShortOTHER=Other
+TicketCategoryShortOTHER=دیگر
 
-ErrorBadEmailAddress=Field '%s' incorrect
-MenuTicketMyAssign=My tickets
-MenuTicketMyAssignNonClosed=My open tickets
-MenuListNonClosed=Open tickets
+ErrorBadEmailAddress=فیلڈ '%s' غلط ہے۔
+MenuTicketMyAssign=میرے ٹکٹ
+MenuTicketMyAssignNonClosed=میرے کھلے ٹکٹ
+MenuListNonClosed=ٹکٹیں کھولیں۔
 
-TypeContact_ticket_internal_CONTRIBUTOR=Contributor
-TypeContact_ticket_internal_SUPPORTTEC=Assigned user
-TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
-TypeContact_ticket_external_CONTRIBUTOR=External contributor
+TypeContact_ticket_internal_CONTRIBUTOR=تعاون کرنے والا
+TypeContact_ticket_internal_SUPPORTTEC=تفویض کردہ صارف
+TypeContact_ticket_external_SUPPORTCLI=گاہک سے رابطہ / واقعہ سے باخبر رہنا
+TypeContact_ticket_external_CONTRIBUTOR=بیرونی تعاون کرنے والا
 
-OriginEmail=Reporter Email
-Notify_TICKET_SENTBYMAIL=Send ticket message by email
+OriginEmail=رپورٹر ای میل
+Notify_TICKET_SENTBYMAIL=ٹکٹ کا پیغام بذریعہ ای میل بھیجیں۔
 
 # Status
-Read=Read
-Assigned=Assigned
-InProgress=In progress
-NeedMoreInformation=Waiting for reporter feedback
-NeedMoreInformationShort=Waiting for feedback
-Answered=Answered
-Waiting=Waiting
-SolvedClosed=Solved
-Deleted=Deleted
+Read=پڑھیں
+Assigned=تفویض کردہ
+InProgress=کام جاری ہے
+NeedMoreInformation=رپورٹر کی رائے کا انتظار ہے۔
+NeedMoreInformationShort=رائے کا انتظار ہے۔
+Answered=جواب دیا۔
+Waiting=انتظار کر رہا ہے۔
+SolvedClosed=حل ہو گیا۔
+Deleted=حذف کر دیا گیا۔
 
 # Dict
-Type=Type
-Severity=Severity
-TicketGroupIsPublic=Group is public
-TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
+Type=قسم
+Severity=شدت
+TicketGroupIsPublic=گروپ عوامی ہے۔
+TicketGroupIsPublicDesc=اگر ٹکٹ گروپ عوامی ہے، تو عوامی انٹرفیس سے ٹکٹ بناتے وقت یہ فارم میں نظر آئے گا۔
 
 # Email templates
-MailToSendTicketMessage=To send email from ticket message
+MailToSendTicketMessage=ٹکٹ کے پیغام سے ای میل بھیجنے کے لیے
 
 #
 # Admin page
 #
-TicketSetup=Ticket module setup
-TicketSettings=Settings
+TicketSetup=ٹکٹ ماڈیول سیٹ اپ
+TicketSettings=ترتیبات
 TicketSetupPage=
-TicketPublicAccess=A public interface requiring no identification is available at the following url
-TicketSetupDictionaries=The type of ticket, severity and analytic codes are configurable from dictionaries
-TicketParamModule=Module variable setup
-TicketParamMail=Email setup
-TicketEmailNotificationFrom=Notification email from
-TicketEmailNotificationFromHelp=Used into ticket message answer by example
-TicketEmailNotificationTo=Notifications email to
-TicketEmailNotificationToHelp=Send email notifications to this address.
-TicketNewEmailBodyLabel=Text message sent after creating a ticket
-TicketNewEmailBodyHelp=The text specified here will be inserted into the email confirming the creation of a new ticket from the public interface. Information on the consultation of the ticket are automatically added.
-TicketParamPublicInterface=Public interface setup
-TicketsEmailMustExist=Require an existing email address to create a ticket
-TicketsEmailMustExistHelp=In the public interface, the email address should already be filled in the database to create a new ticket.
-PublicInterface=Public interface
-TicketUrlPublicInterfaceLabelAdmin=Alternative URL for public interface
-TicketUrlPublicInterfaceHelpAdmin=It is possible to define an alias to the web server and thus make available the public interface with another URL (the server must act as a proxy on this new URL)
-TicketPublicInterfaceTextHomeLabelAdmin=Welcome text of the public interface
-TicketPublicInterfaceTextHome=You can create a support ticket or view existing from its identifier tracking ticket.
-TicketPublicInterfaceTextHomeHelpAdmin=The text defined here will appear on the home page of the public interface.
-TicketPublicInterfaceTopicLabelAdmin=Interface title
-TicketPublicInterfaceTopicHelp=This text will appear as the title of the public interface.
-TicketPublicInterfaceTextHelpMessageLabelAdmin=Help text to the message entry
-TicketPublicInterfaceTextHelpMessageHelpAdmin=This text will appear above the message input area of the user.
-ExtraFieldsTicket=Extra attributes
-TicketCkEditorEmailNotActivated=HTML editor is not activated. Please put FCKEDITOR_ENABLE_MAIL content to 1 to get it.
-TicketsDisableEmail=Do not send emails for ticket creation or message recording
-TicketsDisableEmailHelp=By default, emails are sent when new tickets or messages created. Enable this option to disable *all* email notifications
-TicketsLogEnableEmail=Enable log by email
-TicketsLogEnableEmailHelp=At each change, an email will be sent **to each contact** associated with the ticket.
-TicketParams=Params
-TicketsShowModuleLogo=Display the logo of the module in the public interface
-TicketsShowModuleLogoHelp=Enable this option to hide the logo module in the pages of the public interface
-TicketsShowCompanyLogo=Display the logo of the company in the public interface
-TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
-TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
-TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
-TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
-TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
-TicketsActivatePublicInterface=Activate public interface
-TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create tickets.
-TicketsAutoAssignTicket=Automatically assign the user who created the ticket
-TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
-TicketNumberingModules=Tickets numbering module
-TicketsModelModule=Document templates for tickets
-TicketNotifyTiersAtCreation=Notify third party at creation
-TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
-TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
-TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
-TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
+TicketPublicAccess=ایک عوامی انٹرفیس جس کے لیے کسی شناخت کی ضرورت نہیں ہے درج ذیل یو آر ایل پر دستیاب ہے۔
+TicketSetupDictionaries=ٹکٹ کی قسم، شدت اور تجزیاتی کوڈ لغات سے قابل ترتیب ہیں۔
+TicketParamModule=ماڈیول متغیر سیٹ اپ
+TicketParamMail=ای میل سیٹ اپ
+TicketEmailNotificationFrom=سے اطلاعی ای میل
+TicketEmailNotificationFromHelp=ٹکٹ کے پیغام کے جواب میں مثال کے طور پر استعمال کیا جاتا ہے۔
+TicketEmailNotificationTo=نوٹیفکیشنز کو ای میل کریں۔
+TicketEmailNotificationToHelp=اس ایڈریس پر ای میل اطلاعات بھیجیں۔
+TicketNewEmailBodyLabel=ٹکٹ بنانے کے بعد ٹیکسٹ میسج بھیجا گیا۔
+TicketNewEmailBodyHelp=یہاں بیان کردہ متن عوامی انٹرفیس سے ایک نیا ٹکٹ بنانے کی تصدیق کرنے والے ای میل میں داخل کیا جائے گا۔ ٹکٹ کی مشاورت سے متعلق معلومات خود بخود شامل ہوجاتی ہیں۔
+TicketParamPublicInterface=عوامی انٹرفیس سیٹ اپ
+TicketsEmailMustExist=ٹکٹ بنانے کے لیے موجودہ ای میل ایڈریس کی ضرورت ہے۔
+TicketsEmailMustExistHelp=پبلک انٹرفیس میں، نیا ٹکٹ بنانے کے لیے ڈیٹا بیس میں ای میل ایڈریس کو پہلے سے ہی بھرنا چاہیے۔
+PublicInterface=عوامی انٹرفیس
+TicketUrlPublicInterfaceLabelAdmin=عوامی انٹرفیس کے لیے متبادل URL
+TicketUrlPublicInterfaceHelpAdmin=ویب سرور کے لیے ایک عرف کی وضاحت کرنا اور اس طرح عوامی انٹرفیس کو دوسرے یو آر ایل کے ساتھ دستیاب کرنا ممکن ہے (سرور کو اس نئے یو آر ایل پر پراکسی کے طور پر کام کرنا چاہیے)
+TicketPublicInterfaceTextHomeLabelAdmin=عوامی انٹرفیس کا خوش آمدید متن
+TicketPublicInterfaceTextHome=آپ سپورٹ ٹکٹ بنا سکتے ہیں یا اس کے شناخت کنندہ ٹریکنگ ٹکٹ سے موجودہ کو دیکھ سکتے ہیں۔
+TicketPublicInterfaceTextHomeHelpAdmin=یہاں بیان کردہ متن عوامی انٹرفیس کے ہوم پیج پر ظاہر ہوگا۔
+TicketPublicInterfaceTopicLabelAdmin=انٹرفیس کا عنوان
+TicketPublicInterfaceTopicHelp=یہ متن عوامی انٹرفیس کے عنوان کے طور پر ظاہر ہوگا۔
+TicketPublicInterfaceTextHelpMessageLabelAdmin=پیغام کے اندراج میں مدد کا متن
+TicketPublicInterfaceTextHelpMessageHelpAdmin=یہ متن صارف کے میسج ان پٹ ایریا کے اوپر ظاہر ہوگا۔
+ExtraFieldsTicket=اضافی صفات
+TicketCkEditorEmailNotActivated=HTML ایڈیٹر فعال نہیں ہے۔ براہ کرم اسے حاصل کرنے کے لیے FCKEDITOR_ENABLE_MAIL مواد کو 1 پر رکھیں۔
+TicketsDisableEmail=ٹکٹ بنانے یا پیغام کی ریکارڈنگ کے لیے ای میلز نہ بھیجیں۔
+TicketsDisableEmailHelp=پہلے سے طے شدہ طور پر، نئے ٹکٹ یا پیغامات بننے پر ای میلز بھیجی جاتی ہیں۔ *تمام* ای میل اطلاعات کو غیر فعال کرنے کے لیے اس اختیار کو فعال کریں۔
+TicketsLogEnableEmail=ای میل کے ذریعے لاگ ان کو فعال کریں۔
+TicketsLogEnableEmailHelp=ہر تبدیلی پر، ٹکٹ سے وابستہ **ہر رابطے کو** ایک ای میل بھیجا جائے گا۔
+TicketParams=پارمس
+TicketsShowModuleLogo=عوامی انٹرفیس میں ماڈیول کا لوگو ڈسپلے کریں۔
+TicketsShowModuleLogoHelp=لوگو ماڈیول کو عوامی انٹرفیس کے صفحات میں چھپانے کے لیے اس اختیار کو فعال کریں۔
+TicketsShowCompanyLogo=پبلک انٹرفیس میں کمپنی کا لوگو ڈسپلے کریں۔
+TicketsShowCompanyLogoHelp=عوامی انٹرفیس کے صفحات میں مرکزی کمپنی کا لوگو چھپانے کے لیے اس اختیار کو فعال کریں۔
+TicketsEmailAlsoSendToMainAddress=مرکزی ای میل ایڈریس پر بھی ایک اطلاع بھیجیں۔
+TicketsEmailAlsoSendToMainAddressHelp=سیٹ اپ "%s" (ٹیب "%s" دیکھیں) میں بیان کردہ پتے پر ای میل بھیجنے کے لیے بھی اس اختیار کو فعال کریں۔
+TicketsLimitViewAssignedOnly=ڈسپلے کو موجودہ صارف کو تفویض کردہ ٹکٹوں تک محدود رکھیں (بیرونی صارفین کے لیے مؤثر نہیں، ہمیشہ اس تیسرے فریق تک محدود رہیں جس پر وہ انحصار کرتے ہیں)
+TicketsLimitViewAssignedOnlyHelp=صرف موجودہ صارف کو تفویض کردہ ٹکٹ ہی نظر آئیں گے۔ ٹکٹوں کے انتظام کے حقوق والے صارف پر لاگو نہیں ہوتا ہے۔
+TicketsActivatePublicInterface=عوامی انٹرفیس کو چالو کریں۔
+TicketsActivatePublicInterfaceHelp=عوامی انٹرفیس کسی بھی زائرین کو ٹکٹ بنانے کی اجازت دیتا ہے۔
+TicketsAutoAssignTicket=ٹکٹ بنانے والے صارف کو خود بخود تفویض کریں۔
+TicketsAutoAssignTicketHelp=ٹکٹ بناتے وقت، صارف کو خود بخود ٹکٹ تفویض کیا جا سکتا ہے۔
+TicketNumberingModules=ٹکٹوں کی تعداد کا ماڈیول
+TicketsModelModule=ٹکٹوں کے لیے دستاویزی ٹیمپلیٹس
+TicketNotifyTiersAtCreation=تخلیق پر تیسرے فریق کو مطلع کریں۔
+TicketsDisableCustomerEmail=عوامی انٹرفیس سے ٹکٹ بننے پر ای میلز کو ہمیشہ غیر فعال کریں۔
+TicketsPublicNotificationNewMessage=ٹکٹ میں نیا پیغام/تبصرہ شامل ہونے پر ای میل بھیجیں۔
+TicketsPublicNotificationNewMessageHelp=جب عوامی انٹرفیس سے نیا پیغام شامل کیا جائے تو ای میل بھیجیں ( تفویض کردہ صارف کو یا نوٹیفیکیشن ای میل کو (اپ ڈیٹ) اور/یا نوٹیفیکیشن ای میل کو)
+TicketPublicNotificationNewMessageDefaultEmail=نوٹیفیکیشن ای میل پر (اپ ڈیٹ)
+TicketPublicNotificationNewMessageDefaultEmailHelp=ہر نئے پیغام کی اطلاع کے لیے اس پتے پر ایک ای میل بھیجیں اگر ٹکٹ کے لیے کوئی صارف تفویض نہیں کیا گیا ہے یا صارف کے پاس کوئی معلوم ای میل نہیں ہے۔
 #
 # Index & list page
 #
-TicketsIndex=Tickets area
-TicketList=List of tickets
-TicketAssignedToMeInfos=This page display ticket list created by or assigned to current user
-NoTicketsFound=No ticket found
-NoUnreadTicketsFound=No unread ticket found
-TicketViewAllTickets=View all tickets
-TicketViewNonClosedOnly=View only open tickets
-TicketStatByStatus=Tickets by status
-OrderByDateAsc=Sort by ascending date
-OrderByDateDesc=Sort by descending date
-ShowAsConversation=Show as conversation list
-MessageListViewType=Show as table list
+TicketsIndex=ٹکٹوں کا علاقہ
+TicketList=ٹکٹوں کی فہرست
+TicketAssignedToMeInfos=یہ صفحہ ڈسپلے ٹکٹ کی فہرست موجودہ صارف کے ذریعہ تخلیق یا تفویض کی گئی ہے۔
+NoTicketsFound=کوئی ٹکٹ نہیں ملا
+NoUnreadTicketsFound=کوئی بغیر پڑھا ہوا ٹکٹ نہیں ملا
+TicketViewAllTickets=تمام ٹکٹیں دیکھیں
+TicketViewNonClosedOnly=صرف کھلی ٹکٹیں دیکھیں
+TicketStatByStatus=حیثیت کے لحاظ سے ٹکٹ
+OrderByDateAsc=صعودی تاریخ کے حساب سے ترتیب دیں۔
+OrderByDateDesc=نزولی تاریخ کے مطابق ترتیب دیں۔
+ShowAsConversation=گفتگو کی فہرست کے بطور دکھائیں۔
+MessageListViewType=ٹیبل لسٹ کے بطور دکھائیں۔
 
 #
 # Ticket card
 #
-Ticket=Ticket
-TicketCard=Ticket card
-CreateTicket=Create ticket
-EditTicket=Edit ticket
-TicketsManagement=Tickets Management
-CreatedBy=Created by
-NewTicket=New Ticket
-SubjectAnswerToTicket=Ticket answer
-TicketTypeRequest=Request type
-TicketCategory=Ticket categorization
-SeeTicket=See ticket
-TicketMarkedAsRead=Ticket has been marked as read
-TicketReadOn=Read on
-TicketCloseOn=Closing date
-MarkAsRead=Mark ticket as read
-TicketHistory=Ticket history
-AssignUser=Assign to user
-TicketAssigned=Ticket is now assigned
-TicketChangeType=Change type
-TicketChangeCategory=Change analytic code
-TicketChangeSeverity=Change severity
-TicketAddMessage=Add a message
-AddMessage=Add a message
-MessageSuccessfullyAdded=Ticket added
-TicketMessageSuccessfullyAdded=Message successfully added
-TicketMessagesList=Message list
-NoMsgForThisTicket=No message for this ticket
-TicketProperties=Classification
-LatestNewTickets=Latest %s newest tickets (not read)
-TicketSeverity=Severity
-ShowTicket=See ticket
-RelatedTickets=Related tickets
-TicketAddIntervention=Create intervention
-CloseTicket=Close|Solve ticket
-AbandonTicket=Abandon ticket
-CloseATicket=Close|Solve a ticket
-ConfirmCloseAticket=Confirm ticket closing
-ConfirmAbandonTicket=Do you confirm the closing of the ticket to status 'Abandonned'
-ConfirmDeleteTicket=Please confirm ticket deleting
-TicketDeletedSuccess=Ticket deleted with success
-TicketMarkedAsClosed=Ticket marked as closed
-TicketDurationAuto=Calculated duration
-TicketDurationAutoInfos=Duration calculated automatically from intervention related
-TicketUpdated=Ticket updated
-SendMessageByEmail=Send message by email
-TicketNewMessage=New message
-ErrorMailRecipientIsEmptyForSendTicketMessage=Recipient is empty. No email send
-TicketGoIntoContactTab=Please go into "Contacts" tab to select them
-TicketMessageMailIntro=Introduction
-TicketMessageMailIntroHelp=This text is added only at the beginning of the email and will not be saved.
-TicketMessageMailIntroLabelAdmin=Introduction to the message when sending email
-TicketMessageMailIntroText=Hello,<br>A new response was sent on a ticket that you contact. Here is the message:<br>
-TicketMessageMailIntroHelpAdmin=This text will be inserted before the text of the response to a ticket.
-TicketMessageMailSignature=Signature
-TicketMessageMailSignatureHelp=This text is added only at the end of the email and will not be saved.
-TicketMessageMailSignatureText=<p>Sincerely,</p><p>--</p>
-TicketMessageMailSignatureLabelAdmin=Signature of response email
-TicketMessageMailSignatureHelpAdmin=This text will be inserted after the response message.
-TicketMessageHelp=Only this text will be saved in the message list on ticket card.
-TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
-TimeElapsedSince=Time elapsed since
-TicketTimeToRead=Time elapsed before read
-TicketTimeElapsedBeforeSince=Time elapsed before / since
-TicketContacts=Contacts ticket
-TicketDocumentsLinked=Documents linked to ticket
-ConfirmReOpenTicket=Confirm reopen this ticket ?
-TicketMessageMailIntroAutoNewPublicMessage=A new message was posted on the ticket with the subject %s:
-TicketAssignedToYou=Ticket assigned
-TicketAssignedEmailBody=You have been assigned the ticket #%s by %s
-MarkMessageAsPrivate=Mark message as private
-TicketMessagePrivateHelp=This message will not display to external users
-TicketEmailOriginIssuer=Issuer at origin of the tickets
-InitialMessage=Initial Message
-LinkToAContract=Link to a contract
-TicketPleaseSelectAContract=Select a contract
-UnableToCreateInterIfNoSocid=Can not create an intervention when no third party is defined
-TicketMailExchanges=Mail exchanges
-TicketInitialMessageModified=Initial message modified
-TicketMessageSuccesfullyUpdated=Message successfully updated
-TicketChangeStatus=Change status
-TicketConfirmChangeStatus=Confirm the status change: %s ?
-TicketLogStatusChanged=Status changed: %s to %s
-TicketNotNotifyTiersAtCreate=Not notify company at create
-Unread=Unread
-TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
-ErrorTicketRefRequired=Ticket reference name is required
+Ticket=ٹکٹ
+TicketCard=ٹکٹ کارڈ
+CreateTicket=ٹکٹ بنائیں
+EditTicket=ٹکٹ میں ترمیم کریں۔
+TicketsManagement=ٹکٹوں کا انتظام
+CreatedBy=بنائی گئی
+NewTicket=نیا ٹکٹ
+SubjectAnswerToTicket=ٹکٹ کا جواب
+TicketTypeRequest=درخواست کی قسم
+TicketCategory=ٹکٹ کی درجہ بندی
+SeeTicket=ٹکٹ دیکھیں
+TicketMarkedAsRead=ٹکٹ کو پڑھا ہوا نشان زد کر دیا گیا ہے۔
+TicketReadOn=پڑھیں
+TicketCloseOn=آخری تاریخ
+MarkAsRead=ٹکٹ کو پڑھا ہوا نشان زد کریں۔
+TicketHistory=ٹکٹ کی تاریخ
+AssignUser=صارف کو تفویض کریں۔
+TicketAssigned=ٹکٹ اب تفویض کیا گیا ہے۔
+TicketChangeType=قسم تبدیل کریں۔
+TicketChangeCategory=تجزیاتی کوڈ کو تبدیل کریں۔
+TicketChangeSeverity=شدت کو تبدیل کریں۔
+TicketAddMessage=ایک پیغام شامل کریں۔
+AddMessage=ایک پیغام شامل کریں۔
+MessageSuccessfullyAdded=ٹکٹ شامل کیا گیا۔
+TicketMessageSuccessfullyAdded=پیغام کامیابی کے ساتھ شامل ہو گیا۔
+TicketMessagesList=پیغام کی فہرست
+NoMsgForThisTicket=اس ٹکٹ کے لیے کوئی پیغام نہیں ہے۔
+TicketProperties=درجہ بندی
+LatestNewTickets=تازہ ترین %s تازہ ترین ٹکٹ (پڑھے نہیں گئے)
+TicketSeverity=شدت
+ShowTicket=ٹکٹ دیکھیں
+RelatedTickets=متعلقہ ٹکٹ
+TicketAddIntervention=مداخلت پیدا کریں۔
+CloseTicket=بند کریں | ٹکٹ حل کریں۔
+AbandonTicket=ٹکٹ چھوڑ دیں۔
+CloseATicket=بند کریں | ٹکٹ حل کریں۔
+ConfirmCloseAticket=ٹکٹ بند ہونے کی تصدیق کریں۔
+ConfirmAbandonTicket=کیا آپ ٹکٹ کے بند ہونے کی تصدیق کرتے ہیں اسٹیٹس 'Abandonned'
+ConfirmDeleteTicket=براہ کرم ٹکٹ ڈیلیٹ کرنے کی تصدیق کریں۔
+TicketDeletedSuccess=ٹکٹ کامیابی کے ساتھ حذف کر دیا گیا۔
+TicketMarkedAsClosed=ٹکٹ کو بند کے بطور نشان زد کیا گیا ہے۔
+TicketDurationAuto=حسابی مدت
+TicketDurationAutoInfos=مداخلت سے متعلق خود بخود مدت کا حساب لگایا جاتا ہے۔
+TicketUpdated=ٹکٹ اپ ڈیٹ ہو گیا۔
+SendMessageByEmail=ای میل کے ذریعے پیغام بھیجیں۔
+TicketNewMessage=نیا پیغام
+ErrorMailRecipientIsEmptyForSendTicketMessage=وصول کنندہ خالی ہے۔ کوئی ای میل نہیں بھیجا۔
+TicketGoIntoContactTab=براہ کرم انہیں منتخب کرنے کے لیے "رابطے" ٹیب میں جائیں۔
+TicketMessageMailIntro=تعارف
+TicketMessageMailIntroHelp=یہ متن صرف ای میل کے شروع میں شامل کیا گیا ہے اور محفوظ نہیں کیا جائے گا۔
+TicketMessageMailIntroLabelAdmin=ای میل بھیجتے وقت پیغام کا تعارف
+TicketMessageMailIntroText=ہیلو، <br> ٹکٹ پر ایک نیا جواب بھیجا گیا جس سے آپ رابطہ کرتے ہیں۔ یہ پیغام ہے: <br>
+TicketMessageMailIntroHelpAdmin=یہ متن ٹکٹ کے جواب کے متن سے پہلے داخل کیا جائے گا۔
+TicketMessageMailSignature=دستخط
+TicketMessageMailSignatureHelp=یہ متن صرف ای میل کے آخر میں شامل کیا گیا ہے اور محفوظ نہیں کیا جائے گا۔
+TicketMessageMailSignatureText= <p> مخلص، </p> <p> -- </p>
+TicketMessageMailSignatureLabelAdmin=جوابی ای میل کے دستخط
+TicketMessageMailSignatureHelpAdmin=یہ متن جوابی پیغام کے بعد داخل کیا جائے گا۔
+TicketMessageHelp=ٹکٹ کارڈ پر پیغام کی فہرست میں صرف یہ متن محفوظ کیا جائے گا۔
+TicketMessageSubstitutionReplacedByGenericValues=متبادل متغیرات کو عام اقدار سے تبدیل کیا جاتا ہے۔
+TimeElapsedSince=تب سے وقت گزر گیا۔
+TicketTimeToRead=پڑھنے سے پہلے وقت گزر گیا۔
+TicketTimeElapsedBeforeSince=وقت سے پہلے / بعد سے گزر گیا
+TicketContacts=رابطوں کا ٹکٹ
+TicketDocumentsLinked=ٹکٹ سے منسلک دستاویزات
+ConfirmReOpenTicket=اس ٹکٹ کو دوبارہ کھولنے کی تصدیق کریں؟
+TicketMessageMailIntroAutoNewPublicMessage=ٹکٹ پر %s موضوع کے ساتھ ایک نیا پیغام پوسٹ کیا گیا تھا:
+TicketAssignedToYou=ٹکٹ تفویض کر دیا گیا۔
+TicketAssignedEmailBody=آپ کو %s کی طرف سے ٹکٹ #%s تفویض کیا گیا ہے
+MarkMessageAsPrivate=پیغام کو نجی کے بطور نشان زد کریں۔
+TicketMessagePrivateHelp=یہ پیغام بیرونی صارفین کو نہیں دکھایا جائے گا۔
+TicketEmailOriginIssuer=ٹکٹوں کی اصل پر جاری کنندہ
+InitialMessage=ابتدائی پیغام
+LinkToAContract=ایک معاہدے سے لنک کریں۔
+TicketPleaseSelectAContract=ایک معاہدہ منتخب کریں۔
+UnableToCreateInterIfNoSocid=جب کسی تیسرے فریق کی تعریف نہ کی گئی ہو تو مداخلت نہیں کر سکتے
+TicketMailExchanges=میل ایکسچینج
+TicketInitialMessageModified=ابتدائی پیغام میں ترمیم کی گئی۔
+TicketMessageSuccesfullyUpdated=پیغام کامیابی کے ساتھ اپ ڈیٹ ہو گیا۔
+TicketChangeStatus=حیثیت تبدیل کریں۔
+TicketConfirmChangeStatus=حالت کی تبدیلی کی تصدیق کریں: %s؟
+TicketLogStatusChanged=حالت بدل گئی: %s سے %s
+TicketNotNotifyTiersAtCreate=بنانے پر کمپنی کو مطلع نہ کریں۔
+Unread=ان پڑھ
+TicketNotCreatedFromPublicInterface=دستیاب نہیں ہے. ٹکٹ عوامی انٹرفیس سے نہیں بنایا گیا تھا۔
+ErrorTicketRefRequired=ٹکٹ کا حوالہ نام درکار ہے۔
 
 #
 # Logs
 #
-TicketLogMesgReadBy=Ticket %s read by %s
-NoLogForThisTicket=No log for this ticket yet
-TicketLogAssignedTo=Ticket %s assigned to %s
-TicketLogPropertyChanged=Ticket %s modified: classification from %s to %s
-TicketLogClosedBy=Ticket %s closed by %s
-TicketLogReopen=Ticket %s re-open
+TicketLogMesgReadBy=ٹکٹ %s %s کے ذریعے پڑھا گیا
+NoLogForThisTicket=اس ٹکٹ کے لیے ابھی تک کوئی لاگ نہیں ہے۔
+TicketLogAssignedTo=ٹکٹ %s %s کو تفویض کیا گیا
+TicketLogPropertyChanged=ٹکٹ %s میں ترمیم کی گئی: %s سے %s تک درجہ بندی
+TicketLogClosedBy=ٹکٹ %s %s سے بند
+TicketLogReopen=ٹکٹ %s دوبارہ کھولیں۔
 
 #
 # Public pages
 #
-TicketSystem=Ticket system
-ShowListTicketWithTrackId=Display ticket list from track ID
-ShowTicketWithTrackId=Display ticket from track ID
-TicketPublicDesc=You can create a support ticket or check from an existing ID.
-YourTicketSuccessfullySaved=Ticket has been successfully saved!
-MesgInfosPublicTicketCreatedWithTrackId=A new ticket has been created with ID %s and Ref %s.
-PleaseRememberThisId=Please keep the tracking number that we might ask you later.
-TicketNewEmailSubject=Ticket creation confirmation - Ref %s (public ticket ID %s)
-TicketNewEmailSubjectCustomer=New support ticket
-TicketNewEmailBody=This is an automatic email to confirm you have registered a new ticket.
-TicketNewEmailBodyCustomer=This is an automatic email to confirm a new ticket has just been created into your account.
-TicketNewEmailBodyInfosTicket=Information for monitoring the ticket
-TicketNewEmailBodyInfosTrackId=Ticket tracking number: %s
-TicketNewEmailBodyInfosTrackUrl=You can view the progress of the ticket by clicking the link above.
-TicketNewEmailBodyInfosTrackUrlCustomer=You can view the progress of the ticket in the specific interface by clicking the following link
-TicketEmailPleaseDoNotReplyToThisEmail=Please do not reply directly to this email! Use the link to reply into the interface.
-TicketPublicInfoCreateTicket=This form allows you to record a support ticket in our management system.
-TicketPublicPleaseBeAccuratelyDescribe=Please accurately describe the problem. Provide the most information possible to allow us to correctly identify your request.
-TicketPublicMsgViewLogIn=Please enter ticket tracking ID
-TicketTrackId=Public Tracking ID
-OneOfTicketTrackId=One of your tracking ID
-ErrorTicketNotFound=Ticket with tracking ID %s not found!
-Subject=Subject
-ViewTicket=View ticket
-ViewMyTicketList=View my ticket list
-ErrorEmailMustExistToCreateTicket=Error: email address not found in our database
-TicketNewEmailSubjectAdmin=New ticket created - Ref %s (public ticket ID %s)
-TicketNewEmailBodyAdmin=<p>Ticket has just been created with ID #%s, see information:</p>
-SeeThisTicketIntomanagementInterface=See ticket in management interface
-TicketPublicInterfaceForbidden=The public interface for the tickets was not enabled
-ErrorEmailOrTrackingInvalid=Bad value for tracking ID or email
-OldUser=Old user
-NewUser=New user
-NumberOfTicketsByMonth=Number of tickets per month
-NbOfTickets=Number of tickets
+TicketSystem=ٹکٹ کا نظام
+ShowListTicketWithTrackId=ٹریک ID سے ٹکٹ کی فہرست دکھائیں۔
+ShowTicketWithTrackId=ٹریک ID سے ٹکٹ ڈسپلے کریں۔
+TicketPublicDesc=آپ سپورٹ ٹکٹ بنا سکتے ہیں یا موجودہ ID سے چیک کر سکتے ہیں۔
+YourTicketSuccessfullySaved=ٹکٹ کامیابی کے ساتھ محفوظ ہو گیا ہے!
+MesgInfosPublicTicketCreatedWithTrackId=ID %s اور Ref %s کے ساتھ ایک نیا ٹکٹ بنایا گیا ہے۔
+PleaseRememberThisId=براہ کرم ٹریکنگ نمبر رکھیں جو ہم آپ سے بعد میں پوچھ سکتے ہیں۔
+TicketNewEmailSubject=ٹکٹ بنانے کی تصدیق - Ref %s (عوامی ٹکٹ ID %s)
+TicketNewEmailSubjectCustomer=نیا سپورٹ ٹکٹ
+TicketNewEmailBody=یہ ایک خودکار ای میل ہے اس بات کی تصدیق کرنے کے لیے کہ آپ نے نیا ٹکٹ رجسٹر کیا ہے۔
+TicketNewEmailBodyCustomer=یہ ایک خودکار ای میل ہے اس بات کی تصدیق کرنے کے لیے کہ ابھی آپ کے اکاؤنٹ میں ایک نیا ٹکٹ بنایا گیا ہے۔
+TicketNewEmailBodyInfosTicket=ٹکٹ کی نگرانی کے لیے معلومات
+TicketNewEmailBodyInfosTrackId=ٹکٹ ٹریکنگ نمبر: %s
+TicketNewEmailBodyInfosTrackUrl=آپ اوپر دیے گئے لنک پر کلک کرکے ٹکٹ کی پیشرفت دیکھ سکتے ہیں۔
+TicketNewEmailBodyInfosTrackUrlCustomer=آپ درج ذیل لنک پر کلک کرکے مخصوص انٹرفیس میں ٹکٹ کی پیشرفت دیکھ سکتے ہیں۔
+TicketEmailPleaseDoNotReplyToThisEmail=براہ کرم اس ای میل کا براہ راست جواب نہ دیں! انٹرفیس میں جواب دینے کے لیے لنک کا استعمال کریں۔
+TicketPublicInfoCreateTicket=یہ فارم آپ کو ہمارے انتظامی نظام میں سپورٹ ٹکٹ ریکارڈ کرنے کی اجازت دیتا ہے۔
+TicketPublicPleaseBeAccuratelyDescribe=براہ کرم مسئلہ کی درست وضاحت کریں۔ ہمیں آپ کی درخواست کی درست شناخت کرنے کی اجازت دینے کے لیے زیادہ سے زیادہ معلومات فراہم کریں۔
+TicketPublicMsgViewLogIn=براہ کرم ٹکٹ ٹریکنگ ID درج کریں۔
+TicketTrackId=عوامی ٹریکنگ ID
+OneOfTicketTrackId=آپ کی ٹریکنگ آئی ڈی میں سے ایک
+ErrorTicketNotFound=ٹریکنگ ID %s والا ٹکٹ نہیں ملا!
+Subject=مضمون
+ViewTicket=ٹکٹ دیکھیں
+ViewMyTicketList=میری ٹکٹ کی فہرست دیکھیں
+ErrorEmailMustExistToCreateTicket=خرابی: ای میل ایڈریس ہمارے ڈیٹا بیس میں نہیں ملا
+TicketNewEmailSubjectAdmin=نیا ٹکٹ بنایا گیا - Ref %s (عوامی ٹکٹ ID %s)
+TicketNewEmailBodyAdmin= <p> ٹکٹ ابھی #%s ID کے ساتھ بنایا گیا ہے، معلومات دیکھیں: </p>
+SeeThisTicketIntomanagementInterface=مینجمنٹ انٹرفیس میں ٹکٹ دیکھیں
+TicketPublicInterfaceForbidden=ٹکٹوں کے لیے عوامی انٹرفیس فعال نہیں تھا۔
+ErrorEmailOrTrackingInvalid=ٹریکنگ ID یا ای میل کے لیے خراب قدر
+OldUser=پرانا صارف
+NewUser=نیا صارف
+NumberOfTicketsByMonth=ہر ماہ ٹکٹوں کی تعداد
+NbOfTickets=ٹکٹوں کی تعداد
 # notifications
-TicketNotificationEmailSubject=Ticket %s updated
-TicketNotificationEmailBody=This is an automatic message to notify you that ticket %s has just been updated
-TicketNotificationRecipient=Notification recipient
-TicketNotificationLogMessage=Log message
-TicketNotificationEmailBodyInfosTrackUrlinternal=View ticket into interface
-TicketNotificationNumberEmailSent=Notification email sent: %s
+TicketNotificationEmailSubject=ٹکٹ %s اپ ڈیٹ ہو گیا۔
+TicketNotificationEmailBody=یہ آپ کو مطلع کرنے کے لیے ایک خودکار پیغام ہے کہ ٹکٹ %s کو ابھی اپ ڈیٹ کیا گیا ہے۔
+TicketNotificationRecipient=اطلاع وصول کنندہ
+TicketNotificationLogMessage=لاگ پیغام
+TicketNotificationEmailBodyInfosTrackUrlinternal=انٹرفیس میں ٹکٹ دیکھیں
+TicketNotificationNumberEmailSent=اطلاعی ای میل بھیجی گئی: %s
 
-ActionsOnTicket=Events on ticket
+ActionsOnTicket=ٹکٹ پر واقعات
 
 #
 # Boxes
 #
-BoxLastTicket=Latest created tickets
-BoxLastTicketDescription=Latest %s created tickets
+BoxLastTicket=تازہ ترین تیار کردہ ٹکٹ
+BoxLastTicketDescription=تازہ ترین %s نے ٹکٹ بنائے
 BoxLastTicketContent=
-BoxLastTicketNoRecordedTickets=No recent unread tickets
-BoxLastModifiedTicket=Latest modified tickets
-BoxLastModifiedTicketDescription=Latest %s modified tickets
+BoxLastTicketNoRecordedTickets=کوئی حالیہ بغیر پڑھے ہوئے ٹکٹ
+BoxLastModifiedTicket=تازہ ترین ترمیم شدہ ٹکٹ
+BoxLastModifiedTicketDescription=تازہ ترین %s ترمیم شدہ ٹکٹ
 BoxLastModifiedTicketContent=
-BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
-BoxTicketType=Distribution of open tickets by type
-BoxTicketSeverity=Number of open tickets by severity
-BoxNoTicketSeverity=No tickets opened
-BoxTicketLastXDays=Number of new tickets by days the last %s days
-BoxTicketLastXDayswidget = Number of new tickets by days the last X days
-BoxNoTicketLastXDays=No new tickets the last %s days
-BoxNumberOfTicketByDay=Number of new tickets by day
-BoxNewTicketVSClose=Number of tickets versus closed tickets (today)
-TicketCreatedToday=Ticket created today
-TicketClosedToday=Ticket closed today
-KMFoundForTicketGroup=We found topics and FAQs that may answers your question, thanks to check them before submitting the ticket
+BoxLastModifiedTicketNoRecordedTickets=کوئی حالیہ ترمیم شدہ ٹکٹ نہیں ہے۔
+BoxTicketType=قسم کے لحاظ سے کھلے ٹکٹوں کی تقسیم
+BoxTicketSeverity=شدت کے لحاظ سے کھلے ٹکٹوں کی تعداد
+BoxNoTicketSeverity=کوئی ٹکٹ نہیں کھلا۔
+BoxTicketLastXDays=پچھلے %s دنوں کے حساب سے نئے ٹکٹوں کی تعداد
+BoxTicketLastXDayswidget = آخری X دنوں کے حساب سے نئے ٹکٹوں کی تعداد
+BoxNoTicketLastXDays=پچھلے %s دنوں میں کوئی نیا ٹکٹ نہیں ہے۔
+BoxNumberOfTicketByDay=دن میں نئے ٹکٹوں کی تعداد
+BoxNewTicketVSClose=ٹکٹوں کی تعداد بمقابلہ بند ٹکٹ (آج)
+TicketCreatedToday=ٹکٹ آج بنایا گیا۔
+TicketClosedToday=ٹکٹ آج بند ہے۔
+KMFoundForTicketGroup=ہمیں ایسے عنوانات اور اکثر پوچھے گئے سوالات ملے جو آپ کے سوال کا جواب دے سکتے ہیں، ٹکٹ جمع کرانے سے پہلے انہیں چیک کرنے کا شکریہ
diff --git a/htdocs/langs/ur_PK/trips.lang b/htdocs/langs/ur_PK/trips.lang
index 9210ede360c..ee3884f97cc 100644
--- a/htdocs/langs/ur_PK/trips.lang
+++ b/htdocs/langs/ur_PK/trips.lang
@@ -1,150 +1,150 @@
 # Dolibarr language file - Source file is en_US - trips
-ShowExpenseReport=Show expense report
-Trips=Expense reports
-TripsAndExpenses=Expenses reports
-TripsAndExpensesStatistics=Expense reports statistics
-TripCard=Expense report card
-AddTrip=Create expense report
-ListOfTrips=List of expense reports
-ListOfFees=List of fees
-TypeFees=Types of fees
-ShowTrip=Show expense report
-NewTrip=New expense report
-LastExpenseReports=Latest %s expense reports
-AllExpenseReports=All expense reports
-CompanyVisited=Company/organization visited
-FeesKilometersOrAmout=Amount or kilometers
-DeleteTrip=Delete expense report
-ConfirmDeleteTrip=Are you sure you want to delete this expense report?
-ListTripsAndExpenses=List of expense reports
-ListToApprove=Waiting for approval
-ExpensesArea=Expense reports area
-ClassifyRefunded=Classify 'Refunded'
-ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
-ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
-ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
-ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
-ExpenseReportApproved=An expense report was approved
-ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
-ExpenseReportRefused=An expense report was refused
-ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
-ExpenseReportCanceled=An expense report was canceled
-ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
-ExpenseReportPaid=An expense report was paid
-ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
-TripId=Id expense report
-AnyOtherInThisListCanValidate=Person to be informed for validating the request.
-TripSociete=Information company
-TripNDF=Informations expense report
-PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
-ExpenseReportLine=Expense report line
-TF_OTHER=Other
-TF_TRIP=Transportation
-TF_LUNCH=Lunch
-TF_METRO=Metro
-TF_TRAIN=Train
-TF_BUS=Bus
-TF_CAR=Car
-TF_PEAGE=Toll
-TF_ESSENCE=Fuel
-TF_HOTEL=Hotel
-TF_TAXI=Taxi
-EX_KME=Mileage costs
-EX_FUE=Fuel CV
-EX_HOT=Hotel
-EX_PAR=Parking CV
-EX_TOL=Toll CV
-EX_TAX=Various Taxes
-EX_IND=Indemnity transportation subscription
-EX_SUM=Maintenance supply
-EX_SUO=Office supplies
-EX_CAR=Car rental
-EX_DOC=Documentation
-EX_CUR=Customers receiving
-EX_OTR=Other receiving
-EX_POS=Postage
-EX_CAM=CV maintenance and repair
-EX_EMM=Employees meal
-EX_GUM=Guests meal
-EX_BRE=Breakfast
-EX_FUE_VP=Fuel PV
-EX_TOL_VP=Toll PV
-EX_PAR_VP=Parking PV
-EX_CAM_VP=PV maintenance and repair
-DefaultCategoryCar=Default transportation mode
-DefaultRangeNumber=Default range number
-UploadANewFileNow=Upload a new document now
-Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
-ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
-AucuneLigne=There is no expense report declared yet
-ModePaiement=Payment mode
-VALIDATOR=User responsible for approval
-VALIDOR=Approved by
-AUTHOR=Recorded by
-AUTHORPAIEMENT=Paid by
-REFUSEUR=Denied by
-CANCEL_USER=Deleted by
-MOTIF_REFUS=Reason
-MOTIF_CANCEL=Reason
-DATE_REFUS=Deny date
-DATE_SAVE=Validation date
-DATE_CANCEL=Cancelation date
-DATE_PAIEMENT=Payment date
-ExpenseReportRef=Ref. expense report
-ValidateAndSubmit=Validate and submit for approval
-ValidatedWaitingApproval=Validated (waiting for approval)
-NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
-ConfirmRefuseTrip=Are you sure you want to deny this expense report?
-ValideTrip=Approve expense report
-ConfirmValideTrip=Are you sure you want to approve this expense report?
-PaidTrip=Pay an expense report
-ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid"?
-ConfirmCancelTrip=Are you sure you want to cancel this expense report?
-BrouillonnerTrip=Move back expense report to status "Draft"
-ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft"?
-SaveTrip=Validate expense report
-ConfirmSaveTrip=Are you sure you want to validate this expense report?
-NoTripsToExportCSV=No expense report to export for this period.
-ExpenseReportPayment=Expense report payment
-ExpenseReportsToApprove=Expense reports to approve
-ExpenseReportsToPay=Expense reports to pay
-ConfirmCloneExpenseReport=Are you sure you want to clone this expense report ?
-ExpenseReportsIk=Configuration of mileage charges
-ExpenseReportsRules=Expense report rules
-ExpenseReportIkDesc=You can modify the calculation of kilometers expense by category and range who they are previously defined. <b>d</b> is the distance in kilometers
-ExpenseReportRulesDesc=You can define max amount rules for expense reports. These rules will be applied when a new expense is added to an expense report
-expenseReportOffset=Offset
-expenseReportCoef=Coefficient
-expenseReportTotalForFive=Example with <u>d</u> = 5
-expenseReportRangeFromTo=from %d to %d
-expenseReportRangeMoreThan=more than %d
-expenseReportCoefUndefined=(value not defined)
-expenseReportCatDisabled=Category disabled - see the c_exp_tax_cat dictionary
-expenseReportRangeDisabled=Range disabled - see the c_exp_tax_range dictionay
-expenseReportPrintExample=offset + (d x coef) = %s
-ExpenseReportApplyTo=Apply to
-ExpenseReportDomain=Domain to apply
-ExpenseReportLimitOn=Limit on
-ExpenseReportDateStart=Date start
-ExpenseReportDateEnd=Date end
-ExpenseReportLimitAmount=Max amount
-ExpenseReportRestrictive=Exceeding forbidden
-AllExpenseReport=All type of expense report
-OnExpense=Expense line
-ExpenseReportRuleSave=Expense report rule saved
-ExpenseReportRuleErrorOnSave=Error: %s
-RangeNum=Range %d
-ExpenseReportConstraintViolationError=Max amount exceeded (rule %s): %s is higher than %s (Exceeding forbidden)
-byEX_DAY=by day (limitation to %s)
-byEX_MON=by month (limitation to %s)
-byEX_YEA=by year (limitation to %s)
-byEX_EXP=by line (limitation to %s)
-ExpenseReportConstraintViolationWarning=Max amount exceeded (rule %s): %s is higher than %s (Exceeding authorized)
-nolimitbyEX_DAY=by day (no limitation)
-nolimitbyEX_MON=by month (no limitation)
-nolimitbyEX_YEA=by year (no limitation)
-nolimitbyEX_EXP=by line (no limitation)
-CarCategory=Vehicle category
-ExpenseRangeOffset=Offset amount: %s
-RangeIk=Mileage range
-AttachTheNewLineToTheDocument=Attach the line to an uploaded document
+ShowExpenseReport=اخراجات کی رپورٹ دکھائیں۔
+Trips=اخراجات کی رپورٹ
+TripsAndExpenses=اخراجات کی رپورٹ
+TripsAndExpensesStatistics=اخراجات کی رپورٹ کے اعدادوشمار
+TripCard=اخراجات کی رپورٹ کارڈ
+AddTrip=اخراجات کی رپورٹ بنائیں
+ListOfTrips=اخراجات کی رپورٹوں کی فہرست
+ListOfFees=فیس کی فہرست
+TypeFees=فیس کی اقسام
+ShowTrip=اخراجات کی رپورٹ دکھائیں۔
+NewTrip=نئی اخراجات کی رپورٹ
+LastExpenseReports=تازہ ترین %s اخراجات کی رپورٹس
+AllExpenseReports=تمام اخراجات کی رپورٹ
+CompanyVisited=کمپنی/تنظیم کا دورہ کیا۔
+FeesKilometersOrAmout=مقدار یا کلومیٹر
+DeleteTrip=اخراجات کی رپورٹ کو حذف کریں۔
+ConfirmDeleteTrip=کیا آپ واقعی اس اخراجات کی رپورٹ کو حذف کرنا چاہتے ہیں؟
+ListTripsAndExpenses=اخراجات کی رپورٹوں کی فہرست
+ListToApprove=منظوری کے انتظار میں
+ExpensesArea=اخراجات کی رپورٹ کا علاقہ
+ClassifyRefunded='ریفنڈ' کی درجہ بندی کریں
+ExpenseReportWaitingForApproval=نئی اخراجات کی رپورٹ منظوری کے لیے پیش کر دی گئی ہے۔
+ExpenseReportWaitingForApprovalMessage=ایک نئی اخراجات کی رپورٹ جمع کرائی گئی ہے اور منظوری کا انتظار ہے۔ <br> - صارف: %s <br> - مدت: %s <br> توثیق کرنے کے لیے یہاں کلک کریں: a0ecb2ecz87f
+ExpenseReportWaitingForReApproval=اخراجات کی رپورٹ دوبارہ منظوری کے لیے پیش کر دی گئی ہے۔
+ExpenseReportWaitingForReApprovalMessage=اخراجات کی رپورٹ جمع کرائی گئی ہے اور دوبارہ منظوری کا انتظار ہے۔ <br> %s، آپ نے اس وجہ سے اخراجات کی رپورٹ کو منظور کرنے سے انکار کر دیا: %s۔ <br> ایک نیا ورژن تجویز کیا گیا ہے اور آپ کی منظوری کا انتظار ہے۔ <br> - صارف: %s <br> - مدت: %s <br> توثیق کرنے کے لیے یہاں کلک کریں: a0ecb2ecz87f
+ExpenseReportApproved=اخراجات کی رپورٹ منظور کر لی گئی۔
+ExpenseReportApprovedMessage=اخراجات کی رپورٹ %s منظور کر لی گئی۔ <br> - صارف: %s <br> - منظور شدہ بذریعہ: %s <br> اخراجات کی رپورٹ دکھانے کے لیے یہاں کلک کریں: %s
+ExpenseReportRefused=اخراجات کی رپورٹ مسترد کر دی گئی۔
+ExpenseReportRefusedMessage=اخراجات کی رپورٹ %s سے انکار کر دیا گیا تھا۔ <br> - صارف: %s <br> - انکار کردہ بذریعہ: %s <br> - انکار کا محرک: a0ecb2ec87f49fz7fzf70000 یہاں پر کلک کریں۔
+ExpenseReportCanceled=اخراجات کی رپورٹ منسوخ کر دی گئی۔
+ExpenseReportCanceledMessage=اخراجات کی رپورٹ %s منسوخ کر دی گئی۔ <br> - صارف: %s <br> - منسوخ شدہ بذریعہ: %s <br> - منسوخی کا محرک: a0ecb2eczfda19bz0 کی رپورٹ:
+ExpenseReportPaid=اخراجات کی رپورٹ ادا کر دی گئی۔
+ExpenseReportPaidMessage=اخراجات کی رپورٹ %s ادا کی گئی۔ <br> - صارف: %s <br> - ادائیگی کی طرف سے: %s <br> اخراجات کی رپورٹ دکھانے کے لیے یہاں کلک کریں: a0ecb2ec9fz87
+TripId=شناختی اخراجات کی رپورٹ
+AnyOtherInThisListCanValidate=درخواست کی توثیق کے لیے مطلع کیا جائے۔
+TripSociete=انفارمیشن کمپنی
+TripNDF=معلوماتی اخراجات کی رپورٹ
+PDFStandardExpenseReports=اخراجات کی رپورٹ کے لیے پی ڈی ایف دستاویز بنانے کے لیے معیاری ٹیمپلیٹ
+ExpenseReportLine=اخراجات کی رپورٹ لائن
+TF_OTHER=دیگر
+TF_TRIP=نقل و حمل
+TF_LUNCH=دوپہر کا کھانا
+TF_METRO=میٹرو
+TF_TRAIN=ٹرین
+TF_BUS=بس
+TF_CAR=گاڑی
+TF_PEAGE=ٹول
+TF_ESSENCE=ایندھن
+TF_HOTEL=ہوٹل
+TF_TAXI=ٹیکسی
+EX_KME=مائلیج کے اخراجات
+EX_FUE=ایندھن CV
+EX_HOT=ہوٹل
+EX_PAR=پارکنگ سی وی
+EX_TOL=ٹول سی وی
+EX_TAX=مختلف ٹیکس
+EX_IND=معاوضہ ٹرانسپورٹیشن سبسکرپشن
+EX_SUM=بحالی کی فراہمی
+EX_SUO=دفتری سامان
+EX_CAR=کار کرایہ پر لینا
+EX_DOC=دستاویزی
+EX_CUR=وصول کرنے والے صارفین
+EX_OTR=دوسرے وصول کرنے والے
+EX_POS=ڈاک
+EX_CAM=CV کی دیکھ بھال اور مرمت
+EX_EMM=ملازمین کا کھانا
+EX_GUM=مہمانوں کا کھانا
+EX_BRE=ناشتہ
+EX_FUE_VP=ایندھن PV
+EX_TOL_VP=ٹول پی وی
+EX_PAR_VP=پارکنگ پی وی
+EX_CAM_VP=پی وی کی بحالی اور مرمت
+DefaultCategoryCar=ڈیفالٹ ٹرانسپورٹ موڈ
+DefaultRangeNumber=ڈیفالٹ رینج نمبر
+UploadANewFileNow=ابھی ایک نئی دستاویز اپ لوڈ کریں۔
+Error_EXPENSEREPORT_ADDON_NotDefined=خرابی، ماڈیول 'خرچ رپورٹ' کے سیٹ اپ میں اخراجات کی رپورٹ نمبرنگ ریف کے اصول کی وضاحت نہیں کی گئی تھی۔
+ErrorDoubleDeclaration=آپ نے اسی طرح کی تاریخ کی حد میں ایک اور اخراجات کی رپورٹ کا اعلان کیا ہے۔
+AucuneLigne=ابھی تک کوئی اخراجات کی رپورٹ کا اعلان نہیں کیا گیا ہے۔
+ModePaiement=ادائیگی کا طریقہ
+VALIDATOR=منظوری کے لیے ذمہ دار صارف
+VALIDOR=کی طرف سے منظور
+AUTHOR=کی طرف سے ریکارڈ کیا
+AUTHORPAIEMENT=کی طرف سے ادا کیا
+REFUSEUR=کی طرف سے انکار
+CANCEL_USER=کے ذریعے حذف کر دیا گیا۔
+MOTIF_REFUS=وجہ
+MOTIF_CANCEL=وجہ
+DATE_REFUS=تاریخ سے انکار کریں۔
+DATE_SAVE=توثیق کی تاریخ
+DATE_CANCEL=منسوخی کی تاریخ
+DATE_PAIEMENT=ادائیگی کی تاریخ
+ExpenseReportRef=حوالہ اخراجات کی رپورٹ
+ValidateAndSubmit=تصدیق کریں اور منظوری کے لیے جمع کرائیں۔
+ValidatedWaitingApproval=تصدیق شدہ (منظوری کا انتظار ہے)
+NOT_AUTHOR=آپ اس اخراجات کی رپورٹ کے مصنف نہیں ہیں۔ آپریشن منسوخ کر دیا گیا۔
+ConfirmRefuseTrip=کیا آپ واقعی اس اخراجات کی رپورٹ کو مسترد کرنا چاہتے ہیں؟
+ValideTrip=اخراجات کی رپورٹ منظور کریں۔
+ConfirmValideTrip=کیا آپ واقعی اس اخراجات کی رپورٹ کو منظور کرنا چاہتے ہیں؟
+PaidTrip=اخراجات کی رپورٹ ادا کریں۔
+ConfirmPaidTrip=کیا آپ واقعی اس اخراجات کی رپورٹ کی حیثیت کو "ادائیگی" میں تبدیل کرنا چاہتے ہیں؟
+ConfirmCancelTrip=کیا آپ واقعی اس اخراجات کی رپورٹ کو منسوخ کرنا چاہتے ہیں؟
+BrouillonnerTrip=اخراجات کی رپورٹ کو "ڈرافٹ" کی حیثیت پر واپس منتقل کریں
+ConfirmBrouillonnerTrip=کیا آپ واقعی اس اخراجات کی رپورٹ کو "ڈرافٹ" کی حیثیت میں منتقل کرنا چاہتے ہیں؟
+SaveTrip=اخراجات کی رپورٹ کی توثیق کریں۔
+ConfirmSaveTrip=کیا آپ واقعی اس اخراجات کی رپورٹ کی توثیق کرنا چاہتے ہیں؟
+NoTripsToExportCSV=اس مدت کے لیے ایکسپورٹ کرنے کے لیے کوئی اخراجات کی رپورٹ نہیں ہے۔
+ExpenseReportPayment=اخراجات کی رپورٹ کی ادائیگی
+ExpenseReportsToApprove=منظوری کے لیے اخراجات کی رپورٹ
+ExpenseReportsToPay=ادا کرنے کے لیے اخراجات کی رپورٹ
+ConfirmCloneExpenseReport=کیا آپ واقعی اس اخراجات کی رپورٹ کو کلون کرنا چاہتے ہیں؟
+ExpenseReportsIk=مائلیج چارجز کی ترتیب
+ExpenseReportsRules=اخراجات کی رپورٹ کے قواعد
+ExpenseReportIkDesc=آپ زمرہ اور رینج کے لحاظ سے کلومیٹر کے اخراجات کے حساب کتاب میں ترمیم کر سکتے ہیں جن کی پہلے وضاحت کی گئی ہے۔ <b> d </b> کلومیٹر میں فاصلہ ہے
+ExpenseReportRulesDesc=آپ اخراجات کی رپورٹوں کے لیے زیادہ سے زیادہ رقم کے قواعد کی وضاحت کر سکتے ہیں۔ یہ قواعد لاگو ہوں گے جب اخراجات کی رپورٹ میں نیا خرچ شامل کیا جائے گا۔
+expenseReportOffset=آفسیٹ
+expenseReportCoef=عددی سر
+expenseReportTotalForFive=<u> d </u> = 5 کے ساتھ مثال
+expenseReportRangeFromTo=%d سے %d تک
+expenseReportRangeMoreThan=%d سے زیادہ
+expenseReportCoefUndefined=(قدر کی وضاحت نہیں کی گئی)
+expenseReportCatDisabled=زمرہ غیر فعال - c_exp_tax_cat ڈکشنری دیکھیں
+expenseReportRangeDisabled=رینج غیر فعال - c_exp_tax_range dictionay دیکھیں
+expenseReportPrintExample=آفسیٹ + (d x coef) = %s
+ExpenseReportApplyTo=پر لاگو
+ExpenseReportDomain=درخواست دینے کے لیے ڈومین
+ExpenseReportLimitOn=پر حد
+ExpenseReportDateStart=تاریخ آغاز
+ExpenseReportDateEnd=تاریخ ختم
+ExpenseReportLimitAmount=زیادہ سے زیادہ رقم
+ExpenseReportRestrictive=حد سے تجاوز کرنا
+AllExpenseReport=ہر قسم کے اخراجات کی رپورٹ
+OnExpense=اخراجات کی لکیر
+ExpenseReportRuleSave=اخراجات کی رپورٹ کا اصول محفوظ ہو گیا۔
+ExpenseReportRuleErrorOnSave=خرابی: %s
+RangeNum=رینج %d
+ExpenseReportConstraintViolationError=زیادہ سے زیادہ رقم سے تجاوز کر گیا (قاعدہ %s): %s %s سے زیادہ ہے (حد سے زیادہ)
+byEX_DAY=دن کے لحاظ سے (%s تک کی حد)
+byEX_MON=ماہ کے لحاظ سے (%s تک کی حد)
+byEX_YEA=سال کے لحاظ سے (%s تک کی حد)
+byEX_EXP=لائن کے لحاظ سے (%s تک کی حد)
+ExpenseReportConstraintViolationWarning=زیادہ سے زیادہ رقم سے تجاوز کر گیا (قاعدہ %s): %s %s سے زیادہ ہے (مجاز سے زیادہ)
+nolimitbyEX_DAY=دن کے لحاظ سے (کوئی حد نہیں)
+nolimitbyEX_MON=ماہ کے لحاظ سے (کوئی حد نہیں)
+nolimitbyEX_YEA=سال کے لحاظ سے (کوئی حد نہیں)
+nolimitbyEX_EXP=لائن کے ذریعے (کوئی حد نہیں)
+CarCategory=گاڑیوں کا زمرہ
+ExpenseRangeOffset=آفسیٹ رقم: %s
+RangeIk=مائلیج کی حد
+AttachTheNewLineToTheDocument=اپ لوڈ کردہ دستاویز کے ساتھ لائن منسلک کریں۔
diff --git a/htdocs/langs/ur_PK/users.lang b/htdocs/langs/ur_PK/users.lang
index b6c7feb7bd2..9aeae4e7665 100644
--- a/htdocs/langs/ur_PK/users.lang
+++ b/htdocs/langs/ur_PK/users.lang
@@ -1,126 +1,126 @@
 # Dolibarr language file - Source file is en_US - users
-HRMArea=HRM area
-UserCard=User card
-GroupCard=Group card
-Permission=Permission
-Permissions=Permissions
-EditPassword=Edit password
-SendNewPassword=Regenerate and send password
+HRMArea=HRM کا علاقہ
+UserCard=صارف کارڈ
+GroupCard=گروپ کارڈ
+Permission=اجازت
+Permissions=اجازتیں
+EditPassword=پاس ورڈ میں ترمیم کریں۔
+SendNewPassword=دوبارہ تخلیق کریں اور پاس ورڈ بھیجیں۔
 SendNewPasswordLink=Send link to reset password
-ReinitPassword=Regenerate password
-PasswordChangedTo=Password changed to: %s
-SubjectNewPassword=Your new password for %s
-GroupRights=Group permissions
-UserRights=User permissions
-Credentials=Credentials
-UserGUISetup=User Display Setup
-DisableUser=Disable
-DisableAUser=Disable a user
-DeleteUser=Delete
-DeleteAUser=Delete a user
-EnableAUser=Enable a user
-DeleteGroup=Delete
-DeleteAGroup=Delete a group
-ConfirmDisableUser=Are you sure you want to disable user <b>%s</b>?
-ConfirmDeleteUser=Are you sure you want to delete user <b>%s</b>?
-ConfirmDeleteGroup=Are you sure you want to delete group <b>%s</b>?
-ConfirmEnableUser=Are you sure you want to enable user <b>%s</b>?
-ConfirmReinitPassword=Are you sure you want to generate a new password for user <b>%s</b>?
-ConfirmSendNewPassword=Are you sure you want to generate and send new password for user <b>%s</b>?
-NewUser=New user
-CreateUser=Create user
-LoginNotDefined=Login is not defined.
-NameNotDefined=Name is not defined.
-ListOfUsers=List of users
-SuperAdministrator=Super Administrator
-SuperAdministratorDesc=Global administrator
-AdministratorDesc=Administrator
-DefaultRights=Default Permissions
-DefaultRightsDesc=Define here the <u>default</u> permissions that are automatically granted to a <u>new</u> user (to modify permissions for existing users, go to the user card).
-DolibarrUsers=Dolibarr users
-LastName=Last name
-FirstName=First name
-ListOfGroups=List of groups
-NewGroup=New group
-CreateGroup=Create group
-RemoveFromGroup=Remove from group
-PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
-PasswordChangeRequest=Request to change password for <b>%s</b>
-PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
-IfLoginExistPasswordRequestSent=If this login is a valid account, an email to reset password has been sent.
-IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent.
-ConfirmPasswordReset=Confirm password reset
-MenuUsersAndGroups=Users & Groups
-LastGroupsCreated=Latest %s groups created
-LastUsersCreated=Latest %s users created
-ShowGroup=Show group
-ShowUser=Show user
-NonAffectedUsers=Non assigned users
-UserModified=User modified successfully
-PhotoFile=Photo file
-ListOfUsersInGroup=List of users in this group
-ListOfGroupsForUser=List of groups for this user
-LinkToCompanyContact=Link to third party / contact
-LinkedToDolibarrMember=Link to member
-LinkedToDolibarrUser=Link to user
-LinkedToDolibarrThirdParty=Link to third party
-CreateDolibarrLogin=Create a user
-CreateDolibarrThirdParty=Create a third party
-LoginAccountDisableInDolibarr=Account disabled in Dolibarr.
-UsePersonalValue=Use personal value
-InternalUser=Internal user
-ExportDataset_user_1=Users and their properties
-DomainUser=Domain user %s
-Reactivate=Reactivate
-CreateInternalUserDesc=This form allows you to create an internal user in your company/organization. To create an external user (customer, vendor etc.  ..), use the button 'Create Dolibarr User' from that third-party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
-PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
-Inherited=Inherited
-UserWillBe=Created user will be
-UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
-UserWillBeExternalUser=Created user will be an external user (because linked to a particular third party)
-IdPhoneCaller=Id phone caller
-NewUserCreated=User %s created
-NewUserPassword=Password change for %s
-NewPasswordValidated=Your new password have been validated and must be used now to login.
-EventUserModified=User %s modified
-UserDisabled=User %s disabled
-UserEnabled=User %s activated
-UserDeleted=User %s removed
-NewGroupCreated=Group %s created
-GroupModified=Group %s modified
-GroupDeleted=Group %s removed
-ConfirmCreateContact=Are you sure you want to create a Dolibarr account for this contact?
-ConfirmCreateLogin=Are you sure you want to create a Dolibarr account for this member?
-ConfirmCreateThirdParty=Are you sure you want to create a third party for this member?
-LoginToCreate=Login to create
-NameToCreate=Name of third party to create
-YourRole=Your roles
-YourQuotaOfUsersIsReached=Your quota of active users is reached !
-NbOfUsers=Number of users
-NbOfPermissions=Number of permissions
-DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
-HierarchicalResponsible=Supervisor
-HierarchicView=Hierarchical view
-UseTypeFieldToChange=Use field Type to change
+ReinitPassword=پاس ورڈ دوبارہ بنائیں
+PasswordChangedTo=پاس ورڈ تبدیل کر دیا گیا: %s
+SubjectNewPassword=%s کے لیے آپ کا نیا پاس ورڈ
+GroupRights=گروپ کی اجازت
+UserRights=صارف کی اجازتیں۔
+Credentials=اسناد
+UserGUISetup=یوزر ڈسپلے سیٹ اپ
+DisableUser=غیر فعال کریں۔
+DisableAUser=صارف کو غیر فعال کریں۔
+DeleteUser=حذف کریں۔
+DeleteAUser=صارف کو حذف کریں۔
+EnableAUser=صارف کو فعال کریں۔
+DeleteGroup=حذف کریں۔
+DeleteAGroup=ایک گروپ کو حذف کریں۔
+ConfirmDisableUser=کیا آپ واقعی صارف <b> %s </b> کو غیر فعال کرنا چاہتے ہیں؟
+ConfirmDeleteUser=کیا آپ واقعی صارف <b> %s </b> کو حذف کرنا چاہتے ہیں؟
+ConfirmDeleteGroup=کیا آپ واقعی <b> %s </b> گروپ کو حذف کرنا چاہتے ہیں؟
+ConfirmEnableUser=کیا آپ واقعی صارف <b> %s </b> کو فعال کرنا چاہتے ہیں؟
+ConfirmReinitPassword=کیا آپ واقعی <b> %s </b> صارف کے لیے نیا پاس ورڈ بنانا چاہتے ہیں؟
+ConfirmSendNewPassword=کیا آپ واقعی <b> %s </b> صارف کے لیے نیا پاس ورڈ بنانا اور بھیجنا چاہتے ہیں؟
+NewUser=نیا صارف
+CreateUser=صارف بنائیں
+LoginNotDefined=لاگ ان کی وضاحت نہیں کی گئی ہے۔
+NameNotDefined=نام کی وضاحت نہیں کی گئی ہے۔
+ListOfUsers=صارفین کی فہرست
+SuperAdministrator=سپر ایڈمنسٹریٹر
+SuperAdministratorDesc=عالمی منتظم
+AdministratorDesc=ایڈمنسٹریٹر
+DefaultRights=پہلے سے طے شدہ اجازتیں۔
+DefaultRightsDesc=یہاں <u> پہلے سے طے شدہ </u> اجازتوں کی وضاحت کریں جو خود بخود <u> نئے </u> صارف کو دی جاتی ہیں (موجودہ صارفین کی اجازتوں میں ترمیم کرنے کے لیے، صارف کارڈ پر جائیں)۔
+DolibarrUsers=Dolibarr صارفین
+LastName=آخری نام
+FirstName=پہلا نام
+ListOfGroups=گروپوں کی فہرست
+NewGroup=نیا گروپ
+CreateGroup=گروپ بنائیں
+RemoveFromGroup=گروپ سے نکال دیں۔
+PasswordChangedAndSentTo=پاس ورڈ تبدیل کر کے <b> %s </b> پر بھیج دیا گیا۔
+PasswordChangeRequest=<b> %s </b> کے لیے پاس ورڈ تبدیل کرنے کی درخواست
+PasswordChangeRequestSent=<b> کے لیے پاس ورڈ بدلنے کی درخواست
+IfLoginExistPasswordRequestSent=اگر یہ لاگ ان ایک درست اکاؤنٹ ہے تو پاس ورڈ کو دوبارہ ترتیب دینے کے لیے ایک ای میل بھیجی گئی ہے۔
+IfEmailExistPasswordRequestSent=اگر یہ ای میل ایک درست اکاؤنٹ ہے تو پاس ورڈ کو دوبارہ ترتیب دینے کے لیے ایک ای میل بھیجی گئی ہے۔
+ConfirmPasswordReset=پاس ورڈ دوبارہ ترتیب دینے کی تصدیق کریں۔
+MenuUsersAndGroups=صارفین اور گروپس
+LastGroupsCreated=تازہ ترین %s گروپس بنائے گئے۔
+LastUsersCreated=تازہ ترین %s صارفین بنائے گئے۔
+ShowGroup=گروپ دکھائیں۔
+ShowUser=صارف دکھائیں۔
+NonAffectedUsers=غیر تفویض کردہ صارفین
+UserModified=صارف نے کامیابی سے ترمیم کی۔
+PhotoFile=فوٹو فائل
+ListOfUsersInGroup=اس گروپ کے صارفین کی فہرست
+ListOfGroupsForUser=اس صارف کے لیے گروپس کی فہرست
+LinkToCompanyContact=تھرڈ پارٹی/رابطہ سے لنک کریں۔
+LinkedToDolibarrMember=ممبر سے لنک کریں۔
+LinkedToDolibarrUser=صارف سے لنک کریں۔
+LinkedToDolibarrThirdParty=تیسرے فریق سے لنک کریں۔
+CreateDolibarrLogin=ایک صارف بنائیں
+CreateDolibarrThirdParty=تیسری پارٹی بنائیں
+LoginAccountDisableInDolibarr=Dolibarr میں اکاؤنٹ کو غیر فعال کر دیا گیا ہے۔
+UsePersonalValue=ذاتی قدر استعمال کریں۔
+InternalUser=اندرونی صارف
+ExportDataset_user_1=صارفین اور ان کی خصوصیات
+DomainUser=ڈومین صارف %s
+Reactivate=دوبارہ فعال کریں۔
+CreateInternalUserDesc=یہ فارم آپ کو اپنی کمپنی/تنظیم میں داخلی صارف بنانے کی اجازت دیتا ہے۔ ایک بیرونی صارف (کسٹمر، وینڈر وغیرہ ..) بنانے کے لیے، اس تھرڈ پارٹی کے رابطہ کارڈ سے بٹن 'Create Dolibarr User' استعمال کریں۔
+InternalExternalDesc=<b> اندرونی </b> صارف وہ صارف ہے جو آپ کی کمپنی/تنظیم کا حصہ ہے، یا آپ کی تنظیم سے باہر ایک پارٹنر صارف ہے جسے اپنی کمپنی سے متعلق ڈیٹا سے زیادہ ڈیٹا دیکھنے کی ضرورت ہو سکتی ہے (اجازت کا نظام اس بات کی وضاحت کرے گا کہ وہ کیا کر سکتا ہے یا کر سکتا ہے۔ نہیں دیکھتے یا کرتے ہیں)۔ <br> ایک <b> بیرونی </b> صارف ایک گاہک، فروش یا دوسرا ہے جسے صرف اپنے سے متعلق ڈیٹا دیکھنا چاہیے (تیسرے فریق کے لیے بیرونی صارف بنانا تیسرے فریق کے رابطہ ریکارڈ سے کیا جا سکتا ہے)۔ <br> <br> دونوں صورتوں میں، آپ کو ان خصوصیات کے لیے اجازت دینی چاہیے جن کی صارف کو ضرورت ہے۔
+PermissionInheritedFromAGroup=اجازت دی گئی کیونکہ صارف کے گروپ میں سے ایک سے وراثت میں ملی ہے۔
+Inherited=وراثت میں ملی
+UserWillBe=صارف بنایا جائے گا۔
+UserWillBeInternalUser=تخلیق کردہ صارف اندرونی صارف ہوگا (کیونکہ کسی خاص تیسرے فریق سے منسلک نہیں ہے)
+UserWillBeExternalUser=تخلیق کردہ صارف ایک بیرونی صارف ہوگا (کیونکہ کسی تیسرے فریق سے منسلک ہے)
+IdPhoneCaller=آئی ڈی فون کرنے والا
+NewUserCreated=صارف %s بنایا گیا۔
+NewUserPassword=%s کے لیے پاس ورڈ کی تبدیلی
+NewPasswordValidated=آپ کے نئے پاس ورڈ کی توثیق کر دی گئی ہے اور لاگ ان کرنے کے لیے اسے ابھی استعمال کرنا چاہیے۔
+EventUserModified=صارف %s میں ترمیم کی گئی۔
+UserDisabled=صارف %s غیر فعال ہے۔
+UserEnabled=صارف %s کو چالو کر دیا گیا۔
+UserDeleted=صارف %s کو ہٹا دیا گیا۔
+NewGroupCreated=گروپ %s بنایا گیا۔
+GroupModified=گروپ %s میں ترمیم کی گئی۔
+GroupDeleted=گروپ %s ہٹا دیا گیا۔
+ConfirmCreateContact=کیا آپ واقعی اس رابطے کے لیے Dolibarr اکاؤنٹ بنانا چاہتے ہیں؟
+ConfirmCreateLogin=کیا آپ واقعی اس ممبر کے لیے Dolibarr اکاؤنٹ بنانا چاہتے ہیں؟
+ConfirmCreateThirdParty=کیا آپ واقعی اس ممبر کے لیے ایک تھرڈ پارٹی بنانا چاہتے ہیں؟
+LoginToCreate=بنانے کے لیے لاگ ان کریں۔
+NameToCreate=بنانے کے لیے تیسرے فریق کا نام
+YourRole=آپ کے کردار
+YourQuotaOfUsersIsReached=آپ کے فعال صارفین کا کوٹہ پورا ہو گیا ہے!
+NbOfUsers=صارفین کی تعداد
+NbOfPermissions=اجازتوں کی تعداد
+DontDowngradeSuperAdmin=صرف ایک سپر ایڈمن ہی سپر ایڈمن کو نیچے کر سکتا ہے۔
+HierarchicalResponsible=سپروائزر
+HierarchicView=درجہ بندی کا نظارہ
+UseTypeFieldToChange=تبدیل کرنے کے لیے فیلڈ ٹائپ کا استعمال کریں۔
 OpenIDURL=OpenID URL
-LoginUsingOpenID=Use OpenID to login
-WeeklyHours=Hours worked (per week)
-ExpectedWorkedHours=Expected hours worked per week
-ColorUser=Color of the user
-DisabledInMonoUserMode=Disabled in maintenance mode
-UserAccountancyCode=User accounting code
-UserLogoff=User logout
-UserLogged=User logged
-DateOfEmployment=Employment date
-DateEmployment=Employment
-DateEmploymentstart=Employment Start Date
-DateEmploymentEnd=Employment End Date
-RangeOfLoginValidity=Access validity date range
-CantDisableYourself=You can't disable your own user record
-ForceUserExpenseValidator=Force expense report validator
-ForceUserHolidayValidator=Force leave request validator
-ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
-UserPersonalEmail=Personal email
-UserPersonalMobile=Personal mobile phone
-WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
+LoginUsingOpenID=لاگ ان کرنے کے لیے OpenID استعمال کریں۔
+WeeklyHours=کام کے گھنٹے (فی ہفتہ)
+ExpectedWorkedHours=متوقع گھنٹے فی ہفتہ کام کیا۔
+ColorUser=صارف کا رنگ
+DisabledInMonoUserMode=دیکھ بھال کے موڈ میں غیر فعال
+UserAccountancyCode=صارف اکاؤنٹنگ کوڈ
+UserLogoff=صارف لاگ آؤٹ
+UserLogged=صارف لاگ ان
+DateOfEmployment=ملازمت کی تاریخ
+DateEmployment=روزگار
+DateEmploymentstart=ملازمت شروع ہونے کی تاریخ
+DateEmploymentEnd=ملازمت کی آخری تاریخ
+RangeOfLoginValidity=رسائی کی درستگی کی تاریخ کی حد
+CantDisableYourself=آپ اپنے صارف کے ریکارڈ کو غیر فعال نہیں کر سکتے
+ForceUserExpenseValidator=زبردستی اخراجات کی رپورٹ کی توثیق کرنے والا
+ForceUserHolidayValidator=جبری چھٹی کی درخواست کی تصدیق کنندہ
+ValidatorIsSupervisorByDefault=پہلے سے طے شدہ طور پر، تصدیق کنندہ صارف کا نگران ہوتا ہے۔ اس رویے کو برقرار رکھنے کے لیے خالی رکھیں۔
+UserPersonalEmail=ذاتی ای میل
+UserPersonalMobile=ذاتی موبائل فون
+WarningNotLangOfInterface=تنبیہ، یہ وہ مرکزی زبان ہے جو صارف بولتا ہے، نہ کہ اس انٹرفیس کی زبان جسے دیکھنے کے لیے اس نے چنا ہے۔ اس صارف کے ذریعے نظر آنے والی انٹرفیس کی زبان کو تبدیل کرنے کے لیے، %s ٹیب پر جائیں
diff --git a/htdocs/langs/ur_PK/website.lang b/htdocs/langs/ur_PK/website.lang
index 2bf46e63e9d..c9cce686375 100644
--- a/htdocs/langs/ur_PK/website.lang
+++ b/htdocs/langs/ur_PK/website.lang
@@ -1,147 +1,147 @@
 # Dolibarr language file - Source file is en_US - website
-Shortname=Code
-WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
-DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
-WEBSITE_TYPE_CONTAINER=Type of page/container
-WEBSITE_PAGE_EXAMPLE=Web page to use as example
-WEBSITE_PAGENAME=Page name/alias
-WEBSITE_ALIASALT=Alternative page names/aliases
-WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
-WEBSITE_CSS_URL=URL of external CSS file
-WEBSITE_CSS_INLINE=CSS file content (common to all pages)
-WEBSITE_JS_INLINE=Javascript file content (common to all pages)
-WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
-WEBSITE_ROBOT=Robot file (robots.txt)
-WEBSITE_HTACCESS=Website .htaccess file
-WEBSITE_MANIFEST_JSON=Website manifest.json file
-WEBSITE_README=README.md file
-WEBSITE_KEYWORDSDesc=Use a comma to separate values
-EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
-HtmlHeaderPage=HTML header (specific to this page only)
-PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
-EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
-MediaFiles=Media library
-EditCss=Edit website properties
-EditMenu=Edit menu
-EditMedias=Edit medias
-EditPageMeta=Edit page/container properties
-EditInLine=Edit inline
-AddWebsite=Add website
-Webpage=Web page/container
-AddPage=Add page/container
-PageContainer=Page
-PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
-RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
-SiteDeleted=Web site '%s' deleted
-PageContent=Page/Contenair
-PageDeleted=Page/Contenair '%s' of website %s deleted
-PageAdded=Page/Contenair '%s' added
-ViewSiteInNewTab=View site in new tab
-ViewPageInNewTab=View page in new tab
-SetAsHomePage=Set as Home page
-RealURL=Real URL
-ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
-ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
-YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
-YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank" rel="noopener noreferrer external">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
-ReadPerm=Read
-WritePerm=Write
-TestDeployOnWeb=Test/deploy on web
-PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
-VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
-NoPageYet=No pages yet
-YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
-SyntaxHelp=Help on specific syntax tips
-YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+Shortname=کوڈ
+WebsiteSetupDesc=یہاں وہ ویب سائٹس بنائیں جو آپ استعمال کرنا چاہتے ہیں۔ پھر ان میں ترمیم کرنے کے لیے مینو ویب سائٹس میں جائیں۔
+DeleteWebsite=ویب سائٹ کو حذف کریں۔
+ConfirmDeleteWebsite=کیا آپ واقعی اس ویب سائٹ کو حذف کرنا چاہتے ہیں؟ اس کے تمام صفحات اور مواد کو بھی ہٹا دیا جائے گا۔ اپ لوڈ کی گئی فائلیں (جیسے میڈیا ڈائرکٹری، ECM ماڈیول، ...) باقی رہیں گی۔
+WEBSITE_TYPE_CONTAINER=صفحہ/کنٹینر کی قسم
+WEBSITE_PAGE_EXAMPLE=مثال کے طور پر استعمال کرنے کے لیے ویب صفحہ
+WEBSITE_PAGENAME=صفحہ کا نام/عرف
+WEBSITE_ALIASALT=صفحہ کے متبادل نام/عرف
+WEBSITE_ALIASALTDesc=یہاں دوسرے نام/عرفوں کی فہرست استعمال کریں تاکہ صفحہ تک ان دیگر ناموں/عرفوں کا استعمال کرتے ہوئے بھی رسائی حاصل کی جا سکے (مثال کے طور پر پرانے لنک/نام پر بیک لنک کو کام کرنے کے لیے عرف کا نام تبدیل کرنے کے بعد پرانا نام)۔ نحو ہے: <br> متبادل نام1، متبادل نام2، ...
+WEBSITE_CSS_URL=بیرونی CSS فائل کا URL
+WEBSITE_CSS_INLINE=CSS فائل کا مواد (تمام صفحات پر عام)
+WEBSITE_JS_INLINE=جاوا اسکرپٹ فائل کا مواد (تمام صفحات پر عام)
+WEBSITE_HTML_HEADER=HTML ہیڈر کے نیچے اضافہ (تمام صفحات پر عام)
+WEBSITE_ROBOT=روبوٹ فائل (robots.txt)
+WEBSITE_HTACCESS=ویب سائٹ .htaccess فائل
+WEBSITE_MANIFEST_JSON=ویب سائٹ manifest.json فائل
+WEBSITE_README=README.md فائل
+WEBSITE_KEYWORDSDesc=اقدار کو الگ کرنے کے لیے کوما کا استعمال کریں۔
+EnterHereLicenseInformation=README.md فائل کو بھرنے کے لیے یہاں میٹا ڈیٹا یا لائسنس کی معلومات درج کریں۔ اگر آپ اپنی ویب سائٹ کو ٹیمپلیٹ کے طور پر تقسیم کرتے ہیں، تو فائل کو آزمائشی پیکیج میں شامل کیا جائے گا۔
+HtmlHeaderPage=HTML ہیڈر (صرف اس صفحہ کے لیے مخصوص)
+PageNameAliasHelp=صفحہ کا نام یا عرف۔ <br> یہ عرف SEO یو آر ایل بنانے کے لیے بھی استعمال ہوتا ہے جب ویب سائٹ کسی ویب سرور کے ورچوئل ہوسٹ (جیسے Apacke, Nginx, ...) سے چلائی جاتی ہے۔ اس عرف میں ترمیم کرنے کے لیے بٹن "<strong> %s </strong>" استعمال کریں۔
+EditTheWebSiteForACommonHeader=نوٹ: اگر آپ تمام صفحات کے لیے ذاتی نوعیت کے ہیڈر کی وضاحت کرنا چاہتے ہیں تو صفحہ/کنٹینر کے بجائے سائٹ کی سطح پر ہیڈر میں ترمیم کریں۔
+MediaFiles=میڈیا لائبریری
+EditCss=ویب سائٹ کی خصوصیات میں ترمیم کریں۔
+EditMenu=مینو میں ترمیم کریں۔
+EditMedias=میڈیا میں ترمیم کریں۔
+EditPageMeta=صفحہ/کنٹینر کی خصوصیات میں ترمیم کریں۔
+EditInLine=ان لائن میں ترمیم کریں۔
+AddWebsite=ویب سائٹ شامل کریں۔
+Webpage=ویب صفحہ/کنٹینر
+AddPage=صفحہ/کنٹینر شامل کریں۔
+PageContainer=صفحہ
+PreviewOfSiteNotYetAvailable=آپ کی ویب سائٹ <strong> %s </strong> کا پیش نظارہ ابھی تک دستیاب نہیں ہے۔ آپ کو پہلے '<strong> ایک مکمل ویب سائٹ ٹیمپلیٹ </strong> درآمد کرنا ہوگا' یا صرف '<strong> ایک صفحہ/کنٹینر </strong>' شامل کریں۔
+RequestedPageHasNoContentYet=id %s کے ساتھ درخواست کردہ صفحہ پر ابھی تک کوئی مواد نہیں ہے، یا کیش فائل .tpl.php کو ہٹا دیا گیا ہے۔ اس کو حل کرنے کے لیے صفحہ کے مواد میں ترمیم کریں۔
+SiteDeleted=ویب سائٹ '%s' حذف کر دی گئی۔
+PageContent=صفحہ/کونٹینیئر
+PageDeleted=ویب سائٹ %s کا صفحہ/کنٹینیئر '%s' حذف کر دیا گیا
+PageAdded=صفحہ/Contenair '%s' شامل کر دیا گیا۔
+ViewSiteInNewTab=سائٹ کو نئے ٹیب میں دیکھیں
+ViewPageInNewTab=نئے ٹیب میں صفحہ دیکھیں
+SetAsHomePage=ہوم پیج سیٹ کریں
+RealURL=اصلی URL
+ViewWebsiteInProduction=ہوم یو آر ایل کا استعمال کرتے ہوئے ویب سائٹ دیکھیں
+SetHereVirtualHost= اپاچی کے ساتھ <u> استعمال / NGinx / ... </u> <br> آپ کے ویب سرور پر تخلیق کریں (اپاچی، Nginx ...) پی ایچ پی کے ساتھ ایک سرشار مجازی میزبان فعال اور پر ایک روٹ ڈائریکٹری <br> <strong> %s </strong>
+ExampleToUseInApacheVirtualHostConfig=اپاچی ورچوئل ہوسٹ سیٹ اپ میں استعمال کرنے کی مثال:
+YouCanAlsoTestWithPHPS= پر <br> PHP سرایت سرور </u> ساتھ <u> استعمال کے ماحول کی ترقی، آپ <br> <strong> PHP -S 0.0.0.0:8080 -t %s </strong> چلا کر PHP سرایت ویب سرور کے ساتھ سائٹ (PHP 5.5 درکار) کی جانچ کے لیے پسند کر سکتے ہیں
+YouCanAlsoDeployToAnotherWHP= <u> اپنی ویب سائٹ کو کسی اور Dolibarr ہوسٹنگ فراہم کنندہ کے ساتھ چلائیں ویب سائٹ ماڈیول کے ساتھ انضمام۔ آپ کچھ ڈولیبر ہوسٹنگ فراہم کنندگان کی فہرست <a href="https://saas.dolibarr.org" target="_blank" rel="noopener noreferrer external"> https://saas.dolibarr.org </a> پر حاصل کر سکتے ہیں۔
+CheckVirtualHostPerms=یہ بھی چیک کریں کہ ورچوئل ہوسٹ صارف (مثال کے طور پر www-data) کے پاس <strong> <strong> %s </strong> فائلوں پر <br> a0e784394947c80947c08080847cfc9z0 اجازتیں ہیں۔
+ReadPerm=پڑھیں
+WritePerm=لکھیں۔
+TestDeployOnWeb=ویب پر ٹیسٹ/تعینات کریں۔
+PreviewSiteServedByWebServer= <u> ایک نئے ٹیب میں %s کا جائزہ لیں۔ </u> <br> <br> %s ایک بیرونی ویب سرور (جیسے Apache, Nginx, IIS) کے ذریعہ پیش کیا جائے گا۔ آپ کی ڈائریکٹری کی طرف اشارہ کرنے سے پہلے اس سرور انسٹال اور سیٹ اپ کرنا ضروری ہے: <br> <strong> %s </strong> <br> URL بیرونی سرور کی طرف سے خدمات انجام دیں: <br> <strong> %s </strong>
+PreviewSiteServedByDolibarr= <u> ایک نئے ٹیب میں %s کا جائزہ لیں۔ </u> <br> <br> %s Dolibarr سرور کے ذریعہ پیش کیا جائے گا لہذا اسے انسٹال کرنے کے لئے کسی اضافی ویب سرور (جیسے Apache, Nginx, IIS) کی ضرورت نہیں ہے۔ <br> تکلیف یہ ہے کہ صفحات کے یو آر ایل صارف دوست نہیں ہیں اور آپ کے ڈولیبر کے راستے سے شروع ہوتے ہیں۔ <br> URL Dolibarr طرف سے کی خدمت: <br> <strong> %s </strong> <br> اس ویب سائٹ کی خدمت کو اپنے ویب سرور پر ایک مجازی میزبان پیدا کرنے کے لئے آپ کی اپنی بیرونی ویب سرور کا استعمال کرنے کے <br> کہ ڈائریکٹری پر پوائنٹس <br> <strong> %s </strong> <br> پھر اس مجازی سرور کا نام درج کریں اس ویب سائٹ کی خصوصیات میں اور "Test/deploy on the web" کے لنک پر کلک کریں۔
+VirtualHostUrlNotDefined=بیرونی ویب سرور کے ذریعہ پیش کردہ ورچوئل ہوسٹ کا URL متعین نہیں ہے۔
+NoPageYet=ابھی تک کوئی صفحہ نہیں ہے۔
+YouCanCreatePageOrImportTemplate=آپ ایک نیا صفحہ بنا سکتے ہیں یا مکمل ویب سائٹ ٹیمپلیٹ درآمد کر سکتے ہیں۔
+SyntaxHelp=مخصوص نحوی نکات پر مدد کریں۔
+YouCanEditHtmlSourceckeditor=آپ ایڈیٹر میں "ماخذ" بٹن کا استعمال کرتے ہوئے HTML سورس کوڈ میں ترمیم کر سکتے ہیں۔
+YouCanEditHtmlSource= <br> <span class="fa fa-bug"> </span> آپ PHP کوڈ کو اس سورس میں <strong> &lt;?php ?a0010dc درج ذیل عالمی متغیر دستیاب ہیں: $conf، $db، $mysoc، $user، $website، $websitepage، $weblangs، $pagelangs۔ <br> <br> <span class="fa fa-bug"> </span> آپ مندرجہ ذیل نحو کے ساتھ ایک اور صفحہ / کنٹینر کے مواد شامل کر سکتے ہیں:؟ <br> <strong> &lt; PHP includeContainer ( 'alias_of_container_to_include')؛ ؟ &gt; </strong> <br> <br> <span class="fa fa-bug"> </span> آپ مندرجہ ذیل نحو کے ساتھ ایک اور صفحہ / کنٹینر کو ری بنا سکتے ہیں (نوٹ: نہ پیداوار ایک ری سے پہلے کسی بھی مواد کو ایسا): <br> <strong> &lt; PHP redirectToContainer ( 'alias_of_container_to_redirect_to')؛ ؟ &gt; </strong> <br> <br> <span class="fa fa-link"> </span>، ایک اور صفحے پر ایک لنک شامل کرنے کے لئے نحو کا استعمال: <strong> دستاویزات میں ذخیرہ کردہ فائل </strong> لوڈ کرنے کے لئے ایک <strong> لنک شامل کرنا <br> <strong> &lt;a href کی = "alias_of_page_to_link_to.php" &gt;mylink&lt;a&gt; </strong> <br> <br> <span class="fa fa-download"> </span> </strong> ڈائریکٹری، <strong> document.php </strong> چادر استعمال: دستاویزات / ECM میں ایک فائل کے لئے، <br> مثال (لاگ ان کرنے کی ضرورت ہے)، نحو ہے؟ <br> <strong> &lt;a href کی = "/ document.php modulepart = ECM & فائل = [relative_dir / فائل کا نام "/document.php؟modulepart=medias&file=[relative_dir/]filename.ext"&gt; </strong> <br> ایک حصہ لنک (فائل کے اشتراک کا ہیش کلید کا استعمال کرتے ہوئے کھلی رسائی) کے ساتھ اشتراک ایک فائل کے طور پر، نحو ہے: <br> <strong> &lt;a href کی =" (دستاویزات / میڈیاز میں ایک تصویر کے طور پر، <br> مثال کھلے: /document.php؟hashp=publicsharekeyoffile"&gt; </strong> <br> <br> <span class="fa fa-picture-o"> ڈائریکٹری </strong> <strong> دستاویزات میں ذخیرہ کردہ ایک <strong> تصویر </strong> <strong> viewimage.php </strong> چادر استعمال کرتے ہیں، شامل کرنے کے لئے </span> عوامی رسائی کے لئے ڈائریکٹری)، نحو ہے: <br> <strong> &lt;img ایسآرسی = "؟ / viewimage.php modulepart = medias&amp;file = [relative_dir /] filename.ext" &gt; </strong> <br>
 #YouCanEditHtmlSource2=<br><span class="fa fa-picture-o"></span> To include a <strong>image</strong> shared publicaly, use the <strong>viewimage.php</strong> wrapper:<br>Example with a shared key 123456789, syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
-YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
-YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank" rel="noopener noreferrer external">the wiki documentation</a><br>.
-ClonePage=Clone page/container
-CloneSite=Clone site
-SiteAdded=Website added
-ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
-PageIsANewTranslation=The new page is a translation of the current page ?
-LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
-ParentPageId=Parent page ID
-WebsiteId=Website ID
-CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
-OrEnterPageInfoManually=Or create page from scratch or from a page template...
-FetchAndCreate=Fetch and Create
-ExportSite=Export website
-ImportSite=Import website template
-IDOfPage=Id of page
-Banner=Banner
-BlogPost=Blog post
-WebsiteAccount=Website account
-WebsiteAccounts=Website accounts
-AddWebsiteAccount=Create web site account
-BackToListForThirdParty=Back to list for the third-party
-DisableSiteFirst=Disable website first
-MyContainerTitle=My web site title
-AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
-SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
-YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting javascript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor may not works correclty when used on a grabbed external page.
-OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
-GrabImagesInto=Grab also images found into css and page.
-ImagesShouldBeSavedInto=Images should be saved into directory
-WebsiteRootOfImages=Root directory for website images
-SubdirOfPage=Sub-directory dedicated to page
-AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
-CorporateHomePage=Corporate Home page
-EmptyPage=Empty page
-ExternalURLMustStartWithHttp=External URL must start with http:// or https://
-ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
-ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Show dynamic content
-InternalURLOfPage=Internal URL of page
-ThisPageIsTranslationOf=This page/container is a translation of
-ThisPageHasTranslationPages=This page/container has translation
-NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
-GoTo=Go to
-DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
-NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
-ReplaceWebsiteContent=Search or Replace website content
-DeleteAlsoJs=Delete also all javascript files specific to this website?
-DeleteAlsoMedias=Delete also all medias files specific to this website?
-MyWebsitePages=My website pages
-SearchReplaceInto=Search | Replace into
-ReplaceString=New string
-CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
-LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
-Dynamiccontent=Sample of a page with dynamic content
-ImportSite=Import website template
-EditInLineOnOff=Mode 'Edit inline' is %s
-ShowSubContainersOnOff=Mode to execute 'dynamic content' is %s
-GlobalCSSorJS=Global CSS/JS/Header file of web site
-BackToHomePage=Back to home page...
-TranslationLinks=Translation links
-YouTryToAccessToAFileThatIsNotAWebsitePage=You try to access to a page that is not available.<br>(ref=%s, type=%s, status=%s)
-UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 characters
-MainLanguage=Main language
-OtherLanguages=Other languages
-UseManifest=Provide a manifest.json file
-PublicAuthorAlias=Public author alias
-AvailableLanguagesAreDefinedIntoWebsiteProperties=Available languages are defined into website properties
-ReplacementDoneInXPages=Replacement done in %s pages or containers
-RSSFeed=RSS Feed
-RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
-PagesRegenerated=%s page(s)/container(s) regenerated
-RegenerateWebsiteContent=Regenerate web site cache files
-AllowedInFrames=Allowed in Frames
-DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
-GenerateSitemaps=Generate website sitemap file
-ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
-ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap file <b>%s</b> generated
-ImportFavicon=Favicon
-ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
-FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
+YouCanEditHtmlSource2=شیئر لنک کے ساتھ شیئر کردہ تصویر کے لیے (فائل کی شیئرنگ ہیش کلید کا استعمال کرتے ہوئے کھلی رسائی)، نحو یہ ہے: <br> <strong> &lt;img src="/viewimage.php?hashp=1234256a...20120ccd07800d50d50d50d5080cd57800mg
+YouCanEditHtmlSourceMore= <br> HTML یا متحرک کوڈ کی مزید مثالیں <a href="%s" target="_blank" rel="noopener noreferrer external"> پر دستیاب ہیں ویکی دستاویزات </a> <br> ۔
+ClonePage=کلون صفحہ/کنٹینر
+CloneSite=کلون سائٹ
+SiteAdded=ویب سائٹ شامل کی گئی۔
+ConfirmClonePage=براہ کرم نئے صفحہ کا کوڈ/عرف درج کریں اور اگر یہ کلون شدہ صفحہ کا ترجمہ ہے۔
+PageIsANewTranslation=نیا صفحہ موجودہ صفحہ کا ترجمہ ہے؟
+LanguageMustNotBeSameThanClonedPage=آپ ترجمہ کے طور پر ایک صفحہ کلون کرتے ہیں۔ نئے صفحہ کی زبان ماخذ صفحہ کی زبان سے مختلف ہونی چاہیے۔
+ParentPageId=پیرنٹ پیج ID
+WebsiteId=ویب سائٹ کی شناخت
+CreateByFetchingExternalPage=بیرونی URL سے صفحہ بازیافت کرکے صفحہ/کنٹینر بنائیں...
+OrEnterPageInfoManually=یا شروع سے یا صفحہ ٹیمپلیٹ سے صفحہ بنائیں...
+FetchAndCreate=بازیافت کریں اور بنائیں
+ExportSite=ویب سائٹ برآمد کریں۔
+ImportSite=ویب سائٹ ٹیمپلیٹ درآمد کریں۔
+IDOfPage=صفحہ کی شناخت
+Banner=بینر
+BlogPost=بلاگ پوسٹ
+WebsiteAccount=ویب سائٹ اکاؤنٹ
+WebsiteAccounts=ویب سائٹ اکاؤنٹس
+AddWebsiteAccount=ویب سائٹ اکاؤنٹ بنائیں
+BackToListForThirdParty=تیسرے فریق کی فہرست پر واپس جائیں۔
+DisableSiteFirst=پہلے ویب سائٹ کو غیر فعال کریں۔
+MyContainerTitle=میری ویب سائٹ کا عنوان
+AnotherContainer=دوسرے صفحہ/کنٹینر کے مواد کو شامل کرنے کا طریقہ یہ ہے (اگر آپ ڈائنامک کوڈ کو فعال کرتے ہیں تو آپ کو یہاں غلطی ہو سکتی ہے کیونکہ ایمبیڈڈ سب کنٹینر موجود نہیں ہو سکتا ہے)
+SorryWebsiteIsCurrentlyOffLine=معذرت، یہ ویب سائٹ فی الحال آف لائن ہے۔ براہ کرم بعد میں واپس آئیں...
+WEBSITE_USE_WEBSITE_ACCOUNTS=ویب سائٹ اکاؤنٹ ٹیبل کو فعال کریں۔
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=ہر ویب سائٹ / تیسرے فریق کے لیے ویب سائٹ اکاؤنٹس (لاگ ان/پاس) ذخیرہ کرنے کے لیے ٹیبل کو فعال کریں۔
+YouMustDefineTheHomePage=آپ کو پہلے ڈیفالٹ ہوم پیج کی وضاحت کرنی ہوگی۔
+OnlyEditionOfSourceForGrabbedContentFuture=انتباہ: ایک بیرونی ویب صفحہ درآمد کرکے ویب صفحہ بنانا تجربہ کار صارفین کے لیے مخصوص ہے۔ ماخذ صفحہ کی پیچیدگی پر منحصر ہے، درآمد کا نتیجہ اصل سے مختلف ہو سکتا ہے۔ نیز اگر سورس پیج عام سی ایس ایس اسٹائلز یا متضاد جاوا اسکرپٹ استعمال کرتا ہے، تو اس صفحہ پر کام کرتے وقت یہ ویب سائٹ ایڈیٹر کی شکل یا خصوصیات کو توڑ سکتا ہے۔ یہ طریقہ صفحہ بنانے کا ایک تیز ترین طریقہ ہے لیکن یہ تجویز کیا جاتا ہے کہ آپ اپنا نیا صفحہ شروع سے یا تجویز کردہ صفحہ ٹیمپلیٹ سے بنائیں۔ <br> یہ بھی نوٹ کریں کہ جب پکڑے گئے بیرونی صفحہ پر استعمال کیا جائے تو ان لائن ایڈیٹر درست طریقے سے کام نہیں کر سکتا۔
+OnlyEditionOfSourceForGrabbedContent=HTML ماخذ کا صرف ایڈیشن ہی ممکن ہے جب مواد کسی بیرونی سائٹ سے پکڑا گیا ہو۔
+GrabImagesInto=سی ایس ایس اور صفحہ میں پائی جانے والی تصاویر کو بھی پکڑو۔
+ImagesShouldBeSavedInto=تصاویر کو ڈائریکٹری میں محفوظ کیا جانا چاہیے۔
+WebsiteRootOfImages=ویب سائٹ کی تصاویر کے لیے روٹ ڈائرکٹری
+SubdirOfPage=ذیلی ڈائرکٹری صفحہ کے لیے وقف ہے۔
+AliasPageAlreadyExists=عرفی صفحہ <strong> %s </strong> پہلے سے موجود ہے
+CorporateHomePage=کارپوریٹ ہوم پیج
+EmptyPage=خالی صفحہ
+ExternalURLMustStartWithHttp=بیرونی URL کا آغاز http:// یا https:// سے ہونا چاہیے
+ZipOfWebsitePackageToImport=ویب سائٹ ٹیمپلیٹ پیکج کی زپ فائل اپ لوڈ کریں۔
+ZipOfWebsitePackageToLoad=یا ایک دستیاب ایمبیڈڈ ویب سائٹ ٹیمپلیٹ پیکیج کا انتخاب کریں۔
+ShowSubcontainers=متحرک مواد دکھائیں۔
+InternalURLOfPage=صفحہ کا اندرونی URL
+ThisPageIsTranslationOf=یہ صفحہ/کنٹینر کا ترجمہ ہے۔
+ThisPageHasTranslationPages=اس صفحہ/کنٹینر میں ترجمہ ہے۔
+NoWebSiteCreateOneFirst=ابھی تک کوئی ویب سائٹ نہیں بنائی گئی۔ پہلے ایک بنائیں۔
+GoTo=کے پاس جاؤ
+DynamicPHPCodeContainsAForbiddenInstruction=آپ ڈائنامک پی ایچ پی کوڈ شامل کرتے ہیں جس میں پی ایچ پی انسٹرکشن '<strong> %s </strong>' شامل ہوتا ہے جو بطور ڈیفالٹ ممنوع ہوتا ہے بطور ڈائنامک مواد (دیکھیں پوشیدہ آپشنز آف کمانڈ پی ایچ پی_ایل ایکس ایکس کی اجازت دی گئی فہرست WELOBS_XX کو بڑھانے کے لیے)۔
+NotAllowedToAddDynamicContent=آپ کو ویب سائٹس میں پی ایچ پی کے متحرک مواد کو شامل یا ترمیم کرنے کی اجازت نہیں ہے۔ اجازت طلب کریں یا صرف کوڈ کو پی ایچ پی ٹیگز میں غیر ترمیم شدہ رکھیں۔
+ReplaceWebsiteContent=ویب سائٹ کا مواد تلاش کریں یا تبدیل کریں۔
+DeleteAlsoJs=اس ویب سائٹ سے متعلق تمام جاوا اسکرپٹ فائلوں کو بھی حذف کریں؟
+DeleteAlsoMedias=اس ویب سائٹ سے متعلق تمام میڈیا فائلوں کو بھی حذف کریں؟
+MyWebsitePages=میری ویب سائٹ کے صفحات
+SearchReplaceInto=تلاش کریں | میں تبدیل کریں۔
+ReplaceString=نئی تار
+CSSContentTooltipHelp=یہاں CSS مواد درج کریں۔ ایپلیکیشن کے CSS کے ساتھ کسی بھی تنازعہ سے بچنے کے لیے، تمام ڈیکلریشن کو .bodywebsite کلاس کے ساتھ شامل کرنا یقینی بنائیں۔ مثال کے طور پر: <br> <br> #mycssselector، input.myclass: ہور {...} <br> نوٹ <br>: ہور {...} <br> <br> .bodywebsite #mycssselector، .bodywebsite input.myclass ہونا ضروری ہے آپ کے بغیر ایک بڑی فائل ہے تو یہ سابقہ، آپ اسے تبدیل کرنے کے لیے 'lessc' استعمال کر سکتے ہیں تاکہ ہر جگہ .bodywebsite کا سابقہ شامل کر سکیں۔
+LinkAndScriptsHereAreNotLoadedInEditor=انتباہ: یہ مواد صرف اس وقت آؤٹ پٹ ہوتا ہے جب سرور سے سائٹ تک رسائی حاصل کی جاتی ہے۔ یہ ایڈٹ موڈ میں استعمال نہیں ہوتا ہے لہذا اگر آپ کو جاوا اسکرپٹ فائلوں کو ایڈٹ موڈ میں بھی لوڈ کرنے کی ضرورت ہے تو صرف صفحہ میں اپنا ٹیگ 'script src=...' شامل کریں۔
+Dynamiccontent=متحرک مواد والے صفحہ کا نمونہ
+ImportSite=ویب سائٹ ٹیمپلیٹ درآمد کریں۔
+EditInLineOnOff=موڈ 'ان لائن میں ترمیم کریں' %s ہے۔
+ShowSubContainersOnOff='متحرک مواد' کو انجام دینے کا طریقہ %s ہے۔
+GlobalCSSorJS=ویب سائٹ کی گلوبل CSS/JS/ہیڈر فائل
+BackToHomePage=ہوم پیج پر واپس...
+TranslationLinks=ترجمہ لنکس
+YouTryToAccessToAFileThatIsNotAWebsitePage=آپ کسی ایسے صفحہ تک رسائی حاصل کرنے کی کوشش کرتے ہیں جو دستیاب نہیں ہے۔ <br> (ref=%s, type=%s, status=%s)
+UseTextBetween5And70Chars=SEO کے اچھے طریقوں کے لیے، 5 اور 70 حروف کے درمیان متن استعمال کریں۔
+MainLanguage=مرکزی زبان
+OtherLanguages=دوسری زبانیں
+UseManifest=manifest.json فائل فراہم کریں۔
+PublicAuthorAlias=عوامی مصنف عرف
+AvailableLanguagesAreDefinedIntoWebsiteProperties=دستیاب زبانوں کو ویب سائٹ کی خصوصیات میں بیان کیا گیا ہے۔
+ReplacementDoneInXPages=تبدیلی %s صفحات یا کنٹینرز میں کی گئی ہے۔
+RSSFeed=آر ایس ایس فیڈ
+RSSFeedDesc=آپ اس URL کا استعمال کرتے ہوئے 'blogpost' کی قسم کے ساتھ تازہ ترین مضامین کی RSS فیڈ حاصل کر سکتے ہیں۔
+PagesRegenerated=%s صفحہ/کنٹینر دوبارہ تیار کیا گیا
+RegenerateWebsiteContent=ویب سائٹ کیش فائلوں کو دوبارہ تخلیق کریں۔
+AllowedInFrames=فریموں میں اجازت ہے۔
+DefineListOfAltLanguagesInWebsiteProperties=ویب سائٹ کی خصوصیات میں تمام دستیاب زبانوں کی فہرست کی وضاحت کریں۔
+GenerateSitemaps=ویب سائٹ کا نقشہ فائل بنائیں
+ConfirmGenerateSitemaps=اگر آپ تصدیق کرتے ہیں، تو آپ موجودہ سائٹ میپ فائل کو مٹا دیں گے...
+ConfirmSitemapsCreation=سائٹ کا نقشہ تیار کرنے کی تصدیق کریں۔
+SitemapGenerated=سائٹ کا نقشہ فائل <b> %s </b> تیار کیا گیا
+ImportFavicon=فیویکان
+ErrorFaviconType=Favicon png ہونا چاہیے۔
+ErrorFaviconSize=فیویکن کا سائز 16x16، 32x32 یا 64x64 ہونا چاہیے۔
+FaviconTooltip=ایک تصویر اپ لوڈ کریں جس کا png ہونا ضروری ہے (16x16، 32x32 یا 64x64)
diff --git a/htdocs/langs/ur_PK/withdrawals.lang b/htdocs/langs/ur_PK/withdrawals.lang
index f5a33b78eee..11f9cc76b26 100644
--- a/htdocs/langs/ur_PK/withdrawals.lang
+++ b/htdocs/langs/ur_PK/withdrawals.lang
@@ -1,154 +1,156 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Payments by Direct debit orders
-SuppliersStandingOrdersArea=Payments by Credit transfer
-StandingOrdersPayment=Direct debit payment orders
-StandingOrderPayment=Direct debit payment order
-NewStandingOrder=New direct debit order
-NewPaymentByBankTransfer=New payment by credit transfer
-StandingOrderToProcess=To process
-PaymentByBankTransferReceipts=Credit transfer orders
-PaymentByBankTransferLines=Credit transfer order lines
-WithdrawalsReceipts=Direct debit orders
-WithdrawalReceipt=Direct debit order
-BankTransferReceipts=Credit transfer orders
-BankTransferReceipt=Credit transfer order
-LatestBankTransferReceipts=Latest %s credit transfer orders
-LastWithdrawalReceipts=Latest %s direct debit files
-WithdrawalsLine=Direct debit order line
-CreditTransferLine=Credit transfer line
-WithdrawalsLines=Direct debit order lines
-CreditTransferLines=Credit transfer lines
-RequestStandingOrderToTreat=Requests for direct debit payment order to process
-RequestStandingOrderTreated=Requests for direct debit payment order processed
-RequestPaymentsByBankTransferToTreat=Requests for credit transfer to process
-RequestPaymentsByBankTransferTreated=Requests for credit transfer processed
-NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
-NbOfInvoiceToWithdraw=No. of qualified customer invoices with waiting direct debit order
-NbOfInvoiceToWithdrawWithInfo=No. of customer invoice with direct debit payment orders having defined bank account information
-NbOfInvoiceToPayByBankTransfer=No. of qualified supplier invoices waiting for a payment by credit transfer
-SupplierInvoiceWaitingWithdraw=Vendor invoice waiting for payment by credit transfer
-InvoiceWaitingWithdraw=Invoice waiting for direct debit
-InvoiceWaitingPaymentByBankTransfer=Invoice waiting for credit transfer
-AmountToWithdraw=Amount to withdraw
-NoInvoiceToWithdraw=No invoice open for '%s' is waiting. Go on tab '%s' on invoice card to make a request.
-NoSupplierInvoiceToWithdraw=No supplier invoice with open 'Direct credit requests' is waiting. Go on tab '%s' on invoice card to make a request.
-ResponsibleUser=User Responsible
-WithdrawalsSetup=Direct debit payment setup
-CreditTransferSetup=Credit transfer setup
-WithdrawStatistics=Direct debit payment statistics
-CreditTransferStatistics=Credit transfer statistics
-Rejects=Rejects
-LastWithdrawalReceipt=Latest %s direct debit receipts
-MakeWithdrawRequest=Make a direct debit payment request
-MakeBankTransferOrder=Make a credit transfer request
-WithdrawRequestsDone=%s direct debit payment requests recorded
-BankTransferRequestsDone=%s credit transfer requests recorded
-ThirdPartyBankCode=Third-party bank code
-NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
-WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
-ClassCredited=Classify credited
-ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
-TransData=Transmission date
-TransMetod=Transmission method
-Send=Send
-Lines=Lines
-StandingOrderReject=Issue a rejection
-WithdrawsRefused=Direct debit refused
-WithdrawalRefused=Withdrawal refused
-CreditTransfersRefused=Credit transfers refused
-WithdrawalRefusedConfirm=Are you sure you want to enter a withdrawal rejection for society
-RefusedData=Date of rejection
-RefusedReason=Reason for rejection
-RefusedInvoicing=Billing the rejection
-NoInvoiceRefused=Do not charge the rejection
-InvoiceRefused=Invoice refused (Charge the rejection to customer)
-StatusDebitCredit=Status debit/credit
-StatusWaiting=Waiting
-StatusTrans=Sent
-StatusDebited=Debited
-StatusCredited=Credited
-StatusPaid=Paid
-StatusRefused=Refused
-StatusMotif0=Unspecified
-StatusMotif1=Insufficient funds
-StatusMotif2=Request contested
-StatusMotif3=No direct debit payment order
-StatusMotif4=Sales Order
-StatusMotif5=RIB unusable
-StatusMotif6=Account without balance
-StatusMotif7=Judicial Decision
-StatusMotif8=Other reason
-CreateForSepaFRST=Create direct debit file (SEPA FRST)
-CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
-CreateAll=Create direct debit file
-CreateFileForPaymentByBankTransfer=Create file for credit transfer
-CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
-CreateGuichet=Only office
-CreateBanque=Only bank
-OrderWaiting=Waiting for treatment
-NotifyTransmision=Record file transmission of order
-NotifyCredit=Record credit of order
-NumeroNationalEmetter=National Transmitter Number
-WithBankUsingRIB=For bank accounts using RIB
-WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
-BankToReceiveWithdraw=Receiving Bank Account
-BankToPayCreditTransfer=Bank Account used as source of payments
-CreditDate=Credit on
-WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
-ShowWithdraw=Show Direct Debit Order
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Debit order file
-CreditTransferFile=Credit transfer file
-SetToStatusSent=Set to status "File Sent"
-ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
-StatisticsByLineStatus=Statistics by status of lines
+CustomersStandingOrdersArea=براہ راست ڈیبٹ آرڈرز کے ذریعے ادائیگی
+SuppliersStandingOrdersArea=کریڈٹ ٹرانسفر کے ذریعے ادائیگی
+StandingOrdersPayment=براہ راست ڈیبٹ ادائیگی کے احکامات
+StandingOrderPayment=براہ راست ڈیبٹ ادائیگی کا آرڈر
+NewStandingOrder=نیا ڈائریکٹ ڈیبٹ آرڈر
+NewPaymentByBankTransfer=کریڈٹ ٹرانسفر کے ذریعے نئی ادائیگی
+StandingOrderToProcess=عمل کے لئے
+PaymentByBankTransferReceipts=کریڈٹ ٹرانسفر آرڈرز
+PaymentByBankTransferLines=کریڈٹ ٹرانسفر آرڈر لائنز
+WithdrawalsReceipts=براہ راست ڈیبٹ آرڈرز
+WithdrawalReceipt=براہ راست ڈیبٹ آرڈر
+BankTransferReceipts=کریڈٹ ٹرانسفر آرڈرز
+BankTransferReceipt=کریڈٹ ٹرانسفر آرڈر
+LatestBankTransferReceipts=تازہ ترین %s کریڈٹ ٹرانسفر آرڈرز
+LastWithdrawalReceipts=تازہ ترین %s ڈائریکٹ ڈیبٹ فائلیں۔
+WithdrawalsLine=ڈائریکٹ ڈیبٹ آرڈر لائن
+CreditTransfer=Credit transfer
+CreditTransferLine=کریڈٹ ٹرانسفر لائن
+WithdrawalsLines=ڈائریکٹ ڈیبٹ آرڈر لائنز
+CreditTransferLines=کریڈٹ ٹرانسفر لائنز
+RequestStandingOrderToTreat=کارروائی کے لیے براہ راست ڈیبٹ ادائیگی کے آرڈر کی درخواستیں۔
+RequestStandingOrderTreated=براہ راست ڈیبٹ ادائیگی کے آرڈر کی درخواستوں پر کارروائی ہو گئی۔
+RequestPaymentsByBankTransferToTreat=عمل میں کریڈٹ کی منتقلی کی درخواستیں۔
+RequestPaymentsByBankTransferTreated=کریڈٹ ٹرانسفر کی درخواستوں پر کارروائی ہو گئی۔
+NotPossibleForThisStatusOfWithdrawReceiptORLine=ابھی تک ممکن نہیں۔ مخصوص خطوط پر مسترد ہونے کا اعلان کرنے سے پہلے واپسی کی حیثیت کو 'کریڈیٹڈ' پر سیٹ کرنا ضروری ہے۔
+NbOfInvoiceToWithdraw=براہ راست ڈیبٹ آرڈر کے انتظار کے ساتھ اہل کسٹمر انوائسز کی تعداد
+NbOfInvoiceToWithdrawWithInfo=بینک اکاؤنٹ کی معلومات کے ساتھ براہ راست ڈیبٹ ادائیگی کے آرڈر کے ساتھ کسٹمر انوائس کی تعداد
+NbOfInvoiceToPayByBankTransfer=کریڈٹ ٹرانسفر کے ذریعے ادائیگی کا انتظار کرنے والے کوالیفائیڈ سپلائر انوائسز کی تعداد
+SupplierInvoiceWaitingWithdraw=وینڈر انوائس کریڈٹ ٹرانسفر کے ذریعے ادائیگی کا انتظار کر رہا ہے۔
+InvoiceWaitingWithdraw=انوائس براہ راست ڈیبٹ کا انتظار کر رہا ہے۔
+InvoiceWaitingPaymentByBankTransfer=انوائس کریڈٹ ٹرانسفر کا انتظار کر رہی ہے۔
+AmountToWithdraw=واپس لینے کی رقم
+NoInvoiceToWithdraw='%s' کے لیے کھلا کوئی رسید انتظار نہیں کر رہا ہے۔ درخواست کرنے کے لیے انوائس کارڈ پر ٹیب '%s' پر جائیں۔
+NoSupplierInvoiceToWithdraw=کھلی 'براہ راست کریڈٹ کی درخواستوں' کے ساتھ کوئی سپلائر انوائس انتظار نہیں کر رہا ہے۔ درخواست کرنے کے لیے انوائس کارڈ پر ٹیب '%s' پر جائیں۔
+ResponsibleUser=صارف ذمہ دار
+WithdrawalsSetup=براہ راست ڈیبٹ ادائیگی کا سیٹ اپ
+CreditTransferSetup=کریڈٹ ٹرانسفر سیٹ اپ
+WithdrawStatistics=براہ راست ڈیبٹ ادائیگی کے اعدادوشمار
+CreditTransferStatistics=کریڈٹ ٹرانسفر کے اعدادوشمار
+Rejects=رد کرتا ہے۔
+LastWithdrawalReceipt=تازہ ترین %s براہ راست ڈیبٹ رسیدیں۔
+MakeWithdrawRequest=براہ راست ڈیبٹ ادائیگی کی درخواست کریں۔
+MakeBankTransferOrder=کریڈٹ ٹرانسفر کی درخواست کریں۔
+WithdrawRequestsDone=%s براہ راست ڈیبٹ ادائیگی کی درخواستیں ریکارڈ کی گئیں۔
+BankTransferRequestsDone=%s کریڈٹ ٹرانسفر کی درخواستیں ریکارڈ کی گئیں۔
+ThirdPartyBankCode=تھرڈ پارٹی بینک کوڈ
+NoInvoiceCouldBeWithdrawed=کوئی انوائس کامیابی سے ڈیبٹ نہیں ہوئی۔ چیک کریں کہ رسیدیں ایک درست IBAN والی کمپنیوں پر ہیں اور IBAN کے پاس UMR (منفرد مینڈیٹ حوالہ) ہے <strong> %s </strong> موڈ کے ساتھ۔
+WithdrawalCantBeCreditedTwice=یہ واپسی کی رسید پہلے ہی بطور کریڈٹ نشان زد ہے۔ یہ دو بار نہیں کیا جا سکتا، کیونکہ اس سے ممکنہ طور پر ڈپلیکیٹ ادائیگیاں اور بینک اندراجات پیدا ہوں گے۔
+ClassCredited=درجہ بندی کریڈٹ
+ClassDebited=Classify debited
+ClassCreditedConfirm=کیا آپ واقعی اس رقم نکلوانے کی رسید کو اپنے بینک اکاؤنٹ میں کریڈٹ کے طور پر درجہ بندی کرنا چاہتے ہیں؟
+TransData=ترسیل کی تاریخ
+TransMetod=ترسیل کا طریقہ
+Send=بھیجیں
+Lines=لکیریں
+StandingOrderReject=ایک مسترد جاری کریں۔
+WithdrawsRefused=براہ راست ڈیبٹ سے انکار کر دیا۔
+WithdrawalRefused=واپس لینے سے انکار کر دیا۔
+CreditTransfersRefused=کریڈٹ ٹرانسفر سے انکار کر دیا گیا۔
+WithdrawalRefusedConfirm=کیا آپ کو یقین ہے کہ آپ سوسائٹی کے لیے واپسی کا ردِ عمل درج کرنا چاہتے ہیں؟
+RefusedData=مسترد ہونے کی تاریخ
+RefusedReason=انکار کی وجہ
+RefusedInvoicing=مسترد کرنے کا بل دینا
+NoInvoiceRefused=مسترد ہونے کا الزام نہ لگائیں۔
+InvoiceRefused=انوائس سے انکار کر دیا گیا (کسٹمر سے مسترد ہونے کا چارج)
+StatusDebitCredit=اسٹیٹس ڈیبٹ/کریڈٹ
+StatusWaiting=انتظار کر رہا ہے۔
+StatusTrans=بھیجا
+StatusDebited=ڈیبٹ
+StatusCredited=کریڈٹ
+StatusPaid=ادا کیا
+StatusRefused=انکار کر دیا
+StatusMotif0=غیر متعینہ
+StatusMotif1=ناکافی فنڈز
+StatusMotif2=درخواست کا مقابلہ کیا گیا۔
+StatusMotif3=کوئی براہ راست ڈیبٹ ادائیگی کا آرڈر نہیں ہے۔
+StatusMotif4=سیلز آرڈر
+StatusMotif5=RIB ناقابل استعمال
+StatusMotif6=بیلنس کے بغیر اکاؤنٹ
+StatusMotif7=عدالتی فیصلہ
+StatusMotif8=دوسری وجہ
+CreateForSepaFRST=براہ راست ڈیبٹ فائل بنائیں (SEPA FRST)
+CreateForSepaRCUR=براہ راست ڈیبٹ فائل بنائیں (SEPA RCUR)
+CreateAll=ڈائریکٹ ڈیبٹ فائل بنائیں
+CreateFileForPaymentByBankTransfer=کریڈٹ ٹرانسفر کے لیے فائل بنائیں
+CreateSepaFileForPaymentByBankTransfer=کریڈٹ ٹرانسفر فائل بنائیں (SEPA)
+CreateGuichet=صرف دفتر
+CreateBanque=صرف بینک
+OrderWaiting=علاج کا انتظار ہے۔
+NotifyTransmision=آرڈر کی فائل ٹرانسمیشن کو ریکارڈ کریں۔
+NotifyCredit=آرڈر کا ریکارڈ کریڈٹ
+NumeroNationalEmetter=قومی ٹرانسمیٹر نمبر
+WithBankUsingRIB=RIB استعمال کرنے والے بینک اکاؤنٹس کے لیے
+WithBankUsingBANBIC=IBAN/BIC/SWIFT استعمال کرنے والے بینک اکاؤنٹس کے لیے
+BankToReceiveWithdraw=بینک اکاؤنٹ وصول کرنا
+BankToPayCreditTransfer=ادائیگی کے ذریعہ کے طور پر استعمال ہونے والا بینک اکاؤنٹ
+CreditDate=پر کریڈٹ
+WithdrawalFileNotCapable=آپ کے ملک %s (آپ کا ملک تعاون یافتہ نہیں ہے) کے لیے رقم نکلوانے کی رسید بنانے میں ناکام
+ShowWithdraw=براہ راست ڈیبٹ آرڈر دکھائیں۔
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=تاہم، اگر انوائس میں کم از کم ایک براہ راست ڈیبٹ ادائیگی کا آرڈر ابھی تک پروسیس نہیں ہوا ہے، تو اسے پہلے سے نکالنے کے انتظام کی اجازت دینے کے لیے بطور ادائیگی سیٹ نہیں کیا جائے گا۔
+DoStandingOrdersBeforePayments=یہ ٹیب آپ کو براہ راست ڈیبٹ ادائیگی کے آرڈر کی درخواست کرنے کی اجازت دیتا ہے۔ ایک بار مکمل ہوجانے کے بعد، مینو میں جائیں Bank->براہ راست ڈیبٹ کے ذریعے ادائیگی تاکہ ڈائریکٹ ڈیبٹ آرڈر تیار کریں اور اس کا نظم کریں۔ ڈائریکٹ ڈیبٹ آرڈر بند ہونے پر، انوائسز پر ادائیگی خود بخود ریکارڈ ہو جائے گی، اور اگر ادائیگی باقی ہے تو انوائسز بند ہو جائیں گی۔
+DoCreditTransferBeforePayments=یہ ٹیب آپ کو کریڈٹ ٹرانسفر آرڈر کی درخواست کرنے کی اجازت دیتا ہے۔ ایک بار مکمل ہوجانے کے بعد، مینو میں جائیں بینک-> کریڈٹ ٹرانسفر کے ذریعے ادائیگی کریڈٹ ٹرانسفر آرڈر تیار کرنے اور اس کا نظم کرنے کے لیے۔ جب کریڈٹ ٹرانسفر آرڈر بند ہو جائے گا، انوائس پر ادائیگی خود بخود ریکارڈ ہو جائے گی، اور اگر ادائیگی باقی ہے تو انوائسز بند ہو جائیں گی۔
+WithdrawalFile=ڈیبٹ آرڈر فائل
+CreditTransferFile=کریڈٹ ٹرانسفر فائل
+SetToStatusSent="فائل بھیجی گئی" کی حیثیت پر سیٹ کریں
+ThisWillAlsoAddPaymentOnInvoice=یہ انوائس پر ادائیگیوں کو بھی ریکارڈ کرے گا اور اگر ادائیگی کرنا باقی ہے تو اسے "ادائیگی" کے طور پر درجہ بندی کرے گا
+StatisticsByLineStatus=لائنوں کی حیثیت کے لحاظ سے اعدادوشمار
 RUM=UMR
-DateRUM=Mandate signature date
-RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
-WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Amount of Direct debit request:
-BankTransferAmount=Amount of Credit Transfer request:
-WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
-SepaMandate=SEPA Direct Debit Mandate
-SepaMandateShort=SEPA Mandate
-PleaseReturnMandate=Please return this mandate form by email to %s or by mail to
-SEPALegalText=By signing this mandate form, you authorize (A) %s to send instructions to your bank to debit your account and (B) your bank to debit your account in accordance with the instructions from %s. As part of your rights, you are entitled to a refund from your bank under the terms and conditions of your agreement with your bank. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
-CreditorIdentifier=Creditor Identifier
-CreditorName=Creditor Name
-SEPAFillForm=(B) Please complete all the fields marked *
-SEPAFormYourName=Your name
-SEPAFormYourBAN=Your Bank Account Name (IBAN)
-SEPAFormYourBIC=Your Bank Identifier Code (BIC)
-SEPAFrstOrRecur=Type of payment
-ModeRECUR=Recurring payment
-ModeFRST=One-off payment
-PleaseCheckOne=Please check one only
-CreditTransferOrderCreated=Credit transfer order %s created
-DirectDebitOrderCreated=Direct debit order %s created
-AmountRequested=Amount requested
+DateRUM=مینڈیٹ کے دستخط کی تاریخ
+RUMLong=منفرد مینڈیٹ حوالہ
+RUMWillBeGenerated=خالی ہونے کی صورت میں، بینک اکاؤنٹ کی معلومات محفوظ ہونے کے بعد ایک UMR (منفرد مینڈیٹ حوالہ) تیار کیا جائے گا۔
+WithdrawMode=ڈائریکٹ ڈیبٹ موڈ (FRST یا RECUR)
+WithdrawRequestAmount=براہ راست ڈیبٹ کی درخواست کی رقم:
+BankTransferAmount=کریڈٹ ٹرانسفر کی درخواست کی رقم:
+WithdrawRequestErrorNilAmount=خالی رقم کے لیے براہ راست ڈیبٹ کی درخواست بنانے سے قاصر۔
+SepaMandate=SEPA ڈائریکٹ ڈیبٹ مینڈیٹ
+SepaMandateShort=SEPA مینڈیٹ
+PleaseReturnMandate=براہ کرم یہ مینڈیٹ فارم بذریعہ ای میل %s پر یا بذریعہ ڈاک واپس کریں۔
+SEPALegalText=اس مینڈیٹ فارم پر دستخط کرکے، آپ (A) %s کو اختیار دیتے ہیں کہ وہ آپ کے اکاؤنٹ کو ڈیبٹ کرنے کے لیے اپنے بینک کو ہدایات بھیجے اور (B) آپ کے بینک کو %s کی ہدایات کے مطابق آپ کے اکاؤنٹ کو ڈیبٹ کرنے کا اختیار دیں۔ اپنے حقوق کے حصے کے طور پر، آپ اپنے بینک کے ساتھ اپنے معاہدے کی شرائط و ضوابط کے تحت اپنے بینک سے رقم کی واپسی کے حقدار ہیں۔ مندرجہ بالا مینڈیٹ سے متعلق آپ کے حقوق کی وضاحت ایک بیان میں کی گئی ہے جو آپ اپنے بینک سے حاصل کر سکتے ہیں۔
+CreditorIdentifier=قرض دہندہ شناخت کنندہ
+CreditorName=قرض دینے والے کا نام
+SEPAFillForm=(B) براہ کرم نشان زدہ تمام فیلڈز کو مکمل کریں*
+SEPAFormYourName=تمھارا نام
+SEPAFormYourBAN=آپ کے بینک اکاؤنٹ کا نام (IBAN)
+SEPAFormYourBIC=آپ کا بینک شناختی کوڈ (BIC)
+SEPAFrstOrRecur=ادائیگی کی قسم
+ModeRECUR=بار بار چلنے والی ادائیگی
+ModeFRST=یک طرفہ ادائیگی
+PleaseCheckOne=براہ کرم صرف ایک چیک کریں۔
+CreditTransferOrderCreated=کریڈٹ ٹرانسفر آرڈر %s بنایا گیا۔
+DirectDebitOrderCreated=ڈائریکٹ ڈیبٹ آرڈر %s بنایا گیا۔
+AmountRequested=درخواست کی گئی رقم
 SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
-ExecutionDate=Execution date
-CreateForSepa=Create direct debit file
-ICS=Creditor Identifier - ICS
-END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
-USTRD="Unstructured" SEPA XML tag
-ADDDAYS=Add days to Execution Date
-NoDefaultIBANFound=No default IBAN found for this third party
+ExecutionDate=پھانسی کی تاریخ
+CreateForSepa=ڈائریکٹ ڈیبٹ فائل بنائیں
+ICS=کریڈٹ کنندہ شناخت کنندہ - ICS
+END_TO_END="EndToEndId" SEPA XML ٹیگ - فی ٹرانزیکشن تفویض کردہ منفرد شناخت
+USTRD="غیر ساختہ" SEPA XML ٹیگ
+ADDDAYS=عملدرآمد کی تاریخ میں دن شامل کریں۔
+NoDefaultIBANFound=اس تیسرے فریق کے لیے کوئی ڈیفالٹ IBAN نہیں ملا
 ### Notifications
-InfoCreditSubject=Payment of direct debit payment order %s by the bank
-InfoCreditMessage=The direct debit payment order %s has been paid by the bank<br>Data of payment: %s
-InfoTransSubject=Transmission of direct debit payment order %s to bank
-InfoTransMessage=The direct debit payment order %s has been sent to bank by %s %s.<br><br>
-InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
-InfoRejectSubject=Direct debit payment order refused
-InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
-ModeWarning=Option for real mode was not set, we stop after this simulation
-ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
-ErrorICSmissing=Missing ICS in Bank account %s
-TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
-WarningSomeDirectDebitOrdersAlreadyExists=Warning: There is already some pending Direct Debit orders (%s) requested for an amount of %s
-WarningSomeCreditTransferAlreadyExists=Warning: There is already some pending Credit Transfer (%s) requested for an amount of %s
+InfoCreditSubject=بینک کی طرف سے براہ راست ڈیبٹ ادائیگی آرڈر %s کی ادائیگی
+InfoCreditMessage=براہ راست ڈیبٹ ادائیگی آرڈر %s بینک نے ادا کیا ہے <br> ادائیگی کا ڈیٹا: %s
+InfoTransSubject=بینک میں براہ راست ڈیبٹ ادائیگی آرڈر %s کی ترسیل
+InfoTransMessage=براہ راست ڈیبٹ ادائیگی کا آرڈر %s بینک کو %s %s کے ذریعے بھیج دیا گیا ہے۔ <br> <br>
+InfoTransData=رقم: %s <br> طریقہ: %s <br> تاریخ: %s
+InfoRejectSubject=براہ راست ڈیبٹ ادائیگی کے آرڈر سے انکار کر دیا گیا۔
+InfoRejectMessage=ہیلو، <br> <br> کمپنی %s سے متعلق انوائس %s کا براہ راست ڈیبٹ ادائیگی آرڈر، جس میں %s کی رقم ہے بینک نے انکار کر دیا ہے۔ <br> <br> -- <br> %s
+ModeWarning=اصلی موڈ کے لیے آپشن سیٹ نہیں کیا گیا تھا، ہم اس سمولیشن کے بعد رک جاتے ہیں۔
+ErrorCompanyHasDuplicateDefaultBAN=id %s والی کمپنی کے پاس ایک سے زیادہ ڈیفالٹ بینک اکاؤنٹ ہیں۔ یہ جاننے کا کوئی طریقہ نہیں کہ کون سا استعمال کرنا ہے۔
+ErrorICSmissing=بینک اکاؤنٹ %s میں ICS غائب ہے۔
+TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=براہ راست ڈیبٹ آرڈر کی کل رقم لائنوں کے مجموعے سے مختلف ہے۔
+WarningSomeDirectDebitOrdersAlreadyExists=انتباہ: پہلے سے ہی کچھ زیر التواء ڈائریکٹ ڈیبٹ آرڈرز (%s) کی درخواست کی گئی ہے %s
+WarningSomeCreditTransferAlreadyExists=انتباہ: پہلے سے ہی کچھ زیر التواء کریڈٹ ٹرانسفر (%s) کی درخواست کی گئی ہے %s کی رقم
diff --git a/htdocs/langs/ur_PK/workflow.lang b/htdocs/langs/ur_PK/workflow.lang
index d7d6c1ae763..552890cec33 100644
--- a/htdocs/langs/ur_PK/workflow.lang
+++ b/htdocs/langs/ur_PK/workflow.lang
@@ -1,30 +1,30 @@
 # Dolibarr language file - Source file is en_US - workflow
-WorkflowSetup=Workflow module setup
-WorkflowDesc=This module provides some automatic actions. By default, the workflow is open (you can do things in the order you want) but here you can activate some automatic actions.
-ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+WorkflowSetup=ورک فلو ماڈیول سیٹ اپ
+WorkflowDesc=یہ ماڈیول کچھ خودکار کارروائیاں فراہم کرتا ہے۔ پہلے سے طے شدہ طور پر، ورک فلو کھلا ہے (آپ اپنی مرضی کے مطابق چیزیں کر سکتے ہیں) لیکن یہاں آپ کچھ خودکار کارروائیوں کو چالو کر سکتے ہیں۔
+ThereIsNoWorkflowToModify=فعال ماڈیولز کے ساتھ ورک فلو میں کوئی ترمیم دستیاب نہیں ہے۔
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a sales order after a commercial proposal is signed (the new order will have same amount as the proposal)
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (the new invoice will have same amount as the proposal)
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatically create a customer invoice after a contract is validated
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a sales order is closed (the new invoice will have same amount as the order)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=تجارتی تجویز پر دستخط ہونے کے بعد خودکار طور پر سیلز آرڈر بنائیں (نئے آرڈر میں پروپوزل کے برابر رقم ہوگی)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=تجارتی تجویز پر دستخط ہونے کے بعد خودکار طور پر ایک کسٹمر انوائس بنائیں (نئے انوائس میں پروپوزل کے برابر رقم ہوگی)
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=معاہدے کی توثیق کے بعد خودکار طور پر ایک کسٹمر انوائس بنائیں
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=سیلز آرڈر بند ہونے کے بعد خودکار طور پر کسٹمر انوائس بنائیں (نئے انوائس میں آرڈر کے برابر رقم ہوگی)
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposal)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposal)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked order)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Classify linked source sales order as shipped when a shipment is closed (and if the quantity shipped by all shipments is the same as in the order to update)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=جب سیلز آرڈر کو بل پر سیٹ کیا جاتا ہے تو لنکڈ سورس پروپوزل کو بطور بل کی درجہ بندی کریں (اور اگر آرڈر کی رقم دستخط شدہ لنکڈ پروپوزل کی کل رقم کے برابر ہے)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=جب گاہک کی انوائس کی توثیق کی جاتی ہے تو لنک شدہ سورس پروپوزل کو بل کے طور پر درجہ بندی کریں (اور اگر انوائس کی رقم دستخط شدہ لنکڈ پروپوزل کی کل رقم کے برابر ہے)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=جب کسٹمر انوائس کی توثیق کی جاتی ہے تو لنکڈ سورس سیلز آرڈر کو بل کے طور پر درجہ بندی کریں (اور اگر انوائس کی رقم منسلک آرڈر کی کل رقم کے برابر ہے)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=جب کسٹمر انوائس کو ادائیگی پر سیٹ کیا جاتا ہے تو لنکڈ سورس سیلز آرڈر کو بل کے طور پر درجہ بندی کریں (اور اگر انوائس کی رقم منسلک آرڈر کی کل رقم کے برابر ہے)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=جب کھیپ کی توثیق کی جاتی ہے تو منسلک سورس سیلز آرڈر کو بھیجے گئے کے طور پر درجہ بندی کریں (اور اگر تمام کھیپوں کے ذریعے بھیجی گئی مقدار وہی ہے جو اپ ڈیٹ کرنے کے حکم میں ہے)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=کھیپ بند ہونے پر لنکڈ سورس سیلز آرڈر کو بھیجے جانے کے طور پر درجہ بندی کریں (اور اگر تمام کھیپوں کے ذریعے بھیجی گئی مقدار وہی ہے جو اپ ڈیٹ کرنے کے لیے ہے)
 # Autoclassify purchase proposal
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=جب وینڈر انوائس کی توثیق کی جاتی ہے تو لنکڈ سورس وینڈر پروپوزل کو بل کے طور پر درجہ بندی کریں (اور اگر انوائس کی رقم منسلک پروپوزل کی کل رقم کے برابر ہے)
 # Autoclassify purchase order
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
-descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=Classify linked source purchase order as received when a reception is validated (and if the quantity received by all receptions is the same as in the purchase order to update)
-descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=Classify linked source purchase order as received when a reception is closed (and if the quantity received by all rceptions is the same as in the purchase order to update)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=جب وینڈر انوائس کی توثیق کی جاتی ہے تو لنکڈ سورس پرچیز آرڈر کو بل کے طور پر درجہ بندی کریں (اور اگر انوائس کی رقم منسلک آرڈر کی کل رقم کے برابر ہے)
+descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=جب کسی استقبالیہ کی توثیق ہو جاتی ہے تو منسلک ذریعہ خریداری کے آرڈر کو موصول ہونے کے مطابق درجہ بندی کریں (اور اگر تمام استقبالیوں کو موصول ہونے والی مقدار وہی ہے جو اپ ڈیٹ کرنے کے لیے خریداری آرڈر میں ہے)
+descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=ریسیپشن بند ہونے پر موصول ہونے والے لنکڈ سورس پرچیز آرڈر کی درجہ بندی کریں (اور اگر تمام ریسپشنز کو موصول ہونے والی مقدار وہی ہے جو اپ ڈیٹ کرنے کے لیے خریداری آرڈر میں ہے)
 # Autoclassify purchase invoice
-descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+descWORKFLOW_BILL_ON_RECEPTION=جب کسی منسلک سپلائر آرڈر کی توثیق ہو جاتی ہے تو استقبالیہ کو "بل شدہ" میں درجہ بندی کریں۔
 # Autoclose intervention
-descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
-AutomaticCreation=Automatic creation
-AutomaticClassification=Automatic classification
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=ٹکٹ بند ہونے پر ٹکٹ سے منسلک تمام مداخلتوں کو بند کر دیں۔
+AutomaticCreation=خودکار تخلیق
+AutomaticClassification=خودکار درجہ بندی
 # Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=جب کسٹمر انوائس کی توثیق ہو جائے تو لنک شدہ سورس شپمنٹ کو بند کے طور پر درجہ بندی کریں۔
diff --git a/htdocs/langs/ur_PK/zapier.lang b/htdocs/langs/ur_PK/zapier.lang
index b4cc4ccba4a..e47659b3837 100644
--- a/htdocs/langs/ur_PK/zapier.lang
+++ b/htdocs/langs/ur_PK/zapier.lang
@@ -13,9 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-ModuleZapierForDolibarrName = Zapier for Dolibarr
-ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
-ZapierForDolibarrSetup=Setup of Zapier for Dolibarr
-ZapierDescription=Interface with Zapier
-ZapierAbout=About the module Zapier
-ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
+ModuleZapierForDolibarrName = Dolibarr کے لئے Zapier
+ModuleZapierForDolibarrDesc = Dolibarr ماڈیول کے لئے Zapier
+ZapierForDolibarrSetup=Dolibarr کے لیے Zapier کا سیٹ اپ
+ZapierDescription=Zapier کے ساتھ انٹرفیس
+ZapierAbout=ماڈیول Zapier کے بارے میں
+ZapierSetupPage=Zapier استعمال کرنے کے لیے Dolibarr سائیڈ پر سیٹ اپ کی ضرورت نہیں ہے۔ تاہم، Dolibarr کے ساتھ Zapier استعمال کرنے کے قابل ہونے کے لیے آپ کو zapier پر ایک پیکیج بنانا اور شائع کرنا چاہیے۔ <a href="https://wiki.dolibarr.org/index.php/Module_Zapier"> اس ویکی پیج پر دستاویزات دیکھیں </a>۔
diff --git a/htdocs/langs/uz_UZ/admin.lang b/htdocs/langs/uz_UZ/admin.lang
index 9c2a3aae9ac..1995cf39739 100644
--- a/htdocs/langs/uz_UZ/admin.lang
+++ b/htdocs/langs/uz_UZ/admin.lang
@@ -756,7 +756,7 @@ Permission106=Eksport jo'natmalari
 Permission109=Yuborishlarni o'chirish
 Permission111=Moliyaviy hisoblarni o'qing
 Permission112=Tranzaktsiyalarni yaratish / o'zgartirish / o'chirish va taqqoslash
-Permission113=Moliyaviy hisoblarni sozlash (toifalarni yaratish, boshqarish)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Tranzaktsiyalarni yarashtirish
 Permission115=Eksport operatsiyalari va hisobvaraqlar bo'yicha ko'chirmalar
 Permission116=Hisob-kitoblar o'rtasida o'tkazmalar
@@ -893,12 +893,11 @@ Permission701=Xayr-ehsonlarni o'qing
 Permission702=Xayriya mablag'larini yaratish / o'zgartirish
 Permission703=Xayriyalarni o'chirib tashlang
 Permission771=Xarajatlar to'g'risidagi hisobotlarni o'qing (o'zingiz va sizning bo'ysunuvchilaringiz)
-Permission772=Xarajatlar to'g'risidagi hisobotlarni yaratish / o'zgartirish
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Xarajatlar to'g'risidagi hisobotlarni o'chirish
-Permission774=Barcha xarajatlar hisobotlarini o'qing (hatto bo'ysunuvchi bo'lmagan foydalanuvchi uchun ham)
 Permission775=Xarajatlar to'g'risidagi hisobotlarni tasdiqlash
 Permission776=Xarajatlar bo'yicha hisobotlarni to'lash
-Permission777=Hammaning hisobot hisobotini o'qing
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Hammaning xarajatlar hisobotini yarating / o'zgartiring
 Permission779=Eksport xarajatlari to'g'risidagi hisobotlar
 Permission1001=Qimmatli qog'ozlarni o'qing
@@ -962,15 +961,11 @@ Permission2801=FTP mijozidan o'qish rejimida foydalaning (faqat ko'rib chiqing v
 Permission2802=Yozish rejimida FTP mijozidan foydalaning (fayllarni o'chirish yoki yuklash)
 Permission3200=Arxivlangan voqealar va barmoq izlarini o'qing
 Permission3301=Yangi modullarni yarating
-Permission4001=Xodimlarni ko'rish
-Permission4002=Xodimlarni yarating
-Permission4003=Xodimlarni o'chirish
-Permission4004=Xodimlarni eksport qilish
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
@@ -981,9 +976,9 @@ Permission10005=Veb-sayt tarkibini o'chirish
 Permission20001=Ta'tilga bo'lgan talablarni o'qing (sizning va sizning bo'ysunuvchilaringizning ta'tillari)
 Permission20002=Ta'tilga oid so'rovlarni yaratish (o'zgartirish va o'zingizning bo'ysunuvchilaringiz)
 Permission20003=Dam olish uchun so'rovlarni o'chirib tashlang
-Permission20004=Barcha ta'tilga oid so'rovlarni o'qing (hatto foydalanuvchi unga bo'ysunmagan)
-Permission20005=Barchaga (hattoki tobe bo'lmagan foydalanuvchi uchun ham) ta'tilga chiqish so'rovlarini yaratish / o'zgartirish
-Permission20006=Administrator so'rovlarni qoldiradi (sozlash va balansni yangilash)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Ta'til bo'yicha so'rovlarni tasdiqlash
 Permission23001=Rejalashtirilgan ishni o'qing
 Permission23002=Rejalashtirilgan ishni yaratish / yangilash
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Hozir ushbu kollektsioner uchun to'plamni boshqaris
 NoNewEmailToProcess=Ishlash uchun yangi elektron pochta xabarlari (mos keladigan filtrlar) yo'q
 NothingProcessed=Hech narsa qilinmadi
 XEmailsDoneYActionsDone=%s elektron pochta xabarlari malakali, %s elektron pochta xabarlari muvaffaqiyatli qayta ishlandi (%s yozuvi / bajarilgan harakatlar uchun)
-RecordEvent=Elektron pochta hodisasini yozib oling
-CreateLeadAndThirdParty=Qo'rg'oshin yarating (va agar kerak bo'lsa, uchinchi tomon)
-CreateTicketAndThirdParty=Chiptani yarating (va oldingi operatsiya yuklangan bo'lsa, uchinchi tomon bilan bog'laning)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 CodeLastResult=Oxirgi natija kodi
 NbOfEmailsInInbox=Manba katalogidagi elektron pochta xabarlari soni
 LoadThirdPartyFromName=%s-da qidiruvni uchinchi tomonga yuklang (faqat yuklash uchun)
 LoadThirdPartyFromNameOrCreate=%s-da qidiruvni uchinchi tomonga yuklash (agar topilmasa yaratish)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Dolibarr-dan yuborilgan birinchi elektron pochta orqali boshlangan suhbatdan xabar
 WithoutDolTrackingID=Dolibarr-dan birinchi elektron pochta orqali yuborilgan suhbatdan xabar
 WithDolTrackingIDInMsgId=Dolibarr-dan xabar yuborildi
@@ -2084,7 +2080,7 @@ CreateCandidature=Ishga ariza yarating
 FormatZip=Zip
 MainMenuCode=Menyu kirish kodi (asosiy menyu)
 ECMAutoTree=Avtomatik ECM daraxtini ko'rsating
-OperationParamDesc=Harakat ob'ekti uchun ishlatiladigan qiymatlarni yoki qiymatlarni qanday chiqarishni aniqlang. Masalan: <br> objproperty1 = SET: <br> objproperty2 = SET: __objproperty1__ o'rnini bosuvchi qiymat <br> objproperty3 = SETIFEMPTY: agar ishlatilgan bo'lsa objproT0: ([^ \\ s] *) <br> options_myextrafield1 = EXTRACT: SUBJECT: ([^ & # 92; n] *) <br> object.objproperty5 = EXTRACT: BODY: Mening kompaniyamning nomi \\ s ([^ \\ s] *ffz19) <br> dan foydalaning; ajratish sifatida char bir nechta xususiyatlarni ajratish yoki o'rnatish.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Ish vaqti
 OpeningHoursDesc=Bu erga kompaniyangizning muntazam ish vaqtiga kiring.
 ResourceSetup=Resurs modulining konfiguratsiyasi
@@ -2130,7 +2126,7 @@ LargerThan=Undan kattaroq
 IfTrackingIDFoundEventWillBeLinked=E'tibor bering, agar elektron pochtada ob'ektning kuzatuv identifikatori topilgan bo'lsa yoki elektron pochta manzili to'plangan va ob'ekt bilan bog'langan elektron pochta xabarining javobi bo'lsa, yaratilgan voqea avtomatik ravishda ma'lum tegishli ob'ektga bog'lanadi.
 WithGMailYouCanCreateADedicatedPassword=GMail hisob qaydnomasi yordamida, agar siz 2 bosqichli tekshiruvni yoqsangiz, https://myaccount.google.com/ manzilidagi o'zingizning shaxsiy parol so'zingiz o'rniga dastur uchun maxsus ikkinchi parolni yaratish tavsiya etiladi.
 EmailCollectorTargetDir=Muvaffaqiyatli ishlov berilganda elektron pochtani boshqa yorliq / katalogga ko'chirish istalgan xatti-harakatlar bo'lishi mumkin. Ushbu xususiyatdan foydalanish uchun faqat katalog nomini o'rnating (Ismda maxsus belgilarni ishlatmang). E'tibor bering, siz o'qish / yozish uchun kirish qayd yozuvidan foydalanishingiz kerak.
-EmailCollectorLoadThirdPartyHelp=Ma'lumotlar bazasida mavjud bo'lgan uchinchi tomonni topish va yuklash uchun elektron pochta tarkibidan foydalanish uchun siz ushbu harakatdan foydalanishingiz mumkin. Topilgan (yoki yaratilgan) uchinchi tomon kerak bo'lgan harakatlarni bajarish uchun ishlatiladi. <br> Misol uchun, agar siz tanada "Ism: topiladigan ism" qatorini ajratib olgan uchinchi partiya yaratmoqchi bo'lsangiz, yuboruvchi elektron pochtasini elektron pochta sifatida ishlating, siz parametr maydonini shunday o'rnatishingiz mumkin: <br> 'email = HEADER: ^Kimdan: (.*); Ism = CHIQARISH: TANI: Ism: \\ s ([^\\ s]*); mijoz = SET: 2; ' <br>
+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>
 EndPointFor=%s uchun yakuniy nuqta: %s
 DeleteEmailCollector=Elektron pochta kollektorini o'chirish
 ConfirmDeleteEmailCollector=Ushbu elektron pochta kollektorini o'chirishni xohlaysizmi?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Missing translation for %s
 NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/uz_UZ/companies.lang b/htdocs/langs/uz_UZ/companies.lang
index c02ae302ca8..40c1038b273 100644
--- a/htdocs/langs/uz_UZ/companies.lang
+++ b/htdocs/langs/uz_UZ/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Tekshiring
 VATIntraCheckDesc=QQS identifikatorida mamlakat prefiksi bo'lishi kerak. <b> %s </b> havolasida Dolibarr serveridan Internetga kirishni talab qiladigan Evropa QQS tekshiruvi xizmati (VIES) ishlatiladi.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Evropa Komissiyasi veb-saytida Jamiyat ichidagi QQS identifikatorini tekshiring
-VATIntraManualCheck=Shuningdek, siz Evropa Komissiyasining veb-saytida <a href="%s" target="_blank"> %s </a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Tekshirib bo'lmaydi. Chek xizmati a'zo davlat tomonidan taqdim etilmaydi (%s).
 NorProspectNorCustomer=Istiqbolli ham, mijoz ham emas
 JuridicalStatus=Xo'jalik yurituvchi sub'ekt turi
diff --git a/htdocs/langs/uz_UZ/errors.lang b/htdocs/langs/uz_UZ/errors.lang
index 8eca8972e23..c5dc68717fc 100644
--- a/htdocs/langs/uz_UZ/errors.lang
+++ b/htdocs/langs/uz_UZ/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=Fayl nomida __SOMETHING__ bo'lishi mumkin emas
 ErrorNotInDictionaryPaymentConditions=To'lov shartlari lug'atida yo'q, iltimos o'zgartiring.
 ErrorIsNotADraft=%s qoralama emas
 ErrorExecIdFailed=Can't execute command "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=PHP parametringiz upload_max_filesize (%s) PHP post_max_size (%s) parametridan yuqori. Bu izchil o'rnatish emas.
diff --git a/htdocs/langs/uz_UZ/main.lang b/htdocs/langs/uz_UZ/main.lang
index d1e96389dd6..690c45522f0 100644
--- a/htdocs/langs/uz_UZ/main.lang
+++ b/htdocs/langs/uz_UZ/main.lang
@@ -212,6 +212,8 @@ User=Foydalanuvchi
 Users=Foydalanuvchilar
 Group=Guruh
 Groups=Guruhlar
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=Hech qanday foydalanuvchi guruhi aniqlanmagan
 Password=Parol
 PasswordRetype=Parolingizni qayta kiriting
diff --git a/htdocs/langs/uz_UZ/other.lang b/htdocs/langs/uz_UZ/other.lang
index 5038ccf09c3..aad53130d72 100644
--- a/htdocs/langs/uz_UZ/other.lang
+++ b/htdocs/langs/uz_UZ/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Parolni kodlash
 PermissionsAdd=Ruxsatnomalar qo'shildi
 PermissionsDelete=Ruxsatlar olib tashlandi
 YourPasswordMustHaveAtLeastXChars=Parolingizda kamida <strong> %s </strong> belgilar bo'lishi kerak
+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
 YourPasswordHasBeenReset=Parolingiz qayta tiklandi
 ApplicantIpAddress=Ariza beruvchining IP-manzili
 SMSSentTo=%s raqamiga SMS yuborildi
diff --git a/htdocs/langs/uz_UZ/projects.lang b/htdocs/langs/uz_UZ/projects.lang
index 218a52bdc38..76d5ab7807e 100644
--- a/htdocs/langs/uz_UZ/projects.lang
+++ b/htdocs/langs/uz_UZ/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Izoh: 100%% da barcha vazifalar
 SelectLinesOfTimeSpentToInvoice=Hisob-kitob qilinmagan sarflangan vaqtni tanlang, so'ngra hisob-kitob qilish uchun "Hisob-fakturani yaratish" ommaviy harakati
 ProjectTasksWithoutTimeSpent=Vaqt sarflamasdan loyiha vazifalari
 FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+StartDateCannotBeAfterEndDate=End date cannot be before start date
diff --git a/htdocs/langs/uz_UZ/withdrawals.lang b/htdocs/langs/uz_UZ/withdrawals.lang
index 586c721d7cf..17a7785f94b 100644
--- a/htdocs/langs/uz_UZ/withdrawals.lang
+++ b/htdocs/langs/uz_UZ/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Kredit o'tkazish tartibi
 LatestBankTransferReceipts=Kredit o'tkazish bo'yicha so'nggi buyurtmalar %s
 LastWithdrawalReceipts=Oxirgi %s to'g'ridan-to'g'ri debet fayllari
 WithdrawalsLine=To'g'ridan-to'g'ri debet buyurtmasi liniyasi
+CreditTransfer=Credit transfer
 CreditTransferLine=Kredit o'tkazish liniyasi
 WithdrawalsLines=To'g'ridan-to'g'ri debet buyurtma liniyalari
 CreditTransferLines=Kredit o'tkazish liniyalari
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Uchinchi tomonning bank kodi
 NoInvoiceCouldBeWithdrawed=Hech qanday schyot-faktura muvaffaqiyatli hisobdan chiqarilmagan. Hisob-kitoblarning amaldagi IBANga ega kompaniyalarda ekanligini va IBAN-da <strong> %s </strong> rejimida UMR (noyob mandat ma'lumotnomasi) mavjudligini tekshiring.
 WithdrawalCantBeCreditedTwice=Ushbu pulni qaytarib olish kvitansiyasi allaqachon kreditlangan deb belgilangan; buni ikki marta bajarish mumkin emas, chunki bu takroriy to'lovlar va bank yozuvlarini yaratishi mumkin.
 ClassCredited=Tasniflangan kredit
+ClassDebited=Classify debited
 ClassCreditedConfirm=Ushbu olib qo'yilgan kvitansiyani sizning bank hisob raqamingizga kiritilgan deb tasniflashni xohlaganingizga ishonchingiz komilmi?
 TransData=Etkazish sanasi
 TransMetod=Uzatish usuli
diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang
index 6a09e8cfa0a..2381109ce14 100644
--- a/htdocs/langs/vi_VN/admin.lang
+++ b/htdocs/langs/vi_VN/admin.lang
@@ -756,7 +756,7 @@ Permission106=Xuất dữ liệu Sendings
 Permission109=Xóa sendings
 Permission111=Xem tài khoản tài chính
 Permission112=Tạo/chỉnh sửa/xóa và so sánh giao dịch
-Permission113=Cài đặt tài khoản tài chính (tạo, quản lý phân nhóm)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Các giao dịch hợp nhất
 Permission115=Xuất dữ liệu giao dịch và bảng kê tài khoản
 Permission116=Chuyển giữa các tài khoản
@@ -893,12 +893,11 @@ Permission701=Đọc thông tin Tài trợ
 Permission702=Tạo/sửa đổi Tài trợ
 Permission703=Xóa tài trợ
 Permission771=Xem báo cáo chi phí (của bạn và cấp dưới của bạn)
-Permission772=Tạo/chỉnh sửa báo cáo chi phí
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Xóa báo cáo chi phí
-Permission774=Đọc tất cả báo cáo chi phí (ngay cả người dùng không phụ thuộc)
 Permission775=Duyệt báo cáo chi phí
 Permission776=Báo cáo thanh toán chi phí
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=Xuất dữ liệu báo cáo chi phí
 Permission1001=Xem tồn kho
@@ -962,15 +961,11 @@ Permission2801=Sử dụng FTP client trong chế độ đọc (chỉ duyệt v
 Permission2802=Sử dụng FTP client trong chế độ ghi (xóa hoặc tải lên các tập tin)
 Permission3200=Xem các sự kiện được lưu trữ và dấu vân tay
 Permission3301=Generate new modules
-Permission4001=Xem nhân viên
-Permission4002=Tạo nhân viên
-Permission4003=Xóa nhân viên
-Permission4004=Xuất dữ liệu nhân viên
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
@@ -981,9 +976,9 @@ Permission10005=Xóa nội dung trang web
 Permission20001=Xem yêu cầu nghỉ phép (nghỉ phép của bạn và của cấp dưới)
 Permission20002=Tạo / sửa đổi yêu cầu nghỉ phép của bạn (nghỉ phép của bạn và của những người cấp dưới của bạn)
 Permission20003=Xóa yêu cầu nghỉ phép
-Permission20004=Xem tất cả các yêu cầu để lại (ngay cả người dùng không phải cấp dưới)
-Permission20005=Tạo / sửa đổi yêu cầu nghỉ phép cho mọi người (ngay cả người dùng không phải cấp dưới)
-Permission20006=Quản trị yêu cầu nghỉ phép (thiết lập và cập nhật số dư)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Phê duyệt yêu cầu nghỉ phép
 Permission23001=Xem công việc theo lịch trình
 Permission23002=Tạo/cập nhật công việc theo lịch trình
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Bạn có muốn chạy trình thu thập cho thu t
 NoNewEmailToProcess=Không có email mới (bộ lọc phù hợp) để xử lý
 NothingProcessed=Chưa có gì hoàn thành
 XEmailsDoneYActionsDone=%s email đủ điều kiện, %s email được xử lý thành công (đối với bản ghi / hành động %s được thực hiện)
-RecordEvent=Ghi lại sự kiện email
-CreateLeadAndThirdParty=Tạo khách hàng tiềm năng (và bên thứ ba nếu cần thiết)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 CodeLastResult=Mã kết quả mới nhất
 NbOfEmailsInInbox=Số lượng email trong thư mục nguồn
 LoadThirdPartyFromName=Tải tìm kiếm bên thứ ba trên %s (chỉ tải)
 LoadThirdPartyFromNameOrCreate=Tải tìm kiếm bên thứ ba trên %s (tạo nếu không tìm thấy)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
@@ -2084,7 +2080,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Mã mục nhập menu (mainmenu)
 ECMAutoTree=Hiển thị cây ECM tự động
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Giờ mở cửa
 OpeningHoursDesc=Nhập vào đây giờ mở cửa thường xuyên của công ty bạn.
 ResourceSetup=Cấu hình của mô-đun tài nguyên
@@ -2130,7 +2126,7 @@ LargerThan=Lớn hơn
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=Với tài khoản GMail, nếu bạn đã bật xác thực 2 bước, bạn nên tạo mật khẩu thứ hai dành riêng cho ứng dụng thay vì sử dụng mật khẩu tài khoản của riêng bạn từ https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+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>
 EndPointFor=Điểm kết thúc cho %s: %s
 DeleteEmailCollector=Xóa trình thu thập email
 ConfirmDeleteEmailCollector=Bạn có chắc chắn muốn xóa trình thu thập email này?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Missing translation for %s
 NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/vi_VN/companies.lang b/htdocs/langs/vi_VN/companies.lang
index ecb3a5ae0f0..0ad8601e12b 100644
--- a/htdocs/langs/vi_VN/companies.lang
+++ b/htdocs/langs/vi_VN/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Kiểm tra
 VATIntraCheckDesc=ID VAT phải bao gồm tiền tố quốc gia. Liên kết <b>%s</b> sử dụng dịch vụ kiểm tra VAT Châu Âu (VIES) yêu cầu truy cập internet từ máy chủ Dolibarr.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Kiểm tra ID VAT nội bộ cộng đồng trên trang web của Ủy ban Châu Âu
-VATIntraManualCheck=Bạn cũng có thể kiểm tra thủ công trên trang web của Ủy ban Châu Âu <a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Không phải triển vọng, cũng không phải khách hàng
 JuridicalStatus=Business entity type
diff --git a/htdocs/langs/vi_VN/errors.lang b/htdocs/langs/vi_VN/errors.lang
index 7cb119838c9..941f98abc63 100644
--- a/htdocs/langs/vi_VN/errors.lang
+++ b/htdocs/langs/vi_VN/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
 ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
 ErrorIsNotADraft=%s is not a draft
 ErrorExecIdFailed=Can't execute command "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Tham số PHP của bạn upload_max_filesize (%s) cao hơn tham số PHP post_max_size (%s). Đây không phải là một thiết lập phù hợp.
diff --git a/htdocs/langs/vi_VN/main.lang b/htdocs/langs/vi_VN/main.lang
index 791acdbbc53..7c554f803a4 100644
--- a/htdocs/langs/vi_VN/main.lang
+++ b/htdocs/langs/vi_VN/main.lang
@@ -212,6 +212,8 @@ User=Người dùng
 Users=Người dùng
 Group=Nhóm
 Groups=Nhóm
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=Không có nhóm người dùng được xác định
 Password=Mật khẩu
 PasswordRetype=Nhập lại mật khẩu của bạn
diff --git a/htdocs/langs/vi_VN/other.lang b/htdocs/langs/vi_VN/other.lang
index fa7a1e81d9b..b4fd55dad59 100644
--- a/htdocs/langs/vi_VN/other.lang
+++ b/htdocs/langs/vi_VN/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Mã hóa mật khẩu
 PermissionsAdd=Quyền được thêm
 PermissionsDelete=Quyền đã bị xóa
 YourPasswordMustHaveAtLeastXChars=Mật khẩu của bạn phải có ít nhất <strong>%s</strong> ký tự
+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
 YourPasswordHasBeenReset=Mật khẩu của bạn đã được đặt lại thành công
 ApplicantIpAddress=Địa chỉ IP của người nộp đơn
 SMSSentTo=SMS được gửi tới %s
diff --git a/htdocs/langs/vi_VN/projects.lang b/htdocs/langs/vi_VN/projects.lang
index f966f397b1e..94499eaf1c2 100644
--- a/htdocs/langs/vi_VN/projects.lang
+++ b/htdocs/langs/vi_VN/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
 ProjectTasksWithoutTimeSpent=Project tasks without time spent
 FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+StartDateCannotBeAfterEndDate=Ngày kết thúc không thể trước ngày bắt đầu
diff --git a/htdocs/langs/vi_VN/withdrawals.lang b/htdocs/langs/vi_VN/withdrawals.lang
index 316b57f177e..c29bfa7d6ca 100644
--- a/htdocs/langs/vi_VN/withdrawals.lang
+++ b/htdocs/langs/vi_VN/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Tệp ghi nợ trực tiếp mới nhất %s 
 WithdrawalsLine=Direct debit order line
+CreditTransfer=Credit transfer
 CreditTransferLine=Credit transfer line
 WithdrawalsLines=Dòng lệnh ghi nợ trực tiếp
 CreditTransferLines=Credit transfer lines
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Mã ngân hàng của bên thứ ba
 NoInvoiceCouldBeWithdrawed=Không có hóa đơn ghi nợ thành công. Kiểm tra xem hóa đơn có trên các công ty có IBAN hợp lệ không và IBAN có UMR (Tham chiếu ủy quyền duy nhất) với chế độ <strong>%s</strong> .
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=Phân loại tín dụng
+ClassDebited=Classify debited
 ClassCreditedConfirm=Bạn có chắc chắn muốn phân loại biên nhận rút tiền này là ghi có trên tài khoản ngân hàng của bạn không?
 TransData=Ngày chuyển
 TransMetod=Phương thức chuyển
diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang
index 198fde99380..6dbe7d3f075 100644
--- a/htdocs/langs/zh_CN/admin.lang
+++ b/htdocs/langs/zh_CN/admin.lang
@@ -756,7 +756,7 @@ Permission106=导出发货单
 Permission109=删除发货单
 Permission111=读取财务帐目
 Permission112=创建/变更/删除和比较交易
-Permission113=设置财政账户 (创建和管理分类)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=导出交易和帐户报表
 Permission116=账户间转账
@@ -893,12 +893,11 @@ Permission701=读取捐款资料
 Permission702=创建/变更捐款资料
 Permission703=删除捐款资料
 Permission771=读取费用报表(您以及您下属)
-Permission772=创建/变更费用报表
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=删除费用报表
-Permission774=读取所有费用报表(即使用户没有下属)
 Permission775=批准费用报表
 Permission776=支付费用报表
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=导出费用报表
 Permission1001=读取库存信息
@@ -962,15 +961,11 @@ Permission2801=允许FTP客户端读取(仅供浏览和下载)
 Permission2802=允许FTP客户端写入(删除和上传文件)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
@@ -981,9 +976,9 @@ Permission10005=Delete website content
 Permission20001=Read leave requests (your leave and those of your subordinates)
 Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
 Permission20003=删除请假申请
-Permission20004=阅读所有请假申请（即使是非下属用户）
-Permission20005=为每个人创建/修改请假申请（即使是非下属用户）
-Permission20006=管理员请假申请 (setup and update balance)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Approve leave requests
 Permission23001=读取排定任务
 Permission23002=创建/更新排定任务
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
-RecordEvent=Record email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
@@ -2084,7 +2080,7 @@ CreateCandidature=Create job application
 FormatZip=邮编
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -2130,7 +2126,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+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>
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Missing translation for %s
 NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/zh_CN/companies.lang b/htdocs/langs/zh_CN/companies.lang
index 86080b4b201..1e7067fa16b 100644
--- a/htdocs/langs/zh_CN/companies.lang
+++ b/htdocs/langs/zh_CN/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=支票
 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.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commission website
-VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=检查不可能的。检查服务是没有提供的会员国（%s）中。
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Business entity type
diff --git a/htdocs/langs/zh_CN/errors.lang b/htdocs/langs/zh_CN/errors.lang
index 7b0e8dd6185..456eaf5df69 100644
--- a/htdocs/langs/zh_CN/errors.lang
+++ b/htdocs/langs/zh_CN/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
 ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
 ErrorIsNotADraft=%s is not a draft
 ErrorExecIdFailed=Can't execute command "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # 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/zh_CN/main.lang b/htdocs/langs/zh_CN/main.lang
index 2c57ebd5b75..95ab4e7a0b0 100644
--- a/htdocs/langs/zh_CN/main.lang
+++ b/htdocs/langs/zh_CN/main.lang
@@ -212,6 +212,8 @@ User=用户
 Users=用户
 Group=组
 Groups=群组
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=未定义用户群组
 Password=密码
 PasswordRetype=重新输入您的密码
diff --git a/htdocs/langs/zh_CN/other.lang b/htdocs/langs/zh_CN/other.lang
index 6d51a6bbd73..273f71a86b6 100644
--- a/htdocs/langs/zh_CN/other.lang
+++ b/htdocs/langs/zh_CN/other.lang
@@ -258,6 +258,10 @@ PassEncoding=密码编码
 PermissionsAdd=权限已添加
 PermissionsDelete=权限已删除
 YourPasswordMustHaveAtLeastXChars=您的密码必须至少包含<strong> %s </strong>字符
+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
 YourPasswordHasBeenReset=您的密码已成功重置
 ApplicantIpAddress=申请人的IP地址
 SMSSentTo=短信发送到%s
diff --git a/htdocs/langs/zh_CN/projects.lang b/htdocs/langs/zh_CN/projects.lang
index 787a1841903..b73315ca664 100644
--- a/htdocs/langs/zh_CN/projects.lang
+++ b/htdocs/langs/zh_CN/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
 ProjectTasksWithoutTimeSpent=Project tasks without time spent
 FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+StartDateCannotBeAfterEndDate=结束日期不能早过开始日期啊，时光不能倒流呀魂淡
diff --git a/htdocs/langs/zh_CN/withdrawals.lang b/htdocs/langs/zh_CN/withdrawals.lang
index d2185e2988e..72dd3ffd8b9 100644
--- a/htdocs/langs/zh_CN/withdrawals.lang
+++ b/htdocs/langs/zh_CN/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=最后 %s 取款收据
 WithdrawalsLine=Direct debit order line
+CreditTransfer=Credit transfer
 CreditTransferLine=Credit transfer line
 WithdrawalsLines=直接借记订单行
 CreditTransferLines=Credit transfer lines
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=分类记
+ClassDebited=Classify debited
 ClassCreditedConfirm=你确定要分类这一撤离收据上记入您的银行帐户？
 TransData=数据传输
 TransMetod=传输的方法
diff --git a/htdocs/langs/zh_HK/admin.lang b/htdocs/langs/zh_HK/admin.lang
index b0e9f37cd36..3971948e5a1 100644
--- a/htdocs/langs/zh_HK/admin.lang
+++ b/htdocs/langs/zh_HK/admin.lang
@@ -756,7 +756,7 @@ Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
 Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Export transactions and account statements
 Permission116=Transfers between accounts
@@ -893,12 +893,11 @@ Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Read stocks
@@ -962,15 +961,11 @@ Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
@@ -981,9 +976,9 @@ Permission10005=Delete website content
 Permission20001=Read leave requests (your leave and those of your subordinates)
 Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
 Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+Permission20004=Read all leave requests (even those of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Approve leave requests
 Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
-RecordEvent=Record email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+RecordEvent=Record an event in agenda (with type Email sent or received)
+CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
@@ -2084,7 +2080,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -2130,7 +2126,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+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>
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
@@ -2219,3 +2215,4 @@ MissingTranslationForConfKey = Missing translation for %s
 NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
diff --git a/htdocs/langs/zh_HK/companies.lang b/htdocs/langs/zh_HK/companies.lang
index bce0a98ea83..7de663ede6d 100644
--- a/htdocs/langs/zh_HK/companies.lang
+++ b/htdocs/langs/zh_HK/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Check
 VATIntraCheckDesc=The VAT ID must include the country prefix. The link <b>%s</b> uses the European VAT checker service (VIES) which requires internet access from the Dolibarr server.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commission website
-VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Business entity type
diff --git a/htdocs/langs/zh_HK/errors.lang b/htdocs/langs/zh_HK/errors.lang
index 7bb0fac3f7b..eabc784e6aa 100644
--- a/htdocs/langs/zh_HK/errors.lang
+++ b/htdocs/langs/zh_HK/errors.lang
@@ -273,6 +273,7 @@ ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
 ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
 ErrorIsNotADraft=%s is not a draft
 ErrorExecIdFailed=Can't execute command "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
 
 # 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/zh_HK/main.lang b/htdocs/langs/zh_HK/main.lang
index c59da9aabec..2d850927782 100644
--- a/htdocs/langs/zh_HK/main.lang
+++ b/htdocs/langs/zh_HK/main.lang
@@ -212,6 +212,8 @@ User=User
 Users=Users
 Group=Group
 Groups=Groups
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=No user group defined
 Password=Password
 PasswordRetype=Retype your password
diff --git a/htdocs/langs/zh_HK/other.lang b/htdocs/langs/zh_HK/other.lang
index 9bc68dc3678..7b509f60ff7 100644
--- a/htdocs/langs/zh_HK/other.lang
+++ b/htdocs/langs/zh_HK/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Password encoding
 PermissionsAdd=Permissions added
 PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
+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
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
 SMSSentTo=SMS sent to %s
diff --git a/htdocs/langs/zh_HK/projects.lang b/htdocs/langs/zh_HK/projects.lang
index 5a2911bac0b..0d9c7ea34c8 100644
--- a/htdocs/langs/zh_HK/projects.lang
+++ b/htdocs/langs/zh_HK/projects.lang
@@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
 ProjectTasksWithoutTimeSpent=Project tasks without time spent
 FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+StartDateCannotBeAfterEndDate=End date cannot be before start date
diff --git a/htdocs/langs/zh_HK/withdrawals.lang b/htdocs/langs/zh_HK/withdrawals.lang
index f5a33b78eee..bda987276b1 100644
--- a/htdocs/langs/zh_HK/withdrawals.lang
+++ b/htdocs/langs/zh_HK/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
 WithdrawalsLine=Direct debit order line
+CreditTransfer=Credit transfer
 CreditTransferLine=Credit transfer line
 WithdrawalsLines=Direct debit order lines
 CreditTransferLines=Credit transfer lines
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=Classify credited
+ClassDebited=Classify debited
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
 TransMetod=Transmission method
diff --git a/htdocs/langs/zh_TW/accountancy.lang b/htdocs/langs/zh_TW/accountancy.lang
index c9bb37dc678..94e15da06b1 100644
--- a/htdocs/langs/zh_TW/accountancy.lang
+++ b/htdocs/langs/zh_TW/accountancy.lang
@@ -37,8 +37,8 @@ OtherInfo=其他資訊
 DeleteCptCategory=從群組移除會計帳戶
 ConfirmDeleteCptCategory=您確定要從會計帳戶組中刪除此會計帳戶嗎？
 JournalizationInLedgerStatus=日誌狀態
-AlreadyInGeneralLedger=Already transferred to accounting journals and ledger
-NotYetInGeneralLedger=Not yet transferred to accouting journals and ledger
+AlreadyInGeneralLedger=已經轉移到會計日記帳和分類帳中
+NotYetInGeneralLedger=尚未轉移到結帳日記帳和分類帳中
 GroupIsEmptyCheckSetup=群組是空的，檢查個人化會計群組的設定
 DetailByAccount=依帳戶顯示細節
 AccountWithNonZeroValues=非零值的帳戶
@@ -48,8 +48,8 @@ CountriesNotInEEC=非歐盟國家
 CountriesInEECExceptMe=除了%s以外的歐盟國家
 CountriesExceptMe=除了%s以外的所有國家
 AccountantFiles=匯出來源文件
-ExportAccountingSourceDocHelp=With this tool, you can export the source events (list in CSV and PDFs) that are used to generate your accountancy.
-ExportAccountingSourceDocHelp2=To export your journals, use the menu entry %s - %s.
+ExportAccountingSourceDocHelp=使用此工具，您可以匯出用於產生會計的來源事件（CSV 和 PDF 中的清單）。
+ExportAccountingSourceDocHelp2=要匯出您的日記帳，請使用選單條目 %s - %s。
 VueByAccountAccounting=依會計科目檢視
 VueBySubAccountAccounting=依會計子分類帳檢視
 
@@ -87,7 +87,7 @@ AccountancyAreaDescAnalyze=步驟%s：新增或編輯現有交易並生成報告
 
 AccountancyAreaDescClosePeriod=步驟%s：關帳期，因此我們之後無法進行修改。
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=設定中的強制性步驟尚未完成（未為所有銀行帳戶定義會計代碼日記帳）
 Selectchartofaccounts=選擇有效的會計科目表
 ChangeAndLoad=修改並載入
 Addanaccount=新增會計科目
@@ -120,7 +120,7 @@ ExpenseReportsVentilation=費用報表的關聯
 CreateMvts=建立新的交易
 UpdateMvts=交易的修改
 ValidTransaction=驗證交易
-WriteBookKeeping=Register transactions in accounting
+WriteBookKeeping=在總帳中記錄交易
 Bookkeeping=總帳
 BookkeepingSubAccount=子分類帳
 AccountBalance=帳戶餘額
@@ -148,7 +148,7 @@ NotVentilatedinAccount=不受會計項目約束
 XLineSuccessfullyBinded=%s 產品/服務成功地指定會計項目
 XLineFailedToBeBinded=%s 產品/服務沒指定任何會計項目
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=清單與綁定頁面中的最大行數（建議：50）
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=開始按最新元件對“待綁定”頁面進行排序
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=開始按最新元件對“完成綁定”頁面進行排序
 
@@ -159,7 +159,7 @@ ACCOUNTING_LENGTH_AACCOUNT=合作方會計帳戶的長度（如果在此處將
 ACCOUNTING_MANAGE_ZERO=允許在會計帳戶末尾管理不同數量的零。一些國家（例如瑞士）需要。如果設置為off（默認），則可以設置以下兩個參數來要求應用程序添加虛擬零。
 BANK_DISABLE_DIRECT_INPUT=停用銀行帳戶中直接記錄交易
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=在日記帳上啟用草稿匯出
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
+ACCOUNTANCY_COMBO_FOR_AUX=為子公司帳戶啟用組合列表（如果您有很多合作方，可能會很慢,損失搜尋部份數值的能力）
 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
 
@@ -211,15 +211,15 @@ JournalLabel=日記帳標籤
 NumPiece=件數
 TransactionNumShort=交易編號
 AccountingCategory=自定義群組
-GroupByAccountAccounting=Group by general ledger account
-GroupBySubAccountAccounting=Group by subledger account
+GroupByAccountAccounting=依總分類帳帳戶的群組
+GroupBySubAccountAccounting=依子分類帳帳戶的群組
 AccountingAccountGroupsDesc=您可定義某些會計科目大類。他們可以在個人化會計報表中使用。
 ByAccounts=依帳戶
 ByPredefinedAccountGroups=依大類
 ByPersonalizedAccountGroups=依個人化大類
 ByYear=依年度
 NotMatch=未設定
-DeleteMvt=Delete some operation lines from accounting
+DeleteMvt=從會計中刪除一些操作行
 DelMonth=刪除月份
 DelYear=刪除年度
 DelJournal=刪除日記帳
@@ -298,10 +298,10 @@ NoNewRecordSaved=沒有交易可記錄
 ListOfProductsWithoutAccountingAccount=清單中的產品沒有指定任何會計項目
 ChangeBinding=修改關聯性
 Accounted=計入總帳
-NotYetAccounted=Not yet transferred to accounting
+NotYetAccounted=尚未轉入會計
 ShowTutorial=顯示教程
 NotReconciled=未對帳
-WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
+WarningRecordWithoutSubledgerAreExcluded=警告，所有未定義子分類帳帳戶的操作都將被過濾並從該檢視中排除
 
 ## Admin
 BindingOptions=綁定選項
@@ -352,9 +352,9 @@ Modelcsv_FEC=匯出為FEC
 Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=匯出為Sage 50 Switzerland
 Modelcsv_winfic=Export for Winfic - eWinfic - WinSis Compta
-Modelcsv_Gestinumv3=Export for Gestinum (v3)
-Modelcsv_Gestinumv5=Export for Gestinum (v5)
-Modelcsv_charlemagne=Export for Aplim Charlemagne
+Modelcsv_Gestinumv3=匯出為Gestinum (v3)
+Modelcsv_Gestinumv5=匯出為Gestinum (v5)
+Modelcsv_charlemagne=匯出為Aplim Charlemagne
 ChartofaccountsId=會計項目表ID
 
 ## Tools - Init accounting account on product / service
@@ -387,8 +387,8 @@ SaleExport=出口銷售
 SaleEEC=在歐盟銷售
 SaleEECWithVAT=在EEC中具有營業稅的銷售不為空，因此我們認為這不是內部銷售，建議的帳戶是標準產品帳戶。
 SaleEECWithoutVATNumber=在EEC中銷售沒有營業稅但合作方的營業稅ID未定義。我們退回標準銷售的產品帳戶。您可以根據需要修改合作方或產品帳戶的營業稅ID。
-ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
-ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
+ForbiddenTransactionAlreadyExported=禁止：交易已被驗證和/或匯出。
+ForbiddenTransactionAlreadyValidated=禁止：交易已被驗證。
 ## Dictionary
 Range=會計項目範圍
 Calculated=已計算
@@ -405,14 +405,14 @@ NoJournalDefined=沒有定義的日記帳
 Binded=關聯行數
 ToBind=關聯行
 UseMenuToSetBindindManualy=尚未綁定的行，請使用選單<a href="%s">%s</a>手動進行綁定
-SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Sorry this module is not compatible with the experimental feature of situation invoices
+SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=抱歉此模組不相容於情況發票的實驗功能
 
 ## Import
 ImportAccountingEntries=會計條目
-ImportAccountingEntriesFECFormat=Accounting entries - FEC format
-FECFormatJournalCode=Code journal (JournalCode)
-FECFormatJournalLabel=Label journal (JournalLib)
-FECFormatEntryNum=Piece number (EcritureNum)
+ImportAccountingEntriesFECFormat=會計科目 - FEC 格式
+FECFormatJournalCode=代碼日記簿（日記簿代碼）
+FECFormatJournalLabel=標籤日記簿 (JournalLib)
+FECFormatEntryNum=件數 (EcritureNum)
 FECFormatEntryDate=Piece date (EcritureDate)
 FECFormatGeneralAccountNumber=General account number (CompteNum)
 FECFormatGeneralAccountLabel=General account label (CompteLib)
@@ -424,14 +424,14 @@ FECFormatLabelOperation=Label operation (EcritureLib)
 FECFormatDebit=借記（借記）
 FECFormatCredit=貸記（貸記）
 FECFormatReconcilableCode=Reconcilable code (EcritureLet)
-FECFormatReconcilableDate=Reconcilable date (DateLet)
-FECFormatValidateDate=Piece date validated (ValidDate)
-FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
-FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+FECFormatReconcilableDate=可對帳日期
+FECFormatValidateDate=驗證日期
+FECFormatMulticurrencyAmount=多國幣別金額（貨幣金額）
+FECFormatMulticurrencyCode=多國幣別代碼（Idevise）
 
 DateExport=日期輸出
 WarningReportNotReliable=警告，此報表非依總帳製作的，所以不含總帳中人工修改的交易。若您日記簿是最新的日期，則記帳檢視會比較準確。
 ExpenseReportJournal=費用報表日記帳
 InventoryJournal=庫存日記帳
 
-NAccounts=%s accounts
+NAccounts=%s 個帳戶
diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang
index c97be3eb695..ed7f2ed4ea0 100644
--- a/htdocs/langs/zh_TW/admin.lang
+++ b/htdocs/langs/zh_TW/admin.lang
@@ -77,7 +77,7 @@ Dictionary=分類
 ErrorReservedTypeSystemSystemAuto='system' 及 'systemauto' 為保留值。你可使用 'user' 值加到您自己的紀錄中。
 ErrorCodeCantContainZero=代碼不能包含值0
 DisableJavascript=禁用JavaScript和Ajax功能
-DisableJavascriptNote=Note: For test or debug purpose only. For optimization for blind person or text browsers, you may prefer to use the setup on the profile of user
+DisableJavascriptNote=注意：用於測試或除錯目的。為了優化盲人瀏覽器或文字瀏覽器，您可能更喜歡使用用戶個人資料上的設定
 UseSearchToSelectCompanyTooltip=另外您若有大量合作方 (> 100,000), 您可在 "設定 -> 其他" 設定常數 COMPANY_DONOTSEARCH_ANYWHERE 為 1 增加速度。搜尋則會只限制在字串的開頭。
 UseSearchToSelectContactTooltip=另外您若有大量合作方 (> 100,000), 您可在 " 設定 -> 其他" 中設定常數 CONTACT_DONOTSEARCH_ANYWHERE 為 1 以增加速度。搜尋則會只限制在字串的開頭。
 DelaiedFullListToSelectCompany=等待直到按下任一鍵，然後再加載合作方組合清單的內容。 <br>如果您有大量的合作方，這可能會提高性能，但是不太方便。
@@ -267,8 +267,8 @@ OtherResources=其他資源
 ExternalResources=外部資源
 SocialNetworks=社群網路
 SocialNetworkId=社群網路 ID
-ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank" rel="noopener noreferrer">%s</a></b>
-ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank" rel="noopener noreferrer">%s</a></b>
+ForDocumentationSeeWiki=用戶或開發人員的文件（文件，常見問題...), <br>可在Dolibarr維基查閱： <br><b> <a href="%s" target="_blank" rel="noopener noreferrer">%s</a></b>
+ForAnswersSeeForum=有關任何其他問題/幫助，您可以前往Dolibarr論壇：<br><b><a href="%s" target="_blank" rel="noopener noreferrer">%s</a></b>
 HelpCenterDesc1=以下是獲得Dolibarr幫助和支持的一些資源。
 HelpCenterDesc2=其中一些資源僅以<b>英語提供</b> 。
 CurrentMenuHandler=目前選單處理者
@@ -281,7 +281,7 @@ SpaceX=空間 X
 SpaceY=空間 Y
 FontSize=字型大小
 Content=內容
-ContentForLines=Content to display for each product or service (from variable __LINES__ of Content)
+ContentForLines=為每個產品或服務顯示的內容（內容的變數為 __LINES__）
 NoticePeriod=通知期
 NewByMonth=依月份的新通知
 Emails=電子郵件
@@ -359,9 +359,9 @@ LastActivationVersion=最新啟動版本
 UpdateServerOffline=離線更新伺服器
 WithCounter=管理計數器
 GenericMaskCodes=您可以輸入任何編號遮罩。在此遮罩中，可以使用以下標籤： <br> <b>{000000}</b>對應一個數字，該數字將在每個%s上遞增。輸入與計數器所需長度一樣多的零。計數器將從左側的零開始補全，以便具有與遮罩一樣多的零。 <br> <b>{000000+000}</b>與上一個相同，但是從第一個%s開始應用與+號右邊的數字相對應的偏移量。 <br> <b>{000000 @ x}</b>與上一個相同，但是當到達月份x時，計數器會重置為零（x在1到12之間，或者為0以使用您配置中定義的會計年度的前幾個月，或者為99每月重置為零）。如果使用此選項並且x為2或更高，則還需要序列{yy} {mm}或{yyyy} {mm}。 <br> <b>{dd}</b>天（01到31）。 <br> <b>{mm}</b>月（01到12）。 <br> <b>{yy}</b> ， <b>{yyyy}</b>或<b>{y}</b>年超過2、4或1個數字。 <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
+GenericMaskCodes2=<b>{cccc}</b>客戶端用n個字元的代碼 <br> <b>{cccc000}</b>在n個字元上的客戶代碼後跟一個專門為客戶提供的計數器。此專用於客戶的計數器與全域計數器在同一時間重置。 <br> <b>{tttt}</b>合作方類型用n個字元的代碼（請參閱選單 首頁-設定-分類-合作方類型）。如果增加此標籤，則每種類型的合作方的計數器都將不同。 <br>
 GenericMaskCodes3=遮罩中的所有其他字元將保持不變。 <br>不允許使用空格。 <br>
-GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
+GenericMaskCodes3EAN=遮罩中的所有其他字元將保持不變（EAN13 中第 13 位的 * 或 ? 除外）。 <br>不允許使用空格。 <br> 在 EAN13 中，第 13 位最後一個 } 之後的最後一個字元應該是 * 或 ? .它將被計算的金鑰替換。 <br>
 GenericMaskCodes4a=<u>在日期 2007-01-31 ,第99個%s合作方公司範例:</u><br>
 GenericMaskCodes4b=<u>位於2007-03-01 建立的合作方範例:</u><br>
 GenericMaskCodes4c=<u>位於2007-03-01 建立的產品範例:</u><br>
@@ -499,11 +499,11 @@ Use3StepsApproval=預設情況下，採購訂單需要由2個不同的用戶建
 UseDoubleApproval=當金額(未稅)大於以下金額時使用3步驟核准
 WarningPHPMail=警告: 從此應用程式寄出電子郵件的設定使用的是預設的原始設定。相較於使用預設設定用您電子郵件服務提供的電子信箱伺服器來設定寄出郵件是比較好的，理由如下:
 WarningPHPMailA=- 使用電子郵件服務提供者的伺服器可以增加您電子信箱的可信度，所以會增加寄信成功率並且不會被標記為垃圾信件
-WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
-WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
-WarningPHPMailD=Also, it is therefore recommended to change the sending method of e-mails to the value "SMTP". If you really want to keep the default "PHP" method to send emails, just ignore this warning, or remove it by setting the MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP constant to 1 in Home - Setup - Other.
+WarningPHPMailB=- 一些電子郵件服務提供商（如雅虎）不允許您從其他伺服器而不是他們自己的伺服器發送電子郵件。您當前的設定是使用程式的伺服器而不是您的電子郵件提供商的伺服器來發送電子郵件，因此某些收件人（與限制性 DMARC 協議兼容的那個）會詢問您的電子郵件提供商他們是否可以接受您的電子郵件而某些電子郵件供應商（如雅虎）可能會回答“否”，因為伺服器不是他們的，所以您發送的電子郵件中有可能少部份不被接受（還要注意您的電子郵件供應商的發送配額）。
+WarningPHPMailC=- 使用您自己的電子郵件服務提供商的 SMTP 伺服器發送電子郵件也很好，因此從應用程式發送的所有電子郵件也將保存到您電子郵件的“已發送”資料夾中。
+WarningPHPMailD=此外，因此建議將電子郵件的發送方法更改為“SMTP”。如果您確實想保留預設的“PHP”方式來發送電子郵件，只需忽略此警告，或在 首頁 - 設定 - 其他設定 中將 MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP 數值設定為 1 來刪除它。
 WarningPHPMail2=如果您的電子郵件SMTP程式需要將電子郵件客戶端限制為某些IP地址（非常罕見），則這是ERP CRM應用程式的郵件用戶代理（MUA）的IP地址： <strong>%s</strong> 。
-WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=如果您的寄件人電子郵件地址中的網域名稱受到SPF 記錄保護（詢問您的網域名稱註冊商），您必須在您的網域 DNS 的 SPF 記錄中增加以下 IP： <strong> %s </strong> 。
 ActualMailSPFRecordFound=找到的實際 SPF 記錄：%s
 ClickToShowDescription=點選顯示描述
 DependsOn=此模組需要此模組
@@ -522,8 +522,8 @@ ProductDocumentTemplates=文件範例產生產品文件檔案
 FreeLegalTextOnExpenseReports=費用報表中的自由法律文字
 WatermarkOnDraftExpenseReports=費用報表草案上的浮水印
 ProjectIsRequiredOnExpenseReports=此專案強制需要輸入費用報表
-PrefillExpenseReportDatesWithCurrentMonth=Pre-fill start and end dates of new expense report with start and end dates of the current month
-ForceExpenseReportsLineAmountsIncludingTaxesOnly=Force the entry of expense report amounts always in amount with taxes
+PrefillExpenseReportDatesWithCurrentMonth=費用報表的開始和結束日期預先使用當月的開始和結束日期
+ForceExpenseReportsLineAmountsIncludingTaxesOnly=強制以含稅金額輸入費用報表金額
 AttachMainDocByDefault=若您要預設將主要文件附加到電子郵件(若適用的話)，此值設定為 1
 FilesAttachedToEmail=附加檔案
 SendEmailsReminders=用電子郵件傳送行程提醒
@@ -575,7 +575,7 @@ Module54Desc=合約管理（服務或定期訂閱）
 Module55Name=條碼
 Module55Desc=條碼或QR code管理
 Module56Name=信用轉帳付款
-Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module56Desc=以信用轉帳訂單管理供應商的付款。它包括為歐洲國家生產生SEPA檔案。
 Module57Name=銀行直接轉帳付款
 Module57Desc=管理直接轉帳付款訂單。它包括為歐洲國家產生的SEPA檔案。
 Module58Name=點選撥打
@@ -613,7 +613,7 @@ Module400Desc=專案、潛在/機會及/或任務的管理。你也可指派任
 Module410Name=Webcalendar
 Module410Desc=Webcalendar 整合
 Module500Name=稅金和特殊費用
-Module500Desc=Management of other expenses (sales taxes, social or fiscal taxes, dividends, ...)
+Module500Desc=其他費用管理（營業稅，社會或財政稅，股利等）
 Module510Name=薪資
 Module510Desc=記錄並追蹤員工付款
 Module520Name=貸款
@@ -685,7 +685,7 @@ Module50200Desc=向客戶提供一個PayPal線上支付頁面（PayPal帳戶或
 Module50300Name=Stripe
 Module50300Desc=為客戶提供Stripe線上支付頁面（信用卡/金融信用卡）。這可用於允許您的客戶進行臨時付款或與特定Dolibarr項目有關的付款（發票，訂單等）。
 Module50400Name=會計（複式）
-Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=會計管理（雙重條目，支援總帳和分類帳）。以其他幾種會計軟體格式匯出分類帳。
 Module54000Name=PrintIPP
 Module54000Desc=直接列印(不用打開文件)使用 Cups IPP 介面(印表機可在伺服器上看到，且 CUPS 必須已安裝在伺服器上)。
 Module55000Name=問卷、調查或投票
@@ -756,7 +756,7 @@ Permission106=匯出出貨單
 Permission109=刪除出貨單
 Permission111=讀取財務帳戶
 Permission112=建立/修改/刪除及比較交易
-Permission113=設定財務帳戶(建立、管理分類)
+Permission113=設定財務帳戶(銀行交易的建立、管理分類)
 Permission114=調整交易
 Permission115=匯出交易和會計描述
 Permission116=帳戶之間的交易
@@ -765,7 +765,7 @@ Permission121=讀取已連結到用戶的合作方
 Permission122=建立/修改已連結到用戶的合作方
 Permission125=刪除已連結到用戶的合作方
 Permission126=匯出合作方資料
-Permission130=Create/modify third parties payment information
+Permission130=建立/修改合作方支付資訊
 Permission141=讀取全部專案及任務（也包含我不是連絡人的私人專案）
 Permission142=建立/修改全部專案及任務（也包含我不是連絡人的私人專案）
 Permission144=刪除全部專案及任務（也包含我不是連絡人的私人專案）
@@ -827,8 +827,8 @@ PermissionAdvanced253=建立/修改內部/外部用戶資訊和權限
 Permission254=只能建立/修改外部用戶資訊
 Permission255=修改其他用戶密碼
 Permission256=刪除或停用其他用戶
-Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
-Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission262=延伸存取全部合作方與其項目（不只是合作方的業務代表）。<br>對外部用戶無效（限制其本身之提案/建議書、訂單、發票、通訊錄等）。<br>對專案無效（僅在專案存取、顯示及指派事件的規則）
+Permission263=將訪問權限擴展到所有自己沒有項目的合作方（不僅是用戶作為業務代表的合作方）。 <br> 對外部用戶無效（對於提案/建議書、訂單、發票、合約等，始終僅限於他們自己）。 <br> 對專案無效（僅關於專案權限、可見性和分配事項的規則）。
 Permission271=讀取 CA
 Permission272=讀取發票
 Permission273=發票問題
@@ -893,12 +893,11 @@ Permission701=讀取捐款
 Permission702=建立/修改捐款
 Permission703=刪除捐款
 Permission771=讀取費用報表(您自己及您下屬的)
-Permission772=建立/修改費用報表
+Permission772=建立/修改費用報表（為您和您的下屬）
 Permission773=刪除費用報表
-Permission774=讀取全部費用報表(甚至非屬於用戶的下屬)
 Permission775=核准費用報表
 Permission776=支付費用報表
-Permission777=讀取每個人的費用報表
+Permission777=讀取所有費用報表（即使是非下屬的用戶）
 Permission778=建立/修改每個人的費用報表
 Permission779=匯出費用報表
 Permission1001=讀取庫存資訊
@@ -962,18 +961,14 @@ Permission2801=在唯讀模式下使用 FTP 客戶端 (僅瀏覽及下載)
 Permission2802=在寫入模式下使用 FTP 客戶端 (可刪除或上傳檔案)
 Permission3200=讀取存檔的事件和指紋
 Permission3301=產生新模組
-Permission4001=查看員工
-Permission4002=建立員工
-Permission4003=刪除員工
-Permission4004=匯出員工
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+Permission4001=讀取技能/工作/職位
+Permission4002=建立/修改技能/工作/職位
+Permission4003=刪除技能/工作/職位
+Permission4020=讀取評價
+Permission4021=建立/修改您的評價
 Permission4022=驗證評估
-Permission4023=Delete evaluation
-Permission4030=See comparison menu
+Permission4023=刪除評價
+Permission4030=查看比較選單
 Permission10001=讀取網站內容
 Permission10002=建立/修改網站內容（html和javascript內容）
 Permission10003=建立/修改網站內容（動態php代碼）。危險，必須留給受限開發人員使用。
@@ -982,8 +977,8 @@ Permission20001=讀取休假申請（您和您下屬的休假）
 Permission20002=建立/修改您的休假申請（您的休假和下屬的休假）
 Permission20003=刪除休假申請
 Permission20004=讀取全部休假申請 (甚至非您下屬的用戶)
-Permission20005=建立/修改全部人休假申請(甚至非您下屬的用戶)
-Permission20006=管理休假需求(設定及更新餘額)
+Permission20005=建立/修改所有人的休假申請(甚至非您下屬的用戶)
+Permission20006=管理休假申請（設定與更新餘額）
 Permission20007=批准休假申請
 Permission23001=讀取預定工作
 Permission23002=建立/更新預定工作
@@ -1056,7 +1051,7 @@ DictionaryFees=費用報表-費用報表行的類型
 DictionarySendingMethods=出貨方式
 DictionaryStaff=員工人數
 DictionaryAvailability=遲延交付
-DictionaryOrderMethods=Order methods
+DictionaryOrderMethods=訂購方式
 DictionarySource=原始提案/建議書/訂單
 DictionaryAccountancyCategory=報告的個人化組別
 DictionaryAccountancysystem=會計科目表模型
@@ -1189,8 +1184,8 @@ DoNotSuggestPaymentMode=不建議
 NoActiveBankAccountDefined=沒有定義有效的銀行帳戶
 OwnerOfBankAccount=銀行帳戶擁有者%s
 BankModuleNotActive=銀行帳戶模組沒有啟用
-ShowBugTrackLink=Show the link "<strong>%s</strong>"
-ShowBugTrackLinkDesc=Keep empty to not display this link, use value 'github' for the link to the Dolibarr project or define directly an url 'https://...'
+ShowBugTrackLink=顯示連結"<strong>%s</strong>"
+ShowBugTrackLinkDesc=保持空白以隱藏此連結，使用值 'github' 作為 Dolibarr 專案的連結或直接定義一個網址'https://...'
 Alerts=警告
 DelaysOfToleranceBeforeWarning=顯示警告警報之前的延遲時間：
 DelaysOfToleranceDesc=設定延遲時間，以在螢幕上顯示延遲元件的警告圖案%s。
@@ -1215,9 +1210,9 @@ SetupDescription2=以下兩個部分是必需的（“設定”選單中的前
 SetupDescription3= <a href="%s"> %s-> %s </a> <br> <br>用於自訂您的應用程式預設行為的基本參數（例如 跟國家相關的功能）。
 SetupDescription4= <a href="%s"> %s-> %s </a> <br> <br>此軟體是許多模組/應用程式的套件。必須啟用和配置與您的需求相關的模組。這些模組啟動後將會顯示在選單上。
 SetupDescription5=其他設定選單項目管理可選參數。
-SetupDescriptionLink=<a href="%s">%s - %s</a>
-SetupDescription3b=Basic parameters used to customize the default behavior of your application (e.g for country-related features).
-SetupDescription4b=This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
+SetupDescriptionLink= <a href="%s"> %s - %s </a>
+SetupDescription3b=用於自定義應用程式預設行為的基本參數（例如與國家/地區相關的功能）。
+SetupDescription4b=此軟體是許多模組/應用程式的套件。必須啟用和設定與您的需求相關的模組。啟用這些模組後將出現選單項目。
 AuditedSecurityEvents=已審計的安全性事件
 NoSecurityEventsAreAduited=無已審計的安全性事件。您可以啟用從選單 %s
 Audit=安全事件
@@ -1240,7 +1235,7 @@ SystemAreaForAdminOnly=此區域僅管理員可用。 Dolibarr用戶權限無法
 CompanyFundationDesc=編輯您的 公司/組織 資訊。完成後，點擊頁面底部的“ %s”按鈕。
 AccountantDesc=如果您有外部會計師/簿記員，則可以在此處編輯其資訊。
 AccountantFileNumber=會計代碼
-DisplayDesc=Parameters affecting the look and presentation of the application can be modified here.
+DisplayDesc=可以在此處修改影響應用程式外觀和顯示的參數。
 AvailableModules=可用的程式/模組
 ToActivateModule=為啟動模組前往設定區（首頁 -> 設定 -> 模組）。
 SessionTimeOut=程序超時
@@ -1287,12 +1282,12 @@ RunningUpdateProcessMayBeRequired=似乎需要執行升級（程式版本%s與
 YouMustRunCommandFromCommandLineAfterLoginToUser=用戶<b>%s</b>在登入終端機後您必須從命令列執行此命令，或您必須在命令列末增加 -W 選項以提供 <b>%s</b> 密碼。
 YourPHPDoesNotHaveSSLSupport=您的PHP中無法使用SSL功能
 DownloadMoreSkins=更多佈景主題下載
-SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
-SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefModelDesc=回傳格式為 %syymm-nnnn 的參考編號，其中 yy 是年份，mm 是月份，nnnn 是自動遞增的連續數字，無法重置
+SimpleNumRefNoDateModelDesc=回傳格式為 %s-nnnn 的參考號，其中 nnnn 是自動遞增的連續數字，無法重置
 ShowProfIdInAddress=顯示含有地址的專業 ID
 ShowVATIntaInAddress=隱藏歐盟內增值稅號
 TranslationUncomplete=部分翻譯
-MAIN_DISABLE_METEO=Disable weather thumb
+MAIN_DISABLE_METEO=停用氣象顯示
 MeteoStdMod=標準模式
 MeteoStdModEnabled=標準模式啟用
 MeteoPercentageMod=百分比模式
@@ -1306,7 +1301,7 @@ MAIN_PROXY_HOST=代理伺服器：名稱/地址
 MAIN_PROXY_PORT=代理伺服器：連接埠
 MAIN_PROXY_USER=代理伺服器：登入名稱/用戶
 MAIN_PROXY_PASS=代理伺服器：密碼
-DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
+DefineHereComplementaryAttributes=在此處定義您想要包括的任何其他/自定義屬性：%s
 ExtraFields=補充屬性
 ExtraFieldsLines=補充屬性(行)
 ExtraFieldsLinesRec=補充屬性 ( 範本發票行)
@@ -1356,16 +1351,16 @@ ComboListOptim=組合清單載入優化
 SearchOptim=搜尋最佳化
 YouHaveXObjectUseComboOptim=您有 %s %s 在資料庫內。您可以進入模組設定以啟用在按鍵事件上加載組合清單。
 YouHaveXObjectUseSearchOptim=您的資料庫中有%s %s。您應該在首頁-設定-其他中的%s增加常數1。
-YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectUseSearchOptimDesc=這將限制搜尋在字串的開頭，這使得資料庫可以使用索引，並且您應該立即得到回應。
 YouHaveXObjectAndSearchOptimOn=您在資料庫中有%s %s，並且在首頁-設定-其他中，常數%s設定為%s。
 BrowserIsOK=您正在使用%s 網頁瀏覽器。此瀏覽器可以確保安全性和性能。
 BrowserIsKO=您正在使用%s 網頁瀏覽器。眾所周知，此瀏覽器是安全性，性能和可靠性的錯誤選擇。我們建議使用Firefox，Chrome，Opera或Safari。
 PHPModuleLoaded=PHP組件%s已載入
 PreloadOPCode=已使用預載入OPCode
-AddRefInList=Display Customer/Vendor ref. into combo lists.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
-AddVatInList=Display Customer/Vendor VAT number into combo lists.
-AddAdressInList=Display Customer/Vendor adress into combo lists.<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
-AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
+AddRefInList=於組合清單中顯示客戶/供應商代號。 <br> 合作方將以“CC12345 - SC45678 - 大公司.”的名稱格式出現。而不是“大公司”。
+AddVatInList=在複合清單中顯示客戶/供應商的統一編號。
+AddAdressInList=於組合清單中顯示客戶/供應商地址。 <br> 合作方將以“大公司. - 21 jump street 123456 Big town - USA”的名稱格式出現，而不是“大公司”。
+AddEmailPhoneTownInContactList=在資訊清單中顯示聯絡人電子郵件（或電話，如果未定義）和城鎮（選擇清單或複合框） <br> 聯絡人將以“杜邦杜蘭德 - dupond.durand@email.com - 巴黎”或“杜邦杜蘭德 - 06 07”的名稱格式顯示59 65 66 - 巴黎”而不是“杜邦杜蘭德”。
 AskForPreferredShippingMethod=要求合作方使用首選的運輸方式。
 FieldEdition=欗位 %s編輯
 FillThisOnlyIfRequired=例如： +2 (若遇到時區偏移問題時才填寫)
@@ -1373,7 +1368,7 @@ GetBarCode=取得條碼
 NumberingModules=編號模型
 DocumentModules=文件模型
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
+PasswordGenerationStandard=回傳根據 Dolibarr 內部算法產生的密碼：%s 個字元，包含數字和小寫字元。
 PasswordGenerationNone=不要產生建議密碼。密碼必須手動輸入。
 PasswordGenerationPerso=根據您個人定義的偏好設定返回密碼。
 SetupPerso=根據您的偏好設定
@@ -1395,7 +1390,7 @@ AccountCodeManager=自動產生客戶/供應商會計代碼的選項
 NotificationsDesc=對於某些Dolibarr事件，可以自動發送電子郵件通知。 <br>可以定義通知的收件人：
 NotificationsDescUser=*每位用戶，一次一個用戶。
 NotificationsDescContact=*對於每個合作方聯絡人（客戶或供應商），一次為一個聯絡人。
-NotificationsDescGlobal=* or by setting global email addresses in the setup page of the module.
+NotificationsDescGlobal=*或在模組設定頁面中設定全域電子郵件地址。
 ModelModules=文件範本
 DocumentModelOdt=從OpenDocument範本產生文件（來自LibreOffice，OpenOffice，KOffice，TextEdit等的.ODT / .ODS文件）
 WatermarkOnDraft=草稿文件上的浮水印
@@ -1495,10 +1490,10 @@ LDAPSynchronizeMembersTypes=在 LDAP 中基金會組織的會員類型
 LDAPPrimaryServer=主要伺服器
 LDAPSecondaryServer=次要伺服器
 LDAPServerPort=伺服器連接埠
-LDAPServerPortExample=Standard or StartTLS: 389, LDAPs: 636
+LDAPServerPortExample=標準或 StartTLS：389，LDAP：636
 LDAPServerProtocolVersion=通訊協議版本
 LDAPServerUseTLS=使用 TLS
-LDAPServerUseTLSExample=Your LDAP server use StartTLS
+LDAPServerUseTLSExample=您的 LDAP 伺服器使用StartTLS
 LDAPServerDn=伺服器DN
 LDAPAdminDn=管理員DN
 LDAPAdminDnExample=完整 DN ( 例如：針對啟動資料夾 cn=admin, dc=example, dc=com 或  cn=Administrator, cn=Users, dc=example, dc=com )
@@ -1648,13 +1643,13 @@ ProductSetup=產品模組設定
 ServiceSetup=服務模組設定
 ProductServiceSetup=產品和服務模組設定
 NumberOfProductShowInSelect=組合選擇清單中可顯示的最大產品數量（0 =無限制）
-ViewProductDescInFormAbility=Display product descriptions in lines of items (otherwise show description in a tooltip popup)
+ViewProductDescInFormAbility=在項目行中顯示產品描述（否則在工具提示彈出視窗中顯示描述）
 OnProductSelectAddProductDesc=從文件當中增加一個產品行時如何使用產品描述
 AutoFillFormFieldBeforeSubmit=自動將產品描述填入描述輸入欄位
 DoNotAutofillButAutoConcat=請不要將產品描述自動填入輸入欄位.產品描述將自動串連到整個描述
-DoNotUseDescriptionOfProdut=Description of the product will never be included into the description of lines of documents
+DoNotUseDescriptionOfProdut=產品描述永遠不會包含在文件行的描述中
 MergePropalProductCard=若產品/服務在提案/建議書內，啟動產品/服務中附件檔分頁選項以將產品 PDF 文件整合成報價/建議書/提案的 azur 格式 PDF
-ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
+ViewProductDescInThirdpartyLanguageAbility=使用合作方的語言（否則使用用戶的語言）在表單中顯示產品描述
 UseSearchToSelectProductTooltip=同樣，如果您有大量產品(> 100 000)，則可以通過在設定-其他中將PRODUCT_DONOTSEARCH_ANYWHERE常數變數變為1來提高速度。然後搜尋將僅限於字串開頭的。
 UseSearchToSelectProduct=等到您按下一個鍵，然後再載入產品組合清單的內容（如果您有很多產品，這可能會提高性能，但是使用起來不太方便）
 SetDefaultBarcodeTypeProducts=產品預設條碼類型
@@ -1671,7 +1666,7 @@ SyslogLevel=層級
 SyslogFilename=檔案名稱和路徑
 YouCanUseDOL_DATA_ROOT=您可使用在 Dolibarr "文件"資料夾的日誌檔案 DOL_DATA_ROOT/dolibarr.log來紀錄 。您可以設定不同的路徑來存儲該檔案。
 ErrorUnknownSyslogConstant=常數 %s 不是一個已知的 Syslog 常數
-OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
+OnlyWindowsLOG_USER=在 Windows中，僅支援 LOG_USER 工具
 CompressSyslogs=除錯記錄檔案的縮壓及備份(由記錄除錯模組產生的)
 SyslogFileNumberOfSaves=要保留的備份日誌數
 ConfigureCleaningCronjobToSetFrequencyOfSaves=清除偏好設定的排程工作以設定週期備份日誌
@@ -1712,9 +1707,9 @@ MailingDelay=傳送下一則訊息前的等待秒數
 NotificationSetup=電子郵件通知模組設定
 NotificationEMailFrom=通知模組中的寄件人電子郵件（From）
 FixedEmailTarget=收件人
-NotificationDisableConfirmMessageContact=Hide the list of recipients (subscribed as contact) of notifications into the confirmation message
-NotificationDisableConfirmMessageUser=Hide the list of recipients (subscribed as user) of notifications into the confirmation message
-NotificationDisableConfirmMessageFix=Hide the list of recipients (subscribed as global email) of notifications into the confirmation message
+NotificationDisableConfirmMessageContact=隱藏訊息收件人(聯絡人)清單到確認訊息中
+NotificationDisableConfirmMessageUser=隱藏訊息收件人(用戶)清單到確認訊息中
+NotificationDisableConfirmMessageFix=隱藏訊息收件人(全域電子郵件)清單到確認訊息中
 ##### Sendings #####
 SendingsSetup=發貨模組設定
 SendingsReceiptModel=出貨單模型
@@ -1730,10 +1725,10 @@ FreeLegalTextOnDeliveryReceipts=出貨單的加註文字
 ##### FCKeditor #####
 AdvancedEditor=進階編輯器
 ActivateFCKeditor=啟用進階編輯器：
-FCKeditorForNotePublic=WYSIWIG creation/edition of the field "public notes" of elements
-FCKeditorForNotePrivate=WYSIWIG creation/edition of the field "private notes" of elements
-FCKeditorForCompany=WYSIWIG creation/edition of the field description of elements (except products/services)
-FCKeditorForProduct=WYSIWIG creation/edition of the field description of products/services
+FCKeditorForNotePublic=所見即所得編輯器建立/編輯元件欄位的“公開備註”
+FCKeditorForNotePrivate=所見即所得編輯器建立/編輯元件欄位的“不公開備註”
+FCKeditorForCompany=所見即所得編輯器建立/編輯元件欄位描述（產品/服務除外）
+FCKeditorForProduct=所見即所得建立/編輯產品/服務的欄位描述
 FCKeditorForProductDetails=所見即所得為所有項目（提案/建議書，訂單，發票等）建立/編輯產品明細行。 <font class="warning">警告：在這種情況下，強烈建議不要使用此選項，因為在產生PDF文件時，它會產生特殊字元和頁面格式的問題。</font>
 FCKeditorForMailing= 以所見即所得建立/編輯電子郵件 ( 工具 --> 電子郵件 )
 FCKeditorForUserSignature=以所見即所得建立/編輯用戶簽名檔
@@ -1751,7 +1746,7 @@ NotTopTreeMenuPersonalized=個人化選單沒有連結到頂端選單項目
 NewMenu=新選單
 MenuHandler=選單處理程式
 MenuModule=原始碼模組
-HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
+HideUnauthorizedMenu=也為內部用戶隱藏未經授權的選單（灰色）
 DetailId=選單編號
 DetailMenuHandler=顯示新的選單的選單處理程式
 DetailMenuModule=若選單項目來自一個模組則為模組名稱
@@ -1791,7 +1786,7 @@ YourCompanyDoesNotUseVAT=您的公司尚未定義使用營業稅 ( 首頁 - 設
 AccountancyCode=會計代碼
 AccountancyCodeSell=銷售會計代碼
 AccountancyCodeBuy=採購會計代碼
-CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=建立新稅額時，預設將“自動建立付款”複選框保留為空
 ##### Agenda #####
 AgendaSetup=事件和應辦事項模組設定
 PasswordTogetVCalExport=授權匯出連結秘鑰
@@ -1802,17 +1797,17 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=在事件建立表單中自動為事件類型設
 AGENDA_DEFAULT_FILTER_TYPE=在應辦事項視圖的搜索過濾器中自動設定此類事件
 AGENDA_DEFAULT_FILTER_STATUS=在應辦事項視圖的搜索過濾器中自動為事件設定此狀態
 AGENDA_DEFAULT_VIEW=當選擇應辦事項選單時預設要打開的分頁
-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=<b>在用戶的瀏覽器上</b>啟用事件提醒（到達事件日期時，瀏覽器會跳出提醒視窗.每個用戶都可以從瀏覽器提醒設定中停用此提醒）
 AGENDA_REMINDER_BROWSER_SOUND=啟用音效警告
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL=啟用以<b>電子郵件</b>事件提醒（可以在每個事件上定義提醒選項/延遲）。
+AGENDA_REMINDER_EMAIL_NOTE=注意：排程工作%s的頻率必須足夠以確定提醒可以在正確的時刻寄出。
 AGENDA_SHOW_LINKED_OBJECT=顯示已連結項目到行程的檢視中
 ##### Clicktodial #####
 ClickToDialSetup=點擊撥號模組設定
 ClickToDialUrlDesc=當點選電話圖示時則呼叫網址。在網址中，你可使用標籤<br><b>__PHONETO__</b>，他可取代個人撥打的電話號碼<br><b>__PHONEFROM__</b>，他可以取代個人的電話號碼(您自己的)<br><b>__LOGIN__</b>，他可以取代點選撥打登錄(在用戶卡中定義)<br><b>__PASS__</b>，他可以取代點選撥打密碼(在用戶卡中定義)。
-ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
+ClickToDialDesc=此模組在使用桌上型電腦時會將電話號碼更改為可點擊的連結。點擊將會撥打此號碼。例如，當在桌面上使用軟體電話或使用基於 SIP 協議的 CTI 系統時，這可用於啟動撥打電話。注意：使用智慧手機時，電話號碼始終是可點擊的。
 ClickToDialUseTelLink=在電話號碼中使用 "tel:" 連線
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need a link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill the next field.
+ClickToDialUseTelLinkDesc=如果您的用戶有軟體電話或軟體界面，與瀏覽器安裝在同一台電腦上，並要在您點擊瀏覽器中以“tel:”開頭的連結時撥打，請使用此方法。如果您需要以“sip:”開頭的連結或完整的服務器解決方案（無需安裝本地軟體），您必須將其設定為“否”並填寫下一個欄位。
 ##### Point Of Sale (CashDesk) #####
 CashDesk=銷售點
 CashDeskSetup=銷售點模組設定
@@ -1906,7 +1901,7 @@ ExpenseReportsRulesSetup=費用報表模組設定-規則
 ExpenseReportNumberingModules=費用報表編號模組
 NoModueToManageStockIncrease=沒有啟用能夠管理自動庫存增加的模組。庫存增加將僅能手動輸入。
 YouMayFindNotificationsFeaturesIntoModuleNotification=您可以通過啟用和設定模組“通知”來找到電子郵件通知的選項。
-TemplatesForNotifications=Templates for notifications
+TemplatesForNotifications=通知的模板
 ListOfNotificationsPerUser=每個用戶的自動通知清單*
 ListOfNotificationsPerUserOrContact=每個用戶*或每個聯絡人**的自動通知（在業務事件中）清單
 ListOfFixedNotifications=自動固定通知清單
@@ -1937,17 +1932,17 @@ BackgroundTableLineOddColor=表格奇數行的背景顏色
 BackgroundTableLineEvenColor=表格偶數行的背景色
 MinimumNoticePeriod=最短通知期限（您的休假申請必須在此之前完成）
 NbAddedAutomatically=每月（自動）新增到用戶計數器的天數
-EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
+EnterAnyCode=此欄位包含用於識別行的參考。輸入您選擇的任何值，但不能包含特殊字元。
 Enter0or1=輸入0或1
 UnicodeCurrency=在括號之間輸入代表貨幣符號的字元數列表。例如：對於$，輸入[36]-對於巴西R $ [82,36]-對於€，輸入[8364]
 ColorFormat=在 HEX 格式中 RGB 顏色，例如： FF0000
-PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
+PictoHelp=dolibarr 格式的圖標名稱（如果進入目前主題資料夾“image.png”，如果進入模組的資料夾/img/“image.png@nom_du_module”）
 PositionIntoComboList=行的位置放到組合清單中
 SellTaxRate=銷售稅率
 RecuperableOnly=在法國某些州營業稅是 “Not Perceived but Recoverable”。 在其他情況下，則將該值保持為“否”。
 UrlTrackingDesc=如果供應商或運輸服務商提供頁面或網站來檢查貨件狀態，則可以在此處輸入。您可以在網址參數中使用密鑰{TRACKID}，以便系統將其替換為用戶在發貨卡中輸入的追踪號碼。
 OpportunityPercent=建立潛在時，您將定義專案/潛在的估計金額。根據潛在的狀態，此金額可能會乘以此比率，以評估您所有潛在客戶可能產生的總金額。值是一個百分比（0到100之間）。
-TemplateForElement=This mail template is related to what type of object? An email template is available only when using the "Send Email" button from the related object.
+TemplateForElement=此郵件模板與什麼類型的項目相關？電子郵件模板僅在使用相關項目中的“發送電子郵件”按鈕時可用。
 TypeOfTemplate=範本類型
 TemplateIsVisibleByOwnerOnly=範本僅所有者可見
 VisibleEverywhere=到處可見
@@ -2022,8 +2017,8 @@ MAIN_PDF_MARGIN_RIGHT=PDF右邊邊距
 MAIN_PDF_MARGIN_TOP=PDF頂部邊距
 MAIN_PDF_MARGIN_BOTTOM=PDF底部邊距
 MAIN_DOCUMENTS_LOGO_HEIGHT=PDF上Logo的高度
-MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
-MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Width of the column if a picture is added on lines
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=在提案/建議書行加入圖片欄位
+MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=欄位寬度-如果在行上加入圖片
 MAIN_PDF_NO_SENDER_FRAME=隱藏寄件人地址框的邊框
 MAIN_PDF_NO_RECIPENT_FRAME=隱藏收件人地址框的邊框
 MAIN_PDF_HIDE_CUSTOMER_CODE=隱藏客戶代碼
@@ -2033,7 +2028,7 @@ PROPOSAL_PDF_HIDE_PAYMENTMODE=隱藏付款方式
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=在 PDF 中增加電子簽名
 NothingToSetup=此模組不需要特別的設定。
 SetToYesIfGroupIsComputationOfOtherGroups=若此群組是其他群組的計算值，則將其設定為 "是"
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
+EnterCalculationRuleIfPreviousFieldIsYes=如果先前欄位設定為“是”，則輸入計算規則.<br>例如:<br>CODEGRP1 + CODEGRP2
 SeveralLangugeVariatFound=發現數個語言變數
 RemoveSpecialChars=刪除特殊字元
 COMPANY_AQUARIUM_CLEAN_REGEX=用正則表達式篩選器清除值（COMPANY_AQUARIUM_CLEAN_REGEX）
@@ -2069,13 +2064,14 @@ EmailCollectorConfirmCollect=您是否要立即執行此收集器的收集？
 NoNewEmailToProcess=沒有新的電子郵件（與篩選匹配）要處理
 NothingProcessed=什麼都沒做
 XEmailsDoneYActionsDone=%s電子郵件合格，%s電子郵件已成功處理（對於%s記錄/已完成操作）
-RecordEvent=記錄電子郵件事件
+RecordEvent=在行事曆中記錄事件（類型為發送或接收的電子郵件）
 CreateLeadAndThirdParty=建立潛在(必要時建立合作方)
-CreateTicketAndThirdParty=建立服務單(如果之前已執行讀取也連結至合作方)
+CreateTicketAndThirdParty=建立服務單(如果之前已執行讀取也連結至合作方,否則無合作方)
 CodeLastResult=最新結果代碼
 NbOfEmailsInInbox=來源資料夾中的電子郵件數量
 LoadThirdPartyFromName=在%s載入合作方搜尋 (僅載入)
 LoadThirdPartyFromNameOrCreate= 在%s載入合作方搜尋 (如果找不到就建立)
+AttachJoinedDocumentsToObject=如果在電子郵件主題中找到項目的引用，則將附件保存到項目文件中。
 WithDolTrackingID=來自Dolibarr寄送的第一封電子郵件發起的對話訊息
 WithoutDolTrackingID=來自第一封電子郵件發起的對話的訊息不是從 Dolibarr 發送的
 WithDolTrackingIDInMsgId=來自Dolibarr的訊息
@@ -2084,7 +2080,7 @@ CreateCandidature=建立工作應用程式
 FormatZip=Zip
 MainMenuCode=選單輸入代碼（主選單）
 ECMAutoTree=顯示自動ECM樹狀圖
-OperationParamDesc=定義用於操作的值，或如何提取值. 範例:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:我的公司名稱為\\s([^\\s]*)<br><br>使用; char作為分隔符號以提取或設定幾個屬性。
+OperationParamDesc=定義用於提取或設定數值的規則。 <br> 需要從電子郵件主題中提取名稱的操作範例：<br> name=EXTRACT:SUBJECT:公司訊息 ([^\n] *）<br>操作建立物件的範例：<br> objproperty1 = SET：要設定的數值<br> objproperty2 = SET：__objproperty1__要包括的數值 <br> objproperty3=SETIFEMPTY:objproperty3尚未定義時要使用的數值<br> objproperty4 = EXTRACT：HEADER :X-Myheaderkey:\\s*([^\\s]*) <br> options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*) <br> object.objproperty5=EXTRACT:BODY:我的公司名稱是\\s( [^\\s]*) <br> <br> 使用 ; char 作為分隔符來提取或設定幾個屬性。
 OpeningHours=營業時間
 OpeningHoursDesc=在此處輸入貴公司的正常營業時間。
 ResourceSetup=資源模組的設定
@@ -2130,7 +2126,7 @@ LargerThan=大於
 IfTrackingIDFoundEventWillBeLinked=請注意，如果在電子郵件中發現項目的追蹤 ID，或者如果電子郵件是已收集並連結到項目的電子郵件的回覆，則建立的事件將自動連結到已知的相關項目。
 WithGMailYouCanCreateADedicatedPassword=對於GMail帳戶，如果啟用了兩步驗證，建議您為應用程序建立專用的第二個密碼，而不要使用來自https://myaccount.google.com/的帳戶密碼。
 EmailCollectorTargetDir=當成功地寄出電子郵件後，您可能想將電子郵件移動到另一個標籤/資料夾。只需在此處設定一個值即可使用此功能。請注意，您還必須使用可讀/寫的登入帳戶。
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+EmailCollectorLoadThirdPartyHelp=您可以使用此操作來使用電子郵件內容在資料庫中搜尋和讀取現有合作方。找到的（或建立的）合作方將用於後續需要它的操作。 <br> 例如，如果您想建立一個合作方，其名稱從正文中存在的字串“名稱：要搜尋的名稱”中提取，使用發件人電子郵件作為電子郵件，您可以像這樣設定參數欄位：<br> 'email=HEADER：^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;' <br>
 EndPointFor=%s的端點：%s
 DeleteEmailCollector=刪除電子郵件收集器
 ConfirmDeleteEmailCollector=您確定要刪除此電子郵件收集器嗎？
@@ -2147,7 +2143,7 @@ EMailsWillHaveMessageID=電子郵件將具有與此語法匹配的標籤“參
 PDF_SHOW_PROJECT=在文件中顯示專案
 ShowProjectLabel=專案標籤
 PDF_USE_ALSO_LANGUAGE_CODE=如果您要在生成同一的PDF中以兩種不同的語言複製一些文字，則必須在此處設置第二種語言讓生成的PDF在同一頁中包含兩種不同的語言，選擇的可以用來生成PDF跟另一種語言（只有少數PDF模板支援此功能)。PDF只有一種語言則留空。
-PDF_USE_A=Gererate PDF documents with format PDF/A instead of defaut format PDF
+PDF_USE_A=產生使用PDF/A格式的PDF文件而不是預設格式的PDF
 FafaIconSocialNetworksDesc=在此處輸入FontAwesome圖示的代碼。如果您不知道什麼是FontAwesome，則可以使用通用值fa-address-book。
 RssNote=注意：每個RSS訂閱的定義都提供一個小工具，您必須啟用該小工具才能使其在資訊板中看到
 JumpToBoxes=跳至設定 -> 小工具
@@ -2179,7 +2175,7 @@ NoWritableFilesFoundIntoRootDir=在您的根目錄中找不到一般程式可寫
 RecommendedValueIs=建議：%s
 Recommended=推薦的
 NotRecommended=不建議
-ARestrictedPath=Some restricted path
+ARestrictedPath=一些受限路徑
 CheckForModuleUpdate=檢查外部模組更新
 CheckForModuleUpdateHelp=此操作將連接到外部模組的編輯器以檢查是否有新版本。
 ModuleUpdateAvailable=有可用的更新
@@ -2192,10 +2188,10 @@ DatabasePasswordNotObfuscated=資料庫密碼在conf檔案中不是加密
 APIsAreNotEnabled=未啟用 API 模組
 YouShouldSetThisToOff=您應該將此設定為 0 或off
 InstallAndUpgradeLockedBy=安裝與升級已被檔案<b>%s</b>鎖定
-OldImplementation=Old implementation
+OldImplementation=舊執行
 PDF_SHOW_LINK_TO_ONLINE_PAYMENT=如果有一些線上支付模組已啟用(Paypal, Stripe, ...),在PDF中加入一個線上支付的連結
 DashboardDisableGlobal=禁用所有開放項目縮圖
-BoxstatsDisableGlobal=Disable totally box statistics
+BoxstatsDisableGlobal=完全停用盒子統計
 DashboardDisableBlocks=位於首頁中的開放項目縮圖(執行中或已延遲)
 DashboardDisableBlockAgenda=禁用應辦事項縮圖
 DashboardDisableBlockProject=禁用專案縮圖
@@ -2214,8 +2210,9 @@ LanguageAndPresentation=語言和介紹
 SkinAndColors=外觀和顏色
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=如果您想使用第二種稅率，您仍須啟用第一種稅率
 IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=如果您想使用第三種稅率，您仍須啟用第一種稅率
-PDF_USE_1A=Generate PDF with PDF/A-1b format
-MissingTranslationForConfKey = Missing translation for %s
-NativeModules=Native modules
-NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
-API_DISABLE_COMPRESSION=Disable compression of API responses
+PDF_USE_1A=產生PDF/A-1b 格式的 PDF
+MissingTranslationForConfKey = 缺少 %s 的翻譯
+NativeModules=原生模組
+NoDeployedModulesFoundWithThisSearchCriteria=未找到符合這些搜索條件的模組
+API_DISABLE_COMPRESSION=停用API回應壓縮
+EachTerminalHasItsOwnCounter=每個終端機使用自己的櫃台。
diff --git a/htdocs/langs/zh_TW/banks.lang b/htdocs/langs/zh_TW/banks.lang
index e32b4225b02..9d193bc3d40 100644
--- a/htdocs/langs/zh_TW/banks.lang
+++ b/htdocs/langs/zh_TW/banks.lang
@@ -108,13 +108,13 @@ SocialContributionPayment=社會/財務稅負繳款單
 BankTransfer=銀行轉帳
 BankTransfers=銀行轉帳
 MenuBankInternalTransfer=內部轉帳
-TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
+TransferDesc=使用內部轉帳從一個帳戶轉賬到另一個帳戶，程式將會寫入兩條記錄：來源帳戶中的借方和目標帳戶中的貸方。此交易將使用相同的金額、標籤和日期。
 TransferFrom=從
 TransferTo=至
 TransferFromToDone=從<b>%s</b>到<b>%s</b>的<b>%s</b>%s轉帳已記錄。
 CheckTransmitter=寄件人
 ValidateCheckReceipt=驗證此支票收據
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
+ConfirmValidateCheckReceipt=您確定要驗證這張支票收據嗎？一旦完成將無法再次更動.
 DeleteCheckReceipt=刪除支票收據？
 ConfirmDeleteCheckReceipt=您確認定您要刪除此張支票收據？
 BankChecks=銀行支票
@@ -141,7 +141,7 @@ AllAccounts=所有銀行及現金帳戶
 BackToAccount=回到帳戶
 ShowAllAccounts=顯示所有帳戶
 FutureTransaction=未來交易。無法調節。
-SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
+SelectChequeTransactionAndGenerate=選擇/篩選要包括在支票存款收據中的支票，然後點擊“建立”。
 InputReceiptNumber=選擇與調節相關的銀行對帳單。使用可排序的數值：YYYYMM或YYYYMMDD
 EventualyAddCategory=最後，指定要對記錄進行分類的類別
 ToConciliate=對帳嗎？
@@ -173,12 +173,12 @@ YourSEPAMandate=您的歐洲統一支付區要求
 FindYourSEPAMandate=這是您SEPA的授權，授權我們公司向您的銀行直接付款。退還已簽名（掃描已簽名文檔）或通過郵件發送至
 AutoReportLastAccountStatement=進行對帳時，自動用最後一個對帳單編號填寫“銀行對帳單編號”欄位
 CashControl=POS收銀台控制
-NewCashFence=New cash desk opening or closing
+NewCashFence=新收銀台開啟或關閉
 BankColorizeMovement=動作顏色
 BankColorizeMovementDesc=如果啟用此功能，則可以為借款方或貸款方動作選擇特定的背景顏色
 BankColorizeMovementName1=借款方動作的背景顏色
 BankColorizeMovementName2=貸款方動作的背景顏色
 IfYouDontReconcileDisableProperty=如果您不對某些銀行帳戶進行銀行對帳，請在其上禁用屬性“ %s”以刪除此警告。
 NoBankAccountDefined=未定義銀行帳戶
-NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
-AlreadyOneBankAccount=Already one bank account defined
+NoRecordFoundIBankcAccount=在銀行帳戶中沒有找到記錄。通常，當一條記錄從銀行帳戶的交易清單中手動刪除時（例如在銀行帳戶對帳期間），就會發生這種情況。另一個原因是在停用模組“%s”時記錄了付款。
+AlreadyOneBankAccount=已定義一個銀行帳戶
diff --git a/htdocs/langs/zh_TW/bills.lang b/htdocs/langs/zh_TW/bills.lang
index 31f5d3da6ab..94430b99a96 100644
--- a/htdocs/langs/zh_TW/bills.lang
+++ b/htdocs/langs/zh_TW/bills.lang
@@ -84,8 +84,6 @@ PaymentRule=付款條件
 PaymentMode=付款類型
 DefaultPaymentMode=預設付款類型
 DefaultBankAccount=預設銀行帳戶
-PaymentTypeDC=借/貸卡片
-PaymentTypePP=PayPal
 IdPaymentMode=付款類型 (id)
 CodePaymentMode=付款類型（編碼）
 LabelPaymentMode=付款類型（標籤）
@@ -192,7 +190,7 @@ ConfirmClassifyPaidPartiallyReasonDiscount=未付款餘額<b>（%s %s）</b>是
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=未付款餘額<b>（%s %s）</b>是折扣，因為付款是在付款到期日前進行的。。我司接受此折扣不加營業稅。
 ConfirmClassifyPaidPartiallyReasonDiscountVat=剩餘未付款項<b>(%s %s)</b>同意為折扣，因為付款是在付款到期日前完成的。我在沒有同意折讓照會通知的情況下以這種折扣方式恢復營業稅。
 ConfirmClassifyPaidPartiallyReasonBadCustomer=壞客戶
-ConfirmClassifyPaidPartiallyReasonBankCharge=Deduction by bank (intermediary bank fees)
+ConfirmClassifyPaidPartiallyReasonBankCharge=銀行扣除（中介銀行手續費）
 ConfirmClassifyPaidPartiallyReasonProductReturned=產品部分退貨
 ConfirmClassifyPaidPartiallyReasonOther=因其他原因而放棄的金額
 ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=如果您的發票已提供適當的註釋，則可以選擇此選項。 （例如，“只有與實際支付的價格相對應的稅才有扣除的權利”）
@@ -200,7 +198,7 @@ ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=在某些國家/地區，只
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=如果其他所有條件都不適合，請使用此選項
 ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b>壞客戶</b>是拒絕付款的客戶。
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=由於部分產品已退還而付款未完成時，使用此選項
-ConfirmClassifyPaidPartiallyReasonBankChargeDesc=The unpaid amount is <b>intermediary bank fees</b>, deducted directly from the <b>correct amount</b> paid by the Customer.
+ConfirmClassifyPaidPartiallyReasonBankChargeDesc=未付金額為 <b> 中介銀行費用 </b> ，直接從客戶支付的 <b> 正確金額 </b> 中扣除。
 ConfirmClassifyPaidPartiallyReasonOtherDesc=如果其他所有選項都不適用，請使用此選擇，例如在以下情況下: <br> - 付款不完整因為一些產品被運回<br> - 聲稱金額太重要因為忘記了折扣<br>在所有情況下，都必須建立同意折讓照會通知在會計系統中更正超額的金額。
 ConfirmClassifyAbandonReasonOther=其他
 ConfirmClassifyAbandonReasonOtherDesc=此選擇將在所有其他情況下使用。例如，因為您計劃建立替換發票。
@@ -236,12 +234,12 @@ AlreadyPaidBack=已償還
 AlreadyPaidNoCreditNotesNoDeposits=已付款 (無同意折讓照會通知及訂金）
 Abandoned=已放棄
 RemainderToPay=未付款餘額
-RemainderToPayMulticurrency=Remaining unpaid, original currency
+RemainderToPayMulticurrency=剩餘未付，原始幣別
 RemainderToTake=剩餘金額
-RemainderToTakeMulticurrency=Remaining amount to take, original currency
+RemainderToTakeMulticurrency=剩餘金額，原始幣別
 RemainderToPayBack=剩餘金額退款
-RemainderToPayBackMulticurrency=Remaining amount to refund, original currency
-NegativeIfExcessRefunded=negative if excess refunded
+RemainderToPayBackMulticurrency=退還餘額，原始幣別
+NegativeIfExcessRefunded=如果超額退還，則為負數
 Rest=待辦中
 AmountExpected=索款額
 ExcessReceived=超額收款
@@ -280,7 +278,7 @@ SetMode=設定付款類型
 SetRevenuStamp=設定印花稅票
 Billed=已開發票
 RecurringInvoices=定期發票
-RecurringInvoice=Recurring invoice
+RecurringInvoice=經常性發票
 RepeatableInvoice=發票範本
 RepeatableInvoices=各式發票範本
 Repeatable=範本
@@ -450,6 +448,8 @@ PaymentTypeTRA=銀行匯票
 PaymentTypeShortTRA=匯票
 PaymentTypeFAC=代理
 PaymentTypeShortFAC=代理
+PaymentTypeDC=借/貸卡片
+PaymentTypePP=PayPal
 BankDetails=銀行的詳細資料
 BankCode=銀行代碼
 DeskCode=分行代碼
@@ -582,7 +582,7 @@ ToCreateARecurringInvoiceGene=要定期並手動生成以後的發票，只需
 ToCreateARecurringInvoiceGeneAuto=如果需要自動生成此類發票，請要求管理員啟用和設定模組<strong>%s</strong> 。請注意，兩種方法（手動和自動）都可以一起使用，沒有重複的風險。
 DeleteRepeatableInvoice=刪除發票範本
 ConfirmDeleteRepeatableInvoice=您確定要刪除發票範本嗎？
-CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per selected object)
+CreateOneBillByThird=為每個合作方建立一張發票（否則，為每個項目建立一張發票）
 BillCreated=已產生%s發票
 BillXCreated=已產生發票%s
 StatusOfGeneratedDocuments=文件產生狀態
@@ -604,5 +604,5 @@ PDFSituationTitle=情況n°%d
 SituationTotalProgress=總進度%d %%
 SearchUnpaidInvoicesWithDueDate=搜尋到期日 = %s 的未付款發票
 NoPaymentAvailable=%s 無法付款
-PaymentRegisteredAndInvoiceSetToPaid=Payment registered and invoice %s set to paid
+PaymentRegisteredAndInvoiceSetToPaid=付款已登錄並且發票 %s 設定為已付款
 SendEmailsRemindersOnInvoiceDueDate=使用電子郵件寄送未付發票提醒
diff --git a/htdocs/langs/zh_TW/bookmarks.lang b/htdocs/langs/zh_TW/bookmarks.lang
index a6bcd4435b0..e71a491f000 100644
--- a/htdocs/langs/zh_TW/bookmarks.lang
+++ b/htdocs/langs/zh_TW/bookmarks.lang
@@ -15,7 +15,7 @@ UrlOrLink=網址
 BehaviourOnClick=已選擇書籤網址後的行為
 CreateBookmark=建立書籤
 SetHereATitleForLink=為書籤設定名稱
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external/absolute link (https://externalurl.com) or an internal/relative link (/mypage.php). You can also use phone like tel:0123456.
+UseAnExternalHttpLinkOrRelativeDolibarrLink=使用外部/絕對連結（(https://externalurl.com）或內部/相對連結（/mypage.php）.您也可使用電話號碼如tel:0123456.
 ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=選擇已連結頁面開啟在目前分頁或是在新分頁
 BookmarksManagement=書籤管理
 BookmarksMenuShortCut=Ctrl + shift + m
diff --git a/htdocs/langs/zh_TW/cashdesk.lang b/htdocs/langs/zh_TW/cashdesk.lang
index 55513ca0941..e8273f28dd3 100644
--- a/htdocs/langs/zh_TW/cashdesk.lang
+++ b/htdocs/langs/zh_TW/cashdesk.lang
@@ -95,7 +95,7 @@ BrowserMethodDescription=簡易列印收據。僅需幾個參數即可設定收
 TakeposConnectorMethodDescription=具有附加功能的外部模組。可以從雲端列印。
 PrintMethod=列印方式
 ReceiptPrinterMethodDescription=具有大量參數的強大方法。完全可定制的模板。程式的伺服器不能位於雲端當中（必須能夠使用您網路中的印表機）。
-ByTerminal=依照站台
+ByTerminal=依終端機
 TakeposNumpadUsePaymentIcon=在小鍵盤的付款按鈕上使用圖示而不是文字
 CashDeskRefNumberingModules=POS銷售編號模組
 CashDeskGenericMaskCodes6 = <br> <b> {TN} </b>標籤用於增加站台
@@ -133,4 +133,4 @@ SplitSale=拆分銷售
 PrintWithoutDetailsButton=增加"不列印詳細資訊"按鈕
 PrintWithoutDetailsLabelDefault=預設列印行標籤時不包含詳細資訊
 PrintWithoutDetails=不列印詳細資訊
-YearNotDefined=Year is not defined
+YearNotDefined=年份未定義
diff --git a/htdocs/langs/zh_TW/commercial.lang b/htdocs/langs/zh_TW/commercial.lang
index a98a82c6007..1223c7b67b5 100644
--- a/htdocs/langs/zh_TW/commercial.lang
+++ b/htdocs/langs/zh_TW/commercial.lang
@@ -73,9 +73,9 @@ Stats=銷售統計
 StatusProsp=潛在方狀態
 DraftPropals=商業提案/建議書草稿
 NoLimit=無限制
-ToOfferALinkForOnlineSignature=連結線上簽名
+ToOfferALinkForOnlineSignature=線上簽名連結
 WelcomeOnOnlineSignaturePage=歡迎來到%s的商業計劃書/提案
-ThisScreenAllowsYouToSignDocFrom=此畫面允許您接受並簽署或拒絕報價/商業計劃書/提案
-ThisIsInformationOnDocumentToSign=這是接受或拒絕文件上的信息
-SignatureProposalRef=報價單/商業計劃書/提案的簽名%s
+ThisScreenAllowsYouToSignDocFrom=此畫面可允許您接受並簽署或者是拒絕報價/商業提案/建議書
+ThisIsInformationOnDocumentToSign=此為文件資訊
+SignatureProposalRef=報價單/商業提案/建議書的簽名%s
 FeatureOnlineSignDisabled=已停用線上簽名功能或在啟用該功能之前已產生文件
diff --git a/htdocs/langs/zh_TW/companies.lang b/htdocs/langs/zh_TW/companies.lang
index 74ee62c238c..45e91c6ae3f 100644
--- a/htdocs/langs/zh_TW/companies.lang
+++ b/htdocs/langs/zh_TW/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1（商業登記）
+ProfId2CM=Id. prof. 2（納稅人編號）
+ProfId3CM=Id. prof. 3（建立法令）
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=商業登記
+ProfId2ShortCM=納稅人編號
+ProfId3ShortCM=建立法令
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=確認
 VATIntraCheckDesc=營業稅ID必須包含國家/地區前綴。連結<b>%s</b>使用歐洲增值稅檢查器服務（VIES），該服務需要Dolibarr伺服器連上網路。
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=檢查在歐盟區網站內的區內營業稅
-VATIntraManualCheck=您也可在歐盟網站以人工方式確認<a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=您也可以自行在歐盟委員會網站<a href="%s" target="_blank" rel="noopener noreferrer">%s</a>進行確認
 ErrorVATCheckMS_UNAVAILABLE=無法檢查。無法使用會員國家（%s）進行檢查服務。
 NorProspectNorCustomer=非潛在方或客戶
 JuridicalStatus=法人類型
diff --git a/htdocs/langs/zh_TW/compta.lang b/htdocs/langs/zh_TW/compta.lang
index af27b63e9a2..5218bdf6fff 100644
--- a/htdocs/langs/zh_TW/compta.lang
+++ b/htdocs/langs/zh_TW/compta.lang
@@ -115,7 +115,7 @@ Refund=退款
 SocialContributionsPayments=社會/財政稅金
 ShowVatPayment=顯示營業稅稅金
 TotalToPay=支付總額
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
+BalanceVisibilityDependsOnSortAndFilters=當表格依照 %s 排序並依照 1 個銀行帳戶過濾（沒有其他過濾器）時，餘額才可顯示在此清單中
 CustomerAccountancyCode=客戶會計代碼
 SupplierAccountancyCode=供應商會計代碼
 CustomerAccountancyCodeShort=客戶帳戶代碼
@@ -152,7 +152,7 @@ ConfirmDeleteSalary=您確定要刪除此薪資嗎？
 ExportDataset_tax_1=社會和財政稅金及繳稅
 CalcModeVATDebt=<b>%s承諾會計營業稅%s</b>模式.
 CalcModeVATEngagement=<b>%s收入-支出營業稅%s</b>模式.
-CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
+CalcModeDebt=分析已知文件記錄，即使它們尚未記入分類帳。
 CalcModeEngagement=分析已知並已記錄付款，即使尚未在分類帳中。
 CalcModeBookkeeping=分析記帳簿表中記錄的數據。
 CalcModeLT1= <b>客戶發票-供應商發票%s中的%sRE</b>模式
@@ -166,13 +166,13 @@ AnnualSummaryInputOutputMode=收支平衡表，年度匯總
 AnnualByCompanies=收入和支出餘額，依預定義帳戶組別
 AnnualByCompaniesDueDebtMode=收支平衡表，依預定義組別明細，模式<b>%s債權-債務%s</b>表示<b>承諾會計</b> 。
 AnnualByCompaniesInputOutputMode=收支平衡表，依預定義組別明細，方式<b>%s收入-支出%s</b>表示<b>現金會計</b> 。
-SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
-SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
-SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
+SeeReportInInputOutputMode=請參閱 <b> %s 付款分析%s </b> 以了解 <b>付款記錄</b> 的計算，即使付款記錄尚未記入分類帳
+SeeReportInDueDebtMode=請參閱 <b> %s 文件記錄分析 %s </b> 以了解基於已知 <b> 文件記錄 </b> 的計算，即使文件記錄尚未記入分類帳
+SeeReportInBookkeepingMode=請參閱 <b> %s 記帳分類帳表格分析 %s </b> 以獲取基於 <b> 記帳分類帳表格 </b> 的報告
 RulesAmountWithTaxIncluded=-顯示的金額包括所有稅費
-RulesAmountWithTaxExcluded=- Amounts of invoices shown are with all taxes excluded
-RulesResultDue=- It includes all invoices, expenses, VAT, donations, salaries, whether they are paid or not.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries, the date of end of period is used.
-RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT, donations and salaries.
+RulesAmountWithTaxExcluded=- 顯示的發票金額不包括所有稅費
+RulesResultDue=- 它包括所有發票、費用、增值稅、捐贈、薪資，無論是否已支付。 <br> - 它基於發票的開票日期以及費用或稅款支付的到期日。對於薪資，使用期末日期。
+RulesResultInOut=- 它包括發票、費用、增值稅和薪資的實際付款。 <br> - 它基於發票、費用、增值稅、捐贈和薪資的付款日期。
 RulesCADue=-它包括客戶的到期發票，無論是否已付款。 <br>-它基於這些發票的開票日期。 <br>
 RulesCAIn=-包括從客戶收到的所有有效發票付款。 <br> -此基於這些發票的付款日期<br>
 RulesCATotalSaleJournal=它包括“銷售”日記帳中的所有信用額度。
@@ -193,7 +193,7 @@ VATReport=營業稅報告
 VATReportByPeriods=分期營業稅報告
 VATReportByMonth=每月營業稅報告
 VATReportByRates=營業稅率分類報告
-VATReportByThirdParties=Sales tax report by third party
+VATReportByThirdParties=合作方銷售營業稅報告
 VATReportByCustomers=客戶分類銷售稅報告
 VATReportByCustomersInInputOutputMode=依客戶已收繳營業稅報告
 VATReportByQuartersInInputOutputMode=依銷售稅率收取和繳納分類報告
@@ -202,12 +202,12 @@ LT1ReportByQuarters=依稅率2報稅
 LT2ReportByQuarters=依稅率3報稅
 LT1ReportByQuartersES=依RE稅率報稅
 LT2ReportByQuartersES=依IRPF稅率報稅
-SeeVATReportInInputOutputMode=See report <b>%sVAT collection%s</b> for a standard calculation
-SeeVATReportInDueDebtMode=See report <b>%sVAT on debit%s</b> for a calculation with an option on the invoicing
-RulesVATInServices=- For services, the report includes the VAT of payments actually received or paid on the basis of the date of payment.
-RulesVATInProducts=- For material assets, the report includes the VAT on the basis of the date of payment.
-RulesVATDueServices=- For services, the report includes VAT of due invoices, paid or not, based on the invoice date.
-RulesVATDueProducts=- For material assets, the report includes the VAT of due invoices, based on the invoice date.
+SeeVATReportInInputOutputMode=查看報告<b>%s裝箱營業稅%s</b>的標準計算
+SeeVATReportInDueDebtMode=請參閱 <b>借記%s 上 的 %s稅率</b>報告 以了解帶有發票選項的計算
+RulesVATInServices=- 對於服務，報告包括根據付款日期實際收到或支付之付款的增值稅。
+RulesVATInProducts=- 對於物質資產，報告包括基於付款日期的增值稅。
+RulesVATDueServices=- 對於服務，基於發票日期,無論是否支付,報告包含到期發票的稅金。
+RulesVATDueProducts=- 對於物質資產，基於發票日期,報告包含到期發票的稅金。
 OptionVatInfoModuleComptabilite=註：對於物質資產，它應該使用交貨日期以更加公平。
 ThisIsAnEstimatedValue=這是預覽，基於業務事件而非最終分類帳表格，因此最後可能與此預覽結果不同
 PercentOfInvoice=%%/發票
@@ -232,7 +232,7 @@ Pcg_subtype=Pcg子類型
 InvoiceLinesToDispatch=調度發票行
 ByProductsAndServices=依產品和服務
 RefExt=外部參考
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
+ToCreateAPredefinedInvoice=建立發票範本,建立標準發票,然後,不要驗證它,點擊按鈕"%s".
 LinkedOrder=連線到訂單
 Mode1=方法1
 Mode2=方法2
@@ -271,7 +271,7 @@ LastDayTaxIsRelatedTo=稅期的最後一天
 VATDue=要求營業稅
 ClaimedForThisPeriod=要求的期間
 PaidDuringThisPeriod=本期支付
-PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
+PaidDuringThisPeriodDesc=這是在選定日期範圍內有期末日期的增值稅申報相關之所有付款的總和
 ByVatRate=依營業稅率
 TurnoverbyVatrate=依營業稅率開票的營業額
 TurnoverCollectedbyVatrate=依營業稅率收取的營業額
@@ -287,14 +287,14 @@ ReportPurchaseTurnover=已開票營業額
 ReportPurchaseTurnoverCollected=採購營業額
 IncludeVarpaysInResults = 在報告中包括各種付款
 IncludeLoansInResults = 在報告中包括貸款
-InvoiceLate30Days = Invoices late (> 30 days)
-InvoiceLate15Days = Invoices late (15 to 30 days)
-InvoiceLateMinus15Days = Invoices late (< 15 days)
-InvoiceNotLate = To be collected (< 15 days)
-InvoiceNotLate15Days = To be collected (15 to 30 days)
-InvoiceNotLate30Days = To be collected (> 30 days)
-InvoiceToPay=To pay (< 15 days)
-InvoiceToPay15Days=To pay (15 to 30 days)
-InvoiceToPay30Days=To pay (> 30 days)
-ConfirmPreselectAccount=Preselect accountancy code
-ConfirmPreselectAccountQuestion=Are you sure you want to preselect the %s selected lines with this accountancy code ?
+InvoiceLate30Days = 延遲的發票（> 30 天）
+InvoiceLate15Days = 延遲的發票（15 到 30 天）
+InvoiceLateMinus15Days = 延遲的發票（< 15 天）
+InvoiceNotLate = 待收集（< 15 天）
+InvoiceNotLate15Days = 待收集（15 至 30 天）
+InvoiceNotLate30Days = 待收集（> 30 天）
+InvoiceToPay=支付（< 15 天）
+InvoiceToPay15Days=支付（15 至 30 天）
+InvoiceToPay30Days=支付（> 30 天）
+ConfirmPreselectAccount=預選會計科目代號
+ConfirmPreselectAccountQuestion=您確定要使用此會計科目代號預先選擇 %s 選定的行嗎？
diff --git a/htdocs/langs/zh_TW/errors.lang b/htdocs/langs/zh_TW/errors.lang
index e61bb696410..68944fc7696 100644
--- a/htdocs/langs/zh_TW/errors.lang
+++ b/htdocs/langs/zh_TW/errors.lang
@@ -111,7 +111,7 @@ ErrorFailedToLoadRSSFile=無法獲取RSS訂閱. 如果錯誤訊息沒有提供
 ErrorForbidden=訪問被拒絕。 <br>您嘗試訪問已停用模組的頁面，區域或功能，或者沒經過身份驗證的程序，或者不允許用戶訪問。
 ErrorForbidden2=可以經由您的Dolibarr管理員從選單%s->%s中定義此登入權限。
 ErrorForbidden3=似乎Dolibarr被未通過身份驗證的程序使用。查看Dolibarr設定文件，以了解如何管理身份驗證（htaccess，mod_auth或其他...）。
-ErrorForbidden4=Note: clear your browser cookies to destroy existing sessions for this login.
+ErrorForbidden4=注意：清除您的瀏覽器 cookie 以銷毀此登錄的現有程序。
 ErrorNoImagickReadimage=在此 PHP 中沒有 imagick 類別，所以無法預覽。管理員可以從選單設定 - 顯示中停用此分頁。
 ErrorRecordAlreadyExists=記錄已存在
 ErrorLabelAlreadyExists=此標籤已存在
@@ -271,8 +271,9 @@ ErrorActionCommBadType=選擇的事件類型（id：%n，代碼：%s）在事件
 CheckVersionFail=版本檢查失敗
 ErrorWrongFileName=檔案名稱中不可以有__SOMETHING__
 ErrorNotInDictionaryPaymentConditions=不在支付條款類別中，請修改。
-ErrorIsNotADraft=%s is not a draft
-ErrorExecIdFailed=Can't execute command "id"
+ErrorIsNotADraft=%s 不是草案狀態
+ErrorExecIdFailed=無法執行命令“id”
+ErrorBadCharIntoLoginName=登錄名稱中的未核准字元
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=您的PHP參數upload_max_filesize（%s）高於PHP參數post_max_size（%s）。這不是相同的設定。
diff --git a/htdocs/langs/zh_TW/eventorganization.lang b/htdocs/langs/zh_TW/eventorganization.lang
index cc951450b70..f459f2adab2 100644
--- a/htdocs/langs/zh_TW/eventorganization.lang
+++ b/htdocs/langs/zh_TW/eventorganization.lang
@@ -19,7 +19,7 @@
 #
 ModuleEventOrganizationName = 活動組織
 EventOrganizationDescription = 使用專案模組組織活動
-EventOrganizationDescriptionLong= Manage the organization of an event (show, conferences, attendees or speakers, with public pages for suggestion, vote or registration)
+EventOrganizationDescriptionLong= 管理活動的組織（節目、會議、參與者或演講者，以及用於建議、投票或註冊的公共頁面）
 #
 # Menu
 #
@@ -31,33 +31,33 @@ PaymentEvent=活動的付款
 #
 # Admin page
 #
-NewRegistration=Registration
+NewRegistration=登記
 EventOrganizationSetup=活動組織設定
 EventOrganization=活動組織
 Settings=設定
 EventOrganizationSetupPage = 活動組織設定頁面
 EVENTORGANIZATION_TASK_LABEL = 當專案驗證時自動地建立任務標籤
-EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
-EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
-EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
-EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
-EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
-EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a registration to a booth has been paid.
-EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a registration to an event has been paid.
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+EVENTORGANIZATION_TASK_LABELTooltip = 當您驗證一個有組織的活動，有些任務可以自動在專案中建立<br> <br>例如：<br>發送會議呼叫<br>發送展位呼叫<br>接收會議呼叫<br>接收展位呼叫<br>為參與者打開訂閱活動<br>向演講者發送活動提醒 <br> 向展位主持人發送活動提醒 <br> 向與會者發送活動提醒
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = 有人建議會議時自動建立增加到合作方的類別
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = 當合作方推薦展位時自動建立增加到合作方的類別
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = 收到會議建議後要發送的電子郵件模板。
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = 收到展位建議後要發送的電子郵件模板。
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = 支付展位註冊費用後發送的電子郵件模板。
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = 支付報名費後發送的電子郵件模板。
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = 向參與者發送的批次電子郵件模板
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = 發送給演講者的批次電子郵件模板
+EVENTORGANIZATION_FILTERATTENDEES_CAT = 使用類別過濾參與者建立卡/表單中的合作方選擇清單
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = 使用客戶類型過濾參與者建立卡/表單中合作方選擇清單
 
 #
 # Object
 #
 EventOrganizationConfOrBooth= 會議或展位
-ManageOrganizeEvent = Manage the organization of an event
+ManageOrganizeEvent = 管理活動的組織
 ConferenceOrBooth = 會議或展位
 ConferenceOrBoothTab = 會議或展位
 AmountPaid = 付款金額
-DateOfRegistration = Date of registration
+DateOfRegistration = 註冊日期
 ConferenceOrBoothAttendee = 會議或展位參加者
 
 #
@@ -65,32 +65,32 @@ ConferenceOrBoothAttendee = 會議或展位參加者
 #
 YourOrganizationEventConfRequestWasReceived = 已收到您的會議請求
 YourOrganizationEventBoothRequestWasReceived = 已收到您的展位申請
-EventOrganizationEmailAskConf = Request for conference
-EventOrganizationEmailAskBooth = Request for booth
-EventOrganizationEmailBoothPayment = Payment of your booth
-EventOrganizationEmailRegistrationPayment = Registration for an event
-EventOrganizationMassEmailAttendees = Communication to attendees
-EventOrganizationMassEmailSpeakers = Communication to speakers
+EventOrganizationEmailAskConf = 申請會議
+EventOrganizationEmailAskBooth = 申請展位
+EventOrganizationEmailBoothPayment = 展位付款
+EventOrganizationEmailRegistrationPayment = 活動報名
+EventOrganizationMassEmailAttendees = 與參與者交流
+EventOrganizationMassEmailSpeakers = 與演講者交流
 
 #
 # Event
 #
-AllowUnknownPeopleSuggestConf=Allow people to suggest conferences
-AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest a conference they want to do
-AllowUnknownPeopleSuggestBooth=Allow people to apply for a booth
-AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to apply for a booth
-PriceOfRegistration=Price of registration
-PriceOfRegistrationHelp=Price to pay to register or participate in the event
-PriceOfBooth=Subscription price to stand a booth
-PriceOfBoothHelp=Subscription price to stand a booth
-EventOrganizationICSLink=Link ICS for events
-ConferenceOrBoothInformation=Conference Or Booth informations
-Attendees=Attendees
-ListOfAttendeesOfEvent=List of attendees of the event project
-DownloadICSLink = Download ICS link
-EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
-SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
-SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
+AllowUnknownPeopleSuggestConf=允許建議會議
+AllowUnknownPeopleSuggestConfHelp=允許不知名的人建議他們想參加的會議
+AllowUnknownPeopleSuggestBooth=允許申請展位
+AllowUnknownPeopleSuggestBoothHelp=允許不知名人士申請展位
+PriceOfRegistration=註冊價格
+PriceOfRegistrationHelp=註冊或參加活動的費用
+PriceOfBooth=展位認購價
+PriceOfBoothHelp=展位認購價
+EventOrganizationICSLink=為活動連結 ICS
+ConferenceOrBoothInformation=會議或展位資訊
+Attendees=參與者
+ListOfAttendeesOfEvent=活動項目參與者名單
+DownloadICSLink = 下載 ICS連結
+EVENTORGANIZATION_SECUREKEY = 會議的公共註冊連結安全金鑰
+SERVICE_BOOTH_LOCATION = 關於展位位置發票行的服務
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = 關於參與者訂閱會議發票行的服務
 NbVotes=票數
 #
 # Status
@@ -106,61 +106,61 @@ EvntOrgCancelled = 已取消
 #
 SuggestForm = 建議頁面
 SuggestOrVoteForConfOrBooth = 建議或投票頁面
-EvntOrgRegistrationHelpMessage = Here, you can vote for a conference or suggest a new one for the event. You can also apply to have a booth during the event.
-EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference to animate during the event.
-EvntOrgRegistrationBoothHelpMessage = Here, you can apply to have a booth during the event.
+EvntOrgRegistrationHelpMessage = 在這裡，您可以為會議投票或為活動推薦新的會議。您也可以在活動期間申請展位。
+EvntOrgRegistrationConfHelpMessage = 在這裡，您可以在活動期間鼓勵建議一個新的會議。
+EvntOrgRegistrationBoothHelpMessage = 在這裡，您可以在活動期間申請展位。
 ListOfSuggestedConferences = 建議會議清單
 ListOfSuggestedBooths = 建議展位清單
-ListOfConferencesOrBooths=List of conferences or booths of event project
+ListOfConferencesOrBooths=活動專案的會議或展位清單
 SuggestConference = 建議召開新會議
 SuggestBooth = 建議展位
 ViewAndVote = 查看和票選建議的活動
-PublicAttendeeSubscriptionGlobalPage = Public link for registration to the event
-PublicAttendeeSubscriptionPage = Public link for registration to this event only
-MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the event : <b>%s</b>
-EvntOrgDuration = This conference starts on %s and ends on %s.
-ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
-BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+PublicAttendeeSubscriptionGlobalPage = 活動報名公開連結
+PublicAttendeeSubscriptionPage = 僅用於報名此活動的公共連結
+MissingOrBadSecureKey = 安全金鑰無效或遺失
+EvntOrgWelcomeMessage = 此表單允許您註冊為此活動的新參與者：<b> %s </b>
+EvntOrgDuration = 本次會議從 %s 開始，到 %s 結束。
+ConferenceAttendeeFee = 活動的會議參與者費用："%s"為從%s 到%s發生的。
+BoothLocationFee = 活動展位位置："%s"為從%s 到%s發生的。
 EventType = 活動類別
 LabelOfBooth=展位標籤
 LabelOfconference=會議標籤
-ConferenceIsNotConfirmed=Registration not available, conference is not confirmed yet
+ConferenceIsNotConfirmed=無法註冊，會議尚未確認
 DateMustBeBeforeThan=%s 必須在 %s 之前
 DateMustBeAfterThan=%s 必須在 %s 之後
 
-NewSubscription=Registration
-OrganizationEventConfRequestWasReceived=Your suggestion for a conference has been received
-OrganizationEventBoothRequestWasReceived=Your request for a booth has been received
-OrganizationEventPaymentOfBoothWasReceived=Your payment for your booth has been recorded
-OrganizationEventPaymentOfRegistrationWasReceived=Your payment for your event registration has been recorded
-OrganizationEventBulkMailToAttendees=This is a remind about your participation in the event as an attendee
-OrganizationEventBulkMailToSpeakers=This is a reminder on your participation in the event as a speaker
-OrganizationEventLinkToThirdParty=Link to third party (customer, supplier or partner)
+NewSubscription=登記
+OrganizationEventConfRequestWasReceived=您的會議建議已收到
+OrganizationEventBoothRequestWasReceived=您的展位申請已收到
+OrganizationEventPaymentOfBoothWasReceived=您的展位付款已被記錄
+OrganizationEventPaymentOfRegistrationWasReceived=您的活動註冊付款已被記錄
+OrganizationEventBulkMailToAttendees=這是關於您作為參與者參與活動的提醒
+OrganizationEventBulkMailToSpeakers=這是對您作為演講者參與活動的提醒
+OrganizationEventLinkToThirdParty=連結到合作方（客戶、供應商或合作夥伴）
 
-NewSuggestionOfBooth=Application for a booth
-NewSuggestionOfConference=Application for a conference
+NewSuggestionOfBooth=申請展位
+NewSuggestionOfConference=申請會議
 
 #
 # Vote page
 #
-EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
-EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
-EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
-EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
+EvntOrgRegistrationWelcomeMessage = 歡迎來到會議或展位建議頁面。
+EvntOrgRegistrationConfWelcomeMessage = 歡迎來到會議建議頁面。
+EvntOrgRegistrationBoothWelcomeMessage = 歡迎來到展位建議頁面。
+EvntOrgVoteHelpMessage = 在這裡，您可以查看專案的建議活動並投票
 VoteOk = 您的投票已被接受。
 AlreadyVoted = 您已經為此事件投票。
-VoteError = An error has occurred during the vote, please try again.
+VoteError = 投票時發生錯誤，請重試。
 
-SubscriptionOk = Your registration has been validated
-ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to an event
+SubscriptionOk = 您的登錄已通過驗證
+ConfAttendeeSubscriptionConfirmation = 確認您的活動訂閱
 Attendee = 參加者
 PaymentConferenceAttendee = 參與人員繳費
-PaymentBoothLocation = Booth location payment
-DeleteConferenceOrBoothAttendee=Remove attendee
-RegistrationAndPaymentWereAlreadyRecorder=A registration and a payment were already recorded for the email <b>%s</b>
-EmailAttendee=Attendee email
-EmailCompanyForInvoice=Company email (for invoice, if different of attendee email)
-ErrorSeveralCompaniesWithEmailContactUs=Several companies with this email has been found so we can't validate automaticaly your registration. Please contact us at %s for a manual validation
-ErrorSeveralCompaniesWithNameContactUs=Several companies with this name has been found so we can't validate automaticaly your registration. Please contact us at %s for a manual validation
-NoPublicActionsAllowedForThisEvent=No public actions are open to public for this event
+PaymentBoothLocation = 展位支付
+DeleteConferenceOrBoothAttendee=刪除參與者
+RegistrationAndPaymentWereAlreadyRecorder=已記錄電子郵件 <b> %s </b> 的註冊和付款
+EmailAttendee=參與者電子郵件
+EmailCompanyForInvoice=公司電子郵件（用於發票，如果與參與者電子郵件不同）
+ErrorSeveralCompaniesWithEmailContactUs=已找到幾家收到此電子郵件的公司，因此我們無法自動驗證您的註冊。請以 %s 聯繫我們進行手動驗證
+ErrorSeveralCompaniesWithNameContactUs=已找到數家具有此名稱的公司，因此我們無法自動驗證您的註冊。請以 %s 聯繫我們進行手動驗證
+NoPublicActionsAllowedForThisEvent=本次活動不對外公開任何公開活動
diff --git a/htdocs/langs/zh_TW/exports.lang b/htdocs/langs/zh_TW/exports.lang
index e12a253b1a0..2b827a7fafd 100644
--- a/htdocs/langs/zh_TW/exports.lang
+++ b/htdocs/langs/zh_TW/exports.lang
@@ -96,8 +96,8 @@ DataComeFromFileFieldNb=要插入的值來自來源檔案中的欄位編號<b>%s
 DataComeFromIdFoundFromRef=來自來源檔案的欄位編號<b>%s</b>的值將用於尋找要使用的母項目ID（因此項目<b>%s</b>參考來源必須存在於資料庫中）。
 DataComeFromIdFoundFromCodeId=來自來源檔案的欄位編號<b>%s</b>的代碼將用於尋找要使用的母項目ID（因此來源檔案中的代碼必須存在於字典<b>%s</b>中 ）。請注意，如果您知道ID，您應該在來源檔案中使用它而不是使用代碼。在兩種情況下，匯入都應該起作用。
 DataIsInsertedInto=來自來源檔案的資料將被插入到以下欄位：
-DataIDSourceIsInsertedInto=The id of the parent object, that was found using the data in the source file, will be inserted into the following field:
-DataCodeIDSourceIsInsertedInto=The id of the parent line, that was found from code, will be inserted into the following field:
+DataIDSourceIsInsertedInto=在來源檔案中的資料找到母項目ID，將插入到以下欄位：
+DataCodeIDSourceIsInsertedInto=在代碼中的找到母行ID，將插入到以下欄位：
 SourceRequired=資料值是強制性的
 SourceExample=可能資料值的範例
 ExampleAnyRefFoundIntoElement=已找到元件<b>%s</b>的所有參考
diff --git a/htdocs/langs/zh_TW/help.lang b/htdocs/langs/zh_TW/help.lang
index a662ddfb7f2..85757011540 100644
--- a/htdocs/langs/zh_TW/help.lang
+++ b/htdocs/langs/zh_TW/help.lang
@@ -20,4 +20,4 @@ BackToHelpCenter=否則， <a href="%s">請返回幫助中心首頁</a> 。
 LinkToGoldMember=您可以通過點擊他們的小工具來預先選擇語言的培訓師（%s）（狀態和最高價格會自動更新）：
 PossibleLanguages=支持的語言
 SubscribeToFoundation=幫助Dolibarr項目，訂閱基金會
-SeeOfficalSupport=使用您語言的 Dolibarr 官方支援：<br><b><a href="%s" target="_blank">%s</a></b>
+SeeOfficalSupport=使用您語言的 Dolibarr 官方支援：<br><b><a href="%s" target="_blank" rel="noopener noreferrer">%s</a></b>
diff --git a/htdocs/langs/zh_TW/holiday.lang b/htdocs/langs/zh_TW/holiday.lang
index ea3e3b80f60..8a98b2b27d1 100644
--- a/htdocs/langs/zh_TW/holiday.lang
+++ b/htdocs/langs/zh_TW/holiday.lang
@@ -27,7 +27,7 @@ DescCP=描述
 SendRequestCP=建立休假申請
 DelayToRequestCP=休假申請至少必須提前<b>%s 天(s)</b>申請.
 MenuConfCP=未休假天數
-SoldeCPUser=Leave balance (in days) <b>%s</b>
+SoldeCPUser=未休假天數(天)<b>%s</b>.
 ErrorEndDateCP=您必須選擇一個大於開始日期的結束日期。
 ErrorSQLCreateCP=建立期間發生了SQL錯誤：
 ErrorIDFicheCP=發生錯誤，休假申請不存在。
@@ -134,4 +134,4 @@ HolidaysToApprove=可批准假期
 NobodyHasPermissionToValidateHolidays=沒有人有權限驗證假期
 HolidayBalanceMonthlyUpdate=每月更新假期餘額
 XIsAUsualNonWorkingDay=%s通常為非工作日
-ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=Leave request %s must be draft, canceled or refused to be deleted
+ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=休假 %s 為草案、取消或拒絕,將被刪除
diff --git a/htdocs/langs/zh_TW/hrm.lang b/htdocs/langs/zh_TW/hrm.lang
index 432961087b1..3114e075560 100644
--- a/htdocs/langs/zh_TW/hrm.lang
+++ b/htdocs/langs/zh_TW/hrm.lang
@@ -20,13 +20,14 @@ Employee=員工
 NewEmployee=新員工
 ListOfEmployees=員工名單
 HrmSetup=人資模組設定
-HRM_MAXRANK=技能的最高等級
+SkillsManagement=技能管理
+HRM_MAXRANK=對技能進行排名的最大級別
 HRM_DEFAULT_SKILL_DESCRIPTION=建立技能時的預設等級描述
 deplacement=轉移
 DateEval=評估日期
 JobCard=工作卡
-Job=工作
-Jobs=工作
+JobPosition=工作
+JobsPosition=工作
 NewSkill=新技能
 SkillType=技能類型
 Skilldets=此技能的等級清單
@@ -47,9 +48,8 @@ ConfirmValidateEvaluation=您確定想要以參考<b>%s</b>驗證此評估嗎？
 EvaluationCard=評估卡
 RequiredRank=此職位所需的等級
 EmployeeRank=此技能的員工等級
-Position=職位
-Positions=職位
-PositionCard=職位卡
+EmployeePosition=員工職位
+EmployeePositions=員工職位
 EmployeesInThisPosition=此職位的員工
 group1ToCompare=要分析的用戶組
 group2ToCompare=用於比較的第二個用戶組
diff --git a/htdocs/langs/zh_TW/install.lang b/htdocs/langs/zh_TW/install.lang
index 9abbff319aa..a6f2aa7035d 100644
--- a/htdocs/langs/zh_TW/install.lang
+++ b/htdocs/langs/zh_TW/install.lang
@@ -21,7 +21,7 @@ ErrorPHPDoesNotSupportCurl=您的PHP安裝不支援Curl。
 ErrorPHPDoesNotSupportCalendar=您的PHP安裝不支援php日曆外掛。
 ErrorPHPDoesNotSupportUTF8=您的PHP安裝不支援UTF8函數。 Dolibarr無法正常工作。必須在安裝Dolibarr之前修復此問題。
 ErrorPHPDoesNotSupportIntl=您的PHP安裝不支援Intl函數。
-ErrorPHPDoesNotSupportMbstring=Your PHP installation does not support mbstring functions.
+ErrorPHPDoesNotSupportMbstring=您的 PHP 不支援 mbstring 函數。
 ErrorPHPDoesNotSupportxDebug=您的PHP安裝不支援擴展除錯功能。
 ErrorPHPDoesNotSupport=您的PHP安裝不支援%s函數。
 ErrorDirDoesNotExists=資料夾%s不存在。
diff --git a/htdocs/langs/zh_TW/intracommreport.lang b/htdocs/langs/zh_TW/intracommreport.lang
index a14c918314c..8bc246a5612 100644
--- a/htdocs/langs/zh_TW/intracommreport.lang
+++ b/htdocs/langs/zh_TW/intracommreport.lang
@@ -5,11 +5,11 @@ IntracommReportAbout = 關於內部通訊報告
 
 # Setup
 INTRACOMMREPORT_NUM_AGREMENT=批准文號（由CISD附件簽發）
-INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
-INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
-INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
-INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
-INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+INTRACOMMREPORT_TYPE_ACTEUR=發話者類型
+INTRACOMMREPORT_ROLE_ACTEUR=發話者角色
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=介紹義務的等級
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=裝運義務水平
+INTRACOMMREPORT_CATEG_FRAISDEPORT=“Frais de port”類型的服務類別
 
 INTRACOMMREPORT_NUM_DECLARATION=申報人編號
 
diff --git a/htdocs/langs/zh_TW/knowledgemanagement.lang b/htdocs/langs/zh_TW/knowledgemanagement.lang
index 911db235ad8..6f540d67039 100644
--- a/htdocs/langs/zh_TW/knowledgemanagement.lang
+++ b/htdocs/langs/zh_TW/knowledgemanagement.lang
@@ -18,33 +18,33 @@
 #
 
 # Module label 'ModuleKnowledgeManagementName'
-ModuleKnowledgeManagementName = Knowledge Management System
+ModuleKnowledgeManagementName = 知識管理系統
 # Module description 'ModuleKnowledgeManagementDesc'
-ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+ModuleKnowledgeManagementDesc=管理知識管理 (KM) 或HelpDesk
 
 #
 # Admin page
 #
-KnowledgeManagementSetup = Knowledge Management System setup
+KnowledgeManagementSetup = 知識管理系統設定
 Settings = 設定
-KnowledgeManagementSetupPage = Knowledge Management System setup page
+KnowledgeManagementSetupPage = 知識管理系統設定頁面
 
 
 #
 # About page
 #
 About = 關於
-KnowledgeManagementAbout = About Knowledge Management
-KnowledgeManagementAboutPage = Knowledge Management about page
+KnowledgeManagementAbout = 關於知識管理
+KnowledgeManagementAboutPage = 知識管理的關於頁面
 
-KnowledgeManagementArea = Knowledge Management
-MenuKnowledgeRecord = Knowledge base
-ListKnowledgeRecord = List of articles
-NewKnowledgeRecord = New article
-ValidateReply = Validate solution
-KnowledgeRecords = Articles
+KnowledgeManagementArea = 知識管理
+MenuKnowledgeRecord = 知識庫
+ListKnowledgeRecord = 文章清單
+NewKnowledgeRecord = 新文章
+ValidateReply = 驗證解決方案
+KnowledgeRecords = 文章
 KnowledgeRecord = 物品
-KnowledgeRecordExtraFields = Extrafields for Article
-GroupOfTicket=Group of tickets
-YouCanLinkArticleToATicketCategory=You can link an article to a ticket group (so the article will be suggested during qualification of new tickets)
-SuggestedForTicketsInGroup=Suggested for tickets when group is
+KnowledgeRecordExtraFields = 文章的補充屬性
+GroupOfTicket=服務單群組
+YouCanLinkArticleToATicketCategory=您可以將文章連結至服務單群組（因此在新服務單的有效期間將建議該文章）
+SuggestedForTicketsInGroup=為此群組服務單建議
diff --git a/htdocs/langs/zh_TW/ldap.lang b/htdocs/langs/zh_TW/ldap.lang
index 04ac6f87472..ddbc0e2ddbf 100644
--- a/htdocs/langs/zh_TW/ldap.lang
+++ b/htdocs/langs/zh_TW/ldap.lang
@@ -1,27 +1,31 @@
 # Dolibarr language file - Source file is en_US - ldap
-YouMustChangePassNextLogon=<b>%</b>用戶密碼<b>%之S</b>必須改變對域。
-UserMustChangePassNextLogon=用戶必須更改密碼的域%s
-LDAPInformationsForThisContact=在此LDAP數據庫信息聯系
-LDAPInformationsForThisUser=LDAP數據庫中該用戶信息
-LDAPInformationsForThisGroup=在LDAP數據庫的資料本組
-LDAPInformationsForThisMember=在LDAP數據庫信息該會員
+YouMustChangePassNextLogon=用戶<b>%s</b>在網域<b>%s</b> 的密碼必須更改
+UserMustChangePassNextLogon=用戶必須更改在網域%s上的密碼
+LDAPInformationsForThisContact=LDAP資料庫中此聯絡人的資訊
+LDAPInformationsForThisUser=LDAP資料庫中此用戶的資訊
+LDAPInformationsForThisGroup=LDAP資料庫中此群組的資訊
+LDAPInformationsForThisMember=LDAP資料庫中此會員的資訊
 LDAPInformationsForThisMemberType=LDAP數據庫中此會員類型的資訊
 LDAPAttributes=LDAP屬性
-LDAPCard=LDAP的卡
-LDAPRecordNotFound=記錄中找不到LDAP數據庫
-LDAPUsers=在LDAP用戶數據庫
-LDAPFieldStatus=地位
-LDAPFieldFirstSubscriptionDate=首先認購日期
-LDAPFieldFirstSubscriptionAmount=認購金額拳
+LDAPCard=LDAP卡片
+LDAPRecordNotFound=在LDAP資料庫中找不到記錄
+LDAPUsers=LDAP資料庫中的用戶
+LDAPFieldStatus=狀態
+LDAPFieldFirstSubscriptionDate=首次訂閱日期
+LDAPFieldFirstSubscriptionAmount=首次訂閱金額
 LDAPFieldLastSubscriptionDate=最新訂閱日期
-LDAPFieldLastSubscriptionAmount=Latest subscription amount
-LDAPFieldSkype=Skype id
-LDAPFieldSkypeExample=Example: skypeName
-UserSynchronized=用戶同步
-GroupSynchronized=集團同步
+LDAPFieldLastSubscriptionAmount=最新訂閱金額
+LDAPFieldSkype=Skype帳號
+LDAPFieldSkypeExample=範例：skypeName
+UserSynchronized=用戶已同步
+GroupSynchronized=群組已同步
 MemberSynchronized=會員已同步
 MemberTypeSynchronized=會員類型已同步
-ContactSynchronized=聯系同步
-ForceSynchronize=力同步Dolibarr - &gt;的LDAP
-ErrorFailedToReadLDAP=無法讀取LDAP資料據庫。檢查的LDAP模組設定和資料庫可存取性。
-PasswordOfUserInLDAP=Password of user in LDAP
+ContactSynchronized=聯絡人已同步
+ForceSynchronize=強制同步中Dolibarr -> LDAP
+ErrorFailedToReadLDAP=無法讀取LDAP資料庫。檢查的LDAP模組設定和資料庫可存取權限。
+PasswordOfUserInLDAP=LDAP用戶密碼
+LDAPPasswordHashType=密碼hash類型
+LDAPPasswordHashTypeExample=伺服器上使用的密碼hash類型
+SupportedForLDAPExportScriptOnly=僅支援ldap匯出腳本
+SupportedForLDAPImportScriptOnly=僅支援 ldap匯入腳本
diff --git a/htdocs/langs/zh_TW/loan.lang b/htdocs/langs/zh_TW/loan.lang
index 8f4babc0b9a..c9b1a7e0870 100644
--- a/htdocs/langs/zh_TW/loan.lang
+++ b/htdocs/langs/zh_TW/loan.lang
@@ -24,7 +24,7 @@ FinancialCommitment=財務承諾
 InterestAmount=利益
 CapitalRemain=剩餘資本
 TermPaidAllreadyPaid = 這表示已付款
-CantUseScheduleWithLoanStartedToPaid = Can't use scheduler for a loan with payment started
+CantUseScheduleWithLoanStartedToPaid = 無法在已開始付款的借款中使用排程器
 CantModifyInterestIfScheduleIsUsed = 如果您使用時間表，則無法修改利息
 # Admin
 ConfigLoan=貸款模組設定
diff --git a/htdocs/langs/zh_TW/mails.lang b/htdocs/langs/zh_TW/mails.lang
index 3eacfdfae1a..cd5b4703c34 100644
--- a/htdocs/langs/zh_TW/mails.lang
+++ b/htdocs/langs/zh_TW/mails.lang
@@ -60,7 +60,7 @@ EMailTestSubstitutionReplacedByGenericValues=使用測試模式時，替換變
 MailingAddFile=附加這個文件
 NoAttachedFiles=沒有附加檔案
 BadEMail=電子郵件地址不正確
-EMailNotDefined=Email not defined
+EMailNotDefined=電子郵件未定義
 ConfirmCloneEMailing=您確定要複製此電子郵件嗎？
 CloneContent=複製訊息
 CloneReceivers=複製收件人
@@ -163,8 +163,8 @@ AdvTgtDeleteFilter=刪除篩選器
 AdvTgtSaveFilter=儲存篩選器
 AdvTgtCreateFilter=建立篩選器
 AdvTgtOrCreateNewFilter=新篩選器名稱
-NoContactWithCategoryFound=No category found linked to some contacts/addresses
-NoContactLinkedToThirdpartieWithCategoryFound=No category found linked to some thirdparties
+NoContactWithCategoryFound=找不到與某些聯絡人/地址相關聯的類別
+NoContactLinkedToThirdpartieWithCategoryFound=未找到與某些合作方相關的類別
 OutGoingEmailSetup=外送電子郵件
 InGoingEmailSetup=收到的電子郵件
 OutGoingEmailSetupForEmailing=外送電子郵件（用於%s模組）
@@ -176,5 +176,5 @@ Answered=已回覆
 IsNotAnAnswer=未回應（原始電子郵件）
 IsAnAnswer=是一封原始電子郵件的回應
 RecordCreatedByEmailCollector=由電子郵件收集器%s從電子郵件%s建立的記錄
-DefaultBlacklistMailingStatus=Default value for field '%s' when creating a new contact
+DefaultBlacklistMailingStatus=建立新聯絡人時欄位“%s”的預設值
 DefaultStatusEmptyMandatory=必填
diff --git a/htdocs/langs/zh_TW/main.lang b/htdocs/langs/zh_TW/main.lang
index d5f2acd1801..b1b4465ec5b 100644
--- a/htdocs/langs/zh_TW/main.lang
+++ b/htdocs/langs/zh_TW/main.lang
@@ -88,7 +88,7 @@ FileWasNotUploaded=所選定的檔案尚未上傳。點選 "附加檔案"。
 NbOfEntries=項目數量
 GoToWikiHelpPage=讀取線上幫助 (需要連上網路)
 GoToHelpPage=讀取幫助
-DedicatedPageAvailable=Dedicated help page related to your current screen
+DedicatedPageAvailable=與您目前畫面相關的幫助頁面
 HomePage=首頁
 RecordSaved=記錄已儲存
 RecordDeleted=記錄已刪除
@@ -115,7 +115,7 @@ ReturnCodeLastAccessInError=最新的數據庫訪問請求錯誤返回代碼
 InformationLastAccessInError=最新資料庫訪問請求錯誤的資訊
 DolibarrHasDetectedError=Dolibarr 偵測到一個技術性錯誤
 YouCanSetOptionDolibarrMainProdToZero=您可以讀取 log 檔案或是在編好設定檔案中設定  $dolibarr_main_prod 選項的值為 0，以取得更多資訊。
-InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to hide sensitive information)
+InformationToHelpDiagnose=此資訊對於診斷錯誤很有用 ( 您可以在 $dolibarr_main_prod 選項中設定為 1  移除類似的警告)
 MoreInformation=更多資訊
 TechnicalInformation=技術資訊
 TechnicalID=技術ID
@@ -212,6 +212,8 @@ User=用戶
 Users=用戶
 Group=群組
 Groups=群組
+UserGroup=用戶群組
+UserGroups=用戶群組
 NoUserGroupDefined=未定義用戶群組
 Password=密碼
 PasswordRetype=重新輸入您的密碼
@@ -376,12 +378,12 @@ AmountTTCShort=金額(含稅)
 AmountHT=金額（不含稅）
 AmountTTC=金額(含稅)
 AmountVAT=稅金
-MulticurrencyAlreadyPaid=已付款，原幣別
-MulticurrencyRemainderToPay=支付餘款, 原來幣別
-MulticurrencyPaymentAmount=付款金額, 原來幣別
-MulticurrencyAmountHT=金額（不含稅），原來幣別
-MulticurrencyAmountTTC=金額(含稅), 原來幣別
-MulticurrencyAmountVAT=稅金, 原來幣別
+MulticurrencyAlreadyPaid=已付款，原始貨幣
+MulticurrencyRemainderToPay=支付餘款, 原始貨幣
+MulticurrencyPaymentAmount=付款金額, 原始貨幣
+MulticurrencyAmountHT=金額（不含稅），原始貨幣
+MulticurrencyAmountTTC=金額(含稅), 原始貨幣
+MulticurrencyAmountVAT=稅金, 原始貨幣
 MulticurrencySubPrice=金額子價格多種貨幣
 AmountLT1=稅金 2
 AmountLT2=稅金 3
@@ -907,7 +909,7 @@ ViewFlatList=檢視平面清單
 ViewAccountList=檢視總帳
 ViewSubAccountList=檢視子帳戶總帳
 RemoveString=移除字串‘%s’
-SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank" rel="noopener noreferrer external">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
+SomeTranslationAreUncomplete=提供的某些語言可能僅被部分翻譯，或者可能包含錯誤。請通過註冊<a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>來進行改進，以幫助修正您的語言。
 DirectDownloadLink=公共下載連結
 PublicDownloadLinkDesc=只需要連結即可下載檔案
 DirectDownloadInternalLink=私人下載連結
@@ -1158,7 +1160,7 @@ RecordsApproved=%s 筆記錄已批准
 Properties=屬性
 hasBeenValidated=%s 已驗證
 ClientTZ=客戶時區(用戶)
-NotClosedYet=Not yet closed
-ClearSignature=Reset signature
-CanceledHidden=Canceled hidden
-CanceledShown=Canceled shown
+NotClosedYet=尚未關閉
+ClearSignature=重置簽名
+CanceledHidden=取消隱藏
+CanceledShown=已取消顯示
diff --git a/htdocs/langs/zh_TW/members.lang b/htdocs/langs/zh_TW/members.lang
index 710f55e9297..4ab25942376 100644
--- a/htdocs/langs/zh_TW/members.lang
+++ b/htdocs/langs/zh_TW/members.lang
@@ -7,7 +7,7 @@ Members=會員
 ShowMember=顯示會員卡
 UserNotLinkedToMember=用戶未與會員連結
 ThirdpartyNotLinkedToMember=合作方(客戶/供應商)未與會員連結
-MembersTickets=Membership address sheet
+MembersTickets=會員地址表單
 FundationMembers=財團會員
 ListOfValidatedPublicMembers=經過驗證的公眾會員列表
 ErrorThisMemberIsNotPublic=該會員不是公開的
@@ -19,8 +19,8 @@ MembersCards=會員名片
 MembersList=會員清單
 MembersListToValid=草案會員清單（待確認）
 MembersListValid=有效會員清單
-MembersListUpToDate=List of valid members with up-to-date contribution
-MembersListNotUpToDate=List of valid members with out-of-date contribution
+MembersListUpToDate=具有最新貢獻的有效會員清單
+MembersListNotUpToDate=貢獻已過期的有效會員清單
 MembersListExcluded=排除會員的清單
 MembersListResiliated=已被終止會員清單
 MembersListQualified=合格會員清單
@@ -28,13 +28,13 @@ MenuMembersToValidate=草案會員
 MenuMembersValidated=已驗證會員
 MenuMembersExcluded=排除會員
 MenuMembersResiliated=已終止會員
-MembersWithSubscriptionToReceive=Members with contribution to receive
-MembersWithSubscriptionToReceiveShort=Contributions to receive
+MembersWithSubscriptionToReceive=可接收有捐款的會員
+MembersWithSubscriptionToReceiveShort=收到的捐款
 DateSubscription=入會日期
 DateEndSubscription=會員終止日
 EndSubscription=終止會員
-SubscriptionId=訂閱編號
-WithoutSubscription=沒有訂閱
+SubscriptionId=捐款編號
+WithoutSubscription=沒有捐款
 MemberId=會員編號
 NewMember=新會員
 MemberType=會員類型
@@ -45,22 +45,22 @@ MemberStatusDraft=草案（等待驗證）
 MemberStatusDraftShort=草案
 MemberStatusActive=已驗證（等待訂閱）
 MemberStatusActiveShort=已驗證
-MemberStatusActiveLate=訂閱已過期
+MemberStatusActiveLate=捐款已過期
 MemberStatusActiveLateShort=已過期
-MemberStatusPaid=訂閱最新
+MemberStatusPaid=訂閱為最新
 MemberStatusPaidShort=最新
-MemberStatusExcluded=排除會員
-MemberStatusExcludedShort=排除
+MemberStatusExcluded=未包含的會員
+MemberStatusExcludedShort=未包含
 MemberStatusResiliated=已終止成員
 MemberStatusResiliatedShort=已終止
 MembersStatusToValid=草案會員
-MembersStatusExcluded=排除會員
+MembersStatusExcluded=未包含的會員
 MembersStatusResiliated=已終止會員
-MemberStatusNoSubscription=已驗證（無需訂閱）
+MemberStatusNoSubscription=已驗證（無需捐款）
 MemberStatusNoSubscriptionShort=已驗證
-SubscriptionNotNeeded=無需訂閱
-NewCotisation=新捐贈
-PaymentSubscription=新捐贈支付
+SubscriptionNotNeeded=無需捐款
+NewCotisation=新捐款
+PaymentSubscription=新捐款支付
 SubscriptionEndDate=訂閱的結束日期
 MembersTypeSetup=會員類型設定
 MemberTypeModified=會員類型已修改
@@ -68,82 +68,82 @@ DeleteAMemberType=刪除會員類型
 ConfirmDeleteMemberType=您確定要刪除此會員類型嗎？
 MemberTypeDeleted=會員類型已刪除
 MemberTypeCanNotBeDeleted=會員類型無法刪除
-NewSubscription=新捐贈
-NewSubscriptionDesc=此表單使您可以作為財團的新會員來記錄訂閱。如果要續訂（如果已經是會員），請通過電子郵件%s與財團聯繫。
-Subscription=訂閱
-Subscriptions=訂閱
+NewSubscription=新捐款
+NewSubscriptionDesc=此表單使您可以作為財團的新會員來記錄訂閱。如果要續訂（如果已經是會員），請通過電子郵件%s與基金會聯繫。
+Subscription=捐款
+Subscriptions=捐款
 SubscriptionLate=晚
-SubscriptionNotReceived=從未收到訂閱
-ListOfSubscriptions=訂閱清單
+SubscriptionNotReceived=從未收到捐款
+ListOfSubscriptions=捐款清單
 SendCardByMail=通過電子郵件發送卡片
 AddMember=建立會員
 NoTypeDefinedGoToSetup=未定義會員類型。前往選單“會員類型”
 NewMemberType=新會員類型
 WelcomeEMail=歡迎電子郵件
-SubscriptionRequired=需要訂閱
+SubscriptionRequired=需要捐款
 DeleteType=刪除
 VoteAllowed=允許投票
 Physical=個人
 Moral=公司
 MorAndPhy=公司和個人
 Reenable=重新啟用
-ExcludeMember=排除會員
+ExcludeMember=不包括會員
 Exclude=不包括
-ConfirmExcludeMember=您確定要排除此會員嗎？
+ConfirmExcludeMember=您確定要不包括此會員嗎？
 ResiliateMember=終止會員
 ConfirmResiliateMember=您確定要終止此會員嗎？
 DeleteMember=刪除會員
-ConfirmDeleteMember=您確定要刪除此會員嗎（刪除會員將刪除其所有訂閱）？
+ConfirmDeleteMember=您確定要刪除此會員嗎（刪除會員將刪除其所有捐款）？
 DeleteSubscription=刪除訂閱
-ConfirmDeleteSubscription=您確定要刪除此訂閱嗎？
-Filehtpasswd=htpasswd文件
+ConfirmDeleteSubscription=您確定要刪除此捐款嗎？
+Filehtpasswd=htpasswd檔案
 ValidateMember=驗證會員
 ConfirmValidateMember=您確定要驗證此會員嗎？
 FollowingLinksArePublic=以下連結未受任何Dolibarr權限保護的開放頁面。它們不是格式化的頁面，僅作為範例顯示如何列出會員數據庫。
-PublicMemberList=公共會員名單
-BlankSubscriptionForm=Public self-registration form
+PublicMemberList=公開會員名單
+BlankSubscriptionForm=公開的自行註冊表單
 BlankSubscriptionFormDesc=Dolibarr可以為您提供公共URL /網站，以允許外部訪問者請求訂閱財團。如果啟用了線上付款模組，則還可以自動提供付款表格。
-EnablePublicSubscriptionForm=使用自我訂閱表格啟用公共網站
+EnablePublicSubscriptionForm=啟用自行訂閱表格公共網站
 ForceMemberType=強制會員類型
-ExportDataset_member_1=Members and contributions
+ExportDataset_member_1=會員與捐款
 ImportDataset_member_1=會員
 LastMembersModified=最後%s位修改的會員
-LastSubscriptionsModified=Latest %s modified contributions
+LastSubscriptionsModified=最新%s筆修改的捐款
 String=字串
 Text=文字
 Int=整數
 DateAndTime=日期和時間
 PublicMemberCard=成員公共卡
-SubscriptionNotRecorded=Contribution not recorded
-AddSubscription=Create contribution
-ShowSubscription=Show contribution
+SubscriptionNotRecorded=捐款未記錄
+AddSubscription=建立捐款
+ShowSubscription=顯示捐款
 # Label of email templates
 SendingAnEMailToMember=發送訊息郵件給會員
 SendingEmailOnAutoSubscription=發送自動註冊的電子郵件
 SendingEmailOnMemberValidation=發送新會員驗證電子郵件
-SendingEmailOnNewSubscription=Sending email on new contribution
-SendingReminderForExpiredSubscription=Sending reminder for expired contributions
+SendingEmailOnNewSubscription=發送有關新捐款的電子郵件
+SendingReminderForExpiredSubscription=發送過期捐款提醒
 SendingEmailOnCancelation=發送取消郵件
 SendingReminderActionComm=寄送議程事件提醒
 # Topic of email templates
 YourMembershipRequestWasReceived=您的會員資格已收到。
 YourMembershipWasValidated=您的會員資格已通過驗證
-YourSubscriptionWasRecorded=Your new contribution was recorded
-SubscriptionReminderEmail=contribution reminder
+YourSubscriptionWasRecorded=您的新捐款已被記錄
+SubscriptionReminderEmail=捐款提醒
 YourMembershipWasCanceled=您的會員資格已被取消
 CardContent=您的會員卡內容
 # Text of email templates
 ThisIsContentOfYourMembershipRequestWasReceived=我們想通知您，您的會員要求已收到。 <br><br>
-ThisIsContentOfYourMembershipWasValidated=謹在此通知您，您的會員資格已通過以下信息驗證： <br><br>
+ThisIsContentOfYourMembershipWasValidated=謹在此通知您，您的會員資格已通過以下資訊驗證： <br><br>
 ThisIsContentOfYourSubscriptionWasRecorded=我們想通知您，您的新訂閱已記錄。 <br><br>
 ThisIsContentOfSubscriptionReminderEmail=我們想告訴您您的訂閱即將到期或已經到期（__MEMBER_LAST_SUBSCRIPTION_DATE_END__）。希望您能繼續訂閱。 <br><br>
 ThisIsContentOfYourCard=這是我們有關您的資訊摘要。如果有任何錯誤，請與我們聯繫。 <br><br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=訪客自動註冊時收到的通知電子郵件主題
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL=訪客自動註冊時收到的通知電子郵件的內容
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member auto-registration
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=電子郵件範本，用於會員自動捐款時向會員發送電子郵件
 DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=電子郵件範本，用於會員驗證時向會員發送電子郵件
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new contribution recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when contribution is about to expire
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=電子郵件範本，用於新的捐款記錄時向會員發送電子郵件
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=電子郵件範本, 用於捐款即將到期時發送電子郵件提醒
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=電子郵件範本，用於在會員取消時向會員發送電子郵件
 DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=用於會員排除時向會員發出電子郵件的模板
 DescADHERENT_MAIL_FROM=自動發送電子郵件之發件人電子郵件
@@ -156,10 +156,10 @@ DescADHERENT_CARD_TEXT_RIGHT=會員卡文字（向右對齊）
 DescADHERENT_CARD_FOOTER_TEXT=會員卡底部文字
 ShowTypeCard=顯示類型'%s'
 HTPasswordExport=產生htpassword文件
-NoThirdPartyAssociatedToMember=No third party associated with this member
-MembersAndSubscriptions=Members and Contributions
+NoThirdPartyAssociatedToMember=沒有與該會員關聯的合作方
+MembersAndSubscriptions=會員和捐款
 MoreActions=補充行動記錄
-MoreActionsOnSubscription=Complementary action, suggested by default when recording a contribution
+MoreActionsOnSubscription=補充動作，在記錄捐款時預設建議
 MoreActionBankDirect=在銀行帳戶上建立直接條目
 MoreActionBankViaInvoice=建立發票，並通過銀行帳戶付款
 MoreActionInvoiceOnly=建立無付款的發票
@@ -168,9 +168,9 @@ LinkToGeneratedPagesDesc=通過此畫面，您可以為所有會員或特定會
 DocForAllMembersCards=為所有會員產生名片
 DocForOneMemberCards=為特定會員產生名片
 DocForLabels=產生地址表
-SubscriptionPayment=Contribution payment
-LastSubscriptionDate=Date of latest contribution payment
-LastSubscriptionAmount=Amount of latest contribution
+SubscriptionPayment=捐款支付
+LastSubscriptionDate=最新捐款付款的日期
+LastSubscriptionAmount=最新捐款金額
 LastMemberType=最新的會員類型
 MembersStatisticsByCountries=會員統計(國家/城市)
 MembersStatisticsByState=會員統計(州/省)
@@ -187,34 +187,34 @@ MembersByRegion=此畫面依區域顯示有關會員的統計資訊。
 MembersStatisticsDesc=選擇要讀取的統計訊息...
 MenuMembersStats=統計
 LastMemberDate=最新入會日期
-LatestSubscriptionDate=Latest contribution date
+LatestSubscriptionDate=最新捐款日期
 MemberNature=會員性質
 MembersNature=會員性質
 Public=資訊是公開的
 NewMemberbyWeb=增加了新會員。等待核准
-NewMemberForm=新會員表格
-SubscriptionsStatistics=Contributions statistics
-NbOfSubscriptions=Number of contributions
-AmountOfSubscriptions=Amount collected from contributions
+NewMemberForm=新會員表單
+SubscriptionsStatistics=捐款統計
+NbOfSubscriptions=捐款數量
+AmountOfSubscriptions=從捐款中收取的金額
 TurnoverOrBudget=營業額（對於公司）或預算（對於財團）
-DefaultAmount=Default amount of contribution
-CanEditAmount=Visitor can choose/edit amount of its contribution
+DefaultAmount=捐款預設金額
+CanEditAmount=訪客可以選擇/編輯其捐款金額
 MEMBER_NEWFORM_PAYONLINE=跳至綜合線上支付頁面
 ByProperties=依照性質
 MembersStatisticsByProperties=會員性質統計
-VATToUseForSubscriptions=VAT rate to use for contributionss
-NoVatOnSubscription=No VAT for contributions
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for contribution line into invoice: %s
+VATToUseForSubscriptions=用於捐款的稅率
+NoVatOnSubscription=捐款不徵收稅金
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=用於發票的捐款欄的產品：%s
 NameOrCompany=姓名或公司名稱
-SubscriptionRecorded=Contribution recorded
+SubscriptionRecorded=捐款已記錄
 NoEmailSentToMember=沒有發送電子郵件給會員
 EmailSentToMember=使用%s發送給會員的電子郵件
-SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired contributions
-SendReminderForExpiredSubscription=Send reminder by email to members when contribution is about to expire (parameter is number of days before end of membership to send the remind. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
+SendReminderForExpiredSubscriptionTitle=以電子郵件發送過期捐款提醒
+SendReminderForExpiredSubscription=當捐款即將到期時，以電子郵件向會員發送提醒（參數是捐款終止發送提醒之前的天數。它可以是用分號分隔的天數清單，例如 '10; 5; 0; -5'）
 MembershipPaid=本期已支付的會費（直到%s）
 YouMayFindYourInvoiceInThisEmail=您可在此電子郵件中找到發票
 XMembersClosed=%s會員已關閉
 XExternalUserCreated=已建立%s位外部用戶
 ForceMemberNature=強制會員性質（個人或公司）
-CreateDolibarrLoginDesc=The creation of a user login for members allows them to connect to the application. Depending on the authorizations granted, they will be able, for example, to consult or modify their file themselves.
-CreateDolibarrThirdPartyDesc=A thirdparty is the legal entity that will be used on the invoice if you decide to generate invoice for each contribution. You will be able to create it later during the process of recording the contribution.
+CreateDolibarrLoginDesc=為會員建立用戶登錄允許他們連接到應用程式。例如，根據授予的授權，他們將能夠自己查閱或修改他們的檔案。
+CreateDolibarrThirdPartyDesc=如果您決定為每筆捐款產生發票，合作方就是將使用在發票上的實體法人。您稍後可以在記錄捐款的過程中建立它。
diff --git a/htdocs/langs/zh_TW/modulebuilder.lang b/htdocs/langs/zh_TW/modulebuilder.lang
index a0bcb922711..ef382c35088 100644
--- a/htdocs/langs/zh_TW/modulebuilder.lang
+++ b/htdocs/langs/zh_TW/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank" rel="noopener noreferrer">manual development is here</a>.
+ModuleBuilderDesc=此工具只能由有經驗的用戶或開發人員使用。它提供了構建或編輯您自己的模組的實用程序。替代 <a href="%s" target="_blank" rel="noopener noreferrer"> 手動開發的文件在此處 </a> 。
 EnterNameOfModuleDesc=輸入要新建的 模組/程式 名稱不留空白。使用大寫字母分隔單詞（例如：example: MyModule, EcommerceForShop, SyncWithMySystem...）
 EnterNameOfObjectDesc=輸入要新建的物件名稱不留空白。使用大寫字母分隔單詞（例如：MyObject, Student, Teacher...）。將生成 CRUD class 檔案，以及 API 檔案，頁面用來 列出/新增/編輯/刪除 對象及SQL的檔案將自動生成。
 ModuleBuilderDesc2=已生成/已編輯 模組的路徑（外部模組的首個目錄定義為%s）: <strong> %s </strong>
@@ -20,14 +20,14 @@ ModuleBuilderDescpermissions=此標籤專用於定義您要隨模組提供的新
 ModuleBuilderDesctriggers=這是您模組提供的觸發器檢視。當觸發了業務事件時要包含代碼的執行，只需編輯此檔案。
 ModuleBuilderDeschooks=此標籤專用於掛載。
 ModuleBuilderDescwidgets=此頁籤是專門用於管理/建立小工具。
-ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
-EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
+ModuleBuilderDescbuildpackage=您可以在此處產生模組的“準備發布”封裝檔案（統一化的 .zip 文件）和“準備發布”文件檔案.只需點擊按鈕即可建構封裝或文件檔案。
+EnterNameOfModuleToDeleteDesc=您可以刪除您的模組。警告：模組的所有編碼檔案（手動產生或建立）以及結構化資料和文件都將被刪除！
+EnterNameOfObjectToDeleteDesc=您可以刪除一個項目。警告：所有與物件相關的編碼檔案（手動產生或建立）都將被刪除！
 DangerZone=危險區域
 BuildPackage=建立軟體包
-BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
+BuildPackageDesc=您可以產生應用程式的 zip 包，以便準備好在任何 Dolibarr 上發布它。您也可以在 <a href="https://www.dolistore.com"> DoliStore.com </a> 等市場上發布或出售它。
 BuildDocumentation=建立文件
-ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here
+ModuleIsNotActive=此模組尚未啟用。前往 %s 使其生效或點擊此處
 ModuleIsLive=此模組已被啟動。任何更改都可能會破壞目前的即時功能。
 DescriptionLong=詳細描述
 EditorName=編輯器名稱
@@ -40,7 +40,7 @@ PageForCreateEditView=建立/編輯/檢視記錄PHP頁面
 PageForAgendaTab=事件分頁的PHP頁面
 PageForDocumentTab=文件分頁的PHP頁面
 PageForNoteTab=註記分頁的PHP頁面
-PageForContactTab=PHP page for contact tab
+PageForContactTab=聯絡人分頁的 PHP 頁面
 PathToModulePackage=模組/應用程式包的zip路徑
 PathToModuleDocumentation=模組/應用程式檔案的文件路徑(%s)
 SpaceOrSpecialCharAreNotAllowed=不允許使用空格或特殊符號。
@@ -50,35 +50,35 @@ RegenerateMissingFiles=產生遺失的檔案
 SpecificationFile=文件檔案
 LanguageFile=語言檔案
 ObjectProperties=項目屬性
-ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
+ConfirmDeleteProperty=您確定要刪除屬性 <strong> %s </strong> 嗎？這將更改 PHP 類別中的代碼，但也會從物件表格定義中刪除列。
 NotNull=非空白
-NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
+NotNullDesc=1 = 將資料庫設定為 NOT NULL。 -1=如果為空（'' 或 0），則允許為空並強制值為 NULL。
 SearchAll=用於“全部搜尋”
 DatabaseIndex=資料庫索引
 FileAlreadyExists=檔案%s已存在
 TriggersFile=觸發器代碼檔案
 HooksFile=掛鉤代碼檔案
-ArrayOfKeyValues=Array of key-val
-ArrayOfKeyValuesDesc=Array of keys and values if field is a combo list with fixed values
+ArrayOfKeyValues=鍵值陣列
+ArrayOfKeyValuesDesc=如果欄位是具有固定值的組合清單，則為鍵值陣列與數值
 WidgetFile=小工具檔案
 CSSFile=CSS檔案
 JSFile=Javascript檔案
 ReadmeFile=Readme檔案
 ChangeLog=ChangeLog檔案
-TestClassFile=File for PHP Unit Test class
+TestClassFile=PHP 單位測試類別檔案
 SqlFile=SQL檔案
 PageForLib=通用PHP庫的檔案
-PageForObjLib=File for the PHP library dedicated to object
-SqlFileExtraFields=Sql file for complementary attributes
+PageForObjLib=專用於物件的 PHP 庫檔案
+SqlFileExtraFields=補充屬性的 Sql 檔案
 SqlFileKey=密鑰的SQL檔案
-SqlFileKeyExtraFields=Sql file for keys of complementary attributes
-AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
-UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
-IsAMeasure=Is a measure
+SqlFileKeyExtraFields=補充屬性鍵的 Sql 檔案
+AnObjectAlreadyExistWithThisNameAndDiffCase=已存在具有此名稱和不同大小寫的物件
+UseAsciiDocFormat=可以使用 Markdown 格式，但建議使用 Asciidoc 格式（.md 和 .asciidoc 之間的比較：http://asciidoctor.org/docs/user-manual/#compared-to-markdown）
+IsAMeasure=是一個量測
 DirScanned=資料夾已掃描
 NoTrigger=沒有觸發器
 NoWidget=沒有小工具
-GoToApiExplorer=API explorer
+GoToApiExplorer=API 瀏覽器
 ListOfMenusEntries=選單條目清單
 ListOfDictionariesEntries=分類條目清單
 ListOfPermissionsDefined=已定義權限清單
@@ -87,7 +87,7 @@ EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->M
 VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
 DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=以PDF顯示
-IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
+IsAMeasureDesc=可以將可累積欄位的值以總和放入清單中嗎？ （例如：1 或 0）
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
 SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
 LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
@@ -101,12 +101,12 @@ HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module
 TriggerDefDesc=Define in the trigger file the code that you want to execute when a business event external to your module is executed (events triggered by other modules).
 SeeIDsInUse=See IDs in use in your installation
 SeeReservedIDsRangeHere=See range of reserved IDs
-ToolkitForDevelopers=Toolkit for Dolibarr developers
+ToolkitForDevelopers=Dolibarr 開發人員工具集
 TryToUseTheModuleBuilder=如果您具有SQL和PHP的知識，則可以使用本機模組建構器精靈。 <br>啟用模組<strong> %s </strong>並通過點擊右上方選單上的<span class="fa fa-bug"> </span>使用精靈。 <br>警告：這是高級開發人員功能，請<b>不要</b>在生產 網站上進行實驗！
 SeeTopRightMenu=請參閱右上方選單中的<span class="fa fa-bug"> </span>
 AddLanguageFile=增加語言檔案
 YouCanUseTranslationKey=您可以在此處使用一個key，此key是在語言檔案中找到的翻譯key（請參見“語言”分頁）
-DropTableIfEmpty=(Destroy table if empty)
+DropTableIfEmpty=（如果為空，則刪除表）
 TableDoesNotExists=表%s不存在
 TableDropped=表%s已刪除
 InitStructureFromExistingTable=建立現有表的結構數組字串
@@ -133,15 +133,15 @@ IncludeDocGeneration=我想從項目產生一些文件
 IncludeDocGenerationHelp=如果選中此選項，將產生一些代碼以在記錄上增加“產生文件”框。
 ShowOnCombobox=在組合框中顯示數值
 KeyForTooltip=Key for tooltip
-CSSClass=CSS for edit/create form
-CSSViewClass=CSS for read form
-CSSListClass=CSS for list
+CSSClass=編輯/建立表單的 CSS
+CSSViewClass=讀取表單的 CSS
+CSSListClass=清單的 CSS
 NotEditable=無法編輯
 ForeignKey=外部金鑰
 TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
 AsciiToHtmlConverter=ASCII到HTML轉換器
 AsciiToPdfConverter=ASCII到PDF轉換器
 TableNotEmptyDropCanceled=表不為空。刪除已被取消。
-ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
-ImportExportProfiles=Import and export profiles
+ModuleBuilderNotAllowed=模組建構器可使用，但不允許您的用戶使用。
+ImportExportProfiles=匯入和匯出設定檔
 ValidateModBuilderDesc=Put 1 if this field need to be validated with $this->validateField() or 0 if validation required
diff --git a/htdocs/langs/zh_TW/mrp.lang b/htdocs/langs/zh_TW/mrp.lang
index 9da90fa90c4..4e0a50be74a 100644
--- a/htdocs/langs/zh_TW/mrp.lang
+++ b/htdocs/langs/zh_TW/mrp.lang
@@ -32,7 +32,7 @@ ValueOfMeansLossForProductProduced=值0.95表示損失平均5%%的生產產品
 DeleteBillOfMaterials=刪除物料清單
 DeleteMo=刪除製造訂單
 ConfirmDeleteBillOfMaterials=您確定要刪除此物料清單嗎？
-ConfirmDeleteMo=Are you sure you want to delete this Manufacturing Order?
+ConfirmDeleteMo=您確定要刪除此製造訂單嗎？
 MenuMRP=製造訂單
 NewMO=新製造訂單
 QtyToProduce=生產數量
@@ -104,6 +104,6 @@ HumanMachine=人員/機器
 WorkstationArea=工作站區域
 Machines=機器
 THMEstimatedHelp=此費率使得可以定義物料的預估成本
-BOM=Bill Of Materials
-CollapseBOMHelp=You can define the default display of the details of the nomenclature in the configuration of the BOM module
+BOM=材料清單
+CollapseBOMHelp=您可以在 BOM 模組的設定中定義命名法詳細資訊的預設顯示
 MOAndLines=製造訂單和生產線
diff --git a/htdocs/langs/zh_TW/oauth.lang b/htdocs/langs/zh_TW/oauth.lang
index cd34ff0e779..0e443711506 100644
--- a/htdocs/langs/zh_TW/oauth.lang
+++ b/htdocs/langs/zh_TW/oauth.lang
@@ -23,10 +23,10 @@ TOKEN_DELETE=刪除已儲存的許可證
 OAUTH_GOOGLE_NAME=OAuth Google服務
 OAUTH_GOOGLE_ID=OAuth Google Id
 OAUTH_GOOGLE_SECRET=OAuth Google Secret
-OAUTH_GOOGLE_DESC=前往<a class="notasortlink" href="https://console.developers.google.com/" target="_blank">此頁面</a>然後點擊“憑證”以建立OAuth憑證
+OAUTH_GOOGLE_DESC=前往<a class="notasortlink" href="https://console.developers.google.com/" target="_blank" rel="noopener noreferrer external">此頁面</a>然後點擊“憑證”以建立OAuth憑證
 OAUTH_GITHUB_NAME=OAuth GitHub服務
 OAUTH_GITHUB_ID=OAuth GitHub Id
 OAUTH_GITHUB_SECRET=OAuth GitHub Secret
-OAUTH_GITHUB_DESC=前往<a class="notasortlink" href="https://github.com/settings/developers" target="_blank">此頁面</a>然後“註冊新應用程式”以建立OAuth憑證
+OAUTH_GITHUB_DESC=前往此<a class="notasortlink" href="https://github.com/settings/developers" target="_blank" rel="noopener noreferrer external">頁面</a>然後“註冊新應用程式”以建立OAuth憑證
 OAUTH_STRIPE_TEST_NAME=OAuth Stripe測試
 OAUTH_STRIPE_LIVE_NAME=OAuth Stripe Live
diff --git a/htdocs/langs/zh_TW/opensurvey.lang b/htdocs/langs/zh_TW/opensurvey.lang
index f45a2972720..5e496e32e8f 100644
--- a/htdocs/langs/zh_TW/opensurvey.lang
+++ b/htdocs/langs/zh_TW/opensurvey.lang
@@ -48,8 +48,8 @@ AddEndHour=增加結束時間
 votes=投票
 NoCommentYet=尚未有此調查的評論
 CanComment=投票者可以在調查中發表評論
-YourVoteIsPrivate=This poll is private, nobody can see your vote.
-YourVoteIsPublic=This poll is public, anybody with the link can see your vote.
+YourVoteIsPrivate=此投票是私人的，沒有人可以看到您的投票。
+YourVoteIsPublic=此投票是公開的，任何知道連結的人都可以看到您的投票。
 CanSeeOthersVote=投票者可以看到其他人的投票
 SelectDayDesc=對於每個選定的日期，您可以依照以下格式選擇是否選擇開會時間： <br> -空的<br> -“ 8h”，“ 8H”或“ 8:00”指定會議的開始時間， <br> -“ 8-11”，“ 8h-11h”，“ 8H-11H”或“ 8：00-11：00”給出會議的開始和結束時間， <br> -同樣的用“ 8h15-11h15”，“ 8H15-11H15”或“ 8：15-11：15”表示，但要加上分鐘。
 BackToCurrentMonth=回到目前月份
diff --git a/htdocs/langs/zh_TW/other.lang b/htdocs/langs/zh_TW/other.lang
index 6ab65fbb67d..5cf15672a5d 100644
--- a/htdocs/langs/zh_TW/other.lang
+++ b/htdocs/langs/zh_TW/other.lang
@@ -35,9 +35,9 @@ OnlyOneFieldForXAxisIsPossible=目前只能將1個欄位用作X軸。僅選擇
 AtLeastOneMeasureIsRequired=至少需要1個測量欄位
 AtLeastOneXAxisIsRequired=X軸至少需要1個欄位
 LatestBlogPosts=最新的部落格文章
-notiftouser=To users
-notiftofixedemail=To fixed mail
-notiftouserandtofixedemail=To user and fixed mail
+notiftouser=給用戶
+notiftofixedemail=給固定電子郵件
+notiftouserandtofixedemail=給用戶和固定電子郵件
 Notify_ORDER_VALIDATE=銷售訂單已驗證
 Notify_ORDER_SENTBYMAIL=使用郵件寄送的銷售訂單
 Notify_ORDER_SUPPLIER_SENTBYMAIL=使用電子郵件寄送的採購訂單
@@ -258,6 +258,10 @@ PassEncoding=密碼編碼
 PermissionsAdd=權限已增加
 PermissionsDelete=權限已刪除
 YourPasswordMustHaveAtLeastXChars=您的密碼必須至少具有<strong> %s </strong>字元
+PasswordNeedAtLeastXUpperCaseChars=密碼至少需要 <strong> %s </strong> 個大寫字元
+PasswordNeedAtLeastXDigitChars=密碼至少需要 <strong> %s </strong> 位數字
+PasswordNeedAtLeastXSpecialChars=密碼至少需要 <strong> %s </strong>個 特殊字元
+PasswordNeedNoXConsecutiveChars=密碼不能有 <strong> %s </strong> 個連續的相似字元
 YourPasswordHasBeenReset=您的密碼已成功重置
 ApplicantIpAddress=申請人的IP位址
 SMSSentTo=簡訊已傳送至%s
diff --git a/htdocs/langs/zh_TW/partnership.lang b/htdocs/langs/zh_TW/partnership.lang
index 5d88ca57c44..c554f348d93 100644
--- a/htdocs/langs/zh_TW/partnership.lang
+++ b/htdocs/langs/zh_TW/partnership.lang
@@ -58,7 +58,7 @@ ManagePartnership=管理合作夥伴
 BacklinkNotFoundOnPartnerWebsite=在合作夥伴網站上找不到反向連結
 ConfirmClosePartnershipAsk=您確定要取消此合作關係嗎？
 PartnershipType=合作夥伴類型
-PartnershipRefApproved=Partnership %s approved
+PartnershipRefApproved=合作夥伴 %s 已核准
 
 #
 # Template Mail
@@ -78,8 +78,8 @@ YourPartnershipRefusedContent=我們通知您，您的合作請求已被拒絕
 YourPartnershipAcceptedContent=我們通知您，您的合作請求已被接受。
 YourPartnershipCanceledContent=我們通知您，您的合作夥伴關係已被取消。
 
-CountLastUrlCheckError=Number of errors for last URL check
-LastCheckBacklink=Date of last URL check
+CountLastUrlCheckError=上次檢查網址的錯誤數量
+LastCheckBacklink=上次檢查網址的日期
 ReasonDeclineOrCancel=拒絕原因
 
 #
diff --git a/htdocs/langs/zh_TW/paybox.lang b/htdocs/langs/zh_TW/paybox.lang
index 0f85b99b706..38eac80966d 100644
--- a/htdocs/langs/zh_TW/paybox.lang
+++ b/htdocs/langs/zh_TW/paybox.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - paybox
 PayBoxSetup=PayBox模組設定
-PayBoxDesc=該模塊提供的網頁，以便在付款<a href="http://www.paybox.com" target="_blank">Paybox</a>客戶。這可以用來為一個自由付款或就某一Dolibarr對象（發票，訂貨，付款...）
+PayBoxDesc=此模組允許客戶以<a href="https://www.paybox.com" target="_blank" rel="noopener noreferrer external">Paybox</a>付款。這可以用於臨時付款或與Dolibarr項目有關的付款（發票，訂單等）。
 FollowingUrlAreAvailableToMakePayments=以下網址可提供給客戶的網頁上，能夠作出Dolibarr支付對象
 PaymentForm=付款方式
-WelcomeOnPaymentPage=歡迎使用我們的在線支付服務
+WelcomeOnPaymentPage=歡迎使用我們的線上支付服務
 ThisScreenAllowsYouToPay=這個屏幕允許你進行網上支付%s。
 ThisIsInformationOnPayment=這是在做付款信息
 ToComplete=要完成
@@ -20,7 +20,6 @@ AccountParameter=帳戶參數
 UsageParameter=使用參數
 InformationToFindParameters=幫助，找到你的%s帳戶信息
 PAYBOX_CGI_URL_V2=付款出納CGI模塊的網址
-VendorName=供應商名稱
 CSSUrlForPaymentForm=付款方式的CSS樣式表的URL
 NewPayboxPaymentReceived=收到新的Paybox付款
 NewPayboxPaymentFailed=新的Paybox付款已嘗試但已失敗
diff --git a/htdocs/langs/zh_TW/paypal.lang b/htdocs/langs/zh_TW/paypal.lang
index 3dce92149e3..810bc07e357 100644
--- a/htdocs/langs/zh_TW/paypal.lang
+++ b/htdocs/langs/zh_TW/paypal.lang
@@ -1,36 +1,36 @@
 # Dolibarr language file - Source file is en_US - paypal
-PaypalSetup=貝寶模塊的設置
-PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
-PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
-PaypalDoPayment=Pay with PayPal
-PAYPAL_API_SANDBOX=測試/沙箱模式
-PAYPAL_API_USER=API的用戶名
+PaypalSetup=PayPal模組設定
+PaypalDesc=此模組允許客戶以<a href="https://www.paypal.com" target="_blank" rel="noopener noreferrer external">PayPal付款</a>。這可以用於臨時付款或與Dolibarr項目有關的付款（發票，訂單等）。
+PaypalOrCBDoPayment=使用PayPal（信用卡或PayPal）付款
+PaypalDoPayment=用PayPal付款
+PAYPAL_API_SANDBOX=測試/沙盒模式
+PAYPAL_API_USER=API用戶名
 PAYPAL_API_PASSWORD=API密碼
 PAYPAL_API_SIGNATURE=API簽名
-PAYPAL_SSLVERSION=Curl SSL Version
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
-PaypalModeIntegral=Integral
-PaypalModeOnlyPaypal=PayPal only
-ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
-ThisIsTransactionId=這是交易編號<b>：%s</b>
-PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
-NewOnlinePaymentReceived=New online payment received
-NewOnlinePaymentFailed=New online payment tried but failed
-ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
-ReturnURLAfterPayment=Return URL after payment
-ValidationOfOnlinePaymentFailed=Validation of online payment failed
-PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
-SetExpressCheckoutAPICallFailed=SetExpressCheckout API call failed.
-DoExpressCheckoutPaymentAPICallFailed=DoExpressCheckoutPayment API call failed.
-DetailedErrorMessage=Detailed Error Message
-ShortErrorMessage=Short Error Message
-ErrorCode=Error Code
-ErrorSeverityCode=Error Severity Code
-OnlinePaymentSystem=Online payment system
-PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
-PaypalImportPayment=Import PayPal payments
-PostActionAfterPayment=Post actions after payments
-ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
-ValidationOfPaymentFailed=Validation of payment has failed
-CardOwner=Card holder
-PayPalBalance=Paypal credit
+PAYPAL_SSLVERSION=Curl SSL版本
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=提供“完整”付款（信用卡+ PayPal）或僅“ PayPal”
+PaypalModeIntegral=完整
+PaypalModeOnlyPaypal=PayPal
+ONLINE_PAYMENT_CSS_URL=線上支付頁面上CSS樣式表的可選擇網址
+ThisIsTransactionId=這是交易編號:<b>%s</b>
+PAYPAL_ADD_PAYMENT_URL=通過電子郵件發送文件時，請包含PayPal付款網址
+NewOnlinePaymentReceived=收到新的線上付款
+NewOnlinePaymentFailed=新的線上付款已嘗試但失敗
+ONLINE_PAYMENT_SENDEMAIL=每次付款後（成功或失敗）的通知電子郵件地址
+ReturnURLAfterPayment=付款後返回網址
+ValidationOfOnlinePaymentFailed=線上付款驗證失敗
+PaymentSystemConfirmPaymentPageWasCalledButFailed=付款系統調用付款確認頁面返回錯誤
+SetExpressCheckoutAPICallFailed=SetExpressCheckout API調用失敗。
+DoExpressCheckoutPaymentAPICallFailed=DoExpressCheckoutPayment API調用失敗。
+DetailedErrorMessage=錯誤訊息詳細資訊
+ShortErrorMessage=簡短錯誤訊息
+ErrorCode=錯誤代碼
+ErrorSeverityCode=錯誤嚴重度代碼
+OnlinePaymentSystem=線上支付系統
+PaypalLiveEnabled=啟用PayPal“線上”模式（否則為測試/沙盒模式）
+PaypalImportPayment=匯入PayPal付款
+PostActionAfterPayment=付款後發布操作
+ARollbackWasPerformedOnPostActions=對所有Post操作執行了回滾。如果有必要，您必須手動完成發布操作。
+ValidationOfPaymentFailed=付款驗證失敗
+CardOwner=持卡人
+PayPalBalance=PayPal信用餘額
diff --git a/htdocs/langs/zh_TW/productbatch.lang b/htdocs/langs/zh_TW/productbatch.lang
index 07897068771..9297a806ae8 100644
--- a/htdocs/langs/zh_TW/productbatch.lang
+++ b/htdocs/langs/zh_TW/productbatch.lang
@@ -30,16 +30,16 @@ ManageLotMask=自定義遮罩
 CustomMasks=為每個產品定義不同編號遮罩的選項
 BatchLotNumberingModules=自動產生批號的編號規則
 BatchSerialNumberingModules=自動產生序號的編號規則（對每一個具有 1 個唯一批號/序號的產品）
-QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
+QtyToAddAfterBarcodeScan=%s每一個已掃描的條碼/批號/序號之數量
 LifeTime=有效期（天）
 EndOfLife=已到期
 ManufacturingDate=生產日期
 DestructionDate=銷毀日期
 FirstUseDate=首次使用日期
 QCFrequency=品質控制頻率（天）
-ShowAllLots=Show all lots
-HideLots=Hide lots
+ShowAllLots=顯示全部批號
+HideLots=隱藏批號
 #Traceability - qc status
 OutOfOrder=亂序
 InWorkingOrder=在生產訂單中
-ToReplace=Replace
+ToReplace=更換
diff --git a/htdocs/langs/zh_TW/products.lang b/htdocs/langs/zh_TW/products.lang
index 1c197f82b97..181045182ce 100644
--- a/htdocs/langs/zh_TW/products.lang
+++ b/htdocs/langs/zh_TW/products.lang
@@ -75,9 +75,9 @@ SellingPriceTTC=售價（含稅）
 SellingMinPriceTTC=最低售價（含稅）
 CostPriceDescription=此價格欄位（不含稅）可用於取得該產品給貴公司的平均價格。它可以是您自己計算的任何價格，例如，根據平均購買價格加上平均生產和分銷成本得出的價格。
 CostPriceUsage=此值可用於利潤計算。
-ManufacturingPrice=Manufacturing price
-SoldAmount=銷售數量
-PurchasedAmount=購買數量
+ManufacturingPrice=製造價格
+SoldAmount=銷售金額
+PurchasedAmount=採購金額
 NewPrice=新價格
 MinPrice=最低售價
 EditSellingPriceLabel=修改售價標籤
@@ -316,7 +316,7 @@ LastUpdated=最新更新
 CorrectlyUpdated=更新成功
 PropalMergePdfProductActualFile=用於增加到PDF Azur的文件是
 PropalMergePdfProductChooseFile=選擇PDF文件
-IncludingProductWithTag=Including products/services with the tag
+IncludingProductWithTag=包含有標籤的產品/服務
 DefaultPriceRealPriceMayDependOnCustomer=預設價格，實際價格可能取決於客戶
 WarningSelectOneDocument=請至少選擇一份文件
 DefaultUnitToShow=單位
@@ -398,15 +398,15 @@ ActionAvailableOnVariantProductOnly=僅對產品的變數提供操作
 ProductsPricePerCustomer=每個客戶的產品價格
 ProductSupplierExtraFields=附加屬性（供應商價格）
 DeleteLinkedProduct=刪除連結到組合的子產品
-AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
+AmountUsedToUpdateWAP=用於更新加權平均價格的金額
 PMPValue=加權平均價格
 PMPValueShort=WAP
-mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
-mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
-DefaultBOM=Default BOM
-DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
+mandatoryperiod=強制期限
+mandatoryPeriodNeedTobeSet=注意：必須定義期間（開始和結束日期）
+mandatoryPeriodNeedTobeSetMsgValidate=服務需要有開始與結束的時間
+mandatoryHelper=如果您希望在建立/驗證發票、商業提案/建議書、銷售訂單時向用戶發送訊息，而無需在此服務的行中輸入開始和結束日期，請選此項。 <br> 請注意，該消息是警告而不是封鎖錯誤。
+DefaultBOM=預設物料清單
+DefaultBOMDesc=推薦用於製造此產品的預設的物料清單。僅當產品性質為“%s”時才能設定此欄位。
 Rank=等級
-SwitchOnSaleStatus=Switch on sale status
-SwitchOnPurchaseStatus=Switch on purchase status
+SwitchOnSaleStatus=開啟銷售狀態
+SwitchOnPurchaseStatus=開啟採購狀態
diff --git a/htdocs/langs/zh_TW/projects.lang b/htdocs/langs/zh_TW/projects.lang
index 7e6461b961f..5c0e66147a2 100644
--- a/htdocs/langs/zh_TW/projects.lang
+++ b/htdocs/langs/zh_TW/projects.lang
@@ -140,7 +140,7 @@ NoTasks=此專案沒有任務
 LinkedToAnotherCompany=連結到其他合作方
 TaskIsNotAssignedToUser=任務未分配給用戶。現在使用按鈕'<strong>%s</strong>'分配任務。
 ErrorTimeSpentIsEmpty=花費的時間是空的
-TimeRecordingRestrictedToNMonthsBack=Time recording is restricted to %s months back
+TimeRecordingRestrictedToNMonthsBack=時間記錄僅限於 %s 個月以前
 ThisWillAlsoRemoveTasks=此操作將刪除專案（此刻<b>%s</b>任務）的所有任務和所有輸入的花費時間。
 IfNeedToUseOtherObjectKeepEmpty=如果必須將屬於另一個合作方的某些項目（發票，訂單等）連結到要建立的專案，請將該欄位保留為空白以使此專案為多個合作方。
 CloneTasks=複製任務
@@ -259,7 +259,7 @@ TimeSpentForInvoice=花費時間
 OneLinePerUser=每位用戶一行
 ServiceToUseOnLines=行上使用的服務
 InvoiceGeneratedFromTimeSpent=根據專案花費的時間產生了發票%s
-InterventionGeneratedFromTimeSpent=Intervention %s has been generated from time spent on project
+InterventionGeneratedFromTimeSpent=干預 %s 已從專案的時間花費上產生
 ProjectBillTimeDescription=請勾選如果您輸入了有關專案任務的時間表，並計劃從此時間表中產生發票以向此專案的客戶開立帳單（不要勾選如果您打算建立不基於輸入時間表的發票）。注意：要產生發票，請前往專案的“花費時間”分頁上，並選擇要包括的行。
 ProjectFollowOpportunity=追蹤機會
 ProjectFollowTasks=追蹤任務或花費的時間
@@ -268,13 +268,13 @@ UsageOpportunity=用法：機會
 UsageTasks=用法：任務
 UsageBillTimeShort=用法：帳單時間
 InvoiceToUse=發票草稿
-InterToUse=Draft intervention to use
+InterToUse=使用干預草案
 NewInvoice=新發票
 NewInter=新干預
 OneLinePerTask=每個任務一行
 OneLinePerPeriod=每個週期一行
 OneLinePerTimeSpentLine=一行為一筆時間花費申報
-AddDetailDateAndDuration=With date and duration into line description
+AddDetailDateAndDuration=將日期和持續時間放入行的描述中
 RefTaskParent=參考上層任務
 ProfitIsCalculatedWith=利潤計算是使用
 AddPersonToTask=也增加到任務
@@ -282,5 +282,6 @@ UsageOrganizeEvent=用途：事件組織
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=當所有任務完成時將專案分類為關閉(進度100%%)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=注意：所有任務進度為 100%% 的現有專案不會受到影響：您必須手動關閉它們。此選項僅影響打開的專案。
 SelectLinesOfTimeSpentToInvoice=選擇未計費的時間行，然後批次操作“產生發票”來計費
-ProjectTasksWithoutTimeSpent=Project tasks without time spent
-FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
+ProjectTasksWithoutTimeSpent=無需時間花費的專案任務
+FormForNewLeadDesc=感謝您填寫以下表單與我們聯繫。您也可以直接發送電子郵件至 <b> %s </b> 。
+StartDateCannotBeAfterEndDate=結束日期不能早於開始日期
diff --git a/htdocs/langs/zh_TW/propal.lang b/htdocs/langs/zh_TW/propal.lang
index 660338fcd14..9b718dad63f 100644
--- a/htdocs/langs/zh_TW/propal.lang
+++ b/htdocs/langs/zh_TW/propal.lang
@@ -89,11 +89,11 @@ IdProposal=方案/提案編號
 IdProduct=產品編號
 PrParentLine=方案/提案主行
 LineBuyPriceHT=購買價格扣除稅額
-SignPropal=Accept proposal
-RefusePropal=Refuse proposal
-Sign=Sign
-PropalAlreadySigned=Proposal already accepted
-PropalAlreadyRefused=Proposal already refused
-PropalSigned=Proposal accepted
-PropalRefused=Proposal refused
-ConfirmRefusePropal=Are you sure you want to refuse this commercial proposal?
+SignPropal=接受提案/建議書
+RefusePropal=拒絕提案/建議書
+Sign=簽名
+PropalAlreadySigned=提案/建議書已被接受
+PropalAlreadyRefused=提案/建議書已被拒絕
+PropalSigned=提案/建議書已接受
+PropalRefused=提案/建議書已拒絕
+ConfirmRefusePropal=您確定您想要拒絕此商業提案/建議書?
diff --git a/htdocs/langs/zh_TW/receptions.lang b/htdocs/langs/zh_TW/receptions.lang
index 9fa94da38fc..90931821daa 100644
--- a/htdocs/langs/zh_TW/receptions.lang
+++ b/htdocs/langs/zh_TW/receptions.lang
@@ -23,7 +23,9 @@ ReceptionsAndReceivingForSameOrder=此訂單的收貨和收據
 ReceptionsToValidate=收貨確認
 StatusReceptionCanceled=取消
 StatusReceptionDraft=草案
-StatusReceptionValidated=驗證（產品出貨或已經出貨）
+StatusReceptionValidated=已驗證（待收到或已收到的產品）
+StatusReceptionValidatedToReceive=已驗證（要接收的產品）
+StatusReceptionValidatedReceived=已驗證（收到的產品）
 StatusReceptionProcessed=已處理
 StatusReceptionDraftShort=草案
 StatusReceptionValidatedShort=驗證
@@ -36,8 +38,8 @@ StatsOnReceptionsOnlyValidated=僅對已驗證收貨進行統計。使用的日
 SendReceptionByEMail=以電子郵件發送收貨
 SendReceptionRef=提交收貨%s
 ActionsOnReception=收貨事件
-ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the Purchase Order record.
-ReceptionLine=收貨線
+ReceptionCreationIsDoneFromOrder=目前，新收貨的建立是從採購訂單完成的。
+ReceptionLine=收貨行
 ProductQtyInReceptionAlreadySent=未清銷售訂單中的產品數量已發送
 ProductQtyInSuppliersReceptionAlreadyRecevied=已收到未清供應商訂單中的產品數量
 ValidateOrderFirstBeforeReception=您必須先驗證訂單，然後才能進行收貨。
@@ -45,4 +47,7 @@ ReceptionsNumberingModules=收貨編號模組
 ReceptionsReceiptModel=收貨用文件範本
 NoMorePredefinedProductToDispatch=沒有更多預定義的產品要調度
 ReceptionExist=有櫃台
-ByingPrice=Bying price
+ByingPrice=依價格
+ReceptionBackToDraftInDolibarr=收貨 %s 回到草案狀態
+ReceptionClassifyClosedInDolibarr=收貨%s 分類為已關閉
+ReceptionUnClassifyCloseddInDolibarr=收貨 %s 重新開放
diff --git a/htdocs/langs/zh_TW/salaries.lang b/htdocs/langs/zh_TW/salaries.lang
index b999db2880f..1e868cf86bd 100644
--- a/htdocs/langs/zh_TW/salaries.lang
+++ b/htdocs/langs/zh_TW/salaries.lang
@@ -6,7 +6,7 @@ CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=預設,當建立薪資時將"自動建立
 Salary=薪資
 Salaries=薪資
 NewSalary=新薪資
-AddSalary=Add salary
+AddSalary=新增薪資
 NewSalaryPayment=新薪資卡
 AddSalaryPayment=新增支付薪資
 SalaryPayment=支付薪資
@@ -23,4 +23,5 @@ AllSalaries=所有薪資
 SalariesStatistics=薪資統計
 SalariesAndPayments=薪資與支付
 ConfirmDeleteSalaryPayment=您要刪除此筆薪資支付嗎?
-FillFieldFirst=Fill employee field first
+FillFieldFirst=先填寫員工欄位
+UpdateAmountWithLastSalary=使用上次薪資設定金額
diff --git a/htdocs/langs/zh_TW/sendings.lang b/htdocs/langs/zh_TW/sendings.lang
index 8dfa1318f4b..583f9c228e7 100644
--- a/htdocs/langs/zh_TW/sendings.lang
+++ b/htdocs/langs/zh_TW/sendings.lang
@@ -53,7 +53,7 @@ SendShippingByEMail=通過電子郵件寄送出貨
 SendShippingRef=提交出貨%s 
 ActionsOnShipping=出貨事件
 LinkToTrackYourPackage=連結追踪您的包裹
-ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the Sales Order record.
+ShipmentCreationIsDoneFromOrder=目前，新裝運的建立是從銷售訂單記錄中完成的。
 ShipmentLine=出貨行
 ProductQtyInCustomersOrdersRunning=未清銷售訂單中的產品數量
 ProductQtyInSuppliersOrdersRunning=未清採購訂單中的產品數量
diff --git a/htdocs/langs/zh_TW/stocks.lang b/htdocs/langs/zh_TW/stocks.lang
index 8929743dda7..b8f45dce406 100644
--- a/htdocs/langs/zh_TW/stocks.lang
+++ b/htdocs/langs/zh_TW/stocks.lang
@@ -12,9 +12,9 @@ AddWarehouse=新增倉庫
 AddOne=新增
 DefaultWarehouse=預設倉庫
 WarehouseTarget=目標倉庫
-ValidateSending=Confirm shipment
-CancelSending=Cancel shipment
-DeleteSending=Delete shipment
+ValidateSending=確認發貨
+CancelSending=取消發貨
+DeleteSending=刪除發貨
 Stock=庫存
 Stocks=庫存
 MissingStocks=缺少庫存
@@ -62,8 +62,8 @@ AllowAddLimitStockByWarehouse=除了每個產品的最小和期望庫存值之
 RuleForWarehouse=倉庫規則
 WarehouseAskWarehouseOnThirparty=為合作方設定倉庫
 WarehouseAskWarehouseDuringPropal=為商業提案/建議書設定一個倉庫
-WarehouseAskWarehouseDuringOrder=Set a warehouse on Sales Orders
-WarehouseAskWarehouseDuringProject=Set a warehouse on Projects
+WarehouseAskWarehouseDuringOrder=為銷售訂單設定一個倉庫
+WarehouseAskWarehouseDuringProject=為專案設定一個倉庫
 UserDefaultWarehouse=在用戶上設定一個倉庫
 MainDefaultWarehouse=預設倉庫
 MainDefaultWarehouseUser=為每個用戶設定一個預設倉庫
@@ -96,7 +96,7 @@ RealStock=實際庫存
 RealStockDesc=實體/實際庫存是目前倉庫中的庫存。
 RealStockWillAutomaticallyWhen=實際庫存將根據以下規則（在“庫存”模組中定義）進行修改：
 VirtualStock=虛擬庫存
-VirtualStockAtDate=Virtual stock at a future date
+VirtualStockAtDate=未來日期的虛擬庫存
 VirtualStockAtDateDesc=虛擬庫存將於即將執行的待辦訂單所選擇的日期前完成
 VirtualStockDesc=虛擬庫存是在所有未完成/待辦操作（影響庫存）關閉（收到採購訂單、銷售訂單發貨、生產製造訂單等）後計算出的庫存
 AtDate=目前
@@ -207,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=庫存移動將具有庫存日期
 inventoryChangePMPPermission=允許更改產品的PMP值
 ColumnNewPMP=新PMP單位
 OnlyProdsInStock=沒有庫存時不要增加產品
-TheoricalQty=Theorical qty
-TheoricalValue=Theorical qty
+TheoricalQty=理論數量
+TheoricalValue=理論數量
 LastPA=最新BP
 CurrentPA=目前BP
 RecordedQty=記錄數量
@@ -241,7 +241,7 @@ StockAtDatePastDesc=您可以在此處檢視給定之過去日期的庫存（實
 StockAtDateFutureDesc=您可以在此檢視未來某一天的庫存(虛擬庫存)
 CurrentStock=目前庫存
 InventoryRealQtyHelp=將值設定為0以重置數量<br>保持欄位為空或刪除行以保持不變
-UpdateByScaning=Complete real qty by scaning
+UpdateByScaning=掃描完整真實數量
 UpdateByScaningProductBarcode=掃描更新（產品條碼）
 UpdateByScaningLot=掃描更新（批次|序列條碼）
 DisableStockChangeOfSubProduct=在此移動期間停止此組合所有子產品的庫存變化。
@@ -254,20 +254,20 @@ ReOpen=重新打開
 ConfirmFinish=您確定要關閉此盤點嗎？這將使得產生所有庫存移動並且更新您庫存中的真實數量。
 ObjectNotFound=未發現%s
 MakeMovementsAndClose=產生移動並關閉
-AutofillWithExpected=Replace real quantity with expected quantity
+AutofillWithExpected=用預期數量替換實際數量
 ShowAllBatchByDefault=預設,在產品"庫存"分頁顯示批次詳細資料
 CollapseBatchDetailHelp=您可以在庫存模組設定中設定預設顯示批次詳細資料
-ErrorWrongBarcodemode=Unknown Barcode mode
-ProductDoesNotExist=Product does not exist
-ErrorSameBatchNumber=Several record for the batch number were found in the inventory sheet. No way to know which one to increase.
-ProductBatchDoesNotExist=Product with batch/serial does not exist
-ProductBarcodeDoesNotExist=Product with barcode does not exist
-WarehouseId=Warehouse ID
-WarehouseRef=Warehouse Ref
-SaveQtyFirst=Save the real inventoried quantities first, before asking creation of the stock movement.
+ErrorWrongBarcodemode=未知條碼模式
+ProductDoesNotExist=產品不存在
+ErrorSameBatchNumber=在庫存表中找到了幾條批號記錄。無法得知要增加哪一個。
+ProductBatchDoesNotExist=此批號/序號的產品不存在
+ProductBarcodeDoesNotExist=此條碼的產品不存在
+WarehouseId=倉庫編號
+WarehouseRef=倉庫名稱
+SaveQtyFirst=在詢問建立庫存變動之前，首先儲存實際庫存數量。
 InventoryStartedShort=已開始
-ErrorOnElementsInventory=Operation canceled for the following reason:
-ErrorCantFindCodeInInventory=Can't find the following code in inventory
-QtyWasAddedToTheScannedBarcode=Success !! The quantity was added to all the requested barcode. You can close the Scanner tool.
-StockChangeDisabled=Change on stock disabled
-NoWarehouseDefinedForTerminal=No warehouse defined for terminal
+ErrorOnElementsInventory=操作因為以下原因取消：
+ErrorCantFindCodeInInventory=在庫存中找不到以下代號
+QtyWasAddedToTheScannedBarcode=成功 ！！數量已增加到所有請求的條碼中。您可以關閉掃描工具。
+StockChangeDisabled=更改庫存已停用
+NoWarehouseDefinedForTerminal=沒有為終端機定義倉庫
diff --git a/htdocs/langs/zh_TW/stripe.lang b/htdocs/langs/zh_TW/stripe.lang
index 0d65166d1bb..3e6691b8381 100644
--- a/htdocs/langs/zh_TW/stripe.lang
+++ b/htdocs/langs/zh_TW/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>為客戶提供一個Stripe線上支付頁面，以使用信用卡/簽帳卡付款。這可允許您的客戶進行臨時付款或用於與特定Dolibarr項目（發票，訂單等）有關的付款。
 StripeOrCBDoPayment=用信用卡或Stripe付款
 FollowingUrlAreAvailableToMakePayments=以下網址可用於向客戶提供頁面以對Dolibarr項目進行付款
 PaymentForm=付款表單
diff --git a/htdocs/langs/zh_TW/ticket.lang b/htdocs/langs/zh_TW/ticket.lang
index 77fb51e4dbd..a8519eee662 100644
--- a/htdocs/langs/zh_TW/ticket.lang
+++ b/htdocs/langs/zh_TW/ticket.lang
@@ -318,7 +318,7 @@ BoxTicketLastXDays=最近 %s 天中依日期的新服務單數量
 BoxTicketLastXDayswidget = 最近X天中依日期的新服務單數量
 BoxNoTicketLastXDays=最近%s天沒有新服務單
 BoxNumberOfTicketByDay=每日新服務單數量
-BoxNewTicketVSClose=Number of tickets versus closed tickets (today)
+BoxNewTicketVSClose=服務單與已關閉服務單（本日）
 TicketCreatedToday=今天建立的服務單
 TicketClosedToday=今日已關閉的服務單
-KMFoundForTicketGroup=We found topics and FAQs that may answers your question, thanks to check them before submitting the ticket
+KMFoundForTicketGroup=我們找到了可以回答您問題的主題和常見問題解答，感謝您在提交服務單以前檢查它們
diff --git a/htdocs/langs/zh_TW/trips.lang b/htdocs/langs/zh_TW/trips.lang
index ab27efca81c..47ade2681c9 100644
--- a/htdocs/langs/zh_TW/trips.lang
+++ b/htdocs/langs/zh_TW/trips.lang
@@ -112,7 +112,7 @@ ConfirmCloneExpenseReport=您確定要複製此費用報表嗎？
 ExpenseReportsIk=里程費用的設定
 ExpenseReportsRules=費用報表規則
 ExpenseReportIkDesc=您可以修改依類別的里程費用計算並且事先定義範圍。 <b>d</b>是以公里為單位的距離
-ExpenseReportRulesDesc=You can define max amount rules for expense reports. These rules will be applied when a new expense is added to an expense report
+ExpenseReportRulesDesc=您可以為費用報表定義最高金額規則。將新費用增加到費用報表中時將應用這些規則.
 expenseReportOffset=補償
 expenseReportCoef=係數
 expenseReportTotalForFive=<u>d</u> = 5的範例
@@ -127,19 +127,19 @@ ExpenseReportDomain=核准區域
 ExpenseReportLimitOn=限制於
 ExpenseReportDateStart=開始日期
 ExpenseReportDateEnd=結束日期
-ExpenseReportLimitAmount=Max amount
-ExpenseReportRestrictive=Exceeding forbidden
+ExpenseReportLimitAmount=最高金額
+ExpenseReportRestrictive=限制性的
 AllExpenseReport=費用報表的所有類型
 OnExpense=費用行
 ExpenseReportRuleSave=費用報表規則已儲存
 ExpenseReportRuleErrorOnSave=錯誤：%s
 RangeNum=範圍%d
-ExpenseReportConstraintViolationError=Max amount exceeded (rule %s): %s is higher than %s (Exceeding forbidden)
+ExpenseReportConstraintViolationError=超過最高金額（規則 %s）：%s 高於 %s（超過禁止）
 byEX_DAY=依日（限制為%s）
 byEX_MON=依月（限制為%s）
 byEX_YEA=依年（限制為%s）
 byEX_EXP=依行（限制為%s）
-ExpenseReportConstraintViolationWarning=Max amount exceeded (rule %s): %s is higher than %s (Exceeding authorized)
+ExpenseReportConstraintViolationWarning=超過最高金額（規則 %s）：%s 高於 %s（超過授權）
 nolimitbyEX_DAY=按天（無限制）
 nolimitbyEX_MON=按月（無限制）
 nolimitbyEX_YEA=按年（無限制）
diff --git a/htdocs/langs/zh_TW/website.lang b/htdocs/langs/zh_TW/website.lang
index f88be69a5f7..c406478e70a 100644
--- a/htdocs/langs/zh_TW/website.lang
+++ b/htdocs/langs/zh_TW/website.lang
@@ -45,7 +45,7 @@ ViewWebsiteInProduction=使用家庭網址檢視網站
 SetHereVirtualHost=<u>使用Apache/NGinx/...</u><br>建立您的網頁伺服器 (Apache, Nginx, ...) 啟用了含有PHP的專用虛擬主機並且根目錄資料夾位於<br><strong>%s</strong>
 ExampleToUseInApacheVirtualHostConfig=在Apache虛擬主機設定中使用的範例：
 YouCanAlsoTestWithPHPS=在開發環境中<u>使用嵌入式PHP伺服器</u><br>, 您也許想要使用<br><strong>php -S 0.0.0.0:8080 -t %s</strong> 來測試此嵌入式PHP伺服器 (需要PHP 5.5) 的網站
-YouCanAlsoDeployToAnotherWHP=<u>在其他Dolibarr網站託管供應商執行您的網站</u> <br>如果您在網路上沒有Apache或NGinx之類的Web伺服器，則可以將網站匯出並匯入到另一個由Dolibarr網站託管供應商提供且有完整整合網站模組。您可以在<a href="https://saas.dolibarr.org" target="_blank"> https://saas.dolibarr.org </a>上找到一些Dolibarr網站託管服務供應商的清單。
+YouCanAlsoDeployToAnotherWHP=<u>在其他Dolibarr網站託管供應商執行您的網站</u> <br>如果您在網路上沒有Apache或NGinx之類的Web伺服器，則可以將網站匯出並匯入到另一個由Dolibarr網站託管供應商提供且有完整整合網站模組。您可以在<a href="https://saas.dolibarr.org" target="_blank" rel="noopener noreferrer external"> https://saas.dolibarr.org </a>上找到一些Dolibarr網站託管服務供應商的清單。
 CheckVirtualHostPerms=同時請確認虛擬主機使用者(例如www-data)擁有檔案<br><strong>%s</strong>的<strong>%s</strong>權限
 ReadPerm=閱讀
 WritePerm=寫入
@@ -60,7 +60,7 @@ YouCanEditHtmlSourceckeditor=您可以使用編輯器中的“Source”按鈕來
 YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> 您可以使用標籤將PHP代碼包含到此源中<strong>&lt;?php ?&gt;</strong>. 以下全域變數可用: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> 您還可以使用以下語法包含另一個頁面/容器的內容:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> 您可以使用以下語法重新定向到另一個頁面/容器（注意：重新定向之前請勿輸出任何內容）:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> 要增加到另一個頁面的連結，請使用以下語法:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> 要包含一個 <strong>連結</strong> 下載儲存到 <strong>文件</strong>資料夾, 使用<strong>document.php</strong>打包器:<br>例如, 一個檔案要儲存到documents/ecm (需要紀錄)中, 語法為:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>檔案要儲存到documents/medias (公共權限的資料夾)中, 語法為:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>對於使用共用連結共享的檔案(使用檔案的共用hash鍵進行開放訪問), 語法為:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> 要包含一個<strong>影像</strong> 檔案且儲存到<strong>documents</strong>目錄中, 使用 <strong>viewimage.php</strong> 打包器:<br>例如, 儲存影像到documents/medias (公共權限的資料夾), 語法為:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>.
 #YouCanEditHtmlSource2=<br><span class="fa fa-picture-o"></span> To include a <strong>image</strong> shared publicaly, use the <strong>viewimage.php</strong> wrapper:<br>Example with a shared key 123456789, syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource2=使用有分享連結的影像 (使用檔案的Hash key開啟), 語法為:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
-YouCanEditHtmlSourceMore=<br>您可以在<a href="%s" target="_blank">Wiki文件</a>中找到更多HTML或是動態編碼的範例<br>
+YouCanEditHtmlSourceMore=<br>您可以在<a href="%s" target="_blank" rel="noopener noreferrer external">Wiki文件</a>中找到更多HTML或是動態編碼的範例<br>
 ClonePage=複製頁面/容器
 CloneSite=複製網站
 SiteAdded=網站已增加
diff --git a/htdocs/langs/zh_TW/withdrawals.lang b/htdocs/langs/zh_TW/withdrawals.lang
index 0e76d56fede..46af748ad84 100644
--- a/htdocs/langs/zh_TW/withdrawals.lang
+++ b/htdocs/langs/zh_TW/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=貸方轉帳訂單
 LatestBankTransferReceipts=最新%s筆信用轉帳訂單
 LastWithdrawalReceipts=最新%s個直接轉帳付款檔案
 WithdrawalsLine=直接轉帳訂單行
+CreditTransfer=銀行轉帳
 CreditTransferLine=信用轉帳行
 WithdrawalsLines=直接轉帳付款訂單行
 CreditTransferLines=信用轉帳行
@@ -47,6 +48,7 @@ ThirdPartyBankCode=合作方銀行代碼
 NoInvoiceCouldBeWithdrawed=沒有直接轉帳成功的發票。檢查發票上是否有有效IBAN的公司，以及IBAN是否具有模式為<strong> %s </strong>的UMR（唯一授權參考）。
 WithdrawalCantBeCreditedTwice=此提款收據已標記為已記入；此無法執行兩次，因為這可能會產生重複的付款和銀行分錄。
 ClassCredited=分類為已記入
+ClassDebited=分類為借方
 ClassCreditedConfirm=您確定要將此提款收據分類為銀行帳戶中的已記入嗎？
 TransData=傳送日期
 TransMetod=傳送方式
@@ -97,8 +99,8 @@ CreditDate=信貸
 WithdrawalFileNotCapable=無法為您的國家/地區產生提款收據檔案%s（不支援您的國家/地區）
 ShowWithdraw=顯示直接轉帳付款訂單
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=但是，如果發票中至少有一個直接轉帳付款訂單尚未處理，則不會將其設定為已付款以允許事先提款管理。
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoStandingOrdersBeforePayments=此分頁可讓您申請直接轉帳付款單。完成後，進入選單銀行->直接轉帳訂單以產生和管理直接轉帳付款訂單。關閉付款訂單後，將自動記錄發票付款，如果剩餘付款為空，則關閉發票。
+DoCreditTransferBeforePayments=此分頁允許您申請貸記轉帳訂單。完成後，進入選單銀行->貸記轉帳付款以產生和管理貸記轉帳訂單。當信用轉帳訂單關閉時，發票上的付款將被自動記錄，如果餘額為空，發票將被關閉。
 WithdrawalFile=直接轉帳文件
 CreditTransferFile=信用轉帳文件
 SetToStatusSent=設定狀態為“檔案已傳送”
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=無法為空金額建立直接轉帳付款請求
 SepaMandate=SEPA直接轉帳付款授權
 SepaMandateShort=SEPA授權
 PleaseReturnMandate=請以電子郵件將本授權書退回至%s或郵寄至
-SEPALegalText=By signing this mandate form, you authorize (A) %s to send instructions to your bank to debit your account and (B) your bank to debit your account in accordance with the instructions from %s. As part of your rights, you are entitled to a refund from your bank under the terms and conditions of your agreement with your bank. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
+SEPALegalText=通過簽署本授權書，您授權 (A) %s 向您的銀行發送指令以從您的帳戶中扣款，以及 (B) 您的銀行根據 %s 的指令從您的帳戶中扣款。作為您權利的一部分，您有權根據您與銀行協議的條款和條件從銀行獲得退款。您可以從銀行獲得的聲明中解釋了您對上述授權的權利。
 CreditorIdentifier=債權人識別碼
 CreditorName=債權人名稱
 SEPAFillForm=(B)請填寫所有標有*的欄位
@@ -133,7 +135,7 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=執行日期
 CreateForSepa=建立直接轉帳付款檔案
-ICS=Creditor Identifier - ICS
+ICS=債權人識別碼 - ICS
 END_TO_END="EndToEndId" SEPA XML標籤- 每筆交易分配的唯一ID
 USTRD="Unstructured" SEPA XML標籤
 ADDDAYS=將天數加到執行日期
@@ -150,5 +152,5 @@ ModeWarning=未設定實際模式選項，我們將在此模擬後停止
 ErrorCompanyHasDuplicateDefaultBAN=ID為%s的公司擁有多個預設銀行帳戶.無法得知要使用哪一個.
 ErrorICSmissing=銀行帳戶%s遺失ICS
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=直接借記訂單總金額與行的總和不同
-WarningSomeDirectDebitOrdersAlreadyExists=Warning: There is already some pending Direct Debit orders (%s) requested for an amount of %s
-WarningSomeCreditTransferAlreadyExists=Warning: There is already some pending Credit Transfer (%s) requested for an amount of %s
+WarningSomeDirectDebitOrdersAlreadyExists=警告：已經有一些待處理的直接借記訂單 (%s) 請求金額為 %s
+WarningSomeCreditTransferAlreadyExists=警告：已請求金額為 %s 的一些待處理信用轉帳 (%s)
diff --git a/htdocs/langs/zh_TW/workflow.lang b/htdocs/langs/zh_TW/workflow.lang
index 0f43b46f170..10476adf836 100644
--- a/htdocs/langs/zh_TW/workflow.lang
+++ b/htdocs/langs/zh_TW/workflow.lang
@@ -14,9 +14,13 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=當已開立客戶發票（如
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=當客戶發票設置為已付款時（如果發票金額與連接訂單的總金額相同），將連接的銷售訂單分類為開票
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=當已確認裝運後（並且如果所有裝運的裝運數量與更新訂單中的數量相同），將鏈接的銷售訂單分類為已裝運
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=發貨關閉時將來源連結的銷售訂單分類為已發貨（並且所有發貨的發貨數量與要更新的訂單中的數量相同）
-# Autoclassify purchase order
+# Autoclassify purchase proposal
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=當供應商發票已確認時（如果發票金額與連接提案的總金額相同），將連接供應商提案分類為開票
+# Autoclassify purchase order
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=當供應商發票已確認時（如果發票金額與連接訂單的總金額相同），將連接的採購訂單分類為開票
+descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=在驗證收貨時將連結的來源採購訂單分類為已收貨（並且如果所有收貨的數量與要更新的採購訂單中的數量相同）
+descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=收貨結束時將連結的來源採購訂單分類為已收貨（如果所有收貨的數量與要更新的採購訂單中的數量相同）
+# Autoclassify purchase invoice
 descWORKFLOW_BILL_ON_RECEPTION=驗證連結的供應商訂單後，將接收分類為“已開票”
 # Autoclose intervention
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=關閉服務單後，關閉與服務單連結的所有干預措施
diff --git a/htdocs/langs/zh_TW/zapier.lang b/htdocs/langs/zh_TW/zapier.lang
index 83bf36a1885..62ccb760dbb 100644
--- a/htdocs/langs/zh_TW/zapier.lang
+++ b/htdocs/langs/zh_TW/zapier.lang
@@ -17,5 +17,5 @@ ModuleZapierForDolibarrName = Zapier for Dolibarr
 ModuleZapierForDolibarrDesc = Zapier的Dolibarr模組
 ZapierForDolibarrSetup=Zapier的設定
 ZapierDescription=Zapier界面
-ZapierAbout=About the module Zapier
-ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
+ZapierAbout=關於Zapier模組
+ZapierSetupPage=無需在 Dolibarr 進行設定即可使用 Zapier。但是，您必須在 zapier 上產生並發布一個封包才能將 Zapier 與 Dolibarr 一起使用。請參閱<a href="https://wiki.dolibarr.org/index.php/Module_Zapier">此 wiki 頁面 </a> 上的  文件。

From 3aedf6434b8f4a90880ba2874b12da6c585126b6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 16 Jan 2022 13:11:12 +0100
Subject: [PATCH 132/316] css

---
 htdocs/adherents/cartes/carte.php | 12 ++++++------
 htdocs/core/lib/functions.lib.php | 12 +++++++-----
 htdocs/theme/md/style.css.php     |  6 +-----
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/htdocs/adherents/cartes/carte.php b/htdocs/adherents/cartes/carte.php
index 93054dad234..94621195ac9 100644
--- a/htdocs/adherents/cartes/carte.php
+++ b/htdocs/adherents/cartes/carte.php
@@ -275,7 +275,7 @@ dol_htmloutput_errors($mesg);
 
 print '<br>';
 
-print img_picto('', 'puce').' '.$langs->trans("DocForAllMembersCards", (!empty($conf->global->ADHERENT_CARD_TYPE) ? $conf->global->ADHERENT_CARD_TYPE : $langs->transnoentitiesnoconv("None"))).' ';
+print img_picto('', 'card').' '.$langs->trans("DocForAllMembersCards", (!empty($conf->global->ADHERENT_CARD_TYPE) ? $conf->global->ADHERENT_CARD_TYPE : $langs->transnoentitiesnoconv("None"))).' ';
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="foruserid" value="all">';
@@ -289,12 +289,12 @@ foreach (array_keys($_Avery_Labels) as $codecards) {
 }
 asort($arrayoflabels);
 print $form->selectarray('modelcard', $arrayoflabels, (GETPOST('modelcard') ? GETPOST('modelcard') : (empty($conf->global->ADHERENT_CARD_TYPE) ? '' : $conf->global->ADHERENT_CARD_TYPE)), 1, 0, 0, '', 0, 0, 0, '', '', 1);
-print '<br><input type="submit" class="button" value="'.$langs->trans("BuildDoc").'">';
+print '<br><input type="submit" class="button small" value="'.$langs->trans("BuildDoc").'">';
 print '</form>';
 
 print '<br><br>';
 
-print img_picto('', 'puce').' '.$langs->trans("DocForOneMemberCards", (!empty($conf->global->ADHERENT_CARD_TYPE) ? $conf->global->ADHERENT_CARD_TYPE : $langs->transnoentitiesnoconv("None"))).' ';
+print img_picto('', 'card').' '.$langs->trans("DocForOneMemberCards", (!empty($conf->global->ADHERENT_CARD_TYPE) ? $conf->global->ADHERENT_CARD_TYPE : $langs->transnoentitiesnoconv("None"))).' ';
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="mode" value="cardlogin">';
@@ -308,12 +308,12 @@ foreach (array_keys($_Avery_Labels) as $codecards) {
 asort($arrayoflabels);
 print $form->selectarray('model', $arrayoflabels, (GETPOST('model') ?GETPOST('model') : (empty($conf->global->ADHERENT_CARD_TYPE) ? '' : $conf->global->ADHERENT_CARD_TYPE)), 1, 0, 0, '', 0, 0, 0, '', '', 1);
 print '<br>'.$langs->trans("Login").': <input size="10" type="text" name="foruserlogin" value="'.GETPOST('foruserlogin').'">';
-print '<br><input type="submit" class="button" value="'.$langs->trans("BuildDoc").'">';
+print '<br><input type="submit" class="button small" value="'.$langs->trans("BuildDoc").'">';
 print '</form>';
 
 print '<br><br>';
 
-print img_picto('', 'puce').' '.$langs->trans("DocForLabels", (empty($conf->global->ADHERENT_ETIQUETTE_TYPE) ? '' : $conf->global->ADHERENT_ETIQUETTE_TYPE)).' ';
+print img_picto('', 'card').' '.$langs->trans("DocForLabels", (empty($conf->global->ADHERENT_ETIQUETTE_TYPE) ? '' : $conf->global->ADHERENT_ETIQUETTE_TYPE)).' ';
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="mode" value="label">';
@@ -326,7 +326,7 @@ foreach (array_keys($_Avery_Labels) as $codecards) {
 }
 asort($arrayoflabels);
 print $form->selectarray('modellabel', $arrayoflabels, (GETPOST('modellabel') ? GETPOST('modellabel') : (empty($conf->global->ADHERENT_ETIQUETTE_TYPE) ? '' : $conf->global->ADHERENT_ETIQUETTE_TYPE)), 1, 0, 0, '', 0, 0, 0, '', '', 1);
-print '<br><input type="submit" class="button" value="'.$langs->trans("BuildDoc").'">';
+print '<br><input type="submit" class="button small" value="'.$langs->trans("BuildDoc").'">';
 print '</form>';
 
 // End of page
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 4713542bf5b..b4b2adcde8b 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3640,7 +3640,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'1downarrow', '1uparrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected',
 				'accountancy', 'accounting_account', 'account', 'accountline', 'action', 'add', 'address', 'angle-double-down', 'angle-double-up', 'asset',
 				'bank_account', 'barcode', 'bank', 'bell', 'bill', 'billa', 'billr', 'billd', 'bookmark', 'bom', 'bug', 'building',
-				'calendar', 'calendarmonth', 'calendarweek', 'calendarday', 'calendarperuser', 'calendarpertype',
+				'card', 'calendar', 'calendarmonth', 'calendarweek', 'calendarday', 'calendarperuser', 'calendarpertype',
 				'cash-register', 'category', 'chart', 'check', 'clock', 'close_title', 'cog', 'collab', 'company', 'contact', 'country', 'contract', 'conversation', 'cron', 'cubes',
 				'multicurrency',
 				'delete', 'dolly', 'dollyrevert', 'donation', 'download', 'dynamicprice',
@@ -3652,7 +3652,8 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'label', 'language', 'link', 'list', 'list-alt', 'listlight', 'loan', 'lot', 'long-arrow-alt-right',
 				'margin', 'map-marker-alt', 'member', 'meeting', 'money-bill-alt', 'movement', 'mrp', 'note', 'next',
 				'off', 'on', 'order',
-				'paiment', 'paragraph', 'play', 'pdf', 'phone', 'phoning', 'phoning_mobile', 'phoning_fax', 'playdisabled', 'previous', 'poll', 'pos', 'printer', 'product', 'propal', 'stock', 'resize', 'service', 'stats', 'trip',
+				'paiment', 'paragraph', 'play', 'pdf', 'phone', 'phoning', 'phoning_mobile', 'phoning_fax', 'playdisabled', 'previous', 'poll', 'pos', 'printer', 'product', 'propal', 'puce',
+				'stock', 'resize', 'service', 'stats', 'trip',
 				'security', 'setup', 'share-alt', 'sign-out', 'split', 'stripe', 'stripe-s', 'switch_off', 'switch_on', 'switch_on_red', 'tools', 'unlink', 'uparrow', 'user', 'vcard', 'wrench',
 				'github', 'jabber', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'youtube', 'google-plus-g', 'whatsapp',
 				'chevron-left', 'chevron-right', 'chevron-down', 'chevron-top', 'commercial', 'companies',
@@ -3671,7 +3672,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 			$facolor = '';
 			$fasize = '';
 			$fa = 'fas';
-			if (in_array($pictowithouttext, array('bell', 'clock', 'establishment', 'generic', 'minus-square', 'object_generic', 'pdf', 'plus-square', 'timespent', 'note', 'off', 'on', 'object_bookmark', 'bookmark', 'vcard'))) {
+			if (in_array($pictowithouttext, array('card', 'bell', 'clock', 'establishment', 'generic', 'minus-square', 'object_generic', 'pdf', 'plus-square', 'timespent', 'note', 'off', 'on', 'object_bookmark', 'bookmark', 'vcard'))) {
 				$fa = 'far';
 			}
 			if (in_array($pictowithouttext, array('black-tie', 'github', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'stripe', 'stripe-s', 'youtube', 'google-plus-g', 'whatsapp'))) {
@@ -3684,7 +3685,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'bill'=>'file-invoice-dollar', 'billa'=>'file-excel', 'billr'=>'file-invoice-dollar', 'billd'=>'file-medical',
 				'supplier_invoice'=>'file-invoice-dollar', 'supplier_invoicea'=>'file-excel', 'supplier_invoicer'=>'file-invoice-dollar', 'supplier_invoiced'=>'file-medical',
 				'bom'=>'shapes',
-				'chart'=>'chart-line', 'company'=>'building', 'contact'=>'address-book', 'contract'=>'suitcase', 'collab'=>'people-arrows', 'conversation'=>'comments', 'country'=>'globe-americas', 'cron'=>'business-time',
+				'card'=>'address-card', 'chart'=>'chart-line', 'company'=>'building', 'contact'=>'address-book', 'contract'=>'suitcase', 'collab'=>'people-arrows', 'conversation'=>'comments', 'country'=>'globe-americas', 'cron'=>'business-time',
 				'donation'=>'file-alt', 'dynamicprice'=>'hand-holding-usd',
 				'setup'=>'cog', 'companies'=>'building', 'products'=>'cube', 'commercial'=>'suitcase', 'invoicing'=>'coins',
 				'accounting'=>'search-dollar', 'category'=>'tag', 'dollyrevert'=>'dolly',
@@ -3704,10 +3705,11 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'error'=>'exclamation-triangle', 'warning'=>'exclamation-triangle',
 				'other'=>'square',
 				'playdisabled'=>'play', 'pdf'=>'file-pdf',  'poll'=>'check-double', 'pos'=>'cash-register', 'preview'=>'binoculars', 'project'=>'project-diagram', 'projectpub'=>'project-diagram', 'projecttask'=>'tasks', 'propal'=>'file-signature',
-				'partnership'=>'handshake', 'payment'=>'money-check-alt', 'payment_vat'=>'money-check-alt', 'phoning'=>'phone', 'phoning_mobile'=>'mobile-alt', 'phoning_fax'=>'fax', 'previous'=>'arrow-alt-circle-left', 'printer'=>'print', 'product'=>'cube', 'service'=>'concierge-bell',
+				'partnership'=>'handshake', 'payment'=>'money-check-alt', 'payment_vat'=>'money-check-alt', 'phoning'=>'phone', 'phoning_mobile'=>'mobile-alt', 'phoning_fax'=>'fax', 'previous'=>'arrow-alt-circle-left', 'printer'=>'print', 'product'=>'cube', 'puce'=>'angle-right',
 				'recent' => 'question', 'reception'=>'dolly', 'recruitmentjobposition'=>'id-card-alt', 'recruitmentcandidature'=>'id-badge',
 				'resize'=>'crop', 'supplier_order'=>'dol-order_supplier', 'supplier_proposal'=>'file-signature',
 				'refresh'=>'redo', 'region'=>'map-marked', 'resource'=>'laptop-house', 'recurring'=>'history',
+				'service'=>'concierge-bell',
 				'state'=>'map-marked-alt', 'security'=>'key', 'salary'=>'wallet', 'shipment'=>'dolly', 'stock'=>'box-open', 'stats' => 'chart-bar', 'split'=>'code-branch', 'stripe'=>'stripe-s',
 				'supplier'=>'building', 'technic'=>'cogs',
 				'timespent'=>'clock', 'title_setup'=>'tools', 'title_accountancy'=>'money-check-alt', 'title_bank'=>'university', 'title_hrm'=>'umbrella-beach',
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 94b81cb91d9..538e347a216 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -4286,11 +4286,7 @@ span.dashboardlineko {
 	border-radius: .25em;
 }
 .boxtable {
-	margin-bottom: 8px !important;
-	border-bottom-width: 1px;
-}
-.boxtable {
-	margin-bottom: 8px !important;
+	margin-bottom: 20px !important;
 	border-bottom-width: 1px;
 }
 .boxtablenotop {

From 6826b373fd27e7730f0e7e7bbd40152fdaac2207 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 16 Jan 2022 13:22:21 +0100
Subject: [PATCH 133/316] css

---
 htdocs/comm/action/pertype.php | 4 ++--
 htdocs/comm/action/peruser.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php
index 8b6119eb294..43d55424cd3 100644
--- a/htdocs/comm/action/pertype.php
+++ b/htdocs/comm/action/pertype.php
@@ -1236,9 +1236,9 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 			$color2 = '222222';
 		}
 		print '<table class="nobordernopadding" width="100%">';
-		print '<tr><td '.($color1 ? 'style="background: #'.$color1.';"' : '').'class="'.($style1 ? $style1.' ' : '').'onclickopenref'.($title1 ? ' cursorpointer' : '').'" ref="ref_'.$username->id.'_'.sprintf("%04d", $year).'_'.sprintf("%02d", $month).'_'.sprintf("%02d", $day).'_'.sprintf("%02d", $h).'_00_'.($ids1 ? $ids1 : 'none').'"'.($title1 ? ' title="'.$title1.'"' : '').'>';
+		print '<tr><td '.($color1 ? 'style="background: #'.$color1.';"' : '').'class="'.($style1 ? $style1.' ' : '').'onclickopenref center'.($title1 ? ' cursorpointer' : '').'" ref="ref_'.$username->id.'_'.sprintf("%04d", $year).'_'.sprintf("%02d", $month).'_'.sprintf("%02d", $day).'_'.sprintf("%02d", $h).'_00_'.($ids1 ? $ids1 : 'none').'"'.($title1 ? ' title="'.$title1.'"' : '').'>';
 		print $string1;
-		print '</td><td '.($color2 ? 'style="background: #'.$color2.';"' : '').'class="'.($style2 ? $style2.' ' : '').'onclickopenref'.($title1 ? ' cursorpointer' : '').'" ref="ref_'.$username->id.'_'.sprintf("%04d", $year).'_'.sprintf("%02d", $month).'_'.sprintf("%02d", $day).'_'.sprintf("%02d", $h).'_30_'.($ids2 ? $ids2 : 'none').'"'.($title2 ? ' title="'.$title2.'"' : '').'>';
+		print '</td><td '.($color2 ? 'style="background: #'.$color2.';"' : '').'class="'.($style2 ? $style2.' ' : '').'onclickopenref center'.($title1 ? ' cursorpointer' : '').'" ref="ref_'.$username->id.'_'.sprintf("%04d", $year).'_'.sprintf("%02d", $month).'_'.sprintf("%02d", $day).'_'.sprintf("%02d", $h).'_30_'.($ids2 ? $ids2 : 'none').'"'.($title2 ? ' title="'.$title2.'"' : '').'>';
 		print $string2;
 		print '</td></tr>';
 		print '</table>';
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index e2bc5931d66..f74974a26d9 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -1441,7 +1441,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 		}
 		print 'class="';
 		print ($style1 ? $style1.' ' : '');
-		print 'onclickopenref'.($title2 ? ' classfortooltip' : '').($title1 ? ' cursorpointer' : '').'" ref="ref_'.$username->id.'_'.sprintf("%04d", $year).'_'.sprintf("%02d", $month).'_'.sprintf("%02d", $day).'_'.sprintf("%02d", $h).'_00_'.($ids1 ? $ids1 : 'none').'"'.($title1 ? ' title="'.$title1.'"' : '').'>';
+		print 'onclickopenref center'.($title2 ? ' classfortooltip' : '').($title1 ? ' cursorpointer' : '').'" ref="ref_'.$username->id.'_'.sprintf("%04d", $year).'_'.sprintf("%02d", $month).'_'.sprintf("%02d", $day).'_'.sprintf("%02d", $h).'_00_'.($ids1 ? $ids1 : 'none').'"'.($title1 ? ' title="'.$title1.'"' : '').'>';
 		print $string1;
 		print '</td><td ';
 		if ($style2 == 'peruser_notbusy') {
@@ -1451,7 +1451,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 		}
 		print 'class="';
 		print ($style2 ? $style2.' ' : '');
-		print 'onclickopenref'.($title2 ? ' classfortooltip' : '').($title1 ? ' cursorpointer' : '').'" ref="ref_'.$username->id.'_'.sprintf("%04d", $year).'_'.sprintf("%02d", $month).'_'.sprintf("%02d", $day).'_'.sprintf("%02d", $h).'_30_'.($ids2 ? $ids2 : 'none').'"'.($title2 ? ' title="'.$title2.'"' : '').'>';
+		print 'onclickopenref center'.($title2 ? ' classfortooltip' : '').($title1 ? ' cursorpointer' : '').'" ref="ref_'.$username->id.'_'.sprintf("%04d", $year).'_'.sprintf("%02d", $month).'_'.sprintf("%02d", $day).'_'.sprintf("%02d", $h).'_30_'.($ids2 ? $ids2 : 'none').'"'.($title2 ? ' title="'.$title2.'"' : '').'>';
 		print $string2;
 		print '</td></tr>';
 		print '</table>';

From 372b583e50cd46054e67bd5bf41a9d65b91649d1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 16 Jan 2022 19:21:59 +0100
Subject: [PATCH 134/316] Debug template of warehouse

---
 .../stock/doc/pdf_standard.modules.php        | 34 ++++++++-----------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/htdocs/core/modules/stock/doc/pdf_standard.modules.php b/htdocs/core/modules/stock/doc/pdf_standard.modules.php
index 1597ee32c18..17e2c6b532b 100644
--- a/htdocs/core/modules/stock/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/stock/doc/pdf_standard.modules.php
@@ -179,6 +179,8 @@ class pdf_standard extends ModelePDFStock
 		$this->localtax2 = array();
 		$this->atleastoneratenotnull = 0;
 		$this->atleastonediscount = 0;
+
+		$this->tabTitleHeight = 11;
 	}
 
 
@@ -321,7 +323,6 @@ class pdf_standard extends ModelePDFStock
 					$i = 0;
 					$nblines = $num;
 
-					$this->tabTitleHeight = 10;
 					$nexY = $tab_top + $this->tabTitleHeight;
 
 					for ($i = 0; $i < $nblines; $i++) {
@@ -733,7 +734,7 @@ class pdf_standard extends ModelePDFStock
 		if (empty($hidetop)) {
 			$pdf->SetDrawColor(200, 200, 200);
 			$pdf->SetLineStyle(array('dash' => '0', 'color' => array(200, 200, 200)));
-			$pdf->line($this->marge_gauche, $tab_top + 10, $this->page_largeur - $this->marge_droite, $tab_top + 10);
+			$pdf->line($this->marge_gauche, $tab_top + $this->tabTitleHeight, $this->page_largeur - $this->marge_droite, $tab_top + $this->tabTitleHeight);
 			$pdf->SetLineStyle(array('dash' => 0));
 		}
 	}
@@ -767,8 +768,8 @@ class pdf_standard extends ModelePDFStock
 		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 
 		// Show Draft Watermark
-		if ($object->statut == 0 && (!empty($conf->global->COMMANDE_DRAFT_WATERMARK))) {
-			pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->COMMANDE_DRAFT_WATERMARK);
+		if ($object->statut == 0 && (!empty($conf->global->STOCK_DRAFT_WATERMARK))) {
+			pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->STOCK_DRAFT_WATERMARK);
 		}
 
 		$pdf->SetTextColor(0, 0, 60);
@@ -780,6 +781,7 @@ class pdf_standard extends ModelePDFStock
 		$pdf->SetXY($this->marge_gauche, $posy);
 
 		// Logo
+		$height = 0;
 		$logo = $conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
 		if ($this->emetteur->logo) {
 			if (is_readable($logo)) {
@@ -796,29 +798,19 @@ class pdf_standard extends ModelePDFStock
 			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 		}
 
+		$yafterleft = $pdf->GetY() + $height;
+
 		$pdf->SetFont('', 'B', $default_font_size + 3);
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
-		$title = $outputlangs->transnoentities("Warehouse");
-		$pdf->MultiCell(100, 3, $title, '', 'R');
 
-		$pdf->SetFont('', 'B', $default_font_size);
+		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Warehouse").' '.$outputlangs->convToOutputCharset($object->label), '', 'R');
 
-		$posy += 5;
-		$pdf->SetXY($posx, $posy);
-		$pdf->SetTextColor(0, 0, 60);
-
-		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Ref")." : ".$outputlangs->convToOutputCharset($object->label), '', 'R');
-
-		$posy += 5;
+		$posy += 6;
 		$pdf->SetFont('', '', $default_font_size - 1);
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("LocationSummary").' :', '', 'R');
-
-		$posy += 4;
-		$pdf->SetXY($posx - 50, $posy);
-		$pdf->MultiCell(150, 3, $object->lieu, '', 'R');
+		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("Label").' : '.$object->lieu, '', 'R');
 
 		$posy += 4;
 		$pdf->SetXY($posx, $posy);
@@ -836,8 +828,10 @@ class pdf_standard extends ModelePDFStock
 			$pdf->MultiCell(150, 3, $e->label, '', 'R');
 		}
 
+		$yafterright = $pdf->GetY();
+
 		// Description
-		$nexY = $pdf->GetY();
+		$nexY = max($yafterleft, $yafterright);
 		$nexY += 5;
 		$pdf->SetXY($posx, $posy);
 		$pdf->writeHTMLCell(190, 2, $this->marge_gauche, $nexY, '<b>'.$outputlangs->transnoentities("Description").' : </b>'.nl2br($object->description), 0, 1);

From 24de82859ea83027c3f3da4e3bdd7cf4b20feee4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 16 Jan 2022 20:19:39 +0100
Subject: [PATCH 135/316] Debug v15

---
 .../stock/doc/pdf_standard.modules.php        |   3 +
 htdocs/product/stock/movement_list.php        | 340 +++++++++++++-----
 2 files changed, 248 insertions(+), 95 deletions(-)

diff --git a/htdocs/core/modules/stock/doc/pdf_standard.modules.php b/htdocs/core/modules/stock/doc/pdf_standard.modules.php
index 17e2c6b532b..f66e7e6e5d1 100644
--- a/htdocs/core/modules/stock/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/stock/doc/pdf_standard.modules.php
@@ -853,6 +853,9 @@ class pdf_standard extends ModelePDFStock
 		$pdf->writeHTMLCell(190, 2, $this->marge_gauche, $nexY, '<b>'.$outputlangs->transnoentities("EstimatedStockValueShort").' : </b>'.price((empty($calcproducts['value']) ? '0' : price2num($calcproducts['value'], 'MT')), 0, $langs, 0, -1, -1, $conf->currency), 0, 1);
 		$nexY = $pdf->GetY();
 
+		// Value
+		$pdf->writeHTMLCell(190, 2, $this->marge_gauche, $nexY, '<b>'.$outputlangs->transnoentities("Date").' : </b>'.dol_print_date(dol_now(), 'dayhour'), 0, 1);
+		$nexY = $pdf->GetY();
 
 		// Last movement
 		$sql = "SELECT max(m.datem) as datem";
diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php
index f5d74c47c8e..405528a3480 100644
--- a/htdocs/product/stock/movement_list.php
+++ b/htdocs/product/stock/movement_list.php
@@ -84,14 +84,19 @@ $search_fk_projet=GETPOST("search_fk_projet", 'int');
 $optioncss = GETPOST('optioncss', 'alpha');
 $type = GETPOST("type", "int");
 
+// Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-if (empty($page) || $page == -1) {
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
+	// If $page is not defined, or '' or -1 or if we click on clear filters
 	$page = 0;
-}     // If $page is not defined, or '' or -1
+}
 $offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+
 if (!$sortfield) {
 	$sortfield = "m.datem";
 }
@@ -103,8 +108,10 @@ $pdluoid = GETPOST('pdluoid', 'int');
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $object = new MouvementStock($db);
-$hookmanager->initHooks(array('movementlist'));
 $extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->stock->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('movementlist'));
+
 $formfile = new FormFile($db);
 
 // fetch optionals attributes and labels
@@ -156,6 +163,8 @@ if (!$user->rights->stock->mouvement->lire) {
 	accessforbidden();
 }
 
+$uploaddir = $conf->stock->dir_output.'/movements';
+
 $permissiontoread = $user->rights->stock->mouvement->lire;
 $permissiontoadd = $user->rights->stock->mouvement->creer;
 $permissiontodelete = $user->rights->stock->mouvement->creer; // There is no deletion permission for stock movement as we shoul dnever delete
@@ -172,7 +181,8 @@ $error = 0;
  */
 
 if (GETPOST('cancel', 'alpha')) {
-	$action = 'list'; $massaction = '';
+	$action = 'list';
+	$massaction = '';
 }
 if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
 	$massaction = '';
@@ -185,9 +195,10 @@ if ($reshook < 0) {
 }
 
 if (empty($reshook)) {
+	// Selection of new fields
 	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-	// Do we click on purge search criteria ?
+	// Purge search criteria
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // Both test are required to be compatible with all browsers
 		$search_date_startday = '';
 		$search_date_startmonth = '';
@@ -212,11 +223,92 @@ if (empty($reshook)) {
 		$toselect = '';
 		$search_array_options = array();
 	}
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
+		|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha')) {
+		$massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
+	}
 
 	// Mass actions
 	$objectclass = 'MouvementStock';
 	$objectlabel = 'MouvementStock';
-	$uploaddir = $conf->stock->dir_output;
+
+	if (!$error && $massaction == "builddoc" && $permissiontoread && !GETPOST('button_search')) {
+		if (empty($diroutputmassaction)) {
+			dol_print_error(null, 'include of actions_massactions.inc.php is done but var $diroutputmassaction was not defined');
+			exit;
+		}
+
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+
+		$objecttmp = new $objectclass($db);
+		$listofobjectid = array();
+		foreach ($toselect as $toselectid) {
+			$objecttmp = new $objectclass($db); // must create new instance because instance is saved into $listofobjectref array for future use
+			$result = $objecttmp->fetch($toselectid);
+			if ($result > 0) {
+				$listofobjectid[$toselectid] = $toselectid;
+			}
+		}
+
+		$arrayofinclusion = array();
+		foreach ($listofobjectref as $tmppdf) {
+			$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
+		}
+		$listoffiles = dol_dir_list($uploaddir, 'all', 1, implode('|', $arrayofinclusion), '\.meta$|\.png', 'date', SORT_DESC, 0, true);
+
+		// Define output language (Here it is not used because we do only merging existing PDF)
+		$outputlangs = $langs;
+		$newlang = '';
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
+			$newlang = GETPOST('lang_id', 'aZ09');
+		}
+		//elseif ($conf->global->MAIN_MULTILANGS && empty($newlang) && is_object($objecttmp->thirdparty)) {		// On massaction, we can have several values for $objecttmp->thirdparty
+		//	$newlang = $objecttmp->thirdparty->default_lang;
+		//}
+		if (!empty($newlang)) {
+			$outputlangs = new Translate("", $conf);
+			$outputlangs->setDefaultLang($newlang);
+		}
+
+		// Create output dir if not exists
+		dol_mkdir($diroutputmassaction);
+
+		// Defined name of merged file
+		$filename = strtolower(dol_sanitizeFileName($langs->transnoentities($objectlabel)));
+		$filename = preg_replace('/\s/', '_', $filename);
+
+		// Save merged file
+		/*
+		 if ($year) {
+		 $filename .= '_'.$year;
+		 }
+		 if ($month) {
+		 $filename .= '_'.$month;
+		 }
+		 */
+		$now = dol_now();
+		$file = $diroutputmassaction.'/'.$filename.'_'.dol_print_date($now, 'dayhourlog').'.pdf';
+
+
+		// Create PDF
+		// TODO Create the pdf including list of movement ids found into $listofobjectid
+		// ...
+
+
+		if (!$error) {
+			$langs->load("exports");
+			setEventMessages($langs->trans('FileSuccessfullyBuilt', $filename.'_'.dol_print_date($now, 'dayhourlog')), null, 'mesgs');
+		}
+
+		$massaction = '';
+		$action = '';
+	}
+
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
@@ -482,6 +574,8 @@ if (!empty($conf->projet->enabled)) {
 	$formproject = new FormProjets($db);
 }
 
+// Build and execute select
+// --------------------------------------------------------------------
 $sql = "SELECT p.rowid, p.ref as product_ref, p.label as produit, p.tosell, p.tobuy, p.tobatch, p.fk_product_type as type, p.entity,";
 $sql .= " e.ref as warehouse_ref, e.rowid as entrepot_id, e.lieu, e.fk_parent, e.statut,";
 $sql .= " m.rowid as mid, m.value as qty, m.datem, m.fk_user_author, m.label, m.inventorycode, m.fk_origin, m.origintype,";
@@ -499,7 +593,8 @@ if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 // Add fields from hooks
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
-$sql .= $hookmanager->resPrint;
+$sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
+$sql = preg_replace('/,\s*$/', '', $sql);
 $sql .= " FROM ".MAIN_DB_PREFIX."entrepot as e,";
 $sql .= " ".MAIN_DB_PREFIX."product as p,";
 $sql .= " ".MAIN_DB_PREFIX."stock_mouvement as m";
@@ -572,6 +667,31 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 
+/* If a group by is required
+ $sql .= " GROUP BY ";
+ foreach($object->fields as $key => $val) {
+ $sql .= "t.".$key.", ";
+ }
+ // Add fields from extrafields
+ if (!empty($extrafields->attributes[$object->table_element]['label'])) {
+ foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+ $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.', ' : '');
+ }
+ }
+ // Add where from hooks
+ $parameters = array();
+ $reshook = $hookmanager->executeHooks('printFieldListGroupBy', $parameters, $object);    // Note that $action and $object may have been modified by hook
+ $sql .= $hookmanager->resPrint;
+ $sql = preg_replace('/,\s*$/', '', $sql);
+ */
+
+// Add HAVING from hooks
+/*
+ $parameters = array();
+ $reshook = $hookmanager->executeHooks('printFieldListHaving', $parameters, $object); // Note that $action and $object may have been modified by hook
+ $sql .= empty($hookmanager->resPrint) ? "" : " HAVING 1=1 ".$hookmanager->resPrint;
+ */
+
 // Count total nb of records
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
@@ -589,20 +709,19 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$resql = $db->query($sqlforcount);
 	$objforcount = $db->fetch_object($resql);
 	$nbtotalofrecords = $objforcount->nbtotalofrecords;
-	if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	if (($page * $limit) > $nbtotalofrecords) {	// if total of record found is smaller than page * limit, goto and load page 0
 		$page = 0;
 		$offset = 0;
 	}
 	$db->free($resql);
 }
 
+// Complete request and execute it with limit
 $sql .= $db->order($sortfield, $sortorder);
 if ($limit) {
 	$sql .= $db->plimit($limit + 1, $offset);
 }
 
-//print $sql;
-
 $resql = $db->query($sql);
 if (!$resql) {
 	dol_print_error($db);
@@ -624,20 +743,24 @@ if ($id > 0 || $ref) {
 
 $num = $db->num_rows($resql);
 
-$arrayofselected = is_array($toselect) ? $toselect : array();
 
+// Output page
+// --------------------------------------------------------------------
 
 $i = 0;
 $help_url = 'EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
 if ($msid) {
-	$texte = $langs->trans('StockMovementForId', $msid);
+	$title = $langs->trans('StockMovementForId', $msid);
 } else {
-	$texte = $langs->trans("ListOfStockMovements");
+	$title = $langs->trans("ListOfStockMovements");
 	if ($id) {
-		$texte .= ' ('.$langs->trans("ForThisWarehouse").')';
+		$title .= ' ('.$langs->trans("ForThisWarehouse").')';
 	}
 }
-llxHeader("", $texte, $help_url);
+
+llxHeader('', $title, $help_url);
+
+$arrayofselected = is_array($toselect) ? $toselect : array();
 
 /*
  * Show tab only if we ask a particular warehouse
@@ -774,26 +897,20 @@ if ($object->id > 0) {
 }
 
 
-/*
- * Correct stock
- */
+// Correct stock
 if ($action == "correction") {
 	include DOL_DOCUMENT_ROOT.'/product/stock/tpl/stockcorrection.tpl.php';
 	print '<br>';
 }
 
-/*
- * Transfer of units
- */
+// Transfer of units
 if ($action == "transfert") {
 	include DOL_DOCUMENT_ROOT.'/product/stock/tpl/stocktransfer.tpl.php';
 	print '<br>';
 }
 
 
-/*
- * Action bar
- */
+// Action bar
 if ((empty($action) || $action == 'list') && $id > 0) {
 	print "<div class=\"tabsAction\">\n";
 
@@ -867,12 +984,11 @@ if ($idproduct > 0) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
 // List of mass actions available
-$arrayofmassactions = array(
-	'generate_doc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("ReGeneratePDF"),
-//    'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
-//    'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
-);
-// By default, we should never accept deletion of stock movement.
+$arrayofmassactions = array();
+if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
+	$arrayofmassactions['builddoc'] = img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("GeneratePDF");
+}
+// By default, we should never accept deletion of stock movement
 if (!empty($conf->global->STOCK_ALLOW_DELETE_OF_MOVEMENT) && $permissiontodelete) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
@@ -881,7 +997,7 @@ if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'pr
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
-print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
 if ($optioncss != '') {
 	print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 }
@@ -891,15 +1007,16 @@ 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="type" value="'.$type.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 if ($id > 0) {
 	print '<input type="hidden" name="id" value="'.$id.'">';
 }
 
 if ($id > 0) {
-	print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'movement', 0, '', '', $limit, 0, 0, 1);
+	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'movement', 0, '', '', $limit, 0, 0, 1);
 } else {
-	print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'movement', 0, '', '', $limit, 0, 0, 1);
+	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'movement', 0, '', '', $limit, 0, 0, 1);
 }
 
 // Add code for pre mass action (confirmation or email presend form)
@@ -919,7 +1036,7 @@ if ($sall) {
 $moreforfilter = '';
 
 $parameters = array('arrayfields'=>&$arrayfields);
-$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
 if (empty($reshook)) {
 	$moreforfilter .= $hookmanager->resPrint;
 } else {
@@ -934,12 +1051,14 @@ if (!empty($moreforfilter)) {
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
-print '<div class="div-table-responsive">';
-print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 // Fields title search
-print '<tr class="liste_titre_filter">';
+// --------------------------------------------------------------------
+print '<tr class="liste_titre">';
 if (!empty($arrayfields['m.rowid']['checked'])) {
 	// Ref
 	print '<td class="liste_titre left">';
@@ -1052,7 +1171,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 // Fields from hook
 $parameters = array('arrayfields'=>$arrayfields);
-$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Date creation
 if (!empty($arrayfields['m.datec']['checked'])) {
@@ -1064,13 +1183,16 @@ if (!empty($arrayfields['m.tms']['checked'])) {
 	print '<td class="liste_titre">';
 	print '</td>';
 }
-// Actions
+// Action column
 print '<td class="liste_titre maxwidthsearch">';
-$searchpicto = $form->showFilterAndCheckAddButtons(0);
+$searchpicto = $form->showFilterButtons();
 print $searchpicto;
 print '</td>';
-print "</tr>\n";
+print '</tr>'."\n";
 
+
+// Fields title label
+// --------------------------------------------------------------------
 print '<tr class="liste_titre">';
 if (!empty($arrayfields['m.rowid']['checked'])) {
 	print_liste_field_titre($arrayfields['m.rowid']['label'], $_SERVER["PHP_SELF"], 'm.rowid', '', $param, '', $sortfield, $sortorder);
@@ -1127,7 +1249,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 
 // Hook fields
 $parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
-$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 if (!empty($arrayfields['m.datec']['checked'])) {
 	print_liste_field_titre($arrayfields['p.datec']['label'], $_SERVER["PHP_SELF"], "p.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
@@ -1135,32 +1257,39 @@ if (!empty($arrayfields['m.datec']['checked'])) {
 if (!empty($arrayfields['m.tms']['checked'])) {
 	print_liste_field_titre($arrayfields['p.tms']['label'], $_SERVER["PHP_SELF"], "p.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
 }
+// Action column
 print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
-print "</tr>\n";
+print '</tr>'."\n";
 
 
 $arrayofuniqueproduct = array();
 
+
+// Loop on record
+// --------------------------------------------------------------------
 $i = 0;
 $totalarray = array();
 $totalarray['nbfield'] = 0;
-while ($i < min($num, $limit)) {
-	$objp = $db->fetch_object($resql);
+while ($i < ($limit ? min($num, $limit) : $num)) {
+	$obj = $db->fetch_object($resql);
+	if (empty($obj)) {
+		break; // Should not happen
+	}
 
-	$userstatic->id = $objp->fk_user_author;
-	$userstatic->login = $objp->login;
-	$userstatic->lastname = $objp->lastname;
-	$userstatic->firstname = $objp->firstname;
-	$userstatic->photo = $objp->photo;
-	$userstatic->email = $objp->user_email;
-	$userstatic->statut = $objp->user_status;
+	$userstatic->id = $obj->fk_user_author;
+	$userstatic->login = $obj->login;
+	$userstatic->lastname = $obj->lastname;
+	$userstatic->firstname = $obj->firstname;
+	$userstatic->photo = $obj->photo;
+	$userstatic->email = $obj->user_email;
+	$userstatic->statut = $obj->user_status;
 
 	// Multilangs
 	if (!empty($conf->global->MAIN_MULTILANGS)) {  // If multilang is enabled
 		// TODO Use a cache
 		$sql = "SELECT label";
 		$sql .= " FROM ".MAIN_DB_PREFIX."product_lang";
-		$sql .= " WHERE fk_product = ".((int) $objp->rowid);
+		$sql .= " WHERE fk_product = ".((int) $obj->rowid);
 		$sql .= " AND lang = '".$db->escape($langs->getDefaultLang())."'";
 		$sql .= " LIMIT 1";
 
@@ -1168,37 +1297,37 @@ while ($i < min($num, $limit)) {
 		if ($result) {
 			$objtp = $db->fetch_object($result);
 			if (!empty($objtp->label)) {
-				$objp->produit = $objtp->label;
+				$obj->produit = $objtp->label;
 			}
 		}
 	}
 
-	$productstatic->id = $objp->rowid;
-	$productstatic->ref = $objp->product_ref;
-	$productstatic->label = $objp->produit;
-	$productstatic->type = $objp->type;
-	$productstatic->entity = $objp->entity;
-	$productstatic->status = $objp->tosell;
-	$productstatic->status_buy = $objp->tobuy;
-	$productstatic->status_batch = $objp->tobatch;
+	$productstatic->id = $obj->rowid;
+	$productstatic->ref = $obj->product_ref;
+	$productstatic->label = $obj->produit;
+	$productstatic->type = $obj->type;
+	$productstatic->entity = $obj->entity;
+	$productstatic->status = $obj->tosell;
+	$productstatic->status_buy = $obj->tobuy;
+	$productstatic->status_batch = $obj->tobatch;
 
-	$productlot->id = $objp->lotid;
-	$productlot->batch = $objp->batch;
-	$productlot->eatby = $objp->eatby;
-	$productlot->sellby = $objp->sellby;
+	$productlot->id = $obj->lotid;
+	$productlot->batch = $obj->batch;
+	$productlot->eatby = $obj->eatby;
+	$productlot->sellby = $obj->sellby;
 
-	$warehousestatic->id = $objp->entrepot_id;
-	$warehousestatic->ref = $objp->warehouse_ref;
-	$warehousestatic->label = $objp->warehouse_ref;
-	$warehousestatic->lieu = $objp->lieu;
-	$warehousestatic->fk_parent = $objp->fk_parent;
-	$warehousestatic->statut = $objp->statut;
+	$warehousestatic->id = $obj->entrepot_id;
+	$warehousestatic->ref = $obj->warehouse_ref;
+	$warehousestatic->label = $obj->warehouse_ref;
+	$warehousestatic->lieu = $obj->lieu;
+	$warehousestatic->fk_parent = $obj->fk_parent;
+	$warehousestatic->statut = $obj->statut;
 
-	$movement->type = $objp->type_mouvement;
+	$movement->type = $obj->type_mouvement;
 
-	$arrayofuniqueproduct[$objp->rowid] = $objp->produit;
-	if (!empty($objp->fk_origin)) {
-		$origin = $movement->get_origin($objp->fk_origin, $objp->origintype);
+	$arrayofuniqueproduct[$obj->rowid] = $obj->produit;
+	if (!empty($obj->fk_origin)) {
+		$origin = $movement->get_origin($obj->fk_origin, $obj->origintype);
 	} else {
 		$origin = '';
 	}
@@ -1208,12 +1337,12 @@ while ($i < min($num, $limit)) {
 	if (!empty($arrayfields['m.rowid']['checked'])) {
 		print '<td>';
 		print img_picto($langs->trans("StockMovement"), 'movement', 'class="pictofixedwidth"');
-		print $objp->mid;
+		print $obj->mid;
 		print '</td>'; // This is primary not movement id
 	}
 	if (!empty($arrayfields['m.datem']['checked'])) {
 		// Date
-		print '<td class="nowraponall center">'.dol_print_date($db->jdate($objp->datem), 'dayhour', 'tzuserrel').'</td>';
+		print '<td class="nowraponall center">'.dol_print_date($db->jdate($obj->datem), 'dayhour', 'tzuserrel').'</td>';
 	}
 	if (!empty($arrayfields['p.ref']['checked'])) {
 		// Product ref
@@ -1237,10 +1366,10 @@ while ($i < min($num, $limit)) {
 		print '</td>';
 	}
 	if (!empty($arrayfields['pl.eatby']['checked'])) {
-		print '<td class="center">'.dol_print_date($objp->eatby, 'day').'</td>';
+		print '<td class="center">'.dol_print_date($obj->eatby, 'day').'</td>';
 	}
 	if (!empty($arrayfields['pl.sellby']['checked'])) {
-		print '<td class="center">'.dol_print_date($objp->sellby, 'day').'</td>';
+		print '<td class="center">'.dol_print_date($obj->sellby, 'day').'</td>';
 	}
 	// Warehouse
 	if (!empty($arrayfields['e.ref']['checked'])) {
@@ -1256,11 +1385,11 @@ while ($i < min($num, $limit)) {
 	}
 	if (!empty($arrayfields['m.inventorycode']['checked'])) {
 		// Inventory code
-		print '<td><a href="'.$_SERVER["PHP_SELF"].'?search_inventorycode='.urlencode('^'.$objp->inventorycode.'$').'&search_type_mouvement='.urlencode($objp->type_mouvement).'">'.$objp->inventorycode.'</a></td>';
+		print '<td><a href="'.$_SERVER["PHP_SELF"].'?search_inventorycode='.urlencode('^'.$obj->inventorycode.'$').'&search_type_mouvement='.urlencode($obj->type_mouvement).'">'.$obj->inventorycode.'</a></td>';
 	}
 	if (!empty($arrayfields['m.label']['checked'])) {
 		// Label of movement
-		print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($objp->label).'">'.$objp->label.'</td>';
+		print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($obj->label).'">'.$obj->label.'</td>';
 	}
 	if (!empty($arrayfields['origin']['checked'])) {
 		// Origin of movement
@@ -1269,8 +1398,8 @@ while ($i < min($num, $limit)) {
 	if (!empty($arrayfields['m.fk_projet']['checked'])) {
 		// fk_project
 		print '<td>';
-		if ($objp->fk_project != 0) {
-			print $movement->get_origin($objp->fk_project, 'project');
+		if ($obj->fk_project != 0) {
+			print $movement->get_origin($obj->fk_project, 'project');
 		}
 		print '</td>';
 	}
@@ -1283,14 +1412,14 @@ while ($i < min($num, $limit)) {
 	if (!empty($arrayfields['m.value']['checked'])) {
 		// Qty
 		print '<td class="right">';
-		if ($objp->qty > 0) {
+		if ($obj->qty > 0) {
 			print '<span class="stockmovemententry">';
 			print '+';
-			print $objp->qty;
+			print $obj->qty;
 			print '</span>';
 		} else {
 			print '<span class="stockmovementexit">';
-			print $objp->qty;
+			print $obj->qty;
 			print '</span>';
 		}
 		print '</td>';
@@ -1298,8 +1427,8 @@ while ($i < min($num, $limit)) {
 	if (!empty($arrayfields['m.price']['checked'])) {
 		// Price
 		print '<td class="right">';
-		if ($objp->price != 0) {
-			print price($objp->price);
+		if ($obj->price != 0) {
+			print price($obj->price);
 		}
 		print '</td>';
 	}
@@ -1307,25 +1436,26 @@ while ($i < min($num, $limit)) {
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 	// Fields from hook
-	$parameters = array('arrayfields'=>$arrayfields, 'objp'=>$objp, 'i'=>$i, 'totalarray'=>&$totalarray);
-	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
+	$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
 	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($objp->mid, $arrayofselected)) {
+		if (in_array($obj->mid, $arrayofselected)) {
 			$selected = 1;
 		}
-		print '<input id="cb'.$objp->mid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$objp->mid.'"'.($selected ? ' checked="checked"' : '').'>';
+		print '<input id="cb'.$obj->mid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->mid.'"'.($selected ? ' checked="checked"' : '').'>';
 	}
 	print '</td>';
 	if (!$i) {
 		$totalarray['nbfield']++;
 	}
 
-	print "</tr>\n";
+	print '</tr>'."\n";
+
 	$i++;
 }
 
@@ -1365,6 +1495,26 @@ if (count($arrayofuniqueproduct) == 1 && is_numeric($year)) {
 	//print '</td></tr>';
 }
 
+if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
+	$hidegeneratedfilelistifempty = 1;
+	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
+		$hidegeneratedfilelistifempty = 0;
+	}
+
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+	$formfile = new FormFile($db);
+
+	// Show list of available documents
+	$urlsource = $_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
+	$urlsource .= str_replace('&amp;', '&', $param);
+
+	$filedir = $diroutputmassaction;
+	$genallowed = $permissiontoread;
+	$delallowed = $permissiontoadd;
+
+	print $formfile->showdocuments('massfilesarea_mymodule', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
+}
+
 // End of page
 llxFooter();
 $db->close();

From 8eeb0caa78de718cde24039dc244dcc37226131c Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Sun, 16 Jan 2022 21:10:02 +0100
Subject: [PATCH 136/316] New hook printMainArea

---
 htdocs/main.inc.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 028ed31a618..daf4c22aec5 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -2929,7 +2929,7 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
  */
 function main_area($title = '')
 {
-	global $conf, $langs;
+	global $conf, $langs, $hookmanager;
 
 	if (empty($conf->dol_hide_leftmenu)) {
 		print '<div id="id-right">';
@@ -2939,14 +2939,17 @@ function main_area($title = '')
 
 	print '<!-- Begin div class="fiche" -->'."\n".'<div class="fiche">'."\n";
 
+	$hookmanager->initHooks(array('main'));
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('printMainArea', $parameters); // Note that $action and $object may have been modified by some hooks
+	print $hookmanager->resPrint;
+
 	if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) {
 		print info_admin($langs->trans("WarningYouAreInMaintenanceMode", $conf->global->MAIN_ONLY_LOGIN_ALLOWED), 0, 0, 1, 'warning maintenancemode');
 	}
 
 	// Permit to add user company information on each printed document by setting SHOW_SOCINFO_ON_PRINT
 	if (!empty($conf->global->SHOW_SOCINFO_ON_PRINT) && GETPOST('optioncss', 'aZ09') == 'print' && empty(GETPOST('disable_show_socinfo_on_print', 'az09'))) {
-		global $hookmanager;
-		$hookmanager->initHooks(array('main'));
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('showSocinfoOnPrint', $parameters);
 		if (empty($reshook)) {

From 22ab3c03a1589a91ee3e4873935891a47ad1f41a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 Jan 2022 09:12:09 +0100
Subject: [PATCH 137/316] Fix another way to write the preg_replace_callback

---
 htdocs/core/lib/functions.lib.php | 5 +++--
 htdocs/main.inc.php               | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 5004a42084c..126b69c233e 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -828,8 +828,9 @@ function checkVal($out = '', $check = 'alphanohtml', $filter = null, $options =
 				// We replace chars from a/A to z/Z encoded with numeric HTML entities with the real char so we won't loose the chars at the next step (preg_replace).
 				// No need to use a loop here, this step is not to sanitize (this is done at next step, this is to try to save chars, even if they are
 				// using a non coventionnel way to be encoded, to not have them sanitized just after)
-				$out = preg_replace_callback('/&#(x?[0-9][0-9a-f]+;?)/i', 'realCharForNumericEntities', $out);
-				//$out = preg_replace_callback('/&#(x?[0-9][0-9a-f]+;?)/i', function ($m) { return realCharForNumericEntities($m); }, $out);
+				//$out = preg_replace_callback('/&#(x?[0-9][0-9a-f]+;?)/i', 'realCharForNumericEntities', $out);
+				$out = preg_replace_callback('/&#(x?[0-9][0-9a-f]+;?)/i', function ($m) {
+					return realCharForNumericEntities($m); }, $out);
 
 
 				// Now we remove all remaining HTML entities starting with a number. We don't want such entities.
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 4280634c7dd..f54d4e0dbaa 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -94,7 +94,9 @@ function testSqlAndScriptInject($val, $type)
 	do {
 		$oldval = $val;
 		$val = html_entity_decode($val, ENT_QUOTES | ENT_HTML5);
-		$val = preg_replace_callback('/&#(x?[0-9][0-9a-f]+)/i', 'realCharForNumericEntities', $val); // Sometimes we have entities without the ; at end so html_entity_decode does not work but entities is still interpreted by browser.
+		//$val = preg_replace_callback('/&#(x?[0-9][0-9a-f]+;?)/i', 'realCharForNumericEntities', $val); // Sometimes we have entities without the ; at end so html_entity_decode does not work but entities is still interpreted by browser.
+		$val = preg_replace_callback('/&#(x?[0-9][0-9a-f]+;?)/i', function ($m) {
+			return realCharForNumericEntities($m); }, $val);
 	} while ($oldval != $val);
 	//print "after  decoding $val\n";
 

From 7034ddf0630cebc64af5b202a63d40457587de9d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 Jan 2022 13:56:32 +0100
Subject: [PATCH 138/316] Freemono instead of freeserif

---
 htdocs/langs/ta_IN/main.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/ta_IN/main.lang b/htdocs/langs/ta_IN/main.lang
index f95493447e9..b61756b95b0 100644
--- a/htdocs/langs/ta_IN/main.lang
+++ b/htdocs/langs/ta_IN/main.lang
@@ -4,7 +4,7 @@ DIRECTION=ltr
 # msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader)
 # stsongstdlight or cid0cs are for simplified Chinese
 # To read Chinese pdf with Linux: sudo apt-get install poppler-data
-FONTFORPDF=freeserif
+FONTFORPDF=freemono
 FONTSIZEFORPDF=10
 SeparatorDecimal=.
 SeparatorThousand=,

From 9d067d74abd934f969cd38fe04330d87276feb4c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 Jan 2022 17:51:03 +0100
Subject: [PATCH 139/316] Fix responsive

---
 htdocs/admin/agenda_other.php            | 22 ++++++++++++----------
 htdocs/comm/action/card.php              | 13 +++++++------
 htdocs/core/get_menudiv.php              |  3 ++-
 htdocs/core/menus/standard/eldy_menu.php |  2 +-
 htdocs/theme/md/style.css.php            |  8 +++++++-
 5 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index 1cce5388f90..8e50380e2ae 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -104,6 +104,8 @@ if ($action == 'set') {
 	$resultCreat = $defaultValues->create($user);
 	if ($resultCreat < 0) {
 		setEventMessages($defaultValues->error, $defaultValues->errors, 'errors');
+	} else {
+		setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
 	}
 } elseif ($action == 'specimen') {  // For orders
 	$modele = GETPOST('module', 'alpha');
@@ -316,6 +318,16 @@ print '<td class="center">&nbsp;</td>'."\n";
 print '<td class="right">'.$langs->trans("Value").'</td>'."\n";
 print '</tr>'."\n";
 
+// AGENDA_DEFAULT_VIEW
+print '<tr class="oddeven">'."\n";
+$htmltext = $langs->trans("ThisValueCanOverwrittenOnUserLevel", $langs->transnoentitiesnoconv("UserGUISetup"));
+print '<td>'.$form->textwithpicto($langs->trans("AGENDA_DEFAULT_VIEW"), $htmltext).'</td>'."\n";
+print '<td class="center">&nbsp;</td>'."\n";
+print '<td class="right">'."\n";
+$tmplist = array(''=>'&nbsp;', 'show_list'=>$langs->trans("ViewList"), 'show_month'=>$langs->trans("ViewCal"), 'show_week'=>$langs->trans("ViewWeek"), 'show_day'=>$langs->trans("ViewDay"), 'show_peruser'=>$langs->trans("ViewPerUser"));
+print $form->selectarray('AGENDA_DEFAULT_VIEW', $tmplist, $conf->global->AGENDA_DEFAULT_VIEW);
+print '</td></tr>'."\n";
+
 // Manual or automatic
 
 print '<tr class="oddeven">'."\n";
@@ -340,16 +352,6 @@ if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
 	print '</td></tr>'."\n";
 }
 
-// AGENDA_DEFAULT_VIEW
-print '<tr class="oddeven">'."\n";
-$htmltext = $langs->trans("ThisValueCanOverwrittenOnUserLevel", $langs->transnoentitiesnoconv("UserGUISetup"));
-print '<td>'.$form->textwithpicto($langs->trans("AGENDA_DEFAULT_VIEW"), $htmltext).'</td>'."\n";
-print '<td class="center">&nbsp;</td>'."\n";
-print '<td class="right">'."\n";
-$tmplist = array(''=>'&nbsp;', 'show_list'=>$langs->trans("ViewList"), 'show_month'=>$langs->trans("ViewCal"), 'show_week'=>$langs->trans("ViewWeek"), 'show_day'=>$langs->trans("ViewDay"), 'show_peruser'=>$langs->trans("ViewPerUser"));
-print $form->selectarray('AGENDA_DEFAULT_VIEW', $tmplist, $conf->global->AGENDA_DEFAULT_VIEW);
-print '</td></tr>'."\n";
-
 // AGENDA_EVENT_DEFAULT_STATUS
 print '<tr class="oddeven">'."\n";
 print '<td>'.$langs->trans("AGENDA_EVENT_DEFAULT_STATUS").'</td>'."\n";
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 63f18d2c046..5577e97a5ba 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -1000,7 +1000,7 @@ if ($action == 'create') {
 	print '<tr><td'.(empty($conf->global->AGENDA_USE_EVENT_TYPE) ? ' class="fieldrequired titlefieldcreate"' : '').'>'.$langs->trans("Label").'</td><td><input type="text" id="label" name="label" class="soixantepercent" value="'.GETPOST('label').'"></td></tr>';
 
 	// Full day
-	print '<tr><td>'.$langs->trans("EventOnFullDay").'</td><td><input type="checkbox" id="fullday" name="fullday" '.(GETPOST('fullday') ? ' checked' : '').'></td></tr>';
+	print '<tr><td><label for="fullday">'.$langs->trans("EventOnFullDay").'</label></td><td><input type="checkbox" id="fullday" name="fullday" '.(GETPOST('fullday') ? ' checked' : '').'></td></tr>';
 
 	$datep = ($datep ? $datep : (is_null($object->datep) ? '' : $object->datep));
 	if (GETPOST('datep', 'int', 1)) {
@@ -1311,7 +1311,7 @@ if ($action == 'create') {
 	print '</table>';
 
 
-	if ($conf->global->AGENDA_REMINDER_EMAIL || $conf->global->AGENDA_REMINDER_BROWSER) {
+	if (getDolGlobalString('AGENDA_REMINDER_EMAIL') || getDolGlobalString('AGENDA_REMINDER_BROWSER')) {
 		//checkbox create reminder
 		print '<hr>';
 		print '<br>';
@@ -1336,10 +1336,11 @@ if ($action == 'create') {
 		print '</td></tr>';
 
 		//Mail Model
-		print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("EMailTemplates").'</td><td colspan="3">';
-		print $form->selectModelMail('actioncommsend', 'actioncomm_send', 1, 1);
-		print '</td></tr>';
-
+		if (getDolGlobalString('AGENDA_REMINDER_EMAIL')) {
+			print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("EMailTemplates").'</td><td colspan="3">';
+			print $form->selectModelMail('actioncommsend', 'actioncomm_send', 1, 1);
+			print '</td></tr>';
+		}
 
 		print '</table>';
 		print '</div>';
diff --git a/htdocs/core/get_menudiv.php b/htdocs/core/get_menudiv.php
index 77b0416956b..597031945f1 100644
--- a/htdocs/core/get_menudiv.php
+++ b/htdocs/core/get_menudiv.php
@@ -121,12 +121,13 @@ print '
         display: none;
     }
 
-    a.alilevel0 {
+    a.alilevel0, span.spanlilevel0 {
         background-image: url(\''.DOL_URL_ROOT.'/theme/'.urlencode($conf->theme).'/img/next.png\') !important;
         background-repeat: no-repeat !important;
         background-position-x: 10px;
         background-position-y: 16px;
         padding: 1em 15px 1em 40px;
+		display: block;
     }
     li.lilevel0 font.vsmenudisabled {
         background-repeat: no-repeat !important;
diff --git a/htdocs/core/menus/standard/eldy_menu.php b/htdocs/core/menus/standard/eldy_menu.php
index 35186e423ef..5b426199a6e 100644
--- a/htdocs/core/menus/standard/eldy_menu.php
+++ b/htdocs/core/menus/standard/eldy_menu.php
@@ -317,7 +317,7 @@ class MenuManager
 					print '</ul>';
 				}
 				if ($val['enabled'] == 2) {
-					print '<span class="vsmenudisabled">';
+					print '<span class="spanlilevel0 vsmenudisabled">';
 					// Add font-awesome
 					if ($val['level'] == 0 && !empty($val['prefix'])) {
 						print $val['prefix'];
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 538e347a216..bfc36ea408e 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -3003,8 +3003,14 @@ a.vmenu:link, a.vmenu:visited {
 }
 
 a.vsmenu:link, a.vsmenu:visited, a.vsmenu:hover, a.vsmenu:active, span.vsmenu { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #202020; margin: 1px 1px 1px 8px; }
+span.vsmenudisabled:not(.spanlilevel0), font.vsmenudisabled:not(.spanlilevel0) {
+	font-size:<?php print $fontsize ?>px;
+}
 span.vsmenudisabled, font.vsmenudisabled {
-	font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #aaa;
+	font-family: <?php print $fontlist ?>;
+	text-align: <?php print $left; ?>;
+	font-weight: normal;
+	color: #aaa;
 }
 a.vsmenu:link, a.vsmenu:visited {
 	color: var(--colortextbackvmenu);

From 0e44bfd4e46e2a8b14ce009dd37dc2a6fbecb0f0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 Jan 2022 18:53:57 +0100
Subject: [PATCH 140/316] Fix remove $_GET

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

diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 77d2680c222..0746ca13a17 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -107,10 +107,10 @@ $year = GETPOST("year", "int") ?GETPOST("year", "int") : date("Y");
 $month = GETPOST("month", "int") ?GETPOST("month", "int") : date("m");
 $week = GETPOST("week", "int") ?GETPOST("week", "int") : date("W");
 $day = GETPOST("day", "int") ?GETPOST("day", "int") : date("d");
-$pid = GETPOST("search_projectid", "int", 3) ?GETPOST("search_projectid", "int", 3) : GETPOST("projectid", "int", 3);
-$status = GETPOST("search_status", 'aZ09') ?GETPOST("search_status", 'aZ09') : GETPOST("status", 'aZ09'); // status may be 0, 50, 100, 'todo'
-$type = GETPOST("search_type", 'aZ09') ?GETPOST("search_type", 'aZ09') : GETPOST("type", 'aZ09');
-$maxprint = (isset($_GET["maxprint"]) ?GETPOST("maxprint") : $conf->global->AGENDA_MAX_EVENTS_DAY_VIEW);
+$pid = GETPOST("search_projectid", "int", 3) ? GETPOST("search_projectid", "int", 3) : GETPOST("projectid", "int", 3);
+$status = GETPOSTISSET("search_status") ? GETPOST("search_status", 'aZ09') : GETPOST("status", 'aZ09'); // status may be 0, 50, 100, 'todo'
+$type = GETPOSTISSET("search_type", 'aZ09') ? GETPOST("search_type", 'aZ09') : GETPOST("type", 'aZ09');
+$maxprint = GETPOSTISSET("maxprint") ? GETPOST("maxprint", 'int') : $conf->global->AGENDA_MAX_EVENTS_DAY_VIEW;
 $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 
 $dateselect = dol_mktime(0, 0, 0, GETPOST('dateselectmonth', 'int'), GETPOST('dateselectday', 'int'), GETPOST('dateselectyear', 'int'));

From a072c8911ad9186e251f0f9ec366abe27b2b3ea1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 Jan 2022 19:07:02 +0100
Subject: [PATCH 141/316] Fix tz of message on popup

---
 htdocs/core/ajax/check_notifications.php | 4 ++--
 htdocs/core/js/lib_notification.js.php   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/ajax/check_notifications.php b/htdocs/core/ajax/check_notifications.php
index bbbc95a19c5..0f17f5a80fd 100644
--- a/htdocs/core/ajax/check_notifications.php
+++ b/htdocs/core/ajax/check_notifications.php
@@ -170,8 +170,8 @@ if (empty($_SESSION['auto_check_events_not_before']) || $time >= $_SESSION['auto
 			$event['code'] = $obj->code;
 			$event['label'] = $obj->label;
 			$event['location'] = $obj->location;
-			$event['reminder_date_formated'] = dol_print_date($db->jdate($obj->dateremind), 'standard');
-			$event['event_date_start_formated'] = dol_print_date($db->jdate($obj->datep), 'standard');
+			$event['reminder_date_formated'] = dol_print_date($db->jdate($obj->dateremind), 'standard', 'tzuser');
+			$event['event_date_start_formated'] = dol_print_date($db->jdate($obj->datep), 'standard', 'tzuser');
 
 			$eventfound[$obj->id_agenda] = $event;
 		}
diff --git a/htdocs/core/js/lib_notification.js.php b/htdocs/core/js/lib_notification.js.php
index f4a4e59526a..af5952f6026 100644
--- a/htdocs/core/js/lib_notification.js.php
+++ b/htdocs/core/js/lib_notification.js.php
@@ -64,7 +64,7 @@ print "jQuery(document).ready(function () {\n";
 //print "	console.log('referrer=".dol_escape_js($_SERVER['HTTP_REFERER'])."');\n";
 
 print '	var nowtime = Date.now();';
-print '	var time_auto_update = '.$conf->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY.';'."\n"; // Always defined
+print '	var time_auto_update = '.max(1, getDolGlobalInt('MAIN_BROWSER_NOTIFICATION_FREQUENCY')).';'."\n"; // Always defined
 print '	var time_js_next_test;'."\n";
 ?>
 

From 812f12ccc4d9b9953f7f11df0f4766d15410e380 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 Jan 2022 19:09:18 +0100
Subject: [PATCH 142/316] Fix tz message

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

diff --git a/htdocs/core/ajax/check_notifications.php b/htdocs/core/ajax/check_notifications.php
index 0f17f5a80fd..a5efb52e787 100644
--- a/htdocs/core/ajax/check_notifications.php
+++ b/htdocs/core/ajax/check_notifications.php
@@ -170,6 +170,8 @@ if (empty($_SESSION['auto_check_events_not_before']) || $time >= $_SESSION['auto
 			$event['code'] = $obj->code;
 			$event['label'] = $obj->label;
 			$event['location'] = $obj->location;
+			$event['reminder_date_formated_tzserver'] = dol_print_date($db->jdate($obj->dateremind), 'standard', 'tzserver');
+			$event['event_date_start_formated_tzserver'] = dol_print_date($db->jdate($obj->datep), 'standard', 'tzserver');
 			$event['reminder_date_formated'] = dol_print_date($db->jdate($obj->dateremind), 'standard', 'tzuser');
 			$event['event_date_start_formated'] = dol_print_date($db->jdate($obj->datep), 'standard', 'tzuser');
 

From 2f7832ee44adc5b8e5ae91bc08dad45528fe74f5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 Jan 2022 19:18:48 +0100
Subject: [PATCH 143/316] css

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 126b69c233e..28a20ad6b09 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1999,7 +1999,7 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 						}
 					}
 				} elseif (!$phototoshow) { // example if modulepart = 'societe' or 'photo'
-					$phototoshow .= $form->showphoto($modulepart, $object, 0, 0, 0, 'photoref', 'small', 1, 0, $maxvisiblephotos);
+					$phototoshow .= $form->showphoto($modulepart, $object, 0, 0, 0, 'photowithmargin photoref', 'small', 1, 0, $maxvisiblephotos);
 				}
 
 				if ($phototoshow) {

From 17414b878a964b36984af43be5ad461678e59c48 Mon Sep 17 00:00:00 2001
From: snyk-bot <snyk-bot@snyk.io>
Date: Mon, 17 Jan 2022 20:52:19 +0000
Subject: [PATCH 144/316] fix: package.json to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-NODEFETCH-2342118
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 02c9b2abcb9..eb2362f26c7 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,6 @@
   "dependencies": {
     "chart.js": "^2.9.4",
     "cucumber-pretty": "^6.0.0",
-    "node-fetch": "^2.6.1"
+    "node-fetch": "^3.1.1"
   }
 }

From 642f77e8f5dd6cab6a65072b6f276bd306281723 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 Jan 2022 22:07:18 +0100
Subject: [PATCH 145/316] FIX Widget of stock alert does not report on purchase
 products.

---
 htdocs/core/boxes/box_produits_alerte_stock.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/boxes/box_produits_alerte_stock.php b/htdocs/core/boxes/box_produits_alerte_stock.php
index d7ae1566a44..09431b820bb 100644
--- a/htdocs/core/boxes/box_produits_alerte_stock.php
+++ b/htdocs/core/boxes/box_produits_alerte_stock.php
@@ -94,12 +94,12 @@ class box_produits_alerte_stock extends ModeleBoxes
 			$sql .= " FROM ".MAIN_DB_PREFIX."product as p";
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as s on p.rowid = s.fk_product";
 			$sql .= ' WHERE p.entity IN ('.getEntity($productstatic->element).')';
-			$sql .= " AND p.tosell = 1 AND p.seuil_stock_alerte > 0";
+			$sql .= " AND p.seuil_stock_alerte > 0";
 			if (empty($user->rights->produit->lire)) {
-				$sql .= ' AND p.fk_product_type != 0';
+				$sql .= ' AND p.fk_product_type <> 0';
 			}
 			if (empty($user->rights->service->lire)) {
-				$sql .= ' AND p.fk_product_type != 1';
+				$sql .= ' AND p.fk_product_type <> 1';
 			}
 			// Add where from hooks
 			if (is_object($hookmanager)) {

From 70e4705149861b4b6effd2b5312470079af4376a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 Jan 2022 22:52:56 +0100
Subject: [PATCH 146/316] Clean code

---
 htdocs/comm/action/card.php                    | 5 +++--
 htdocs/comm/action/class/cactioncomm.class.php | 4 ++--
 htdocs/core/class/html.formactions.class.php   | 4 ++--
 htdocs/core/class/link.class.php               | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 5577e97a5ba..d9118fefcdd 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -937,7 +937,7 @@ if ($action == 'create') {
                     $("#selectcomplete").change(function() {
                         if ($("#selectcomplete").val() == 100)
                         {
-                            if ($("#doneby").val() <= 0) $("#doneby").val(\''.$user->id.'\');
+                            if ($("#doneby").val() <= 0) $("#doneby").val(\''.((int) $user->id).'\');
                         }
                         if ($("#selectcomplete").val() == 0)
                         {
@@ -992,7 +992,8 @@ if ($action == 'create') {
 	if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
 		print '<tr><td class="titlefieldcreate"><span class="fieldrequired">'.$langs->trans("Type").'</span></b></td><td>';
 		$default = (empty($conf->global->AGENDA_USE_EVENT_TYPE_DEFAULT) ? 'AC_RDV' : $conf->global->AGENDA_USE_EVENT_TYPE_DEFAULT);
-		$formactions->select_type_actions(GETPOSTISSET("actioncode") ? GETPOST("actioncode", 'aZ09') : ($object->type_code ? $object->type_code : $default), "actioncode", "systemauto", 0, -1);
+		print img_picto($langs->trans("ActionType"), 'square', 'class="fawidth30 inline-block" style="color: #ddd;"');
+		print $formactions->select_type_actions(GETPOSTISSET("actioncode") ? GETPOST("actioncode", 'aZ09') : ($object->type_code ? $object->type_code : $default), "actioncode", "systemauto", -1, -1, 0, 1);
 		print '</td></tr>';
 	}
 
diff --git a/htdocs/comm/action/class/cactioncomm.class.php b/htdocs/comm/action/class/cactioncomm.class.php
index a248482ee9d..32c2345a657 100644
--- a/htdocs/comm/action/class/cactioncomm.class.php
+++ b/htdocs/comm/action/class/cactioncomm.class.php
@@ -145,7 +145,7 @@ class CActionComm
 	 *  @param  string|int  $active         1 or 0 to filter on event state active or not ('' by default = no filter)
 	 *  @param  string      $idorcode       'id' or 'code' or 'all'
 	 *  @param  string      $excludetype    Type to exclude ('system' or 'systemauto')
-	 *  @param  int         $onlyautoornot  1=Group all type AC_XXX into 1 line AC_MANUAL. 0=Keep details of type, -1=Keep details and add a combined line per calendar (Default, Auto, BoothConf, ...)
+	 *  @param  int         $onlyautoornot  1=Group all type AC_XXX into 1 line AC_MANUAL. 0=Keep details of type, -1 or -2=Keep details and add a combined line per calendar (Default, Auto, BoothConf, ...)
 	 *  @param  string      $morefilter     Add more SQL filter
 	 *  @param  int         $shortlabel     1=Get short label instead of long label
 	 *  @return mixed                       Array of all event types if OK, <0 if KO. Key of array is id or code depending on parameter $idorcode.
@@ -241,7 +241,7 @@ class CActionComm
 							$transcode = $langs->trans($keyfortrans);
 						}
 						$label = (($transcode != $keyfortrans) ? $transcode : $langs->trans($obj->label));
-						if ($onlyautoornot == -1 && !empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
+						if (($onlyautoornot == -1 || $onlyautoornot == -2) && !empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
 							if ($typecalendar == 'system') {
 								$label = '&nbsp;&nbsp; '.$label;
 								$repid[-99] = $langs->trans("ActionAC_MANUAL");
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index d4f4779a606..f5502426b00 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -352,7 +352,7 @@ class FormActions
 	 *  @param	array|string	$selected       Type pre-selected (can be 'manual', 'auto' or 'AC_xxx'). Can be an array too.
 	 *  @param  string		    $htmlname       Name of select field
 	 *  @param	string		    $excludetype	A type to exclude ('systemauto', 'system', '')
-	 *  @param	integer		    $onlyautoornot	1=Group all type AC_XXX into 1 line AC_MANUAL. 0=Keep details of type, -1=Keep details and add a combined line "All manual"
+	 *  @param	integer		    $onlyautoornot	1=Group all type AC_XXX into 1 line AC_MANUAL. 0=Keep details of type, -1=Keep details and add a combined line "All manual", -2=Combined line is disabled (not implemented yet)
 	 *  @param	int		        $hideinfohelp	1=Do not show info help, 0=Show, -1=Show+Add info to tell how to set default value
 	 *  @param  int		        $multiselect    1=Allow multiselect of action type
 	 *  @param  int             $nooutput       1=No output
@@ -373,7 +373,7 @@ class FormActions
 		$caction = new CActionComm($this->db);
 
 		// Suggest a list with manual events or all auto events
-		$arraylist = $caction->liste_array(1, 'code', $excludetype, $onlyautoornot);
+		$arraylist = $caction->liste_array(1, 'code', $excludetype, $onlyautoornot, '', 0);		// If we use param 'all' instead of 'code', there is no group by include in answer but the key 'type' of answer array contains the key for the group by.
 		if (empty($multiselect)) {
 			// Add empty line at start only if no multiselect
 			array_unshift($arraylist, '&nbsp;');
diff --git a/htdocs/core/class/link.class.php b/htdocs/core/class/link.class.php
index eaf4804b213..f69dcb2874d 100644
--- a/htdocs/core/class/link.class.php
+++ b/htdocs/core/class/link.class.php
@@ -249,7 +249,7 @@ class Link extends CommonObject
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
-			dol_syslog(get_class($this)."::fetchAll ".$num."records", LOG_DEBUG);
+			dol_syslog(get_class($this)."::fetchAll num=".((int) $num), LOG_DEBUG);
 			if ($num > 0) {
 				while ($obj = $this->db->fetch_object($resql)) {
 					$link = new Link($this->db);

From 254ed31fb14d572e10ee52ed325d59ca938a9820 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 Jan 2022 23:47:23 +0100
Subject: [PATCH 147/316] Fix combo

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

diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index d9118fefcdd..52b93acdabb 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -993,7 +993,7 @@ if ($action == 'create') {
 		print '<tr><td class="titlefieldcreate"><span class="fieldrequired">'.$langs->trans("Type").'</span></b></td><td>';
 		$default = (empty($conf->global->AGENDA_USE_EVENT_TYPE_DEFAULT) ? 'AC_RDV' : $conf->global->AGENDA_USE_EVENT_TYPE_DEFAULT);
 		print img_picto($langs->trans("ActionType"), 'square', 'class="fawidth30 inline-block" style="color: #ddd;"');
-		print $formactions->select_type_actions(GETPOSTISSET("actioncode") ? GETPOST("actioncode", 'aZ09') : ($object->type_code ? $object->type_code : $default), "actioncode", "systemauto", -1, -1, 0, 1);
+		print $formactions->select_type_actions(GETPOSTISSET("actioncode") ? GETPOST("actioncode", 'aZ09') : ($object->type_code ? $object->type_code : $default), "actioncode", "systemauto", 0, -1, 0, 1);	// TODO Replace 0 with -2 in onlyautoornot
 		print '</td></tr>';
 	}
 

From e19994c75699700c614f3735b5681547b972ec63 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 18 Jan 2022 00:07:45 +0100
Subject: [PATCH 148/316] Fix drag event on week view

---
 htdocs/comm/action/index.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 0746ca13a17..4d6a032492f 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -570,7 +570,7 @@ if (!empty($conf->use_javascript_ajax)) {	// If javascript on
 		$s .= 'console.log("found parent div.dayevent with id = "+newval);'."\n";
 		$s .= 'var frm=jQuery("#searchFormList");'."\n";
 		$s .= 'var newurl = ui.item.find("a.cal_event").attr("href");'."\n";
-		$s .= 'console.log(newurl);'."\n";
+		$s .= 'console.log("Found url on href of a.cal_event"+newurl+", we submit form with actionmove=mupdate");'."\n";
 		$s .= 'frm.attr("action", newurl).children("#newdate").val(newval);frm.submit();}'."\n";
 		$s .= '});'."\n";
 	}
@@ -1393,7 +1393,7 @@ if (empty($mode) || $mode == 'show_month') {      // View by month
 	print '</div>';
 
 	print '<div class="div-table-responsive-no-min sectioncalendarbymonth maxscreenheightless300">';
-	print '<table width="100%" class="noborder nocellnopadd cal_pannel cal_month">';
+	print '<table class="centpercent noborder nocellnopadd cal_pannel cal_month">';
 	print ' <tr class="liste_titre">';
 	// Column title of weeks numbers
 	echo '  <td class="center">#</td>';
@@ -1482,7 +1482,7 @@ if (empty($mode) || $mode == 'show_month') {      // View by month
 	print '</div>';
 
 	print '<input type="hidden" name="actionmove" value="mupdate">';
-	print '<input type="hidden" name="backtopage" value="'.dol_escape_htmltag($_SERVER['PHP_SELF']).'?'.dol_escape_htmltag($_SERVER['QUERY_STRING']).'">';
+	print '<input type="hidden" name="backtopage" value="'.dol_escape_htmltag($_SERVER['PHP_SELF']).'?mode=show_month&'.dol_escape_htmltag($_SERVER['QUERY_STRING']).'">';
 	print '<input type="hidden" name="newdate" id="newdate">';
 } elseif ($mode == 'show_week') {
 	// View by week
@@ -1502,7 +1502,7 @@ if (empty($mode) || $mode == 'show_month') {      // View by month
 	print '</div></div>';
 
 	print '<div class="div-table-responsive-no-min sectioncalendarbyweek maxscreenheightless300">';
-	print '<table width="100%" class="noborder nocellnopadd cal_pannel cal_month">';
+	print '<table class="centpercent noborder nocellnopadd cal_pannel cal_month">';
 	print ' <tr class="liste_titre">';
 	$i = 0;
 	while ($i < 7) {
@@ -1544,10 +1544,9 @@ if (empty($mode) || $mode == 'show_month') {      // View by month
 	print '</div>';
 
 	echo '<input type="hidden" name="actionmove" value="mupdate">';
-	echo '<input type="hidden" name="backtopage" value="'.dol_escape_htmltag($_SERVER['PHP_SELF']).'?'.dol_escape_htmltag($_SERVER['QUERY_STRING']).'">';
+	echo '<input type="hidden" name="backtopage" value="'.dol_escape_htmltag($_SERVER['PHP_SELF']).'?mode=show_week&'.dol_escape_htmltag($_SERVER['QUERY_STRING']).'">';
 	echo '<input type="hidden" name="newdate" id="newdate">';
-} else // View by day
-{
+} else { // View by day
 	$newparam = $param; // newparam is for birthday links
 	$newparam = preg_replace('/mode=show_month&?/i', '', $newparam);
 	$newparam = preg_replace('/mode=show_week&?/i', '', $newparam);

From b5de1323437c434153ae2874be6a6b06fde2541f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 18 Jan 2022 00:22:25 +0100
Subject: [PATCH 149/316] Fix responsive

---
 htdocs/product/stock/replenish.php       |  2 +-
 htdocs/product/stock/replenishorders.php | 20 +++++++++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index 695e4356582..23e93aba785 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -623,7 +623,7 @@ if (empty($reshook)) {
 }
 
 print '<div class="inline-block valignmiddle">';
-print '<input type="submit" class="button" name="valid" value="'.$langs->trans('ToFilter').'">';
+print '<input type="submit" class="button small" name="valid" value="'.$langs->trans('ToFilter').'">';
 print '</div>';
 
 print '</form>';
diff --git a/htdocs/product/stock/replenishorders.php b/htdocs/product/stock/replenishorders.php
index 8c2a218b40c..1eba8556753 100644
--- a/htdocs/product/stock/replenishorders.php
+++ b/htdocs/product/stock/replenishorders.php
@@ -37,11 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 // Load translation files required by the page
 $langs->loadLangs(array('products', 'stocks', 'orders'));
 
-// Security check
-if ($user->socid) {
-	$socid = $user->socid;
-}
-$result = restrictedArea($user, 'produit|service');
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'replenishorders'; // To manage different context of search
 
 $sall = GETPOST('search_all', 'alphanohtml');
 $sref = GETPOST('search_ref', 'alpha');
@@ -70,6 +66,12 @@ if ($page < 0) {
 }
 $offset = $limit * $page;
 
+// Security check
+if ($user->socid) {
+	$socid = $user->socid;
+}
+$result = restrictedArea($user, 'produit|service');
+
 
 /*
  * Actions
@@ -171,9 +173,10 @@ if ($resql) {
 	$num = $db->num_rows($resql);
 	$i = 0;
 
-	print '<span class="opacitymedium">'.$langs->trans("ReplenishmentOrdersDesc").'</span><br><br>';
+	print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
 
-	print '<form action="'.$_SERVER["PHP_SELF"].'" method="GET">';
+	print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ReplenishmentOrdersDesc").'</span><br class="hideonsmartphone">';
 
 	print_barre_liste('', $page, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', $num, 0, '');
 
@@ -209,6 +212,7 @@ if ($resql) {
 		$param .= '&optioncss='.urlencode($optioncss);
 	}
 
+	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder centpercent">';
 
 	print '<tr class="liste_titre_filter">';
@@ -347,6 +351,8 @@ if ($resql) {
 		$i++;
 	}
 	print '</table>';
+	print '</div>';
+
 	print '</form>';
 
 	$db->free($resql);

From 08009bcec50dee3665e805145418750540cab400 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Tue, 18 Jan 2022 10:06:11 +0100
Subject: [PATCH 150/316] FIX avoid warning

---
 htdocs/core/class/commonobject.class.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 029ac6cbfc1..39dc97cf930 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -1215,17 +1215,20 @@ abstract class CommonObject
 	public function delete_linked_contact($source = '', $code = '')
 	{
 		// phpcs:enable
+		$listId = null;
 		$temp = array();
 		$typeContact = $this->liste_type_contact($source, '', 0, 0, $code);
 
-		foreach ($typeContact as $key => $value) {
-			array_push($temp, $key);
+		if (!empty($typeContact)) {
+			foreach ($typeContact as $key => $value) {
+				array_push($temp, $key);
+			}
+			$listId = implode(",", $temp);
 		}
-		$listId = implode(",", $temp);
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_contact";
 		$sql .= " WHERE element_id = ".((int) $this->id);
-		if ($listId) {
+		if (!empty($listId)) {
 			$sql .= " AND fk_c_type_contact IN (".$this->db->sanitize($listId).")";
 		}
 

From 255d8ba7537d5920834533348a92313be0eddda0 Mon Sep 17 00:00:00 2001
From: Gauthier PC portable 024 <gauthier.verdol@atm-consulting.fr>
Date: Tue, 18 Jan 2022 10:59:10 +0100
Subject: [PATCH 151/316] FIX : rankorder + vacant positions

---
 htdocs/hrm/class/position.class.php                  | 2 +-
 htdocs/hrm/skill_card.php                            | 6 +++---
 htdocs/install/mysql/migration/14.0.0-15.0.0.sql     | 2 +-
 htdocs/install/mysql/tables/llx_hrm_job_user-hrm.sql | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/hrm/class/position.class.php b/htdocs/hrm/class/position.class.php
index 26298c31aa7..bd31311f4bf 100644
--- a/htdocs/hrm/class/position.class.php
+++ b/htdocs/hrm/class/position.class.php
@@ -109,7 +109,7 @@ class Position extends CommonObject
 		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>500, 'notnull'=>1, 'visible'=>-2,),
 		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>'1', 'position'=>501, 'notnull'=>0, 'visible'=>-2,),
 		'fk_contrat' => array('type'=>'integer:Contrat:contrat/class/contrat.class.php', 'label'=>'fk_contrat', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>0,),
-		'fk_user' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'Employee', 'enabled'=>'1', 'position'=>55, 'notnull'=>1, 'visible'=>1,),
+		'fk_user' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'Employee', 'enabled'=>'1', 'position'=>55, 'notnull'=>0, 'visible'=>1,),
 		'fk_job' => array('type'=>'integer:Job:/hrm/class/job.class.php', 'label'=>'Job', 'enabled'=>'1', 'position'=>56, 'notnull'=>1, 'visible'=>1,),
 		'date_start' => array('type'=>'date', 'label'=>'DateStart', 'enabled'=>'1', 'position'=>51, 'notnull'=>1, 'visible'=>1,),
 		'date_end' => array('type'=>'date', 'label'=>'DateEnd', 'enabled'=>'1', 'position'=>52, 'notnull'=>0, 'visible'=>1,),
diff --git a/htdocs/hrm/skill_card.php b/htdocs/hrm/skill_card.php
index 6fa601249db..a06cf40952a 100644
--- a/htdocs/hrm/skill_card.php
+++ b/htdocs/hrm/skill_card.php
@@ -264,7 +264,7 @@ if (($id || $ref) && $action == 'edit') {
 	if (is_array($SkilldetRecords) && count($SkilldetRecords) > 0) {
 		print '<table>';
 		foreach ($SkilldetRecords as $sk) {
-			if ($sk->rank > $MaxNumberSkill) {
+			if ($sk->rankorder > $MaxNumberSkill) {
 				continue;
 			}
 
@@ -291,7 +291,7 @@ if (($id || $ref) && $action == 'edit') {
 				//              if (!empty($val['help'])) {
 				//                  print $form->textwithpicto($langs->trans($val['label']), $langs->trans($val['help']));
 				//              } else {
-					print $langs->trans($val['label']).'&nbsp;'.$langs->trans('rank').'&nbsp;'.$sk->rank;
+					print $langs->trans($val['label']).'&nbsp;'.$langs->trans('rank').'&nbsp;'.$sk->rankorder;
 				//              }
 				print '</td>';
 				print '<td class="valuefieldcreate">';
@@ -696,7 +696,7 @@ if ($action != "create" && $action != "edit") {
 			break; // Should not happen
 		}
 
-		if ($obj->rank > $MaxNumberSkill) {
+		if ($obj->rankorder > $MaxNumberSkill) {
 			continue;
 		}
 
diff --git a/htdocs/install/mysql/migration/14.0.0-15.0.0.sql b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
index e60208cf56d..ae5625cabbb 100644
--- a/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
+++ b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
@@ -289,7 +289,7 @@ CREATE TABLE llx_hrm_job_user(
     date_creation datetime NOT NULL,
     tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     fk_contrat integer,
-    fk_user integer NOT NULL,
+    fk_user integer,
     fk_job integer NOT NULL,
     date_start date,
     date_end date,
diff --git a/htdocs/install/mysql/tables/llx_hrm_job_user-hrm.sql b/htdocs/install/mysql/tables/llx_hrm_job_user-hrm.sql
index 33906d1607f..4e10bf64bf8 100644
--- a/htdocs/install/mysql/tables/llx_hrm_job_user-hrm.sql
+++ b/htdocs/install/mysql/tables/llx_hrm_job_user-hrm.sql
@@ -23,7 +23,7 @@ CREATE TABLE llx_hrm_job_user(
 	date_creation datetime NOT NULL,
 	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	fk_contrat integer,
-	fk_user integer NOT NULL,
+	fk_user integer,
 	fk_job integer NOT NULL,
 	date_start datetime,
 	date_end datetime,

From f91504b9c189284f83520738fd1f567643b11e5e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 18 Jan 2022 12:16:13 +0100
Subject: [PATCH 152/316] Add property

---
 htdocs/core/db/DoliDB.class.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php
index daa5f657549..fb7f432e9f4 100644
--- a/htdocs/core/db/DoliDB.class.php
+++ b/htdocs/core/db/DoliDB.class.php
@@ -62,6 +62,9 @@ abstract class DoliDB implements Database
 	/** @var string Last error number. For example: 'DB_ERROR_RECORD_ALREADY_EXISTS', '12345', ... */
 	public $lasterrno;
 
+	/** @var string If we need to set a prefix specific to the database so it can be reused instead of MAIN_DB_PREFIX when defined to forge requests */
+	public $prefix_db;
+
 	/** @var bool Status */
 	public $ok;
 	/** @var string */

From 874bbca8810cc009becbdfa49546f9ebf4e4802d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 18 Jan 2022 12:24:19 +0100
Subject: [PATCH 153/316] Doc

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

diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php
index fb7f432e9f4..fdbb755637a 100644
--- a/htdocs/core/db/DoliDB.class.php
+++ b/htdocs/core/db/DoliDB.class.php
@@ -62,7 +62,7 @@ abstract class DoliDB implements Database
 	/** @var string Last error number. For example: 'DB_ERROR_RECORD_ALREADY_EXISTS', '12345', ... */
 	public $lasterrno;
 
-	/** @var string If we need to set a prefix specific to the database so it can be reused instead of MAIN_DB_PREFIX when defined to forge requests */
+	/** @var string If we need to set a prefix specific to the database so it can be reused (when defined instead of MAIN_DB_PREFIX) to forge requests */
 	public $prefix_db;
 
 	/** @var bool Status */

From 62882fd66d458d7367c22685a7f89d5b109f29f4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 18 Jan 2022 13:16:59 +0100
Subject: [PATCH 154/316] Migration 14 - 15

---
 .travis.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index b48a3667bb0..ddeefaab256 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -57,7 +57,7 @@ jobs:
       php: nightly 
       env: DB=mysql
     - stage: PHP Dev
-      if: type = push AND branch = 14.0
+      if: type = push AND branch = 15.0
       php: nightly 
       env: DB=mysql
 
@@ -411,6 +411,9 @@ script:
   php upgrade.php 13.0.0 14.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade13001400.log
   php upgrade2.php 13.0.0 14.0.0 > $TRAVIS_BUILD_DIR/upgrade13001400-2.log
   php step5.php 13.0.0 14.0.0 > $TRAVIS_BUILD_DIR/upgrade13001400-3.log
+  php upgrade.php 14.0.0 15.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade14001500.log
+  php upgrade2.php 14.0.0 15.0.0 > $TRAVIS_BUILD_DIR/upgrade14001500-2.log
+  php step5.php 14.0.0 15.0.0 > $TRAVIS_BUILD_DIR/upgrade14001500-3.log
   ls -alrt $TRAVIS_BUILD_DIR/
 
 - |

From 6276bb77ad9f1cba47a79fcb3a718ecfc030fe17 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 18 Jan 2022 13:15:40 +0100
Subject: [PATCH 155/316] Prepare v16

---
 .travis.yml                                   |  8 +++-
 .../install/mysql/migration/15.0.0-16.0.0.sql | 41 +++++++++++++++++++
 2 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 htdocs/install/mysql/migration/15.0.0-16.0.0.sql

diff --git a/.travis.yml b/.travis.yml
index b48a3667bb0..fabd7448acf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -57,7 +57,7 @@ jobs:
       php: nightly 
       env: DB=mysql
     - stage: PHP Dev
-      if: type = push AND branch = 14.0
+      if: type = push AND branch = 15.0
       php: nightly 
       env: DB=mysql
 
@@ -411,6 +411,12 @@ script:
   php upgrade.php 13.0.0 14.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade13001400.log
   php upgrade2.php 13.0.0 14.0.0 > $TRAVIS_BUILD_DIR/upgrade13001400-2.log
   php step5.php 13.0.0 14.0.0 > $TRAVIS_BUILD_DIR/upgrade13001400-3.log
+  php upgrade.php 14.0.0 15.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade14001500.log
+  php upgrade2.php 14.0.0 15.0.0 > $TRAVIS_BUILD_DIR/upgrade14001500-2.log
+  php step5.php 14.0.0 15.0.0 > $TRAVIS_BUILD_DIR/upgrade14001500-3.log
+  php upgrade.php 15.0.0 16.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade15001600.log
+  php upgrade2.php 15.0.0 16.0.0 > $TRAVIS_BUILD_DIR/upgrade15001600-2.log
+  php step5.php 15.0.0 16.0.0 > $TRAVIS_BUILD_DIR/upgrade14001500-3.log
   ls -alrt $TRAVIS_BUILD_DIR/
 
 - |
diff --git a/htdocs/install/mysql/migration/15.0.0-16.0.0.sql b/htdocs/install/mysql/migration/15.0.0-16.0.0.sql
new file mode 100644
index 00000000000..0f223d520e5
--- /dev/null
+++ b/htdocs/install/mysql/migration/15.0.0-16.0.0.sql
@@ -0,0 +1,41 @@
+--
+-- Be carefull to requests order.
+-- This file must be loaded by calling /install/index.php page
+-- when current version is 14.0.0 or higher.
+--
+-- To restrict request to Mysql version x.y minimum use -- VMYSQLx.y
+-- To restrict request to Pgsql version x.y minimum use -- VPGSQLx.y
+-- To rename a table:       ALTER TABLE llx_table RENAME TO llx_table_new;
+-- To add a column:         ALTER TABLE llx_table ADD COLUMN newcol varchar(60) NOT NULL DEFAULT '0' AFTER existingcol;
+-- To rename a column:      ALTER TABLE llx_table CHANGE COLUMN oldname newname varchar(60);
+-- To drop a column:        ALTER TABLE llx_table DROP COLUMN oldname;
+-- To change type of field: ALTER TABLE llx_table MODIFY COLUMN name varchar(60);
+-- To drop a foreign key:   ALTER TABLE llx_table DROP FOREIGN KEY fk_name;
+-- To create a unique index ALTER TABLE llx_table ADD UNIQUE INDEX uk_table_field (field);
+-- To drop an index:        -- VMYSQL4.1 DROP INDEX nomindex on llx_table;
+-- To drop an index:        -- VPGSQL8.2 DROP INDEX nomindex;
+-- To make pk to be auto increment (mysql):    -- VMYSQL4.3 ALTER TABLE llx_table CHANGE COLUMN rowid rowid INTEGER NOT NULL AUTO_INCREMENT;
+-- To make pk to be auto increment (postgres):
+-- -- VPGSQL8.2 CREATE SEQUENCE llx_table_rowid_seq OWNED BY llx_table.rowid;
+-- -- VPGSQL8.2 ALTER TABLE llx_table ADD PRIMARY KEY (rowid);
+-- -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN rowid SET DEFAULT nextval('llx_table_rowid_seq');
+-- -- VPGSQL8.2 SELECT setval('llx_table_rowid_seq', MAX(rowid)) FROM llx_table;
+-- To set a field as NULL:                     -- VMYSQL4.3 ALTER TABLE llx_table MODIFY COLUMN name varchar(60) NULL;
+-- To set a field as NULL:                     -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name DROP NOT NULL;
+-- To set a field as NOT NULL:                 -- VMYSQL4.3 ALTER TABLE llx_table MODIFY COLUMN name varchar(60) NOT NULL;
+-- To set a field as NOT NULL:                 -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET NOT NULL;
+-- To set a field as default NULL:             -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET DEFAULT NULL;
+-- Note: fields with type BLOB/TEXT can't have default value.
+-- To rebuild sequence for postgresql after insert by forcing id autoincrement fields:
+-- -- VPGSQL8.2 SELECT dol_util_rebuild_sequences();
+
+
+-- Missing in v15 or lower
+
+UPDATE llx_rights_def SET perms = 'writeall' WHERE perms = 'writeall_advance' AND module = 'holiday';
+
+
+
+-- v16
+
+

From fb6e5f03f923f97cd8c34c97147290d90c84e052 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 18 Jan 2022 13:44:52 +0100
Subject: [PATCH 156/316] Clean code and translation

---
 htdocs/comm/action/class/actioncomm.class.php | 30 +++++++++++--------
 .../action/class/actioncommreminder.class.php |  4 +--
 htdocs/comm/action/index.php                  |  6 ++--
 htdocs/comm/contact.php                       |  4 +--
 .../html.formadvtargetemailing.class.php      |  4 +--
 htdocs/comm/mailing/class/mailing.class.php   | 10 +++----
 htdocs/comm/prospect/index.php                |  2 +-
 7 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index e2adf06425f..d45aeaa0958 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -123,6 +123,12 @@ class ActionComm extends CommonObject
 	 */
 	public $label;
 
+	/**
+	 * @var string Agenda event label
+	 * @deprecated Use $label
+	 */
+	public $libelle;
+
 	/**
 	 * @var integer Date creation record (datec)
 	 */
@@ -1439,9 +1445,9 @@ class ActionComm extends CommonObject
 
 
 	/**
-	 *  Return label of status
+	 *  Return the label of the status
 	 *
-	 *  @param	int		$mode           0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 *  @param  int		$mode           0=Long label, 1=Short label, 2=Picto+Short label, 3=Picto, 4=Picto+Short label, 5=Short label+Picto, 6=Picto+Long label, 7=Very short label+Picto
 	 *  @param  int		$hidenastatus   1=Show nothing if status is "Not applicable"
 	 *  @return string          		String with status
 	 */
@@ -1628,36 +1634,34 @@ class ActionComm extends CommonObject
 		}
 
 		if ($withpicto == 2) {
-			$libelle = $label;
 			if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
-				$libelle = $labeltype;
+				$label = $labeltype;
 			}
-			$libelleshort = '';
+			$labelshort = '';
 		} else {
-			$libelle = (empty($this->libelle) ? $label : $this->libelle.(($label && $label != $this->libelle) ? ' '.$label : ''));
-			if (!empty($conf->global->AGENDA_USE_EVENT_TYPE) && empty($libelle)) {
-				$libelle = $labeltype;
+			if (!empty($conf->global->AGENDA_USE_EVENT_TYPE) && empty($label)) {
+				$label = $labeltype;
 			}
 			if ($maxlength < 0) {
-				$libelleshort = $this->ref;
+				$labelshort = $this->ref;
 			} else {
-				$libelleshort = dol_trunc($libelle, $maxlength);
+				$labelshort = dol_trunc($label, $maxlength);
 			}
 		}
 
 		if ($withpicto) {
 			if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) {	// Add code into ()
 				if ($labeltype) {
-					$libelle .= (preg_match('/'.preg_quote($labeltype, '/').'/', $libelle) ? '' : ' ('.$langs->transnoentities("Action".$this->type_code).')');
+					$label .= (preg_match('/'.preg_quote($labeltype, '/').'/', $label) ? '' : ' ('.$langs->transnoentities("Action".$this->type_code).')');
 				}
 			}
 		}
 
 		$result .= $linkstart;
 		if ($withpicto) {
-			$result .= img_object(($notooltip ? '' : $langs->trans("ShowAction").': '.$libelle), ($overwritepicto ? $overwritepicto : 'action'), (($this->type_color && $overwritepicto) ? 'style="color: #'.$this->type_color.' !important;" ' : '').($notooltip ? 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'"' : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+			$result .= img_object(($notooltip ? '' : $langs->trans("ShowAction").': '.$label), ($overwritepicto ? $overwritepicto : 'action'), (($this->type_color && $overwritepicto) ? 'style="color: #'.$this->type_color.' !important;" ' : '').($notooltip ? 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'"' : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
 		}
-		$result .= $libelleshort;
+		$result .= $labelshort;
 		$result .= $linkend;
 
 		global $action;
diff --git a/htdocs/comm/action/class/actioncommreminder.class.php b/htdocs/comm/action/class/actioncommreminder.class.php
index aa693d2e41f..ff242430b0a 100644
--- a/htdocs/comm/action/class/actioncommreminder.class.php
+++ b/htdocs/comm/action/class/actioncommreminder.class.php
@@ -205,9 +205,9 @@ class ActionCommReminder extends CommonObject
 	}
 
 	/**
-	 *  Retourne le libelle du status d'un user (actif, inactif)
+	 *  Return label of the status of a reminder
 	 *
-	 *  @param	int		$mode          0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 *  @param  int     $mode          0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
 	 *  @return	string 			       Label of status
 	 */
 	public function getLibStatut($mode = 0)
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 4d6a032492f..3b2a08a6f6e 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -837,7 +837,7 @@ if ($resql) {
 
 		$event->fk_project = $obj->fk_project;
 
-		$event->thirdparty_id = $obj->fk_soc;
+		$event->socid = $obj->fk_soc;
 		$event->contact_id = $obj->fk_contact;
 
 		// Defined date_start_in_calendar and date_end_in_calendar property
@@ -1964,7 +1964,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 						if ($event->type_code != 'ICALEVENT') {
 							$savlabel = $event->label ? $event->label : $event->libelle;
 							$event->label = $titletoshow;
-							$event->libelle = $titletoshow;
+							$event->libelle = $titletoshow;		// deprecatd
 							// Note: List of users are inside $event->userassigned. Link may be clickable depending on permissions of user.
 							$titletoshow = (($event->type_picto || $event->type_code) ? $event->getTypePicto() : '');
 							$titletoshow .= $event->getNomUrl(0, $maxnbofchar, 'cal_event cal_event_title', '', 0, 0);
@@ -1996,7 +1996,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 							print '<br>('.dol_trunc($event->icalname, $maxnbofchar).')';
 						}
 
-						$thirdparty_id = ($event->thirdparty_id > 0 ? $event->thirdparty_id : ((is_object($event->societe) && $event->societe->id > 0) ? $event->societe->id : 0));
+						$thirdparty_id = ($event->socid > 0 ? $event->socid : ((is_object($event->societe) && $event->societe->id > 0) ? $event->societe->id : 0));
 						$contact_id = ($event->contact_id > 0 ? $event->contact_id : ((is_object($event->contact) && $event->contact->id > 0) ? $event->contact->id : 0));
 
 						// If action related to company / contact
diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php
index 57a88bef157..62f57c008ba 100644
--- a/htdocs/comm/contact.php
+++ b/htdocs/comm/contact.php
@@ -157,10 +157,10 @@ if ($resql) {
 		print '<tr class="oddeven">';
 		print '<td><a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$obj->cidp.'&socid='.$obj->rowid.'">'.img_object($langs->trans("ShowContact"), "contact");
 		print '</a>&nbsp;<a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$obj->cidp.'&socid='.$obj->rowid.'">'.$obj->name.'</a></td>';
-		print "<td>$obj->firstname</TD>";
+		print '<td>'.dol_escape_htmltag($obj->firstname).'</td>';
 
 		print '<td><a href="'.$_SERVER["PHP_SELF"].'?type='.$type.'&socid='.$obj->rowid.'">'.img_object($langs->trans("ShowCompany"), "company").'</a>&nbsp;';
-		print "<a href=\"".$urlfiche."?socid=".$obj->rowid."\">$obj->name</a></td>\n";
+		print '<a href="'.$urlfiche."?socid=".$obj->rowid.'">'.$obj->name."</a></td>\n";
 
 		print '<td>'.dol_print_phone($obj->email, $obj->cidp, $obj->rowid, 'AC_EMAIL').'</td>';
 
diff --git a/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php b/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
index cfdca4a1fc2..f4295fa6583 100644
--- a/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
+++ b/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
@@ -230,7 +230,7 @@ class FormAdvTargetEmailing extends Form
 			$InfoFieldList = explode(":", $param_list [0]);
 
 			// 0 1 : tableName
-			// 1 2 : label field name Nom du champ contenant le libelle
+			// 1 2 : label field name 	Name of field that contains the label
 			// 2 3 : key fields name (if differ of rowid)
 			// 3 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value
 
@@ -304,7 +304,7 @@ class FormAdvTargetEmailing extends Form
 			if ($num) {
 				while ($i < $num) {
 					$obj = $this->db->fetch_object($resql);
-					// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
+					// If a translation exists, we use it, else we use the default label
 					$label = ($langs->trans("Civility".$obj->code) != "Civility".$obj->code ? $langs->trans("Civility".$obj->code) : ($obj->civilite != '-' ? $obj->civilite : ''));
 
 					$options_array[$obj->code] = $label;
diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php
index cb900f7ac7b..8050b85f180 100644
--- a/htdocs/comm/mailing/class/mailing.class.php
+++ b/htdocs/comm/mailing/class/mailing.class.php
@@ -754,7 +754,7 @@ class Mailing extends CommonObject
 	/**
 	 *  Return label of status of emailing (draft, validated, ...)
 	 *
-	 *  @param	int		$mode          	0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long
+	 *  @param  int		$mode           0=Long label, 1=Short label, 2=Picto+Short label, 3=Picto, 4=Picto+Short label, 5=Short label+Picto, 6=Picto+Long label, 7=Very short label+Picto
 	 *  @return string        			Label
 	 */
 	public function getLibStatut($mode = 0)
@@ -764,10 +764,10 @@ class Mailing extends CommonObject
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *  Renvoi le libelle d'un statut donne
+	 *  Return the label of a given status
 	 *
 	 *  @param	int		$status        	Id status
-	 *  @param  int		$mode          	0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 *  @param  int		$mode           0=Long label, 1=Short label, 2=Picto+Short label, 3=Picto, 4=Picto+Short label, 5=Short label+Picto, 6=Picto+Long label, 7=Very short label+Picto
 	 *  @return string        			Label
 	 */
 	public function LibStatut($status, $mode = 0)
@@ -792,11 +792,11 @@ class Mailing extends CommonObject
 
 
 	/**
-	 *  Renvoi le libelle d'un statut donne
+	 *  Return the label of a given status  of a recipient
 	 *  TODO Add class mailin_target.class.php
 	 *
 	 *  @param	int		$status        	Id status
-	 *  @param  int		$mode          	0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 *  @param  int		$mode           0=Long label, 1=Short label, 2=Picto+Short label, 3=Picto, 4=Picto+Short label, 5=Short label+Picto, 6=Picto+Long label, 7=Very short label+Picto
 	 *  @param	string	$desc			Desc error
 	 *  @return string        			Label
 	 */
diff --git a/htdocs/comm/prospect/index.php b/htdocs/comm/prospect/index.php
index 1e1caa796b5..0bcf2662a44 100644
--- a/htdocs/comm/prospect/index.php
+++ b/htdocs/comm/prospect/index.php
@@ -77,7 +77,7 @@ if (!empty($conf->propal->enabled)) {
  *
  */
 
-$sql = "SELECT count(*) as cc, st.libelle, st.picto, st.id";
+$sql = "SELECT count(*) as cc, st.libelle as stcomm, st.picto, st.id";
 $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 $sql .= ", ".MAIN_DB_PREFIX."c_stcomm as st ";
 if (empty($user->rights->societe->client->voir) && !$socid) {

From ebc3ef2f37ad22b4a5e595b445011294c7be0b7b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 18 Jan 2022 13:52:09 +0100
Subject: [PATCH 157/316] Removed no more used property

---
 htdocs/comm/action/class/actioncomm.class.php | 25 +++++++++++++++----
 htdocs/comm/action/index.php                  | 11 --------
 htdocs/comm/action/pertype.php                |  4 ---
 htdocs/comm/action/peruser.php                |  4 ---
 4 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index d45aeaa0958..baa5bbddf0d 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -134,11 +134,6 @@ class ActionComm extends CommonObject
 	 */
 	public $datec;
 
-	/**
-	 * @var integer Date end record (datef)
-	 */
-	public $datef;
-
 	/**
 	 * @var integer Duration (duree)
 	 */
@@ -178,6 +173,21 @@ class ActionComm extends CommonObject
 	 */
 	public $datep;
 
+	/**
+	 * @var integer Date action end (datef)
+	 */
+	public $datef;
+
+	/**
+	 * @var integer This is date start action (datep) but modified to not be outside calendar view.
+	 */
+	public $date_start_in_calendar;
+
+	/**
+	 * @var integer This is date end action (datef) but modified to not be outside calendar view.
+	 */
+	public $date_end_in_calendar;
+
 	/**
 	 * @var integer Date action end (datep2)
 	 */
@@ -194,6 +204,11 @@ class ActionComm extends CommonObject
 	 */
 	public $fulldayevent = 0;
 
+	/**
+	 * @var int 1=???
+	 */
+	public $ponctuel;
+
 	/**
 	 * @var integer Percentage
 	 */
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 3b2a08a6f6e..d3538c6a2c9 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -848,10 +848,6 @@ if ($resql) {
 		} else {
 			$event->date_end_in_calendar = $event->datep;
 		}
-		// Define ponctual property
-		if ($event->date_start_in_calendar == $event->date_end_in_calendar) {
-			$event->ponctuel = 1;
-		}
 
 		// Check values
 		if ($event->date_end_in_calendar < $firstdaytoshow || $event->date_start_in_calendar >= $lastdaytoshow)	{
@@ -945,7 +941,6 @@ if ($showbirthday) {
 
 			$event->date_start_in_calendar = $db->jdate($event->datep);
 			$event->date_end_in_calendar = $db->jdate($event->datef);
-			$event->ponctuel = 0;
 
 			// Add an entry in eventarray for each day
 			$daycursor = $event->datep;
@@ -1288,12 +1283,6 @@ if (count($listofextcals)) {
 						$event->date_end_in_calendar = $event->datep;
 					}
 
-					// Define ponctual property
-					if ($event->date_start_in_calendar == $event->date_end_in_calendar) {
-						$event->ponctuel = 1;
-						//print 'x'.$datestart.'-'.$dateend;exit;
-					}
-
 					// Add event into $eventarray if date range are ok.
 					if ($event->date_end_in_calendar < $firstdaytoshow || $event->date_start_in_calendar >= $lastdaytoshow) {
 						//print 'x'.$datestart.'-'.$dateend;exit;
diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php
index 43d55424cd3..eee8baa2b20 100644
--- a/htdocs/comm/action/pertype.php
+++ b/htdocs/comm/action/pertype.php
@@ -683,10 +683,6 @@ if ($resql) {
 				$event->date_end_in_calendar = $datep;
 			}
 		}
-		// Define ponctual property
-		if ($event->date_start_in_calendar == $event->date_end_in_calendar) {
-			$event->ponctuel = 1;
-		}
 
 		// Check values
 		if ($event->date_end_in_calendar < $firstdaytoshow ||
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index f74974a26d9..957ccd6e361 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -711,10 +711,6 @@ if ($resql) {
 				$event->date_end_in_calendar = $datep;
 			}
 		}
-		// Define ponctual property
-		if ($event->date_start_in_calendar == $event->date_end_in_calendar) {
-			$event->ponctuel = 1;
-		}
 
 		// Check values
 		if ($event->date_end_in_calendar < $firstdaytoshow ||

From 1087ddb22fb1e0001f038510e54a1b19a632ca00 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 18 Jan 2022 14:00:38 +0100
Subject: [PATCH 158/316] Clean code

---
 htdocs/comm/action/class/actioncomm.class.php | 36 ++++++-------------
 1 file changed, 10 insertions(+), 26 deletions(-)

diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index baa5bbddf0d..9ab13962bfa 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -240,8 +240,7 @@ class ActionComm extends CommonObject
 	public $userownerid;
 
 	/**
-	 * @var int Id of user done (deprecated)
-	 * @deprecated
+	 * @var int Id of user that has done the event. Used only if AGENDA_ENABLE_DONEBY is set.
 	 */
 	public $userdoneid;
 
@@ -260,20 +259,6 @@ class ActionComm extends CommonObject
 	 */
 	public $reminders = array();
 
-	/**
-	 * @var User Object user of owner
-	 * @deprecated
-	 * @see $userownerid
-	 */
-	public $usertodo;
-
-	/**
-	 * @var User Object user that did action
-	 * @deprecated
-	 * @see $userdoneid
-	 */
-	public $userdone;
-
 	/**
 	 * @var int thirdparty id linked to action
 	 */
@@ -848,18 +833,17 @@ class ActionComm extends CommonObject
 				$this->usermodid = $obj->fk_user_mod;
 
 				if (!is_object($this->author)) {
-					$this->author = new stdClass(); // To avoid warning
+					$this->author = new User($this->db); // To avoid warning
 				}
 				$this->author->id = $obj->fk_user_author; // deprecated
 				$this->author->firstname = $obj->firstname; // deprecated
 				$this->author->lastname = $obj->lastname; // deprecated
 				if (!is_object($this->usermod)) {
-					$this->usermod = new stdClass(); // To avoid warning
+					$this->usermod = new User($this->db); // To avoid warning
 				}
 				$this->usermod->id = $obj->fk_user_mod; // deprecated
 
 				$this->userownerid = $obj->fk_user_action;
-				$this->userdoneid = $obj->fk_user_done;
 				$this->priority				= $obj->priority;
 				$this->fulldayevent			= $obj->fulldayevent;
 				$this->location				= $obj->location;
@@ -1151,18 +1135,18 @@ class ActionComm extends CommonObject
 		$sql .= ", datep2 = ".(strval($this->datef) != '' ? "'".$this->db->idate($this->datef)."'" : 'null');
 		$sql .= ", durationp = ".(isset($this->durationp) && $this->durationp >= 0 && $this->durationp != '' ? "'".$this->db->escape($this->durationp)."'" : "null"); // deprecated
 		$sql .= ", note = '".$this->db->escape($this->note_private)."'";
-		$sql .= ", fk_project =".($this->fk_project > 0 ? $this->fk_project : "null");
-		$sql .= ", fk_soc =".($socid > 0 ? $socid : "null");
-		$sql .= ", fk_contact =".($contactid > 0 ? $contactid : "null");
+		$sql .= ", fk_project =".($this->fk_project > 0 ? ((int) $this->fk_project) : "null");
+		$sql .= ", fk_soc =".($socid > 0 ? ((int) $socid) : "null");
+		$sql .= ", fk_contact =".($contactid > 0 ? ((int) $contactid) : "null");
 		$sql .= ", priority = '".$this->db->escape($this->priority)."'";
 		$sql .= ", fulldayevent = '".$this->db->escape($this->fulldayevent)."'";
 		$sql .= ", location = ".($this->location ? "'".$this->db->escape($this->location)."'" : "null");
 		$sql .= ", transparency = '".$this->db->escape($this->transparency)."'";
-		$sql .= ", fk_user_mod = ".$user->id;
-		$sql .= ", fk_user_action = ".($userownerid > 0 ? "'".$this->db->escape($userownerid)."'" : "null");
-		$sql .= ", fk_user_done = ".($userdoneid > 0 ? "'".$this->db->escape($userdoneid)."'" : "null");
+		$sql .= ", fk_user_mod = ".((int) $user->id);
+		$sql .= ", fk_user_action = ".($userownerid > 0 ? ((int) $userownerid) : "null");
+		$sql .= ", fk_user_done = ".($userdoneid > 0 ? ((int) $userdoneid) : "null");
 		if (!empty($this->fk_element)) {
-			$sql .= ", fk_element=".($this->fk_element ? $this->db->escape($this->fk_element) : "null");
+			$sql .= ", fk_element=".($this->fk_element ? ((int) $this->fk_element) : "null");
 		}
 		if (!empty($this->elementtype)) {
 			$sql .= ", elementtype=".($this->elementtype ? "'".$this->db->escape($this->elementtype)."'" : "null");

From 01aa2deae62efbafb8b234aed19875be8bcec3de Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 18 Jan 2022 15:27:43 +0100
Subject: [PATCH 159/316] Fix bad include

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

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index f62d1d71585..2e377a3571f 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1585,7 +1585,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 					}
 					// cssfile is a relative path
 					$urlforcss = dol_buildpath($cssfile, 1);
-					if ($urlforcss) {
+					if ($urlforcss && $urlforcss != '/') {
 						print '<!-- Includes CSS added by module '.$modcss.' -->'."\n".'<link rel="stylesheet" type="text/css" href="'.$urlforcss;
 						// We add params only if page is not static, because some web server setup does not return content type text/css if url has parameters, so browser cache is not used.
 						if (!preg_match('/\.css$/i', $cssfile)) {
@@ -1734,7 +1734,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 					foreach ($filesjs as $jsfile) {
 						// jsfile is a relative path
 						$urlforjs = dol_buildpath($jsfile, 1);
-						if ($urlforjs) {
+						if ($urlforjs && $urlforjs != '/') {
 							print '<!-- Include JS added by module '.$modjs.'-->'."\n".'<script src="'.$urlforjs.((strpos($jsfile, '?') === false) ? '?' : '&amp;').'lang='.$langs->defaultlang.'"></script>'."\n";
 						} else {
 							dol_syslog("Warning: module ".$modjs." declared a js path file for a file we can't find.", LOG_WARNING);

From 75eb25658966599f3f14a8484c4db20eb65be381 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 18 Jan 2022 16:06:27 +0100
Subject: [PATCH 160/316] Fix perm to delete a draft supplier order

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

diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 5f06b2f5559..915354b50b6 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -127,7 +127,7 @@ if ($id > 0 || !empty($ref)) {
 // Common permissions
 $usercanread	= ($user->rights->fournisseur->commande->lire || $user->rights->supplier_order->lire);
 $usercancreate	= ($user->rights->fournisseur->commande->creer || $user->rights->supplier_order->creer);
-$usercandelete	= ($user->rights->fournisseur->commande->supprimer || $user->rights->supplier_order->supprimer);
+$usercandelete	= (($user->rights->fournisseur->commande->supprimer || $user->rights->supplier_order->supprimer) || ($usercancreate && isset($object->statut) && $object->statut == $object::STATUS_DRAFT));
 
 // Advanced permissions
 $usercanvalidate = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($usercancreate)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->supplier_order_advance->validate)));
@@ -2538,14 +2538,14 @@ if ($action == 'create') {
 			}
 
 			// Cancel
-			if ($object->statut == 2) {
+			if ($object->statut == CommandeFournisseur::STATUS_ACCEPTED) {
 				if ($usercanorder) {
 					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=cancel">'.$langs->trans("CancelOrder").'</a>';
 				}
 			}
 
 			// Delete
-			if (!empty($usercandelete) || ($object->statut == CommandeFournisseur::STATUS_DRAFT && !empty($usercancreate))) {
+			if (!empty($usercandelete)) {
 				if ($hasreception) {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("ReceptionExist").'">'.$langs->trans("Delete").'</a>';
 				} else {

From d4adeba1fcd3d0c01eb83ef545968655d1c4aaaa Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Tue, 18 Jan 2022 16:22:41 +0100
Subject: [PATCH 161/316] FIX: origin missing for supplier order
 dispatchProduct

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

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 83b737a050e..0151af97acf 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -2012,6 +2012,8 @@ class CommandeFournisseur extends CommonOrder
 				if ($product > 0) {
 					// $price should take into account discount (except if option STOCK_EXCLUDE_DISCOUNT_FOR_PMP is on)
 					$mouv->origin = &$this;
+					$mouv->origin_type = $this->element;
+					$mouv->origin_id = $this->id;
 					$result = $mouv->reception($user, $product, $entrepot, $qty, $price, $comment, $eatby, $sellby, $batch);
 					if ($result < 0) {
 						$this->error = $mouv->error;

From 22a3b5ea78a5fa211803bcca04a1d55fee3ba909 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 18 Jan 2022 16:24:28 +0100
Subject: [PATCH 162/316] FIX deletion of supplier order when draft

---
 htdocs/fourn/commande/card.php                  | 15 ++++++++-------
 htdocs/modulebuilder/template/myobject_card.php |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 915354b50b6..a44a1be11be 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -85,13 +85,6 @@ $hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (!empty($con
 
 $datelivraison = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'), GETPOST('liv_sec', 'int'), GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int'));
 
-
-// Security check
-if ($user->socid) {
-	$socid = $user->socid;
-}
-$result = restrictedArea($user, 'fournisseur', $id, 'commande_fournisseur', 'commande');
-
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('ordersuppliercard', 'globalcard'));
 
@@ -101,6 +94,10 @@ $extrafields = new ExtraFields($db);
 // fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
 
+if ($user->socid) {
+	$socid = $user->socid;
+}
+
 // Load object
 if ($id > 0 || !empty($ref)) {
 	$ret = $object->fetch($id, $ref);
@@ -124,6 +121,10 @@ if ($id > 0 || !empty($ref)) {
 	}
 }
 
+// Security check
+$isdraft = (isset($object->statut) && ($object->statut == $object::STATUS_DRAFT) ? 1 : 0);
+$result = restrictedArea($user, 'fournisseur', $id, 'commande_fournisseur', 'commande', 'fk_soc', 'rowid', $isdraft);
+
 // Common permissions
 $usercanread	= ($user->rights->fournisseur->commande->lire || $user->rights->supplier_order->lire);
 $usercancreate	= ($user->rights->fournisseur->commande->creer || $user->rights->supplier_order->creer);
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index b074412b6b3..346e9d907e6 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -132,7 +132,7 @@ $upload_dir = $conf->mymodule->multidir_output[isset($object->entity) ? $object-
 // Security check (enable the most restrictive one)
 //if ($user->socid > 0) accessforbidden();
 //if ($user->socid > 0) $socid = $user->socid;
-//$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
+//$isdraft = (isset($object->status) && ($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
 //if (empty($conf->mymodule->enabled)) accessforbidden();
 //if (!$permissiontoread) accessforbidden();

From 6a9c9cc81aecda5e04cb58cb1ed40e74e950958c Mon Sep 17 00:00:00 2001
From: lvessiller <lvessiller@open-dsi.fr>
Date: Tue, 18 Jan 2022 16:36:50 +0100
Subject: [PATCH 163/316] NEW MAIN_SEARCH_CAT_OR_BY_DEFAULT const for search by
 category

---
 htdocs/product/list.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index a3ec599dea8..778565dd2cb 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -65,7 +65,12 @@ $search_barcode = GETPOST("search_barcode", 'alpha');
 $search_label = GETPOST("search_label", 'alpha');
 $search_type = GETPOST("search_type", 'int');
 $search_vatrate = GETPOST("search_vatrate", 'alpha');
-$searchCategoryProductOperator = (GETPOST('search_category_product_operator', 'int') ? GETPOST('search_category_product_operator', 'int') : 0);
+$searchCategoryProductOperator = 0;
+if (GETPOSTISSET('formfilteraction')) {
+	$searchCategoryProductOperator = GETPOST('search_category_product_operator', 'int');
+} elseif (!empty($conf->global->MAIN_SEARCH_CAT_OR_BY_DEFAULT)) {
+	$searchCategoryProductOperator = $conf->global->MAIN_SEARCH_CAT_OR_BY_DEFAULT;
+}
 $searchCategoryProductList = GETPOST('search_category_product_list', 'array');
 $search_tosell = GETPOST("search_tosell", 'int');
 $search_tobuy = GETPOST("search_tobuy", 'int');

From 178f7b0aceee47e063e850dd96d11115595df727 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 18 Jan 2022 18:59:03 +0100
Subject: [PATCH 164/316] CSS

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

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 3b09b210349..682c3ea5a68 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -4529,7 +4529,7 @@ div.boximport {
 
 .fieldrequired { font-weight: bold; color: var(--fieldrequiredcolor) !important; }
 
-td.widthpictotitle { width: 38px; text-align: <?php echo $left; ?>; }
+td.widthpictotitle, .table-fiche-title .widthpictotitle { width: 38px; text-align: <?php echo $left; ?>; }
 span.widthpictotitle { font-size: 1.7em; }
 table.titlemodulehelp tr td img.widthpictotitle { width: 80px; }
 
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index bfc36ea408e..7359c9f0e87 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -4464,7 +4464,7 @@ div.boximport {
 
 .fieldrequired { font-weight: bold; color: #000055; }
 
-.widthpictotitle { width: 32px; font-size: 1.4em; text-align: <?php echo $left; ?>; }
+td.widthpictotitle, .table-fiche-title .widthpictotitle { width: 32px; font-size: 1.4em; text-align: <?php echo $left; ?>; }
 table.titlemodulehelp tr td img.widthpictotitle { width: 80px; }
 
 .dolgraphtitle { margin-top: 6px; margin-bottom: 4px; }

From b3a8b5662553836421878a3edb83201bb6bfd46e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 18 Jan 2022 19:01:51 +0100
Subject: [PATCH 165/316] Fix typo

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

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 02a88e8a453..e8a64b3f72b 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -2215,4 +2215,5 @@ MissingTranslationForConfKey = Missing translation for %s
 NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
-EachTerminalHasItsOwnCounter=Each terminal use its own counter.
\ No newline at end of file
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
+FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
\ No newline at end of file

From 3eff894da1f5f681df013107c8fffca46c996339 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 18 Jan 2022 19:27:06 +0100
Subject: [PATCH 166/316] Fix css

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

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 682c3ea5a68..164fc74bc35 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -4529,7 +4529,7 @@ div.boximport {
 
 .fieldrequired { font-weight: bold; color: var(--fieldrequiredcolor) !important; }
 
-td.widthpictotitle, .table-fiche-title .widthpictotitle { width: 38px; text-align: <?php echo $left; ?>; }
+td.widthpictotitle, .table-fiche-title img.widthpictotitle { width: 38px; text-align: <?php echo $left; ?>; }
 span.widthpictotitle { font-size: 1.7em; }
 table.titlemodulehelp tr td img.widthpictotitle { width: 80px; }
 
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 7359c9f0e87..0257ca2465c 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -4464,7 +4464,7 @@ div.boximport {
 
 .fieldrequired { font-weight: bold; color: #000055; }
 
-td.widthpictotitle, .table-fiche-title .widthpictotitle { width: 32px; font-size: 1.4em; text-align: <?php echo $left; ?>; }
+td.widthpictotitle, .table-fiche-title img.widthpictotitle { width: 32px; font-size: 1.4em; text-align: <?php echo $left; ?>; }
 table.titlemodulehelp tr td img.widthpictotitle { width: 80px; }
 
 .dolgraphtitle { margin-top: 6px; margin-bottom: 4px; }

From 16ca2d68b6e70c32ae7226dcc3c6a81b9b70e379 Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Tue, 18 Jan 2022 19:31:51 +0100
Subject: [PATCH 167/316] Update llx_c_action_trigger.sql

---
 htdocs/install/mysql/data/llx_c_action_trigger.sql | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/htdocs/install/mysql/data/llx_c_action_trigger.sql b/htdocs/install/mysql/data/llx_c_action_trigger.sql
index 12eb3d7e6b3..258b56f1471 100644
--- a/htdocs/install/mysql/data/llx_c_action_trigger.sql
+++ b/htdocs/install/mysql/data/llx_c_action_trigger.sql
@@ -117,6 +117,11 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('TICKET_SENTBYMAIL','Ticket message sent by email','Executed when a message is sent from the ticket record','ticket',166);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('TICKET_DELETE','Ticket deleted','Executed when a ticket is deleted','ticket',167);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('USER_SENTBYMAIL','Email sent','Executed when an email is sent from user card','user',300);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('USER_CREATE','User created','Executed when a user is created','user',301);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('USER_MODIFY','User update','Executed when a user is updated','user',302);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('USER_DELETE','User update','Executed when a user is deleted','user',303);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('USER_NEW_PASSWORD','User update','Executed when a user is change password','user',304);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('USER_ENABLEDISABLE','User update','Executed when a user is enable or disable','user',305);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PRODUCT_MODIFY','Product or service modified','Executed when a product or sevice is modified','product',41);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_MODIFY','Member modified','Executed when a member is modified','member',23);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_MODIFY','Intervention modified','Executed when a intervention is modified','ficheinter',19);

From f093e01cec4e88c6b93f0c396db9f1493db6d29d Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Tue, 18 Jan 2022 19:34:18 +0100
Subject: [PATCH 168/316] Update 14.0.0-15.0.0.sql

---
 htdocs/install/mysql/migration/14.0.0-15.0.0.sql | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/htdocs/install/mysql/migration/14.0.0-15.0.0.sql b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
index e60208cf56d..50342bc6917 100644
--- a/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
+++ b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
@@ -484,3 +484,10 @@ ALTER TABLE llx_stock_mouvement MODIFY COLUMN origintype varchar(64);
 ALTER TABLE llx_intracommreport CHANGE COLUMN period periods varchar(32);
 
 UPDATE llx_rights_def SET perms = 'writeall' WHERE perms = 'writeall_advance' AND module = 'holiday';
+
+
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('USER_CREATE','User created','Executed when a user is created','user',301);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('USER_MODIFY','User update','Executed when a user is updated','user',302);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('USER_DELETE','User update','Executed when a user is deleted','user',303);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('USER_NEW_PASSWORD','User update','Executed when a user is change password','user',304);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('USER_ENABLEDISABLE','User update','Executed when a user is enable or disable','user',305);

From c46963410138ca70271fefa41d90ee31834510a9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 19 Jan 2022 02:01:52 +0100
Subject: [PATCH 169/316] Fix hook for emailcollector

---
 htdocs/core/class/hookmanager.class.php              | 2 +-
 htdocs/emailcollector/class/emailcollector.class.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index d1b1e08710e..a40ec3e30c3 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -111,7 +111,7 @@ class HookManager
 
 				if (in_array($context, $arrayhooks) || in_array('all', $arrayhooks)) {    // We instantiate action class only if initialized hook is handled by module
 					// Include actions class overwriting hooks
-					if (empty($this->hooks[$context][$module]) || !is_object($this->hooks[$context][$module])) {	// If set to an object value, class was already loaded
+					if (empty($this->hooks[$context][$module]) || !is_object($this->hooks[$context][$module])) {	// If set to an object value, class was already loaded so we do nothing.
 						$path = '/'.$module.'/class/';
 						$actionfile = 'actions_'.$module.'.class.php';
 
diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index 913b7b08a55..ff29e56b1e7 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -2365,7 +2365,7 @@ class EmailCollector extends CommonObject
 						// this code action is hook..... for support this call
 						global $hookmanager;
 
-						if (!is_object($hookmanager)) {
+						if (is_object($hookmanager)) {
 							$hookmanager->initHooks(array('emailcollectorcard'));
 						}
 

From 0a99e7c82a0c94681ddb0999e7cf1fba3408d3d2 Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Wed, 19 Jan 2022 10:51:31 +0100
Subject: [PATCH 170/316] Update functions.lib.php

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 28a20ad6b09..4bbf75a27bd 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -6951,6 +6951,10 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 				'__USER_ID__' => (string) $user->id,
 				'__USER_LOGIN__' => (string) $user->login,
 				'__USER_EMAIL__' => (string) $user->email,
+				'__USER_PHONE__' => (string) $user->office_phone,
+				'__USER_PHONEPRO__' => (string) $user->user_mobile,
+				'__USER_PHONEMOBILE__' => (string) $user->personal_mobile,
+				'__USER_FAX__' => (string) $user->office_fax,
 				'__USER_LASTNAME__' => (string) $user->lastname,
 				'__USER_FIRSTNAME__' => (string) $user->firstname,
 				'__USER_FULLNAME__' => (string) $user->getFullName($outputlangs),

From 5f4c53f8240d6964e0373f31b7a9ea66255b6dc5 Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Wed, 19 Jan 2022 11:37:38 +0100
Subject: [PATCH 171/316] Update functions.lib.php

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 4bbf75a27bd..1e7099d6bbc 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -17,6 +17,7 @@
  * Copyright (C) 2019       Thibault Foucart            <support@ptibogxiv.net>
  * Copyright (C) 2020       Open-Dsi         			<support@open-dsi.fr>
  * Copyright (C) 2021       Gauthier VERDOL         	<gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2022       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

From aa2b244bf399d6a56f1bff4c03772224e888b39e Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Wed, 19 Jan 2022 13:31:51 +0100
Subject: [PATCH 172/316] fix wordpress indent

---
 .../OAuth/OAuth2/Service/WordPress.php        | 153 ++++++++++--------
 1 file changed, 83 insertions(+), 70 deletions(-)

diff --git a/htdocs/includes/OAuth/OAuth2/Service/WordPress.php b/htdocs/includes/OAuth/OAuth2/Service/WordPress.php
index c59e90c605f..79a13d00e2d 100755
--- a/htdocs/includes/OAuth/OAuth2/Service/WordPress.php
+++ b/htdocs/includes/OAuth/OAuth2/Service/WordPress.php
@@ -11,87 +11,100 @@ use OAuth\Common\Http\Exception\TokenResponseException;
 use OAuth\OAuth2\Service\Exception\InvalidAccessTypeException;
 use OAuth\Common\Http\Uri\Uri;
 
+/**
+ * Class For WordPress OAuth
+ */
 class WordPress extends AbstractService
 {
-    protected $accessType = 'online';
+	/**
+	 * @var string
+	 */
+	protected $accessType = 'online';
 
-    public function __construct(
-        CredentialsInterface $credentials,
-        ClientInterface $httpClient,
-        TokenStorageInterface $storage,
-        $scopes = array(),
-        UriInterface $baseApiUri = null
-    ) {
-        parent::__construct($credentials, $httpClient, $storage, $scopes, $baseApiUri, true);
+	/**
+	 * Construct
+	 *
+	 * @param CredentialsInterface $credentials credentials
+	 * @param ClientInterface $httpClient httpClient
+	 * @param TokenStorageInterface $storage storage
+	 * @param $scopes scope
+	 * @param UriInterface|null $baseApiUri baseApiUri
+	 * @throws Exception\InvalidScopeException
+	 */
+	public function __construct(CredentialsInterface $credentials, ClientInterface $httpClient, TokenStorageInterface $storage, $scopes = array(), UriInterface $baseApiUri = null)
+	{
+		parent::__construct($credentials, $httpClient, $storage, $scopes, $baseApiUri, true);
 
-        if (null === $baseApiUri) {
-            $this->baseApiUri = new Uri('https://addresse_de_votre_site_wordpress');
-        }
-    }
-/*
-    // LDR CHANGE Add approval_prompt to force the prompt if value is set to 'force' so it force return of a "refresh token" in addition to "standard token"
-    public $approvalPrompt='auto';
-    public function setApprouvalPrompt($prompt)
-    {
-        if (!in_array($prompt, array('auto', 'force'), true)) {
-            // @todo Maybe could we rename this exception
-            throw new InvalidAccessTypeException('Invalid approuvalPrompt, expected either auto or force.');
-        }
-        $this->approvalPrompt = $prompt;
-    }*/
-    
-    /**
-     * {@inheritdoc}
-     */
-    public function getAuthorizationEndpoint()
-    {
-        return new Uri(sprintf('%s/oauth/authorize', $this->baseApiUri));
-    }
+		if (null === $baseApiUri) {
+			$this->baseApiUri = new Uri('https://addresse_de_votre_site_wordpress');
+		}
+	}
+	/*
+	// LDR CHANGE Add approval_prompt to force the prompt if value is set to 'force' so it force return of a "refresh token" in addition to "standard token"
+	public $approvalPrompt='auto';
+	public function setApprouvalPrompt($prompt)
+	{
+		if (!in_array($prompt, array('auto', 'force'), true)) {
+			// @todo Maybe could we rename this exception
+			throw new InvalidAccessTypeException('Invalid approuvalPrompt, expected either auto or force.');
+		}
+		$this->approvalPrompt = $prompt;
+	}*/
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getAccessTokenEndpoint()
-    {
-        return new Uri(sprintf('%s/oauth/token', $this->baseApiUri));
-    }
+	/**
+	 * @return Uri
+	 */
+	public function getAuthorizationEndpoint()
+	{
+		return new Uri(sprintf('%s/oauth/authorize', $this->baseApiUri));
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function getAuthorizationMethod()
-    {
-        global $conf;
-        return empty($conf->global->OAUTH_WORDPRESS_AUTHORIZATION_METHOD_QUERY_STRING) ? static::AUTHORIZATION_METHOD_HEADER_BEARER : static::AUTHORIZATION_METHOD_QUERY_STRING;
-    }
+	/**
+	 * @return Uri
+	 */
+	public function getAccessTokenEndpoint()
+	{
+		return new Uri(sprintf('%s/oauth/token', $this->baseApiUri));
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function parseAccessTokenResponse($responseBody)
-    {
-        $data = json_decode($responseBody, true);
+	/**
+	 * @return int
+	 */
+	protected function getAuthorizationMethod()
+	{
+		global $conf;
+		return empty($conf->global->OAUTH_WORDPRESS_AUTHORIZATION_METHOD_QUERY_STRING) ? static::AUTHORIZATION_METHOD_HEADER_BEARER : static::AUTHORIZATION_METHOD_QUERY_STRING;
+	}
 
-        if (null === $data || !is_array($data)) {
-            throw new TokenResponseException('Unable to parse response: "'.(isset($responseBody)?$responseBody:'NULL').'"');
-        } elseif (isset($data['error'])) {
-            throw new TokenResponseException('Error in retrieving token: "' . $data['error'] . '" : "'.$data['error_description'].'"');
-        }
+	/**
+	 * @param $responseBody responseBody
+	 * @return StdOAuth2Token
+	 * @throws TokenResponseException
+	 */
+	protected function parseAccessTokenResponse($responseBody)
+	{
+		$data = json_decode($responseBody, true);
 
-        $token = new StdOAuth2Token();
-        $token->setAccessToken($data['access_token']);
-        $token->setLifetime($data['expires_in']);
+		if (null === $data || !is_array($data)) {
+			throw new TokenResponseException('Unable to parse response: "'.(isset($responseBody)?$responseBody:'NULL').'"');
+		} elseif (isset($data['error'])) {
+			throw new TokenResponseException('Error in retrieving token: "' . $data['error'] . '" : "'.$data['error_description'].'"');
+		}
 
-        if (isset($data['refresh_token'])) {
-            $token->setRefreshToken($data['refresh_token']);
-            unset($data['refresh_token']);
-        }
+		$token = new StdOAuth2Token();
+		$token->setAccessToken($data['access_token']);
+		$token->setLifetime($data['expires_in']);
 
-        unset($data['access_token']);
-        unset($data['expires_in']);
+		if (isset($data['refresh_token'])) {
+			$token->setRefreshToken($data['refresh_token']);
+			unset($data['refresh_token']);
+		}
 
-        $token->setExtraParams($data);
+		unset($data['access_token']);
+		unset($data['expires_in']);
 
-        return $token;
-    }
+		$token->setExtraParams($data);
+
+		return $token;
+	}
 }

From ed2ca6af79d7ac92e59dc6d8c17e6e963e8f192b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 19 Jan 2022 14:32:15 +0100
Subject: [PATCH 173/316] CSS

---
 htdocs/theme/eldy/global.inc.php           | 23 +++++++++++---
 htdocs/theme/md/btn.inc.php                |  1 +
 htdocs/theme/md/main_menu_fa_icons.inc.php |  2 +-
 htdocs/theme/md/style.css.php              | 18 ++++++++---
 htdocs/website/index.php                   | 36 +++++++++++++---------
 5 files changed, 55 insertions(+), 25 deletions(-)

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 164fc74bc35..0ffc4e84786 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -1888,7 +1888,7 @@ div.blockvmenulogo
 	margin-left: 11px;
 	margin-right: 9px;
 	padding: 0;
-	height: <?php echo $disableimages ? '20' : '35'; ?>px;
+	height: <?php echo $disableimages ? '18' : '35'; ?>px;
 	/* width: 100px; */
 	max-width: 100px;
 	vertical-align: middle;
@@ -4936,6 +4936,11 @@ tr.visible {
 /*  Module website                                                                */
 /* ============================================================================== */
 
+.websiteformtoolbar {
+	position: sticky;
+	top: <?php echo $disableimages ? '32px' : '52px'; ?>;
+}
+
 .exampleapachesetup {
 	overflow-y: auto;
 	height: 100px;
@@ -4988,7 +4993,13 @@ span[phptag] {
 	/* display: inline-block; */
 	padding-<?php echo $right; ?>: 10px;
 	vertical-align: middle;
-	/* line-height: 28px; */
+	line-height: 28px;
+}
+.websiteselectionsection {
+	font-size: 0.85em;
+}
+.websiteselection span {
+	vertical-align: middle;
 }
 .websitetools {
 	float: right;
@@ -5000,7 +5011,7 @@ span[phptag] {
 }
 .websiteinputurl {
 	display: inline-block;
-	vertical-align: top;
+	vertical-align: middle;
 	line-height: 28px;
 }
 .websiteiframenoborder {
@@ -5035,6 +5046,10 @@ span.websitebuttonsitepreviewdisabled img, a.websitebuttonsitepreviewdisabled im
 	line-height: 1em;
 }
 
+.websitebar input.bordertransp {
+	line-height: normal !important;
+}
+
 #divbodywebsite section p {
 	margin: unset;
 }
@@ -7340,7 +7355,7 @@ div.clipboardCPValue.hidewithsize {
 
 	.websiteselectionsection {
 		border-left: unset;
-		boerder-right: unset;
+		border-right: unset;
 		padding-left: 5px;
 	}
 
diff --git a/htdocs/theme/md/btn.inc.php b/htdocs/theme/md/btn.inc.php
index 17ab4d83f28..a593f6ecdbf 100644
--- a/htdocs/theme/md/btn.inc.php
+++ b/htdocs/theme/md/btn.inc.php
@@ -234,6 +234,7 @@ span.butActionNewRefused>span.fa, span.butActionNewRefused>span.fa:hover
 	background: var(--butactiondeletebg);
 	/* border: 1px solid #633; */
 	color: #633;
+	vertical-align: middle;
 }
 
 .butActionDelete:hover {
diff --git a/htdocs/theme/md/main_menu_fa_icons.inc.php b/htdocs/theme/md/main_menu_fa_icons.inc.php
index d234ff15d4a..b8f45808293 100644
--- a/htdocs/theme/md/main_menu_fa_icons.inc.php
+++ b/htdocs/theme/md/main_menu_fa_icons.inc.php
@@ -11,7 +11,7 @@
 	font-variant: normal;
 	text-rendering: auto;
 	line-height: 26px;
-	font-size: 1.5em;
+	font-size: 1.3em;
 	-webkit-font-smoothing: antialiased;
 	text-align:center;
 	text-decoration:none;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 0257ca2465c..1d794d60de1 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -3041,11 +3041,11 @@ div.blockvmenulogo
 	border-bottom: 0 !important;
 }
 .menulogocontainer {
-	margin: <?php echo $disableimages ? '0' : '6'; ?>px;
+	margin: <?php echo $disableimages ? '-1' : '6'; ?>px;
 	margin-left: 12px;
 	margin-right: 6px;
 	padding: 0;
-	height: <?php echo $disableimages ? '20' : '32'; ?>px;
+	height: <?php echo $disableimages ? '18' : '32'; ?>px;
 	/* width: 100px; */
 	max-width: 100px;
 	vertical-align: middle;
@@ -4862,6 +4862,11 @@ tr.visible {
 /*  Module website                                                                */
 /* ============================================================================== */
 
+.websiteformtoolbar {
+	position: sticky;
+	top: <?php echo $disableimages ? '36px' : '50px'; ?>;
+}
+
 .exampleapachesetup {
 	overflow-y: auto;
 	max-height: 100px;
@@ -4891,7 +4896,10 @@ span[phptag] {
 	border-bottom: 1px solid #ccc;
 	background: #eee;
 	display: inline-block;
-	padding: 4px 0 4px 0;
+	padding: 5px 5px 5px 5px;
+}
+.centpercent.websitebar {
+	width: calc(100% - 10px);
 }
 .websitebar .buttonDelete, .websitebar .button {
 	text-shadow: none;
@@ -4908,7 +4916,7 @@ span[phptag] {
 }
 .websiteselection {
 	/* display: inline-block; */
-	padding-left: 10px;
+	padding-<?php echo $right; ?>: 10px;
 	vertical-align: middle;
 }
 .websitetools {
@@ -7126,7 +7134,7 @@ div.clipboardCPValue.hidewithsize {
 
 	.websiteselectionsection {
 		border-left: unset;
-		boerder-right: unset;
+		border-right: unset;
 		padding-left: 5px;
 	}
 
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index cdadc2c3eba..af2f3a96ae1 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -2508,7 +2508,7 @@ llxHeader($moreheadcss.$moreheadjs, $langs->trans("WebsiteSetup"), $helpurl, '',
 
 print "\n";
 print '<!-- Open form for all page -->'."\n";
-print '<form action="'.$_SERVER["PHP_SELF"].($action == 'file_manager' ? '?uploadform=1': '').'" method="POST" enctype="multipart/form-data">';
+print '<form action="'.$_SERVER["PHP_SELF"].($action == 'file_manager' ? '?uploadform=1': '').'" method="POST" enctype="multipart/form-data" class="websiteformtoolbar">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 
@@ -2669,7 +2669,7 @@ if (!GETPOST('hide_websitemenu')) {
 			print ' &nbsp; ';
 
 			//print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditCss")).'" name="editcss">';
-			print '<a href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$pageid.'&action=editcss&token='.newToken().'" class="button bordertransp"'.$disabled.'>'.dol_escape_htmltag($langs->trans($conf->dol_optimize_smallscreen ? "Properties" : "EditCss")).'</a>';
+			print '<a href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$pageid.'&action=editcss&token='.newToken().'" class="button bordertransp" title="'.dol_escape_htmltag($langs->trans("EditCss")).'"'.$disabled.'><span class="fa fa-cog paddingrightonly"></span><span class="hideonsmartphone">'.dol_escape_htmltag($langs->trans("EditCss")).'</span></a>';
 
 			$importlabel = $langs->trans("ImportSite");
 			$exportlabel = $langs->trans("ExportSite");
@@ -2692,24 +2692,24 @@ if (!GETPOST('hide_websitemenu')) {
 			print '<input type="submit" class="buttonDelete bordertransp" name="deletesite" value="'.$langs->trans("Delete").'"'.($atleastonepage ? ' disabled="disabled"' : '').'>';
 
 			// Regenerate all pages
-			print '<a href="'.$_SERVER["PHP_SELF"].'?action=regeneratesite&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("RegenerateWebsiteContent")).'"><span class="fa fa-cogs"><span></a>';
+			print '<a href="'.$_SERVER["PHP_SELF"].'?action=regeneratesite&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("RegenerateWebsiteContent")).'"><span class="far fa-hdd"></span></a>';
 
 			// Generate site map
-			print '<a href="'.$_SERVER["PHP_SELF"].'?action=confirmgeneratesitemaps&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("GenerateSitemaps")).'"><span class="fa fa-sitemap"><span></a>';
+			print '<a href="'.$_SERVER["PHP_SELF"].'?action=confirmgeneratesitemaps&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("GenerateSitemaps")).'"><span class="fa fa-sitemap"></span></a>';
 
-			print '<a href="'.$_SERVER["PHP_SELF"].'?action=replacesite&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("ReplaceWebsiteContent")).'"><span class="fa fa-search"><span></a>';
+			print '<a href="'.$_SERVER["PHP_SELF"].'?action=replacesite&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("ReplaceWebsiteContent")).'"><span class="fa fa-search"></span></a>';
 		}
 
 		print '</span>';
 
 		if ($websitekey && $websitekey != '-1' && ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone' || $action == 'deletesite')) {
 			print '<span class="websiteselection">';
-			//print '<a href="'.$_SERVER["PHP_SELF"].'?action=file_manager&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("MediaFiles")).'"><span class="fa fa-image"><span></a>';
-			print dolButtonToOpenUrlInDialogPopup('file_manager', $langs->transnoentitiesnoconv("MediaFiles"), '<span class="fa fa-image"><span>', '/website/index.php?action=file_manager&website='.$website->ref, $disabled);
+			//print '<a href="'.$_SERVER["PHP_SELF"].'?action=file_manager&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("MediaFiles")).'"><span class="fa fa-image"></span></a>';
+			print dolButtonToOpenUrlInDialogPopup('file_manager', $langs->transnoentitiesnoconv("MediaFiles"), '<span class="fa fa-image"></span>', '/website/index.php?action=file_manager&website='.$website->ref, $disabled);
 
 			if (!empty($conf->categorie->enabled)) {
-				//print '<a href="'.DOL_URL_ROOT.'/categories/index.php?leftmenu=website&dol_hide_leftmenu=1&nosearch=1&type=website_page&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("Categories")).'"><span class="fa fa-tags"><span></a>';
-				print dolButtonToOpenUrlInDialogPopup('categories', $langs->transnoentitiesnoconv("Categories"), '<span class="fa fa-tags"><span>', '/categories/index.php?leftmenu=website&nosearch=1&type=website_page&website='.$website->ref, $disabled);
+				//print '<a href="'.DOL_URL_ROOT.'/categories/index.php?leftmenu=website&dol_hide_leftmenu=1&nosearch=1&type=website_page&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("Categories")).'"><span class="fa fa-tags"></span></a>';
+				print dolButtonToOpenUrlInDialogPopup('categories', $langs->transnoentitiesnoconv("Categories"), '<span class="fa fa-tags"></span>', '/categories/index.php?leftmenu=website&nosearch=1&type=website_page&website='.$website->ref, $disabled);
 			}
 
 			print '</span>';
@@ -2808,7 +2808,7 @@ if (!GETPOST('hide_websitemenu')) {
 		print '</span>';
 
 		print '<span class="websiteselection hideonsmartphoneimp">';
-		print '<a href="'.$_SERVER["PHP_SELF"].'?action=createcontainer&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("AddPage")).'"><span class="fa fa-plus-circle valignmiddle btnTitle-icon"><span></a>';
+		print '<a href="'.$_SERVER["PHP_SELF"].'?action=createcontainer&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("AddPage")).'"><span class="fa fa-plus-circle valignmiddle btnTitle-icon"></span></a>';
 		print '</span>';
 
 		//print '<span class="websiteselection">';
@@ -2846,9 +2846,10 @@ if (!GETPOST('hide_websitemenu')) {
 			print $langs->trans("New");
 		}
 
-		//print '<input type="submit" class="button" name="refreshpage" value="'.$langs->trans("Load").'"'.($atleastonepage?'':' disabled="disabled"').'>';
-		print '<input type="image" class="valignmiddle" src="'.img_picto('', 'refresh', '', 0, 1).'" name="refreshpage" value="'.$langs->trans("Load").'"'.(($atleastonepage && $action != 'editsource') ? '' : ' disabled="disabled"').'>';
 
+		print '<span class="websiteselection">';
+
+		print '<input type="image" class="valignmiddle" src="'.img_picto('', 'refresh', '', 0, 1).'" name="refreshpage" value="'.$langs->trans("Load").'"'.(($atleastonepage && $action != 'editsource') ? '' : ' disabled="disabled"').'>';
 
 		// Print nav arrows
 		$pagepreviousid = 0;
@@ -2887,6 +2888,8 @@ if (!GETPOST('hide_websitemenu')) {
 			print '<span class="valignmiddle opacitymedium">'.img_next($langs->trans("Next")).'</span>';
 		}
 
+		print '</span>';
+
 		$websitepage = new WebSitePage($db);
 		if ($pageid > 0 && ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone')) {
 			$websitepage->fetch($pageid);
@@ -2962,13 +2965,16 @@ if (!GETPOST('hide_websitemenu')) {
 					print $formconfirm;
 				}
 
+				print '<span class="websiteselection">';
+
 				print ' &nbsp; ';
 
 				//print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditPageMeta")).'" name="editmeta">';
-				print '<a href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$pageid.'&action=editmeta&token='.newToken().'" class="button bordertransp"'.$disabled.'>'.dol_escape_htmltag($langs->trans($conf->dol_optimize_smallscreen ? "Properties" : "EditPageMeta")).'</a>';
+				print '<a href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$pageid.'&action=editmeta&token='.newToken().'" class="button bordertransp" title="'.dol_escape_htmltag($langs->trans("EditPageMeta")).'"'.$disabled.'><span class="fa fa-cog paddingrightonly"></span><span class="hideonsmartphone">'.dol_escape_htmltag($langs->trans("EditPageMeta")).'</span></a>';
 
 				//print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditHTMLSource")).'" name="editsource">';
 				print '<a href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$pageid.'&action=editsource&token='.newToken().'" class="button bordertransp"'.$disabled.'>'.dol_escape_htmltag($langs->trans($conf->dol_optimize_smallscreen ? "HTML" : "EditHTMLSource")).'</a>';
+				print '</span>';
 
 				print '<!-- button EditInLine and ShowSubcontainers -->'."\n";
 				print '<div class="websiteselectionsection inline-block">';
@@ -3055,11 +3061,11 @@ if (!GETPOST('hide_websitemenu')) {
 					//$disabled=' disabled="disabled"';
 					//print '<span class="button bordertransp disabled"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'"><span class="fa fa-home"></span></span>';
 					//print '<input type="submit" class="button bordertransp" disabled="disabled" value="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'" name="setashome">';
-					print '<a href="#" class="button bordertransp disabled" disabled="disabled" title="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'"><span class="fa fa-home valignmiddle btnTitle-icon"><span></a>';
+					print '<a href="#" class="button bordertransp disabled" disabled="disabled" title="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'"><span class="fa fa-home valignmiddle btnTitle-icon"></span></a>';
 				} else {
 					//$disabled='';
 					//print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'" name="setashome">';
-					print '<a href="'.$_SERVER["PHP_SELF"].'?action=setashome&token='.newToken().'&website='.$website->ref.'&pageid='.$pageid.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'"><span class="fa fa-home valignmiddle btnTitle-icon"><span></a>';
+					print '<a href="'.$_SERVER["PHP_SELF"].'?action=setashome&token='.newToken().'&website='.$website->ref.'&pageid='.$pageid.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'"><span class="fa fa-home valignmiddle btnTitle-icon"></span></a>';
 				}
 				print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("ClonePage")).'" name="createpagefromclone">';
 				print '<input type="submit" class="buttonDelete bordertransp" name="delete" value="'.$langs->trans("Delete").'"'.($atleastonepage ? '' : ' disabled="disabled"').'>';

From 60b90056c4a5ea0a2b15931325b76aa6afe96f61 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 19 Jan 2022 15:20:10 +0100
Subject: [PATCH 174/316] Fix #yogosha8450

---
 htdocs/adherents/partnership.php              | 21 -------------------
 htdocs/admin/const.php                        |  2 --
 htdocs/admin/defaultvalues.php                |  2 +-
 htdocs/comm/mailing/card.php                  | 12 +++++------
 htdocs/compta/facture/class/facture.class.php |  6 +++---
 htdocs/compta/tva/card.php                    |  5 +++--
 htdocs/core/customreports.php                 |  2 +-
 htdocs/core/lib/functions.lib.php             |  2 +-
 htdocs/core/tpl/admin_extrafields_add.tpl.php |  2 +-
 .../conferenceorboothattendee_note.php        |  1 -
 htdocs/externalsite/admin/index.php           |  4 ++--
 htdocs/hrm/position.php                       |  1 -
 htdocs/main.inc.php                           |  2 +-
 htdocs/modulebuilder/index.php                |  2 +-
 .../template/scripts/mymodule.php             |  1 -
 htdocs/public/onlinesign/newonlinesign.php    |  2 --
 htdocs/public/ticket/create_ticket.php        |  2 +-
 htdocs/salaries/card.php                      |  2 +-
 htdocs/salaries/paiement_salary.php           |  4 ++--
 htdocs/user/card.php                          |  2 +-
 htdocs/viewimage.php                          |  2 +-
 test/phpunit/CodingPhpTest.php                | 19 +++++++++++++++++
 22 files changed, 45 insertions(+), 53 deletions(-)

diff --git a/htdocs/adherents/partnership.php b/htdocs/adherents/partnership.php
index cf0e11d70e0..160a037c187 100644
--- a/htdocs/adherents/partnership.php
+++ b/htdocs/adherents/partnership.php
@@ -22,27 +22,6 @@
  *		\brief      Page to create/edit/view partnership
  */
 
-//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');				// Do not create database handler $db
-//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');				// Do not load object $user
-//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');				// Do not load object $mysoc
-//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
-//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
-//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
-//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
-//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
-//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');				// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       	  	// Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');					// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
-//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
-//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
-//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
-//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
-//if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
-
 // Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php
index a632d5f1a41..1426c323c01 100644
--- a/htdocs/admin/const.php
+++ b/htdocs/admin/const.php
@@ -37,8 +37,6 @@ if (!$user->admin) {
 $rowid = GETPOST('rowid', 'int');
 $entity = GETPOST('entity', 'int');
 $action = GETPOST('action', 'aZ09');
-$update = GETPOST('update', 'alpha');
-$delete = GETPOST('delete', 'none'); // Do not use alpha here
 $debug = GETPOST('debug', 'int');
 $consts = GETPOST('const', 'array');
 $constname = GETPOST('constname', 'alphanohtml');
diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index 4d88675ffd4..58a72250d64 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -64,7 +64,7 @@ if (!$sortorder) {
 
 $defaulturl = GETPOST('defaulturl', 'alphanohtml');
 $defaultkey = GETPOST('defaultkey', 'alphanohtml');
-$defaultvalue = GETPOST('defaultvalue', 'none');
+$defaultvalue = GETPOST('defaultvalue', 'restricthtml');
 
 $defaulturl = preg_replace('/^\//', '', $defaulturl);
 
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 7f2410da136..79faf4b2cd2 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -493,9 +493,9 @@ if (empty($reshook)) {
 	if ($action == 'add') {
 		$mesgs = array();
 
-		$object->email_from     = (string) GETPOST("from", "none"); // Must allow 'name <email>'
-		$object->email_replyto  = (string) GETPOST("replyto", "none"); // Must allow 'name <email>'
-		$object->email_errorsto = (string) GETPOST("errorsto", "none"); // Must allow 'name <email>'
+		$object->email_from     = (string) GETPOST("from", 'alphawithlgt'); // Must allow 'name <email>'
+		$object->email_replyto  = (string) GETPOST("replyto", 'alphawithlgt'); // Must allow 'name <email>'
+		$object->email_errorsto = (string) GETPOST("errorsto", 'alphawithlgt'); // Must allow 'name <email>'
 		$object->title          = (string) GETPOST("title");
 		$object->sujet          = (string) GETPOST("sujet");
 		$object->body           = (string) GETPOST("bodyemail", 'restricthtml');
@@ -531,11 +531,11 @@ if (empty($reshook)) {
 		if ($action == 'settitle') {
 			$object->title = trim(GETPOST('title', 'alpha'));
 		} elseif ($action == 'setemail_from') {
-			$object->email_from = trim(GETPOST('email_from', 'none')); // Must allow 'name <email>'
+			$object->email_from = trim(GETPOST('email_from', 'alphawithlgt')); // Must allow 'name <email>'
 		} elseif ($action == 'setemail_replyto') {
-			$object->email_replyto = trim(GETPOST('email_replyto', 'none')); // Must allow 'name <email>'
+			$object->email_replyto = trim(GETPOST('email_replyto', 'alphawithlgt')); // Must allow 'name <email>'
 		} elseif ($action == 'setemail_errorsto') {
-			$object->email_errorsto = trim(GETPOST('email_errorsto', 'none')); // Must allow 'name <email>'
+			$object->email_errorsto = trim(GETPOST('email_errorsto', 'alphawithlgt')); // Must allow 'name <email>'
 		} elseif ($action == 'settitle' && empty($object->title)) {
 			$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("MailTitle"));
 		} elseif ($action == 'setfrom' && empty($object->email_from)) {
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 74d08ddef2a..63fee0085bb 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -527,9 +527,9 @@ class Facture extends CommonInvoice
 
 			// Fields coming from GUI (priority on template). TODO Value of template should be used as default value on GUI so we can use here always value from GUI
 			$this->fk_project        = GETPOST('projectid', 'int') > 0 ? ((int) GETPOST('projectid', 'int')) : $_facrec->fk_project;
-			$this->note_public       = GETPOST('note_public', 'none') ? GETPOST('note_public', 'restricthtml') : $_facrec->note_public;
-			$this->note_private      = GETPOST('note_private', 'none') ? GETPOST('note_private', 'restricthtml') : $_facrec->note_private;
-			$this->model_pdf = GETPOST('model', 'alpha') ? GETPOST('model', 'alpha') : $_facrec->model_pdf;
+			$this->note_public       = GETPOSTISSET('note_public') ? GETPOST('note_public', 'restricthtml') : $_facrec->note_public;
+			$this->note_private      = GETPOSTISSET('note_private') ? GETPOST('note_private', 'restricthtml') : $_facrec->note_private;
+			$this->model_pdf = GETPOSTISSET('model') ? GETPOST('model', 'alpha') : $_facrec->model_pdf;
 			$this->cond_reglement_id = GETPOST('cond_reglement_id', 'int') > 0 ? ((int) GETPOST('cond_reglement_id', 'int')) : $_facrec->cond_reglement_id;
 			$this->mode_reglement_id = GETPOST('mode_reglement_id', 'int') > 0 ? ((int) GETPOST('mode_reglement_id', 'int')) : $_facrec->mode_reglement_id;
 			$this->fk_account        = GETPOST('fk_account') > 0 ? ((int) GETPOST('fk_account')) : $_facrec->fk_account;
diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php
index 530d18d17f9..317838009c7 100644
--- a/htdocs/compta/tva/card.php
+++ b/htdocs/compta/tva/card.php
@@ -196,7 +196,8 @@ if ($action == 'add' && !$cancel) {
 	}
 	$object->amount = $amount;
 	$object->label = GETPOST("label", 'alpha');
-	$object->note = GETPOST("note", 'none');
+	$object->note = GETPOST("note", 'restricthtml');
+	$object->note_private = GETPOST("note", 'restricthtml');
 
 	if (empty($object->datep)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DatePayment")), null, 'errors');
@@ -236,7 +237,7 @@ if ($action == 'add' && !$cancel) {
 			$paiement->amounts      = array($object->id=>$amount); // Tableau de montant
 			$paiement->paiementtype = GETPOST("type_payment", 'alphanohtml');
 			$paiement->num_payment  = GETPOST("num_payment", 'alphanohtml');
-			$paiement->note = GETPOST("note", 'none');
+			$paiement->note = GETPOST("note", 'restricthtml');
 
 			if (!$error) {
 				$paymentid = $paiement->create($user, (int) GETPOST('closepaidtva'));
diff --git a/htdocs/core/customreports.php b/htdocs/core/customreports.php
index e380dea8403..fafd1c015e8 100644
--- a/htdocs/core/customreports.php
+++ b/htdocs/core/customreports.php
@@ -56,7 +56,7 @@ if (!defined('USE_CUSTOM_REPORT_AS_INCLUDE')) {
 	}
 
 	$search_yaxis = GETPOST('search_yaxis', 'array');
-	$search_graph = GETPOST('search_graph', 'none');
+	$search_graph = GETPOST('search_graph', 'restricthtml');
 
 	// Load variable for pagination
 	$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 28a20ad6b09..535eb7f226e 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -641,7 +641,7 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 	}
 
 	// Check rule
-	if (preg_match('/^array/', $check)) {	// If 'array' or 'array:restricthtml' or 'array:aZ09'
+	if (preg_match('/^array/', $check)) {	// If 'array' or 'array:restricthtml' or 'array:aZ09' or 'array:intcomma'
 		if (!is_array($out) || empty($out)) {
 			$out = array();
 		} else {
diff --git a/htdocs/core/tpl/admin_extrafields_add.tpl.php b/htdocs/core/tpl/admin_extrafields_add.tpl.php
index d9c0f650395..9b46fba6c67 100644
--- a/htdocs/core/tpl/admin_extrafields_add.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_add.tpl.php
@@ -185,7 +185,7 @@ $listofexamplesforlink = 'Societe:societe/class/societe.class.php<br>Contact:con
 <?php } else { ?>
 	<td><?php echo $form->textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc")).$form->textwithpicto($langs->trans("Computedpersistent"), $langs->trans("ComputedpersistentDesc"), 1, 'warning'); ?></td>
 <?php } ?>
-<td class="valeur"><textarea name="computed_value" id="computed_value" class="quatrevingtpercent" rows="<?php echo ROWS_4 ?>"><?php echo (GETPOST('computed_value', 'none') ?GETPOST('computed_value', 'none') : ''); ?></textarea></td>
+<td class="valeur"><textarea name="computed_value" id="computed_value" class="quatrevingtpercent" rows="<?php echo ROWS_4 ?>"><?php echo (GETPOSTISSET('computed_value') ? GETPOST('computed_value', 'restricthtml') : ''); ?></textarea></td>
 </tr>
 <!-- Default Value (at sql setup level) -->
 <tr class="extra_default_value"><td><?php echo $langs->trans("DefaultValue").' ('.$langs->trans("Database").')'; ?></td><td class="valeur"><input id="default_value" type="text" name="default_value" size="5" value="<?php echo (GETPOST('default_value', 'alpha') ?GETPOST('default_value', 'alpha') : ''); ?>"></td></tr>
diff --git a/htdocs/eventorganization/conferenceorboothattendee_note.php b/htdocs/eventorganization/conferenceorboothattendee_note.php
index 19d413daaa0..b8fb87d39fa 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_note.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_note.php
@@ -39,7 +39,6 @@
 //if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
 //if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
 //if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
 //if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
 //if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
 
diff --git a/htdocs/externalsite/admin/index.php b/htdocs/externalsite/admin/index.php
index ba23b88e68e..0b55a297be9 100644
--- a/htdocs/externalsite/admin/index.php
+++ b/htdocs/externalsite/admin/index.php
@@ -57,7 +57,7 @@ if ($action == 'update') {
 	$label  = GETPOST('EXTERNALSITE_LABEL', 'alphanohtml');
 
 	// exturl can be an url or a HTML string
-	$exturl = GETPOST('EXTERNALSITE_URL', 'none');
+	$exturl = GETPOST('EXTERNALSITE_URL', 'restricthtml');
 	$exturl = dol_string_onlythesehtmltags($exturl, 1, 1, 0, 1);
 	$exturl = dol_string_onlythesehtmlattributes($exturl);
 
@@ -110,7 +110,7 @@ print '<tr class="oddeven">';
 print '<td class="fieldrequired">'.$langs->trans("ExternalSiteURL")."</td>";
 print '<td><textarea class="flat minwidth500" name="EXTERNALSITE_URL">';
 
-$exturl = GETPOST('EXTERNALSITE_URL', 'none');
+$exturl = GETPOST('EXTERNALSITE_URL', 'restricthtml');
 $exturl = dol_string_onlythesehtmltags($exturl, 1, 1, 0, 1);
 $exturl = dol_string_onlythesehtmlattributes($exturl);
 
diff --git a/htdocs/hrm/position.php b/htdocs/hrm/position.php
index 208a397f135..d36d352e895 100644
--- a/htdocs/hrm/position.php
+++ b/htdocs/hrm/position.php
@@ -42,7 +42,6 @@
 //if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
 //if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
 //if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
 //if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
 //if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
 
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index b2247294d40..4ec8767a801 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -661,7 +661,7 @@ if (!defined('NOLOGIN')) {
 		// Verification security graphic code
 		if ($test && GETPOST("username", "alpha", 2) && !empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA) && !isset($_SESSION['dol_bypass_antispam'])) {
 			$sessionkey = 'dol_antispam_value';
-			$ok = (array_key_exists($sessionkey, $_SESSION) === true && (strtolower($_SESSION[$sessionkey]) === strtolower(GETPOST('code', 'none'))));
+			$ok = (array_key_exists($sessionkey, $_SESSION) === true && (strtolower($_SESSION[$sessionkey]) === strtolower(GETPOST('code', 'restricthtml'))));
 
 			// Check code
 			if (!$ok) {
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index ac7522fed2e..4e66e655f5e 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -767,7 +767,7 @@ if ($dirins && $action == 'addlanguage' && !empty($module)) {
 
 // remove/delete File
 if ($dirins && $action == 'confirm_removefile' && !empty($module)) {
-	$relativefilename = dol_sanitizePathName(GETPOST('file', 'none'));
+	$relativefilename = dol_sanitizePathName(GETPOST('file', 'restricthtml'));
 	if ($relativefilename) {
 		$dirnametodelete = dirname($relativefilename);
 		$filetodelete = $dirins.'/'.$relativefilename;
diff --git a/htdocs/modulebuilder/template/scripts/mymodule.php b/htdocs/modulebuilder/template/scripts/mymodule.php
index f0a7ca715a4..3f117a51094 100644
--- a/htdocs/modulebuilder/template/scripts/mymodule.php
+++ b/htdocs/modulebuilder/template/scripts/mymodule.php
@@ -40,7 +40,6 @@
 //if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
 //if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
 //if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
 //if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
 //if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
 if (!defined('NOSESSION')) define('NOSESSION', '1');	// On CLI mode, no need to use web sessions
diff --git a/htdocs/public/onlinesign/newonlinesign.php b/htdocs/public/onlinesign/newonlinesign.php
index 3aaa3676663..8bd95d23c8d 100644
--- a/htdocs/public/onlinesign/newonlinesign.php
+++ b/htdocs/public/onlinesign/newonlinesign.php
@@ -448,10 +448,8 @@ if ($action == "dosign" && empty($cancel)) {
 	  $("#clearsignature").on("click",function(){
 		$("#signature").jSignature("clear");
 		$("#signbutton").attr("disabled",true);
-		/* $("#clearsignature").css("display","none"); */
 	  });
 
-	  /* $("#clearsignature").css("display","none"); */
 	  $("#signbutton").attr("disabled",true);
 	});
 	</script>';
diff --git a/htdocs/public/ticket/create_ticket.php b/htdocs/public/ticket/create_ticket.php
index 9efa561341e..6a3fd1aa688 100644
--- a/htdocs/public/ticket/create_ticket.php
+++ b/htdocs/public/ticket/create_ticket.php
@@ -173,7 +173,7 @@ if (empty($reshook) && $action == 'create_ticket' && GETPOST('save', 'alpha')) {
 	// Check Captcha code if is enabled
 	if (!empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA)) {
 		$sessionkey = 'dol_antispam_value';
-		$ok = (array_key_exists($sessionkey, $_SESSION) === true && (strtolower($_SESSION[$sessionkey]) === strtolower(GETPOST('code', 'none'))));
+		$ok = (array_key_exists($sessionkey, $_SESSION) === true && (strtolower($_SESSION[$sessionkey]) === strtolower(GETPOST('code', 'restricthtml'))));
 		if (!$ok) {
 			$error++;
 			array_push($object->errors, $langs->trans("ErrorBadValueForCode"));
diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php
index 89676e50140..689a2664c0a 100644
--- a/htdocs/salaries/card.php
+++ b/htdocs/salaries/card.php
@@ -277,7 +277,7 @@ if ($action == 'add' && empty($cancel)) {
 			$paiement->amounts      = array($object->id=>$amount); // Tableau de montant
 			$paiement->paiementtype = $type_payment;
 			$paiement->num_payment  = GETPOST("num_payment", 'alphanohtml');
-			$paiement->note = GETPOST("note", 'none');
+			$paiement->note = GETPOST("note", 'restricthtml');
 
 			if (!$error) {
 				$paymentid = $paiement->create($user, (int) GETPOST('closepaidsalary'));
diff --git a/htdocs/salaries/paiement_salary.php b/htdocs/salaries/paiement_salary.php
index d4465103308..221e5cf2c0e 100644
--- a/htdocs/salaries/paiement_salary.php
+++ b/htdocs/salaries/paiement_salary.php
@@ -110,8 +110,8 @@ if ($action == 'add_payment' || ($action == 'confirm_paiement' && $confirm == 'y
 			$paiement->amounts      = $amounts; // Tableau de montant
 			$paiement->paiementtype = GETPOST("paiementtype", 'alphanohtml');
 			$paiement->num_payment  = GETPOST("num_payment", 'alphanohtml');
-			$paiement->note         = GETPOST("note", 'none');
-			$paiement->note_private = GETPOST("note", 'none');
+			$paiement->note         = GETPOST("note", 'restricthtml');
+			$paiement->note_private = GETPOST("note", 'restricthtml');
 
 			if (!$error) {
 				$paymentid = $paiement->create($user, (GETPOST('closepaidsalary') == 'on' ? 1 : 0));
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index ac7fad391ef..4d748cd6946 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -404,7 +404,7 @@ if (empty($reshook)) {
 				$object->firstname = GETPOST("firstname", 'alphanohtml');
 				$object->login = GETPOST("login", 'alphanohtml');
 				$object->gender = GETPOST("gender", 'aZ09');
-				$object->pass = GETPOST("password", 'none');
+				$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;
 				if (!empty($user->admin)) {
 					$object->admin = GETPOST("admin", "int"); // admin flag can only be set/unset by an admin user. A test is also done later when forging sql request
diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php
index 0e91bd5bc9f..24c41e5e927 100644
--- a/htdocs/viewimage.php
+++ b/htdocs/viewimage.php
@@ -290,7 +290,7 @@ if ($modulepart == 'barcode') {
 	if (in_array($encoding, array('EAN8', 'EAN13'))) {
 		$code = GETPOST("code", 'alphanohtml');
 	} else {
-		$code = GETPOST("code", 'none'); // This can be rich content (qrcode, datamatrix, ...)
+		$code = GETPOST("code", 'restricthtml'); // This can be rich content (qrcode, datamatrix, ...)
 	}
 
 	if (empty($generator) || empty($encoding)) {
diff --git a/test/phpunit/CodingPhpTest.php b/test/phpunit/CodingPhpTest.php
index 597aad1024c..ae69c3f0eed 100644
--- a/test/phpunit/CodingPhpTest.php
+++ b/test/phpunit/CodingPhpTest.php
@@ -437,6 +437,25 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
 			$this->assertTrue($ok, 'Found a $_SERVER[\'QUERY_STRING\'] without dol_escape_htmltag neither dol_string_nohtmltag around it, in file '.$file['relativename'].'. Bad.');
 
 
+			// Check GETPOST(... 'none');
+			$ok=true;
+			$matches=array();
+			preg_match_all('/GETPOST\s*\(([^\)]+),\s*["\']none["\']/i', $filecontent, $matches, PREG_SET_ORDER);
+			foreach ($matches as $key => $val) {
+				var_dump($val);
+				if (!in_array($val[1], array(
+						"'replacestring'", "'htmlheader'", "'WEBSITE_HTML_HEADER'", "'WEBSITE_CSS_INLINE'", "'WEBSITE_JS_INLINE'", "'WEBSITE_MANIFEST_JSON'", "'PAGE_CONTENT'", "'WEBSITE_README'",
+						"'search_status'", '"mysqldump"', '"postgresqldump"', "'db_pass_root'", "'db_pass'", '"pass"', '"pass1"', '"pass2"', '"password"', "'password'", '"MAIN_MAIL_SMTPS_PW"'))) {
+					$ok=false;
+					break;
+				}
+				//if ($reg[0] != 'db') $ok=false;
+			}
+			//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
+			$this->assertTrue($ok, 'Found a GETPOST that use \'none\' as a parameter in file '.$file['relativename'].' and param is not an allowed parameter for using none - Bad.');
+			//exit;
+
+
 			// Test that first param of print_liste_field_titre is a translation key and not the translated value
 			$ok=true;
 			$matches=array();

From c8589970af00a70e7dcb51068a977cccc0e5f40c Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Wed, 19 Jan 2022 15:33:30 +0100
Subject: [PATCH 175/316] FIX : event created from contract not linked to
 object origin

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

diff --git a/htdocs/contrat/agenda.php b/htdocs/contrat/agenda.php
index 94232aa6afd..c320b708ccb 100644
--- a/htdocs/contrat/agenda.php
+++ b/htdocs/contrat/agenda.php
@@ -244,6 +244,8 @@ if ($id > 0) {
 	$newcardbutton = '';
 	if (!empty($conf->agenda->enabled)) {
 		if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create)) {
+			$backtopage = $_SERVER['PHP_SELF'].'?id='.$object->id;
+			$out = '&origin='.urlencode($object->element).'&originid='.$object->id.'&backtopage='.urlencode($backtopage);
 			$newcardbutton .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out);
 		}
 	}

From db9a26f8d426bbd292e4df84eefaab40e21cf1e3 Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Wed, 19 Jan 2022 15:35:09 +0100
Subject: [PATCH 176/316] FIX error urlencode

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

diff --git a/htdocs/contrat/agenda.php b/htdocs/contrat/agenda.php
index c320b708ccb..a291a9d8761 100644
--- a/htdocs/contrat/agenda.php
+++ b/htdocs/contrat/agenda.php
@@ -245,7 +245,7 @@ if ($id > 0) {
 	if (!empty($conf->agenda->enabled)) {
 		if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create)) {
 			$backtopage = $_SERVER['PHP_SELF'].'?id='.$object->id;
-			$out = '&origin='.urlencode($object->element).'&originid='.$object->id.'&backtopage='.urlencode($backtopage);
+			$out = '&origin='.$object->element.'&originid='.$object->id.'&backtopage='.urlencode($backtopage);
 			$newcardbutton .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out);
 		}
 	}

From db903ad64d5a50fd2c43f4efcad5d2415052e052 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 19 Jan 2022 16:40:48 +0100
Subject: [PATCH 177/316] Fix #yogosha8457

---
 htdocs/core/lib/geturl.lib.php | 13 ++++++++-----
 test/phpunit/SecurityTest.php  |  5 +++++
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/lib/geturl.lib.php b/htdocs/core/lib/geturl.lib.php
index be7e1ffa80b..79ed4821ac8 100644
--- a/htdocs/core/lib/geturl.lib.php
+++ b/htdocs/core/lib/geturl.lib.php
@@ -214,11 +214,14 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
 				}
 			}
 
-			// Common check (local and external)
-			if (in_array($iptocheck, array('100.100.100.200'))) {
-				$info['http_code'] = 400;
-				$info['content'] = 'Error bad hostname IP (Used by Alibaba metadata). Must be an external URL.';
-				break;
+			// Common check on ip (local and external)
+			$arrayofmetadataserver = array('100.100.100.200' => 'Alibaba', '192.0.0.192'=> 'Oracle');
+			foreach ($arrayofmetadataserver as $ipofmetadataserver => $nameofmetadataserver) {
+				if ($iptocheck == $ipofmetadataserver) {
+					$info['http_code'] = 400;
+					$info['content'] = 'Error bad hostname IP (Used by '.$nameofmetadataserver.' metadata server). This IP is forbidden.';
+					break 2;	// exit the foreach and the do...
+				}
 			}
 
 			// Set CURLOPT_CONNECT_TO so curl will not try another resolution that may give a different result. Possible only on PHP v7+
diff --git a/test/phpunit/SecurityTest.php b/test/phpunit/SecurityTest.php
index 6ca58e0d450..95aeb948c1d 100644
--- a/test/phpunit/SecurityTest.php
+++ b/test/phpunit/SecurityTest.php
@@ -791,6 +791,11 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 		 $this->assertEquals(400, $tmp['http_code'], 'Should GET url to '.$url.' that resolves to a local URL');	// Test we receive an error because localtest.me is not an external URL
 		 */
 
+		$url = 'http://192.0.0.192';
+		$tmp = getURLContent($url, 'GET', '', 0, array(), array('http', 'https'), 0);		// Only external URL but on an IP in blacklist
+		print __METHOD__." url=".$url." tmp['http_code'] = ".$tmp['http_code']."\n";
+		$this->assertEquals(400, $tmp['http_code'], 'Access should be refused and was not');	// Test we receive an error because ip is in blacklist
+
 		return 0;
 	}
 

From ff1037634b202ba99a3f160ef1fe35b9a5a9ba01 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 19 Jan 2022 18:23:31 +0100
Subject: [PATCH 178/316] Clean OAuth feature

---
 htdocs/admin/oauth.php            | 22 ++++++++++------
 htdocs/admin/oauthlogintokens.php | 44 +++++++++++++++++--------------
 htdocs/core/lib/functions.lib.php |  4 +--
 htdocs/core/lib/oauth.lib.php     | 10 +++----
 4 files changed, 45 insertions(+), 35 deletions(-)

diff --git a/htdocs/admin/oauth.php b/htdocs/admin/oauth.php
index 9bf5be2c294..a0d82d1d6bd 100644
--- a/htdocs/admin/oauth.php
+++ b/htdocs/admin/oauth.php
@@ -27,6 +27,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/oauth.lib.php';
 
+// $supportedoauth2array is defined into oauth.lib.php
 
 // Define $urlwithroot
 $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
@@ -96,10 +97,12 @@ print '<table class="noborder centpercent">';
 
 $i = 0;
 
-// $list is defined into oauth.lib.php
+// $list is defined into oauth.lib.php to the list of supporter OAuth providers.
 foreach ($list as $key) {
 	$supported = 0;
-	if (in_array($key[0], array_keys($supportedoauth2array))) {
+	$keyforsupportedoauth2array = $key[0];
+
+	if (in_array($keyforsupportedoauth2array, array_keys($supportedoauth2array))) {
 		$supported = 1;
 	}
 	if (!$supported) {
@@ -110,20 +113,23 @@ foreach ($list as $key) {
 
 	print '<tr class="liste_titre'.($i > 1 ? ' liste_titre_add' : '').'">';
 	// Api Name
-	$label = $langs->trans($key[0]);
-	print '<td>'.$label.'</td>';
+	$label = $langs->trans($keyforsupportedoauth2array);
 	print '<td>';
-	if (!empty($key[3])) {
-		print $langs->trans($key[3]);
+	print img_picto('', $supportedoauth2array[$keyforsupportedoauth2array]['picto'], 'class="pictofixedwidth"');
+	print $label;
+	print '</td>';
+	print '<td>';
+	if (!empty($supportedoauth2array[$keyforsupportedoauth2array]['urlforapp'])) {
+		print $langs->trans($supportedoauth2array[$keyforsupportedoauth2array]['urlforapp']);
 	}
 	print '</td>';
 	print '</tr>';
 
 	if ($supported) {
-		$redirect_uri = $urlwithroot.'/core/modules/oauth/'.$supportedoauth2array[$key[0]].'_oauthcallback.php';
+		$redirect_uri = $urlwithroot.'/core/modules/oauth/'.$supportedoauth2array[$keyforsupportedoauth2array]['callbackfile'].'_oauthcallback.php';
 		print '<tr class="oddeven value">';
 		print '<td>'.$langs->trans("UseTheFollowingUrlAsRedirectURI").'</td>';
-		print '<td><input style="width: 80%" type"text" name="uri'.$key[0].'" value="'.$redirect_uri.'">';
+		print '<td><input style="width: 80%" type"text" name="uri'.$keyforsupportedoauth2array.'" value="'.$redirect_uri.'">';
 		print '</td></tr>';
 	} else {
 		print '<tr class="oddeven value">';
diff --git a/htdocs/admin/oauthlogintokens.php b/htdocs/admin/oauthlogintokens.php
index 8697b400a2b..680a5f1f02f 100644
--- a/htdocs/admin/oauthlogintokens.php
+++ b/htdocs/admin/oauthlogintokens.php
@@ -25,17 +25,13 @@
 
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/oauth.lib.php'; // This define $list
+require_once DOL_DOCUMENT_ROOT.'/core/lib/oauth.lib.php'; // This define $list and $supportedoauth2array
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 use OAuth\Common\Storage\DoliStorage;
 
 // Load translation files required by the page
 $langs->loadLangs(array('admin', 'printing', 'oauth'));
 
-if (!$user->admin) {
-	accessforbidden();
-}
-
 $action = GETPOST('action', 'aZ09');
 $mode = GETPOST('mode', 'alpha');
 $value = GETPOST('value', 'alpha');
@@ -50,6 +46,10 @@ if (!$mode) {
 	$mode = 'setup';
 }
 
+if (!$user->admin) {
+	accessforbidden();
+}
+
 
 /*
  * Action
@@ -140,7 +140,9 @@ if ($mode == 'setup' && $user->admin) {
 
 	foreach ($list as $key) {
 		$supported = 0;
-		if (in_array($key[0], array_keys($supportedoauth2array))) {
+		$keyforsupportedoauth2array = $key[0];
+
+		if (in_array($keyforsupportedoauth2array, array_keys($supportedoauth2array))) {
 			$supported = 1;
 		}
 		if (!$supported) {
@@ -148,17 +150,18 @@ if ($mode == 'setup' && $user->admin) {
 		}
 
 
-		$OAUTH_SERVICENAME = 'Unknown';
-		if ($key[0] == 'OAUTH_GITHUB_NAME') {
-			$OAUTH_SERVICENAME = 'GitHub';
+		$OAUTH_SERVICENAME = empty($supportedoauth2array[$keyforsupportedoauth2array]['name']) ? 'Unknown' : $supportedoauth2array[$keyforsupportedoauth2array]['name'];
+
+		// Define $shortscope, $urltorenew, $urltodelete, $urltocheckperms
+		// TODO Use array $supportedoauth2array
+		if ($keyforsupportedoauth2array == 'OAUTH_GITHUB_NAME') {
 			// List of keys that will be converted into scopes (from constants 'SCOPE_state_in_uppercase' in file of service).
 			// We pass this param list in to 'state' because we need it before and after the redirect.
 			$shortscope = 'user,public_repo';
 			$urltorenew = $urlwithroot.'/core/modules/oauth/github_oauthcallback.php?shortscope='.$shortscope.'&state='.$shortscope.'&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
 			$urltodelete = $urlwithroot.'/core/modules/oauth/github_oauthcallback.php?action=delete&token='.newToken().'&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
 			$urltocheckperms = 'https://github.com/settings/applications/';
-		} elseif ($key[0] == 'OAUTH_GOOGLE_NAME') {
-			$OAUTH_SERVICENAME = 'Google';
+		} elseif ($keyforsupportedoauth2array == 'OAUTH_GOOGLE_NAME') {
 			// List of keys that will be converted into scopes (from constants 'SCOPE_state_in_uppercase' in file of service).
 			// We pass this param list in to 'state' because we need it before and after the redirect.
 			$shortscope = 'userinfo_email,userinfo_profile,cloud_print';
@@ -169,13 +172,11 @@ if ($mode == 'setup' && $user->admin) {
 			$urltorenew = $urlwithroot.'/core/modules/oauth/google_oauthcallback.php?shortscope='.$shortscope.'&state='.$shortscope.'&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
 			$urltodelete = $urlwithroot.'/core/modules/oauth/google_oauthcallback.php?action=delete&token='.newToken().'&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
 			$urltocheckperms = 'https://security.google.com/settings/security/permissions';
-		} elseif ($key[0] == 'OAUTH_STRIPE_TEST_NAME') {
-			$OAUTH_SERVICENAME = 'StripeTest';
+		} elseif ($keyforsupportedoauth2array == 'OAUTH_STRIPE_TEST_NAME') {
 			$urltorenew = $urlwithroot.'/core/modules/oauth/stripetest_oauthcallback.php?backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
 			$urltodelete = '';
 			$urltocheckperms = '';
-		} elseif ($key[0] == 'OAUTH_STRIPE_LIVE_NAME') {
-			$OAUTH_SERVICENAME = 'StripeLive';
+		} elseif ($keyforsupportedoauth2array == 'OAUTH_STRIPE_LIVE_NAME') {
 			$urltorenew = $urlwithroot.'/core/modules/oauth/stripelive_oauthcallback.php?backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
 			$urltodelete = '';
 			$urltocheckperms = '';
@@ -230,11 +231,14 @@ if ($mode == 'setup' && $user->admin) {
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="setconst">';
 
-		print '<div class="div-table-responsive">';
+		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent">'."\n";
 
 		print '<tr class="liste_titre">';
-		print '<th class="titlefieldcreate">'.$langs->trans($key[0]).'</th>';
+		print '<th class="titlefieldcreate">';
+		print img_picto('', $supportedoauth2array[$keyforsupportedoauth2array]['picto'], 'class="pictofixedwidth"');
+		print $langs->trans($keyforsupportedoauth2array);
+		print '</th>';
 		print '<th></th>';
 		print '<th></th>';
 		print "</tr>\n";
@@ -244,7 +248,7 @@ if ($mode == 'setup' && $user->admin) {
 		//var_dump($key);
 		print $langs->trans("OAuthIDSecret").'</td>';
 		print '<td>';
-		print $langs->trans("SeePreviousTab");
+		print '<span class="opacitymedium">'.$langs->trans("SeePreviousTab").'</span>';
 		print '</td>';
 		print '<td>';
 		print '</td>';
@@ -259,7 +263,7 @@ if ($mode == 'setup' && $user->admin) {
 		if (is_object($tokenobj)) {
 			print $langs->trans("HasAccessToken");
 		} else {
-			print $langs->trans("NoAccessToken");
+			print '<span class="opacitymedium">'.$langs->trans("NoAccessToken").'</span>';
 		}
 		print '</td>';
 		print '<td width="50%">';
@@ -346,7 +350,7 @@ if ($mode == 'setup' && $user->admin) {
 if ($mode == 'test' && $user->admin) {
 	print $langs->trans('PrintTestDesc'.$driver)."<br><br>\n";
 
-	print '<div class="div-table-responsive">';
+	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder centpercent">';
 	if (!empty($driver)) {
 		require_once DOL_DOCUMENT_ROOT.'/core/modules/printing/'.$driver.'.modules.php';
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 535eb7f226e..975e1f20a88 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3658,7 +3658,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'paiment', 'paragraph', 'play', 'pdf', 'phone', 'phoning', 'phoning_mobile', 'phoning_fax', 'playdisabled', 'previous', 'poll', 'pos', 'printer', 'product', 'propal', 'puce',
 				'stock', 'resize', 'service', 'stats', 'trip',
 				'security', 'setup', 'share-alt', 'sign-out', 'split', 'stripe', 'stripe-s', 'switch_off', 'switch_on', 'switch_on_red', 'tools', 'unlink', 'uparrow', 'user', 'vcard', 'wrench',
-				'github', 'jabber', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'youtube', 'google-plus-g', 'whatsapp',
+				'github', 'google', 'jabber', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'youtube', 'google-plus-g', 'whatsapp',
 				'chevron-left', 'chevron-right', 'chevron-down', 'chevron-top', 'commercial', 'companies',
 				'generic', 'home', 'hrm', 'members', 'products', 'invoicing',
 				'partnership', 'payment', 'payment_vat', 'pencil-ruler', 'preview', 'project', 'projectpub', 'projecttask', 'question', 'refresh', 'region',
@@ -3678,7 +3678,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 			if (in_array($pictowithouttext, array('card', 'bell', 'clock', 'establishment', 'generic', 'minus-square', 'object_generic', 'pdf', 'plus-square', 'timespent', 'note', 'off', 'on', 'object_bookmark', 'bookmark', 'vcard'))) {
 				$fa = 'far';
 			}
-			if (in_array($pictowithouttext, array('black-tie', 'github', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'stripe', 'stripe-s', 'youtube', 'google-plus-g', 'whatsapp'))) {
+			if (in_array($pictowithouttext, array('black-tie', 'github', 'google', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'stripe', 'stripe-s', 'youtube', 'google-plus-g', 'whatsapp'))) {
 				$fa = 'fab';
 			}
 
diff --git a/htdocs/core/lib/oauth.lib.php b/htdocs/core/lib/oauth.lib.php
index 48356868143..ab1b5a217b8 100644
--- a/htdocs/core/lib/oauth.lib.php
+++ b/htdocs/core/lib/oauth.lib.php
@@ -25,13 +25,13 @@
 
 // Supported OAUTH (a provider is supported when a file xxx_oauthcallback.php is available into htdocs/core/modules/oauth)
 $supportedoauth2array = array(
-	'OAUTH_GOOGLE_NAME'=>'google',
+	'OAUTH_GOOGLE_NAME'=>array('callbackfile' => 'google', 'picto' => 'google', 'urlforapp' => 'OAUTH_GOOGLE_DESC', 'name'=>'Google'),
 );
-if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
-	$supportedoauth2array['OAUTH_STRIPE_TEST_NAME'] = 'stripetest';
-	$supportedoauth2array['OAUTH_STRIPE_LIVE_NAME'] = 'stripelive';
+if (!empty($conf->stripe->enabled)) {
+	$supportedoauth2array['OAUTH_STRIPE_TEST_NAME'] = array('callbackfile' => 'stripetest', 'picto' => 'stripe', 'urlforapp' => '', 'name'=>'StripeTest');
+	$supportedoauth2array['OAUTH_STRIPE_LIVE_NAME'] = array('callbackfile' => 'stripelive', 'picto' => 'stripe', 'urlforapp' => '', 'name'=>'StripeLive');
 }
-$supportedoauth2array['OAUTH_GITHUB_NAME'] = 'github';
+$supportedoauth2array['OAUTH_GITHUB_NAME'] = array('callbackfile' => 'github', 'picto' => 'github', 'urlforapp' => 'OAUTH_GITHUB_DESC', 'name'=>'GitHub');
 
 
 

From d38784f45a0f996a023e4e28ac057b641076017a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 19 Jan 2022 20:33:20 +0100
Subject: [PATCH 179/316] WIP Login with Google

---
 htdocs/admin/oauthlogintokens.php             | 23 ++++++++---
 htdocs/core/modules/modPrinting.class.php     |  1 -
 .../modules/oauth/google_oauthcallback.php    | 41 ++++++++++++-------
 htdocs/core/tpl/login.tpl.php                 | 33 +++++++++++++++
 htdocs/langs/en_US/other.lang                 |  3 +-
 5 files changed, 78 insertions(+), 23 deletions(-)

diff --git a/htdocs/admin/oauthlogintokens.php b/htdocs/admin/oauthlogintokens.php
index 680a5f1f02f..820ce847030 100644
--- a/htdocs/admin/oauthlogintokens.php
+++ b/htdocs/admin/oauthlogintokens.php
@@ -122,7 +122,7 @@ $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domai
 
 $form = new Form($db);
 
-llxHeader('', $langs->trans("PrintingSetup"));
+llxHeader('', $langs->trans("TokenManager"));
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans('ConfigOAuth'), $linkback, 'title_setup');
@@ -163,13 +163,24 @@ if ($mode == 'setup' && $user->admin) {
 			$urltocheckperms = 'https://github.com/settings/applications/';
 		} elseif ($keyforsupportedoauth2array == 'OAUTH_GOOGLE_NAME') {
 			// List of keys that will be converted into scopes (from constants 'SCOPE_state_in_uppercase' in file of service).
-			// We pass this param list in to 'state' because we need it before and after the redirect.
-			$shortscope = 'userinfo_email,userinfo_profile,cloud_print';
-			if (!empty($conf->global->OAUTH_GSUITE)) {
+			// List of scopes for Google are here: https://developers.google.com/identity/protocols/oauth2/scopes
+			// We pass this key list into the param 'state' because we need it before and after the redirect.
+			$shortscope = 'userinfo_email,userinfo_profile';
+			$shortscope .= ',openid,email,profile';	// For openid connect
+			if (!empty($conf->printing->enabled)) {
+				$shortscope .= ',cloud_print';
+			}
+			if (!empty($conf->global->OAUTH_GOOGLE_GSUITE)) {
 				$shortscope .= ',admin_directory_user';
 			}
-			//$scope.=',gmail_full';
-			$urltorenew = $urlwithroot.'/core/modules/oauth/google_oauthcallback.php?shortscope='.$shortscope.'&state='.$shortscope.'&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
+			if (!empty($conf->global->OAUTH_GOOGLE_GMAIL)) {
+				$shortscope.=',gmail_full';
+			}
+
+			$oauthstateanticsrf = bin2hex(random_bytes(128/8));
+			$_SESSION['oauthstateanticsrf'] = $shortscope.'-'.$oauthstateanticsrf;
+
+			$urltorenew = $urlwithroot.'/core/modules/oauth/google_oauthcallback.php?shortscope='.$shortscope.'&state='.$shortscope.$oauthstateanticsrf.'&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
 			$urltodelete = $urlwithroot.'/core/modules/oauth/google_oauthcallback.php?action=delete&token='.newToken().'&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
 			$urltocheckperms = 'https://security.google.com/settings/security/permissions';
 		} elseif ($keyforsupportedoauth2array == 'OAUTH_STRIPE_TEST_NAME') {
diff --git a/htdocs/core/modules/modPrinting.class.php b/htdocs/core/modules/modPrinting.class.php
index 4c104b30ecf..c9e99b3d933 100644
--- a/htdocs/core/modules/modPrinting.class.php
+++ b/htdocs/core/modules/modPrinting.class.php
@@ -34,7 +34,6 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modPrinting extends DolibarrModules
 {
-
 	/**
 	 *  Constructor
 	 *
diff --git a/htdocs/core/modules/oauth/google_oauthcallback.php b/htdocs/core/modules/oauth/google_oauthcallback.php
index 4f9fded878f..520da0881e9 100644
--- a/htdocs/core/modules/oauth/google_oauthcallback.php
+++ b/htdocs/core/modules/oauth/google_oauthcallback.php
@@ -16,6 +16,9 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
+// This page should make the process to login and get token as described here:
+// https://developers.google.com/identity/protocols/oauth2/openid-connect#server-flow
+
 /**
  *      \file       htdocs/core/modules/oauth/google_oauthcallback.php
  *      \ingroup    oauth
@@ -70,9 +73,13 @@ $credentials = new Credentials(
 	$currentUri->getAbsoluteUri()
 );
 
+$state = GETPOST('state');
+
 $requestedpermissionsarray = array();
-if (GETPOST('state')) {
-	$requestedpermissionsarray = explode(',', GETPOST('state')); // Example: 'userinfo_email,userinfo_profile,cloud_print'. 'state' parameter is standard to store a hash value and can be used to retrieve some parameters back
+if ($state) {
+	// 'state' parameter is standard to store a hash value and can be used to retrieve some parameters back
+	$statewithscopeonly = preg_replace('/\-.*$/', '', $state);
+	$requestedpermissionsarray = explode(',', $statewithscopeonly); // Example: 'userinfo_email,userinfo_profile,openid,email,profile,cloud_print'.
 }
 if ($action != 'delete' && empty($requestedpermissionsarray)) {
 	print 'Error, parameter state is not defined';
@@ -80,6 +87,8 @@ if ($action != 'delete' && empty($requestedpermissionsarray)) {
 }
 //var_dump($requestedpermissionsarray);exit;
 
+
+
 // Instantiate the Api service using the credentials, http client and storage mechanism for the token
 // $requestedpermissionsarray contains list of scopes.
 // Conversion into URL is done by Reflection on constant with name SCOPE_scope_in_uppercase
@@ -91,6 +100,8 @@ $apiService->setAccessType('offline');
 
 $apiService->setApprouvalPrompt('force');
 
+//$apiService->setLoginHint(email); // If we know the email of Google account, we can set it to have it correctly selected on login prompt on multiaccount
+
 $langs->load("oauth");
 
 
@@ -108,17 +119,12 @@ if ($action == 'delete') {
 	exit();
 }
 
-if (!empty($_GET['code'])) {     // We are coming from oauth provider page
+if (GETPOST('code')) {     // We are coming from oauth provider page.
 	dol_syslog("We are coming from the oauth provider page");
-	//llxHeader('',$langs->trans("OAuthSetup"));
 
-	//$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
-	//print load_fiche_titre($langs->trans("OAuthSetup"),$linkback,'title_setup');
+	// TODO
+	// We should validate that the $sate is same than the one into $_SESSION['oauthstateanticsrf'], return error if not.
 
-	//print dol_get_fiche_head();
-	// retrieve the CSRF state parameter
-	$state = isset($_GET['state']) ? $_GET['state'] : null;
-	//print '<table>';
 
 	// This was a callback request from service, get the token
 	try {
@@ -126,9 +132,13 @@ if (!empty($_GET['code'])) {     // We are coming from oauth provider page
 		//var_dump($state);
 		//var_dump($apiService);      // OAuth\OAuth2\Service\Google
 
-		$token = $apiService->requestAccessToken($_GET['code'], $state);
+		// This request the token
+		// Result is stored into object managed by class DoliStorage into includes/OAuth/Common/Storage/DoliStorage.php, so into table llx_oauth_token
+		$token = $apiService->requestAccessToken(GETPOST('code'), $state);
 
-		setEventMessages($langs->trans('NewTokenStored'), null, 'mesgs'); // Stored into object managed by class DoliStorage so into table oauth_token
+		// Note: The token contains a lot of information about the user.
+
+		setEventMessages($langs->trans('NewTokenStored'), null, 'mesgs');
 
 		$backtourl = $_SESSION["backtourlsavedbeforeoauthjump"];
 		unset($_SESSION["backtourlsavedbeforeoauthjump"]);
@@ -138,8 +148,9 @@ if (!empty($_GET['code'])) {     // We are coming from oauth provider page
 	} catch (Exception $e) {
 		print $e->getMessage();
 	}
-} else // If entry on page with no parameter, we arrive here
-{
+} else {
+	// If we enter this page without 'code' parameter, we arrive here. this is the case when we want to get the redirect
+	// to the OAuth provider login page
 	$_SESSION["backtourlsavedbeforeoauthjump"] = $backtourl;
 
 	// This may create record into oauth_state before the header redirect.
@@ -160,6 +171,6 @@ if (!empty($_GET['code'])) {     // We are coming from oauth provider page
  * View
  */
 
-// No view at all, just actions
+// No view at all, just actions, so we never reach this line, except on error.
 
 $db->close();
diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index 338d2bd1a19..2645a76a8ab 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -33,6 +33,8 @@ if (empty($conf) || !is_object($conf)) {
 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
+
+
 header('Cache-Control: Public, must-revalidate');
 header("Content-type: text/html; charset=".$conf->file->character_set_client);
 
@@ -316,6 +318,37 @@ if (isset($conf->file->main_authentication) && preg_match('/openid/', $conf->fil
 	echo '</div>';
 }
 
+if (isset($conf->file->main_authentication) && preg_match('/google/', $conf->file->main_authentication)) {
+	$langs->load("users");
+
+	global $dolibarr_main_url_root;
+
+	// Define $urlwithroot
+	$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+	$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
+	//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
+
+	echo '<br>';
+	echo '<div class="center" style="margin-top: 4px;">';
+
+	$shortscope = 'userinfo_email,userinfo_profile';
+	$shortscope .= ',openid,email,profile';	// For openid connect
+
+	$oauthstateanticsrf = bin2hex(random_bytes(128/8));
+	$_SESSION['oauthstateanticsrf'] = $shortscope.'-'.$oauthstateanticsrf;
+	$urltorenew = $urlwithroot.'/core/modules/oauth/google_oauthcallback.php?shortscope='.$shortscope.'&state='.$shortscope.$oauthstateanticsrf.'&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
+
+	$url = $urltorenew;
+
+	//if (!empty($url)) {
+		print img_picto('', 'google', 'class="pictofixedwidth"').'<a class="alogin" href="'.$url.'">'.$langs->trans("LoginWith", "Google").'</a>';
+	/*} else {
+		$langs->load("errors");
+		print '<span class="warning">'.$langs->trans("ErrorOpenIDSetupNotComplete", 'MAIN_AUTHENTICATION_OPENID_URL').'</span>';
+	}*/
+
+	echo '</div>';
+}
 
 ?>
 
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index 91dd5ba4509..a43e97c1a02 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -272,7 +272,8 @@ ProjectCreatedByEmailCollector=Project created by email collector from email MSG
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
 SuffixSessionName=Suffix for session name
-
+LoginWith=Login with %s
+ 
 ##### Export #####
 ExportsArea=Exports area
 AvailableFormats=Available formats

From ee836305bae36eb21f379d1b2867a5adea06935c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 19 Jan 2022 20:51:53 +0100
Subject: [PATCH 180/316] Fix state field

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

diff --git a/htdocs/admin/oauthlogintokens.php b/htdocs/admin/oauthlogintokens.php
index 820ce847030..73a9139f856 100644
--- a/htdocs/admin/oauthlogintokens.php
+++ b/htdocs/admin/oauthlogintokens.php
@@ -180,7 +180,7 @@ if ($mode == 'setup' && $user->admin) {
 			$oauthstateanticsrf = bin2hex(random_bytes(128/8));
 			$_SESSION['oauthstateanticsrf'] = $shortscope.'-'.$oauthstateanticsrf;
 
-			$urltorenew = $urlwithroot.'/core/modules/oauth/google_oauthcallback.php?shortscope='.$shortscope.'&state='.$shortscope.$oauthstateanticsrf.'&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
+			$urltorenew = $urlwithroot.'/core/modules/oauth/google_oauthcallback.php?shortscope='.$shortscope.'&state='.$shortscope.'-'.$oauthstateanticsrf.'&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
 			$urltodelete = $urlwithroot.'/core/modules/oauth/google_oauthcallback.php?action=delete&token='.newToken().'&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
 			$urltocheckperms = 'https://security.google.com/settings/security/permissions';
 		} elseif ($keyforsupportedoauth2array == 'OAUTH_STRIPE_TEST_NAME') {

From 13329aab2e3b0f303673e5a1ae619ef022022377 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 19 Jan 2022 21:18:49 +0100
Subject: [PATCH 181/316] fix : bad path

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

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 7490fca0265..a49bf478763 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -4870,7 +4870,7 @@ class Societe extends CommonObject
 	{
 		global $langs;
 
-		require_once DOL_DOCUMENT_ROOT.'/parntership/class/partnership.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/partnership/class/partnership.class.php';
 
 
 		$this->partnerships[] = array();

From b09cb42e25e60fc432a1b6bc01ded082a2d2f458 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 19 Jan 2022 22:26:31 +0100
Subject: [PATCH 182/316] Decode extra params of id_token

---
 .../modules/oauth/google_oauthcallback.php    |  27 +-
 .../includes/OAuth/OAuth2/Service/Google.php  | 318 +++++++++---------
 2 files changed, 186 insertions(+), 159 deletions(-)

diff --git a/htdocs/core/modules/oauth/google_oauthcallback.php b/htdocs/core/modules/oauth/google_oauthcallback.php
index 520da0881e9..55a4394aa37 100644
--- a/htdocs/core/modules/oauth/google_oauthcallback.php
+++ b/htdocs/core/modules/oauth/google_oauthcallback.php
@@ -136,7 +136,32 @@ if (GETPOST('code')) {     // We are coming from oauth provider page.
 		// Result is stored into object managed by class DoliStorage into includes/OAuth/Common/Storage/DoliStorage.php, so into table llx_oauth_token
 		$token = $apiService->requestAccessToken(GETPOST('code'), $state);
 
-		// Note: The token contains a lot of information about the user.
+		// Note: The extraparams has the 'id_token' than contains a lot of information about the user.
+		$extraparams = $token->getExtraParams();
+		$jwt = explode('.', $extraparams['id_token']);
+
+		// Extract the middle part, base64 decode, then json_decode it
+		if (!empty($jwt[1])) {
+			$userinfo = json_decode(base64_decode($jwt[1]), true);
+
+			// TODO
+			// We should make the 5 steps of validation of id_token
+			// Verify that the ID token is properly signed by the issuer. Google-issued tokens are signed using one of the certificates found at the URI specified in the jwks_uri metadata value of the Discovery document.
+			// Verify that the value of the iss claim in the ID token is equal to https://accounts.google.com or accounts.google.com.
+			// Verify that the value of the aud claim in the ID token is equal to your app's client ID.
+			// Verify that the expiry time (exp claim) of the ID token has not passed.
+			// If you specified a hd parameter value in the request, verify that the ID token has a hd claim that matches an accepted G Suite hosted domain.
+
+			/*
+			$useremailuniq = $userinfo['sub'];
+			$useremail = $userinfo['email'];
+			$useremailverified = $userinfo['email_verified'];
+			$username = $userinfo['name'];
+			$userfamilyname = $userinfo['family_name'];
+			$usergivenname = $userinfo['given_name'];
+			$hd = $userinfo['hd'];
+			*/
+		}
 
 		setEventMessages($langs->trans('NewTokenStored'), null, 'mesgs');
 
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Google.php b/htdocs/includes/OAuth/OAuth2/Service/Google.php
index 5ab0f8a474b..8cf6daf9a7e 100644
--- a/htdocs/includes/OAuth/OAuth2/Service/Google.php
+++ b/htdocs/includes/OAuth/OAuth2/Service/Google.php
@@ -13,194 +13,196 @@ use OAuth\Common\Http\Uri\Uri;
 
 class Google extends AbstractService
 {
-    /**
-     * Defined scopes - More scopes are listed here:
-     * https://developers.google.com/oauthplayground/
-     *
-     * Make a pull request if you need more scopes.
-     */
+	/**
+	 * Defined scopes - More scopes are listed here:
+	 * https://developers.google.com/oauthplayground/
+	 *
+	 * Make a pull request if you need more scopes.
+	 */
 
-    // Basic
-    const SCOPE_EMAIL                       = 'email';
-    const SCOPE_PROFILE                     = 'profile';
+	// Basic
+	const SCOPE_EMAIL                       = 'email';
+	const SCOPE_PROFILE                     = 'profile';
 
-    const SCOPE_USERINFO_EMAIL              = 'https://www.googleapis.com/auth/userinfo.email';
-    const SCOPE_USERINFO_PROFILE            = 'https://www.googleapis.com/auth/userinfo.profile';
+	const SCOPE_USERINFO_EMAIL              = 'https://www.googleapis.com/auth/userinfo.email';
+	const SCOPE_USERINFO_PROFILE            = 'https://www.googleapis.com/auth/userinfo.profile';
 
-    // Google+
-    const SCOPE_GPLUS_ME                    = 'https://www.googleapis.com/auth/plus.me';
-    const SCOPE_GPLUS_LOGIN                 = 'https://www.googleapis.com/auth/plus.login';
-    const SCOPE_GPLUS_CIRCLES_READ          = 'https://www.googleapis.com/auth/plus.circles.read';
-    const SCOPE_GPLUS_CIRCLES_WRITE         = 'https://www.googleapis.com/auth/plus.circles.write';
-    const SCOPE_GPLUS_STREAM_READ           = 'https://www.googleapis.com/auth/plus.stream.read';
-    const SCOPE_GPLUS_STREAM_WRITE          = 'https://www.googleapis.com/auth/plus.stream.write';
-    const SCOPE_GPLUS_MEDIA                 = 'https://www.googleapis.com/auth/plus.media.upload';
+	// Google+
+	const SCOPE_GPLUS_ME                    = 'https://www.googleapis.com/auth/plus.me';
+	const SCOPE_GPLUS_LOGIN                 = 'https://www.googleapis.com/auth/plus.login';
+	const SCOPE_GPLUS_CIRCLES_READ          = 'https://www.googleapis.com/auth/plus.circles.read';
+	const SCOPE_GPLUS_CIRCLES_WRITE         = 'https://www.googleapis.com/auth/plus.circles.write';
+	const SCOPE_GPLUS_STREAM_READ           = 'https://www.googleapis.com/auth/plus.stream.read';
+	const SCOPE_GPLUS_STREAM_WRITE          = 'https://www.googleapis.com/auth/plus.stream.write';
+	const SCOPE_GPLUS_MEDIA                 = 'https://www.googleapis.com/auth/plus.media.upload';
 
-    // Google Drive
-    const SCOPE_DOCUMENTSLIST               = 'https://docs.google.com/feeds/';
-    const SCOPE_SPREADSHEETS                = 'https://spreadsheets.google.com/feeds/';
-    const SCOPE_GOOGLEDRIVE                 = 'https://www.googleapis.com/auth/drive';
-    const SCOPE_DRIVE_APPS                  = 'https://www.googleapis.com/auth/drive.appdata';
-    const SCOPE_DRIVE_APPS_READ_ONLY        = 'https://www.googleapis.com/auth/drive.apps.readonly';
-    const SCOPE_GOOGLEDRIVE_FILES           = 'https://www.googleapis.com/auth/drive.file';
-    const SCOPE_DRIVE_METADATA_READ_ONLY    = 'https://www.googleapis.com/auth/drive.metadata.readonly';
-    const SCOPE_DRIVE_READ_ONLY             = 'https://www.googleapis.com/auth/drive.readonly';
-    const SCOPE_DRIVE_SCRIPTS               = 'https://www.googleapis.com/auth/drive.scripts';
+	// Google Drive
+	const SCOPE_DOCUMENTSLIST               = 'https://docs.google.com/feeds/';
+	const SCOPE_SPREADSHEETS                = 'https://spreadsheets.google.com/feeds/';
+	const SCOPE_GOOGLEDRIVE                 = 'https://www.googleapis.com/auth/drive';
+	const SCOPE_DRIVE_APPS                  = 'https://www.googleapis.com/auth/drive.appdata';
+	const SCOPE_DRIVE_APPS_READ_ONLY        = 'https://www.googleapis.com/auth/drive.apps.readonly';
+	const SCOPE_GOOGLEDRIVE_FILES           = 'https://www.googleapis.com/auth/drive.file';
+	const SCOPE_DRIVE_METADATA_READ_ONLY    = 'https://www.googleapis.com/auth/drive.metadata.readonly';
+	const SCOPE_DRIVE_READ_ONLY             = 'https://www.googleapis.com/auth/drive.readonly';
+	const SCOPE_DRIVE_SCRIPTS               = 'https://www.googleapis.com/auth/drive.scripts';
 
-    // Cloud Print
-    const SCOPE_CLOUD_PRINT                 = 'https://www.googleapis.com/auth/cloudprint';
+	// Cloud Print
+	const SCOPE_CLOUD_PRINT                 = 'https://www.googleapis.com/auth/cloudprint';
 
-    // Adwords
-    const SCOPE_ADSENSE                     = 'https://www.googleapis.com/auth/adsense';
-    const SCOPE_ADWORDS                     = 'https://www.googleapis.com/auth/adwords/';
-    const SCOPE_GAN                         = 'https://www.googleapis.com/auth/gan'; // google affiliate network...?
+	// Adwords
+	const SCOPE_ADSENSE                     = 'https://www.googleapis.com/auth/adsense';
+	const SCOPE_ADWORDS                     = 'https://www.googleapis.com/auth/adwords/';
+	const SCOPE_GAN                         = 'https://www.googleapis.com/auth/gan'; // google affiliate network...?
 
-    // Google Analytics
-    const SCOPE_ANALYTICS                   = 'https://www.googleapis.com/auth/analytics';
-    const SCOPE_ANALYTICS_EDIT              = 'https://www.googleapis.com/auth/analytics.edit';
-    const SCOPE_ANALYTICS_MANAGE_USERS      = 'https://www.googleapis.com/auth/analytics.manage.users';
-    const SCOPE_ANALYTICS_READ_ONLY         = 'https://www.googleapis.com/auth/analytics.readonly';
+	// Google Analytics
+	const SCOPE_ANALYTICS                   = 'https://www.googleapis.com/auth/analytics';
+	const SCOPE_ANALYTICS_EDIT              = 'https://www.googleapis.com/auth/analytics.edit';
+	const SCOPE_ANALYTICS_MANAGE_USERS      = 'https://www.googleapis.com/auth/analytics.manage.users';
+	const SCOPE_ANALYTICS_READ_ONLY         = 'https://www.googleapis.com/auth/analytics.readonly';
 
-    //Gmail
-    const SCOPE_GMAIL_MODIFY                = 'https://www.googleapis.com/auth/gmail.modify';
-    const SCOPE_GMAIL_READONLY              = 'https://www.googleapis.com/auth/gmail.readonly';
-    const SCOPE_GMAIL_COMPOSE               = 'https://www.googleapis.com/auth/gmail.compose';
-    const SCOPE_GMAIL_SEND                  = 'https://www.googleapis.com/auth/gmail.send';
-    const SCOPE_GMAIL_INSERT                = 'https://www.googleapis.com/auth/gmail.insert';
-    const SCOPE_GMAIL_LABELS                = 'https://www.googleapis.com/auth/gmail.labels';
-    const SCOPE_GMAIL_FULL                  = 'https://mail.google.com/';
+	//Gmail
+	const SCOPE_GMAIL_MODIFY                = 'https://www.googleapis.com/auth/gmail.modify';
+	const SCOPE_GMAIL_READONLY              = 'https://www.googleapis.com/auth/gmail.readonly';
+	const SCOPE_GMAIL_COMPOSE               = 'https://www.googleapis.com/auth/gmail.compose';
+	const SCOPE_GMAIL_SEND                  = 'https://www.googleapis.com/auth/gmail.send';
+	const SCOPE_GMAIL_INSERT                = 'https://www.googleapis.com/auth/gmail.insert';
+	const SCOPE_GMAIL_LABELS                = 'https://www.googleapis.com/auth/gmail.labels';
+	const SCOPE_GMAIL_FULL                  = 'https://mail.google.com/';
 
-    // Other services
-    const SCOPE_BOOKS                       = 'https://www.googleapis.com/auth/books';
-    const SCOPE_BLOGGER                     = 'https://www.googleapis.com/auth/blogger';
-    const SCOPE_CALENDAR                    = 'https://www.googleapis.com/auth/calendar';
-    const SCOPE_CALENDAR_READ_ONLY          = 'https://www.googleapis.com/auth/calendar.readonly';
-    const SCOPE_CONTACT                     = 'https://www.google.com/m8/feeds/';
-    const SCOPE_CONTACTS_RO                 = 'https://www.googleapis.com/auth/contacts.readonly';
-    const SCOPE_CHROMEWEBSTORE              = 'https://www.googleapis.com/auth/chromewebstore.readonly';
-    const SCOPE_GMAIL                       = 'https://mail.google.com/mail/feed/atom';
-    const SCOPE_GMAIL_IMAP_SMTP             = 'https://mail.google.com';
-    const SCOPE_PICASAWEB                   = 'https://picasaweb.google.com/data/';
-    const SCOPE_SITES                       = 'https://sites.google.com/feeds/';
-    const SCOPE_URLSHORTENER                = 'https://www.googleapis.com/auth/urlshortener';
-    const SCOPE_WEBMASTERTOOLS              = 'https://www.google.com/webmasters/tools/feeds/';
-    const SCOPE_TASKS                       = 'https://www.googleapis.com/auth/tasks';
+	// Other services
+	const SCOPE_BOOKS                       = 'https://www.googleapis.com/auth/books';
+	const SCOPE_BLOGGER                     = 'https://www.googleapis.com/auth/blogger';
+	const SCOPE_CALENDAR                    = 'https://www.googleapis.com/auth/calendar';
+	const SCOPE_CALENDAR_READ_ONLY          = 'https://www.googleapis.com/auth/calendar.readonly';
+	const SCOPE_CONTACT                     = 'https://www.google.com/m8/feeds/';
+	const SCOPE_CONTACTS_RO                 = 'https://www.googleapis.com/auth/contacts.readonly';
+	const SCOPE_CHROMEWEBSTORE              = 'https://www.googleapis.com/auth/chromewebstore.readonly';
+	const SCOPE_GMAIL                       = 'https://mail.google.com/mail/feed/atom';
+	const SCOPE_GMAIL_IMAP_SMTP             = 'https://mail.google.com';
+	const SCOPE_PICASAWEB                   = 'https://picasaweb.google.com/data/';
+	const SCOPE_SITES                       = 'https://sites.google.com/feeds/';
+	const SCOPE_URLSHORTENER                = 'https://www.googleapis.com/auth/urlshortener';
+	const SCOPE_WEBMASTERTOOLS              = 'https://www.google.com/webmasters/tools/feeds/';
+	const SCOPE_TASKS                       = 'https://www.googleapis.com/auth/tasks';
 
-    // Cloud services
-    const SCOPE_CLOUDSTORAGE                = 'https://www.googleapis.com/auth/devstorage.read_write';
-    const SCOPE_CONTENTFORSHOPPING          = 'https://www.googleapis.com/auth/structuredcontent'; // what even is this
-    const SCOPE_USER_PROVISIONING           = 'https://apps-apis.google.com/a/feeds/user/';
-    const SCOPE_GROUPS_PROVISIONING         = 'https://apps-apis.google.com/a/feeds/groups/';
-    const SCOPE_NICKNAME_PROVISIONING       = 'https://apps-apis.google.com/a/feeds/alias/';
+	// Cloud services
+	const SCOPE_CLOUDSTORAGE                = 'https://www.googleapis.com/auth/devstorage.read_write';
+	const SCOPE_CONTENTFORSHOPPING          = 'https://www.googleapis.com/auth/structuredcontent'; // what even is this
+	const SCOPE_USER_PROVISIONING           = 'https://apps-apis.google.com/a/feeds/user/';
+	const SCOPE_GROUPS_PROVISIONING         = 'https://apps-apis.google.com/a/feeds/groups/';
+	const SCOPE_NICKNAME_PROVISIONING       = 'https://apps-apis.google.com/a/feeds/alias/';
 
-    // Old
-    const SCOPE_ORKUT                       = 'https://www.googleapis.com/auth/orkut';
-    const SCOPE_GOOGLELATITUDE =
-        'https://www.googleapis.com/auth/latitude.all.best https://www.googleapis.com/auth/latitude.all.city';
-    const SCOPE_OPENID                      = 'openid';
+	// Old
+	const SCOPE_ORKUT                       = 'https://www.googleapis.com/auth/orkut';
+	const SCOPE_GOOGLELATITUDE =
+		'https://www.googleapis.com/auth/latitude.all.best https://www.googleapis.com/auth/latitude.all.city';
+	const SCOPE_OPENID                      = 'openid';
 
-    // YouTube
-    const SCOPE_YOUTUBE_GDATA               = 'https://gdata.youtube.com';
-    const SCOPE_YOUTUBE_ANALYTICS_MONETARY  = 'https://www.googleapis.com/auth/yt-analytics-monetary.readonly';
-    const SCOPE_YOUTUBE_ANALYTICS           = 'https://www.googleapis.com/auth/yt-analytics.readonly';
-    const SCOPE_YOUTUBE                     = 'https://www.googleapis.com/auth/youtube';
-    const SCOPE_YOUTUBE_READ_ONLY           = 'https://www.googleapis.com/auth/youtube.readonly';
-    const SCOPE_YOUTUBE_UPLOAD              = 'https://www.googleapis.com/auth/youtube.upload';
-    const SCOPE_YOUTUBE_PARTNER             = 'https://www.googleapis.com/auth/youtubepartner';
-    const SCOPE_YOUTUBE_PARTNER_AUDIT       = 'https://www.googleapis.com/auth/youtubepartner-channel-audit';
+	// YouTube
+	const SCOPE_YOUTUBE_GDATA               = 'https://gdata.youtube.com';
+	const SCOPE_YOUTUBE_ANALYTICS_MONETARY  = 'https://www.googleapis.com/auth/yt-analytics-monetary.readonly';
+	const SCOPE_YOUTUBE_ANALYTICS           = 'https://www.googleapis.com/auth/yt-analytics.readonly';
+	const SCOPE_YOUTUBE                     = 'https://www.googleapis.com/auth/youtube';
+	const SCOPE_YOUTUBE_READ_ONLY           = 'https://www.googleapis.com/auth/youtube.readonly';
+	const SCOPE_YOUTUBE_UPLOAD              = 'https://www.googleapis.com/auth/youtube.upload';
+	const SCOPE_YOUTUBE_PARTNER             = 'https://www.googleapis.com/auth/youtubepartner';
+	const SCOPE_YOUTUBE_PARTNER_AUDIT       = 'https://www.googleapis.com/auth/youtubepartner-channel-audit';
 
-    // Google Glass
-    const SCOPE_GLASS_TIMELINE              = 'https://www.googleapis.com/auth/glass.timeline';
-    const SCOPE_GLASS_LOCATION              = 'https://www.googleapis.com/auth/glass.location';
+	// Google Glass
+	const SCOPE_GLASS_TIMELINE              = 'https://www.googleapis.com/auth/glass.timeline';
+	const SCOPE_GLASS_LOCATION              = 'https://www.googleapis.com/auth/glass.location';
 
-    // Android Publisher
-    const SCOPE_ANDROID_PUBLISHER           = 'https://www.googleapis.com/auth/androidpublisher';
+	// Android Publisher
+	const SCOPE_ANDROID_PUBLISHER           = 'https://www.googleapis.com/auth/androidpublisher';
 
 
-    // Google Gsuite
+	// Google Gsuite
 	const SCOPE_ADMIN_DIRECTORY_USER =        "https://www.googleapis.com/auth/admin.directory.user";
 	const SCOPE_ADMIN_DIRECTORY_CUSTOMER =        "https://www.googleapis.com/auth/admin.directory.customer";
 
-    protected $accessType = 'online';
+	protected $accessType = 'online';
 
-    public function __construct(
-        CredentialsInterface $credentials,
-        ClientInterface $httpClient,
-        TokenStorageInterface $storage,
-        $scopes = array(),
-        UriInterface $baseApiUri = null
-    ) {
-        parent::__construct($credentials, $httpClient, $storage, $scopes, $baseApiUri, true);
+	public function __construct(
+		CredentialsInterface $credentials,
+		ClientInterface $httpClient,
+		TokenStorageInterface $storage,
+		$scopes = array(),
+		UriInterface $baseApiUri = null
+	) {
+		parent::__construct($credentials, $httpClient, $storage, $scopes, $baseApiUri, true);
 
-        if (null === $baseApiUri) {
-            $this->baseApiUri = new Uri('https://www.googleapis.com/oauth2/v1/');
-        }
-    }
+		if (null === $baseApiUri) {
+			$this->baseApiUri = new Uri('https://www.googleapis.com/oauth2/v1/');
+		}
+	}
 
-    public function setAccessType($accessType)
-    {
-        if (!in_array($accessType, array('online', 'offline'), true)) {
-            throw new InvalidAccessTypeException('Invalid accessType, expected either online or offline');
-        }
-        $this->accessType = $accessType;
-    }
+	public function setAccessType($accessType)
+	{
+		if (!in_array($accessType, array('online', 'offline'), true)) {
+			throw new InvalidAccessTypeException('Invalid accessType, expected either online or offline');
+		}
+		$this->accessType = $accessType;
+	}
 
-    // LDR CHANGE Add approval_prompt to force the prompt if value is set to 'force' so it force return of a "refresh token" in addition to "standard token"
-    public $approvalPrompt='auto';
-    public function setApprouvalPrompt($prompt)
-    {
-        if (!in_array($prompt, array('auto', 'force'), true)) {
-            // @todo Maybe could we rename this exception
-            throw new InvalidAccessTypeException('Invalid approuvalPrompt, expected either auto or force.');
-        }
-        $this->approvalPrompt = $prompt;
-    }
+	// LDR CHANGE Add approval_prompt to force the prompt if value is set to 'force' so it force return of a "refresh token" in addition to "standard token"
+	public $approvalPrompt='auto';
+	public function setApprouvalPrompt($prompt)
+	{
+		if (!in_array($prompt, array('auto', 'force'), true)) {
+			// @todo Maybe could we rename this exception
+			throw new InvalidAccessTypeException('Invalid approuvalPrompt, expected either auto or force.');
+		}
+		$this->approvalPrompt = $prompt;
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getAuthorizationEndpoint()
-    {
-        // LDR CHANGE Add approval_prompt to force the prompt if value is set to 'force' so it force return of a "refresh token" in addition to "standard token"
-        //return new Uri('https://accounts.google.com/o/oauth2/auth?access_type='.$this->accessType);
-        return new Uri('https://accounts.google.com/o/oauth2/auth?'.($this->approvalPrompt?'approval_prompt='.$this->approvalPrompt.'&':'').'access_type='.$this->accessType);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getAuthorizationEndpoint()
+	{
+		// LDR CHANGE Add approval_prompt to force the prompt if value is set to 'force' so it force return of a "refresh token" in addition to "standard token"
+		//return new Uri('https://accounts.google.com/o/oauth2/auth?access_type='.$this->accessType);
+		$url = 'https://accounts.google.com/o/oauth2/auth?nonce='.bin2hex(random_bytes(64/8)).'&'.($this->approvalPrompt?'approval_prompt='.$this->approvalPrompt.'&':'').'access_type='.$this->accessType;
+		// TODO Add param hd and/or login_hint
+		return new Uri($url);
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getAccessTokenEndpoint()
-    {
-        return new Uri('https://accounts.google.com/o/oauth2/token');
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getAccessTokenEndpoint()
+	{
+		return new Uri('https://accounts.google.com/o/oauth2/token');
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function parseAccessTokenResponse($responseBody)
-    {
-        $data = json_decode($responseBody, true);
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function parseAccessTokenResponse($responseBody)
+	{
+		$data = json_decode($responseBody, true);
 
-        if (null === $data || !is_array($data)) {
-            throw new TokenResponseException('Unable to parse response.');
-        } elseif (isset($data['error'])) {
-            throw new TokenResponseException('Error in retrieving token: "' . $data['error'] . '"');
-        }
+		if (null === $data || !is_array($data)) {
+			throw new TokenResponseException('Unable to parse response.');
+		} elseif (isset($data['error'])) {
+			throw new TokenResponseException('Error in retrieving token: "' . $data['error'] . '"');
+		}
 
-        $token = new StdOAuth2Token();
-        $token->setAccessToken($data['access_token']);
-        $token->setLifetime($data['expires_in']);
+		$token = new StdOAuth2Token();
+		$token->setAccessToken($data['access_token']);
+		$token->setLifetime($data['expires_in']);
 
-        if (isset($data['refresh_token'])) {
-            $token->setRefreshToken($data['refresh_token']);
-            unset($data['refresh_token']);
-        }
+		if (isset($data['refresh_token'])) {
+			$token->setRefreshToken($data['refresh_token']);
+			unset($data['refresh_token']);
+		}
 
-        unset($data['access_token']);
-        unset($data['expires_in']);
+		unset($data['access_token']);
+		unset($data['expires_in']);
 
-        $token->setExtraParams($data);
+		$token->setExtraParams($data);
 
-        return $token;
-    }
+		return $token;
+	}
 }

From 3ae63cb111cb9de578fdc0501e5df7a72b2c2319 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 19 Jan 2022 22:49:53 +0100
Subject: [PATCH 183/316] Clean code

---
 .../core/modules/oauth/google_oauthcallback.php   | 15 ++++++++++-----
 htdocs/core/tpl/login.tpl.php                     | 13 ++++---------
 htdocs/includes/OAuth/OAuth2/Service/Google.php   |  4 ++--
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/htdocs/core/modules/oauth/google_oauthcallback.php b/htdocs/core/modules/oauth/google_oauthcallback.php
index 55a4394aa37..2b2b253c40d 100644
--- a/htdocs/core/modules/oauth/google_oauthcallback.php
+++ b/htdocs/core/modules/oauth/google_oauthcallback.php
@@ -98,9 +98,6 @@ $apiService = $serviceFactory->createService('Google', $credentials, $storage, $
 // also note that a refresh token is sent only after a prompt
 $apiService->setAccessType('offline');
 
-$apiService->setApprouvalPrompt('force');
-
-//$apiService->setLoginHint(email); // If we know the email of Google account, we can set it to have it correctly selected on login prompt on multiaccount
 
 $langs->load("oauth");
 
@@ -178,14 +175,22 @@ if (GETPOST('code')) {     // We are coming from oauth provider page.
 	// to the OAuth provider login page
 	$_SESSION["backtourlsavedbeforeoauthjump"] = $backtourl;
 
+	if (!preg_match('/^forlogin/', $state)) {
+		$apiService->setApprouvalPrompt('force');
+	}
+
 	// This may create record into oauth_state before the header redirect.
 	// Creation of record with state in this tables depend on the Provider used (see its constructor).
-	if (GETPOST('state')) {
-		$url = $apiService->getAuthorizationUri(array('state'=>GETPOST('state')));
+	if ($state) {
+		$url = $apiService->getAuthorizationUri(array('state' => $state));
 	} else {
 		$url = $apiService->getAuthorizationUri(); // Parameter state will be randomly generated
 	}
 
+	// Add more param
+	$url .= '&nonce='.bin2hex(random_bytes(64/8));
+	// TODO Add param hd and/or login_hint
+
 	// we go on oauth provider authorization page
 	header('Location: '.$url);
 	exit();
diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index 2645a76a8ab..d7e9bda13dd 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -331,21 +331,16 @@ if (isset($conf->file->main_authentication) && preg_match('/google/', $conf->fil
 	echo '<br>';
 	echo '<div class="center" style="margin-top: 4px;">';
 
-	$shortscope = 'userinfo_email,userinfo_profile';
-	$shortscope .= ',openid,email,profile';	// For openid connect
+	//$shortscope = 'userinfo_email,userinfo_profile';
+	$shortscope = 'openid,email,profile';	// For openid connect
 
 	$oauthstateanticsrf = bin2hex(random_bytes(128/8));
 	$_SESSION['oauthstateanticsrf'] = $shortscope.'-'.$oauthstateanticsrf;
-	$urltorenew = $urlwithroot.'/core/modules/oauth/google_oauthcallback.php?shortscope='.$shortscope.'&state='.$shortscope.$oauthstateanticsrf.'&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
+	$urltorenew = $urlwithroot.'/core/modules/oauth/google_oauthcallback.php?shortscope='.$shortscope.'&state=forlogin-'.$shortscope.'-'.$oauthstateanticsrf;
 
 	$url = $urltorenew;
 
-	//if (!empty($url)) {
-		print img_picto('', 'google', 'class="pictofixedwidth"').'<a class="alogin" href="'.$url.'">'.$langs->trans("LoginWith", "Google").'</a>';
-	/*} else {
-		$langs->load("errors");
-		print '<span class="warning">'.$langs->trans("ErrorOpenIDSetupNotComplete", 'MAIN_AUTHENTICATION_OPENID_URL').'</span>';
-	}*/
+	print img_picto('', 'google', 'class="pictofixedwidth"').'<a class="alogin" href="'.$url.'">'.$langs->trans("LoginWith", "Google").'</a>';
 
 	echo '</div>';
 }
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Google.php b/htdocs/includes/OAuth/OAuth2/Service/Google.php
index 8cf6daf9a7e..d2041979faa 100644
--- a/htdocs/includes/OAuth/OAuth2/Service/Google.php
+++ b/htdocs/includes/OAuth/OAuth2/Service/Google.php
@@ -163,8 +163,8 @@ class Google extends AbstractService
 	{
 		// LDR CHANGE Add approval_prompt to force the prompt if value is set to 'force' so it force return of a "refresh token" in addition to "standard token"
 		//return new Uri('https://accounts.google.com/o/oauth2/auth?access_type='.$this->accessType);
-		$url = 'https://accounts.google.com/o/oauth2/auth?nonce='.bin2hex(random_bytes(64/8)).'&'.($this->approvalPrompt?'approval_prompt='.$this->approvalPrompt.'&':'').'access_type='.$this->accessType;
-		// TODO Add param hd and/or login_hint
+		$url = 'https://accounts.google.com/o/oauth2/auth?'.($this->approvalPrompt?'approval_prompt='.$this->approvalPrompt.'&':'').'access_type='.$this->accessType;
+
 		return new Uri($url);
 	}
 

From 4be8cb5ded6c3a81b3aa095ad7e04d1c4de996d8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 19 Jan 2022 23:01:50 +0100
Subject: [PATCH 184/316] Validate the oauthstateanticsrf value.

---
 .../modules/oauth/google_oauthcallback.php    | 90 ++++++++++---------
 1 file changed, 47 insertions(+), 43 deletions(-)

diff --git a/htdocs/core/modules/oauth/google_oauthcallback.php b/htdocs/core/modules/oauth/google_oauthcallback.php
index 2b2b253c40d..efafbde6aa0 100644
--- a/htdocs/core/modules/oauth/google_oauthcallback.php
+++ b/htdocs/core/modules/oauth/google_oauthcallback.php
@@ -119,56 +119,57 @@ if ($action == 'delete') {
 if (GETPOST('code')) {     // We are coming from oauth provider page.
 	dol_syslog("We are coming from the oauth provider page");
 
-	// TODO
-	// We should validate that the $sate is same than the one into $_SESSION['oauthstateanticsrf'], return error if not.
+	// We must validate that the $state is the same than the one into $_SESSION['oauthstateanticsrf'], return error if not.
+	if (isset($_SESSION['oauthstateanticsrf']) && $state == $_SESSION['oauthstateanticsrf']) {
+		print 'Value for state = '.dol_escape_htmltag($state).' differs from value in $_SESSION["oauthstateanticsrf"]. Code is refused.';
+	} else {
+		// This was a callback request from service, get the token
+		try {
+			//var_dump($_GET['code']);
+			//var_dump($state);
+			//var_dump($apiService);      // OAuth\OAuth2\Service\Google
 
+			// This request the token
+			// Result is stored into object managed by class DoliStorage into includes/OAuth/Common/Storage/DoliStorage.php, so into table llx_oauth_token
+			$token = $apiService->requestAccessToken(GETPOST('code'), $state);
 
-	// This was a callback request from service, get the token
-	try {
-		//var_dump($_GET['code']);
-		//var_dump($state);
-		//var_dump($apiService);      // OAuth\OAuth2\Service\Google
+			// Note: The extraparams has the 'id_token' than contains a lot of information about the user.
+			$extraparams = $token->getExtraParams();
+			$jwt = explode('.', $extraparams['id_token']);
 
-		// This request the token
-		// Result is stored into object managed by class DoliStorage into includes/OAuth/Common/Storage/DoliStorage.php, so into table llx_oauth_token
-		$token = $apiService->requestAccessToken(GETPOST('code'), $state);
+			// Extract the middle part, base64 decode, then json_decode it
+			if (!empty($jwt[1])) {
+				$userinfo = json_decode(base64_decode($jwt[1]), true);
 
-		// Note: The extraparams has the 'id_token' than contains a lot of information about the user.
-		$extraparams = $token->getExtraParams();
-		$jwt = explode('.', $extraparams['id_token']);
+				// TODO
+				// We should make the 5 steps of validation of id_token
+				// Verify that the ID token is properly signed by the issuer. Google-issued tokens are signed using one of the certificates found at the URI specified in the jwks_uri metadata value of the Discovery document.
+				// Verify that the value of the iss claim in the ID token is equal to https://accounts.google.com or accounts.google.com.
+				// Verify that the value of the aud claim in the ID token is equal to your app's client ID.
+				// Verify that the expiry time (exp claim) of the ID token has not passed.
+				// If you specified a hd parameter value in the request, verify that the ID token has a hd claim that matches an accepted G Suite hosted domain.
 
-		// Extract the middle part, base64 decode, then json_decode it
-		if (!empty($jwt[1])) {
-			$userinfo = json_decode(base64_decode($jwt[1]), true);
+				/*
+				$useremailuniq = $userinfo['sub'];
+				$useremail = $userinfo['email'];
+				$useremailverified = $userinfo['email_verified'];
+				$username = $userinfo['name'];
+				$userfamilyname = $userinfo['family_name'];
+				$usergivenname = $userinfo['given_name'];
+				$hd = $userinfo['hd'];
+				*/
+			}
 
-			// TODO
-			// We should make the 5 steps of validation of id_token
-			// Verify that the ID token is properly signed by the issuer. Google-issued tokens are signed using one of the certificates found at the URI specified in the jwks_uri metadata value of the Discovery document.
-			// Verify that the value of the iss claim in the ID token is equal to https://accounts.google.com or accounts.google.com.
-			// Verify that the value of the aud claim in the ID token is equal to your app's client ID.
-			// Verify that the expiry time (exp claim) of the ID token has not passed.
-			// If you specified a hd parameter value in the request, verify that the ID token has a hd claim that matches an accepted G Suite hosted domain.
+			setEventMessages($langs->trans('NewTokenStored'), null, 'mesgs');
 
-			/*
-			$useremailuniq = $userinfo['sub'];
-			$useremail = $userinfo['email'];
-			$useremailverified = $userinfo['email_verified'];
-			$username = $userinfo['name'];
-			$userfamilyname = $userinfo['family_name'];
-			$usergivenname = $userinfo['given_name'];
-			$hd = $userinfo['hd'];
-			*/
+			$backtourl = $_SESSION["backtourlsavedbeforeoauthjump"];
+			unset($_SESSION["backtourlsavedbeforeoauthjump"]);
+
+			header('Location: '.$backtourl);
+			exit();
+		} catch (Exception $e) {
+			print $e->getMessage();
 		}
-
-		setEventMessages($langs->trans('NewTokenStored'), null, 'mesgs');
-
-		$backtourl = $_SESSION["backtourlsavedbeforeoauthjump"];
-		unset($_SESSION["backtourlsavedbeforeoauthjump"]);
-
-		header('Location: '.$backtourl);
-		exit();
-	} catch (Exception $e) {
-		print $e->getMessage();
 	}
 } else {
 	// If we enter this page without 'code' parameter, we arrive here. this is the case when we want to get the redirect
@@ -190,6 +191,9 @@ if (GETPOST('code')) {     // We are coming from oauth provider page.
 	// Add more param
 	$url .= '&nonce='.bin2hex(random_bytes(64/8));
 	// TODO Add param hd and/or login_hint
+	if (!preg_match('/^forlogin/', $state)) {
+		//$url .= 'hd=xxx';
+	}
 
 	// we go on oauth provider authorization page
 	header('Location: '.$url);
@@ -201,6 +205,6 @@ if (GETPOST('code')) {     // We are coming from oauth provider page.
  * View
  */
 
-// No view at all, just actions, so we never reach this line, except on error.
+// No view at all, just actions, so we never reach this line.
 
 $db->close();

From a5de93cf44b9b29ba4b7cdce2a2267b5c81bec9f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 19 Jan 2022 23:01:50 +0100
Subject: [PATCH 185/316] Validate the oauthstateanticsrf value.

---
 .../modules/oauth/google_oauthcallback.php    | 91 ++++++++++---------
 1 file changed, 48 insertions(+), 43 deletions(-)

diff --git a/htdocs/core/modules/oauth/google_oauthcallback.php b/htdocs/core/modules/oauth/google_oauthcallback.php
index 2b2b253c40d..9fbc38ef156 100644
--- a/htdocs/core/modules/oauth/google_oauthcallback.php
+++ b/htdocs/core/modules/oauth/google_oauthcallback.php
@@ -119,56 +119,58 @@ if ($action == 'delete') {
 if (GETPOST('code')) {     // We are coming from oauth provider page.
 	dol_syslog("We are coming from the oauth provider page");
 
-	// TODO
-	// We should validate that the $sate is same than the one into $_SESSION['oauthstateanticsrf'], return error if not.
+	// We must validate that the $state is the same than the one into $_SESSION['oauthstateanticsrf'], return error if not.
+	if (isset($_SESSION['oauthstateanticsrf']) && $state != $_SESSION['oauthstateanticsrf']) {
+		print 'Value for state = '.dol_escape_htmltag($state).' differs from value in $_SESSION["oauthstateanticsrf"]. Code is refused.';
+		unset($_SESSION['oauthstateanticsrf']);
+	} else {
+		// This was a callback request from service, get the token
+		try {
+			//var_dump($_GET['code']);
+			//var_dump($state);
+			//var_dump($apiService);      // OAuth\OAuth2\Service\Google
 
+			// This request the token
+			// Result is stored into object managed by class DoliStorage into includes/OAuth/Common/Storage/DoliStorage.php, so into table llx_oauth_token
+			$token = $apiService->requestAccessToken(GETPOST('code'), $state);
 
-	// This was a callback request from service, get the token
-	try {
-		//var_dump($_GET['code']);
-		//var_dump($state);
-		//var_dump($apiService);      // OAuth\OAuth2\Service\Google
+			// Note: The extraparams has the 'id_token' than contains a lot of information about the user.
+			$extraparams = $token->getExtraParams();
+			$jwt = explode('.', $extraparams['id_token']);
 
-		// This request the token
-		// Result is stored into object managed by class DoliStorage into includes/OAuth/Common/Storage/DoliStorage.php, so into table llx_oauth_token
-		$token = $apiService->requestAccessToken(GETPOST('code'), $state);
+			// Extract the middle part, base64 decode, then json_decode it
+			if (!empty($jwt[1])) {
+				$userinfo = json_decode(base64_decode($jwt[1]), true);
 
-		// Note: The extraparams has the 'id_token' than contains a lot of information about the user.
-		$extraparams = $token->getExtraParams();
-		$jwt = explode('.', $extraparams['id_token']);
+				// TODO
+				// We should make the 5 steps of validation of id_token
+				// Verify that the ID token is properly signed by the issuer. Google-issued tokens are signed using one of the certificates found at the URI specified in the jwks_uri metadata value of the Discovery document.
+				// Verify that the value of the iss claim in the ID token is equal to https://accounts.google.com or accounts.google.com.
+				// Verify that the value of the aud claim in the ID token is equal to your app's client ID.
+				// Verify that the expiry time (exp claim) of the ID token has not passed.
+				// If you specified a hd parameter value in the request, verify that the ID token has a hd claim that matches an accepted G Suite hosted domain.
 
-		// Extract the middle part, base64 decode, then json_decode it
-		if (!empty($jwt[1])) {
-			$userinfo = json_decode(base64_decode($jwt[1]), true);
+				/*
+				$useremailuniq = $userinfo['sub'];
+				$useremail = $userinfo['email'];
+				$useremailverified = $userinfo['email_verified'];
+				$username = $userinfo['name'];
+				$userfamilyname = $userinfo['family_name'];
+				$usergivenname = $userinfo['given_name'];
+				$hd = $userinfo['hd'];
+				*/
+			}
 
-			// TODO
-			// We should make the 5 steps of validation of id_token
-			// Verify that the ID token is properly signed by the issuer. Google-issued tokens are signed using one of the certificates found at the URI specified in the jwks_uri metadata value of the Discovery document.
-			// Verify that the value of the iss claim in the ID token is equal to https://accounts.google.com or accounts.google.com.
-			// Verify that the value of the aud claim in the ID token is equal to your app's client ID.
-			// Verify that the expiry time (exp claim) of the ID token has not passed.
-			// If you specified a hd parameter value in the request, verify that the ID token has a hd claim that matches an accepted G Suite hosted domain.
+			setEventMessages($langs->trans('NewTokenStored'), null, 'mesgs');
 
-			/*
-			$useremailuniq = $userinfo['sub'];
-			$useremail = $userinfo['email'];
-			$useremailverified = $userinfo['email_verified'];
-			$username = $userinfo['name'];
-			$userfamilyname = $userinfo['family_name'];
-			$usergivenname = $userinfo['given_name'];
-			$hd = $userinfo['hd'];
-			*/
+			$backtourl = $_SESSION["backtourlsavedbeforeoauthjump"];
+			unset($_SESSION["backtourlsavedbeforeoauthjump"]);
+
+			header('Location: '.$backtourl);
+			exit();
+		} catch (Exception $e) {
+			print $e->getMessage();
 		}
-
-		setEventMessages($langs->trans('NewTokenStored'), null, 'mesgs');
-
-		$backtourl = $_SESSION["backtourlsavedbeforeoauthjump"];
-		unset($_SESSION["backtourlsavedbeforeoauthjump"]);
-
-		header('Location: '.$backtourl);
-		exit();
-	} catch (Exception $e) {
-		print $e->getMessage();
 	}
 } else {
 	// If we enter this page without 'code' parameter, we arrive here. this is the case when we want to get the redirect
@@ -190,6 +192,9 @@ if (GETPOST('code')) {     // We are coming from oauth provider page.
 	// Add more param
 	$url .= '&nonce='.bin2hex(random_bytes(64/8));
 	// TODO Add param hd and/or login_hint
+	if (!preg_match('/^forlogin/', $state)) {
+		//$url .= 'hd=xxx';
+	}
 
 	// we go on oauth provider authorization page
 	header('Location: '.$url);
@@ -201,6 +206,6 @@ if (GETPOST('code')) {     // We are coming from oauth provider page.
  * View
  */
 
-// No view at all, just actions, so we never reach this line, except on error.
+// No view at all, just actions, so we never reach this line.
 
 $db->close();

From 115f022ae9bb332ef91bc4be6ca2c8db5c52312d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cserveny=2C=20Tam=C3=A1s?= <cserveny.tamas@gmail.com>
Date: Thu, 20 Jan 2022 00:55:52 +0100
Subject: [PATCH 186/316] Check if the lines in create is type object (like
 supplier invoice)

---
 .../class/fournisseur.commande.class.php      | 40 +++++++++++--------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index fc89ee06caa..6def2a9faf4 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -1357,32 +1357,38 @@ class CommandeFournisseur extends CommonOrder
 
 			if ($this->id) {
 				$num = count($this->lines);
-
+                                
 				// insert products details into database
 				for ($i = 0; $i < $num; $i++) {
-					$this->special_code = $this->lines[$i]->special_code; // TODO : remove this in 9.0 and add special_code param to addline()
+                                        $line = $this->lines[$i];
+                                        if (!is_object($line)) {
+						$line = (object) $line;
+					}
 
+                                  
+					$this->special_code = $line->special_code; // TODO : remove this in 9.0 and add special_code param to addline()
+                                        
 					// This include test on qty if option SUPPLIER_ORDER_WITH_NOPRICEDEFINED is not set
 					$result = $this->addline(
-						$this->lines[$i]->desc,
-						$this->lines[$i]->subprice,
-						$this->lines[$i]->qty,
-						$this->lines[$i]->tva_tx,
-						$this->lines[$i]->localtax1_tx,
-						$this->lines[$i]->localtax2_tx,
-						$this->lines[$i]->fk_product,
+						$line->desc,
+						$line->subprice,
+						$line->qty,
+						$line->tva_tx,
+						$line->localtax1_tx,
+						$line->localtax2_tx,
+						$line->fk_product,
 						0,
-						$this->lines[$i]->ref_fourn, // $this->lines[$i]->ref_fourn comes from field ref into table of lines. Value may ba a ref that does not exists anymore, so we first try with value of product
-						$this->lines[$i]->remise_percent,
+						$line->ref_fourn, // $line->ref_fourn comes from field ref into table of lines. Value may ba a ref that does not exists anymore, so we first try with value of product
+						$line->remise_percent,
 						'HT',
 						0,
-						$this->lines[$i]->product_type,
-						$this->lines[$i]->info_bits,
+						$line->product_type,
+						$line->info_bits,
 						false,
-						$this->lines[$i]->date_start,
-						$this->lines[$i]->date_end,
-						$this->lines[$i]->array_options,
-						$this->lines[$i]->fk_unit
+						$line->date_start,
+						$line->date_end,
+						$line->array_options,
+						$line->fk_unit
 						);
 					if ($result < 0) {
 						dol_syslog(get_class($this)."::create ".$this->error, LOG_WARNING); // do not use dol_print_error here as it may be a functionnal error

From 400d28238c58de1929232560e198e452616c694f Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Thu, 20 Jan 2022 00:09:52 +0000
Subject: [PATCH 187/316] Fixing style errors.

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

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 6def2a9faf4..b86834ee206 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -1357,17 +1357,17 @@ class CommandeFournisseur extends CommonOrder
 
 			if ($this->id) {
 				$num = count($this->lines);
-                                
+
 				// insert products details into database
 				for ($i = 0; $i < $num; $i++) {
-                                        $line = $this->lines[$i];
-                                        if (!is_object($line)) {
+										$line = $this->lines[$i];
+					if (!is_object($line)) {
 						$line = (object) $line;
 					}
 
-                                  
+
 					$this->special_code = $line->special_code; // TODO : remove this in 9.0 and add special_code param to addline()
-                                        
+
 					// This include test on qty if option SUPPLIER_ORDER_WITH_NOPRICEDEFINED is not set
 					$result = $this->addline(
 						$line->desc,

From e212395f00283c68313cc6f470b9ce0a30bf2f1d Mon Sep 17 00:00:00 2001
From: alsoft10 <h.sattar@alsoft.org>
Date: Thu, 20 Jan 2022 12:12:59 +0530
Subject: [PATCH 188/316] PR REQUEST #19679

---
 htdocs/main.inc.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 4ec8767a801..5ae92c702a0 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1766,6 +1766,14 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 				}
 			}
 		}
+		
+		//If you want to load custom javascript file from your selected theme directory
+		if (!empty($conf->global->ALLOW_THEME_JS)) { 
+			$theme_js = dol_buildpath('/theme/'.$conf->theme.'/'.$conf->theme.'.js', 0);
+			if (file_exists($theme_js)) {
+				print '<script src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/'.$conf->theme.'.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+			}
+		}
 
 		if (!empty($head)) {
 			print $head."\n";

From 0bb697c3aed4cb4a6a68ee3131e671c2354bc7cd Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Thu, 20 Jan 2022 06:47:57 +0000
Subject: [PATCH 189/316] Fixing style errors.

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

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 5ae92c702a0..fd811877295 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1766,9 +1766,9 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 				}
 			}
 		}
-		
+
 		//If you want to load custom javascript file from your selected theme directory
-		if (!empty($conf->global->ALLOW_THEME_JS)) { 
+		if (!empty($conf->global->ALLOW_THEME_JS)) {
 			$theme_js = dol_buildpath('/theme/'.$conf->theme.'/'.$conf->theme.'.js', 0);
 			if (file_exists($theme_js)) {
 				print '<script src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/'.$conf->theme.'.js'.($ext ? '?'.$ext : '').'"></script>'."\n";

From 871e707185836acff04f8ed6613296fbda5a30fe Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Thu, 20 Jan 2022 13:45:51 +0100
Subject: [PATCH 190/316] Update functions.lib.php

---
 htdocs/core/lib/functions.lib.php | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 975e1f20a88..5562b0e5d0a 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -6963,8 +6963,8 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 		$substitutionarray = array_merge($substitutionarray, array(
 			'__MYCOMPANY_NAME__'    => $mysoc->name,
 			'__MYCOMPANY_EMAIL__'   => $mysoc->email,
-			'__MYCOMPANY_PHONE__'   => $mysoc->phone,
-			'__MYCOMPANY_FAX__'     => $mysoc->fax,
+			'__MYCOMPANY_PHONE__'   => dol_print_phone($mysoc->phone),
+			'__MYCOMPANY_FAX__'     => dol_print_phone($mysoc->fax),
 			'__MYCOMPANY_PROFID1__' => $mysoc->idprof1,
 			'__MYCOMPANY_PROFID2__' => $mysoc->idprof2,
 			'__MYCOMPANY_PROFID3__' => $mysoc->idprof3,
@@ -7112,9 +7112,9 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 				$substitutionarray['__MEMBER_PHOTO__'] = (isset($object->photo) ? $object->photo : '');
 				$substitutionarray['__MEMBER_LOGIN__'] = (isset($object->login) ? $object->login : '');
 				$substitutionarray['__MEMBER_PASSWORD__'] = (isset($object->pass) ? $object->pass : '');
-				$substitutionarray['__MEMBER_PHONE__'] = (isset($object->phone) ? $object->phone : '');
-				$substitutionarray['__MEMBER_PHONEPRO__'] = (isset($object->phone_perso) ? $object->phone_perso : '');
-				$substitutionarray['__MEMBER_PHONEMOBILE__'] = (isset($object->phone_mobile) ? $object->phone_mobile : '');
+				$substitutionarray['__MEMBER_PHONE__'] = (isset($object->phone) ? dol_print_phone($object->phone) : '');
+				$substitutionarray['__MEMBER_PHONEPRO__'] = (isset($object->phone_perso) ? dol_print_phone($object->phone_perso) : '');
+				$substitutionarray['__MEMBER_PHONEMOBILE__'] = (isset($object->phone_mobile) ? dol_print_phone($object->phone_mobile) : '');
 				$substitutionarray['__MEMBER_TYPE__'] = (isset($object->type) ? $object->type : '');
 				$substitutionarray['__MEMBER_FIRST_SUBSCRIPTION_DATE__']       = dol_print_date($object->first_subscription_date, 'dayrfc');
 				$substitutionarray['__MEMBER_FIRST_SUBSCRIPTION_DATE_START__'] = dol_print_date($object->first_subscription_date_start, 'dayrfc');
@@ -7131,8 +7131,8 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 				$substitutionarray['__THIRDPARTY_CODE_CLIENT__'] = (is_object($object) ? $object->code_client : '');
 				$substitutionarray['__THIRDPARTY_CODE_FOURNISSEUR__'] = (is_object($object) ? $object->code_fournisseur : '');
 				$substitutionarray['__THIRDPARTY_EMAIL__'] = (is_object($object) ? $object->email : '');
-				$substitutionarray['__THIRDPARTY_PHONE__'] = (is_object($object) ? $object->phone : '');
-				$substitutionarray['__THIRDPARTY_FAX__'] = (is_object($object) ? $object->fax : '');
+				$substitutionarray['__THIRDPARTY_PHONE__'] = (is_object($object) ? dol_print_phone($object->phone) : '');
+				$substitutionarray['__THIRDPARTY_FAX__'] = (is_object($object) ? dol_print_phone($object->fax) : '');
 				$substitutionarray['__THIRDPARTY_ADDRESS__'] = (is_object($object) ? $object->address : '');
 				$substitutionarray['__THIRDPARTY_ZIP__'] = (is_object($object) ? $object->zip : '');
 				$substitutionarray['__THIRDPARTY_TOWN__'] = (is_object($object) ? $object->town : '');
@@ -7154,8 +7154,8 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 				$substitutionarray['__THIRDPARTY_CODE_CLIENT__'] = (is_object($object->thirdparty) ? $object->thirdparty->code_client : '');
 				$substitutionarray['__THIRDPARTY_CODE_FOURNISSEUR__'] = (is_object($object->thirdparty) ? $object->thirdparty->code_fournisseur : '');
 				$substitutionarray['__THIRDPARTY_EMAIL__'] = (is_object($object->thirdparty) ? $object->thirdparty->email : '');
-				$substitutionarray['__THIRDPARTY_PHONE__'] = (is_object($object->thirdparty) ? $object->thirdparty->phone : '');
-				$substitutionarray['__THIRDPARTY_FAX__'] = (is_object($object->thirdparty) ? $object->thirdparty->fax : '');
+				$substitutionarray['__THIRDPARTY_PHONE__'] = (is_object($object->thirdparty) ? dol_print_phone($object->thirdparty->phone) : '');
+				$substitutionarray['__THIRDPARTY_FAX__'] = (is_object($object->thirdparty) ? dol_print_phone($object->thirdparty->fax) : '');
 				$substitutionarray['__THIRDPARTY_ADDRESS__'] = (is_object($object->thirdparty) ? $object->thirdparty->address : '');
 				$substitutionarray['__THIRDPARTY_ZIP__'] = (is_object($object->thirdparty) ? $object->thirdparty->zip : '');
 				$substitutionarray['__THIRDPARTY_TOWN__'] = (is_object($object->thirdparty) ? $object->thirdparty->town : '');
@@ -7236,6 +7236,11 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 								$substitutionarray['__EXTRAFIELD_'.strtoupper($key).'_LOCALE__'] = ($datetime != "0000-00-00 00:00:00" ? dol_print_date($datetime, 'dayhour', 'tzserver', $outputlangs) : '');
 								$substitutionarray['__EXTRAFIELD_'.strtoupper($key).'_DAY_LOCALE__'] = ($datetime != "0000-00-00 00:00:00" ? dol_print_date($datetime, 'day', 'tzserver', $outputlangs) : '');
 								$substitutionarray['__EXTRAFIELD_'.strtoupper($key).'_RFC__'] = ($datetime != "0000-00-00 00:00:00" ? dol_print_date($datetime, 'dayhourrfc') : '');
+							} elseif ($extrafields->attributes[$object->table_element]['type'][$key] == 'phone') {
+								$substitutionarray['__EXTRAFIELD_'.strtoupper($key).'__'] = dol_print_phone($object->array_options['options_'.$key]);
+							} elseif ($extrafields->attributes[$object->table_element]['type'][$key] == 'price') {
+								$substitutionarray['__EXTRAFIELD_'.strtoupper($key).'__'] = $object->array_options['options_'.$key];
+								$substitutionarray['__EXTRAFIELD_'.strtoupper($key).'_FORMATED__'] = price($object->array_options['options_'.$key]);
 							}
 						}
 					}

From 687c8e2082479821db6e4fdfe4bc4a53f746491c Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Thu, 20 Jan 2022 13:49:23 +0100
Subject: [PATCH 191/316] Update functions.lib.php

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 1e7099d6bbc..0f7d07efd1f 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -6952,9 +6952,9 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 				'__USER_ID__' => (string) $user->id,
 				'__USER_LOGIN__' => (string) $user->login,
 				'__USER_EMAIL__' => (string) $user->email,
-				'__USER_PHONE__' => (string) $user->office_phone,
-				'__USER_PHONEPRO__' => (string) $user->user_mobile,
-				'__USER_PHONEMOBILE__' => (string) $user->personal_mobile,
+				'__USER_PHONE__' => (string) dol_print_phone($user->office_phone),
+				'__USER_PHONEPRO__' => (string) dol_print_phone($user->user_mobile),
+				'__USER_PHONEMOBILE__' => (string) dol_print_phone($user->personal_mobile),
 				'__USER_FAX__' => (string) $user->office_fax,
 				'__USER_LASTNAME__' => (string) $user->lastname,
 				'__USER_FIRSTNAME__' => (string) $user->firstname,

From 03af9ea3f3aafc6337444f597dd25067039641cb Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Thu, 20 Jan 2022 14:54:54 +0100
Subject: [PATCH 192/316] remove false positive on  carriage return

---
 htdocs/product/inventory/inventory.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index 82747fb8360..95c9e2972cb 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -630,7 +630,10 @@ if ($object->id > 0) {
 				errortab3 = [];
 				errortab4 = [];
 
-				if(textarray[0] != ""){
+				textarray = textarray.filter(function(value){
+					return value != "";
+				});
+				if(textarray.some((element) => element != "")){
 					$(".expectedqty").each(function(){
 						id = this.id;
 						console.log("Analyze line "+id+" in inventory");
@@ -851,7 +854,7 @@ if ($object->id > 0) {
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans("Warehouse").'</td>';
 	print '<td>'.$langs->trans("Product").'</td>';
-	if ($conf->productbatch->enabled) {
+	if (!empty($conf->productbatch->enabled)) {
 		print '<td>';
 		print $langs->trans("Batch");
 		print '</td>';
@@ -881,7 +884,7 @@ if ($object->id > 0) {
 		print '<td>';
 		print $form->select_produits((GETPOSTISSET('fk_product') ? GETPOST('fk_product', 'int') : $object->fk_product), 'fk_product', '', 0, 0, -1, 2, '', 0, null, 0, '1', 0, 'maxwidth300');
 		print '</td>';
-		if ($conf->productbatch->enabled) {
+		if (!empty($conf->productbatch->enabled)) {
 			print '<td>';
 			print '<input type="text" name="batch" class="maxwidth100" value="'.(GETPOSTISSET('batch') ? GETPOST('batch') : '').'">';
 			print '</td>';
@@ -927,6 +930,7 @@ if ($object->id > 0) {
 			}
 
 			// Load real stock we have now
+			$option = '';
 			if (isset($cacheOfProducts[$obj->fk_product])) {
 				$product_static = $cacheOfProducts[$obj->fk_product];
 			} else {
@@ -948,7 +952,7 @@ if ($object->id > 0) {
 			print $product_static->getNomUrl(1).' - '.$product_static->label;
 			print '</td>';
 
-			if ($conf->productbatch->enabled) {
+			if (!empty($conf->productbatch->enabled)) {
 				print '<td id="id_'.$obj->rowid.'_batch">';
 				print $obj->batch;
 				print '</td>';
@@ -959,7 +963,7 @@ if ($object->id > 0) {
 			$valuetoshow = $obj->qty_stock;
 			// For inventory not yet close, we overwrite with the real value in stock now
 			if ($object->status == $object::STATUS_DRAFT || $object->status == $object::STATUS_VALIDATED) {
-				if ($conf->productbatch->enabled && $product_static->hasbatch()) {
+				if (!empty($conf->productbatch->enabled) && $product_static->hasbatch()) {
 					$valuetoshow = $product_static->stock_warehouse[$obj->fk_warehouse]->detail_batch[$obj->batch]->qty;
 				} else {
 					$valuetoshow = $product_static->stock_warehouse[$obj->fk_warehouse]->real;

From 553dc5a1efeb59d14cd8bbc7ab97b63728627549 Mon Sep 17 00:00:00 2001
From: kevin <kevin.giuga@atm-consulting.fr>
Date: Thu, 20 Jan 2022 16:55:57 +0100
Subject: [PATCH 193/316] Display the physical and virtual stock of the
 products when creating OF from a BOM

---
 htdocs/mrp/class/mo.class.php            | 17 +++++++++++++++++
 htdocs/mrp/tpl/originproductline.tpl.php | 10 ++++++++++
 2 files changed, 27 insertions(+)

diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index 2e7b4186a87..7b49722a25b 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -1300,6 +1300,17 @@ class Mo extends CommonObject
 	{
 		global $langs, $hookmanager, $conf, $form;
 
+        $langs->load('stocks');
+        $text_stock_options = $langs->trans("RealStockDesc").'<br>';
+        $text_stock_options .= $langs->trans("RealStockWillAutomaticallyWhen").'<br>';
+        $text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT) || !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE) ? '- '.$langs->trans("DeStockOnShipment").'<br>' : '');
+        $text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) ? '- '.$langs->trans("DeStockOnValidateOrder").'<br>' : '');
+        $text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_BILL) ? '- '.$langs->trans("DeStockOnBill").'<br>' : '');
+        $text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) ? '- '.$langs->trans("ReStockOnBill").'<br>' : '');
+        $text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER) ? '- '.$langs->trans("ReStockOnValidateOrder").'<br>' : '');
+        $text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER) ? '- '.$langs->trans("ReStockOnDispatchOrder").'<br>' : '');
+        $text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_RECEPTION) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE) ? '- '.$langs->trans("StockOnReception").'<br>' : '');
+
 		print '<tr class="liste_titre">';
 		print '<td>'.$langs->trans('Ref').'</td>';
 		print '<td class="right">'.$langs->trans('Qty');
@@ -1309,6 +1320,8 @@ class Mo extends CommonObject
 			print ' <span class="opacitymedium">('.$langs->trans("ForAQuantityToConsumeOf", $this->bom->qty).')</span>';
 		}
 		print '</td>';
+        print '<td class="center">'.$form->textwithpicto($langs->trans("PhysicalStock"), $text_stock_options, 1).'</td>';
+        print '<td class="center">'.$form->textwithpicto($langs->trans("VirtualStock"), $langs->trans("VirtualStockDesc")).'</td>';
 		print '<td class="center">'.$langs->trans('QtyFrozen').'</td>';
 		print '<td class="center">'.$langs->trans('DisableStockChange').'</td>';
 		//print '<td class="right">'.$langs->trans('Efficiency').'</td>';
@@ -1358,6 +1371,7 @@ class Mo extends CommonObject
 		if (!empty($line->fk_product)) {
 			$productstatic = new Product($this->db);
 			$productstatic->fetch($line->fk_product);
+            $productstatic->load_virtual_stock();
 			$this->tpl['label'] .= $productstatic->getNomUrl(1);
 			//$this->tpl['label'].= ' - '.$productstatic->label;
 		} else {
@@ -1370,6 +1384,9 @@ class Mo extends CommonObject
 			$this->tpl['qty_bom'] = $this->bom->qty;
 		}
 
+        $this->tpl['stock'] = $productstatic->stock_reel;
+        $this->tpl['seuil_stock_alerte'] = $productstatic->seuil_stock_alerte;
+        $this->tpl['virtual_stock'] = $productstatic->stock_theorique;
 		$this->tpl['qty'] = $line->qty;
 		$this->tpl['qty_frozen'] = $line->qty_frozen;
 		$this->tpl['disable_stock_change'] = $line->disable_stock_change;
diff --git a/htdocs/mrp/tpl/originproductline.tpl.php b/htdocs/mrp/tpl/originproductline.tpl.php
index 478c6504979..98b39a637c3 100644
--- a/htdocs/mrp/tpl/originproductline.tpl.php
+++ b/htdocs/mrp/tpl/originproductline.tpl.php
@@ -39,6 +39,16 @@ $qtytoconsumeforline = price2num($qtytoconsumeforline, 'MS');
 print '<tr class="oddeven'.(empty($this->tpl['strike']) ? '' : ' strikefordisabled').'">';
 print '<td>'.$this->tpl['label'].'</td>';
 print '<td class="right">'.$this->tpl['qty'].(($this->tpl['efficiency'] > 0 && $this->tpl['efficiency'] < 1) ? ' / '.$form->textwithpicto($this->tpl['efficiency'], $langs->trans("ValueOfMeansLoss")).' = '.$qtytoconsumeforline : '').'</td>';
+print '<td class="center">'.(empty($this->tpl['stock']) ? 0 : price2num($this->tpl['stock'], 'MS'));
+if ($this->tpl['seuil_stock_alerte'] != '' && ($this->tpl['stock'] < $this->tpl['seuil_stock_alerte'])) {
+    print ' '.img_warning($langs->trans("StockLowerThanLimit", $this->tpl['seuil_stock_alerte']));
+}
+print '</td>';
+print '<td class="center">'.((empty($this->tpl['virtual_stock']) ? 0 : price2num($this->tpl['virtual_stock'], 'MS')));
+if ($this->tpl['seuil_stock_alerte'] != '' && ($this->tpl['virtual_stock'] < $this->tpl['seuil_stock_alerte'])) {
+    print ' '.img_warning($langs->trans("StockLowerThanLimit", $this->tpl['seuil_stock_alerte']));
+}
+print '</td>';
 print '<td class="center">'.($this->tpl['qty_frozen'] ? yn($this->tpl['qty_frozen']) : '').'</td>';
 print '<td class="center">'.($this->tpl['disable_stock_change'] ? yn($this->tpl['disable_stock_change']) : '').'</td>';
 //print '<td class="right">'.$this->tpl['efficiency'].'</td>';

From 238e2111f05eaab7747cffb837a6dc56377c7118 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Thu, 20 Jan 2022 16:07:18 +0000
Subject: [PATCH 194/316] Fixing style errors.

---
 htdocs/mrp/class/mo.class.php            | 32 ++++++++++++------------
 htdocs/mrp/tpl/originproductline.tpl.php |  4 +--
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index 7b49722a25b..29db4bcb669 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -1300,16 +1300,16 @@ class Mo extends CommonObject
 	{
 		global $langs, $hookmanager, $conf, $form;
 
-        $langs->load('stocks');
-        $text_stock_options = $langs->trans("RealStockDesc").'<br>';
-        $text_stock_options .= $langs->trans("RealStockWillAutomaticallyWhen").'<br>';
-        $text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT) || !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE) ? '- '.$langs->trans("DeStockOnShipment").'<br>' : '');
-        $text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) ? '- '.$langs->trans("DeStockOnValidateOrder").'<br>' : '');
-        $text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_BILL) ? '- '.$langs->trans("DeStockOnBill").'<br>' : '');
-        $text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) ? '- '.$langs->trans("ReStockOnBill").'<br>' : '');
-        $text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER) ? '- '.$langs->trans("ReStockOnValidateOrder").'<br>' : '');
-        $text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER) ? '- '.$langs->trans("ReStockOnDispatchOrder").'<br>' : '');
-        $text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_RECEPTION) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE) ? '- '.$langs->trans("StockOnReception").'<br>' : '');
+		$langs->load('stocks');
+		$text_stock_options = $langs->trans("RealStockDesc").'<br>';
+		$text_stock_options .= $langs->trans("RealStockWillAutomaticallyWhen").'<br>';
+		$text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT) || !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE) ? '- '.$langs->trans("DeStockOnShipment").'<br>' : '');
+		$text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) ? '- '.$langs->trans("DeStockOnValidateOrder").'<br>' : '');
+		$text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_BILL) ? '- '.$langs->trans("DeStockOnBill").'<br>' : '');
+		$text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) ? '- '.$langs->trans("ReStockOnBill").'<br>' : '');
+		$text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER) ? '- '.$langs->trans("ReStockOnValidateOrder").'<br>' : '');
+		$text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER) ? '- '.$langs->trans("ReStockOnDispatchOrder").'<br>' : '');
+		$text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_RECEPTION) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE) ? '- '.$langs->trans("StockOnReception").'<br>' : '');
 
 		print '<tr class="liste_titre">';
 		print '<td>'.$langs->trans('Ref').'</td>';
@@ -1320,8 +1320,8 @@ class Mo extends CommonObject
 			print ' <span class="opacitymedium">('.$langs->trans("ForAQuantityToConsumeOf", $this->bom->qty).')</span>';
 		}
 		print '</td>';
-        print '<td class="center">'.$form->textwithpicto($langs->trans("PhysicalStock"), $text_stock_options, 1).'</td>';
-        print '<td class="center">'.$form->textwithpicto($langs->trans("VirtualStock"), $langs->trans("VirtualStockDesc")).'</td>';
+		print '<td class="center">'.$form->textwithpicto($langs->trans("PhysicalStock"), $text_stock_options, 1).'</td>';
+		print '<td class="center">'.$form->textwithpicto($langs->trans("VirtualStock"), $langs->trans("VirtualStockDesc")).'</td>';
 		print '<td class="center">'.$langs->trans('QtyFrozen').'</td>';
 		print '<td class="center">'.$langs->trans('DisableStockChange').'</td>';
 		//print '<td class="right">'.$langs->trans('Efficiency').'</td>';
@@ -1371,7 +1371,7 @@ class Mo extends CommonObject
 		if (!empty($line->fk_product)) {
 			$productstatic = new Product($this->db);
 			$productstatic->fetch($line->fk_product);
-            $productstatic->load_virtual_stock();
+			$productstatic->load_virtual_stock();
 			$this->tpl['label'] .= $productstatic->getNomUrl(1);
 			//$this->tpl['label'].= ' - '.$productstatic->label;
 		} else {
@@ -1384,9 +1384,9 @@ class Mo extends CommonObject
 			$this->tpl['qty_bom'] = $this->bom->qty;
 		}
 
-        $this->tpl['stock'] = $productstatic->stock_reel;
-        $this->tpl['seuil_stock_alerte'] = $productstatic->seuil_stock_alerte;
-        $this->tpl['virtual_stock'] = $productstatic->stock_theorique;
+		$this->tpl['stock'] = $productstatic->stock_reel;
+		$this->tpl['seuil_stock_alerte'] = $productstatic->seuil_stock_alerte;
+		$this->tpl['virtual_stock'] = $productstatic->stock_theorique;
 		$this->tpl['qty'] = $line->qty;
 		$this->tpl['qty_frozen'] = $line->qty_frozen;
 		$this->tpl['disable_stock_change'] = $line->disable_stock_change;
diff --git a/htdocs/mrp/tpl/originproductline.tpl.php b/htdocs/mrp/tpl/originproductline.tpl.php
index 98b39a637c3..ba1d7fccd86 100644
--- a/htdocs/mrp/tpl/originproductline.tpl.php
+++ b/htdocs/mrp/tpl/originproductline.tpl.php
@@ -41,12 +41,12 @@ print '<td>'.$this->tpl['label'].'</td>';
 print '<td class="right">'.$this->tpl['qty'].(($this->tpl['efficiency'] > 0 && $this->tpl['efficiency'] < 1) ? ' / '.$form->textwithpicto($this->tpl['efficiency'], $langs->trans("ValueOfMeansLoss")).' = '.$qtytoconsumeforline : '').'</td>';
 print '<td class="center">'.(empty($this->tpl['stock']) ? 0 : price2num($this->tpl['stock'], 'MS'));
 if ($this->tpl['seuil_stock_alerte'] != '' && ($this->tpl['stock'] < $this->tpl['seuil_stock_alerte'])) {
-    print ' '.img_warning($langs->trans("StockLowerThanLimit", $this->tpl['seuil_stock_alerte']));
+	print ' '.img_warning($langs->trans("StockLowerThanLimit", $this->tpl['seuil_stock_alerte']));
 }
 print '</td>';
 print '<td class="center">'.((empty($this->tpl['virtual_stock']) ? 0 : price2num($this->tpl['virtual_stock'], 'MS')));
 if ($this->tpl['seuil_stock_alerte'] != '' && ($this->tpl['virtual_stock'] < $this->tpl['seuil_stock_alerte'])) {
-    print ' '.img_warning($langs->trans("StockLowerThanLimit", $this->tpl['seuil_stock_alerte']));
+	print ' '.img_warning($langs->trans("StockLowerThanLimit", $this->tpl['seuil_stock_alerte']));
 }
 print '</td>';
 print '<td class="center">'.($this->tpl['qty_frozen'] ? yn($this->tpl['qty_frozen']) : '').'</td>';

From de30b68f9e7241a8b0c1c5d7f5519d98de84baa1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 20 Jan 2022 16:32:30 +0100
Subject: [PATCH 195/316] Code comment

---
 htdocs/admin/agenda.php                                |  1 +
 htdocs/core/class/CSMSFile.class.php                   | 10 +++++++---
 .../interface_50_modAgenda_ActionsAuto.class.php       |  6 ++++--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php
index 730983ad090..a730f199213 100644
--- a/htdocs/admin/agenda.php
+++ b/htdocs/admin/agenda.php
@@ -192,6 +192,7 @@ if (!empty($triggers)) {
 			}
 
 			if ($search_event === '' || preg_match('/'.preg_quote($search_event, '/').'/i', $trigger['code'])) {
+				print '<!-- '.$trigger['position'].' -->';
 				print '<tr class="oddeven">';
 				print '<td>'.$trigger['code'].'</td>';
 				print '<td>'.$trigger['label'].'</td>';
diff --git a/htdocs/core/class/CSMSFile.class.php b/htdocs/core/class/CSMSFile.class.php
index 8d5bcf7dc50..3f082ba6d53 100644
--- a/htdocs/core/class/CSMSFile.class.php
+++ b/htdocs/core/class/CSMSFile.class.php
@@ -29,8 +29,9 @@
 
 /**
  *		Class to send SMS
- *      Usage: $smsfile = new CSMSFile($subject,$sendto,$replyto,$message,$filepath,$mimetype,$filename,$cc,$ccc,$deliveryreceipt,$msgishtml,$errors_to);
- *             $smsfile->sendfile();
+ *      Usage:	$smsfile = new CSMSFile($subject,$sendto,$replyto,$message,$filepath,$mimetype,$filename,$cc,$ccc,$deliveryreceipt,$msgishtml,$errors_to);
+ *      		$smsfile->socid=...; $smsfile->contact_id=...; $smsfile->member_id=...; $smsfile->fk_project=...;
+ *             	$smsfile->sendfile();
  */
 class CSMSFile
 {
@@ -48,7 +49,8 @@ class CSMSFile
 	public $nostop;
 
 	public $socid;
-	public $contactid;
+	public $contact_id;
+	public $member_id;
 
 	public $fk_project;
 
@@ -135,6 +137,7 @@ class CSMSFile
 
 				$sms->socid = $this->socid;
 				$sms->contact_id = $this->contact_id;
+				$sms->member_id = $this->member_id;
 				$sms->project = $this->fk_project;
 
 				$res = $sms->SmsSend();
@@ -167,6 +170,7 @@ class CSMSFile
 
 					$sms->socid = $this->socid;
 					$sms->contact_id = $this->contact_id;
+					$sms->member_id = $this->member_id;
 					$sms->fk_project = $this->fk_project;
 
 					$res = $sms->SmsSend();
diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index d441d364f4b..2ff5d3f9c43 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -66,7 +66,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 	 *      $object->elementtype (->element of object to link action to)
 	 *      $object->module (if defined, elementtype in llx_actioncomm will be elementtype@module)
 	 *
-	 * @param string		$action		Event action code ('CONTRACT_MODIFY', 'RECRUITMENTCANDIDATURE_MODIFIY', ...)
+	 * @param string		$action		Event action code ('CONTRACT_MODIFY', 'RECRUITMENTCANDIDATURE_MODIFIY', or example by external module: 'SENTBYSMS'...)
 	 * @param Object		$object     Object
 	 * @param User		    $user       Object user
 	 * @param Translate 	$langs      Object langs
@@ -88,6 +88,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		//var_dump($action.' - '.$conf->global->$key);exit;
 
 		// Do not log events not enabled for this action
+		// GUI allow to set this option only if entry exists into table llx_c_action_trigger
 		if (empty($conf->global->$key)) {
 			return 0;
 		}
@@ -887,8 +888,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		} else {
 			// TODO Merge all previous cases into this generic one
 			// $action = BILL_DELETE, TICKET_CREATE, TICKET_MODIFY, TICKET_DELETE, CONTACT_SENTBYMAIL, RECRUITMENTCANDIDATURE_MODIFY, ...
+			// Can also be a value defined by an external module like SENTBYSMS, COMPANY_SENTBYSMS, MEMBER_SENTBYSMS, ...
 			// Note: We are here only if $conf->global->MAIN_AGENDA_ACTIONAUTO_action is on (tested at begining of this function).
-			// Note that these key can be set in agenda setup, only if defined into c_action_trigger
+			// Note that these key can be set in agenda setup, only if defined into llx_c_action_trigger
 			// Load translation files required by the page
 			if (empty($object->actionmsg2)) {
 				$langs->loadLangs(array("agenda", "other"));

From 259c94e3201d4683aa738042d8e781cf94648806 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cserveny=2C=20Tam=C3=A1s?= <cserveny.tamas@gmail.com>
Date: Thu, 20 Jan 2022 17:57:21 +0100
Subject: [PATCH 196/316] fix docker build setup

---
 build/docker/Dockerfile         | 13 ++++---------
 build/docker/docker-compose.yml |  3 +++
 htdocs/install/default.css      |  2 --
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile
index dca74e9e720..e38ad20931d 100644
--- a/build/docker/Dockerfile
+++ b/build/docker/Dockerfile
@@ -39,15 +39,10 @@ RUN chmod +x /usr/local/bin/docker-run.sh
 
 RUN pecl install xdebug && docker-php-ext-enable xdebug
 RUN echo 'zend_extension="/usr/local/lib/php/extensions/no-debug-non-zts-20180731/xdebug.so"' >> ${PHP_INI_DIR}/php.ini
-RUN echo 'xdebug.remote_autostart=1' >> ${PHP_INI_DIR}/php.ini
-RUN echo 'xdebug.remote_enable=1' >> ${PHP_INI_DIR}/php.ini
-RUN echo 'xdebug.default_enable=1' >> ${PHP_INI_DIR}/php.ini
-#RUN echo 'xdebug.remote_host=docker.host' >> ${PHP_INI_DIR}/php.ini
-RUN echo 'xdebug.remote_port=9000' >> ${PHP_INI_DIR}/php.ini
-RUN echo 'xdebug.remote_connect_back=1' >> ${PHP_INI_DIR}/php.ini
-RUN echo 'xdebug.profiler_enable=0' >> ${PHP_INI_DIR}/php.ini
-RUN echo 'xdebug.remote_log="/tmp/xdebug.log"' >> ${PHP_INI_DIR}/php.ini
-#RUN echo 'localhost docker.host' >> /etc/hosts
+RUN echo 'xdebug.mode=debug' >> ${PHP_INI_DIR}/php.ini
+RUN echo 'xdebug.client_host=host.docker.internal' >> ${PHP_INI_DIR}/php.ini
+RUN echo 'xdebug.client_port=9003' >> ${PHP_INI_DIR}/php.ini
+RUN echo 'xdebug.idekey="netbeans-xdebug"' >> ${PHP_INI_DIR}/php.ini
 
 # set up sendmail config, to use maildev
 RUN echo "account default" > /etc/msmtprc
diff --git a/build/docker/docker-compose.yml b/build/docker/docker-compose.yml
index 2167f069f25..8994043cd8a 100644
--- a/build/docker/docker-compose.yml
+++ b/build/docker/docker-compose.yml
@@ -46,6 +46,9 @@ services:
         networks:
             - internal-pod
             - external-pod
+        extra_hosts:
+            - "localhost.localdomain:127.0.0.1"
+            - "host.docker.internal:host-gateway"
 
     mail:
         image: maildev/maildev
diff --git a/htdocs/install/default.css b/htdocs/install/default.css
index 726f1d2d0c2..96c671d1472 100644
--- a/htdocs/install/default.css
+++ b/htdocs/install/default.css
@@ -473,5 +473,3 @@ table.tablesupport {
 		width: 100%;
 	}
 }
-	
-}

From b2f6de06d5227d4023a883c8084c6cc2236b25e7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 20 Jan 2022 18:09:30 +0100
Subject: [PATCH 197/316] Fix the localtax were not saved on price when no code
 was set

---
 htdocs/core/lib/functions.lib.php |   2 +-
 htdocs/product/price.php          | 182 +++++++++++++++++++++++++-----
 htdocs/theme/eldy/global.inc.php  |   2 +-
 htdocs/theme/md/style.css.php     |   2 +-
 4 files changed, 154 insertions(+), 34 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 975e1f20a88..ce8e02e9cee 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1897,7 +1897,7 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 
 	if ($object->element == 'product') {
 		$width = 80;
-		$cssclass = 'photoref';
+		$cssclass = 'photowithmargin photoref';
 		$showimage = $object->is_photo_available($conf->product->multidir_output[$entity]);
 		$maxvisiblephotos = (isset($conf->global->PRODUCT_MAX_VISIBLE_PHOTO) ? $conf->global->PRODUCT_MAX_VISIBLE_PHOTO : 5);
 		if ($conf->browser->layout == 'phone') {
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 4c14add3660..d21574e696e 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -143,15 +143,35 @@ if (empty($reshook)) {
 			$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
 			$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($mysoc->country_code)."'";
 			$sql .= " AND t.taux = ".((float) $tva_tx)." AND t.active = 1";
-			$sql .= " AND t.code ='".$db->escape($vatratecode)."'";
+			$sql .= " AND t.code = '".$db->escape($vatratecode)."'";
 			$resql = $db->query($sql);
 			if ($resql) {
 				$obj = $db->fetch_object($resql);
-				$npr = $obj->recuperableonly;
-				$localtax1 = $obj->localtax1;
-				$localtax2 = $obj->localtax2;
-				$localtax1_type = $obj->localtax1_type;
-				$localtax2_type = $obj->localtax2_type;
+				if ($obj) {
+					$npr = $obj->recuperableonly;
+					$localtax1 = $obj->localtax1;
+					$localtax2 = $obj->localtax2;
+					$localtax1_type = $obj->localtax1_type;
+					$localtax2_type = $obj->localtax2_type;
+				}
+			}
+		} else {
+			// Get record with empty code
+			$sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
+			$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+			$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($mysoc->country_code)."'";
+			$sql .= " AND t.taux = ".((float) $tva_tx)." AND t.active = 1";
+			$sql .= " AND t.code = ''";
+			$resql = $db->query($sql);
+			if ($resql) {
+				$obj = $db->fetch_object($resql);
+				if ($obj) {
+					$npr = $obj->recuperableonly;
+					$localtax1 = $obj->localtax1;
+					$localtax2 = $obj->localtax2;
+					$localtax1_type = $obj->localtax1_type;
+					$localtax2_type = $obj->localtax2_type;
+				}
 			}
 		}
 
@@ -258,11 +278,37 @@ if (empty($reshook)) {
 					$resql = $db->query($sql);
 					if ($resql) {
 						$obj = $db->fetch_object($resql);
-						$npr = $obj->recuperableonly;
-						$localtax1 = $obj->localtax1;
-						$localtax2 = $obj->localtax2;
-						$localtax1_type = $obj->localtax1_type;
-						$localtax2_type = $obj->localtax2_type;
+						if ($obj) {
+							$npr = $obj->recuperableonly;
+							$localtax1 = $obj->localtax1;
+							$localtax2 = $obj->localtax2;
+							$localtax1_type = $obj->localtax1_type;
+							$localtax2_type = $obj->localtax2_type;
+						}
+
+						// If spain, we don't use the localtax found into tax record in database with same code, but using the get_localtax rule.
+						if (in_array($mysoc->country_code, array('ES'))) {
+							$localtax1 = get_localtax($tva_tx, 1);
+							$localtax2 = get_localtax($tva_tx, 2);
+						}
+					}
+				} else {
+					// Get record with empty code
+					$sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
+					$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+					$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($mysoc->country_code)."'";
+					$sql .= " AND t.taux = ".((float) $tva_tx)." AND t.active = 1";
+					$sql .= " AND t.code = ''";
+					$resql = $db->query($sql);
+					if ($resql) {
+						$obj = $db->fetch_object($resql);
+						if ($obj) {
+							$npr = $obj->recuperableonly;
+							$localtax1 = $obj->localtax1;
+							$localtax2 = $obj->localtax2;
+							$localtax1_type = $obj->localtax1_type;
+							$localtax2_type = $obj->localtax2_type;
+						}
 					}
 				}
 
@@ -311,19 +357,40 @@ if (empty($reshook)) {
 				$resql = $db->query($sql);
 				if ($resql) {
 					$obj = $db->fetch_object($resql);
-					$npr = $obj->recuperableonly;
-					$localtax1 = $obj->localtax1;
-					$localtax2 = $obj->localtax2;
-					$localtax1_type = $obj->localtax1_type;
-					$localtax2_type = $obj->localtax2_type;
+					if ($obj) {
+						$npr = $obj->recuperableonly;
+						$localtax1 = $obj->localtax1;
+						$localtax2 = $obj->localtax2;
+						$localtax1_type = $obj->localtax1_type;
+						$localtax2_type = $obj->localtax2_type;
+					}
 
-					// If spain, we don't use the localtax found into tax record in database with same code, but using the get_localtax rule
+					// If spain, we don't use the localtax found into tax record in database with same code, but using the get_localtax rule.
 					if (in_array($mysoc->country_code, array('ES'))) {
 						$localtax1 = get_localtax($tva_tx, 1);
 						$localtax2 = get_localtax($tva_tx, 2);
 					}
 				}
+			} else {
+				// Get record with empty code
+				$sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
+				$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+				$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($mysoc->country_code)."'";
+				$sql .= " AND t.taux = ".((float) $tva_tx)." AND t.active = 1";
+				$sql .= " AND t.code = ''";
+				$resql = $db->query($sql);
+				if ($resql) {
+					$obj = $db->fetch_object($resql);
+					if ($obj) {
+						$npr = $obj->recuperableonly;
+						$localtax1 = $obj->localtax1;
+						$localtax2 = $obj->localtax2;
+						$localtax1_type = $obj->localtax1_type;
+						$localtax2_type = $obj->localtax2_type;
+					}
+				}
 			}
+
 			$pricestoupdate[0] = array(
 				'price' => $newprice,
 				'price_min' => $newprice_min,
@@ -534,11 +601,37 @@ if (empty($reshook)) {
 			$resql = $db->query($sql);
 			if ($resql) {
 				$obj = $db->fetch_object($resql);
-				$npr = $obj->recuperableonly;
-				$localtax1 = $obj->localtax1;
-				$localtax2 = $obj->localtax2;
-				$localtax1_type = $obj->localtax1_type;
-				$localtax2_type = $obj->localtax2_type;
+				if ($obj) {
+					$npr = $obj->recuperableonly;
+					$localtax1 = $obj->localtax1;
+					$localtax2 = $obj->localtax2;
+					$localtax1_type = $obj->localtax1_type;
+					$localtax2_type = $obj->localtax2_type;
+				}
+
+				// If spain, we don't use the localtax found into tax record in database with same code, but using the get_localtax rule.
+				if (in_array($mysoc->country_code, array('ES'))) {
+					$localtax1 = get_localtax($tva_tx, 1);
+					$localtax2 = get_localtax($tva_tx, 2);
+				}
+			}
+		} else {
+			// Get record with empty code
+			$sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
+			$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+			$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($mysoc->country_code)."'";
+			$sql .= " AND t.taux = ".((float) $tva_tx)." AND t.active = 1";
+			$sql .= " AND t.code = ''";
+			$resql = $db->query($sql);
+			if ($resql) {
+				$obj = $db->fetch_object($resql);
+				if ($obj) {
+					$npr = $obj->recuperableonly;
+					$localtax1 = $obj->localtax1;
+					$localtax2 = $obj->localtax2;
+					$localtax1_type = $obj->localtax1_type;
+					$localtax2_type = $obj->localtax2_type;
+				}
 			}
 		}
 
@@ -627,11 +720,37 @@ if (empty($reshook)) {
 			$resql = $db->query($sql);
 			if ($resql) {
 				$obj = $db->fetch_object($resql);
-				$npr = $obj->recuperableonly;
-				$localtax1 = $obj->localtax1;
-				$localtax2 = $obj->localtax2;
-				$localtax1_type = $obj->localtax1_type;
-				$localtax2_type = $obj->localtax2_type;
+				if ($obj) {
+					$npr = $obj->recuperableonly;
+					$localtax1 = $obj->localtax1;
+					$localtax2 = $obj->localtax2;
+					$localtax1_type = $obj->localtax1_type;
+					$localtax2_type = $obj->localtax2_type;
+				}
+
+				// If spain, we don't use the localtax found into tax record in database with same code, but using the get_localtax rule.
+				if (in_array($mysoc->country_code, array('ES'))) {
+					$localtax1 = get_localtax($tva_tx, 1);
+					$localtax2 = get_localtax($tva_tx, 2);
+				}
+			}
+		} else {
+			// Get record with empty code
+			$sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
+			$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+			$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($mysoc->country_code)."'";
+			$sql .= " AND t.taux = ".((float) $tva_tx)." AND t.active = 1";
+			$sql .= " AND t.code = ''";
+			$resql = $db->query($sql);
+			if ($resql) {
+				$obj = $db->fetch_object($resql);
+				if ($obj) {
+					$npr = $obj->recuperableonly;
+					$localtax1 = $obj->localtax1;
+					$localtax2 = $obj->localtax2;
+					$localtax1_type = $obj->localtax1_type;
+					$localtax2_type = $obj->localtax2_type;
+				}
 			}
 		}
 
@@ -829,22 +948,23 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 			}
 
 			// TVA
+			print '<!-- Default VAT Rate -->';
 			print '<tr><td class="titlefieldcreate">'.$langs->trans("DefaultTaxRate").'</td><td>';
 
 			$positiverates = '';
 			if (price2num($object->tva_tx)) {
-				$positiverates .= ($positiverates ? '/' : '').price2num($object->tva_tx);
+				$positiverates .= ($positiverates ? '<span class="opacitymedium">/</span>' : '').price2num($object->tva_tx);
 			}
 			if (price2num($object->localtax1_type)) {
-				$positiverates .= ($positiverates ? '/' : '').price2num($object->localtax1_tx);
+				$positiverates .= ($positiverates ? '<span class="opacitymedium">/</span>' : '').price2num($object->localtax1_tx);
 			}
 			if (price2num($object->localtax2_type)) {
-				$positiverates .= ($positiverates ? '/' : '').price2num($object->localtax2_tx);
+				$positiverates .= ($positiverates ? '<span class="opacitymedium">/</span>' : '').price2num($object->localtax2_tx);
 			}
 			if (empty($positiverates)) {
 				$positiverates = '0';
 			}
-			echo vatrate($positiverates.($object->default_vat_code ? ' ('.$object->default_vat_code.')' : ''), '%', $object->tva_npr);
+			print vatrate($positiverates.($object->default_vat_code ? ' ('.$object->default_vat_code.')' : ''), true, $object->tva_npr, 1);
 			/*
 			if ($object->default_vat_code)
 			{
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 0ffc4e84786..a830002d197 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -4558,7 +4558,7 @@ label.radioprivate {
 /*	margin-bottom: 2px;
 	margin-top: 2px; */
 }
-div.divphotoref > a > .photowithmargin {		/* Margin right for photo not inside a div.photoref frame only */
+div.divphotoref > img.photowithmargin, div.divphotoref > a > .photowithmargin {		/* Margin right for photo not inside a div.photoref frame only */
 	margin-right: 15px;
 }
 .photowithborder {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 1d794d60de1..6d052a2dc03 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -4492,7 +4492,7 @@ label.radioprivate {
 /*	margin-bottom: 2px;
 	margin-top: 2px; */
 }
-div.divphotoref > a > .photowithmargin {		/* Margin right for photo not inside a div.photoref frame only */
+div.divphotoref > img.photowithmargin, div.divphotoref > a > .photowithmargin {		/* Margin right for photo not inside a div.photoref frame only */
 	margin-right: 15px;
 }
 .photowithborder {

From 8c3b28b0d0e7f721bc215a4d018dbc957a28914a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 20 Jan 2022 18:50:18 +0100
Subject: [PATCH 198/316] Introduce method for future

---
 htdocs/core/db/DoliDB.class.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php
index fdbb755637a..4476228d509 100644
--- a/htdocs/core/db/DoliDB.class.php
+++ b/htdocs/core/db/DoliDB.class.php
@@ -70,6 +70,18 @@ abstract class DoliDB implements Database
 	/** @var string */
 	public $error;
 
+
+
+	/**
+	 *	Return the DB prefix
+	 *
+	 *	@return string		The DB prefix
+	 */
+	public function prefix()
+	{
+		return (empty($this->prefix_db) ? MAIN_DB_PREFIX : $this->prefix_db);
+	}
+
 	/**
 	 *	Format a SQL IF
 	 *

From d9b0af616e4ad5b56adf9a0a3edbf676a8236628 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 20 Jan 2022 18:09:30 +0100
Subject: [PATCH 199/316] Fix the localtax were not saved on price when no code
 was set

---
 htdocs/core/lib/functions.lib.php |   2 +-
 htdocs/product/price.php          | 182 +++++++++++++++++++++++++-----
 htdocs/theme/eldy/global.inc.php  |   2 +-
 htdocs/theme/md/style.css.php     |   2 +-
 4 files changed, 154 insertions(+), 34 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 535eb7f226e..76ac0df05b1 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1897,7 +1897,7 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 
 	if ($object->element == 'product') {
 		$width = 80;
-		$cssclass = 'photoref';
+		$cssclass = 'photowithmargin photoref';
 		$showimage = $object->is_photo_available($conf->product->multidir_output[$entity]);
 		$maxvisiblephotos = (isset($conf->global->PRODUCT_MAX_VISIBLE_PHOTO) ? $conf->global->PRODUCT_MAX_VISIBLE_PHOTO : 5);
 		if ($conf->browser->layout == 'phone') {
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 4c14add3660..d21574e696e 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -143,15 +143,35 @@ if (empty($reshook)) {
 			$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
 			$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($mysoc->country_code)."'";
 			$sql .= " AND t.taux = ".((float) $tva_tx)." AND t.active = 1";
-			$sql .= " AND t.code ='".$db->escape($vatratecode)."'";
+			$sql .= " AND t.code = '".$db->escape($vatratecode)."'";
 			$resql = $db->query($sql);
 			if ($resql) {
 				$obj = $db->fetch_object($resql);
-				$npr = $obj->recuperableonly;
-				$localtax1 = $obj->localtax1;
-				$localtax2 = $obj->localtax2;
-				$localtax1_type = $obj->localtax1_type;
-				$localtax2_type = $obj->localtax2_type;
+				if ($obj) {
+					$npr = $obj->recuperableonly;
+					$localtax1 = $obj->localtax1;
+					$localtax2 = $obj->localtax2;
+					$localtax1_type = $obj->localtax1_type;
+					$localtax2_type = $obj->localtax2_type;
+				}
+			}
+		} else {
+			// Get record with empty code
+			$sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
+			$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+			$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($mysoc->country_code)."'";
+			$sql .= " AND t.taux = ".((float) $tva_tx)." AND t.active = 1";
+			$sql .= " AND t.code = ''";
+			$resql = $db->query($sql);
+			if ($resql) {
+				$obj = $db->fetch_object($resql);
+				if ($obj) {
+					$npr = $obj->recuperableonly;
+					$localtax1 = $obj->localtax1;
+					$localtax2 = $obj->localtax2;
+					$localtax1_type = $obj->localtax1_type;
+					$localtax2_type = $obj->localtax2_type;
+				}
 			}
 		}
 
@@ -258,11 +278,37 @@ if (empty($reshook)) {
 					$resql = $db->query($sql);
 					if ($resql) {
 						$obj = $db->fetch_object($resql);
-						$npr = $obj->recuperableonly;
-						$localtax1 = $obj->localtax1;
-						$localtax2 = $obj->localtax2;
-						$localtax1_type = $obj->localtax1_type;
-						$localtax2_type = $obj->localtax2_type;
+						if ($obj) {
+							$npr = $obj->recuperableonly;
+							$localtax1 = $obj->localtax1;
+							$localtax2 = $obj->localtax2;
+							$localtax1_type = $obj->localtax1_type;
+							$localtax2_type = $obj->localtax2_type;
+						}
+
+						// If spain, we don't use the localtax found into tax record in database with same code, but using the get_localtax rule.
+						if (in_array($mysoc->country_code, array('ES'))) {
+							$localtax1 = get_localtax($tva_tx, 1);
+							$localtax2 = get_localtax($tva_tx, 2);
+						}
+					}
+				} else {
+					// Get record with empty code
+					$sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
+					$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+					$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($mysoc->country_code)."'";
+					$sql .= " AND t.taux = ".((float) $tva_tx)." AND t.active = 1";
+					$sql .= " AND t.code = ''";
+					$resql = $db->query($sql);
+					if ($resql) {
+						$obj = $db->fetch_object($resql);
+						if ($obj) {
+							$npr = $obj->recuperableonly;
+							$localtax1 = $obj->localtax1;
+							$localtax2 = $obj->localtax2;
+							$localtax1_type = $obj->localtax1_type;
+							$localtax2_type = $obj->localtax2_type;
+						}
 					}
 				}
 
@@ -311,19 +357,40 @@ if (empty($reshook)) {
 				$resql = $db->query($sql);
 				if ($resql) {
 					$obj = $db->fetch_object($resql);
-					$npr = $obj->recuperableonly;
-					$localtax1 = $obj->localtax1;
-					$localtax2 = $obj->localtax2;
-					$localtax1_type = $obj->localtax1_type;
-					$localtax2_type = $obj->localtax2_type;
+					if ($obj) {
+						$npr = $obj->recuperableonly;
+						$localtax1 = $obj->localtax1;
+						$localtax2 = $obj->localtax2;
+						$localtax1_type = $obj->localtax1_type;
+						$localtax2_type = $obj->localtax2_type;
+					}
 
-					// If spain, we don't use the localtax found into tax record in database with same code, but using the get_localtax rule
+					// If spain, we don't use the localtax found into tax record in database with same code, but using the get_localtax rule.
 					if (in_array($mysoc->country_code, array('ES'))) {
 						$localtax1 = get_localtax($tva_tx, 1);
 						$localtax2 = get_localtax($tva_tx, 2);
 					}
 				}
+			} else {
+				// Get record with empty code
+				$sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
+				$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+				$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($mysoc->country_code)."'";
+				$sql .= " AND t.taux = ".((float) $tva_tx)." AND t.active = 1";
+				$sql .= " AND t.code = ''";
+				$resql = $db->query($sql);
+				if ($resql) {
+					$obj = $db->fetch_object($resql);
+					if ($obj) {
+						$npr = $obj->recuperableonly;
+						$localtax1 = $obj->localtax1;
+						$localtax2 = $obj->localtax2;
+						$localtax1_type = $obj->localtax1_type;
+						$localtax2_type = $obj->localtax2_type;
+					}
+				}
 			}
+
 			$pricestoupdate[0] = array(
 				'price' => $newprice,
 				'price_min' => $newprice_min,
@@ -534,11 +601,37 @@ if (empty($reshook)) {
 			$resql = $db->query($sql);
 			if ($resql) {
 				$obj = $db->fetch_object($resql);
-				$npr = $obj->recuperableonly;
-				$localtax1 = $obj->localtax1;
-				$localtax2 = $obj->localtax2;
-				$localtax1_type = $obj->localtax1_type;
-				$localtax2_type = $obj->localtax2_type;
+				if ($obj) {
+					$npr = $obj->recuperableonly;
+					$localtax1 = $obj->localtax1;
+					$localtax2 = $obj->localtax2;
+					$localtax1_type = $obj->localtax1_type;
+					$localtax2_type = $obj->localtax2_type;
+				}
+
+				// If spain, we don't use the localtax found into tax record in database with same code, but using the get_localtax rule.
+				if (in_array($mysoc->country_code, array('ES'))) {
+					$localtax1 = get_localtax($tva_tx, 1);
+					$localtax2 = get_localtax($tva_tx, 2);
+				}
+			}
+		} else {
+			// Get record with empty code
+			$sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
+			$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+			$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($mysoc->country_code)."'";
+			$sql .= " AND t.taux = ".((float) $tva_tx)." AND t.active = 1";
+			$sql .= " AND t.code = ''";
+			$resql = $db->query($sql);
+			if ($resql) {
+				$obj = $db->fetch_object($resql);
+				if ($obj) {
+					$npr = $obj->recuperableonly;
+					$localtax1 = $obj->localtax1;
+					$localtax2 = $obj->localtax2;
+					$localtax1_type = $obj->localtax1_type;
+					$localtax2_type = $obj->localtax2_type;
+				}
 			}
 		}
 
@@ -627,11 +720,37 @@ if (empty($reshook)) {
 			$resql = $db->query($sql);
 			if ($resql) {
 				$obj = $db->fetch_object($resql);
-				$npr = $obj->recuperableonly;
-				$localtax1 = $obj->localtax1;
-				$localtax2 = $obj->localtax2;
-				$localtax1_type = $obj->localtax1_type;
-				$localtax2_type = $obj->localtax2_type;
+				if ($obj) {
+					$npr = $obj->recuperableonly;
+					$localtax1 = $obj->localtax1;
+					$localtax2 = $obj->localtax2;
+					$localtax1_type = $obj->localtax1_type;
+					$localtax2_type = $obj->localtax2_type;
+				}
+
+				// If spain, we don't use the localtax found into tax record in database with same code, but using the get_localtax rule.
+				if (in_array($mysoc->country_code, array('ES'))) {
+					$localtax1 = get_localtax($tva_tx, 1);
+					$localtax2 = get_localtax($tva_tx, 2);
+				}
+			}
+		} else {
+			// Get record with empty code
+			$sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
+			$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+			$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($mysoc->country_code)."'";
+			$sql .= " AND t.taux = ".((float) $tva_tx)." AND t.active = 1";
+			$sql .= " AND t.code = ''";
+			$resql = $db->query($sql);
+			if ($resql) {
+				$obj = $db->fetch_object($resql);
+				if ($obj) {
+					$npr = $obj->recuperableonly;
+					$localtax1 = $obj->localtax1;
+					$localtax2 = $obj->localtax2;
+					$localtax1_type = $obj->localtax1_type;
+					$localtax2_type = $obj->localtax2_type;
+				}
 			}
 		}
 
@@ -829,22 +948,23 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 			}
 
 			// TVA
+			print '<!-- Default VAT Rate -->';
 			print '<tr><td class="titlefieldcreate">'.$langs->trans("DefaultTaxRate").'</td><td>';
 
 			$positiverates = '';
 			if (price2num($object->tva_tx)) {
-				$positiverates .= ($positiverates ? '/' : '').price2num($object->tva_tx);
+				$positiverates .= ($positiverates ? '<span class="opacitymedium">/</span>' : '').price2num($object->tva_tx);
 			}
 			if (price2num($object->localtax1_type)) {
-				$positiverates .= ($positiverates ? '/' : '').price2num($object->localtax1_tx);
+				$positiverates .= ($positiverates ? '<span class="opacitymedium">/</span>' : '').price2num($object->localtax1_tx);
 			}
 			if (price2num($object->localtax2_type)) {
-				$positiverates .= ($positiverates ? '/' : '').price2num($object->localtax2_tx);
+				$positiverates .= ($positiverates ? '<span class="opacitymedium">/</span>' : '').price2num($object->localtax2_tx);
 			}
 			if (empty($positiverates)) {
 				$positiverates = '0';
 			}
-			echo vatrate($positiverates.($object->default_vat_code ? ' ('.$object->default_vat_code.')' : ''), '%', $object->tva_npr);
+			print vatrate($positiverates.($object->default_vat_code ? ' ('.$object->default_vat_code.')' : ''), true, $object->tva_npr, 1);
 			/*
 			if ($object->default_vat_code)
 			{
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 0ffc4e84786..a830002d197 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -4558,7 +4558,7 @@ label.radioprivate {
 /*	margin-bottom: 2px;
 	margin-top: 2px; */
 }
-div.divphotoref > a > .photowithmargin {		/* Margin right for photo not inside a div.photoref frame only */
+div.divphotoref > img.photowithmargin, div.divphotoref > a > .photowithmargin {		/* Margin right for photo not inside a div.photoref frame only */
 	margin-right: 15px;
 }
 .photowithborder {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 1d794d60de1..6d052a2dc03 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -4492,7 +4492,7 @@ label.radioprivate {
 /*	margin-bottom: 2px;
 	margin-top: 2px; */
 }
-div.divphotoref > a > .photowithmargin {		/* Margin right for photo not inside a div.photoref frame only */
+div.divphotoref > img.photowithmargin, div.divphotoref > a > .photowithmargin {		/* Margin right for photo not inside a div.photoref frame only */
 	margin-right: 15px;
 }
 .photowithborder {

From 050b5314035f86b1ae5183e456a40f5fc0c1fbc0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 20 Jan 2022 19:01:04 +0100
Subject: [PATCH 200/316] Fix troubles in select_language when selected is
 array

---
 htdocs/core/class/html.formadmin.class.php | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/class/html.formadmin.class.php b/htdocs/core/class/html.formadmin.class.php
index 3240d64c893..99ce3bb0201 100644
--- a/htdocs/core/class/html.formadmin.class.php
+++ b/htdocs/core/class/html.formadmin.class.php
@@ -73,15 +73,19 @@ class FormAdmin
 
 		$langs_available = $langs->get_available_languages(DOL_DOCUMENT_ROOT, 12, 0, $mainlangonly);
 
-		// If the language to select is not inside the list of available language and empty value is not available, we must find
-		// an alternative as the language code to pre-select (to avoid to have first element in list pre-selected).
-		if ($selected && !array_key_exists($selected, $langs_available) && empty($showempty)) {
-			$tmparray = explode('_', $selected);
-			if (!empty($tmparray[1])) {
-				$selected = getLanguageCodeFromCountryCode($tmparray[1]);
-			}
-			if (empty($selected)) {
-				$selected = $langs->defaultlang;
+		// If empty value is not allowed and the language to select is not inside the list of available language and we must find
+		// an alternative of the language code to pre-select (to avoid to have first element in list pre-selected).
+		if ($selected && empty($showempty)) {
+			if (!is_array($selected) && !array_key_exists($selected, $langs_available)) {
+				$tmparray = explode('_', $selected);
+				if (!empty($tmparray[1])) {
+					$selected = getLanguageCodeFromCountryCode($tmparray[1]);
+				}
+				if (empty($selected)) {
+					$selected = $langs->defaultlang;
+				}
+			} else {
+				// If the preselected value is an array, we do not try to find alternative to preselect
 			}
 		}
 

From 56dd41324c9eed96541696c5b2659259dfac2718 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Thu, 20 Jan 2022 19:57:48 +0100
Subject: [PATCH 201/316] Update commande.class.php

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

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 1b525ce9a0b..26a52836744 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -490,7 +490,11 @@ class Commande extends CommonOrder
 		$sql .= " SET ref = '".$this->db->escape($num)."',";
 		$sql .= " fk_statut = ".self::STATUS_VALIDATED.",";
 		$sql .= " date_valid='".$this->db->idate($now)."',";
+<<<<<<< Updated upstream
 		$sql .= " fk_user_valid = ".((int) $user->id)."',";
+=======
+		$sql .= " fk_user_valid = ".((int) $user->id).",";
+>>>>>>> Stashed changes
 		$sql .= " fk_user_modif = ".((int) $user->id);
 		$sql .= " WHERE rowid = ".((int) $this->id);
 

From b89947ff7caf55e5b637c0fef78570ce7560dd78 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Thu, 20 Jan 2022 19:58:31 +0100
Subject: [PATCH 202/316] Update commande.class.php

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

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 26a52836744..652e7a72d4a 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -490,11 +490,7 @@ class Commande extends CommonOrder
 		$sql .= " SET ref = '".$this->db->escape($num)."',";
 		$sql .= " fk_statut = ".self::STATUS_VALIDATED.",";
 		$sql .= " date_valid='".$this->db->idate($now)."',";
-<<<<<<< Updated upstream
-		$sql .= " fk_user_valid = ".((int) $user->id)."',";
-=======
 		$sql .= " fk_user_valid = ".((int) $user->id).",";
->>>>>>> Stashed changes
 		$sql .= " fk_user_modif = ".((int) $user->id);
 		$sql .= " WHERE rowid = ".((int) $this->id);
 

From 0a8eb3ee00b4e2aa607660b661160705ffcf60e0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 20 Jan 2022 20:03:24 +0100
Subject: [PATCH 203/316] Doc

---
 SECURITY.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SECURITY.md b/SECURITY.md
index 4e7e5fa933a..cadd4a23791 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -67,7 +67,7 @@ Scope is the web application (back office) and the APIs.
 * Remote code execution (RCE)
 * Local files access and manipulation (LFI, RFI, XXE, SSRF, XSPA)
 * Code injections (HTML, JS, SQL, PHP, ...)
-* Cross-Site Scripting (XSS), except from setup page of module "External web site" (allowing any content here, editable by admin user only, is accepted on purpose or into module "Web site" when permission to edit website content is allowed).
+* Cross-Site Scripting (XSS), except from setup page of module "External web site" (allowing any content here, editable by admin user only, is accepted on purpose) and except into module "Web site" when permission to edit website content is allowed (injecting any data in this case is allowed too).
 * Cross-Site Requests Forgery (CSRF) with real security impact (when using GET URLs, CSRF are qualified only for creating, updating or deleting data from pages restricted to admin users)
 * Open redirect
 * Broken authentication & session management

From beee7fc5d3f2a88ae12520eeb91aff3bac5151ae Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 20 Jan 2022 20:03:58 +0100
Subject: [PATCH 204/316] Fix #yogosha8484

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

diff --git a/htdocs/core/lib/geturl.lib.php b/htdocs/core/lib/geturl.lib.php
index 79ed4821ac8..50ae7c33561 100644
--- a/htdocs/core/lib/geturl.lib.php
+++ b/htdocs/core/lib/geturl.lib.php
@@ -215,7 +215,7 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
 			}
 
 			// Common check on ip (local and external)
-			$arrayofmetadataserver = array('100.100.100.200' => 'Alibaba', '192.0.0.192'=> 'Oracle');
+			$arrayofmetadataserver = array('100.100.100.200' => 'Alibaba', '192.0.0.192'=> 'Oracle', '192.80.8.124'=>'Packet');
 			foreach ($arrayofmetadataserver as $ipofmetadataserver => $nameofmetadataserver) {
 				if ($iptocheck == $ipofmetadataserver) {
 					$info['http_code'] = 400;

From a322f113bfda316ee5442e0174016ae9910db39b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cserveny=2C=20Tam=C3=A1s?= <cserveny.tamas@gmail.com>
Date: Thu, 20 Jan 2022 22:18:36 +0100
Subject: [PATCH 205/316] missing supplierorder api

---
 .../fourn/class/api_supplier_orders.class.php | 183 ++++++++++++++++++
 1 file changed, 183 insertions(+)

diff --git a/htdocs/fourn/class/api_supplier_orders.class.php b/htdocs/fourn/class/api_supplier_orders.class.php
index 01c0079171e..4dc3799ec41 100644
--- a/htdocs/fourn/class/api_supplier_orders.class.php
+++ b/htdocs/fourn/class/api_supplier_orders.class.php
@@ -368,6 +368,189 @@ class SupplierOrders extends DolibarrApi
 			)
 		);
 	}
+        
+	/**
+	 * Approve an order
+	 *
+	 * @param   int $id             Order ID
+	 * @param   int $idwarehouse    Warehouse ID
+	 * @param   int $secondlevel      1=Does not execute triggers, 0= execute triggers
+	 *
+	 * @url POST    {id}/approve
+	 *
+	 * @return  array
+	 * FIXME An error 403 is returned if the request has an empty body.
+	 * Error message: "Forbidden: Content type `text/plain` is not supported."
+	 * Workaround: send this in the body
+	 * {
+	 *   "idwarehouse": 0,
+	 *   "secondlevel": 0
+	 * }
+	 */
+	public function approve($id, $idwarehouse = 0, $secondlevel = 0)
+	{
+		if (empty(DolibarrApiAccess::$user->rights->fournisseur->commande->creer) && empty(DolibarrApiAccess::$user->rights->supplier_order->creer)) {
+			throw new RestException(401);
+		}
+		$result = $this->order->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Order not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('fournisseur', $this->order->id, 'commande_fournisseur', 'commande')) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		$result = $this->order->approve(DolibarrApiAccess::$user, $idwarehouse, $secondlevel);
+		if ($result == 0) {
+			throw new RestException(304, 'Error nothing done. May be object is already approved');
+		}
+		if ($result < 0) {
+			throw new RestException(500, 'Error when approve Order: '.$this->order->error);
+		}
+
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Order approved (Ref='.$this->order->ref.')'
+			)
+		);
+	}
+        
+        
+	/**
+	 * Sends an order to the vendor
+	 *
+	 * @param   int		$id             Order ID
+	 * @param   integer	$date		Date (unix timestamp in sec)
+	 * @param   int		$method		Method
+	 * @param  string	$comment	Comment
+	 *
+	 * @url POST    {id}/makeorder
+	 *
+	 * @return  array
+	 * FIXME An error 403 is returned if the request has an empty body.
+	 * Error message: "Forbidden: Content type `text/plain` is not supported."
+	 * Workaround: send this in the body
+	 * {
+	 *   "date": 0,
+	 *   "method": 0,
+	 *   "comment": ""
+	 * }
+	 */
+	public function makeOrder($id, $date, $method, $comment='')
+	{
+		if (empty(DolibarrApiAccess::$user->rights->fournisseur->commande->creer) && empty(DolibarrApiAccess::$user->rights->supplier_order->creer)) {
+			throw new RestException(401);
+		}
+		$result = $this->order->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Order not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('fournisseur', $this->order->id, 'commande_fournisseur', 'commande')) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		$result = $this->order->commande(DolibarrApiAccess::$user, $date, $method, $comment);
+		if ($result == 0) {
+			throw new RestException(304, 'Error nothing done. May be object is already sent');
+		}
+		if ($result < 0) {
+			throw new RestException(500, 'Error when sending Order: '.$this->order->error);
+		}
+
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Order sent (Ref='.$this->order->ref.')'
+			)
+		);
+	}
+        
+        /**
+	 * Receives the order, dispatches products.
+         * 
+	 * Example: 
+	 * <code> {
+	 *   "closeopenorder": 1,
+	 *   "comment": "",
+         *   "lines": [{
+         *      "id": 14, 
+         *      "fk_product": 112, 
+         *      "qty": 18, 
+         *      "warehouse": 1, 
+         *      "price": 114, 
+         *      "comment": "", 
+         *      "eatby": 0, 
+         *      "sellby": 0, 
+         *      "batch": 0, 
+         *      "notrigger": 0
+         *   }]
+	 * }</code>
+         * 
+	 * @param   int		$id             Order ID
+	 * @param   integer	$closeopenorder	Close order if everything is received
+	 * @param   string	$comment	Comment {@required false}
+	 * @param   array	$lines		Array of product dispatches
+	 *
+	 * @url POST    {id}/receive
+	 *
+	 * @return  array
+	 * FIXME An error 403 is returned if the request has an empty body.
+	 * Error message: "Forbidden: Content type `text/plain` is not supported."
+	 * 
+	 */
+	public function receiveOrder($id, $closeopenorder = 1, $comment = null, $lines)
+	{
+		if (empty(DolibarrApiAccess::$user->rights->fournisseur->commande->creer) && empty(DolibarrApiAccess::$user->rights->supplier_order->creer)) {
+			throw new RestException(401);
+		}
+		$result = $this->order->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Order not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('fournisseur', $this->order->id, 'commande_fournisseur', 'commande')) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+                foreach ($lines as $line) {
+                  $lineObj =(object) $line;
+                  
+                  $result=$this->order->dispatchProduct(DolibarrApiAccess::$user, 
+                          $lineObj->fk_product, 
+                          $lineObj->qty, 
+                          $lineObj->warehouse, 
+                          $lineObj->price, 
+                          $lineObj->comment, 
+                          $lineObj->eatby, 
+                          $lineObj->sellby, 
+                          $lineObj->batch, 
+                          $lineObj->id, 
+                          $lineObj->notrigger);
+                  
+                  if ($result < 0) {
+                    throw new RestException(500, 'Error dispatch order line '.$line->id.': '.$this->order->error);
+                  }
+                }
+                
+		$result = $this->order->calcAndSetStatusDispatch(DolibarrApiAccess::$user, $closeopenorder, $comment);
+		
+                if ($result == 0) {
+			throw new RestException(304, 'Error nothing done. May be object is already dispatched');
+		}
+		if ($result < 0) {
+			throw new RestException(500, 'Error when receivce order: '.$this->order->error);
+		}
+
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Order received (Ref='.$this->order->ref.')'
+			)
+		);
+	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**

From c5136240b49c90057ebebf260028a280cbb6ad53 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Thu, 20 Jan 2022 21:25:35 +0000
Subject: [PATCH 206/316] Fixing style errors.

---
 .../fourn/class/api_supplier_orders.class.php | 88 +++++++++----------
 1 file changed, 44 insertions(+), 44 deletions(-)

diff --git a/htdocs/fourn/class/api_supplier_orders.class.php b/htdocs/fourn/class/api_supplier_orders.class.php
index 4dc3799ec41..e7087dcd22e 100644
--- a/htdocs/fourn/class/api_supplier_orders.class.php
+++ b/htdocs/fourn/class/api_supplier_orders.class.php
@@ -368,7 +368,7 @@ class SupplierOrders extends DolibarrApi
 			)
 		);
 	}
-        
+
 	/**
 	 * Approve an order
 	 *
@@ -416,8 +416,8 @@ class SupplierOrders extends DolibarrApi
 			)
 		);
 	}
-        
-        
+
+
 	/**
 	 * Sends an order to the vendor
 	 *
@@ -438,7 +438,7 @@ class SupplierOrders extends DolibarrApi
 	 *   "comment": ""
 	 * }
 	 */
-	public function makeOrder($id, $date, $method, $comment='')
+	public function makeOrder($id, $date, $method, $comment = '')
 	{
 		if (empty(DolibarrApiAccess::$user->rights->fournisseur->commande->creer) && empty(DolibarrApiAccess::$user->rights->supplier_order->creer)) {
 			throw new RestException(401);
@@ -467,28 +467,28 @@ class SupplierOrders extends DolibarrApi
 			)
 		);
 	}
-        
-        /**
+
+		/**
 	 * Receives the order, dispatches products.
-         * 
-	 * Example: 
+		 *
+	 * Example:
 	 * <code> {
 	 *   "closeopenorder": 1,
 	 *   "comment": "",
-         *   "lines": [{
-         *      "id": 14, 
-         *      "fk_product": 112, 
-         *      "qty": 18, 
-         *      "warehouse": 1, 
-         *      "price": 114, 
-         *      "comment": "", 
-         *      "eatby": 0, 
-         *      "sellby": 0, 
-         *      "batch": 0, 
-         *      "notrigger": 0
-         *   }]
+		 *   "lines": [{
+		 *      "id": 14,
+		 *      "fk_product": 112,
+		 *      "qty": 18,
+		 *      "warehouse": 1,
+		 *      "price": 114,
+		 *      "comment": "",
+		 *      "eatby": 0,
+		 *      "sellby": 0,
+		 *      "batch": 0,
+		 *      "notrigger": 0
+		 *   }]
 	 * }</code>
-         * 
+		 *
 	 * @param   int		$id             Order ID
 	 * @param   integer	$closeopenorder	Close order if everything is received
 	 * @param   string	$comment	Comment {@required false}
@@ -499,7 +499,7 @@ class SupplierOrders extends DolibarrApi
 	 * @return  array
 	 * FIXME An error 403 is returned if the request has an empty body.
 	 * Error message: "Forbidden: Content type `text/plain` is not supported."
-	 * 
+	 *
 	 */
 	public function receiveOrder($id, $closeopenorder = 1, $comment = null, $lines)
 	{
@@ -515,29 +515,29 @@ class SupplierOrders extends DolibarrApi
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-                foreach ($lines as $line) {
-                  $lineObj =(object) $line;
-                  
-                  $result=$this->order->dispatchProduct(DolibarrApiAccess::$user, 
-                          $lineObj->fk_product, 
-                          $lineObj->qty, 
-                          $lineObj->warehouse, 
-                          $lineObj->price, 
-                          $lineObj->comment, 
-                          $lineObj->eatby, 
-                          $lineObj->sellby, 
-                          $lineObj->batch, 
-                          $lineObj->id, 
-                          $lineObj->notrigger);
-                  
-                  if ($result < 0) {
-                    throw new RestException(500, 'Error dispatch order line '.$line->id.': '.$this->order->error);
-                  }
-                }
-                
+		foreach ($lines as $line) {
+			$lineObj =(object) $line;
+
+			$result=$this->order->dispatchProduct(DolibarrApiAccess::$user,
+				  $lineObj->fk_product,
+				  $lineObj->qty,
+				  $lineObj->warehouse,
+				  $lineObj->price,
+				  $lineObj->comment,
+				  $lineObj->eatby,
+				  $lineObj->sellby,
+				  $lineObj->batch,
+				  $lineObj->id,
+				  $lineObj->notrigger);
+
+			if ($result < 0) {
+				throw new RestException(500, 'Error dispatch order line '.$line->id.': '.$this->order->error);
+			}
+		}
+
 		$result = $this->order->calcAndSetStatusDispatch(DolibarrApiAccess::$user, $closeopenorder, $comment);
-		
-                if ($result == 0) {
+
+		if ($result == 0) {
 			throw new RestException(304, 'Error nothing done. May be object is already dispatched');
 		}
 		if ($result < 0) {

From c6ac4d63a54084ef79b16ee9be86b6457a8b7c8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cserveny=2C=20Tam=C3=A1s?= <cserveny.tamas@gmail.com>
Date: Thu, 20 Jan 2022 22:28:02 +0100
Subject: [PATCH 207/316] fix code review errors

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

diff --git a/htdocs/fourn/class/api_supplier_orders.class.php b/htdocs/fourn/class/api_supplier_orders.class.php
index e7087dcd22e..e21eb3436dc 100644
--- a/htdocs/fourn/class/api_supplier_orders.class.php
+++ b/htdocs/fourn/class/api_supplier_orders.class.php
@@ -490,7 +490,7 @@ class SupplierOrders extends DolibarrApi
 	 * }</code>
 		 *
 	 * @param   int		$id             Order ID
-	 * @param   integer	$closeopenorder	Close order if everything is received
+	 * @param   integer	$closeopenorder	Close order if everything is received {@required false}
 	 * @param   string	$comment	Comment {@required false}
 	 * @param   array	$lines		Array of product dispatches
 	 *
@@ -501,7 +501,7 @@ class SupplierOrders extends DolibarrApi
 	 * Error message: "Forbidden: Content type `text/plain` is not supported."
 	 *
 	 */
-	public function receiveOrder($id, $closeopenorder = 1, $comment = null, $lines)
+	public function receiveOrder($id, $closeopenorder, $comment, $lines)
 	{
 		if (empty(DolibarrApiAccess::$user->rights->fournisseur->commande->creer) && empty(DolibarrApiAccess::$user->rights->supplier_order->creer)) {
 			throw new RestException(401);

From bb86be062cc702c608154e7ae490876462032ae1 Mon Sep 17 00:00:00 2001
From: Thomas Negre <tnegre@open-dsi.fr>
Date: Fri, 21 Jan 2022 09:44:22 +0100
Subject: [PATCH 208/316] NEW ticket module : add an option to enable default
 check notify tier at creation

    introduces new option TICKET_CHECK_NOTIFY_TIER_AT_CREATE
---
 htdocs/ticket/card.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100644 => 100755 htdocs/ticket/card.php

diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
old mode 100644
new mode 100755
index cf665e8a470..68e95515bbf
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -742,7 +742,7 @@ if ($action == 'create' || $action == 'presend') {
 	$formticket->withfromsocid = $socid ? $socid : $user->socid;
 	$formticket->withfromcontactid = $contactid ? $contactid : '';
 	$formticket->withtitletopic = 1;
-	$formticket->withnotifytiersatcreate = ($notifyTiers ? 1 : 0);
+	$formticket->withnotifytiersatcreate = ($notifyTiers ? 1 : !empty($conf->global->TICKET_CHECK_NOTIFY_TIER_AT_CREATE) ? 1 : 0);
 	$formticket->withusercreate = 0;
 	$formticket->withref = 1;
 	$formticket->fk_user_create = $user->id;

From 015cd543d6d241fed3ae1e7ef0d48304e3b8ef28 Mon Sep 17 00:00:00 2001
From: jpb <jean-pascal.boudet@atm-consulting>
Date: Fri, 21 Jan 2022 09:52:52 +0100
Subject: [PATCH 209/316] add minwidth to selectArray

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

diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index 81912207f57..3eb59d761d1 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -1261,7 +1261,7 @@ class FormTicket
 			// Zone to select its email template
 			if (count($modelmail_array) > 0) {
 				print '<tr class="email_line"><td></td><td colspan="2"><div style="padding: 3px 0 3px 0">'."\n";
-				print $langs->trans('SelectMailModel').': '.$formmail->selectarray('modelmailselected', $modelmail_array, $this->param['models_id'], 1);
+				 print $langs->trans('SelectMailModel').': '.$formmail->selectarray('modelmailselected', $modelmail_array, $this->param['models_id'], 1,0,"","",0,0,0,'','minwidth200');
 				if ($user->admin) {
 					print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 				}
@@ -1375,7 +1375,7 @@ class FormTicket
 
 		print '<tr><td class="tdtop"><label for="message"><span class="fieldrequired">'.$langs->trans("Message").'</span>';
 		if ($user->rights->ticket->write && !$user->socid) {
-			print $form->textwithpicto('', $langs->trans("TicketMessageHelp"), 1, 'help');
+			//print $form->textwithpicto('', $langs->trans("TicketMessageHelp"), 1, 'help');
 		}
 		print '</label></td><td>';
 		//$toolbarname = 'dolibarr_details';

From 15c39db35ca0c5046a838c1ffc2863962fc378e5 Mon Sep 17 00:00:00 2001
From: jpb <jean-pascal.boudet@atm-consulting>
Date: Fri, 21 Jan 2022 09:55:14 +0100
Subject: [PATCH 210/316] add minwidth to selectArray

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

diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index 3eb59d761d1..814c30374f9 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -1375,7 +1375,7 @@ class FormTicket
 
 		print '<tr><td class="tdtop"><label for="message"><span class="fieldrequired">'.$langs->trans("Message").'</span>';
 		if ($user->rights->ticket->write && !$user->socid) {
-			//print $form->textwithpicto('', $langs->trans("TicketMessageHelp"), 1, 'help');
+			print $form->textwithpicto('', $langs->trans("TicketMessageHelp"), 1, 'help');
 		}
 		print '</label></td><td>';
 		//$toolbarname = 'dolibarr_details';

From 3e84a999651594fda2607d7329a4ab8bb3930048 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Fri, 21 Jan 2022 08:58:06 +0000
Subject: [PATCH 211/316] Fixing style errors.

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

diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index 814c30374f9..6866bfa8356 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -1261,7 +1261,7 @@ class FormTicket
 			// Zone to select its email template
 			if (count($modelmail_array) > 0) {
 				print '<tr class="email_line"><td></td><td colspan="2"><div style="padding: 3px 0 3px 0">'."\n";
-				 print $langs->trans('SelectMailModel').': '.$formmail->selectarray('modelmailselected', $modelmail_array, $this->param['models_id'], 1,0,"","",0,0,0,'','minwidth200');
+				 print $langs->trans('SelectMailModel').': '.$formmail->selectarray('modelmailselected', $modelmail_array, $this->param['models_id'], 1, 0, "", "", 0, 0, 0, '', 'minwidth200');
 				if ($user->admin) {
 					print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 				}

From e9526654feec4c21bdc1f37faf8614289e128b90 Mon Sep 17 00:00:00 2001
From: Thomas Negre <tnegre@open-dsi.fr>
Date: Wed, 19 Jan 2022 15:38:43 +0100
Subject: [PATCH 212/316] NEW allow a ticket to be automatically marked as read
 when created from backend.

Introduces option TICKET_AUTO_READ_WHEN_CREATED_FROM_BACKEND
---
 htdocs/ticket/card.php | 7 +++++++
 1 file changed, 7 insertions(+)
 mode change 100644 => 100755 htdocs/ticket/card.php

diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
old mode 100644
new mode 100755
index cf665e8a470..ecab3d4a59b
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -243,6 +243,13 @@ if (empty($reshook)) {
 					$object->setProject($projectid);
 				}
 
+				// Auto mark as read if created from backend
+				if (!empty($conf->global->TICKET_AUTO_READ_WHEN_CREATED_FROM_BACKEND) && $user->rights->ticket->write) {
+					if ( ! $object->markAsRead($user) > 0) {
+						setEventMessages($object->error, $object->errors, 'errors');
+					}
+				}
+
 				// Auto assign user
 				if (!empty($conf->global->TICKET_AUTO_ASSIGN_USER_CREATE)) {
 					$result = $object->assignUser($user, $user->id, 1);

From 59921d60b3d1840d768daa45a8f1a6187c828384 Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Fri, 21 Jan 2022 13:38:59 +0100
Subject: [PATCH 213/316] Length label control

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

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 5245e60ad67..0b2404050e6 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2018	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2004		Benoit Mortier			<benoit.mortier@opensides.be>
  * Copyright (C) 2005-2017	Regis Houssin			<regis.houssin@inodbox.com>
- * Copyright (C) 2010-2016	Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2010-2022	Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2011-2021	Philippe Grand			<philippe.grand@atoo-net.com>
  * Copyright (C) 2011		Remy Younes				<ryounes@gmail.com>
  * Copyright (C) 2012-2015	Marcos García			<marcosgdf@gmail.com>
@@ -2408,6 +2408,33 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 					$fieldValue = '0';
 				}
 			}
+
+			// Labels Length
+			$maxlength = '';
+			if (in_array($fieldlist[$field], array('libelle', 'label'))) {
+				if ($fieldlist[$field] == 'label' || $fieldlist[$field] == 'libelle') {
+					switch ($tabname) {
+						case MAIN_DB_PREFIX . 'c_accounting_category':
+						case MAIN_DB_PREFIX . 'c_ecotaxe':
+						case MAIN_DB_PREFIX . 'c_email_senderprofile':
+						case MAIN_DB_PREFIX . 'c_forme_juridique':
+						case MAIN_DB_PREFIX . 'c_holiday_types':
+						case MAIN_DB_PREFIX . 'c_payment_term':
+						case MAIN_DB_PREFIX . 'c_transport_mode':
+							$maxlength = ' maxlength="255"';
+							break;
+						case MAIN_DB_PREFIX . 'c_email_templates':
+							$maxlength = ' maxlength="180"';
+							break;
+						case MAIN_DB_PREFIX . 'c_socialnetworks':
+							$maxlength = ' maxlength="150"';
+							break;
+						default:
+							$maxlength = ' maxlength="128"';
+					}
+				}
+			}
+
 			print '<td class="'.$classtd.'">';
 			$transfound = 0;
 			$transkey = '';
@@ -2426,7 +2453,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 				}
 			}
 			if (!$transfound) {
-				print '<input type="text" class="flat'.($class ? ' '.$class : '').'" value="'.dol_escape_htmltag($fieldValue).'" name="'.$fieldlist[$field].'">';
+				print '<input type="text" class="flat'.($class ? ' '.$class : '').'"'.($maxlength ? ' '.$maxlength : '').' value="'.dol_escape_htmltag($fieldValue).'" name="'.$fieldlist[$field].'">';
 			} else {
 				print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$transkey.'">';
 			}

From 1dcfb88ad4991e3171bd7987cbada74f75b024e4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 21 Jan 2022 13:44:40 +0100
Subject: [PATCH 214/316] Debug v15

---
 ChangeLog                                     |   7 +
 htdocs/admin/eventorganization.php            |   8 +-
 htdocs/core/actions_massactions.inc.php       |   2 +-
 htdocs/core/class/html.formmail.class.php     |  40 +++---
 .../modules/modEventOrganization.class.php    |   2 +-
 htdocs/core/tpl/massactions_pre.tpl.php       |  65 ++++++---
 .../conferenceorbooth_list.php                |  10 +-
 .../conferenceorboothattendee_list.php        |  17 +--
 .../core/actions_massactions_mail.inc.php     |   2 +-
 .../tpl/massactions_mail_pre.tpl.php          | 126 ------------------
 .../install/mysql/migration/14.0.0-15.0.0.sql |   7 +-
 htdocs/langs/en_US/eventorganization.lang     |  17 +--
 12 files changed, 109 insertions(+), 194 deletions(-)
 delete mode 100644 htdocs/eventorganization/tpl/massactions_mail_pre.tpl.php

diff --git a/ChangeLog b/ChangeLog
index a8211da486a..0f568ff5359 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -109,6 +109,13 @@ NEW: External backups can be downloaded from the "About info page".
 NEW: Add massaction to switch status on sale / on purchase of a product.
 
 
+ Modules
+NEW: Stable module Knowledge Management
+NEW: Experimental module Event Organization Management
+NEW: Experimental module Workstations Management
+NEW: Development of module Partnership Management
+
+
 For developers:
 ---------------
 
diff --git a/htdocs/admin/eventorganization.php b/htdocs/admin/eventorganization.php
index 06309a2706e..8edc61bf255 100644
--- a/htdocs/admin/eventorganization.php
+++ b/htdocs/admin/eventorganization.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/eventorganization.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
 // Translations
-$langs->loadLangs(array("admin", "eventorganization"));
+$langs->loadLangs(array("admin", "eventorganization", "categories"));
 
 // Parameters
 $action = GETPOST('action', 'aZ09');
@@ -54,11 +54,11 @@ $arrayofparameters = array(
 	'EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH'=>array('type'=>'emailtemplate:conferenceorbooth', 'enabled'=>1),
 	'EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH'=>array('type'=>'emailtemplate:conferenceorbooth', 'enabled'=>1),
 	'EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT'=>array('type'=>'emailtemplate:conferenceorbooth', 'enabled'=>1),
-	'EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER'=>array('type'=>'emailtemplate:conferenceorbooth', 'enabled'=>1),
-	'EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES'=>array('type'=>'emailtemplate:conferenceorbooth', 'enabled'=>1),
-	'EVENTORGANIZATION_SECUREKEY'=>array('type'=>'securekey', 'enabled'=>1),
+	//'EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER'=>array('type'=>'emailtemplate:conferenceorbooth', 'enabled'=>1),
+	//'EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES'=>array('type'=>'emailtemplate:conferenceorbooth', 'enabled'=>1),
 	'SERVICE_BOOTH_LOCATION'=>array('type'=>'product', 'enabled'=>1),
 	'SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION'=>array('type'=>'product', 'enabled'=>1),
+	'EVENTORGANIZATION_SECUREKEY'=>array('type'=>'securekey', 'enabled'=>1),
 );
 
 $error = 0;
diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 5f161f88bfb..602897d34f9 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -81,7 +81,7 @@ if (!$error && $massaction == 'confirm_presend') {
 	$listofobjectref = array();
 	$contactidtosend = array();
 	$attachedfilesThirdpartyObj = array();
-	$oneemailperrecipient = (GETPOST('oneemailperrecipient') == 'on' ? 1 : 0);
+	$oneemailperrecipient = (GETPOST('oneemailperrecipient', 'int') ? 1 : 0);
 
 	if (!$error) {
 		$thirdparty = new Societe($db);
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 7ceca2f373b..72b4050f9b3 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -157,6 +157,7 @@ class FormMail extends Form
 
 	public $lines_model;
 
+	// -1 suggest the checkbox 'one email per recipient' not checked, 0 = no suggestion, 1 = suggest and checked
 	public $withoptiononeemailperrecipient;
 
 
@@ -357,7 +358,7 @@ class FormMail extends Form
 		// phpcs:enable
 		global $conf, $langs, $user, $hookmanager, $form;
 
-		// Required to show preview of mail attachments
+		// Required to show preview wof mail attachments
 		require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 		$formfile = new Formfile($this->db);
 
@@ -366,7 +367,7 @@ class FormMail extends Form
 		}
 
 		// Load translation files required by the page
-		$langs->loadLangs(array('other', 'mails'));
+		$langs->loadLangs(array('other', 'mails', 'members'));
 
 		// Clear temp files. Must be done before call of triggers, at beginning (mode = init), or when we select a new template
 		if (GETPOST('mode', 'alpha') == 'init' || (GETPOST('modelselected') && GETPOST('modelmailselected', 'alpha') && GETPOST('modelmailselected', 'alpha') != '-1')) {
@@ -464,11 +465,10 @@ class FormMail extends Form
 			$modelmail_array = array();
 			if ($this->param['models'] != 'none') {
 				$result = $this->fetchAllEMailTemplate($this->param["models"], $user, $outputlangs);
-
 				if ($result < 0) {
 					setEventMessages($this->error, $this->errors, 'errors');
 				}
-				$langs->trans("members");
+
 				foreach ($this->lines_model as $line) {
 					$reg = array();
 					if (preg_match('/\((.*)\)/', $line->label, $reg)) {
@@ -503,7 +503,7 @@ class FormMail extends Form
 				}
 
 				$out .= ' &nbsp; ';
-				$out .= '<input type="submit" class="button" value="'.$langs->trans('Apply').'" name="modelselected" id="modelselected">';
+				$out .= '<input type="submit" class="button reposition" value="'.$langs->trans('Apply').'" name="modelselected" id="modelselected">';
 				$out .= ' &nbsp; ';
 				$out .= '</div>';
 			} elseif (!empty($this->param['models']) && in_array($this->param['models'], array(
@@ -526,7 +526,7 @@ class FormMail extends Form
 			}
 
 
-			$out .= '<table class="tableforemailform boxtablenotop" width="100%">'."\n";
+			$out .= '<table class="tableforemailform boxtablenotop centpercent">'."\n";
 
 			// Substitution array/string
 			$helpforsubstitution = '';
@@ -688,16 +688,20 @@ class FormMail extends Form
 
 			// With option one email per recipient
 			if (!empty($this->withoptiononeemailperrecipient)) {
-				$out .= '<tr><td class="minwidth200">';
-				$out .= $langs->trans("GroupEmails");
-				$out .= '</td><td>';
-				$out .= ' <input type="checkbox" id="oneemailperrecipient" name="oneemailperrecipient"'.($this->withoptiononeemailperrecipient > 0 ? ' checked="checked"' : '').'> ';
-				$out .= '<label for="oneemailperrecipient">'.$langs->trans("OneEmailPerRecipient").'</label>';
-				$out .= '<span class="hideonsmartphone opacitymedium">';
-				$out .= ' - ';
-				$out .= $langs->trans("WarningIfYouCheckOneRecipientPerEmail");
-				$out .= '</span>';
-				$out .= '</td></tr>';
+				if (abs($this->withoptiononeemailperrecipient) == 1) {
+					$out .= '<tr><td class="minwidth200">';
+					$out .= $langs->trans("GroupEmails");
+					$out .= '</td><td>';
+					$out .= ' <input type="checkbox" id="oneemailperrecipient" value="1" name="oneemailperrecipient"'.($this->withoptiononeemailperrecipient > 0 ? ' checked="checked"' : '').'> ';
+					$out .= '<label for="oneemailperrecipient">'.$langs->trans("OneEmailPerRecipient").'</label>';
+					$out .= '<span class="hideonsmartphone opacitymedium">';
+					$out .= ' - ';
+					$out .= $langs->trans("WarningIfYouCheckOneRecipientPerEmail");
+					$out .= '</span>';
+					$out .= '</td></tr>';
+				} else {
+					$out .= '<tr><td><input type="hidden" name="oneemailperrecipient" value="1"></td><td></td></tr>';
+				}
 			}
 
 			// CC
@@ -813,8 +817,7 @@ class FormMail extends Form
 							$out .= '<br></div>';
 						}
 					} elseif (empty($this->withmaindocfile)) {
-						// Do not show message if we asked to show the checkbox
-						$out .= $langs->trans("NoAttachedFiles").'<br>';
+						$out .= '<span class="opacitymedium">'.$langs->trans("NoAttachedFiles").'</span><br>';
 					}
 					if ($this->withfile == 2) {
 						// Can add other files
@@ -1217,6 +1220,7 @@ class FormMail extends Form
 		global $conf, $langs, $form;
 
 		$defaulttopic = GETPOST('subject', 'restricthtml');
+
 		if (!GETPOST('modelselected', 'alpha') || GETPOST('modelmailselected') != '-1') {
 			if ($arraydefaultmessage && $arraydefaultmessage->topic) {
 				$defaulttopic = $arraydefaultmessage->topic;
diff --git a/htdocs/core/modules/modEventOrganization.class.php b/htdocs/core/modules/modEventOrganization.class.php
index 6ab1c8acb89..96ee96efae2 100644
--- a/htdocs/core/modules/modEventOrganization.class.php
+++ b/htdocs/core/modules/modEventOrganization.class.php
@@ -55,7 +55,7 @@ class modEventOrganization extends DolibarrModules
 		$this->description = "EventOrganizationDescription";
 		$this->descriptionlong = "EventOrganizationDescriptionLong";
 
-		$this->version = 'development';
+		$this->version = 'experimental';
 
 
 		// Key used in llx_const table to save module status enabled/disabled (where EVENTORGANIZATION is value of property name of module in uppercase)
diff --git a/htdocs/core/tpl/massactions_pre.tpl.php b/htdocs/core/tpl/massactions_pre.tpl.php
index e1f56974483..b3a40ba3582 100644
--- a/htdocs/core/tpl/massactions_pre.tpl.php
+++ b/htdocs/core/tpl/massactions_pre.tpl.php
@@ -19,12 +19,17 @@
  */
 
 // Following var must be set:
+// $action
 // $arrayofselected = array of id selected
-// $object
-// $objecttmp=new Propal($db);
+// $objecttmp = new MyObject($db);
 // $topicmail="SendSupplierProposalRef";
 // $modelmail="supplier_proposal_send";
-// $trackid='ord'.$object->id;
+// $trackid='ord'.$objecttmp->id;
+//
+// Following var can be set
+// $object = Object fetched;
+// $sendto
+// $withmaindocfilemail
 
 
 if ($massaction == 'predeletedraft') {
@@ -41,6 +46,7 @@ if ($massaction == 'preaffecttag') {
 	$categ_types = array();
 	$categ_type_array = $categ->getMapList();
 	foreach ($categ_type_array as $categdef) {
+		// Test on $object (should be useless, we already check on $objecttmp just after)
 		if (isset($object) && $categdef['obj_table'] == $object->table_element) {
 			if (!array_key_exists($categdef['code'], $categ_types)) {
 				$categ_types[$categdef['code']] = array('code'=>$categdef['code'], 'label'=>$langs->trans($categdef['obj_class']));
@@ -76,7 +82,7 @@ if ($massaction == 'presend') {
 	$langs->load("mails");
 
 	$listofselectedid = array();
-	$listofselectedthirdparties = array();
+	$listofselectedrecipientobjid = array();
 	$listofselectedref = array();
 
 	if (!GETPOST('cancel', 'alpha')) {
@@ -84,14 +90,19 @@ if ($massaction == 'presend') {
 			$result = $objecttmp->fetch($toselectid);
 			if ($result > 0) {
 				$listofselectedid[$toselectid] = $toselectid;
-				$thirdpartyid = ($objecttmp->fk_soc ? $objecttmp->fk_soc : $objecttmp->socid);
-				if ($objecttmp->element == 'societe') {
+				$thirdpartyid = ($objecttmp->fk_soc ? $objecttmp->fk_soc : $objecttmp->socid);	// For proposal, order, invoice, conferenceorbooth, ...
+				if (in_array($objecttmp->element, array('societe', 'conferenceorboothattendee'))) {
 					$thirdpartyid = $objecttmp->id;
 				}
 				if ($objecttmp->element == 'expensereport') {
 					$thirdpartyid = $objecttmp->fk_user_author;
 				}
-				$listofselectedthirdparties[$thirdpartyid] = $thirdpartyid;
+				if (empty($thirdpartyid)) {
+					$thirdpartyid = 0;
+				}
+				if ($thirdpartyid) {
+					$listofselectedrecipientobjid[$thirdpartyid] = $thirdpartyid;
+				}
 				$listofselectedref[$thirdpartyid][$toselectid] = $objecttmp->ref;
 			}
 		}
@@ -113,9 +124,9 @@ if ($massaction == 'presend') {
 	$formmail->trackid = $trackid;
 	$formmail->withfrom = 1;
 	$liste = $langs->trans("AllRecipientSelected", count($arrayofselected));
-	if (count($listofselectedthirdparties) == 1) { // Only 1 different recipient selected, we can suggest contacts
+	if (count($listofselectedrecipientobjid) == 1) { // Only 1 different recipient selected, we can suggest contacts
 		$liste = array();
-		$thirdpartyid = array_shift($listofselectedthirdparties);
+		$thirdpartyid = array_shift($listofselectedrecipientobjid);
 		if ($objecttmp->element == 'expensereport') {
 			$fuser = new User($db);
 			$fuser->fetch($thirdpartyid);
@@ -136,19 +147,31 @@ if ($massaction == 'presend') {
 		$formmail->withtoreadonly = 1;
 	}
 
-	$formmail->withoptiononeemailperrecipient = ((count($listofselectedref) == 1 && count(reset($listofselectedref)) == 1) || empty($liste)) ? 0 : ((GETPOST('oneemailperrecipient') == 'on') ? 1 : -1);
+
+	$formmail->withoptiononeemailperrecipient = ((count($listofselectedref) == 1 && count(reset($listofselectedref)) == 1) || empty($liste)) ? 0 : (GETPOST('oneemailperrecipient', 'int') ? 1 : -1);
+	if (in_array($objecttmp->element, array('conferenceorboothattendee'))) {
+		$formmail->withoptiononeemailperrecipient = 0;
+	}
 
 	$formmail->withto = empty($liste) ? (GETPOST('sendto', 'alpha') ?GETPOST('sendto', 'alpha') : array()) : $liste;
 	$formmail->withtofree = empty($liste) ? 1 : 0;
 	$formmail->withtocc = 1;
 	$formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC;
-	$formmail->withtopic = $langs->transnoentities($topicmail, '__REF__', '__REF_CLIENT__');
-	$formmail->withfile = 1;
-	// $formmail->withfile = 2; Not yet supported in mass action
-	$formmail->withmaindocfile = 1; // Add a checkbox "Attach also main document"
-	if ($objecttmp->element != 'societe') {
-		$formmail->withfile = '<span class="hideonsmartphone opacitymedium">'.$langs->trans("OnlyPDFattachmentSupported").'</span>';
-		$formmail->withmaindocfile = - 1; // Add a checkbox "Attach also main document" but not checked by default
+	if (!empty($topicmail)) {
+		$formmail->withtopic = $langs->transnoentities($topicmail, '__REF__', '__REF_CLIENT__');
+	} else {
+		$formmail->withtopic = 1;
+	}
+	$formmail->withfile = 1;	// $formmail->withfile = 2 to allow to upload files is not yet supported in mass action
+	// Add a checkbox "Attach also main document"
+	if (isset($withmaindocfilemail)) {
+		$formmail->withmaindocfile = $withmaindocfilemail;
+	} else {	// Do an automatic definition of $formmail->withmaindocfile
+		$formmail->withmaindocfile = 1;
+		if ($objecttmp->element != 'societe') {
+			$formmail->withfile = '<span class="hideonsmartphone opacitymedium">'.$langs->trans("OnlyPDFattachmentSupported").'</span>';
+			$formmail->withmaindocfile = -1; // Add a checkbox "Attach also main document" but not checked by default
+		}
 	}
 	$formmail->withbody = 1;
 	$formmail->withdeliveryreceipt = 1;
@@ -167,16 +190,16 @@ if ($massaction == 'presend') {
 	);
 	complete_substitutions_array($substitutionarray, $langs, $object, $parameters);
 
-	// Tableau des substitutions
+	// Array of substitutions
 	$formmail->substit = $substitutionarray;
 
 	// Tableau des parametres complementaires du post
 	$formmail->param['action'] = $action;
-	$formmail->param['models'] = $modelmail;
-	$formmail->param['models_id'] = GETPOST('modelmailselected', 'int');
+	$formmail->param['models'] = $modelmail;	// the filter to know which kind of template emails to show. 'none' means no template suggested.
+	$formmail->param['models_id'] = GETPOST('modelmailselected', 'int') ? GETPOST('modelmailselected', 'int') : '-1';
 	$formmail->param['id'] = join(',', $arrayofselected);
 	// $formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
-	if (!empty($conf->global->MAILING_LIMIT_SENDBYWEB) && count($listofselectedthirdparties) > $conf->global->MAILING_LIMIT_SENDBYWEB) {
+	if (!empty($conf->global->MAILING_LIMIT_SENDBYWEB) && count($listofselectedrecipientobjid) > $conf->global->MAILING_LIMIT_SENDBYWEB) {
 		$langs->load("errors");
 		print img_warning().' '.$langs->trans('WarningNumberOfRecipientIsRestrictedInMassAction', $conf->global->MAILING_LIMIT_SENDBYWEB);
 		print ' - <a href="javascript: window.history.go(-1)">'.$langs->trans("GoBack").'</a>';
diff --git a/htdocs/eventorganization/conferenceorbooth_list.php b/htdocs/eventorganization/conferenceorbooth_list.php
index 5980bfa6132..d105ad05c43 100644
--- a/htdocs/eventorganization/conferenceorbooth_list.php
+++ b/htdocs/eventorganization/conferenceorbooth_list.php
@@ -621,8 +621,8 @@ $arrayofmassactions = array(
 	//'validate'=>img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("Validate"),
 	//'generate_doc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("ReGeneratePDF"),
 	//'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
-	'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail").' - '.$langs->trans("ConferenceOrBooth"),
-	'presend_attendees'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail").' - '.$langs->trans("Attendees"),
+	'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail").' ('.$langs->trans("ToSpeakers").')',
+	//'presend_attendees'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail").' - '.$langs->trans("Attendees"),
 );
 if ($permissiontodelete) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
@@ -650,12 +650,13 @@ $newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle'
 
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, $object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
 
+
 // Add code for pre mass action (confirmation or email presend form)
-$topicmail = $object->ref;
+$topicmail = $projectstatic->title;
 $modelmail = "conferenceorbooth";
 $objecttmp = new ConferenceOrBooth($db);
 $trackid = 'conferenceorbooth_'.$object->id;
-include DOL_DOCUMENT_ROOT.'/eventorganization/tpl/massactions_mail_pre.tpl.php';
+$withmaindocfilemail = 0;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 
@@ -689,6 +690,7 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
+
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
 print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
diff --git a/htdocs/eventorganization/conferenceorboothattendee_list.php b/htdocs/eventorganization/conferenceorboothattendee_list.php
index 9cc7e882631..e084c68cfe7 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_list.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_list.php
@@ -182,8 +182,8 @@ if (GETPOST('cancel', 'alpha')) {
 	$massaction = '';
 }
 if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend'
-&& $massaction != 'presend_attendees'
-&& $massaction != 'confirm_presend_attendees') {
+&& $massaction != 'presend'
+&& $massaction != 'confirm_presend') {
 	$massaction = '';
 }
 
@@ -676,8 +676,7 @@ $arrayofmassactions = array(
 	//'validate'=>img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("Validate"),
 	//'generate_doc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("ReGeneratePDF"),
 	//'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
-	//'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
-	'presend_attendees'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail").' - '.$langs->trans("Attendees"),
+	'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
 );
 if ($permissiontodelete) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
@@ -706,14 +705,16 @@ $newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle'
 
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, $object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
 
+
 // Add code for pre mass action (confirmation or email presend form)
-$topicmail = "SendConferenceOrBoothAttendeeRef";
-$modelmail = "conferenceorboothattendee";
+$topicmail = $projectstatic->title;
+$modelmail = "conferenceorbooth";
 $objecttmp = new ConferenceOrBoothAttendee($db);
-$trackid = 'xxxx'.$object->id;
-include DOL_DOCUMENT_ROOT.'/eventorganization/tpl/massactions_mail_pre.tpl.php';
+$trackid = 'conferenceorbooth_'.$object->id;
+$withmaindocfilemail = 0;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
+
 if ($search_all) {
 	foreach ($fieldstosearchall as $key => $val) {
 		$fieldstosearchall[$key] = $langs->trans($val);
diff --git a/htdocs/eventorganization/core/actions_massactions_mail.inc.php b/htdocs/eventorganization/core/actions_massactions_mail.inc.php
index 5fcada893f9..afdee363f24 100644
--- a/htdocs/eventorganization/core/actions_massactions_mail.inc.php
+++ b/htdocs/eventorganization/core/actions_massactions_mail.inc.php
@@ -78,7 +78,7 @@ if (!$error && $massaction == 'confirm_presend_attendees') {
 	$listofobjectid = array();
 
 	$listofobjectref = array();
-	$oneemailperrecipient = (GETPOST('oneemailperrecipient') == 'on' ? 1 : 0);
+	$oneemailperrecipient = (GETPOST('oneemailperrecipient', 'int') ? 1 : 0);
 
 	if (!$error) {
 		require_once DOL_DOCUMENT_ROOT . '/eventorganization/class/conferenceorboothattendee.class.php';
diff --git a/htdocs/eventorganization/tpl/massactions_mail_pre.tpl.php b/htdocs/eventorganization/tpl/massactions_mail_pre.tpl.php
deleted file mode 100644
index 8d0836b080e..00000000000
--- a/htdocs/eventorganization/tpl/massactions_mail_pre.tpl.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-/* Copyright (C)    2013      Cédric Salvador     <csalvador@gpcsolutions.fr>
- * Copyright (C)    2013-2014 Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C)	2015	  Marcos García		  <marcosgdf@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- * or see https://www.gnu.org/
- */
-
-// Following var must be set:
-// $arrayofselected = array of id selected
-// $object
-// $objecttmp=new Propal($db);
-// $topicmail="SendSupplierProposalRef";
-// $modelmail="supplier_proposal_send";
-// $trackid='ord'.$object->id;
-
-if ($massaction == 'presend_attendees') {
-	$langs->load("mails");
-	require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorboothattendee.class.php';
-	$attendee = new ConferenceOrBoothAttendee($db);
-	$listofselectedid = array();
-	$listofselectedref = array();
-
-	if (!GETPOST('cancel', 'alpha')) {
-		foreach ($arrayofselected as $toselectid) {
-			$result = $objecttmp->fetch($toselectid);
-			if ($result > 0) {
-				$attendees = $attendee->fetchAll();
-				if (is_array($attendees) && count($attendees)>0) {
-					foreach ($attendees as $attmail) {
-						if (!empty($attmail->email)) {
-							$listofselectedid[$attmail->email] = $attmail->id;
-							$listofselectedref[$attmail->id][$toselectid] = $objecttmp->ref;
-						}
-					}
-				}
-			}
-		}
-	}
-
-	print '<input type="hidden" name="massaction" value="confirm_presend_attendees">';
-	print '<input type="hidden" name="projectid" value="'.GETPOST('projectid', 'int').'">';
-
-	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-	$formmail = new FormMail($db);
-
-	print dol_get_fiche_head(null, '', '');
-
-	// Create form for email
-	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-	$formmail = new FormMail($db);
-	$formmail->withform = -1;
-	$formmail->fromtype = (GETPOST('fromtype') ? GETPOST('fromtype') : (!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE) ? $conf->global->MAIN_MAIL_DEFAULT_FROMTYPE : 'user'));
-
-	if ($formmail->fromtype === 'user') {
-		$formmail->fromid = $user->id;
-	}
-	$formmail->trackid = $trackid;
-	$formmail->withfrom = 1;
-	$liste = $langs->trans("AllRecipientSelected", count($listofselectedid));
-	$formmail->withtoreadonly = 1;
-
-	$formmail->withoptiononeemailperrecipient = ((count($listofselectedref) == 1 && count(reset($listofselectedref)) == 1) || empty($liste)) ? 0 : ((GETPOST('oneemailperrecipient') == 'on') ? 1 : -1);
-
-	$formmail->withto = empty($liste) ? (GETPOST('sendto', 'alpha') ?GETPOST('sendto', 'alpha') : array()) : $liste;
-	$formmail->withtofree = empty($liste) ? 1 : 0;
-	$formmail->withtocc = 1;
-	$formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC;
-	$formmail->withtopic = $langs->transnoentities($topicmail, '__REF__', '__REF_CLIENT__');
-	$formmail->withfile = 0;
-	// $formmail->withfile = 2; Not yet supported in mass action
-	$formmail->withmaindocfile = 0; // Add a checkbox "Attach also main document"
-	$formmail->withbody = 1;
-	$formmail->withdeliveryreceipt = 1;
-	$formmail->withcancel = 1;
-
-	// Make substitution in email content
-	$substitutionarray = getCommonSubstitutionArray($langs, 0, null, $object);
-
-	$substitutionarray['__EMAIL__'] = $sendto;
-	$substitutionarray['__CHECK_READ__'] = (is_object($object) && is_object($object->thirdparty)) ? '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.urlencode($object->thirdparty->tag).'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>' : '';
-	$substitutionarray['__PERSONALIZED__'] = ''; // deprecated
-	$substitutionarray['__CONTACTCIVNAME__'] = '';
-
-	$parameters = array(
-		'mode' => 'formemail'
-	);
-	complete_substitutions_array($substitutionarray, $langs, $object, $parameters);
-
-	// Tableau des substitutions
-	$formmail->substit = $substitutionarray;
-
-	// Tableau des parametres complementaires du post
-	$formmail->param['action'] = $action;
-	$formmail->param['models'] = $modelmail;
-	$formmail->param['models_id'] = empty(GETPOST('modelmailselected', 'int'))?$conf->global->EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES:GETPOST('modelmailselected', 'int');
-	$formmail->param['id'] = join(',', $arrayofselected);
-	// $formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
-	if (!empty($conf->global->MAILING_LIMIT_SENDBYWEB) && count($listofselectedid) > $conf->global->MAILING_LIMIT_SENDBYWEB) {
-		$langs->load("errors");
-		print img_warning().' '.$langs->trans('WarningNumberOfRecipientIsRestrictedInMassAction', $conf->global->MAILING_LIMIT_SENDBYWEB);
-		print ' - <a href="javascript: window.history.go(-1)">'.$langs->trans("GoBack").'</a>';
-		$arrayofmassactions = array();
-	} else {
-		print $formmail->get_form();
-	}
-
-	print dol_get_fiche_end();
-}
-// Allow Pre-Mass-Action hook (eg for confirmation dialog)
-$parameters = array(
-	'toselect' => $toselect,
-	'uploaddir' => isset($uploaddir) ? $uploaddir : null
-);
diff --git a/htdocs/install/mysql/migration/14.0.0-15.0.0.sql b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
index 50342bc6917..f383c706653 100644
--- a/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
+++ b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
@@ -72,11 +72,14 @@ ALTER TABLE llx_salary_extrafields ADD INDEX idx_salary_extrafields (fk_object);
 INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'conferenceorbooth', '', 0, null, null, '(EventOrganizationEmailAskConf)',       10, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailAskConf)__', '__(Hello)__,<br /><br />__(OrganizationEventConfRequestWasReceived)__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
 INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'conferenceorbooth', '', 0, null, null, '(EventOrganizationEmailAskBooth)',      20, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailAskBooth)__', '__(Hello)__,<br /><br />__(OrganizationEventBoothRequestWasReceived)__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
 -- TODO Add message for registration only to event  __ONLINE_PAYMENT_TEXT_AND_URL__
-INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'conferenceorbooth', '', 0, null, null, '(EventOrganizationEmailSubsBooth)',     30, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailBoothPayment)__', '__(Hello)__,<br /><br />__(OrganizationEventPaymentOfBoothWasReceived)__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
-INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'conferenceorbooth', '', 0, null, null, '(EventOrganizationEmailSubsEvent)',     40, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailRegistrationPayment)__', '__(Hello)__,<br /><br />__(OrganizationEventPaymentOfRegistrationWasReceived)__<br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'conferenceorbooth', '', 0, null, null, '(EventOrganizationEmailBoothPayment)',  30, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailBoothPayment)__', '__(Hello)__,<br /><br />__(OrganizationEventPaymentOfBoothWasReceived)__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'conferenceorbooth', '', 0, null, null, '(EventOrganizationEmailRegistrationPayment)', 40, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailRegistrationPayment)__', '__(Hello)__,<br /><br />__(OrganizationEventPaymentOfRegistrationWasReceived)__<br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
 INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'conferenceorbooth', '', 0, null, null, '(EventOrganizationMassEmailAttendees)', 50, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationMassEmailAttendees)__', '__(Hello)__,<br /><br />__(OrganizationEventBulkMailToAttendees)__<br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
 INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'conferenceorbooth', '', 0, null, null, '(EventOrganizationMassEmailSpeakers)',  60, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationMassEmailSpeakers)__', '__(Hello)__,<br /><br />__(OrganizationEventBulkMailToSpeakers)__<br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
 
+UPDATE llx_c_email_templates SET label = '(EventOrganizationEmailBoothPayment)' WHERE label = '(EventOrganizationEmailSubsBooth)';
+UPDATE llx_c_email_templates SET label = '(EventOrganizationEmailRegistrationPayment)' WHERE label = '(EventOrganizationEmailSubsEvent)';
+
 
 --Fix bad sign on multicompany column for customer invoice lines
 UPDATE llx_facturedet SET multicurrency_subprice = -multicurrency_subprice WHERE ((multicurrency_subprice < 0 and subprice > 0) OR (multicurrency_subprice > 0 and subprice < 0));
diff --git a/htdocs/langs/en_US/eventorganization.lang b/htdocs/langs/en_US/eventorganization.lang
index 88415022bde..bc334fe08cf 100644
--- a/htdocs/langs/en_US/eventorganization.lang
+++ b/htdocs/langs/en_US/eventorganization.lang
@@ -42,12 +42,12 @@ EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties autom
 EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
 EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
 EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
-EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send  after a registration to a booth has been paid.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send after a registration to a booth has been paid.
 EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a registration to an event has been paid.
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email of massaction to attendes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email to use when sending emails from the massaction "Send emails" to speakers
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email to use when sending emails from the massaction "Send emails" on attendee list
+EVENTORGANIZATION_FILTERATTENDEES_CAT = In the form to create/add an attendee, restricts the list of thirdparties to thirdparties in the category
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = In the form to create/add an attendee, restricts the list of thirdparties to thirdparties with the nature
 
 #
 # Object
@@ -71,6 +71,7 @@ EventOrganizationEmailBoothPayment = Payment of your booth
 EventOrganizationEmailRegistrationPayment = Registration for an event
 EventOrganizationMassEmailAttendees = Communication to attendees
 EventOrganizationMassEmailSpeakers = Communication to speakers
+ToSpeakers=To speakers
 
 #
 # Event
@@ -83,14 +84,14 @@ PriceOfRegistration=Price of registration
 PriceOfRegistrationHelp=Price to pay to register or participate in the event
 PriceOfBooth=Subscription price to stand a booth
 PriceOfBoothHelp=Subscription price to stand a booth
-EventOrganizationICSLink=Link ICS for events
+EventOrganizationICSLink=Link ICS for conferences
 ConferenceOrBoothInformation=Conference Or Booth informations
 Attendees=Attendees
 ListOfAttendeesOfEvent=List of attendees of the event project
 DownloadICSLink = Download ICS link
-EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+EVENTORGANIZATION_SECUREKEY = Seed to secure the key for the public registration page to suggest a conference
 SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
-SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
 NbVotes=Number of votes
 #
 # Status

From 18e308e800e0899d1b52ff67a3b2245a40c9e11e Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Fri, 21 Jan 2022 13:47:20 +0100
Subject: [PATCH 215/316] remove leftover if

---
 htdocs/admin/dict.php | 38 ++++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 0b2404050e6..954b3e632ca 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -2412,26 +2412,24 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			// Labels Length
 			$maxlength = '';
 			if (in_array($fieldlist[$field], array('libelle', 'label'))) {
-				if ($fieldlist[$field] == 'label' || $fieldlist[$field] == 'libelle') {
-					switch ($tabname) {
-						case MAIN_DB_PREFIX . 'c_accounting_category':
-						case MAIN_DB_PREFIX . 'c_ecotaxe':
-						case MAIN_DB_PREFIX . 'c_email_senderprofile':
-						case MAIN_DB_PREFIX . 'c_forme_juridique':
-						case MAIN_DB_PREFIX . 'c_holiday_types':
-						case MAIN_DB_PREFIX . 'c_payment_term':
-						case MAIN_DB_PREFIX . 'c_transport_mode':
-							$maxlength = ' maxlength="255"';
-							break;
-						case MAIN_DB_PREFIX . 'c_email_templates':
-							$maxlength = ' maxlength="180"';
-							break;
-						case MAIN_DB_PREFIX . 'c_socialnetworks':
-							$maxlength = ' maxlength="150"';
-							break;
-						default:
-							$maxlength = ' maxlength="128"';
-					}
+				switch ($tabname) {
+					case MAIN_DB_PREFIX . 'c_accounting_category':
+					case MAIN_DB_PREFIX . 'c_ecotaxe':
+					case MAIN_DB_PREFIX . 'c_email_senderprofile':
+					case MAIN_DB_PREFIX . 'c_forme_juridique':
+					case MAIN_DB_PREFIX . 'c_holiday_types':
+					case MAIN_DB_PREFIX . 'c_payment_term':
+					case MAIN_DB_PREFIX . 'c_transport_mode':
+						$maxlength = ' maxlength="255"';
+						break;
+					case MAIN_DB_PREFIX . 'c_email_templates':
+						$maxlength = ' maxlength="180"';
+						break;
+					case MAIN_DB_PREFIX . 'c_socialnetworks':
+						$maxlength = ' maxlength="150"';
+						break;
+					default:
+						$maxlength = ' maxlength="128"';
 				}
 			}
 

From 20cc2c924ec8bd9b7924daefd05f35234718e55e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 21 Jan 2022 14:02:26 +0100
Subject: [PATCH 216/316] css

---
 htdocs/theme/eldy/info-box.inc.php | 5 +++--
 htdocs/theme/md/info-box.inc.php   | 3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php
index a6d9f6d2df9..716ca7eac27 100644
--- a/htdocs/theme/eldy/info-box.inc.php
+++ b/htdocs/theme/eldy/info-box.inc.php
@@ -101,10 +101,11 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
 	font-size: 25px;
 	line-height: 92px;
 }
-.opened-dash-board-wrap .info-box-sm .info-box-icon {
-	border-radius: 0 0 0 20px;
+.opened-dash-board-wrap .info-box .info-box-icon {
+	font-size: 2em;
 }
 .opened-dash-board-wrap .info-box-sm .info-box-icon {
+	border-radius: 0 0 0 20px;
 	line-height: 80px;
 }
 .info-box-module .info-box-icon {
diff --git a/htdocs/theme/md/info-box.inc.php b/htdocs/theme/md/info-box.inc.php
index cedfab31df8..33dde512fc0 100644
--- a/htdocs/theme/md/info-box.inc.php
+++ b/htdocs/theme/md/info-box.inc.php
@@ -198,6 +198,9 @@ a.info-box-text-a i.fa.fa-exclamation-triangle {
 	font-size: 25px;
 	line-height: 92px;
 }
+.opened-dash-board-wrap .info-box .info-box-icon {
+	font-size: 2em;
+}
 .opened-dash-board-wrap .info-box-sm .info-box-icon {
 	line-height: 80px;
 }

From accc41359654eab11b320aaf8560df6cdb27e334 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 21 Jan 2022 15:26:54 +0100
Subject: [PATCH 217/316] Fix error management

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

diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index f4c7a7352ea..a6b6b5af1e6 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1907,8 +1907,8 @@ class User extends CommonObject
 				if ($this->pass != $this->pass_indatabase && $this->pass != $this->pass_indatabase_crypted) {
 					// Si mot de passe saisi et different de celui en base
 					$result = $this->setPassword($user, $this->pass, 0, $notrigger, $nosyncmemberpass);
-					if (!$nbrowsaffected) {
-						$nbrowsaffected++;
+					if ($result < 0) {
+						return -5;
 					}
 				}
 			}
@@ -2148,6 +2148,7 @@ class User extends CommonObject
 				}
 			}
 
+
 			// Now, we encrypt the new password
 			$password_crypted = dol_hash($password);
 		}

From 84d446cf73ec1e14432253ebd2ff3ebc7b5b2d57 Mon Sep 17 00:00:00 2001
From: Quentin VIAL-GOUTEYRON <quentin.vial-gouteyron@atm-consulting.fr>
Date: Fri, 21 Jan 2022 15:31:30 +0100
Subject: [PATCH 218/316] NEW possibility to consume multiple   batch

---
 htdocs/mrp/js/lib_dispatch.js.php |  6 ++++--
 htdocs/mrp/mo_production.php      | 16 ++++++++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/htdocs/mrp/js/lib_dispatch.js.php b/htdocs/mrp/js/lib_dispatch.js.php
index 8a5eef60211..aa29b38c5fb 100644
--- a/htdocs/mrp/js/lib_dispatch.js.php
+++ b/htdocs/mrp/js/lib_dispatch.js.php
@@ -70,10 +70,12 @@ function addDispatchLine(index, type, mode)
 	mode = mode || 'qtymissing'
 
 	console.log("fourn/js/lib_dispatch.js.php Split line type="+type+" index="+index+" mode="+mode);
+    if(mode == 'qtymissingconsume') var inputId = 'qtytoconsume';
+    else var inputId = 'qtytoproduce';
 	var nbrTrs = $("tr[name^='"+type+"_"+index+"']").length; 				// position of line for batch
 	var $row = $("tr[name='"+type+'_'+index+"_1']").clone(true); 				// clone last batch line to jQuery object
 	var	qtyOrdered = parseFloat($("#qty_ordered_"+index).val()); 	// Qty ordered is same for all rows
-	var	qty = parseFloat($("#qtytoproduce-"+index+"-"+nbrTrs).val());
+	var	qty = parseFloat($("#"+inputId+"-"+index+"-"+nbrTrs).val());
 	var	qtyDispatched;
 
 	if (mode === 'lessone')
@@ -83,7 +85,7 @@ function addDispatchLine(index, type, mode)
 	else
 	{
 		qtyDispatched = parseFloat($("#qty_dispatched_"+index).val()) + qty;
-		console.log(qty);
+		console.log($("#qty_dispatched_"+index).val());
 		// If user did not reduced the qty to dispatch on old line, we keep only 1 on old line and the rest on new line
 		if (qtyDispatched == qtyOrdered && qtyDispatched > 1) {
 			qtyDispatched = parseFloat($("#qty_dispatched_"+index).val()) + 1;
diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index ca9480eb1ae..fa5897bb5f0 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -811,6 +811,12 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 						$alreadyconsumed += $line2['qty'];
 					}
 
+					$suffix = '_'.$line->id;
+					print '<!-- Line to dispatch '.$suffix.' -->'."\n";
+					// hidden fields for js function
+					print '<input id="qty_ordered'.$suffix.'" type="hidden" value="'.$line->qty.'">';
+					print '<input id="qty_dispatched'.$suffix.'" type="hidden" value="'.$alreadyconsumed.'">';
+
 					print '<tr>';
 					print '<td>'.$tmpproduct->getNomUrl(1);
 					print '<br><span class="opacitymedium small">'.$tmpproduct->label.'</span>';
@@ -914,13 +920,13 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 					if (in_array($action, array('consumeorproduce', 'consumeandproduceall'))) {
 						$i = 1;
 						print '<!-- Enter line to consume -->'."\n";
-						print '<tr>';
+						print '<tr name="batch_'.$line->id.'_'.$i.'">';
 						print '<td><span class="opacitymedium">'.$langs->trans("ToConsume").'</span></td>';
 						$preselected = (GETPOSTISSET('qty-'.$line->id.'-'.$i) ? GETPOST('qty-'.$line->id.'-'.$i) : max(0, $line->qty - $alreadyconsumed));
 						if ($action == 'consumeorproduce' && !GETPOSTISSET('qty-'.$line->id.'-'.$i)) {
 							$preselected = 0;
 						}
-						print '<td class="right"><input type="text" class="width50 right" name="qty-'.$line->id.'-'.$i.'" value="'.$preselected.'"></td>';
+						print '<td class="right"><input type="text" class="width50 right" id="qtytoconsume-'.$line->id.'-'.$i.'" name="qty-'.$line->id.'-'.$i.'" value="'.$preselected.'"></td>';
 						if ($permissiontoupdatecost && !empty($conf->global->MRP_SHOW_COST_FOR_CONSUMPTION)) {
 							print '<td></td>';
 						}
@@ -945,6 +951,12 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 								print '<input type="text" class="width50" name="batch-'.$line->id.'-'.$i.'" value="'.$preselected.'">';
 							}
 							print '</td>';
+							print '<td>';
+							if ($tmpproduct->status_batch) {
+								$type = 'batch';
+								print img_picto($langs->trans('AddStockLocationLine'), 'split.png', 'class="splitbutton" onClick="addDispatchLine('.$line->id.', \''.$type.'\', \'qtymissingconsume\')"');
+							}
+							print '</td>';
 						}
 						print '</tr>';
 					}

From 482efec536c5856467862a5a70a960c16df9545a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 21 Jan 2022 15:40:37 +0100
Subject: [PATCH 219/316] Fix missing column

---
 htdocs/core/lib/project.lib.php | 2 +-
 htdocs/user/card.php            | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 7f5daf77c4a..90a67991413 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -823,7 +823,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 					}
 				}
 
-				if (count($arrayfields) > 0 && !empty($arrayfields['c.budget_amount']['checked'])) {
+				if (count($arrayfields) > 0 && !empty($arrayfields['t.budget_amount']['checked'])) {
 					print '<td class="center">';
 					print price($lines[$i]->budget_amount, 0, $langs, 1, 0, 0, $conf->currency);
 					$total_budget_amount += $lines[$i]->budget_amount;
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 4d748cd6946..c5103278dda 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -505,6 +505,7 @@ if (empty($reshook)) {
 							setEventMessages($langs->trans("ErrorLoginAlreadyExists", $object->login), null, 'errors');
 						} else {
 							setEventMessages($object->error, $object->errors, 'errors');
+							$action = 'edit';
 						}
 					}
 				}

From bbb0864fd8dac4354002aa37b5da130c5b1cfce4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 21 Jan 2022 15:45:09 +0100
Subject: [PATCH 220/316] Look and feel v15

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

diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index dc482c1c60c..64d134a7254 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -850,8 +850,8 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 	$moreforfilter = '';
 	if (count($tasksarray) > 0) {
 		$moreforfilter .= '<div class="divsearchfield">';
-		$moreforfilter .= $langs->trans("TasksAssignedTo").': ';
-		$moreforfilter .= $form->select_dolusers($tmpuser->id > 0 ? $tmpuser->id : '', 'search_user_id', 1);
+		$moreforfilter .= img_picto('', 'user', 'class="pictofixedwidth"');
+		$moreforfilter .= $form->select_dolusers($tmpuser->id > 0 ? $tmpuser->id : '', 'search_user_id', $langs->trans("TasksAssignedTo"), null, 0, '', '');
 		$moreforfilter .= '</div>';
 	}
 	if ($moreforfilter) {

From 8c22de698265889efbe06d9f443b174c8cd548aa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 21 Jan 2022 16:15:38 +0100
Subject: [PATCH 221/316] Comment

---
 htdocs/projet/tasks/note.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php
index 3d1ec610b48..5f3d74a3c68 100644
--- a/htdocs/projet/tasks/note.php
+++ b/htdocs/projet/tasks/note.php
@@ -47,7 +47,6 @@ if (!$user->rights->projet->lire) {
 
 $hookmanager->initHooks(array('projettasknote'));
 
-//$result = restrictedArea($user, 'projet', $id, '', 'task'); // TODO ameliorer la verification
 
 $object = new Task($db);
 $projectstatic = new Project($db);
@@ -89,6 +88,7 @@ if ($id > 0 || $ref) {
 	$object->fetch($id, $ref);
 }
 
+//$result = restrictedArea($user, 'projet', $id, '', 'task'); // TODO ameliorer la verification
 restrictedArea($user, 'projet', $object->fk_project, 'projet&project');
 
 $permissionnote = ($user->rights->projet->creer || $user->rights->projet->all->creer);

From 4ac62773ae7ff2c7a00b9cd0e783f0906eb93ec6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 21 Jan 2022 16:22:59 +0100
Subject: [PATCH 222/316] Fix permissions on deletion on time spend line

---
 htdocs/projet/tasks/time.php | 86 +++++++++++++++++++++---------------
 1 file changed, 51 insertions(+), 35 deletions(-)

diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index bbf33b620c4..bc6ec7d15cf 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -74,13 +74,6 @@ $search_task_label = GETPOST('search_task_label', 'alpha');
 $search_user = GETPOST('search_user', 'int');
 $search_valuebilled = GETPOST('search_valuebilled', 'int');
 
-// Security check
-$socid = 0;
-//if ($user->socid > 0) $socid = $user->socid;	  // For external user, no check is done on company because readability is managed by public status of project and assignement.
-if (!$user->rights->projet->lire) {
-	accessforbidden();
-}
-
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
@@ -98,6 +91,8 @@ if (!$sortorder) {
 	$sortorder = 'DESC,DESC,DESC';
 }
 
+$childids = $user->getAllChildIds(1);
+
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 //$object = new TaskTime($db);
 $hookmanager->initHooks(array('projecttasktime', 'globalcard'));
@@ -113,11 +108,19 @@ if ($id > 0 || $ref) {
 	$object->fetch($id, $ref);
 }
 
+
+// Security check
+$socid = 0;
+//if ($user->socid > 0) $socid = $user->socid;	  // For external user, no check is done on company because readability is managed by public status of project and assignement.
+if (!$user->rights->projet->lire) {
+	accessforbidden();
+}
+
 if ($object->fk_project > 0) {
 	restrictedArea($user, 'projet', $object->fk_project, 'projet&project');
 } else {
 	restrictedArea($user, 'projet', null, 'projet&project');
-	// We check user has permission to see all taks of all users
+	// We check user has permission to see all tasks of all users
 	if (empty($projectid) && !$user->hasRight('projet', 'all', 'lire')) {
 		$search_user = $user->id;
 	}
@@ -246,10 +249,14 @@ if (($action == 'updateline' || $action == 'updatesplitline') && !$cancel && $us
 			$id = GETPOST('taskid', 'int');
 
 			$object->fetchTimeSpent(GETPOST('lineid', 'int'));
-			// TODO Check that ($task_time->fk_user == $user->id || in_array($task_time->fk_user, $childids))
-			$result = $object->delTimeSpent($user);
+
+			$result = 0;
+			if (in_array($object->timespent_fk_user, $childids) || $user->rights->projet->all->creer) {
+				$result = $object->delTimeSpent($user);
+			}
 
 			$object->fetch($id, $ref);
+
 			$object->timespent_note = GETPOST("timespent_note_line", 'alpha');
 			$object->timespent_old_duration = GETPOST("old_duration");
 			$object->timespent_duration = GETPOSTINT("new_durationhour") * 60 * 60; // We store duration in seconds
@@ -261,7 +268,12 @@ if (($action == 'updateline' || $action == 'updatesplitline') && !$cancel && $us
 				$object->timespent_date = dol_mktime(12, 0, 0, GETPOST("timelinemonth"), GETPOST("timelineday"), GETPOST("timelineyear"));
 			}
 			$object->timespent_fk_user = GETPOST("userid_line", 'int');
-			$result = $object->addTimeSpent($user);
+
+			$result = 0;
+			if (in_array($object->timespent_fk_user, $childids) || $user->rights->projet->all->creer) {
+				$result = $object->addTimeSpent($user);
+			}
+
 			if ($result >= 0) {
 				setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
 			} else {
@@ -270,7 +282,6 @@ if (($action == 'updateline' || $action == 'updatesplitline') && !$cancel && $us
 			}
 		} else {
 			$object->fetch($id, $ref);
-			// TODO Check that ($task_time->fk_user == $user->id || in_array($task_time->fk_user, $childids))
 
 			$object->timespent_id = GETPOST("lineid", 'int');
 			$object->timespent_note = GETPOST("timespent_note_line");
@@ -285,12 +296,16 @@ if (($action == 'updateline' || $action == 'updatesplitline') && !$cancel && $us
 			}
 			$object->timespent_fk_user = GETPOST("userid_line", 'int');
 
-			$result = $object->updateTimeSpent($user);
-			if ($result >= 0) {
-				setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
-			} else {
-				setEventMessages($langs->trans($object->error), null, 'errors');
-				$error++;
+			$result = 0;
+			if (in_array($object->timespent_fk_user, $childids) || $user->rights->projet->all->creer) {
+				$result = $object->updateTimeSpent($user);
+
+				if ($result >= 0) {
+					setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
+				} else {
+					setEventMessages($langs->trans($object->error), null, 'errors');
+					$error++;
+				}
 			}
 		}
 	} else {
@@ -298,18 +313,20 @@ if (($action == 'updateline' || $action == 'updatesplitline') && !$cancel && $us
 	}
 }
 
-if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->projet->lire) {
-	$object->fetchTimeSpent(GETPOST('lineid', 'int'));
-	// TODO Check that ($task_time->fk_user == $user->id || in_array($task_time->fk_user, $childids))
-	$result = $object->delTimeSpent($user);
+if ($action == 'confirm_deleteline' && $confirm == "yes" && $user->rights->projet->lire) {
+	$object->fetchTimeSpent(GETPOST('lineid', 'int'));	// load properties like $object->timespent_id
 
-	if ($result < 0) {
-		$langs->load("errors");
-		setEventMessages($langs->trans($object->error), null, 'errors');
-		$error++;
-		$action = '';
-	} else {
-		setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
+	if (in_array($object->timespent_fk_user, $childids) || $user->rights->projet->all->creer) {
+		$result = $object->delTimeSpent($user);	// delete line with $object->timespent_id
+
+		if ($result < 0) {
+			$langs->load("errors");
+			setEventMessages($langs->trans($object->error), null, 'errors');
+			$error++;
+			$action = '';
+		} else {
+			setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
+		}
 	}
 }
 
@@ -888,7 +905,8 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 			}
 		}
 
-		$linktocreatetime = dolGetButtonTitle($langs->trans('AddTimeSpent'), $linktocreatetimeHelpText, 'fa fa-plus-circle', $linktocreatetimeUrl, '', $linktocreatetimeBtnStatus);
+		$paramsbutton = array('morecss'=>'reposition');
+		$linktocreatetime = dolGetButtonTitle($langs->trans('AddTimeSpent'), $linktocreatetimeHelpText, 'fa fa-plus-circle', $linktocreatetimeUrl, '', $linktocreatetimeBtnStatus, $paramsbutton);
 	}
 
 	$massactionbutton = '';
@@ -915,7 +933,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 		print dol_get_fiche_head($head, 'task_time', $langs->trans("Task"), -1, 'projecttask', 0, '', 'reposition');
 
 		if ($action == 'deleteline') {
-			print $form->formconfirm($_SERVER["PHP_SELF"]."?".($object->id > 0 ? "id=".$object->id : 'projectid='.$projectstatic->id).'&lineid='.GETPOST("lineid", 'int').($withproject ? '&withproject=1' : ''), $langs->trans("DeleteATimeSpent"), $langs->trans("ConfirmDeleteATimeSpent"), "confirm_delete", '', '', 1);
+			print $form->formconfirm($_SERVER["PHP_SELF"]."?".($object->id > 0 ? "id=".$object->id : 'projectid='.$projectstatic->id).'&lineid='.GETPOST("lineid", 'int').($withproject ? '&withproject=1' : ''), $langs->trans("DeleteATimeSpent"), $langs->trans("ConfirmDeleteATimeSpent"), "confirm_deleteline", '', '', 1);
 		}
 
 		$param = ($withproject ? '&withproject=1' : '');
@@ -1014,7 +1032,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 
 	if ($projectstatic->id > 0 || $allprojectforuser > 0) {
 		if ($action == 'deleteline' && !empty($projectidforalltimes)) {
-			print $form->formconfirm($_SERVER["PHP_SELF"]."?".($object->id > 0 ? "id=".$object->id : 'projectid='.$projectstatic->id).'&lineid='.GETPOST('lineid', 'int').($withproject ? '&withproject=1' : ''), $langs->trans("DeleteATimeSpent"), $langs->trans("ConfirmDeleteATimeSpent"), "confirm_delete", '', '', 1);
+			print $form->formconfirm($_SERVER["PHP_SELF"]."?".($object->id > 0 ? "id=".$object->id : 'projectid='.$projectstatic->id).'&lineid='.GETPOST('lineid', 'int').($withproject ? '&withproject=1' : ''), $langs->trans("DeleteATimeSpent"), $langs->trans("ConfirmDeleteATimeSpent"), "confirm_deleteline", '', '', 1);
 		}
 
 		// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
@@ -1579,8 +1597,6 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 
 		$i = 0;
 
-		$childids = $user->getAllChildIds();
-
 		$total = 0;
 		$totalvalue = 0;
 		$totalarray = array();
@@ -1796,7 +1812,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 				print '<br>';
 				print '<input type="submit" class="button buttongen margintoponlyshort marginbottomonlyshort button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 			} elseif ($user->rights->projet->lire || $user->rights->projet->all->creer) {	 // Read project and enter time consumed on assigned tasks
-				if ($task_time->fk_user == $user->id || in_array($task_time->fk_user, $childids) || $user->rights->projet->all->creer) {
+				if (in_array($task_time->fk_user, $childids) || $user->rights->projet->all->creer) {
 					if ($conf->MAIN_FEATURES_LEVEL >= 2) {
 						print '&nbsp;';
 						print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$task_time->fk_task.'&action=splitline&token='.newToken().'&lineid='.$task_time->rowid.$param.((empty($id) || $tab == 'timespent') ? '&tab=timespent' : '').'">';

From 82305d7dd403eb33f959b9e7d69c2e23afafb80c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 21 Jan 2022 16:34:09 +0100
Subject: [PATCH 223/316] Fix bad position sorting of permission list

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

diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index 4571ed48884..6e28a77b5bc 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -292,6 +292,72 @@ if ($user->admin) {
 }
 print '</tr>'."\n";
 
+
+// Fix bad value for module_position in table
+// ------------------------------------------
+$sql = "SELECT r.id, r.libelle as label, r.module, r.perms, r.subperms, r.module_position, r.bydefault";
+$sql .= " FROM ".MAIN_DB_PREFIX."rights_def as r";
+$sql .= " WHERE r.libelle NOT LIKE 'tou%'"; // On ignore droits "tous"
+$sql .= " AND r.entity = ".((int) $entity);
+$sql .= " ORDER BY r.family_position, r.module_position, r.module, r.id";
+
+$result = $db->query($sql);
+if ($result) {
+	$num = $db->num_rows($result);
+	$i = 0;
+	$oldmod = '';
+
+	while ($i < $num) {
+		$obj = $db->fetch_object($result);
+
+		// If line is for a module that does not exist anymore (absent of includes/module), we ignore it
+		if (empty($modules[$obj->module])) {
+			$i++;
+			continue;
+		}
+
+		// Special cases
+		if (!empty($conf->reception->enabled)) {
+			// The 2 permissions in fournisseur modules are replaced by permissions into reception module
+			if ($obj->module == 'fournisseur' && $obj->perms == 'commande' && $obj->subperms == 'receptionner') {
+				$i++;
+				continue;
+			}
+			if ($obj->module == 'fournisseur' && $obj->perms == 'commande_advance' && $obj->subperms == 'check') {
+				$i++;
+				continue;
+			}
+		}
+
+		$objMod = $modules[$obj->module];
+
+		// Save field module_position in database if value is wrong
+		if (empty($obj->module_position) || (is_object($objMod) && $objMod->isCoreOrExternalModule() == 'external' && $obj->module_position < 100000)) {
+			if (is_object($modules[$obj->module]) && ($modules[$obj->module]->module_position > 0)) {
+				// TODO Define familyposition
+				//$familyposition = $modules[$obj->module]->family_position;
+				$familyposition = 0;
+
+				$newmoduleposition = $modules[$obj->module]->module_position;
+
+				// Correct $newmoduleposition position for external modules
+				$objMod = $modules[$obj->module];
+				if (is_object($objMod) && $objMod->isCoreOrExternalModule() == 'external' && $newmoduleposition < 100000) {
+					$newmoduleposition += 100000;
+				}
+
+				$sqlupdate = 'UPDATE '.MAIN_DB_PREFIX."rights_def SET module_position = ".((int) $newmoduleposition).",";
+				$sqlupdate .= " family_position = ".((int) $familyposition);
+				$sqlupdate .= " WHERE module_position = ".((int) $obj->module_position)." AND module = '".$db->escape($obj->module)."'";
+
+				$db->query($sqlupdate);
+			}
+		}
+	}
+}
+
+
+
 //print "xx".$conf->global->MAIN_USE_ADVANCED_PERMS;
 $sql = "SELECT r.id, r.libelle as label, r.module, r.perms, r.subperms, r.module_position, r.bydefault";
 $sql .= " FROM ".MAIN_DB_PREFIX."rights_def as r";
@@ -333,6 +399,7 @@ if ($result) {
 		$objMod = $modules[$obj->module];
 
 		// Save field module_position in database if value is wrong
+		/*
 		if (empty($obj->module_position) || (is_object($objMod) && $objMod->isCoreOrExternalModule() == 'external' && $obj->module_position < 100000)) {
 			if (is_object($modules[$obj->module]) && ($modules[$obj->module]->module_position > 0)) {
 				// TODO Define familyposition
@@ -354,6 +421,7 @@ if ($result) {
 				$db->query($sqlupdate);
 			}
 		}
+		*/
 
 		// Break found, it's a new module to catch
 		if (isset($obj->module) && ($oldmod <> $obj->module)) {

From a3a856d0be08aa7eca3f60012b6f9f0dddef1b53 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Fri, 21 Jan 2022 16:57:57 +0100
Subject: [PATCH 224/316] NEW add modifications for new function
 "$db->prefix()"

---
 htdocs/core/class/conf.class.php |   2 +-
 htdocs/user/class/user.class.php | 116 +++++++++++++++----------------
 2 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 2b19e0db134..c7d01cab586 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -258,7 +258,7 @@ class Conf
 			// Define all global constants into $this->global->key=value
 			$sql = "SELECT ".$db->decrypt('name')." as name,";
 			$sql .= " ".$db->decrypt('value')." as value, entity";
-			$sql .= " FROM ".MAIN_DB_PREFIX."const";
+			$sql .= " FROM ".$db->prefix()."const";
 			$sql .= " WHERE entity IN (0,".$this->entity.")";
 			$sql .= " ORDER BY entity"; // This is to have entity 0 first, then entity 1 that overwrite.
 
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index f4c7a7352ea..a0167dd34c8 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -439,9 +439,9 @@ class User extends CommonObject
 		$sql .= " u.default_range, u.default_c_exp_tax_cat,"; // Expense report default mode
 		$sql .= " c.code as country_code, c.label as country,";
 		$sql .= " d.code_departement as state_code, d.nom as state";
-		$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON u.fk_country = c.rowid";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as d ON u.fk_state = d.rowid";
+		$sql .= " FROM ".$this->db->prefix()."user as u";
+		$sql .= " LEFT JOIN ".$this->db->prefix()."c_country as c ON u.fk_country = c.rowid";
+		$sql .= " LEFT JOIN ".$this->db->prefix()."c_departements as d ON u.fk_state = d.rowid";
 
 		if ($entity < 0) {
 			if ((empty($conf->multicompany->enabled) || empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) && (!empty($user->entity))) {
@@ -584,7 +584,7 @@ class User extends CommonObject
 		// To get back the global configuration unique to the user
 		if ($loadpersonalconf) {
 			// Load user->conf for user
-			$sql = "SELECT param, value FROM ".MAIN_DB_PREFIX."user_param";
+			$sql = "SELECT param, value FROM ".$this->db->prefix()."user_param";
 			$sql .= " WHERE fk_user = ".((int) $this->id);
 			$sql .= " AND entity = ".((int) $conf->entity);
 			//dol_syslog(get_class($this).'::fetch load personalized conf', LOG_DEBUG);
@@ -801,7 +801,7 @@ class User extends CommonObject
 
 			// If we ask to add a given permission, we first load properties of this permission (module, perms and subperms).
 			$sql = "SELECT module, perms, subperms";
-			$sql .= " FROM ".MAIN_DB_PREFIX."rights_def";
+			$sql .= " FROM ".$this->db->prefix()."rights_def";
 			$sql .= " WHERE id = ".((int) $rid);
 			$sql .= " AND entity = ".((int) $entity);
 
@@ -847,7 +847,7 @@ class User extends CommonObject
 		if (!empty($whereforadd)) {
 			//print "$module-$perms-$subperms";
 			$sql = "SELECT id";
-			$sql .= " FROM ".MAIN_DB_PREFIX."rights_def";
+			$sql .= " FROM ".$this->db->prefix()."rights_def";
 			$sql .= " WHERE entity = ".((int) $entity);
 			if (!empty($whereforadd) && $whereforadd != 'allmodules') {
 				$sql .= " AND (".$whereforadd.")";	// Note: parenthesis are important because whereforadd can contains OR. Also note that $whereforadd is already sanitized
@@ -861,11 +861,11 @@ class User extends CommonObject
 					$obj = $this->db->fetch_object($result);
 					$nid = $obj->id;
 
-					$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_rights WHERE fk_user = ".((int) $this->id)." AND fk_id = ".((int) $nid)." AND entity = ".((int) $entity);
+					$sql = "DELETE FROM ".$this->db->prefix()."user_rights WHERE fk_user = ".((int) $this->id)." AND fk_id = ".((int) $nid)." AND entity = ".((int) $entity);
 					if (!$this->db->query($sql)) {
 						$error++;
 					}
-					$sql = "INSERT INTO ".MAIN_DB_PREFIX."user_rights (entity, fk_user, fk_id) VALUES (".((int) $entity).", ".((int) $this->id).", ".((int) $nid).")";
+					$sql = "INSERT INTO ".$this->db->prefix()."user_rights (entity, fk_user, fk_id) VALUES (".((int) $entity).", ".((int) $this->id).", ".((int) $nid).")";
 					if (!$this->db->query($sql)) {
 						$error++;
 					}
@@ -927,7 +927,7 @@ class User extends CommonObject
 			// Si on a demande supression d'un droit en particulier, on recupere
 			// les caracteristiques module, perms et subperms de ce droit.
 			$sql = "SELECT module, perms, subperms";
-			$sql .= " FROM ".MAIN_DB_PREFIX."rights_def";
+			$sql .= " FROM ".$this->db->prefix()."rights_def";
 			$sql .= " WHERE id = '".$this->db->escape($rid)."'";
 			$sql .= " AND entity = ".((int) $entity);
 
@@ -973,7 +973,7 @@ class User extends CommonObject
 		if (!empty($wherefordel)) {
 			//print "$module-$perms-$subperms";
 			$sql = "SELECT id";
-			$sql .= " FROM ".MAIN_DB_PREFIX."rights_def";
+			$sql .= " FROM ".$this->db->prefix()."rights_def";
 			$sql .= " WHERE entity = ".((int) $entity);
 			if (!empty($wherefordel) && $wherefordel != 'allmodules') {
 				$sql .= " AND (".$wherefordel.")";	// Note: parenthesis are important because wherefordel can contains OR. Also note that $wherefordel is already sanitized
@@ -995,7 +995,7 @@ class User extends CommonObject
 					$obj = $this->db->fetch_object($result);
 					$nid = $obj->id;
 
-					$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_rights";
+					$sql = "DELETE FROM ".$this->db->prefix()."user_rights";
 					$sql .= " WHERE fk_user = ".((int) $this->id)." AND fk_id = ".((int) $nid);
 					$sql .= " AND entity = ".((int) $entity);
 					if (!$this->db->query($sql)) {
@@ -1076,8 +1076,8 @@ class User extends CommonObject
 
 		// First user permissions
 		$sql = "SELECT DISTINCT r.module, r.perms, r.subperms";
-		$sql .= " FROM ".MAIN_DB_PREFIX."user_rights as ur,";
-		$sql .= " ".MAIN_DB_PREFIX."rights_def as r";
+		$sql .= " FROM ".$this->db->prefix()."user_rights as ur,";
+		$sql .= " ".$this->db->prefix()."rights_def as r";
 		$sql .= " WHERE r.id = ur.fk_id";
 		if (!empty($conf->global->MULTICOMPANY_BACKWARD_COMPATIBILITY)) {
 			// on old version, we use entity defined into table r only
@@ -1138,9 +1138,9 @@ class User extends CommonObject
 
 		// Now permissions of groups
 		$sql = "SELECT DISTINCT r.module, r.perms, r.subperms";
-		$sql .= " FROM ".MAIN_DB_PREFIX."usergroup_rights as gr,";
-		$sql .= " ".MAIN_DB_PREFIX."usergroup_user as gu,";
-		$sql .= " ".MAIN_DB_PREFIX."rights_def as r";
+		$sql .= " FROM ".$this->db->prefix()."usergroup_rights as gr,";
+		$sql .= " ".$this->db->prefix()."usergroup_user as gu,";
+		$sql .= " ".$this->db->prefix()."rights_def as r";
 		$sql .= " WHERE r.id = gr.fk_id";
 		if (!empty($conf->global->MULTICOMPANY_BACKWARD_COMPATIBILITY)) {
 			if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
@@ -1243,7 +1243,7 @@ class User extends CommonObject
 		$this->db->begin();
 
 		// Save in database
-		$sql = "UPDATE ".MAIN_DB_PREFIX."user";
+		$sql = "UPDATE ".$this->db->prefix()."user";
 		$sql .= " SET statut = ".((int) $status);
 		$sql .= " WHERE rowid = ".((int) $this->id);
 		$result = $this->db->query($sql);
@@ -1304,7 +1304,7 @@ class User extends CommonObject
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 
 		// Remove rights
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_rights WHERE fk_user = ".((int) $this->id);
+		$sql = "DELETE FROM ".$this->db->prefix()."user_rights WHERE fk_user = ".((int) $this->id);
 
 		if (!$error && !$this->db->query($sql)) {
 			$error++;
@@ -1312,14 +1312,14 @@ class User extends CommonObject
 		}
 
 		// Remove group
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."usergroup_user WHERE fk_user  = ".((int) $this->id);
+		$sql = "DELETE FROM ".$this->db->prefix()."usergroup_user WHERE fk_user  = ".((int) $this->id);
 		if (!$error && !$this->db->query($sql)) {
 			$error++;
 			$this->error = $this->db->lasterror();
 		}
 
 		// Remove params
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_param WHERE fk_user  = ".((int) $this->id);
+		$sql = "DELETE FROM ".$this->db->prefix()."user_param WHERE fk_user  = ".((int) $this->id);
 		if (!$error && !$this->db->query($sql)) {
 			$error++;
 			$this->error = $this->db->lasterror();
@@ -1327,7 +1327,7 @@ class User extends CommonObject
 
 		// If contact, remove link
 		if ($this->contact_id > 0) {
-			$sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET fk_user_creat = null WHERE rowid = ".((int) $this->contact_id);
+			$sql = "UPDATE ".$this->db->prefix()."socpeople SET fk_user_creat = null WHERE rowid = ".((int) $this->contact_id);
 			if (!$error && !$this->db->query($sql)) {
 				$error++;
 				$this->error = $this->db->lasterror();
@@ -1345,7 +1345,7 @@ class User extends CommonObject
 
 		// Remove user
 		if (!$error) {
-			$sql = "DELETE FROM ".MAIN_DB_PREFIX."user WHERE rowid = ".((int) $this->id);
+			$sql = "DELETE FROM ".$this->db->prefix()."user WHERE rowid = ".((int) $this->id);
 			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 			if (!$this->db->query($sql)) {
 				$error++;
@@ -1417,7 +1417,7 @@ class User extends CommonObject
 
 		// Check if login already exists in same entity or into entity 0.
 		if ($this->login) {
-			$sqltochecklogin = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."user WHERE entity IN (".$this->db->sanitize((int) $this->entity).", 0) AND login = '".$this->db->escape($this->login)."'";
+			$sqltochecklogin = "SELECT COUNT(*) as nb FROM ".$this->db->prefix()."user WHERE entity IN (".$this->db->sanitize((int) $this->entity).", 0) AND login = '".$this->db->escape($this->login)."'";
 			$resqltochecklogin = $this->db->query($sqltochecklogin);
 			if ($resqltochecklogin) {
 				$objtochecklogin = $this->db->fetch_object($resqltochecklogin);
@@ -1432,7 +1432,7 @@ class User extends CommonObject
 			}
 		}
 		if ($this->email !== '') {
-			$sqltochecklogin = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."user WHERE entity IN (".$this->db->sanitize((int) $this->entity).", 0) AND email = '".$this->db->escape($this->email)."'";
+			$sqltochecklogin = "SELECT COUNT(*) as nb FROM ".$this->db->prefix()."user WHERE entity IN (".$this->db->sanitize((int) $this->entity).", 0) AND email = '".$this->db->escape($this->email)."'";
 			$resqltochecklogin = $this->db->query($sqltochecklogin);
 			if ($resqltochecklogin) {
 				$objtochecklogin = $this->db->fetch_object($resqltochecklogin);
@@ -1448,13 +1448,13 @@ class User extends CommonObject
 		}
 
 		// Insert into database
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."user (datec, login, ldap_sid, entity)";
+		$sql = "INSERT INTO ".$this->db->prefix()."user (datec, login, ldap_sid, entity)";
 		$sql .= " VALUES('".$this->db->idate($this->datec)."', '".$this->db->escape($this->login)."', '".$this->db->escape($this->ldap_sid)."', ".((int) $this->entity).")";
 		$result = $this->db->query($sql);
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		if ($result) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."user");
+			$this->id = $this->db->last_insert_id($this->db->prefix()."user");
 
 			// Set default rights
 			if ($this->set_default_rights() < 0) {
@@ -1556,7 +1556,7 @@ class User extends CommonObject
 		// Create user and set $this->id. Trigger is disabled because executed later.
 		$result = $this->create($user, 1);
 		if ($result > 0) {
-			$sql = "UPDATE ".MAIN_DB_PREFIX."user";
+			$sql = "UPDATE ".$this->db->prefix()."user";
 			$sql .= " SET fk_socpeople=".((int) $contact->id);
 			$sql .= ", civility='".$this->db->escape($contact->civility_code)."'";
 			if ($contact->socid > 0) {
@@ -1644,7 +1644,7 @@ class User extends CommonObject
 					$result = -2;
 				}
 			} elseif (!empty($this->pass_crypted)) {	// If a crypted password is already known, we save it directly into database because the previous create did not save it.
-				$sql = "UPDATE ".MAIN_DB_PREFIX."user";
+				$sql = "UPDATE ".$this->db->prefix()."user";
 				$sql .= " SET pass_crypted = '".$this->db->escape($this->pass_crypted)."'";
 				$sql .= " WHERE rowid=".((int) $this->id);
 
@@ -1655,7 +1655,7 @@ class User extends CommonObject
 			}
 
 			if ($result > 0 && $member->fk_soc) {	// If member is linked to a thirdparty
-				$sql = "UPDATE ".MAIN_DB_PREFIX."user";
+				$sql = "UPDATE ".$this->db->prefix()."user";
 				$sql .= " SET fk_soc=".((int) $member->fk_soc);
 				$sql .= " WHERE rowid=".((int) $this->id);
 
@@ -1696,7 +1696,7 @@ class User extends CommonObject
 
 		$rd = array();
 		$num = 0;
-		$sql = "SELECT id FROM ".MAIN_DB_PREFIX."rights_def";
+		$sql = "SELECT id FROM ".$this->db->prefix()."rights_def";
 		$sql .= " WHERE bydefault = 1";
 		$sql .= " AND entity = ".((int) $conf->entity);
 
@@ -1713,10 +1713,10 @@ class User extends CommonObject
 		}
 		$i = 0;
 		while ($i < $num) {
-			$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_rights WHERE fk_user = $this->id AND fk_id=$rd[$i]";
+			$sql = "DELETE FROM ".$this->db->prefix()."user_rights WHERE fk_user = $this->id AND fk_id=$rd[$i]";
 			$result = $this->db->query($sql);
 
-			$sql = "INSERT INTO ".MAIN_DB_PREFIX."user_rights (fk_user, fk_id) VALUES ($this->id, $rd[$i])";
+			$sql = "INSERT INTO ".$this->db->prefix()."user_rights (fk_user, fk_id) VALUES ($this->id, $rd[$i])";
 			$result = $this->db->query($sql);
 			if (!$result) {
 				return -1;
@@ -1807,7 +1807,7 @@ class User extends CommonObject
 
 		// Check if login already exists in same entity or into entity 0.
 		if (!empty($this->oldcopy) && $this->oldcopy->login != $this->login) {
-			$sqltochecklogin = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."user WHERE entity IN (".$this->db->sanitize((int) $this->entity).", 0) AND login = '".$this->db->escape($this->login)."'";
+			$sqltochecklogin = "SELECT COUNT(*) as nb FROM ".$this->db->prefix()."user WHERE entity IN (".$this->db->sanitize((int) $this->entity).", 0) AND login = '".$this->db->escape($this->login)."'";
 			$resqltochecklogin = $this->db->query($sqltochecklogin);
 			if ($resqltochecklogin) {
 				$objtochecklogin = $this->db->fetch_object($resqltochecklogin);
@@ -1821,7 +1821,7 @@ class User extends CommonObject
 			}
 		}
 		if (!empty($this->oldcopy) && $this->email !== '' && $this->oldcopy->email != $this->email) {
-			$sqltochecklogin = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."user WHERE entity IN (".$this->db->sanitize((int) $this->entity).", 0) AND email = '".$this->db->escape($this->email)."'";
+			$sqltochecklogin = "SELECT COUNT(*) as nb FROM ".$this->db->prefix()."user WHERE entity IN (".$this->db->sanitize((int) $this->entity).", 0) AND email = '".$this->db->escape($this->email)."'";
 			$resqltochecklogin = $this->db->query($sqltochecklogin);
 			if ($resqltochecklogin) {
 				$objtochecklogin = $this->db->fetch_object($resqltochecklogin);
@@ -1836,7 +1836,7 @@ class User extends CommonObject
 		}
 
 		// Update datas
-		$sql = "UPDATE ".MAIN_DB_PREFIX."user SET";
+		$sql = "UPDATE ".$this->db->prefix()."user SET";
 		$sql .= " civility = '".$this->db->escape($this->civility_code)."'";
 		$sql .= ", lastname = '".$this->db->escape($this->lastname)."'";
 		$sql .= ", firstname = '".$this->db->escape($this->firstname)."'";
@@ -1916,7 +1916,7 @@ class User extends CommonObject
 			// If user is linked to a member, remove old link to this member
 			if ($this->fk_member > 0) {
 				dol_syslog(get_class($this)."::update remove link with member. We will recreate it later", LOG_DEBUG);
-				$sql = "UPDATE ".MAIN_DB_PREFIX."user SET fk_member = NULL where fk_member = ".((int) $this->fk_member);
+				$sql = "UPDATE ".$this->db->prefix()."user SET fk_member = NULL where fk_member = ".((int) $this->fk_member);
 				$resql = $this->db->query($sql);
 				if (!$resql) {
 					$this->error = $this->db->error(); $this->db->rollback(); return -5;
@@ -1924,7 +1924,7 @@ class User extends CommonObject
 			}
 			// Set link to user
 			dol_syslog(get_class($this)."::update set link with member", LOG_DEBUG);
-			$sql = "UPDATE ".MAIN_DB_PREFIX."user SET fk_member =".($this->fk_member > 0 ? ((int) $this->fk_member) : 'null')." where rowid = ".((int) $this->id);
+			$sql = "UPDATE ".$this->db->prefix()."user SET fk_member =".($this->fk_member > 0 ? ((int) $this->fk_member) : 'null')." where rowid = ".((int) $this->id);
 			$resql = $this->db->query($sql);
 			if (!$resql) {
 				$this->error = $this->db->error(); $this->db->rollback(); return -5;
@@ -2082,7 +2082,7 @@ class User extends CommonObject
 		// phpcs:enable
 		$now = dol_now();
 
-		$sql = "UPDATE ".MAIN_DB_PREFIX."user SET";
+		$sql = "UPDATE ".$this->db->prefix()."user SET";
 		$sql .= " datepreviouslogin = datelastlogin,";
 		$sql .= " datelastlogin = '".$this->db->idate($now)."',";
 		$sql .= " tms = tms"; // La date de derniere modif doit changer sauf pour la mise a jour de date de derniere connexion
@@ -2160,7 +2160,7 @@ class User extends CommonObject
 
 			$this->db->begin();
 
-			$sql = "UPDATE ".MAIN_DB_PREFIX."user";
+			$sql = "UPDATE ".$this->db->prefix()."user";
 			$sql .= " SET pass_crypted = '".$this->db->escape($password_crypted)."',";
 			$sql .= " pass_temp = null";
 			if (!empty($conf->global->DATABASE_PWD_ENCRYPTED)) {
@@ -2224,7 +2224,7 @@ class User extends CommonObject
 		} else {
 			// We store password in password temporary field.
 			// After receiving confirmation link, we will erase and store it in pass_crypted
-			$sql = "UPDATE ".MAIN_DB_PREFIX."user";
+			$sql = "UPDATE ".$this->db->prefix()."user";
 			$sql .= " SET pass_temp = '".$this->db->escape($password)."'";
 			$sql .= " WHERE rowid = ".((int) $this->id);
 
@@ -2373,7 +2373,7 @@ class User extends CommonObject
 	{
 		// phpcs:enable
 		$sql = "SELECT url, login, pass, poste ";
-		$sql .= " FROM ".MAIN_DB_PREFIX."user_clicktodial as u";
+		$sql .= " FROM ".$this->db->prefix()."user_clicktodial as u";
 		$sql .= " WHERE u.fk_user = ".((int) $this->id);
 
 		$resql = $this->db->query($sql);
@@ -2408,13 +2408,13 @@ class User extends CommonObject
 		// phpcs:enable
 		$this->db->begin();
 
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_clicktodial";
+		$sql = "DELETE FROM ".$this->db->prefix()."user_clicktodial";
 		$sql .= " WHERE fk_user = ".((int) $this->id);
 
 		dol_syslog(get_class($this).'::update_clicktodial', LOG_DEBUG);
 		$result = $this->db->query($sql);
 
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."user_clicktodial";
+		$sql = "INSERT INTO ".$this->db->prefix()."user_clicktodial";
 		$sql .= " (fk_user,url,login,pass,poste)";
 		$sql .= " VALUES (".$this->id;
 		$sql .= ", '".$this->db->escape($this->clicktodial_url)."'";
@@ -2453,14 +2453,14 @@ class User extends CommonObject
 
 		$this->db->begin();
 
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."usergroup_user";
+		$sql = "DELETE FROM ".$this->db->prefix()."usergroup_user";
 		$sql .= " WHERE fk_user  = ".((int) $this->id);
 		$sql .= " AND fk_usergroup = ".((int) $group);
 		$sql .= " AND entity = ".((int) $entity);
 
 		$result = $this->db->query($sql);
 
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."usergroup_user (entity, fk_user, fk_usergroup)";
+		$sql = "INSERT INTO ".$this->db->prefix()."usergroup_user (entity, fk_user, fk_usergroup)";
 		$sql .= " VALUES (".((int) $entity).",".((int) $this->id).",".((int) $group).")";
 
 		$result = $this->db->query($sql);
@@ -2510,7 +2510,7 @@ class User extends CommonObject
 
 		$this->db->begin();
 
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."usergroup_user";
+		$sql = "DELETE FROM ".$this->db->prefix()."usergroup_user";
 		$sql .= " WHERE fk_user  = ".((int) $this->id);
 		$sql .= " AND fk_usergroup = ".((int) $group);
 		$sql .= " AND entity = ".((int) $entity);
@@ -3103,7 +3103,7 @@ class User extends CommonObject
 	{
 		$sql = "SELECT u.rowid, u.login as ref, u.datec,";
 		$sql .= " u.tms as date_modification, u.entity";
-		$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
+		$sql .= " FROM ".$this->db->prefix()."user as u";
 		$sql .= " WHERE u.rowid = ".((int) $id);
 
 		$result = $this->db->query($sql);
@@ -3134,7 +3134,7 @@ class User extends CommonObject
 	public function getNbOfEMailings()
 	{
 		$sql = "SELECT count(mc.email) as nb";
-		$sql .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc";
+		$sql .= " FROM ".$this->db->prefix()."mailing_cibles as mc";
 		$sql .= " WHERE mc.email = '".$this->db->escape($this->email)."'";
 		$sql .= " AND mc.statut NOT IN (-1,0)"; // -1 erreur, 0 non envoye, 1 envoye avec succes
 
@@ -3164,7 +3164,7 @@ class User extends CommonObject
 		global $conf;
 
 		$sql = "SELECT count(rowid) as nb";
-		$sql .= " FROM ".MAIN_DB_PREFIX."user";
+		$sql .= " FROM ".$this->db->prefix()."user";
 		if ($option == 'superadmin') {
 			$sql .= " WHERE entity = 0";
 		} else {
@@ -3242,7 +3242,7 @@ class User extends CommonObject
 	public function get_children()
 	{
 		// phpcs:enable
-		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."user";
+		$sql = "SELECT rowid FROM ".$this->db->prefix()."user";
 		$sql .= " WHERE fk_user = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::get_children", LOG_DEBUG);
@@ -3275,7 +3275,7 @@ class User extends CommonObject
 
 		// Load array[child]=parent
 		$sql = "SELECT fk_user as id_parent, rowid as id_son";
-		$sql .= " FROM ".MAIN_DB_PREFIX."user";
+		$sql .= " FROM ".$this->db->prefix()."user";
 		$sql .= " WHERE fk_user <> 0";
 		$sql .= " AND entity IN (".getEntity('user').")";
 
@@ -3322,7 +3322,7 @@ class User extends CommonObject
 
 		// Init $this->users array
 		$sql = "SELECT DISTINCT u.rowid, u.firstname, u.lastname, u.fk_user, u.fk_soc, u.login, u.email, u.gender, u.admin, u.statut, u.photo, u.entity"; // Distinct reduce pb with old tables with duplicates
-		$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
+		$sql .= " FROM ".$this->db->prefix()."user as u";
 		// Add fields from hooks
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('printUserListWhere', $parameters); // Note that $action and $object may have been modified by hook
@@ -3505,9 +3505,9 @@ class User extends CommonObject
 		$this->nb = array();
 
 		$sql = "SELECT COUNT(DISTINCT u.rowid) as nb";
-		$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
+		$sql .= " FROM ".$this->db->prefix()."user as u";
 		if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
-			$sql .= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
+			$sql .= ", ".$this->db->prefix()."usergroup_user as ug";
 			$sql .= " WHERE ug.entity IN (".getEntity('usergroup').")";
 			$sql .= " AND ug.fk_user = u.rowid";
 		} else {
@@ -3579,7 +3579,7 @@ class User extends CommonObject
 		}
 
 		$sql = "SELECT rowid, email, user_mobile, civility, lastname, firstname";
-		$sql .= " FROM ".MAIN_DB_PREFIX."user";
+		$sql .= " FROM ".$this->db->prefix()."user";
 		$sql .= " WHERE rowid = ".((int) $rowid);
 
 		$resql = $this->db->query($sql);
@@ -3618,14 +3618,14 @@ class User extends CommonObject
 		global $conf, $user;
 
 		$sql = "SELECT t.rowid";
-		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t ';
+		$sql .= ' FROM '.$this->db->prefix().$this->table_element.' as t ';
 
 		if ($entityfilter) {
 			if (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 				if (!empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
 					$sql .= " WHERE t.entity IS NOT NULL"; // Show all users
 				} else {
-					$sql .= ",".MAIN_DB_PREFIX."usergroup_user as ug";
+					$sql .= ",".$this->db->prefix()."usergroup_user as ug";
 					$sql .= " WHERE ((ug.fk_user = t.rowid";
 					$sql .= " AND ug.entity IN (".getEntity('user')."))";
 					$sql .= " OR t.entity = 0)"; // Show always superadmin
@@ -3713,7 +3713,7 @@ class User extends CommonObject
 		global $conf;
 
 		$sql = 'SELECT rowid';
-		$sql .= ' FROM '.MAIN_DB_PREFIX.'user';
+		$sql .= ' FROM '.$this->db->prefix().'user';
 		if (!empty($conf->global->AGENDA_DISABLE_EXACT_USER_EMAIL_COMPARE_FOR_EXTERNAL_CALENDAR)) {
 			$sql .= " WHERE email LIKE '%".$this->db->escape($email)."%'";
 		} else {

From 38fcfd38f8057b57689545f003f3386fb7cc921f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 21 Jan 2022 19:16:29 +0100
Subject: [PATCH 225/316] Fix trans

---
 htdocs/core/boxes/box_validated_projects.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/boxes/box_validated_projects.php b/htdocs/core/boxes/box_validated_projects.php
index 574ee7b7d80..e57bb1f14d9 100644
--- a/htdocs/core/boxes/box_validated_projects.php
+++ b/htdocs/core/boxes/box_validated_projects.php
@@ -26,6 +26,7 @@
  */
 include_once DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php";
 
+
 /**
  * Class to manage the box to show last projet
  */
@@ -63,7 +64,7 @@ class box_validated_projects extends ModeleBoxes
 		$langs->loadLangs(array('boxes', 'projects'));
 
 		$this->db = $db;
-		$this->boxlabel = "ProjectsWithTask";
+		$this->boxlabel = "ProjectTasksWithoutTimeSpent";
 
 		$this->hidden = !($user->rights->projet->lire);
 
@@ -116,7 +117,7 @@ class box_validated_projects extends ModeleBoxes
 			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."element_contact as ec ON ec.element_id = t.rowid AND fk_c_type_contact IN (-1, -2, -3)";
 			$sql .= " WHERE p.fk_statut = 1"; // Only open projects
 			if ($projectsListId) {
-				$sql .= ' AND p.rowid IN ('.$this->db->sanitize($projectsListId).')'; // Only project are allowed
+				$sql .= ' AND p.rowid IN ('.$this->db->sanitize($projectsListId).')'; // Only projects that are allowed
 			}
 			$sql .= " AND t.rowid NOT IN (SELECT fk_task FROM ".MAIN_DB_PREFIX."projet_task_time WHERE fk_user = ".((int) $user->id).")";
 			$sql .= " GROUP BY p.rowid, p.ref, p.fk_soc, p.dateo";

From 65e58943b31b8d34f4d4af31539009c7eaa45743 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 21 Jan 2022 20:57:45 +0100
Subject: [PATCH 226/316] FIX exclude the pdf png preview files from backup

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

diff --git a/htdocs/admin/tools/export_files.php b/htdocs/admin/tools/export_files.php
index 0b9272c2418..36be1f273ff 100644
--- a/htdocs/admin/tools/export_files.php
+++ b/htdocs/admin/tools/export_files.php
@@ -137,7 +137,7 @@ $dirtocompress = basename($fulldirtocompress);
 
 if ($compression == 'zip') {
 	$file .= '.zip';
-	$excludefiles = '/(\.back|\.old|\.log|[\/\\\]temp[\/\\\]|documents[\/\\\]admin[\/\\\]documents[\/\\\])/i';
+	$excludefiles = '/(\.back|\.old|\.log|\.pdf_preview-.*\.png|[\/\\\]temp[\/\\\]|documents[\/\\\]admin[\/\\\]documents[\/\\\])/i';
 
 	//var_dump($fulldirtocompress);
 	//var_dump($outputdir."/".$file);exit;
@@ -173,7 +173,7 @@ if ($compression == 'zip') {
 
 	// We also exclude '/temp/' dir and 'documents/admin/documents'
 	// We make escapement here and call executeCLI without escapement because we don't want to have the '*.log' escaped.
-	$cmd = "tar -cf ".escapeshellcmd($outputdir."/".$file)." --exclude-vcs --exclude-caches-all --exclude='temp' --exclude='*.log' --exclude='documents/admin/documents' -C '".escapeshellcmd(dol_sanitizePathName($dirtoswitch))."' '".escapeshellcmd(dol_sanitizeFileName($dirtocompress))."'";
+	$cmd = "tar -cf ".escapeshellcmd($outputdir."/".$file)." --exclude-vcs --exclude-caches-all --exclude='temp' --exclude='*.log' --exclude='*.pdf_preview-*.png' --exclude='documents/admin/documents' -C '".escapeshellcmd(dol_sanitizePathName($dirtoswitch))."' '".escapeshellcmd(dol_sanitizeFileName($dirtocompress))."'";
 
 	$result = $utils->executeCLI($cmd, $outputfile, 0, null, 1);
 

From 284fcf3ad57dd562995e0a2554a5bb27acacf308 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 22 Jan 2022 13:19:29 +0100
Subject: [PATCH 227/316] FIX Company logo not found in some cases on some
 templates

---
 .../supplier_order/doc/pdf_cornas.modules.php | 34 ++++++++++++-------
 .../doc/pdf_muscadet.modules.php              | 34 ++++++++++++-------
 .../doc/pdf_aurore.modules.php                | 34 ++++++++++++-------
 3 files changed, 66 insertions(+), 36 deletions(-)

diff --git a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
index 0018bc7ff7f..e823ceebb25 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
@@ -1245,20 +1245,30 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 		$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 (empty($conf->global->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 (empty($conf->global->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(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
+					$pdf->MultiCell(100, 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("ErrorGoToModuleSetup"), 0, 'L');
+				$text = $this->emetteur->name;
+				$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, $ltrdirection);
 			}
-		} else {
-			$text = $this->emetteur->name;
-			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, $ltrdirection);
 		}
 
 		$pdf->SetFont('', 'B', $default_font_size + 3);
diff --git a/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
index 8c706f59db3..736e23519bc 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
@@ -1153,20 +1153,30 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 		$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 (empty($conf->global->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 (empty($conf->global->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(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
+					$pdf->MultiCell(100, 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("ErrorGoToModuleSetup"), 0, 'L');
+				$text = $this->emetteur->name;
+				$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, $ltrdirection);
 			}
-		} else {
-			$text = $this->emetteur->name;
-			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, $ltrdirection);
 		}
 
 		$pdf->SetFont('', 'B', $default_font_size + 3);
diff --git a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
index 1bf47275599..7e1b1105452 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
@@ -1290,20 +1290,30 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		$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 (empty($conf->global->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 (empty($conf->global->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(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
+					$pdf->MultiCell(100, 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(100, 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);

From 6baa0939ceedb5e0b564cbfb2ed5c59e84783c17 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 22 Jan 2022 14:03:39 +0100
Subject: [PATCH 228/316] NEW Can add a tooltip after the combo list of doc
 templates

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

diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 3539348e35a..b848e04b061 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -379,9 +379,10 @@ class FormFile
 	 *      @param      Object              $object             Object when method is called from an object card.
 	 *      @param		int					$hideifempty		Hide section of generated files if there is no file
 	 *      @param      string              $removeaction       (optional) The action to remove a file
+	 *      @param		string				$tooltipontemplatecombo		Text to show on a tooltip after the combo list of templates
 	 * 		@return		string              					Output string with HTML array of documents (might be empty string)
 	 */
-	public function showdocuments($modulepart, $modulesubdir, $filedir, $urlsource, $genallowed, $delallowed = 0, $modelselected = '', $allowgenifempty = 1, $forcenomultilang = 0, $iconPDF = 0, $notused = 0, $noform = 0, $param = '', $title = '', $buttonlabel = '', $codelang = '', $morepicto = '', $object = null, $hideifempty = 0, $removeaction = 'remove_file')
+	public function showdocuments($modulepart, $modulesubdir, $filedir, $urlsource, $genallowed, $delallowed = 0, $modelselected = '', $allowgenifempty = 1, $forcenomultilang = 0, $iconPDF = 0, $notused = 0, $noform = 0, $param = '', $title = '', $buttonlabel = '', $codelang = '', $morepicto = '', $object = null, $hideifempty = 0, $removeaction = 'remove_file', $tooltipontemplatecombo = '')
 	{
 		global $dolibarr_main_url_root;
 
@@ -769,6 +770,7 @@ class FormFile
 				if ($conf->use_javascript_ajax) {
 					$out .= ajax_combobox('model');
 				}
+				$out .= $form->textwithpicto('', $tooltipontemplatecombo, 1, 'help', 'marginrightonly', 0, 3, '', 0);
 			} else {
 				$out .= '<div class="float">'.$langs->trans("Files").'</div>';
 			}

From 4750f6bbc679f382b92982230f8f04e19be00fbf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 22 Jan 2022 15:05:41 +0100
Subject: [PATCH 229/316] FIX action must be protected with a permission check

---
 htdocs/core/actions_setmoduleoptions.inc.php | 41 +++++++++++++++++---
 1 file changed, 36 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/actions_setmoduleoptions.inc.php b/htdocs/core/actions_setmoduleoptions.inc.php
index 43ddd23f13d..fbf526fd58e 100644
--- a/htdocs/core/actions_setmoduleoptions.inc.php
+++ b/htdocs/core/actions_setmoduleoptions.inc.php
@@ -29,13 +29,13 @@
 // $formSetup may be defined
 
 
-if ($action == 'update' && !empty($formSetup) && is_object($formSetup)) {
+if ($action == 'update' && !empty($formSetup) && is_object($formSetup) && !empty($user->admin)) {
 	$formSetup->saveConfFromPost();
 	return;
 }
 
 
-if ($action == 'update' && is_array($arrayofparameters)) {
+if ($action == 'update' && is_array($arrayofparameters) && !empty($user->admin)) {
 	$db->begin();
 
 	foreach ($arrayofparameters as $key => $val) {
@@ -72,8 +72,37 @@ if ($action == 'update' && is_array($arrayofparameters)) {
 	}
 }
 
+if ($action == 'deletefile' && $modulepart == 'doctemplates' && !empty($user->admin)) {
+	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+	$keyforuploaddir = GETPOST('keyforuploaddir', 'aZ09');
+
+	$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim(getDolGlobalString($keyforuploaddir))));
+	foreach ($listofdir as $key => $tmpdir) {
+		$tmpdir = preg_replace('/DOL_DATA_ROOT\/*/', '', $tmpdir);	// Clean string if we found a hardcoded DOL_DATA_ROOT
+		if (!$tmpdir) {
+			unset($listofdir[$key]);
+			continue;
+		}
+		$tmpdir = DOL_DATA_ROOT.'/'.$tmpdir;	// Complete with DOL_DATA_ROOT. Only files into DOL_DATA_ROOT can be reach/set
+		if (!is_dir($tmpdir)) {
+			if (empty($nomessageinsetmoduleoptions)) {
+				setEventMessages($langs->trans("ErrorDirNotFound", $tmpdir), null, 'warnings');
+			}
+		} else {
+			$upload_dir = $tmpdir;
+			break;	// So we take the first directory found into setup $conf->global->$keyforuploaddir
+		}
+	}
+
+	$filetodelete = $tmpdir.'/'.GETPOST('file');
+	$result = dol_delete_file($filetodelete);
+	if ($result > 0) {
+		setEventMessages($langs->trans("FileWasRemoved", GETPOST('file')), null, 'mesgs');
+	}
+}
+
 // Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...)
-if ($action == 'setModuleOptions') {
+if ($action == 'setModuleOptions' && !empty($user->admin)) {
 	$db->begin();
 
 	// Process common param fields
@@ -97,20 +126,22 @@ if ($action == 'setModuleOptions') {
 	if (GETPOST('upload', 'alpha') && GETPOST('keyforuploaddir', 'aZ09')) {
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 		$keyforuploaddir = GETPOST('keyforuploaddir', 'aZ09');
-		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim($conf->global->$keyforuploaddir)));
+		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim(getDolGlobalString($keyforuploaddir))));
 		foreach ($listofdir as $key => $tmpdir) {
 			$tmpdir = trim($tmpdir);
-			$tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
+			$tmpdir = preg_replace('/DOL_DATA_ROOT\/*/', '', $tmpdir);	// Clean string if we found a hardcoded DOL_DATA_ROOT
 			if (!$tmpdir) {
 				unset($listofdir[$key]);
 				continue;
 			}
+			$tmpdir = DOL_DATA_ROOT.'/'.$tmpdir;	// Complete with DOL_DATA_ROOT. Only files into DOL_DATA_ROOT can be reach/set
 			if (!is_dir($tmpdir)) {
 				if (empty($nomessageinsetmoduleoptions)) {
 					setEventMessages($langs->trans("ErrorDirNotFound", $tmpdir), null, 'warnings');
 				}
 			} else {
 				$upload_dir = $tmpdir;
+				break;	// So we take the first directory found into setup $conf->global->$keyforuploaddir
 			}
 		}
 		if ($upload_dir) {

From 1790ba2820f6f9d2d3325b6986f77eb4b618ee0b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 22 Jan 2022 15:06:05 +0100
Subject: [PATCH 230/316] NEW Can removed doc templates from setup page of
 thirdparty

---
 .../core/modules/societe/doc/doc_generic_odt.modules.php   | 7 +++++--
 htdocs/societe/admin/societe.php                           | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
index 3a7c8447775..8ead9003f95 100644
--- a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
+++ b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
@@ -102,12 +102,13 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 		$form = new Form($this->db);
 
 		$texte = $this->description.".<br>\n";
+		$texte .= '<!-- form for option of ODT templates -->';
 		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" enctype="multipart/form-data">';
 		$texte .= '<input type="hidden" name="token" value="'.newToken().'">';
 		$texte .= '<input type="hidden" name="page_y" value="">';
 		$texte .= '<input type="hidden" name="action" value="setModuleOptions">';
 		$texte .= '<input type="hidden" name="param1" value="COMPANY_ADDON_PDF_ODT_PATH">';
-		$texte .= '<table class="nobordernopadding" width="100%">';
+		$texte .= '<table class="nobordernopadding centpercent">';
 
 		// List of directories area
 		$texte .= '<tr><td>';
@@ -161,7 +162,9 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 			$texte .= '<div id="div_'.get_class($this).'" class="hiddenx">';
 			// Show list of found files
 			foreach ($listoffiles as $file) {
-				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=thirdparties/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
+				$texte .= '- '.$file['name'].' &nbsp; <a class="reposition" href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=thirdparties/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a>';
+				$texte .= ' &nbsp; <a class="reposition" href="'.$_SERVER["PHP_SELF"].'?modulepart=doctemplates&keyforuploaddir=COMPANY_ADDON_PDF_ODT_PATH&action=deletefile&file='.urlencode(basename($file['name'])).'">'.img_picto('', 'delete').'</a>';
+				$texte .= '<br>';
 			}
 			$texte .= '</div>';
 		}
diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php
index 2f272ceca1c..42ee366ad4e 100644
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@@ -34,6 +34,7 @@ $langs->loadLangs(array("admin", "companies", "other"));
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');
 
 if (!$user->admin) {
 	accessforbidden();

From caf7e7d7d5842cca02a40cebd637156cbbb1520e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 22 Jan 2022 15:05:41 +0100
Subject: [PATCH 231/316] FIX action must be protected with a permission check

---
 htdocs/core/actions_setmoduleoptions.inc.php | 41 +++++++++++++++++---
 1 file changed, 36 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/actions_setmoduleoptions.inc.php b/htdocs/core/actions_setmoduleoptions.inc.php
index 43ddd23f13d..fbf526fd58e 100644
--- a/htdocs/core/actions_setmoduleoptions.inc.php
+++ b/htdocs/core/actions_setmoduleoptions.inc.php
@@ -29,13 +29,13 @@
 // $formSetup may be defined
 
 
-if ($action == 'update' && !empty($formSetup) && is_object($formSetup)) {
+if ($action == 'update' && !empty($formSetup) && is_object($formSetup) && !empty($user->admin)) {
 	$formSetup->saveConfFromPost();
 	return;
 }
 
 
-if ($action == 'update' && is_array($arrayofparameters)) {
+if ($action == 'update' && is_array($arrayofparameters) && !empty($user->admin)) {
 	$db->begin();
 
 	foreach ($arrayofparameters as $key => $val) {
@@ -72,8 +72,37 @@ if ($action == 'update' && is_array($arrayofparameters)) {
 	}
 }
 
+if ($action == 'deletefile' && $modulepart == 'doctemplates' && !empty($user->admin)) {
+	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+	$keyforuploaddir = GETPOST('keyforuploaddir', 'aZ09');
+
+	$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim(getDolGlobalString($keyforuploaddir))));
+	foreach ($listofdir as $key => $tmpdir) {
+		$tmpdir = preg_replace('/DOL_DATA_ROOT\/*/', '', $tmpdir);	// Clean string if we found a hardcoded DOL_DATA_ROOT
+		if (!$tmpdir) {
+			unset($listofdir[$key]);
+			continue;
+		}
+		$tmpdir = DOL_DATA_ROOT.'/'.$tmpdir;	// Complete with DOL_DATA_ROOT. Only files into DOL_DATA_ROOT can be reach/set
+		if (!is_dir($tmpdir)) {
+			if (empty($nomessageinsetmoduleoptions)) {
+				setEventMessages($langs->trans("ErrorDirNotFound", $tmpdir), null, 'warnings');
+			}
+		} else {
+			$upload_dir = $tmpdir;
+			break;	// So we take the first directory found into setup $conf->global->$keyforuploaddir
+		}
+	}
+
+	$filetodelete = $tmpdir.'/'.GETPOST('file');
+	$result = dol_delete_file($filetodelete);
+	if ($result > 0) {
+		setEventMessages($langs->trans("FileWasRemoved", GETPOST('file')), null, 'mesgs');
+	}
+}
+
 // Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...)
-if ($action == 'setModuleOptions') {
+if ($action == 'setModuleOptions' && !empty($user->admin)) {
 	$db->begin();
 
 	// Process common param fields
@@ -97,20 +126,22 @@ if ($action == 'setModuleOptions') {
 	if (GETPOST('upload', 'alpha') && GETPOST('keyforuploaddir', 'aZ09')) {
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 		$keyforuploaddir = GETPOST('keyforuploaddir', 'aZ09');
-		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim($conf->global->$keyforuploaddir)));
+		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim(getDolGlobalString($keyforuploaddir))));
 		foreach ($listofdir as $key => $tmpdir) {
 			$tmpdir = trim($tmpdir);
-			$tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
+			$tmpdir = preg_replace('/DOL_DATA_ROOT\/*/', '', $tmpdir);	// Clean string if we found a hardcoded DOL_DATA_ROOT
 			if (!$tmpdir) {
 				unset($listofdir[$key]);
 				continue;
 			}
+			$tmpdir = DOL_DATA_ROOT.'/'.$tmpdir;	// Complete with DOL_DATA_ROOT. Only files into DOL_DATA_ROOT can be reach/set
 			if (!is_dir($tmpdir)) {
 				if (empty($nomessageinsetmoduleoptions)) {
 					setEventMessages($langs->trans("ErrorDirNotFound", $tmpdir), null, 'warnings');
 				}
 			} else {
 				$upload_dir = $tmpdir;
+				break;	// So we take the first directory found into setup $conf->global->$keyforuploaddir
 			}
 		}
 		if ($upload_dir) {

From 14af64d1436c28cc438c24f3a3b96b540a7d1020 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 22 Jan 2022 15:06:05 +0100
Subject: [PATCH 232/316] NEW Can removed doc templates from setup page of
 thirdparty

---
 .../core/modules/societe/doc/doc_generic_odt.modules.php   | 7 +++++--
 htdocs/societe/admin/societe.php                           | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
index 3a7c8447775..8ead9003f95 100644
--- a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
+++ b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
@@ -102,12 +102,13 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 		$form = new Form($this->db);
 
 		$texte = $this->description.".<br>\n";
+		$texte .= '<!-- form for option of ODT templates -->';
 		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" enctype="multipart/form-data">';
 		$texte .= '<input type="hidden" name="token" value="'.newToken().'">';
 		$texte .= '<input type="hidden" name="page_y" value="">';
 		$texte .= '<input type="hidden" name="action" value="setModuleOptions">';
 		$texte .= '<input type="hidden" name="param1" value="COMPANY_ADDON_PDF_ODT_PATH">';
-		$texte .= '<table class="nobordernopadding" width="100%">';
+		$texte .= '<table class="nobordernopadding centpercent">';
 
 		// List of directories area
 		$texte .= '<tr><td>';
@@ -161,7 +162,9 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 			$texte .= '<div id="div_'.get_class($this).'" class="hiddenx">';
 			// Show list of found files
 			foreach ($listoffiles as $file) {
-				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=thirdparties/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
+				$texte .= '- '.$file['name'].' &nbsp; <a class="reposition" href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=thirdparties/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a>';
+				$texte .= ' &nbsp; <a class="reposition" href="'.$_SERVER["PHP_SELF"].'?modulepart=doctemplates&keyforuploaddir=COMPANY_ADDON_PDF_ODT_PATH&action=deletefile&file='.urlencode(basename($file['name'])).'">'.img_picto('', 'delete').'</a>';
+				$texte .= '<br>';
 			}
 			$texte .= '</div>';
 		}
diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php
index 2f272ceca1c..42ee366ad4e 100644
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@@ -34,6 +34,7 @@ $langs->loadLangs(array("admin", "companies", "other"));
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');
 
 if (!$user->admin) {
 	accessforbidden();

From e0956c17658437f42019d8af1504759f752fbaa5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 22 Jan 2022 15:33:47 +0100
Subject: [PATCH 233/316] Fix missing token, missing reposition, missing
 modulepart

---
 .../modules/product/doc/doc_generic_product_odt.modules.php  | 5 ++++-
 htdocs/core/modules/societe/doc/doc_generic_odt.modules.php  | 2 +-
 htdocs/modulebuilder/template/admin/setup.php                | 1 +
 .../mymodule/doc/doc_generic_myobject_odt.modules.php        | 5 ++++-
 htdocs/product/admin/product.php                             | 2 ++
 htdocs/recruitment/admin/setup.php                           | 1 +
 htdocs/recruitment/admin/setup_candidatures.php              | 1 +
 .../doc/doc_generic_recruitmentjobposition_odt.modules.php   | 5 ++++-
 htdocs/societe/admin/societe.php                             | 2 +-
 9 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
index 7ad49fdb01e..7fff122ec57 100644
--- a/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
+++ b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
@@ -170,7 +170,10 @@ class doc_generic_product_odt extends ModelePDFProduct
 			$texte .= '<div id="div_'.get_class($this).'" class="hiddenx">';
 			// Show list of found files
 			foreach ($listoffiles as $file) {
-				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=products/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
+				$texte .= '- '.$file['name'];
+				$texte .= ' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=products/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a>';
+				$texte .= ' &nbsp; <a class="reposition" href="'.$_SERVER["PHP_SELF"].'?modulepart=doctemplates&keyforuploaddir=PRODUCT_ADDON_PDF_ODT_PATH&action=deletefile&token='.newToken().'&file='.urlencode(basename($file['name'])).'">'.img_picto('', 'delete').'</a>';
+				$texte .= '<br>';
 			}
 			$texte .= '</div>';
 		}
diff --git a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
index 8ead9003f95..aaa9c03c6e7 100644
--- a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
+++ b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
@@ -163,7 +163,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 			// Show list of found files
 			foreach ($listoffiles as $file) {
 				$texte .= '- '.$file['name'].' &nbsp; <a class="reposition" href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=thirdparties/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a>';
-				$texte .= ' &nbsp; <a class="reposition" href="'.$_SERVER["PHP_SELF"].'?modulepart=doctemplates&keyforuploaddir=COMPANY_ADDON_PDF_ODT_PATH&action=deletefile&file='.urlencode(basename($file['name'])).'">'.img_picto('', 'delete').'</a>';
+				$texte .= ' &nbsp; <a class="reposition" href="'.$_SERVER["PHP_SELF"].'?modulepart=doctemplates&keyforuploaddir=COMPANY_ADDON_PDF_ODT_PATH&action=deletefile&token='.newToken().'&file='.urlencode(basename($file['name'])).'">'.img_picto('', 'delete').'</a>';
 				$texte .= '<br>';
 			}
 			$texte .= '</div>';
diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php
index 5348ea32520..c9eb9043084 100644
--- a/htdocs/modulebuilder/template/admin/setup.php
+++ b/htdocs/modulebuilder/template/admin/setup.php
@@ -71,6 +71,7 @@ if (!$user->admin) {
 // Parameters
 $action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
 
 $value = GETPOST('value', 'alpha');
 $label = GETPOST('label', 'alpha');
diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php b/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
index 913609ba821..8040c13d606 100644
--- a/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
+++ b/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
@@ -175,7 +175,10 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 		if ($nbofiles) {
 			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
 			foreach ($listoffiles as $file) {
-				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=mymodule_myobject/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
+				$texte .= '- '.$file['name'];
+				$texte .= ' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=mymodule_myobject/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a>';
+				$texte .= ' &nbsp; <a class="reposition" href="'.$_SERVER["PHP_SELF"].'?modulepart=doctemplates&keyforuploaddir=COMPANY_ADDON_PDF_ODT_PATH&action=deletefile&token='.newToken().'&file='.urlencode(basename($file['name'])).'">'.img_picto('', 'delete').'</a>';
+				$texte .= '<br>';
 			}
 			$texte .= '</div>';
 		}
diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index 4f6094e1787..2d7d99a9ab3 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -46,6 +46,8 @@ if (!$user->admin || (empty($conf->product->enabled) && empty($conf->service->en
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'product';
diff --git a/htdocs/recruitment/admin/setup.php b/htdocs/recruitment/admin/setup.php
index b6f03d38b76..6091da86b09 100644
--- a/htdocs/recruitment/admin/setup.php
+++ b/htdocs/recruitment/admin/setup.php
@@ -68,6 +68,7 @@ if (!$user->admin) {
 // Parameters
 $action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
 
 $value = GETPOST('value', 'alpha');
 $label = GETPOST('label', 'alpha');
diff --git a/htdocs/recruitment/admin/setup_candidatures.php b/htdocs/recruitment/admin/setup_candidatures.php
index 60bd0494ebc..726e24e89b1 100644
--- a/htdocs/recruitment/admin/setup_candidatures.php
+++ b/htdocs/recruitment/admin/setup_candidatures.php
@@ -68,6 +68,7 @@ if (!$user->admin) {
 // Parameters
 $action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
 
 $value = GETPOST('value', 'alpha');
 $label = GETPOST('label', 'alpha');
diff --git a/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php b/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
index 3b9840f9155..e818a0816a9 100644
--- a/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
+++ b/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
@@ -174,7 +174,10 @@ class doc_generic_recruitmentjobposition_odt extends ModelePDFRecruitmentJobPosi
 		if ($nbofiles) {
 			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
 			foreach ($listoffiles as $file) {
-				$texte .= $file['name'].'<br>';
+				$texte .= '- '.$file['name'];
+				//$texte .= ' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=recruitementjobposition/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a>';
+				//$texte .= ' &nbsp; <a class="reposition" href="'.$_SERVER["PHP_SELF"].'?modulepart=doctemplates&keyforuploaddir=RECRUITMENT_RECRUITMENTJOBPOSITION_ADDON_PDF_ODT_PATH&action=deletefile&token='.newToken().'&file='.urlencode(basename($file['name'])).'">'.img_picto('', 'delete').'</a>';
+				$texte .= '<br>';
 			}
 			$texte .= '</div>';
 		}
diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php
index 42ee366ad4e..95e1d5e47cb 100644
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@@ -34,7 +34,7 @@ $langs->loadLangs(array("admin", "companies", "other"));
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
-$modulepart = GETPOST('modulepart', 'aZ09');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
 
 if (!$user->admin) {
 	accessforbidden();

From 2f1805beb8d88d93196f06ea77d866c2905c83ca Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 22 Jan 2022 17:14:45 +0100
Subject: [PATCH 234/316] Fix #yogosha8532

---
 htdocs/core/lib/geturl.lib.php | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/geturl.lib.php b/htdocs/core/lib/geturl.lib.php
index 50ae7c33561..8f9942d8108 100644
--- a/htdocs/core/lib/geturl.lib.php
+++ b/htdocs/core/lib/geturl.lib.php
@@ -35,9 +35,10 @@
  * @param	string[]  $addheaders			Array of string to add into header. Example: ('Accept: application/xrds+xml', ....)
  * @param	string[]  $allowedschemes		List of schemes that are allowed ('http' + 'https' only by default)
  * @param	int		  $localurl				0=Only external URL are possible, 1=Only local URL, 2=Both external and local URL are allowed.
+ * @param	int		  $ssl_verifypeer		-1=Auto (no ssl check on dev, check on prod), 0=No ssl check, 1=Always ssl check
  * @return	array						    Returns an associative array containing the response from the server array('content'=>response, 'curl_error_no'=>errno, 'curl_error_msg'=>errmsg...)
  */
-function getURLContent($url, $postorget = 'GET', $param = '', $followlocation = 1, $addheaders = array(), $allowedschemes = array('http', 'https'), $localurl = 0)
+function getURLContent($url, $postorget = 'GET', $param = '', $followlocation = 1, $addheaders = array(), $allowedschemes = array('http', 'https'), $localurl = 0, $ssl_verifypeer = -1)
 {
 	//declaring of global variables
 	global $conf;
@@ -75,8 +76,17 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
 	}
 	//curl_setopt($ch, CURLOPT_SSLVERSION, 6); for tls 1.2
 
+	// Turning on or off the ssl target certificate
+	if ($ssl_verifypeer < 0) {
+		global $dolibarr_main_prod;
+		$ssl_verifypeer =  ($dolibarr_main_prod ? true : false);
+	}
+	if (!empty($conf->global->MAIN_CURL_DISABLE_VERIFYPEER)) {
+		$ssl_verifypeer = 0;
+	}
+
 	// Turning off the server and peer verification(TrustManager Concept).
-	curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+	curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, ($ssl_verifypeer ? true : false));
 	curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
 
 	// Restrict use to some protocols only

From e3cf5fecbedeef0922d992bd6595d604101b8e03 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 23 Jan 2022 02:06:47 +0100
Subject: [PATCH 235/316] css

---
 htdocs/admin/dolistore/css/dolistore.css |  1 -
 htdocs/admin/modules.php                 | 14 +++++++-------
 htdocs/theme/eldy/dropdown.inc.php       | 11 +++++++++++
 htdocs/theme/eldy/global.inc.php         | 17 ++++++++++++-----
 htdocs/theme/md/dropdown.inc.php         |  5 +++--
 htdocs/theme/md/style.css.php            | 11 +++++++++--
 6 files changed, 42 insertions(+), 17 deletions(-)

diff --git a/htdocs/admin/dolistore/css/dolistore.css b/htdocs/admin/dolistore/css/dolistore.css
index fb4dc2d5bb1..3d8f163caf2 100644
--- a/htdocs/admin/dolistore/css/dolistore.css
+++ b/htdocs/admin/dolistore/css/dolistore.css
@@ -1,6 +1,5 @@
 
 div.divsearchfield {
-    float: left;
     margin: 4px 12px 4px 2px;
     padding-left: 2px;
 }
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index f720e411717..215d66eb693 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -535,11 +535,11 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 
 	//$moreforfilter .= '<div class="floatright center marginrightonly hideonsmartphone" style="padding-top: 3px"><span class="paddingright">'.$moreinfo.'</span> '.$moreinfo2.'</div>';
 
-	$moreforfilter .= '<div class="colorbacktimesheet float valignmiddle">';
-	$moreforfilter .= '<div class="divsearchfield paddingtop">';
+	$moreforfilter .= '<div class="divfilteralone colorbacktimesheet float valignmiddle">';
+	$moreforfilter .= '<div class="divsearchfield paddingtop paddingbottom valignmiddle inline-block">';
 	$moreforfilter .= img_picto($langs->trans("Filter"), 'filter', 'class="paddingright opacityhigh hideonsmartphone"').'<input type="text" id="search_keyword" name="search_keyword" class="maxwidth125" value="'.dol_escape_htmltag($search_keyword).'" placeholder="'.dol_escape_htmltag($langs->trans('Keyword')).'">';
 	$moreforfilter .= '</div>';
-	$moreforfilter .= '<div class="divsearchfield paddingtop">';
+	$moreforfilter .= '<div class="divsearchfield paddingtop paddingbottom valignmiddle inline-block">';
 	$moreforfilter .= $form->selectarray('search_nature', $arrayofnatures, dol_escape_htmltag($search_nature), $langs->trans('Origin'), 0, 0, '', 0, 0, 0, '', 'maxwidth250', 1);
 	$moreforfilter .= '</div>';
 	if (getDolGlobalInt('MAIN_FEATURES_LEVEL')) {
@@ -553,16 +553,16 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 		if ($conf->global->MAIN_FEATURES_LEVEL > 1) {
 			$array_version['development'] = $langs->trans("Development");
 		}
-		$moreforfilter .= '<div class="divsearchfield paddingtop">';
+		$moreforfilter .= '<div class="divsearchfield paddingtop paddingbottom valignmiddle inline-block">';
 		$moreforfilter .= $form->selectarray('search_version', $array_version, $search_version, $langs->trans('Version'), 0, 0, '', 0, 0, 0, '', 'maxwidth150', 1);
 		$moreforfilter .= '</div>';
 	}
-	$moreforfilter .= '<div class="divsearchfield paddingtop">';
+	$moreforfilter .= '<div class="divsearchfield paddingtop paddingbottom valignmiddle inline-block">';
 	$moreforfilter .= $form->selectarray('search_status', array('active'=>$langs->transnoentitiesnoconv("Enabled"), 'disabled'=>$langs->transnoentitiesnoconv("Disabled")), $search_status, $langs->trans('Status'), 0, 0, '', 0, 0, 0, '', 'maxwidth150', 1);
 	$moreforfilter .= '</div>';
 	$moreforfilter .= ' ';
-	$moreforfilter .= '<div class="divsearchfield">';
-	$moreforfilter .= '<input type="submit" name="buttonsubmit" class="button" value="'.dol_escape_htmltag($langs->trans("Refresh")).'">';
+	$moreforfilter .= '<div class="divsearchfield valignmiddle inline-block">';
+	$moreforfilter .= '<input type="submit" name="buttonsubmit" class="button small" value="'.dol_escape_htmltag($langs->trans("Refresh")).'">';
 	if ($search_keyword || ($search_nature && $search_nature != '-1') || ($search_version && $search_version != '-1') || ($search_status && $search_status != '-1')) {
 		$moreforfilter .= ' ';
 		$moreforfilter .= '<input type="submit" name="buttonreset" class="buttonreset noborderbottom" value="'.dol_escape_htmltag($langs->trans("Reset")).'">';
diff --git a/htdocs/theme/eldy/dropdown.inc.php b/htdocs/theme/eldy/dropdown.inc.php
index 81734c817b8..5c62a703f67 100644
--- a/htdocs/theme/eldy/dropdown.inc.php
+++ b/htdocs/theme/eldy/dropdown.inc.php
@@ -7,6 +7,11 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
  * Dropdown of user popup
  */
 
+.bookmark-footer a.top-menu-dropdown-link {
+	white-space: normal;
+	word-break: break-word;
+}
+
 button.dropdown-item.global-search-item {
 	outline: none;
 }
@@ -15,6 +20,12 @@ button.dropdown-item.global-search-item {
 	display: block;
 }
 
+#topmenu-bookmark-dropdown .dropdown-menu {
+	min-width: 300px;
+	max-width: 360px;
+}
+
+
 .dropdown-search {
 	border-color: #eee;
 
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index a830002d197..ff8a07c8ac0 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -261,7 +261,7 @@ input:invalid, select:invalid, input.--error , select.--error {
 div.tabBar textarea:focus {
 	border: 1px solid #aaa !important;
 }
-input:focus:not(.select2-search__field), select:focus, .select2-container--open .select2-selection--single {
+input:focus:not(.select2-search__field):not(#top-bookmark-search-input), select:focus, .select2-container--open .select2-selection--single {
 /* div.tabBar input:focus, div.tabBar select:focus { */
 	border-bottom: 1px solid #666 !important;
 	border-bottom-left-radius: 0 !important;
@@ -985,12 +985,18 @@ span.fa.fa-plus-circle.paddingleft {
 	padding-<?php print $right; ?>: 20px;
 }
 div.divsearchfield {
-	float: <?php print $left; ?>;
+	/* float: <?php print $left; ?>; */
+	display: inline-block;
 	margin-<?php print $right; ?>: 12px;
 	margin-<?php print $left; ?>: 2px;
 	margin-top: 4px;
 	margin-bottom: 4px;
-	  padding-left: 2px;
+	padding-left: 2px;
+}
+.divfilteralone {
+	background-color: #e8e8e8;
+	border-radius: 5px;
+	padding-left: 5px;
 }
 .divsearchfieldfilter {
 	text-overflow: clip;
@@ -2808,8 +2814,8 @@ div.login a:hover {
 div.login_block_user {
 	display: inline-block;
 	vertical-align: middle;
-	line-height: <?php echo $disableimages ? '25' : '50'; ?>px;
-	height: <?php echo $disableimages ? '25' : '50'; ?>px;
+	line-height: <?php echo $disableimages ? '25' : '52'; ?>px;
+	height: <?php echo $disableimages ? '25' : '52'; ?>px;
 }
 div.login_block_other {
 	display: inline-block;
@@ -3396,6 +3402,7 @@ input.buttonreset {
 	padding: 8px 15px;
 	text-decoration: underline;
 	color: var(--colortextlink);
+	background-color: transparent;
 	cursor: pointer;
 }
 .nopaddingleft {
diff --git a/htdocs/theme/md/dropdown.inc.php b/htdocs/theme/md/dropdown.inc.php
index 1aec654410f..ff7285a2772 100644
--- a/htdocs/theme/md/dropdown.inc.php
+++ b/htdocs/theme/md/dropdown.inc.php
@@ -2,7 +2,6 @@
 if (!defined('ISLOADEDBYSTEELSHEET')) {
 	die('Must be call by steelsheet');
 } ?>
-
 /* <style type="text/css" > dont remove this line it's an ide hack */
 /*
  * Dropdown of user popup
@@ -10,6 +9,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
 
 .bookmark-footer a.top-menu-dropdown-link {
 	white-space: normal;
+	word-break: break-word;
 }
 
 button.dropdown-item.global-search-item {
@@ -35,7 +35,8 @@ div#topmenu-bookmark-dropdown {
 }
 
 #topmenu-bookmark-dropdown .dropdown-menu {
-	width: 300px;
+	min-width: 300px;
+	max-width: 360px;
 }
 
 button.dropdown-item.global-search-item {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 6d052a2dc03..7cf7ad0de30 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1098,13 +1098,19 @@ a.editfielda.nohover *:hover:before {
 .divsocialnetwork:not(:last-child) {
 	padding-<?php print $right; ?>: 20px;
 }
+.divfilteralone {
+	background-color: #e8e8e8;
+	border-radius: 5px;
+	padding-left: 5px;
+}
 div.divsearchfield {
-	float: <?php print $left; ?>;
+	/* float: <?php print $left; ?>; */
+	display: inline-block;
 	margin-<?php print $right; ?>: 12px;
 	margin-<?php print $left; ?>: 2px;
 	margin-top: 4px;
 	margin-bottom: 4px;
-	  padding-left: 2px;
+	padding-left: 2px;
 }
 .divsearchfieldfilter {
 	text-overflow: clip;
@@ -3442,6 +3448,7 @@ input.buttonreset {
 	padding: 8px 15px;
 	text-decoration: underline;
 	color: var(--colortextlink);
+	background-color: transparent;
 	cursor: pointer;
 }
 

From 0c8cdad1e9b106e7b290f3b0156a3c41119280d9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 23 Jan 2022 02:22:12 +0100
Subject: [PATCH 236/316] css

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

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index ff8a07c8ac0..deb7cdadf9e 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -261,7 +261,7 @@ input:invalid, select:invalid, input.--error , select.--error {
 div.tabBar textarea:focus {
 	border: 1px solid #aaa !important;
 }
-input:focus:not(.select2-search__field):not(#top-bookmark-search-input), select:focus, .select2-container--open .select2-selection--single {
+input:focus:not(.button):not(.select2-search__field):not(#top-bookmark-search-input), select:focus, .select2-container--open .select2-selection--single {
 /* div.tabBar input:focus, div.tabBar select:focus { */
 	border-bottom: 1px solid #666 !important;
 	border-bottom-left-radius: 0 !important;
@@ -994,7 +994,7 @@ div.divsearchfield {
 	padding-left: 2px;
 }
 .divfilteralone {
-	background-color: #e8e8e8;
+	background-color: rgba(0, 0, 0, 0.08);
 	border-radius: 5px;
 	padding-left: 5px;
 }
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 7cf7ad0de30..0790db17cfb 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1099,7 +1099,7 @@ a.editfielda.nohover *:hover:before {
 	padding-<?php print $right; ?>: 20px;
 }
 .divfilteralone {
-	background-color: #e8e8e8;
+	background-color: rgba(0, 0, 0, 0.08);
 	border-radius: 5px;
 	padding-left: 5px;
 }

From e06ca2ea083b02757d25bf0d96e73d20d0f763d4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 23 Jan 2022 02:38:34 +0100
Subject: [PATCH 237/316] css

---
 htdocs/admin/modules.php      | 2 +-
 htdocs/langs/en_US/admin.lang | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 215d66eb693..29d2335a0f9 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -1139,7 +1139,7 @@ if ($mode == 'deploy') {
 		}
 
 		if ($allowfromweb == 1) {
-			print $langs->trans("UnpackPackageInModulesRoot", $dirins).'<br>';
+			print '<span class="opacitymedium">'.$langs->trans("UnpackPackageInModulesRoot", $dirins).'</span><br>';
 
 			print '<br>';
 
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index e8a64b3f72b..47daec0851b 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -343,7 +343,7 @@ StepNb=Step %s
 FindPackageFromWebSite=Find a package that provides the features you need (for example on the official web site %s).
 DownloadPackageFromWebSite=Download package (for example from the official web site %s).
 UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack/unzip the packaged files into the server directory dedicated to external modules:<br><b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, you must unpack/unzip the archive file into the server directory dedicated to external modules:<br><b>%s</b>
 SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going to the page setup modules: <a href="%s">%s</a>.
 NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
 InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>

From 93edbf1cda318ffed1822323a8a9a8e101f43ee8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cserveny=2C=20Tam=C3=A1s?= <cserveny.tamas@gmail.com>
Date: Thu, 20 Jan 2022 22:18:36 +0100
Subject: [PATCH 238/316] missing supplierorder api

---
 .../fourn/class/api_supplier_orders.class.php | 183 ++++++++++++++++++
 1 file changed, 183 insertions(+)

diff --git a/htdocs/fourn/class/api_supplier_orders.class.php b/htdocs/fourn/class/api_supplier_orders.class.php
index 01c0079171e..4dc3799ec41 100644
--- a/htdocs/fourn/class/api_supplier_orders.class.php
+++ b/htdocs/fourn/class/api_supplier_orders.class.php
@@ -368,6 +368,189 @@ class SupplierOrders extends DolibarrApi
 			)
 		);
 	}
+        
+	/**
+	 * Approve an order
+	 *
+	 * @param   int $id             Order ID
+	 * @param   int $idwarehouse    Warehouse ID
+	 * @param   int $secondlevel      1=Does not execute triggers, 0= execute triggers
+	 *
+	 * @url POST    {id}/approve
+	 *
+	 * @return  array
+	 * FIXME An error 403 is returned if the request has an empty body.
+	 * Error message: "Forbidden: Content type `text/plain` is not supported."
+	 * Workaround: send this in the body
+	 * {
+	 *   "idwarehouse": 0,
+	 *   "secondlevel": 0
+	 * }
+	 */
+	public function approve($id, $idwarehouse = 0, $secondlevel = 0)
+	{
+		if (empty(DolibarrApiAccess::$user->rights->fournisseur->commande->creer) && empty(DolibarrApiAccess::$user->rights->supplier_order->creer)) {
+			throw new RestException(401);
+		}
+		$result = $this->order->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Order not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('fournisseur', $this->order->id, 'commande_fournisseur', 'commande')) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		$result = $this->order->approve(DolibarrApiAccess::$user, $idwarehouse, $secondlevel);
+		if ($result == 0) {
+			throw new RestException(304, 'Error nothing done. May be object is already approved');
+		}
+		if ($result < 0) {
+			throw new RestException(500, 'Error when approve Order: '.$this->order->error);
+		}
+
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Order approved (Ref='.$this->order->ref.')'
+			)
+		);
+	}
+        
+        
+	/**
+	 * Sends an order to the vendor
+	 *
+	 * @param   int		$id             Order ID
+	 * @param   integer	$date		Date (unix timestamp in sec)
+	 * @param   int		$method		Method
+	 * @param  string	$comment	Comment
+	 *
+	 * @url POST    {id}/makeorder
+	 *
+	 * @return  array
+	 * FIXME An error 403 is returned if the request has an empty body.
+	 * Error message: "Forbidden: Content type `text/plain` is not supported."
+	 * Workaround: send this in the body
+	 * {
+	 *   "date": 0,
+	 *   "method": 0,
+	 *   "comment": ""
+	 * }
+	 */
+	public function makeOrder($id, $date, $method, $comment='')
+	{
+		if (empty(DolibarrApiAccess::$user->rights->fournisseur->commande->creer) && empty(DolibarrApiAccess::$user->rights->supplier_order->creer)) {
+			throw new RestException(401);
+		}
+		$result = $this->order->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Order not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('fournisseur', $this->order->id, 'commande_fournisseur', 'commande')) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		$result = $this->order->commande(DolibarrApiAccess::$user, $date, $method, $comment);
+		if ($result == 0) {
+			throw new RestException(304, 'Error nothing done. May be object is already sent');
+		}
+		if ($result < 0) {
+			throw new RestException(500, 'Error when sending Order: '.$this->order->error);
+		}
+
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Order sent (Ref='.$this->order->ref.')'
+			)
+		);
+	}
+        
+        /**
+	 * Receives the order, dispatches products.
+         * 
+	 * Example: 
+	 * <code> {
+	 *   "closeopenorder": 1,
+	 *   "comment": "",
+         *   "lines": [{
+         *      "id": 14, 
+         *      "fk_product": 112, 
+         *      "qty": 18, 
+         *      "warehouse": 1, 
+         *      "price": 114, 
+         *      "comment": "", 
+         *      "eatby": 0, 
+         *      "sellby": 0, 
+         *      "batch": 0, 
+         *      "notrigger": 0
+         *   }]
+	 * }</code>
+         * 
+	 * @param   int		$id             Order ID
+	 * @param   integer	$closeopenorder	Close order if everything is received
+	 * @param   string	$comment	Comment {@required false}
+	 * @param   array	$lines		Array of product dispatches
+	 *
+	 * @url POST    {id}/receive
+	 *
+	 * @return  array
+	 * FIXME An error 403 is returned if the request has an empty body.
+	 * Error message: "Forbidden: Content type `text/plain` is not supported."
+	 * 
+	 */
+	public function receiveOrder($id, $closeopenorder = 1, $comment = null, $lines)
+	{
+		if (empty(DolibarrApiAccess::$user->rights->fournisseur->commande->creer) && empty(DolibarrApiAccess::$user->rights->supplier_order->creer)) {
+			throw new RestException(401);
+		}
+		$result = $this->order->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Order not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('fournisseur', $this->order->id, 'commande_fournisseur', 'commande')) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+                foreach ($lines as $line) {
+                  $lineObj =(object) $line;
+                  
+                  $result=$this->order->dispatchProduct(DolibarrApiAccess::$user, 
+                          $lineObj->fk_product, 
+                          $lineObj->qty, 
+                          $lineObj->warehouse, 
+                          $lineObj->price, 
+                          $lineObj->comment, 
+                          $lineObj->eatby, 
+                          $lineObj->sellby, 
+                          $lineObj->batch, 
+                          $lineObj->id, 
+                          $lineObj->notrigger);
+                  
+                  if ($result < 0) {
+                    throw new RestException(500, 'Error dispatch order line '.$line->id.': '.$this->order->error);
+                  }
+                }
+                
+		$result = $this->order->calcAndSetStatusDispatch(DolibarrApiAccess::$user, $closeopenorder, $comment);
+		
+                if ($result == 0) {
+			throw new RestException(304, 'Error nothing done. May be object is already dispatched');
+		}
+		if ($result < 0) {
+			throw new RestException(500, 'Error when receivce order: '.$this->order->error);
+		}
+
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Order received (Ref='.$this->order->ref.')'
+			)
+		);
+	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**

From bd6fdbd3be4ff24c59a51dcae0a174547417eec0 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Thu, 20 Jan 2022 21:25:35 +0000
Subject: [PATCH 239/316] Fixing style errors.

---
 .../fourn/class/api_supplier_orders.class.php | 88 +++++++++----------
 1 file changed, 44 insertions(+), 44 deletions(-)

diff --git a/htdocs/fourn/class/api_supplier_orders.class.php b/htdocs/fourn/class/api_supplier_orders.class.php
index 4dc3799ec41..e7087dcd22e 100644
--- a/htdocs/fourn/class/api_supplier_orders.class.php
+++ b/htdocs/fourn/class/api_supplier_orders.class.php
@@ -368,7 +368,7 @@ class SupplierOrders extends DolibarrApi
 			)
 		);
 	}
-        
+
 	/**
 	 * Approve an order
 	 *
@@ -416,8 +416,8 @@ class SupplierOrders extends DolibarrApi
 			)
 		);
 	}
-        
-        
+
+
 	/**
 	 * Sends an order to the vendor
 	 *
@@ -438,7 +438,7 @@ class SupplierOrders extends DolibarrApi
 	 *   "comment": ""
 	 * }
 	 */
-	public function makeOrder($id, $date, $method, $comment='')
+	public function makeOrder($id, $date, $method, $comment = '')
 	{
 		if (empty(DolibarrApiAccess::$user->rights->fournisseur->commande->creer) && empty(DolibarrApiAccess::$user->rights->supplier_order->creer)) {
 			throw new RestException(401);
@@ -467,28 +467,28 @@ class SupplierOrders extends DolibarrApi
 			)
 		);
 	}
-        
-        /**
+
+		/**
 	 * Receives the order, dispatches products.
-         * 
-	 * Example: 
+		 *
+	 * Example:
 	 * <code> {
 	 *   "closeopenorder": 1,
 	 *   "comment": "",
-         *   "lines": [{
-         *      "id": 14, 
-         *      "fk_product": 112, 
-         *      "qty": 18, 
-         *      "warehouse": 1, 
-         *      "price": 114, 
-         *      "comment": "", 
-         *      "eatby": 0, 
-         *      "sellby": 0, 
-         *      "batch": 0, 
-         *      "notrigger": 0
-         *   }]
+		 *   "lines": [{
+		 *      "id": 14,
+		 *      "fk_product": 112,
+		 *      "qty": 18,
+		 *      "warehouse": 1,
+		 *      "price": 114,
+		 *      "comment": "",
+		 *      "eatby": 0,
+		 *      "sellby": 0,
+		 *      "batch": 0,
+		 *      "notrigger": 0
+		 *   }]
 	 * }</code>
-         * 
+		 *
 	 * @param   int		$id             Order ID
 	 * @param   integer	$closeopenorder	Close order if everything is received
 	 * @param   string	$comment	Comment {@required false}
@@ -499,7 +499,7 @@ class SupplierOrders extends DolibarrApi
 	 * @return  array
 	 * FIXME An error 403 is returned if the request has an empty body.
 	 * Error message: "Forbidden: Content type `text/plain` is not supported."
-	 * 
+	 *
 	 */
 	public function receiveOrder($id, $closeopenorder = 1, $comment = null, $lines)
 	{
@@ -515,29 +515,29 @@ class SupplierOrders extends DolibarrApi
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-                foreach ($lines as $line) {
-                  $lineObj =(object) $line;
-                  
-                  $result=$this->order->dispatchProduct(DolibarrApiAccess::$user, 
-                          $lineObj->fk_product, 
-                          $lineObj->qty, 
-                          $lineObj->warehouse, 
-                          $lineObj->price, 
-                          $lineObj->comment, 
-                          $lineObj->eatby, 
-                          $lineObj->sellby, 
-                          $lineObj->batch, 
-                          $lineObj->id, 
-                          $lineObj->notrigger);
-                  
-                  if ($result < 0) {
-                    throw new RestException(500, 'Error dispatch order line '.$line->id.': '.$this->order->error);
-                  }
-                }
-                
+		foreach ($lines as $line) {
+			$lineObj =(object) $line;
+
+			$result=$this->order->dispatchProduct(DolibarrApiAccess::$user,
+				  $lineObj->fk_product,
+				  $lineObj->qty,
+				  $lineObj->warehouse,
+				  $lineObj->price,
+				  $lineObj->comment,
+				  $lineObj->eatby,
+				  $lineObj->sellby,
+				  $lineObj->batch,
+				  $lineObj->id,
+				  $lineObj->notrigger);
+
+			if ($result < 0) {
+				throw new RestException(500, 'Error dispatch order line '.$line->id.': '.$this->order->error);
+			}
+		}
+
 		$result = $this->order->calcAndSetStatusDispatch(DolibarrApiAccess::$user, $closeopenorder, $comment);
-		
-                if ($result == 0) {
+
+		if ($result == 0) {
 			throw new RestException(304, 'Error nothing done. May be object is already dispatched');
 		}
 		if ($result < 0) {

From ca588852df42249e598d6d077308c01bc3bc5c19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cserveny=2C=20Tam=C3=A1s?= <cserveny.tamas@gmail.com>
Date: Thu, 20 Jan 2022 22:28:02 +0100
Subject: [PATCH 240/316] fix code review errors

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

diff --git a/htdocs/fourn/class/api_supplier_orders.class.php b/htdocs/fourn/class/api_supplier_orders.class.php
index e7087dcd22e..e21eb3436dc 100644
--- a/htdocs/fourn/class/api_supplier_orders.class.php
+++ b/htdocs/fourn/class/api_supplier_orders.class.php
@@ -490,7 +490,7 @@ class SupplierOrders extends DolibarrApi
 	 * }</code>
 		 *
 	 * @param   int		$id             Order ID
-	 * @param   integer	$closeopenorder	Close order if everything is received
+	 * @param   integer	$closeopenorder	Close order if everything is received {@required false}
 	 * @param   string	$comment	Comment {@required false}
 	 * @param   array	$lines		Array of product dispatches
 	 *
@@ -501,7 +501,7 @@ class SupplierOrders extends DolibarrApi
 	 * Error message: "Forbidden: Content type `text/plain` is not supported."
 	 *
 	 */
-	public function receiveOrder($id, $closeopenorder = 1, $comment = null, $lines)
+	public function receiveOrder($id, $closeopenorder, $comment, $lines)
 	{
 		if (empty(DolibarrApiAccess::$user->rights->fournisseur->commande->creer) && empty(DolibarrApiAccess::$user->rights->supplier_order->creer)) {
 			throw new RestException(401);

From bb6f571633da807b38712863bcb277d7ca611533 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 23 Jan 2022 12:01:50 +0100
Subject: [PATCH 241/316] Doc

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

diff --git a/ChangeLog b/ChangeLog
index 0f568ff5359..030650d5863 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,7 +15,7 @@ NEW: Add option to disable globaly some notifications emails.
 NEW: #18326 Workflow: Close order on shipment closing.
 NEW: #18401 Add __NEWREF__ subtitute to get new object reference.
 NEW: #18403 Add __URL_SHIPMENT__ substitute to get the URL of a shipment
-NEW: #18689 REST API module: add api key generate / modify right.
+NEW: #18689 REST API module: add api key generate / modify pemrission.
 NEW: #18663 Make "L'Annuaire des Entreprises" the default provider for SIREN verification for French thirdparties.
 NEW: #18046 Add tags on ticket/categories
 NEW: #18326 Workflow: Close order on shipment closing.
@@ -123,6 +123,7 @@ NEW: Introduce method hasRight
 NEW: Can use textarea field into a confirm popup.
 NEW: Can use the result_mode of mysqli driver. Save memory for list count
 NEW: #18319 REST API - Shipment: Add 'close' action / endpoint / POST method.
+NEW: Add API /approve and /makeOrder for purchase orders. 
 NEW: add action trigger for member excluded
 NEW: add option MAIN_IBAN_IS_NEVER_MANDATORY, MAIN_IBAN_NOT_MANDATORY, PROPAL_NOT_BILLABLE, PROPAL_REOPEN_UNSIGNED_ONLY, PROPOSAL_ARE_NOT_BILLABLE, TICKETS_MESSAGE_FORCE_MAIL
 NEW: Add code codebar column on serial/lot structure

From a16d47c78e35838658cfecd452a287d68b65bceb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 23 Jan 2022 12:06:40 +0100
Subject: [PATCH 242/316] Close #19890

---
 htdocs/api/class/api_documents.class.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php
index 3cd8d3e0774..28dbef6887e 100644
--- a/htdocs/api/class/api_documents.class.php
+++ b/htdocs/api/class/api_documents.class.php
@@ -624,6 +624,9 @@ class Documents extends DolibarrApi
 			} elseif ($modulepart == 'expensereport') {
 				require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 				$object = new ExpenseReport($this->db);
+			} elseif ($modulepart == 'fichinter') {
+				require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
+				$object = new Fichinter($this->db);
 			} elseif ($modulepart == 'adherent' || $modulepart == 'member') {
 				$modulepart = 'adherent';
 				require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';

From 255ac69a0df0c930588519b86be8f27ae7e8d6c6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 23 Jan 2022 12:10:52 +0100
Subject: [PATCH 243/316] Update card.php

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

diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index 68e95515bbf..a15791f9d92 100755
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -742,7 +742,7 @@ if ($action == 'create' || $action == 'presend') {
 	$formticket->withfromsocid = $socid ? $socid : $user->socid;
 	$formticket->withfromcontactid = $contactid ? $contactid : '';
 	$formticket->withtitletopic = 1;
-	$formticket->withnotifytiersatcreate = ($notifyTiers ? 1 : !empty($conf->global->TICKET_CHECK_NOTIFY_TIER_AT_CREATE) ? 1 : 0);
+	$formticket->withnotifytiersatcreate = ($notifyTiers ? 1 : (empty($conf->global->TICKET_CHECK_NOTIFY_THIRDPARTY_AT_CREATION) ? 0 : 1));
 	$formticket->withusercreate = 0;
 	$formticket->withref = 1;
 	$formticket->fk_user_create = $user->id;

From fefbaa739a3b01a978200b99672f69468350b9f7 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 19 Jan 2022 21:18:49 +0100
Subject: [PATCH 244/316] fix : bad path

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

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 7490fca0265..a49bf478763 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -4870,7 +4870,7 @@ class Societe extends CommonObject
 	{
 		global $langs;
 
-		require_once DOL_DOCUMENT_ROOT.'/parntership/class/partnership.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/partnership/class/partnership.class.php';
 
 
 		$this->partnerships[] = array();

From 9dd3d970bfdef67e822e68c74e1f7335ad54a27a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 23 Jan 2022 12:31:30 +0100
Subject: [PATCH 245/316] Update commonobject.class.php

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 39dc97cf930..db004c117a0 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -1215,7 +1215,7 @@ abstract class CommonObject
 	public function delete_linked_contact($source = '', $code = '')
 	{
 		// phpcs:enable
-		$listId = null;
+		$listId = '';
 		$temp = array();
 		$typeContact = $this->liste_type_contact($source, '', 0, 0, $code);
 

From 4888d127e02dc2ed5a40af863d4ed0a34f3efa69 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 23 Jan 2022 12:59:15 +0100
Subject: [PATCH 246/316] Make virus file no more detected.

---
 test/phpunit/testvirus.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/phpunit/testvirus.txt b/test/phpunit/testvirus.txt
index a2463df6d64..86bb55dac62 100644
--- a/test/phpunit/testvirus.txt
+++ b/test/phpunit/testvirus.txt
@@ -1 +1,2 @@
-X5O!P%@AP[4\PZX54(P^)7CC)7}$EICAR-STANDARD-ANTIVIRUS-TEST-FILE!$H+H*
\ No newline at end of file
+# Remove this line and replace the "AB" with "X5" at begin of line to get a file that is detected by antiviruses.
+ABO!P%@AP[4\PZX54(P^)7CC)7}$EICAR-STANDARD-ANTIVIRUS-TEST-FILE!$H+H*

From 20ac994d0d940ec2f60e184479f8716c62234b60 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 23 Jan 2022 13:41:26 +0100
Subject: [PATCH 247/316] Update emailcollector.class.php

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

diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index ed3e2afe0de..e2493a338fd 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -2365,8 +2365,9 @@ class EmailCollector extends CommonObject
 						// this code action is hook..... for support this call
 						global $hookmanager;
 
-						if ( ! in_array('emailcollectorcard', $hookmanager->hooks)) {
-							$hookmanager->initHooks(array('emailcollectorcard'));
+						if (!is_object($hookmanager)) {
+							include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+							$hookmanager = new HookManager($this->db);
 						}
 
 						$parameters = array(

From e392d98beb9e44351d70d213f99a6967a7e9e675 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 23 Jan 2022 13:43:48 +0100
Subject: [PATCH 248/316] Fix hook

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

diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index ff29e56b1e7..e2493a338fd 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -2365,8 +2365,9 @@ class EmailCollector extends CommonObject
 						// this code action is hook..... for support this call
 						global $hookmanager;
 
-						if (is_object($hookmanager)) {
-							$hookmanager->initHooks(array('emailcollectorcard'));
+						if (!is_object($hookmanager)) {
+							include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+							$hookmanager = new HookManager($this->db);
 						}
 
 						$parameters = array(

From adf74925752f99f33d3f921aed4edfaf230b2110 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cserveny=2C=20Tam=C3=A1s?= <cserveny.tamas@gmail.com>
Date: Sun, 23 Jan 2022 16:26:14 +0100
Subject: [PATCH 249/316] migrate missing properties

---
 build/docker/Dockerfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile
index e38ad20931d..e39f96b0b27 100644
--- a/build/docker/Dockerfile
+++ b/build/docker/Dockerfile
@@ -40,8 +40,11 @@ RUN chmod +x /usr/local/bin/docker-run.sh
 RUN pecl install xdebug && docker-php-ext-enable xdebug
 RUN echo 'zend_extension="/usr/local/lib/php/extensions/no-debug-non-zts-20180731/xdebug.so"' >> ${PHP_INI_DIR}/php.ini
 RUN echo 'xdebug.mode=debug' >> ${PHP_INI_DIR}/php.ini
+RUN echo 'xdebug.start_with_request=yes' >> ${PHP_INI_DIR}/php.ini
 RUN echo 'xdebug.client_host=host.docker.internal' >> ${PHP_INI_DIR}/php.ini
 RUN echo 'xdebug.client_port=9003' >> ${PHP_INI_DIR}/php.ini
+RUN echo 'xdebug.discover_client_host=true' >> ${PHP_INI_DIR}/php.ini
+#RUN echo 'xdebug.log="/tmp/xdebug.log"' >> ${PHP_INI_DIR}/php.ini
 RUN echo 'xdebug.idekey="netbeans-xdebug"' >> ${PHP_INI_DIR}/php.ini
 
 # set up sendmail config, to use maildev

From 0552381e3938e12caea47964f238a6de1a5bdc74 Mon Sep 17 00:00:00 2001
From: BB2A Anthony Berton <bertonanthony@gmail.com>
Date: Sun, 23 Jan 2022 16:36:47 +0100
Subject: [PATCH 250/316] 1

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 95a975267b0..ac7ea26e791 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -6960,6 +6960,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 				'__USER_FIRSTNAME__' => (string) $user->firstname,
 				'__USER_FULLNAME__' => (string) $user->getFullName($outputlangs),
 				'__USER_SUPERVISOR_ID__' => (string) ($user->fk_user ? $user->fk_user : '0'),
+				'__USER_JOB__' => (string) $user->job,
 				'__USER_REMOTE_IP__' => (string) getUserRemoteIP()
 				));
 		}

From 053b402202900cf6a9e5e35d2456b77923c094a2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 23 Jan 2022 19:20:13 +0100
Subject: [PATCH 251/316] Fix for notes standardization #19835

---
 .../adherents/class/adherent_type.class.php   | 31 ++++++++++++++-----
 htdocs/adherents/class/subscription.class.php | 11 +++++--
 htdocs/user/class/user.class.php              |  2 +-
 3 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index 90f160e7932..18a91efaacd 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -94,9 +94,15 @@ class AdherentType extends CommonObject
 	 */
 	public $amount;
 
-	/** @var string 	Public note */
+	/**
+	 * @var string 	Public note
+	 * @deprecated
+	 */
 	public $note;
 
+	/** @var string 	Public note */
+	public $note_public;
+
 	/** @var integer	Can vote */
 	public $vote;
 
@@ -358,6 +364,10 @@ class AdherentType extends CommonObject
 
 		$this->label = trim($this->label);
 
+		if (empty($this->note_public) && !empty($this->note)) {		// For backward compatibility
+			$this->note_public = $this->note;
+		}
+
 		$this->db->begin();
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."adherent_type ";
@@ -368,14 +378,14 @@ class AdherentType extends CommonObject
 		$sql .= "subscription = '".$this->db->escape($this->subscription)."',";
 		$sql .= "amount = ".((empty($this->amount) && $this->amount == '') ? 'null' : ((float) $this->amount)).",";
 		$sql .= "duration = '".$this->db->escape($this->duration_value.$this->duration_unit)."',";
-		$sql .= "note = '".$this->db->escape($this->note)."',";
+		$sql .= "note = '".$this->db->escape($this->note_public)."',";
 		$sql .= "vote = ".(integer) $this->db->escape($this->vote).",";
 		$sql .= "mail_valid = '".$this->db->escape($this->mail_valid)."'";
 		$sql .= " WHERE rowid =".((int) $this->id);
 
 		$result = $this->db->query($sql);
 		if ($result) {
-			$this->description = $this->db->escape($this->note);
+			$this->description = $this->db->escape($this->note_public);
 
 			// Multilangs
 			if (!empty($conf->global->MAIN_MULTILANGS)) {
@@ -461,7 +471,7 @@ class AdherentType extends CommonObject
 	{
 		global $langs, $conf;
 
-		$sql = "SELECT d.rowid, d.libelle as label, d.morphy, d.statut as status, d.duration, d.subscription, d.amount, d.mail_valid, d.note, d.vote";
+		$sql = "SELECT d.rowid, d.libelle as label, d.morphy, d.statut as status, d.duration, d.subscription, d.amount, d.mail_valid, d.note as note_public, d.vote";
 		$sql .= " FROM ".MAIN_DB_PREFIX."adherent_type as d";
 		$sql .= " WHERE d.rowid = ".(int) $rowid;
 
@@ -483,7 +493,8 @@ class AdherentType extends CommonObject
 				$this->subscription   = $obj->subscription;
 				$this->amount         = $obj->amount;
 				$this->mail_valid     = $obj->mail_valid;
-				$this->note           = $obj->note;
+				$this->note           = $obj->note_public;	// deprecated
+				$this->note_public    = $obj->note_public;
 				$this->vote           = $obj->vote;
 
 				// multilangs
@@ -792,12 +803,16 @@ class AdherentType extends CommonObject
 		// Object classes
 		$info["objectclass"] = explode(',', $conf->global->LDAP_MEMBER_TYPE_OBJECT_CLASS);
 
+		if (empty($this->note_public) && !empty($this->note)) {		// For backward compatibility
+			$this->note_public = $this->note;
+		}
+
 		// Champs
 		if ($this->label && !empty($conf->global->LDAP_MEMBER_TYPE_FIELD_FULLNAME)) {
 			$info[$conf->global->LDAP_MEMBER_TYPE_FIELD_FULLNAME] = $this->label;
 		}
-		if ($this->note && !empty($conf->global->LDAP_MEMBER_TYPE_FIELD_DESCRIPTION)) {
-			$info[$conf->global->LDAP_MEMBER_TYPE_FIELD_DESCRIPTION] = dol_string_nohtmltag($this->note, 0, 'UTF-8', 1);
+		if ($this->note_public && !empty($conf->global->LDAP_MEMBER_TYPE_FIELD_DESCRIPTION)) {
+			$info[$conf->global->LDAP_MEMBER_TYPE_FIELD_DESCRIPTION] = dol_string_nohtmltag($this->note_public, 0, 'UTF-8', 1);
 		}
 		if (!empty($conf->global->LDAP_MEMBER_TYPE_FIELD_GROUPMEMBERS)) {
 			$valueofldapfield = array();
@@ -829,7 +844,7 @@ class AdherentType extends CommonObject
 		$this->specimen = 1;
 
 		$this->label = 'MEMBERS TYPE SPECIMEN';
-		$this->note = 'This is a note';
+		$this->note_public = 'This is a public note';
 		$this->mail_valid = 'This is welcome email';
 		$this->subscription = 1;
 		$this->vote = 0;
diff --git a/htdocs/adherents/class/subscription.class.php b/htdocs/adherents/class/subscription.class.php
index cae5dd07beb..885c8981d93 100644
--- a/htdocs/adherents/class/subscription.class.php
+++ b/htdocs/adherents/class/subscription.class.php
@@ -215,7 +215,7 @@ class Subscription extends CommonObject
 		$sql .= " tms,";
 		$sql .= " dateadh as dateh,";
 		$sql .= " datef,";
-		$sql .= " subscription, note, fk_bank";
+		$sql .= " subscription, note as note_public, fk_bank";
 		$sql .= " FROM ".MAIN_DB_PREFIX."subscription";
 		$sql .= "	WHERE rowid=".((int) $rowid);
 
@@ -235,7 +235,8 @@ class Subscription extends CommonObject
 				$this->dateh          = $this->db->jdate($obj->dateh);
 				$this->datef          = $this->db->jdate($obj->datef);
 				$this->amount         = $obj->subscription;
-				$this->note           = $obj->note;
+				$this->note           = $obj->note_public;	// deprecated
+				$this->note_public    = $obj->note_public;
 				$this->fk_bank        = $obj->fk_bank;
 				return 1;
 			} else {
@@ -266,10 +267,14 @@ class Subscription extends CommonObject
 			return -1;
 		}
 
+		if (empty($this->note_public) && !empty($this->note)) {	// For backward compatibility
+			$this->note_public = $this->note;
+		}
+
 		$sql = "UPDATE ".MAIN_DB_PREFIX."subscription SET ";
 		$sql .= " fk_type = ".((int) $this->fk_type).",";
 		$sql .= " fk_adherent = ".((int) $this->fk_adherent).",";
-		$sql .= " note=".($this->note ? "'".$this->db->escape($this->note)."'" : 'null').",";
+		$sql .= " note=".($this->note_public ? "'".$this->db->escape($this->note_public)."'" : 'null').",";
 		$sql .= " subscription = ".price2num($this->amount).",";
 		$sql .= " dateadh='".$this->db->idate($this->dateh)."',";
 		$sql .= " datef='".$this->db->idate($this->datef)."',";
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index a6b6b5af1e6..d1cf9a40b95 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -524,7 +524,7 @@ class User extends CommonObject
 				$this->admin		= $obj->admin;
 				$this->note_public = $obj->note_public;
 				$this->note_private = $obj->note_private;
-				$this->note			= $obj->note_private;
+				$this->note			= $obj->note_private;	// deprecated
 				$this->statut		= $obj->statut;
 				$this->photo		= $obj->photo;
 				$this->openid		= $obj->openid;

From 45ffd68e92bb8e28a0916d3568edd1535499eb55 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 23 Jan 2022 19:26:29 +0100
Subject: [PATCH 252/316] Simplify code

---
 htdocs/contrat/card.php | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index ef0944883a8..3febcc868a0 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -40,9 +40,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/contract/modules_contract.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-if (!empty($conf->facture->enabled) && !empty($conf->global->CONTRACT_CREATE_FROM_INVOICE)) {
-	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-}
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 if (!empty($conf->propal->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 }
@@ -251,11 +249,9 @@ if (empty($reshook)) {
 				if ($element == 'propal') {
 					$element = 'comm/propal'; $subelement = 'propal';
 				}
-				if (!empty($conf->global->CONTRACT_CREATE_FROM_INVOICE)) {
-					if ($element == 'invoice' || $element == 'facture') {
-						$element = 'compta/facture';
-						$subelement = 'facture';
-					}
+				if ($element == 'invoice' || $element == 'facture') {
+					$element = 'compta/facture';
+					$subelement = 'facture';
 				}
 
 				$object->origin    = $origin;
@@ -1049,11 +1045,9 @@ if ($action == 'create') {
 			if ($element == 'propal') {
 				$element = 'comm/propal'; $subelement = 'propal';
 			}
-			if (!empty($conf->global->CONTRACT_CREATE_FROM_INVOICE)) {
-				if ($element == 'invoice' || $element == 'facture') {
-					$element = 'compta/facture';
-					$subelement = 'facture';
-				}
+			if ($element == 'invoice' || $element == 'facture') {
+				$element = 'compta/facture';
+				$subelement = 'facture';
 			}
 
 			dol_include_once('/'.$element.'/class/'.$subelement.'.class.php');

From dee020f2866223be7a7516ac96460782d4f234cf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 23 Jan 2022 19:40:23 +0100
Subject: [PATCH 253/316] Update getSupplierPrices.php

---
 htdocs/fourn/ajax/getSupplierPrices.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/fourn/ajax/getSupplierPrices.php b/htdocs/fourn/ajax/getSupplierPrices.php
index 211734f1129..4d47f6a477f 100644
--- a/htdocs/fourn/ajax/getSupplierPrices.php
+++ b/htdocs/fourn/ajax/getSupplierPrices.php
@@ -109,8 +109,7 @@ if ($idprod > 0)
 	{
 		// Add price for pmp
 		$price=$producttmp->pmp;
-		if (empty($price))
-		{
+		if (empty($price) && !empty($conf->global->PRODUCT_USE_SUB_COST_PRICES_IF_COST_PRICE_EMPTY)) {
 			// get pmp for subproducts if any
 			$producttmp->get_sousproduits_arbo();
 			$prods_arbo=$producttmp->get_arbo_each_prod();

From bc37e75e7f2cfd1da3c7161587df36603e7136c6 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sun, 23 Jan 2022 18:49:28 +0000
Subject: [PATCH 254/316] Fixing style errors.

---
 htdocs/fourn/ajax/getSupplierPrices.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/htdocs/fourn/ajax/getSupplierPrices.php b/htdocs/fourn/ajax/getSupplierPrices.php
index 2b515713a7d..6cfc4fbe7b9 100644
--- a/htdocs/fourn/ajax/getSupplierPrices.php
+++ b/htdocs/fourn/ajax/getSupplierPrices.php
@@ -101,7 +101,7 @@ if ($idprod > 0) {
 			$prods_arbo=$producttmp->get_arbo_each_prod();
 			if (!empty($prods_arbo)) {
 				$price = 0;
-				foreach($prods_arbo as $child) {
+				foreach ($prods_arbo as $child) {
 					$sousprod = new Product($db);
 					$sousprod->fetch($child['id']);
 					$price += $sousprod->pmp;
@@ -114,15 +114,13 @@ if ($idprod > 0) {
 
 	// Add price for costprice (at end)
 	$price = $producttmp->cost_price;
- 	if (empty($price) && ! empty($conf->global->PRODUCT_USE_SUB_COST_PRICES_IF_COST_PRICE_EMPTY)) {
+	if (empty($price) && ! empty($conf->global->PRODUCT_USE_SUB_COST_PRICES_IF_COST_PRICE_EMPTY)) {
 		// get costprice for subproducts if any
 		$producttmp->get_sousproduits_arbo();
 		$prods_arbo=$producttmp->get_arbo_each_prod();
-		if (!empty($prods_arbo))
-		{
+		if (!empty($prods_arbo)) {
 			$price = 0;
-			foreach($prods_arbo as $child)
-			{
+			foreach ($prods_arbo as $child) {
 				$sousprod = new Product($db);
 				$sousprod->fetch($child['id']);
 				$price += $sousprod->cost_price;

From 69cd6f0a254b3c3e8aee496c38c6189fd840fae2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 23 Jan 2022 23:37:59 +0100
Subject: [PATCH 255/316] Remove hardcodes list of migration files

---
 htdocs/install/check.php | 43 +++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/htdocs/install/check.php b/htdocs/install/check.php
index d3c5cba1290..f260be4f9fb 100644
--- a/htdocs/install/check.php
+++ b/htdocs/install/check.php
@@ -420,29 +420,26 @@ if (!file_exists($conffile)) {
 		if (GETPOST('allowupgrade')) {
 			$allowupgrade = true;
 		}
-		$migrationscript = array(
-			array('from'=>'3.0.0', 'to'=>'3.1.0'),
-			array('from'=>'3.1.0', 'to'=>'3.2.0'),
-			array('from'=>'3.2.0', 'to'=>'3.3.0'),
-			array('from'=>'3.3.0', 'to'=>'3.4.0'),
-			array('from'=>'3.4.0', 'to'=>'3.5.0'),
-			array('from'=>'3.5.0', 'to'=>'3.6.0'),
-			array('from'=>'3.6.0', 'to'=>'3.7.0'),
-			array('from'=>'3.7.0', 'to'=>'3.8.0'),
-			array('from'=>'3.8.0', 'to'=>'3.9.0'),
-			array('from'=>'3.9.0', 'to'=>'4.0.0'),
-			array('from'=>'4.0.0', 'to'=>'5.0.0'),
-			array('from'=>'5.0.0', 'to'=>'6.0.0'),
-			array('from'=>'6.0.0', 'to'=>'7.0.0'),
-			array('from'=>'7.0.0', 'to'=>'8.0.0'),
-			array('from'=>'8.0.0', 'to'=>'9.0.0'),
-			array('from'=>'9.0.0', 'to'=>'10.0.0'),
-			array('from'=>'10.0.0', 'to'=>'11.0.0'),
-			array('from'=>'11.0.0', 'to'=>'12.0.0'),
-			array('from'=>'12.0.0', 'to'=>'13.0.0'),
-			array('from'=>'13.0.0', 'to'=>'14.0.0'),
-			array('from'=>'14.0.0', 'to'=>'15.0.0'),
-		);
+
+		$dir = DOL_DOCUMENT_ROOT."/install/mysql/migration/";	// We use mysql migration scripts whatever is database driver
+		dolibarr_install_syslog("Scan sql files for migration files in ".$dir);
+
+		// Get files list of migration file x.y.z-a.b.c.sql into /install/mysql/migration
+		$migrationscript = array();
+		$handle = opendir($dir);
+		if (is_resource($handle)) {
+			while (($file = readdir($handle)) !== false) {
+				$reg = array();
+				if (preg_match('/^(\d+\.\d+\.\d+)-(\d+\.\d+\.\d+)\.sql$/i', $file, $reg)) {
+					if (!empty($reg[2]) && version_compare(DOL_VERSION, $reg[2])) {
+						$migrationscript[] = array('from' => $reg[1], 'to' => $reg[2]);
+					}
+				}
+			}
+			$migrationscript = dol_sort_array($migrationscript, 'from', 'asc', 1);
+		} else {
+			print '<div class="error">'.$langs->trans("ErrorCanNotReadDir", $dir).'</div>';
+		}
 
 		$count = 0;
 		foreach ($migrationscript as $migarray) {

From 00eabded6d037541bb50b90fdf5e253436b5e1d6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 24 Jan 2022 12:43:42 +0100
Subject: [PATCH 256/316] Fix phpunit

---
 htdocs/core/lib/functions.lib.php | 1 +
 htdocs/user/class/user.class.php  | 4 ++--
 test/phpunit/UserTest.php         | 4 +++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 76ac0df05b1..3d98530ffd7 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1544,6 +1544,7 @@ function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename =
 			// This is when PHP session is ran outside a web server, like from Linux command line (Not always defined, but usefull if OS defined it).
 			$data['ip'] = '???@'.$_SERVER['LOGNAME'];
 		}
+
 		// Loop on each log handler and send output
 		foreach ($conf->loghandlers as $loghandlerinstance) {
 			if ($restricttologhandler && $loghandlerinstance->code != $restricttologhandler) {
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index d1cf9a40b95..6345cac8b1a 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1905,7 +1905,7 @@ class User extends CommonObject
 			// Update password
 			if (!empty($this->pass)) {
 				if ($this->pass != $this->pass_indatabase && $this->pass != $this->pass_indatabase_crypted) {
-					// Si mot de passe saisi et different de celui en base
+					// If a new value for password is set and different than the one crypted into database
 					$result = $this->setPassword($user, $this->pass, 0, $notrigger, $nosyncmemberpass);
 					if ($result < 0) {
 						return -5;
@@ -3080,7 +3080,7 @@ class User extends CommonObject
 		$this->personal_mobile = '0999999996';
 		$this->admin = 0;
 		$this->login = 'dolibspec';
-		$this->pass = 'dolibspec';
+		$this->pass = 'dolibSpec+@123';
 		//$this->pass_indatabase='dolibspec';									Set after a fetch
 		//$this->pass_indatabase_crypted='e80ca5a88c892b0aaaf7e154853bccab';	Set after a fetch
 		$this->datec = $now;
diff --git a/test/phpunit/UserTest.php b/test/phpunit/UserTest.php
index b8025a3cd41..699e9fd89f0 100644
--- a/test/phpunit/UserTest.php
+++ b/test/phpunit/UserTest.php
@@ -143,11 +143,13 @@ class UserTest extends PHPUnit\Framework\TestCase
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
+		print __METHOD__." USER_PASSWORD_GENERATED=".getDolGlobalString('USER_PASSWORD_GENERATED')."\n";
+
 		$localobject=new User($this->savdb);
 		$localobject->initAsSpecimen();
 		$result=$localobject->create($user);
 
-		$this->assertLessThan($result, 0);
+		$this->assertLessThan($result, 0, 'Creation of user has failed: '.$localobject->error);
 		print __METHOD__." result=".$result."\n";
 		return $result;
 	}

From 1eb4d7625333d653a735b3cf6c1efb6571635491 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 24 Jan 2022 13:15:32 +0100
Subject: [PATCH 257/316] Clean code

---
 htdocs/admin/commande.php | 31 -------------------------------
 1 file changed, 31 deletions(-)

diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index 1e977fb48df..24a45bb413a 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -158,18 +158,6 @@ if ($action == 'updateMask') {
 		$error++;
 	}
 
-	if (!$error) {
-		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	} else {
-		setEventMessages($langs->trans("Error"), null, 'errors');
-	}
-} elseif ($action == "setshippableiconinlist") {
-	// Activate Set Shippable Icon In List
-	$setshippableiconinlist = GETPOST('value', 'int');
-	$res = dolibarr_set_const($db, "SHIPPABLE_ORDER_ICON_IN_LIST", $setshippableiconinlist, 'yesno', 0, '', $conf->entity);
-	if (!($res > 0)) {
-		$error++;
-	}
 	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
@@ -646,25 +634,6 @@ print '<input type="submit" class="button button-edit" value="'.$langs->trans("M
 print "</td></tr>\n";
 print '</form>';
 
-// Shippable Icon in List
-/* Kept as hidden feature for the moment, result seems bugged.
-Where is definition of "shippable" according to all different STOCK_CALCULATE_... options ?
-
-print '<tr class="oddeven">';
-print '<td>'.$langs->trans("ShippableOrderIconInList").'</td>';
-print '<td>&nbsp;</td>';
-print '<td class="center">';
-if (!empty($conf->global->SHIPPABLE_ORDER_ICON_IN_LIST)) {
-	print '<a href="'.$_SERVER['PHP_SELF'].'?action=setshippableiconinlist&token='.newToken().'&value=0">';
-	print img_picto($langs->trans("Activated"),'switch_on');
-} else {
-	print '<a href="'.$_SERVER['PHP_SELF'].'?action=setshippableiconinlist&token='.newToken().'&value=1">';
-	print img_picto($langs->trans("Disabled"),'switch_off');
-}
-print '</a></td>';
-print '</tr>';
-*/
-
 /*
 // Seems to be not so used. So kept hidden for the moment to avoid dangerous options inflation.
 // Ask for payment bank during order

From 6b5c0769b843c8de8f0d57f1460d438e2398bde4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 24 Jan 2022 14:09:53 +0100
Subject: [PATCH 258/316] FIX #19786

---
 htdocs/commande/class/commande.class.php | 12 +++++++---
 htdocs/commande/list.php                 | 30 +++++++++++++-----------
 htdocs/expedition/card.php               |  7 ++++--
 3 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index f60a91ae3df..48b7e499dbb 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -261,6 +261,11 @@ class Commande extends CommonOrder
 	//! key of pos source ('0', '1', ...)
 	public $pos_source;
 
+	/**
+	 * @var array	Array with line of all shipments
+	 */
+	public $expeditions;
+
 
 	/**
 	 *  'type' if the field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password')
@@ -2004,9 +2009,9 @@ class Commande extends CommonOrder
 	/**
 	 *	Load array lines
 	 *
-	 *	@param		int		$only_product	Return only physical products, not services
+	 *	@param		int		$only_product			Return only physical products, not services
 	 *	@param		int		$loadalsotranslation	Return translation for products
-	 *	@return		int						<0 if KO, >0 if OK
+	 *	@return		int								<0 if KO, >0 if OK
 	 */
 	public function fetch_lines($only_product = 0, $loadalsotranslation = 0)
 	{
@@ -2201,9 +2206,10 @@ class Commande extends CommonOrder
 	 *  Note: For a dedicated shipment, the fetch_lines can be used to load the qty_asked and qty_shipped. This function is use to return qty_shipped cumulated for the order
 	 *
 	 *	@param      int		$filtre_statut      Filter on shipment status
+	 *  @param		int		$fk_product			Add a filter on a product
 	 * 	@return     int                			<0 if KO, Nb of lines found if OK
 	 */
-	public function loadExpeditions($filtre_statut = -1)
+	public function loadExpeditions($filtre_statut = -1, $fk_product = 0)
 	{
 		$this->expeditions = array();
 
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 8fc93a233c2..717b57ae8b1 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -1854,10 +1854,13 @@ if ($resql) {
 			print '<td class="center">';
 			if (!empty($show_shippable_command) && !empty($conf->stock->enabled)) {
 				if (($obj->fk_statut > $generic_commande::STATUS_DRAFT) && ($obj->fk_statut < $generic_commande::STATUS_CLOSED)) {
-					$generic_commande->getLinesArray(); // This set ->lines
+					$generic_commande->getLinesArray(); 	// Load array ->lines
+					$generic_commande->loadExpeditions();	// Load array ->expeditions
 
 					$numlines = count($generic_commande->lines); // Loop on each line of order
 					for ($lig = 0; $lig < $numlines; $lig++) {
+						$reliquat = $generic_commande->lines[$lig]->qty - $generic_commande->expeditions[$generic_commande->lines[$lig]->id];
+
 						if ($generic_commande->lines[$lig]->product_type == 0 && $generic_commande->lines[$lig]->fk_product > 0) {  // If line is a product and not a service
 							$nbprod++; // order contains real products
 							$generic_product->id = $generic_commande->lines[$lig]->fk_product;
@@ -1872,15 +1875,15 @@ if ($resql) {
 								$generic_product->stock_theorique = $productstat_cachevirtual[$generic_commande->lines[$lig]->fk_product]['stock_reel'] = $generic_product->stock_theorique;
 							}
 
+							if ($reliquat > $generic_product->stock_reel) {
+								$notshippable++;
+							}
 							if (empty($conf->global->SHIPPABLE_ORDER_ICON_IN_LIST)) {  // Default code. Default should be this case.
-								$text_info .= $generic_commande->lines[$lig]->qty.' X '.$generic_commande->lines[$lig]->product_ref.'&nbsp;'.dol_trunc($generic_commande->lines[$lig]->product_label, 25);
+								$text_info .= $reliquat.' x '.$generic_commande->lines[$lig]->product_ref.'&nbsp;'.dol_trunc($generic_commande->lines[$lig]->product_label, 20);
 								$text_info .= ' - '.$langs->trans("Stock").': <span class="'.($generic_product->stock_reel > 0 ? 'ok' : 'error').'">'.$generic_product->stock_reel.'</span>';
 								$text_info .= ' - '.$langs->trans("VirtualStock").': <span class="'.($generic_product->stock_theorique > 0 ? 'ok' : 'error').'">'.$generic_product->stock_theorique.'</span>';
+								$text_info .= ($reliquat != $generic_commande->lines[$lig]->qty ? ' <span class="opacitymedium">('.$langs->trans("QtyInOtherShipments").' '.($generic_commande->lines[$lig]->qty - $reliquat).')</span>' : '');
 								$text_info .= '<br>';
-
-								if ($generic_commande->lines[$lig]->qty > $generic_product->stock_reel) {
-									$notshippable++;
-								}
 							} else {  // BUGGED CODE.
 								// DOES NOT TAKE INTO ACCOUNT MANUFACTURING. THIS CODE SHOULD BE USELESS. PREVIOUS CODE SEEMS COMPLETE.
 								// COUNT STOCK WHEN WE SHOULD ALREADY HAVE VALUE
@@ -1908,32 +1911,31 @@ if ($resql) {
 										$stock_order_supplier = $generic_product->stats_commande_fournisseur['qty'];
 									}
 								}
-								$text_info .= $generic_commande->lines[$lig]->qty.' X '.$generic_commande->lines[$lig]->ref.'&nbsp;'.dol_trunc($generic_commande->lines[$lig]->product_label, 25);
+								$text_info .= $reliquat.' x '.$generic_commande->lines[$lig]->ref.'&nbsp;'.dol_trunc($generic_commande->lines[$lig]->product_label, 20);
 								$text_stock_reel = $generic_product->stock_reel.'/'.$stock_order;
 								if ($stock_order > $generic_product->stock_reel && !($generic_product->stock_reel < $generic_commande->lines[$lig]->qty)) {
 									$warning++;
 									$text_warning .= '<span class="warning">'.$langs->trans('Available').'&nbsp;:&nbsp;'.$text_stock_reel.'</span>';
 								}
-								if ($generic_product->stock_reel < $generic_commande->lines[$lig]->qty) {
-									$notshippable++;
+								if ($reliquat > $generic_product->stock_reel) {
 									$text_info .= '<span class="warning">'.$langs->trans('Available').'&nbsp;:&nbsp;'.$text_stock_reel.'</span>';
 								} else {
 									$text_info .= '<span class="ok">'.$langs->trans('Available').'&nbsp;:&nbsp;'.$text_stock_reel.'</span>';
 								}
 								if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled)) {
-									$text_info .= '&nbsp;'.$langs->trans('SupplierOrder').'&nbsp;:&nbsp;'.$stock_order_supplier.'<br>';
-								} else {
-									$text_info .= '<br>';
+									$text_info .= '&nbsp;'.$langs->trans('SupplierOrder').'&nbsp;:&nbsp;'.$stock_order_supplier;
 								}
+								$text_info .= ($reliquat != $generic_commande->lines[$lig]->qty ? ' <span class="opacitymedium">('.$langs->trans("QtyInOtherShipments").' '.($generic_commande->lines[$lig]->qty - $reliquat).')</span>' : '');
+								$text_info .= '<br>';
 							}
 						}
 					}
 					if ($notshippable == 0) {
 						$text_icon = img_picto('', 'dolly', '', false, 0, 0, '', 'green paddingleft');
-						$text_info = $langs->trans('Shippable').'<br>'.$text_info;
+						$text_info = $text_icon.' '.$langs->trans('Shippable').'<br>'.$text_info;
 					} else {
 						$text_icon = img_picto('', 'dolly', '', false, 0, 0, '', 'error paddingleft');
-						$text_info = $langs->trans('NonShippable').'<br>'.$text_info;
+						$text_info = $text_icon.' '.$langs->trans('NonShippable').'<br>'.$text_info;
 					}
 				}
 
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 064dfc3a52c..f835e293f5f 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -1126,16 +1126,19 @@ if ($action == 'create') {
 						$product_static->status_buy = $line->product_tobuy;
 						$product_static->status_batch = $line->product_tobatch;
 
+						$showdescinproductdesc = (getDolGlobalString('PRODUIT_DESC_IN_FORM') == 2 ? 1 : 0);
+
 						$text = $product_static->getNomUrl(1);
 						$text .= ' - '.(!empty($line->label) ? $line->label : $line->product_label);
-						$description = ($conf->global->PRODUIT_DESC_IN_FORM ? '' : dol_htmlentitiesbr($line->desc));
+						$description = ($showdescinproductdesc ? '' : dol_htmlentitiesbr($line->desc));
+
 						print $form->textwithtooltip($text, $description, 3, '', '', $i);
 
 						// Show range
 						print_date_range($db->jdate($line->date_start), $db->jdate($line->date_end));
 
 						// Add description in form
-						if (!empty($conf->global->PRODUIT_DESC_IN_FORM)) {
+						if ($showdescinproductdesc) {
 							print ($line->desc && $line->desc != $line->product_label) ? '<br>'.dol_htmlentitiesbr($line->desc) : '';
 						}
 

From 38dbaa3d0785174c1dccf686449206979cd26197 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 24 Jan 2022 14:12:27 +0100
Subject: [PATCH 259/316] Doc

---
 htdocs/install/mysql/migration/15.0.0-16.0.0.sql | 2 --
 1 file changed, 2 deletions(-)

diff --git a/htdocs/install/mysql/migration/15.0.0-16.0.0.sql b/htdocs/install/mysql/migration/15.0.0-16.0.0.sql
index 4ee300998ea..1ef84b065b9 100644
--- a/htdocs/install/mysql/migration/15.0.0-16.0.0.sql
+++ b/htdocs/install/mysql/migration/15.0.0-16.0.0.sql
@@ -38,6 +38,4 @@ UPDATE llx_rights_def SET perms = 'writeall' WHERE perms = 'writeall_advance' AN
 
 -- v16
 
-
--- Missing in v14 or lower
 ALTER TABLE llx_projet_task_time ADD COLUMN fk_product integer NULL;

From be01e3b1aca44814fcd5f5f2ac1f755d547b6d25 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 24 Jan 2022 14:48:18 +0100
Subject: [PATCH 260/316] Migration

---
 htdocs/install/mysql/migration/12.0.0-13.0.0.sql | 6 +++---
 htdocs/install/mysql/migration/15.0.0-16.0.0.sql | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
index a9f1a669e52..517771ced4e 100644
--- a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
+++ b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
@@ -484,9 +484,9 @@ ALTER TABLE llx_delivery DROP FOREIGN KEY  fk_livraison_fk_user_author;
 ALTER TABLE llx_delivery DROP FOREIGN KEY  fk_livraison_fk_user_valid;
 
 -- add constraint
-ALTER TABLE llx_delivery ADD CONSTRAINT fk_delivery_fk_soc			FOREIGN KEY (fk_soc)			REFERENCES llx_societe (rowid);
-ALTER TABLE llx_delivery ADD CONSTRAINT fk_delivery_fk_user_author	FOREIGN KEY (fk_user_author)	REFERENCES llx_user (rowid);
-ALTER TABLE llx_delivery ADD CONSTRAINT fk_delivery_fk_user_valid	FOREIGN KEY (fk_user_valid)	REFERENCES llx_user (rowid);
+ALTER TABLE llx_delivery ADD CONSTRAINT fk_delivery_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid);
+ALTER TABLE llx_delivery ADD CONSTRAINT fk_delivery_fk_user_author FOREIGN KEY (fk_user_author) REFERENCES llx_user (rowid);
+ALTER TABLE llx_delivery ADD CONSTRAINT fk_delivery_fk_user_valid FOREIGN KEY (fk_user_valid) REFERENCES llx_user (rowid);
 
 ALTER TABLE llx_deliverydet DROP FOREIGN KEY  fk_livraisondet_fk_livraison;
 ALTER TABLE llx_deliverydet DROP INDEX idx_livraisondet_fk_expedition;
diff --git a/htdocs/install/mysql/migration/15.0.0-16.0.0.sql b/htdocs/install/mysql/migration/15.0.0-16.0.0.sql
index 1ef84b065b9..93eecc6fa89 100644
--- a/htdocs/install/mysql/migration/15.0.0-16.0.0.sql
+++ b/htdocs/install/mysql/migration/15.0.0-16.0.0.sql
@@ -1,7 +1,7 @@
 --
 -- Be carefull to requests order.
 -- This file must be loaded by calling /install/index.php page
--- when current version is 14.0.0 or higher.
+-- when current version is 15.0.0 or higher.
 --
 -- To restrict request to Mysql version x.y minimum use -- VMYSQLx.y
 -- To restrict request to Pgsql version x.y minimum use -- VPGSQLx.y

From c131bdcbd307301a70d28f165d62410216bf9071 Mon Sep 17 00:00:00 2001
From: Adrien Raze <adrien.raze@atm-consulting.fr>
Date: Mon, 24 Jan 2022 16:06:02 +0100
Subject: [PATCH 261/316] NEW : Add hooks on salaries and sociales card

---
 htdocs/compta/sociales/card.php | 28 +++++++++++++++++++++++++---
 htdocs/salaries/card.php        | 20 +++++++++++++++++---
 2 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index 7454f61f6de..f0dd02eac80 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -56,6 +56,9 @@ $label = GETPOST('label', 'alpha');
 $actioncode = GETPOST('actioncode');
 $fk_user = GETPOST('userid', 'int');
 
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('propalcard', 'globalcard'));
+
 $object = new ChargeSociales($db);
 if ($id > 0) {
 	$object->fetch($id);
@@ -74,6 +77,12 @@ $result = restrictedArea($user, 'tax', $object->id, 'chargesociales', 'charges')
  * Actions
  */
 
+$parameters = array('socid' => $socid);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+
 // Classify paid
 if ($action == 'confirm_paid' && $user->rights->tax->charges->creer && $confirm == 'yes') {
 	$object->fetch($id);
@@ -416,6 +425,8 @@ if ($id > 0) {
 	$object = new ChargeSociales($db);
 	$result = $object->fetch($id);
 
+	$formconfirm = '';
+	
 	if ($result > 0) {
 		$head = tax_prepare_head($object);
 
@@ -433,25 +444,36 @@ if ($id > 0) {
 				$formquestion[] = array('type' => 'date', 'name' => 'clone_period', 'label' => $langs->trans("PeriodEndDate"), 'value' => -1);
 			}
 
-			print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneTax', $object->ref), 'confirm_clone', $formquestion, 'yes', 1, 240);
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneTax', $object->ref), 'confirm_clone', $formquestion, 'yes', 1, 240);
 		}
 
 
 		if ($action == 'paid') {
 			$text = $langs->trans('ConfirmPaySocialContribution');
-			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans('PaySocialContribution'), $text, "confirm_paid", '', '', 2);
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans('PaySocialContribution'), $text, "confirm_paid", '', '', 2);
 		}
 
 		// Confirmation of the removal of the Social Contribution
 		if ($action == 'delete') {
 			$text = $langs->trans('ConfirmDeleteSocialContribution');
-			print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans('DeleteSocialContribution'), $text, 'confirm_delete', '', '', 2);
+			$formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans('DeleteSocialContribution'), $text, 'confirm_delete', '', '', 2);
 		}
 
 		if ($action == 'edit') {
 			print "<form name=\"charge\" action=\"".$_SERVER["PHP_SELF"]."?id=$object->id&amp;action=update\" method=\"post\">";
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 		}
+		// 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;
 
 		print dol_get_fiche_head($head, 'card', $langs->trans("SocialContribution"), -1, 'bill');
 
diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php
index f5ebbcf0ec6..dc1a98209f4 100755
--- a/htdocs/salaries/card.php
+++ b/htdocs/salaries/card.php
@@ -647,6 +647,7 @@ if ($action == 'create') {
 
 if ($id) {
 	$head = salaries_prepare_head($object);
+	$formconfirm = '';
 
 	if ($action === 'clone') {
 		$formquestion = array(
@@ -657,17 +658,17 @@ if ($id) {
 		$formquestion[] = array('type' => 'date', 'name' => 'clone_date_start', 'label' => $langs->trans("DateStart"), 'value' => -1);
 		$formquestion[] = array('type' => 'date', 'name' => 'clone_date_end', 'label' => $langs->trans("DateEnd"), 'value' => -1);
 
-		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneSalary', $object->ref), 'confirm_clone', $formquestion, 'yes', 1, 240);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneSalary', $object->ref), 'confirm_clone', $formquestion, 'yes', 1, 240);
 	}
 
 	if ($action == 'paid') {
 		$text = $langs->trans('ConfirmPaySalary');
-		print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans('PaySalary'), $text, "confirm_paid", '', '', 2);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans('PaySalary'), $text, "confirm_paid", '', '', 2);
 	}
 
 	if ($action == 'delete') {
 		$text = $langs->trans('ConfirmDeleteSalary');
-		print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans('DeleteSalary'), $text, 'confirm_delete', '', '', 2);
+		$formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans('DeleteSalary'), $text, 'confirm_delete', '', '', 2);
 	}
 
 	if ($action == 'edit') {
@@ -675,6 +676,19 @@ if ($id) {
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 	}
 
+	// Call Hook formConfirm
+	$parameters = array('formConfirm' => $formconfirm);
+	$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	if (empty($reshook)) {
+		$formconfirm .= $hookmanager->resPrint;
+	} elseif ($reshook > 0) {
+		$formconfirm = $hookmanager->resPrint;
+	}
+
+	// Print form confirm
+	print $formconfirm;
+
+
 	print dol_get_fiche_head($head, 'card', $langs->trans("SalaryPayment"), -1, 'salary');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/salaries/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';

From 6cb97b1346fdbbebc08cf0ea477517d84d9171a4 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 24 Jan 2022 15:13:40 +0000
Subject: [PATCH 262/316] Fixing style errors.

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

diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index f0dd02eac80..d1ef5c1ea08 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -426,7 +426,7 @@ if ($id > 0) {
 	$result = $object->fetch($id);
 
 	$formconfirm = '';
-	
+
 	if ($result > 0) {
 		$head = tax_prepare_head($object);
 

From 0e8b7ef656eb8259757c38b87ba006cb5bc1379a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 24 Jan 2022 16:38:25 +0100
Subject: [PATCH 263/316] Clean code

---
 htdocs/core/lib/sendings.lib.php          |  2 +-
 htdocs/core/tpl/commonfields_view.tpl.php | 48 +++++++++++++----------
 htdocs/delivery/card.php                  |  4 +-
 3 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/htdocs/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php
index 0814c0f4825..e2ab74b8cfc 100644
--- a/htdocs/core/lib/sendings.lib.php
+++ b/htdocs/core/lib/sendings.lib.php
@@ -180,7 +180,7 @@ function delivery_prepare_head($object)
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->commande->dir_output."/".dol_sanitizeFileName($tmpobject->ref);
+	$upload_dir = $conf->expedition->dir_output."/sending/".dol_sanitizeFileName($object->ref);
 	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
 	$nbLinks = Link::count($db, $tmpobject->element, $tmpobject->id);
 	$head[$h][0] = DOL_URL_ROOT.'/expedition/document.php?id='.$tmpobject->id;
diff --git a/htdocs/core/tpl/commonfields_view.tpl.php b/htdocs/core/tpl/commonfields_view.tpl.php
index 29bf3943cea..42ead1573f4 100644
--- a/htdocs/core/tpl/commonfields_view.tpl.php
+++ b/htdocs/core/tpl/commonfields_view.tpl.php
@@ -110,11 +110,9 @@ print '</table>';
 
 // We close div and reopen for second column
 print '</div>';
-print '<div class="fichehalfright">';
 
-print '<div class="underbanner clearboth"></div>';
-print '<table class="border centpercent tableforfield">';
 
+$rightpart = '';
 $alreadyoutput = 1;
 foreach ($object->fields as $key => $val) {
 	if ($alreadyoutput) {
@@ -139,38 +137,46 @@ foreach ($object->fields as $key => $val) {
 
 	$value = $object->$key;
 
-	print '<tr><td';
-	print ' class="'.(empty($val['tdcss']) ? 'titlefield' : $val['tdcss']).'  fieldname_'.$key;
-	//if ($val['notnull'] > 0) print ' fieldrequired';		// No fieldrequired inthe view output
+	$rightpart .= '<tr><td';
+	$rightpart .= ' class="'.(empty($val['tdcss']) ? 'titlefield' : $val['tdcss']).'  fieldname_'.$key;
+	//if ($val['notnull'] > 0) $rightpart .= ' fieldrequired';		// No fieldrequired inthe view output
 	if ($val['type'] == 'text' || $val['type'] == 'html') {
-		print ' tdtop';
+		$rightpart .= ' tdtop';
 	}
-	print '">';
+	$rightpart.= '">';
 	if (!empty($val['help'])) {
-		print $form->textwithpicto($langs->trans($val['label']), $langs->trans($val['help']));
+		$rightpart .= $form->textwithpicto($langs->trans($val['label']), $langs->trans($val['help']));
 	} else {
-		print $langs->trans($val['label']);
+		$rightpart .= $langs->trans($val['label']);
 	}
-	print '</td>';
-	print '<td class="valuefield fieldname_'.$key;
+	$rightpart .= '</td>';
+	$rightpart .= '<td class="valuefield fieldname_'.$key;
 	if ($val['type'] == 'text') {
-		print ' wordbreak';
+		$rightpart .= ' wordbreak';
 	}
 	if (!empty($val['cssview'])) {
-		print ' '.$val['cssview'];
+		$rightpart .= ' '.$val['cssview'];
 	}
-	print '">';
+	$rightpart .= '">';
 	if (in_array($val['type'], array('text', 'html'))) {
-		print '<div class="longmessagecut">';
+		$rightpart .= '<div class="longmessagecut">';
 	}
-	print $object->showOutputField($val, $key, $value, '', '', '', 0);
-	//print dol_escape_htmltag($object->$key, 1, 1);
+	$rightpart .= $object->showOutputField($val, $key, $value, '', '', '', 0);
+	//$rightpart .= dol_escape_htmltag($object->$key, 1, 1);
 	if (in_array($val['type'], array('text', 'html'))) {
-		print '</div>';
+		$rightpart .= '</div>';
 	}
-	print '</td>';
-	print '</tr>';
+	$rightpart .= '</td>';
+	$rightpart .= '</tr>';
 }
 
+
+print '<div class="fichehalfright">';
+print '<div class="underbanner clearboth"></div>';
+
+print '<table class="border centpercent tableforfield">';
+
+print $rightpart;
+
 ?>
 <!-- END PHP TEMPLATE commonfields_view.tpl.php -->
diff --git a/htdocs/delivery/card.php b/htdocs/delivery/card.php
index 62955da7f06..00975946f6b 100644
--- a/htdocs/delivery/card.php
+++ b/htdocs/delivery/card.php
@@ -101,7 +101,7 @@ if ($action == 'add') {
 	$object->fk_incoterms = GETPOST('incoterm_id', 'int');
 
 	if (!$conf->expedition_bon->enabled && !empty($conf->stock->enabled)) {
-		$expedition->entrepot_id = GETPOST('entrepot_id');
+		$expedition->entrepot_id = GETPOST('entrepot_id', 'int');
 	}
 
 	// We loop on each line of order to complete object delivery with qty to delivery
@@ -282,7 +282,7 @@ if ($action == 'create') {    // Create. Seems to no be used
 			print '<input type="hidden" name="id" value="'.$object->id.'">';
 			print '<input type="hidden" name="ref" value="'.$object->ref.'">';
 
-			print dol_get_fiche_head($head, 'delivery', $langs->trans("Shipment"), -1, 'sending');
+			print dol_get_fiche_head($head, 'delivery', $langs->trans("Shipment"), -1, 'dolly');
 
 			/*
 			 * Confirmation de la suppression

From bb11ab992ba91d7250f1cf3faee1e0cbd3bf3d9a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 24 Jan 2022 17:50:35 +0100
Subject: [PATCH 264/316] Trans

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

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 47daec0851b..1bf5233f660 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -2216,4 +2216,5 @@ NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
 API_DISABLE_COMPRESSION=Disable compression of API responses
 EachTerminalHasItsOwnCounter=Each terminal use its own counter.
-FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
\ No newline at end of file
+FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
+PreviousHash=Previous hash
\ No newline at end of file

From d56048387575db738e6945dbe33d59e09c851698 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 24 Jan 2022 18:32:03 +0100
Subject: [PATCH 265/316] Fix permission from group not found

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

diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 6345cac8b1a..71ed5f9a7e2 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1149,9 +1149,12 @@ class User extends CommonObject
 				$sql .= " AND r.entity = ".((int) $conf->entity);
 			}
 		} else {
-			$sql .= " AND gr.entity = ".((int) $conf->entity);
-			$sql .= " AND gu.entity = ".((int) $conf->entity);
-			$sql .= " AND r.entity = ".((int) $conf->entity);
+			$sql .= " AND gr.entity = ".((int) $conf->entity);	// Only groups created in current entity
+			// The entity on the table usergroup_user should be useless and shoumd never be used because it is alreay into gr and r.
+			// but when using MULTICOMPANY_TRANSVERSE_MODE, we may insert record that make rubbish result due to duplicate record of
+			// other entities, so we are forced to add a filter here
+			$sql .= " AND gu.entity IN (0,".$conf->entity.")";
+			$sql .= " AND r.entity = ".((int) $conf->entity);	// Only permission of modules enabled in current entity
 		}
 		$sql .= " AND gr.fk_usergroup = gu.fk_usergroup";
 		$sql .= " AND gu.fk_user = ".((int) $this->id);

From 9f377b7fe42977ecc0e3d5e1dc41b7536f972afb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 24 Jan 2022 23:58:16 +0100
Subject: [PATCH 266/316] Better responsive on small screen

---
 htdocs/compta/bank/bankentries_list.php | 53 +++++++++++++------------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index c05f0f4530c..3d8e6f8bd98 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -1339,14 +1339,15 @@ if ($resql) {
 				$labeltoshow = $langs->trans($reg[1]);
 			} else {
 				if ($objp->label == '(payment_salary)') {
-					$labeltoshow = dol_trunc($langs->trans("SalaryPayment", 40));
+					$labeltoshow = $langs->trans("SalaryPayment");
 				} else {
 					$labeltoshow = dol_escape_htmltag($objp->label);
 					$titletoshow = $objp->label;
 				}
 			}
-			print '<td class="tdoverflowmax300"'.($titletoshow ? ' title="'.dol_escape_htmltag($titletoshow).'"' : '').'>';
-			print $labeltoshow;	// Already escaped
+
+
+			print '<td class="tdoverflowmax250"'.($titletoshow ? ' title="'.dol_escape_htmltag($titletoshow).'"' : '').'>';
 
 			// Add info about links after description
 			$cachebankaccount = array();
@@ -1355,70 +1356,70 @@ if ($resql) {
 				if ($links[$key]['type'] == 'withdraw') {
 					$banktransferstatic->id = $links[$key]['url_id'];
 					$banktransferstatic->ref = $links[$key]['label'];
-					print ' '.$banktransferstatic->getNomUrl(0);
+					print $banktransferstatic->getNomUrl(0).' ';
 				} elseif ($links[$key]['type'] == 'payment') {
 					$paymentstatic->id = $links[$key]['url_id'];
 					$paymentstatic->ref = $links[$key]['url_id']; // FIXME This is id, not ref of payment
 					$paymentstatic->date = $db->jdate($objp->do);
-					print ' '.$paymentstatic->getNomUrl(2);
+					print $paymentstatic->getNomUrl(2).' ';
 				} elseif ($links[$key]['type'] == 'payment_supplier') {
 					$paymentsupplierstatic->id = $links[$key]['url_id'];
 					$paymentsupplierstatic->ref = $links[$key]['url_id']; // FIXME This is id, not ref of payment
-					print ' '.$paymentsupplierstatic->getNomUrl(2);
+					print $paymentsupplierstatic->getNomUrl(2).' ';
 				} elseif ($links[$key]['type'] == 'payment_sc') {
 					$paymentscstatic->id = $links[$key]['url_id'];
 					$paymentscstatic->ref = $links[$key]['url_id'];
 					$paymentscstatic->label = $links[$key]['label'];
-					print ' '.$paymentscstatic->getNomUrl(2);
+					print $paymentscstatic->getNomUrl(2).' ';
 				} elseif ($links[$key]['type'] == 'payment_vat') {
 					$paymentvatstatic->id = $links[$key]['url_id'];
 					$paymentvatstatic->ref = $links[$key]['url_id'];
-					print ' '.$paymentvatstatic->getNomUrl(2);
+					print $paymentvatstatic->getNomUrl(2).' ';
 				} elseif ($links[$key]['type'] == 'payment_salary') {
 					$paymentsalstatic->id = $links[$key]['url_id'];
 					$paymentsalstatic->ref = $links[$key]['url_id'];
 					$paymentsalstatic->label = $links[$key]['label'];
-					print ' '.$paymentsalstatic->getNomUrl(2);
+					print $paymentsalstatic->getNomUrl(2).' ';
 				} elseif ($links[$key]['type'] == 'payment_loan') {
 					print '<a href="'.DOL_URL_ROOT.'/loan/payment/card.php?id='.$links[$key]['url_id'].'">';
 					print ' '.img_object($langs->trans('ShowPayment'), 'payment').' ';
-					print '</a>';
+					print '</a> ';
 				} elseif ($links[$key]['type'] == 'payment_donation') {
 					$paymentdonationstatic->id = $links[$key]['url_id'];
 					$paymentdonationstatic->ref = $links[$key]['url_id'];
-					print ' '.$paymentdonationstatic->getNomUrl(2);
+					print $paymentdonationstatic->getNomUrl(2).' ';
 				} elseif ($links[$key]['type'] == 'payment_expensereport') {
 					$paymentexpensereportstatic->id = $links[$key]['url_id'];
 					$paymentexpensereportstatic->ref = $links[$key]['url_id'];
-					print ' '.$paymentexpensereportstatic->getNomUrl(2);
+					print $paymentexpensereportstatic->getNomUrl(2).' ';
 				} elseif ($links[$key]['type'] == 'payment_various') {
 					$paymentvariousstatic->id = $links[$key]['url_id'];
 					$paymentvariousstatic->ref = $links[$key]['url_id'];
-					print ' '.$paymentvariousstatic->getNomUrl(2);
+					print $paymentvariousstatic->getNomUrl(2).' ';
 				} elseif ($links[$key]['type'] == 'banktransfert') {
 					// Do not show link to transfer since there is no transfer card (avoid confusion). Can already be accessed from transaction detail.
 					if ($objp->amount > 0) {
 						$banklinestatic->fetch($links[$key]['url_id']);
 						$bankstatic->id = $banklinestatic->fk_account;
 						$bankstatic->label = $banklinestatic->bank_account_ref;
-						print ' ('.$langs->trans("TransferFrom").' ';
+						print $langs->trans("TransferFrom").' ';
 						print $bankstatic->getNomUrl(1, 'transactions');
 						print ' '.$langs->trans("toward").' ';
 						$bankstatic->id = $objp->bankid;
 						$bankstatic->label = $objp->bankref;
 						print $bankstatic->getNomUrl(1, '');
-						print ')';
+						print ' - ';
 					} else {
 						$bankstatic->id = $objp->bankid;
 						$bankstatic->label = $objp->bankref;
-						print ' ('.$langs->trans("TransferFrom").' ';
+						print $langs->trans("TransferFrom").' ';
 						print $bankstatic->getNomUrl(1, '');
 						print ' '.$langs->trans("toward").' ';
 						$banklinestatic->fetch($links[$key]['url_id']);
 						$bankstatic->id = $banklinestatic->fk_account;
 						$bankstatic->label = $banklinestatic->bank_account_ref;
 						print $bankstatic->getNomUrl(1, 'transactions');
-						print ')';
+						print ' - ';
 					}
 					//var_dump($links);
 				} elseif ($links[$key]['type'] == 'company') {
@@ -1430,22 +1431,22 @@ if ($resql) {
 					// Information is already shown using the payment_salary link. No need of this link.
 				} else {
 					// Show link with label $links[$key]['label']
-					if (!empty($objp->label) && !empty($links[$key]['label'])) {
-						print ' - ';
-					}
 					print '<a href="'.$links[$key]['url'].$links[$key]['url_id'].'">';
 					if (preg_match('/^\((.*)\)$/i', $links[$key]['label'], $reg)) {
 						// Label generique car entre parentheses. On l'affiche en le traduisant
 						if ($reg[1] == 'paiement') {
 							$reg[1] = 'Payment';
 						}
-						print ' '.$langs->trans($reg[1]);
+						print $langs->trans($reg[1]);
 					} else {
-						print ' '.$links[$key]['label'];
+						print $links[$key]['label'];
 					}
-					print '</a>';
+					print '</a>'.($labeltoshow ? ' - ' : '');
 				}
 			}
+
+			print $labeltoshow;	// Already escaped
+
 			print '</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
@@ -1488,7 +1489,7 @@ if ($resql) {
 
 		// Payment type
 		if (!empty($arrayfields['type']['checked'])) {
-			print '<td align="center" class="nowrap">';
+			print '<td class="tdoverflowmax100 center">';
 			$labeltype = ($langs->trans("PaymentTypeShort".$objp->fk_type) != "PaymentTypeShort".$objp->fk_type) ? $langs->trans("PaymentTypeShort".$objp->fk_type) : $langs->getLabelFromKey($db, $objp->fk_type, 'c_paiement', 'code', 'libelle', '', 1);
 			if ($labeltype == 'SOLD') {
 				print '&nbsp;'; //$langs->trans("InitialBankBalance");
@@ -1514,9 +1515,9 @@ if ($resql) {
 			print '<td class="tdoverflowmax150">';
 
 			$companylinked_id = 0;
-				$userlinked_id = 0;
+			$userlinked_id = 0;
 
-				//payment line type to define user display and user or company linked
+			//payment line type to define user display and user or company linked
 			foreach ($links as $key => $value) {
 				if ($links[$key]['type'] == 'payment_sc') {
 					$type_link = 'payment_sc';

From 19dcc95d6f3d7b289de44bd49df70a01109345c5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 24 Jan 2022 23:58:31 +0100
Subject: [PATCH 267/316] Fix tooltip for payment

---
 .../class/paymentexpensereport.class.php              | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/htdocs/expensereport/class/paymentexpensereport.class.php b/htdocs/expensereport/class/paymentexpensereport.class.php
index 48adeab929d..3aac0cee2b8 100644
--- a/htdocs/expensereport/class/paymentexpensereport.class.php
+++ b/htdocs/expensereport/class/paymentexpensereport.class.php
@@ -635,7 +635,16 @@ class PaymentExpenseReport extends CommonObject
 		if (empty($this->ref)) {
 			$this->ref = $this->label;
 		}
-		$label = $langs->trans("ShowPayment").': '.$this->ref;
+		$label = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Payment").'</u>';
+		if (isset($this->status)) {
+			$label .= ' '.$this->getLibStatut(5);
+		}
+		if (!empty($this->ref)) {
+			$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		}
+		if (!empty($this->datep)) {
+			$label .= '<br><b>'.$langs->trans('Date').':</b> '.dol_print_date($this->datep, 'dayhour');
+		}
 
 		if (!empty($this->id)) {
 			$link = '<a href="'.DOL_URL_ROOT.'/expensereport/payment/card.php?id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';

From b64856807ba381a57f35e895c774b69837a2028b Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Tue, 25 Jan 2022 00:09:41 +0100
Subject: [PATCH 268/316] Update llx_c_action_trigger.sql

---
 .../mysql/data/llx_c_action_trigger.sql       | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_c_action_trigger.sql b/htdocs/install/mysql/data/llx_c_action_trigger.sql
index 258b56f1471..119a4215f56 100644
--- a/htdocs/install/mysql/data/llx_c_action_trigger.sql
+++ b/htdocs/install/mysql/data/llx_c_action_trigger.sql
@@ -9,6 +9,7 @@
 -- Copyright (C) 2013       Cedric Gross            <c.gross@kreiz-it.fr>
 -- Copyright (C) 2014       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
 -- Copyright (C) 2015       Bahfir Abbes            <bafbes@gmail.com>
+-- Copyright (C) 2022       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
@@ -39,6 +40,7 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('COMPANY_SENTBYMAIL','Mails sent from third party card','Executed when you send email from third party card','societe',1);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('COMPANY_DELETE','Third party deleted','Executed when you delete third party','societe',1);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_VALIDATE','Customer proposal validated','Executed when a commercial proposal is validated','propal',2);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_MODIFY','Customer proposal modified','Executed when a customer proposal is modified','propal',2);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_SENTBYMAIL','Commercial proposal sent by mail','Executed when a commercial proposal is sent by mail','propal',3);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_CLOSE_SIGNED','Customer proposal closed signed','Executed when a customer proposal is closed signed','propal',2);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_CLOSE_REFUSED','Customer proposal closed refused','Executed when a customer proposal is closed refused','propal',2);
@@ -46,17 +48,20 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_DELETE','Customer proposal deleted','Executed when a customer proposal is deleted','propal',2);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_VALIDATE','Customer order validate','Executed when a customer order is validated','commande',4);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_CLOSE','Customer order classify delivered','Executed when a customer order is set delivered','commande',5);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_MODIFY','Customer order modified','Executed when a customer order is set modified','commande',5);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_CLASSIFY_BILLED','Customer order classify billed','Executed when a customer order is set to billed','commande',5);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_CANCEL','Customer order canceled','Executed when a customer order is canceled','commande',5);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SENTBYMAIL','Customer order sent by mail','Executed when a customer order is sent by mail ','commande',5);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_DELETE','Customer order deleted','Executed when a customer order is deleted','commande',5);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_VALIDATE','Customer invoice validated','Executed when a customer invoice is approved','facture',6);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_MODIFY','Customer invoice modified','Executed when a customer invoice is modified','facture',7);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_PAYED','Customer invoice payed','Executed when a customer invoice is payed','facture',7);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_CANCEL','Customer invoice canceled','Executed when a customer invoice is conceled','facture',8);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SENTBYMAIL','Customer invoice sent by mail','Executed when a customer invoice is sent by mail','facture',9);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_UNVALIDATE','Customer invoice unvalidated','Executed when a customer invoice status set back to draft','facture',9);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_DELETE','Customer invoice deleted','Executed when a customer invoice is deleted','facture',9);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPOSAL_SUPPLIER_VALIDATE','Price request validated','Executed when a commercial proposal is validated','proposal_supplier',10);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPOSAL_SUPPLIER_MODIFY','Price request modified','Executed when a commercial proposal is modified','proposal_supplier',10);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPOSAL_SUPPLIER_SENTBYMAIL','Price request sent by mail','Executed when a commercial proposal is sent by mail','proposal_supplier',10);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPOSAL_SUPPLIER_CLOSE_SIGNED','Price request closed signed','Executed when a customer proposal is closed signed','proposal_supplier',10);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPOSAL_SUPPLIER_CLOSE_REFUSED','Price request closed refused','Executed when a customer proposal is closed refused','proposal_supplier',10);
@@ -64,6 +69,7 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 --insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_CREATE','Supplier order created','Executed when a supplier order is created','order_supplier',11);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_VALIDATE','Supplier order validated','Executed when a supplier order is validated','order_supplier',12);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_APPROVE','Supplier order request approved','Executed when a supplier order is approved','order_supplier',13);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_MODIFY','Supplier order request modified','Executed when a supplier order is modified','order_supplier',13);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_SUBMIT','Supplier order request submited','Executed when a supplier order is approved','order_supplier',13);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_RECEIVE','Supplier order request received','Executed when a supplier order is received','order_supplier',13);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_REFUSE','Supplier order request refused','Executed when a supplier order is refused','order_supplier',13);
@@ -72,20 +78,24 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_CLASSIFY_BILLED','Supplier order set billed','Executed when a supplier order is set as billed','order_supplier',14);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_DELETE','Supplier order deleted','Executed when a supplier order is deleted','order_supplier',14);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SUPPLIER_VALIDATE','Supplier invoice validated','Executed when a supplier invoice is validated','invoice_supplier',15);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SUPPLIER_MODIFY','Supplier invoice modified','Executed when a supplier invoice is modified','invoice_supplier',15);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SUPPLIER_UNVALIDATE','Supplier invoice unvalidated','Executed when a supplier invoice status is set back to draft','invoice_supplier',15);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SUPPLIER_PAYED','Supplier invoice payed','Executed when a supplier invoice is payed','invoice_supplier',16);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SUPPLIER_SENTBYMAIL','Supplier invoice sent by mail','Executed when a supplier invoice is sent by mail','invoice_supplier',17);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SUPPLIER_CANCELED','Supplier invoice cancelled','Executed when a supplier invoice is cancelled','invoice_supplier',17);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SUPPLIER_DELETE','Supplier invoice deleted','Executed when a supplier invoice is deleted','invoice_supplier',17);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTRACT_VALIDATE','Contract validated','Executed when a contract is validated','contrat',18);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTRACT_MODIFY','Contract modified','Executed when a contract is modified','contrat',18);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTRACT_SENTBYMAIL','Contract sent by mail','Executed when a contract is sent by mail','contrat',18);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTRACT_DELETE','Contract deleted','Executed when a contract is deleted','contrat',18);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('SHIPPING_VALIDATE','Shipping validated','Executed when a shipping is validated','shipping',20);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('SHIPPING_MODIFY','Shipping modified','Executed when a shipping is modified','shipping',20);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('SHIPPING_SENTBYMAIL','Shipping sent by mail','Executed when a shipping is sent by mail','shipping',21);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('SHIPPING_DELETE','Shipping sent is deleted','Executed when a shipping is deleted','shipping',21);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('RECEPTION_VALIDATE','Reception validated','Executed when a reception is validated','reception',22);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('RECEPTION_SENTBYMAIL','Reception sent by mail','Executed when a reception is sent by mail','reception',22);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_VALIDATE','Member validated','Executed when a member is validated','member',22);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_MODIFY','Member modified','Executed when a member is modified','member',23);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_SENTBYMAIL','Mails sent from member card','Executed when you send email from member card','member',23);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_SUBSCRIPTION_CREATE','Member subscribtion recorded','Executed when a member subscribtion is deleted','member',24);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_SUBSCRIPTION_MODIFY','Member subscribtion modified','Executed when a member subscribtion is modified','member',24);
@@ -94,21 +104,27 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_DELETE','Member deleted','Executed when a member is deleted','member',26);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_EXCLUDE','Member excluded','Executed when a member is excluded','member',27);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_VALIDATE','Intervention validated','Executed when a intervention is validated','ficheinter',30);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_MODIFY','Intervention modify','Executed when a intervention is modify','ficheinter',30);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_CLASSIFY_BILLED','Intervention set billed','Executed when a intervention is set to billed (when option FICHINTER_CLASSIFY_BILLED is set)','ficheinter',32);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_CLASSIFY_UNBILLED','Intervention set unbilled','Executed when a intervention is set to unbilled (when option FICHINTER_CLASSIFY_BILLED is set)','ficheinter',33);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_REOPEN','Intervention opened','Executed when a intervention is re-opened','ficheinter',34);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_SENTBYMAIL','Intervention sent by mail','Executed when a intervention is sent by mail','ficheinter',35);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_DELETE','Intervention is deleted','Executed when a intervention is deleted','ficheinter',35);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PRODUCT_CREATE','Product or service created','Executed when a product or sevice is created','product',40);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PRODUCT_MODIFY','Product or service modified','Executed when a product or sevice is modified','product',41);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PRODUCT_DELETE','Product or service deleted','Executed when a product or sevice is deleted','product',42);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_CREATE','Expense report created','Executed when an expense report is created','expensereport',201);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_VALIDATE','Expense report validated','Executed when an expense report is validated','expensereport',202);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_MODIFY','Expense report modified','Executed when an expense report is modified','expensereport',202);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_APPROVE','Expense report approved','Executed when an expense report is approved','expensereport',203);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_PAID','Expense report billed','Executed when an expense report is set as billed','expensereport',204);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_DELETE','Expense report deleted','Executed when an expense report is deleted','expensereport',205);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('HOLIDAY_VALIDATE','Expense report validated','Executed when an expense report is validated','expensereport',211);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('HOLIDAY_MODIFY','Expense report modified','Executed when an expense report is modified','expensereport',212);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('HOLIDAY_APPROVE','Expense report approved','Executed when an expense report is approved','expensereport',212);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROJECT_CREATE','Project creation','Executed when a project is created','project',140);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROJECT_VALIDATE','Project validation','Executed when a project is validated','project',141);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROJECT_MODIFY','Project modified','Executed when a project is modified','project',142);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROJECT_DELETE','Project deleted','Executed when a project is deleted','project',143);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('TICKET_CREATE','Ticket created','Executed when a ticket is created','ticket',161);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('TICKET_MODIFY','Ticket modified','Executed when a ticket is modified','ticket',163);
@@ -122,11 +138,7 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('USER_DELETE','User update','Executed when a user is deleted','user',303);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('USER_NEW_PASSWORD','User update','Executed when a user is change password','user',304);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('USER_ENABLEDISABLE','User update','Executed when a user is enable or disable','user',305);
-insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PRODUCT_MODIFY','Product or service modified','Executed when a product or sevice is modified','product',41);
-insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_MODIFY','Member modified','Executed when a member is modified','member',23);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_MODIFY','Intervention modified','Executed when a intervention is modified','ficheinter',19);
-insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROJECT_CREATE','Project creation','Executed when a project is created','project',140);
-insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROJECT_MODIFY','Project modified','Executed when a project is modified','project',142);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BOM_VALIDATE','BOM validated','Executed when a BOM is validated','bom',650);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BOM_UNVALIDATE','BOM unvalidated','Executed when a BOM is unvalidated','bom',651);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BOM_CLOSE','BOM disabled','Executed when a BOM is disabled','bom',652);
@@ -140,7 +152,6 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTACT_MODIFY','Contact address update','Executed when a contact is updated','contact',51);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTACT_SENTBYMAIL','Mails sent from third party card','Executed when you send email from contact address record','contact',52);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTACT_DELETE','Contact address deleted','Executed when a contact is deleted','contact',53);
-
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('RECRUITMENTJOBPOSITION_CREATE','Job created','Executed when a job is created','recruitment',7500);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('RECRUITMENTJOBPOSITION_MODIFY','Job modified','Executed when a job is modified','recruitment',7502);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('RECRUITMENTJOBPOSITION_SENTBYMAIL','Mails sent from job record','Executed when you send email from job record','recruitment',7504);

From 1bd86e4bae73e93f85b3870b1333a2166b59ad55 Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Tue, 25 Jan 2022 00:11:04 +0100
Subject: [PATCH 269/316] Update 14.0.0-15.0.0.sql

---
 htdocs/install/mysql/migration/14.0.0-15.0.0.sql | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/htdocs/install/mysql/migration/14.0.0-15.0.0.sql b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
index f383c706653..f1921a41e77 100644
--- a/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
+++ b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
@@ -494,3 +494,15 @@ INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) value
 INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('USER_DELETE','User update','Executed when a user is deleted','user',303);
 INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('USER_NEW_PASSWORD','User update','Executed when a user is change password','user',304);
 INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('USER_ENABLEDISABLE','User update','Executed when a user is enable or disable','user',305);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_MODIFY','Customer proposal modified','Executed when a customer proposal is modified','propal',2);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_MODIFY','Customer order modified','Executed when a customer order is set modified','commande',5);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_MODIFY','Customer invoice modified','Executed when a customer invoice is modified','facture',7);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPOSAL_SUPPLIER_MODIFY','Price request modified','Executed when a commercial proposal is modified','proposal_supplier',10);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_MODIFY','Supplier order request modified','Executed when a supplier order is modified','order_supplier',13);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SUPPLIER_MODIFY','Supplier invoice modified','Executed when a supplier invoice is modified','invoice_supplier',15);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTRACT_MODIFY','Contract modified','Executed when a contract is modified','contrat',18);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('SHIPPING_MODIFY','Shipping modified','Executed when a shipping is modified','shipping',20);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_MODIFY','Intervention modify','Executed when a intervention is modify','ficheinter',30);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('PRODUCT_MODIFY','Product or service modified','Executed when a product or sevice is modified','product',41);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_MODIFY','Expense report modified','Executed when an expense report is modified','expensereport',202);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('HOLIDAY_MODIFY','Expense report modified','Executed when an expense report is modified','expensereport',212);

From 1d265d801a3229723e1c34b813dbde980bd6f895 Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Tue, 25 Jan 2022 00:19:09 +0100
Subject: [PATCH 270/316] Update 14.0.0-15.0.0.sql

---
 htdocs/install/mysql/migration/14.0.0-15.0.0.sql | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/htdocs/install/mysql/migration/14.0.0-15.0.0.sql b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
index f1921a41e77..f383c706653 100644
--- a/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
+++ b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
@@ -494,15 +494,3 @@ INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) value
 INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('USER_DELETE','User update','Executed when a user is deleted','user',303);
 INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('USER_NEW_PASSWORD','User update','Executed when a user is change password','user',304);
 INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('USER_ENABLEDISABLE','User update','Executed when a user is enable or disable','user',305);
-INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_MODIFY','Customer proposal modified','Executed when a customer proposal is modified','propal',2);
-INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_MODIFY','Customer order modified','Executed when a customer order is set modified','commande',5);
-INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_MODIFY','Customer invoice modified','Executed when a customer invoice is modified','facture',7);
-INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPOSAL_SUPPLIER_MODIFY','Price request modified','Executed when a commercial proposal is modified','proposal_supplier',10);
-INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_MODIFY','Supplier order request modified','Executed when a supplier order is modified','order_supplier',13);
-INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SUPPLIER_MODIFY','Supplier invoice modified','Executed when a supplier invoice is modified','invoice_supplier',15);
-INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTRACT_MODIFY','Contract modified','Executed when a contract is modified','contrat',18);
-INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('SHIPPING_MODIFY','Shipping modified','Executed when a shipping is modified','shipping',20);
-INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_MODIFY','Intervention modify','Executed when a intervention is modify','ficheinter',30);
-INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('PRODUCT_MODIFY','Product or service modified','Executed when a product or sevice is modified','product',41);
-INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_MODIFY','Expense report modified','Executed when an expense report is modified','expensereport',202);
-INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('HOLIDAY_MODIFY','Expense report modified','Executed when an expense report is modified','expensereport',212);

From 13dbadf7702cb708b539e414113356d7b7241295 Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Tue, 25 Jan 2022 00:19:41 +0100
Subject: [PATCH 271/316] Update 15.0.0-16.0.0.sql

---
 htdocs/install/mysql/migration/15.0.0-16.0.0.sql | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/htdocs/install/mysql/migration/15.0.0-16.0.0.sql b/htdocs/install/mysql/migration/15.0.0-16.0.0.sql
index 93eecc6fa89..a6be50a91a7 100644
--- a/htdocs/install/mysql/migration/15.0.0-16.0.0.sql
+++ b/htdocs/install/mysql/migration/15.0.0-16.0.0.sql
@@ -39,3 +39,17 @@ UPDATE llx_rights_def SET perms = 'writeall' WHERE perms = 'writeall_advance' AN
 -- v16
 
 ALTER TABLE llx_projet_task_time ADD COLUMN fk_product integer NULL;
+
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_MODIFY','Customer proposal modified','Executed when a customer proposal is modified','propal',2);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_MODIFY','Customer order modified','Executed when a customer order is set modified','commande',5);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_MODIFY','Customer invoice modified','Executed when a customer invoice is modified','facture',7);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPOSAL_SUPPLIER_MODIFY','Price request modified','Executed when a commercial proposal is modified','proposal_supplier',10);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_MODIFY','Supplier order request modified','Executed when a supplier order is modified','order_supplier',13);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SUPPLIER_MODIFY','Supplier invoice modified','Executed when a supplier invoice is modified','invoice_supplier',15);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTRACT_MODIFY','Contract modified','Executed when a contract is modified','contrat',18);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('SHIPPING_MODIFY','Shipping modified','Executed when a shipping is modified','shipping',20);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_MODIFY','Intervention modify','Executed when a intervention is modify','ficheinter',30);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('PRODUCT_MODIFY','Product or service modified','Executed when a product or sevice is modified','product',41);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_MODIFY','Expense report modified','Executed when an expense report is modified','expensereport',202);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('HOLIDAY_MODIFY','Expense report modified','Executed when an expense report is modified','expensereport',212);
+

From a1f676eb8cac354d7621f291acca15cd7604be82 Mon Sep 17 00:00:00 2001
From: Je2fb <46494485+Je2fb@users.noreply.github.com>
Date: Tue, 25 Jan 2022 09:07:53 +0100
Subject: [PATCH 272/316] Add new expression in Dynamic Price

Add the expression supplier_min_price_with_discount for select the buy price.
---
 htdocs/product/dynamic_price/class/price_parser.class.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/htdocs/product/dynamic_price/class/price_parser.class.php b/htdocs/product/dynamic_price/class/price_parser.class.php
index 3d28f4b6011..8a1bb68a157 100644
--- a/htdocs/product/dynamic_price/class/price_parser.class.php
+++ b/htdocs/product/dynamic_price/class/price_parser.class.php
@@ -263,13 +263,16 @@ class PriceParser
 			return -1;
 		} elseif ($res == 0) {
 			$supplier_min_price = 0;
+        	$supplier_min_price_with_discount = 0;
 		} else {
 			 $supplier_min_price = $productFournisseur->fourn_unitprice;
+			 $supplier_min_price_with_discount = $productFournisseur->fourn_unitprice_with_discount;
 		}
 
 		//Accessible values by expressions
 		$extra_values = array_merge($extra_values, array(
 			"supplier_min_price" => $supplier_min_price,
+			"supplier_min_price_with_discount" => $supplier_min_price_with_discount,
 		));
 
 		//Parse the expression and return the price, if not error occurred check if price is higher than min
@@ -329,12 +332,13 @@ class PriceParser
 		//Values for product expressions
 		$extra_values = array_merge($extra_values, array(
 			"supplier_min_price" => 1,
+			"supplier_min_price_with_discount" => 2,
 		));
 
 		//Values for supplier product expressions
 		$extra_values = array_merge($extra_values, array(
-			"supplier_quantity" => 2,
-			"supplier_tva_tx" => 3,
+			"supplier_quantity" => 3,
+			"supplier_tva_tx" => 4,
 		));
 		return $this->parseExpression($product, $expression, $extra_values);
 	}

From d1dd70f9cca12b6fbc6e160b726f8cfb9649acf1 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Tue, 25 Jan 2022 08:10:58 +0000
Subject: [PATCH 273/316] Fixing style errors.

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

diff --git a/htdocs/product/dynamic_price/class/price_parser.class.php b/htdocs/product/dynamic_price/class/price_parser.class.php
index 8a1bb68a157..9bd986a3c73 100644
--- a/htdocs/product/dynamic_price/class/price_parser.class.php
+++ b/htdocs/product/dynamic_price/class/price_parser.class.php
@@ -263,7 +263,7 @@ class PriceParser
 			return -1;
 		} elseif ($res == 0) {
 			$supplier_min_price = 0;
-        	$supplier_min_price_with_discount = 0;
+			$supplier_min_price_with_discount = 0;
 		} else {
 			 $supplier_min_price = $productFournisseur->fourn_unitprice;
 			 $supplier_min_price_with_discount = $productFournisseur->fourn_unitprice_with_discount;

From 15346d1c4acafb7576914b4b48df2e73ba233fef Mon Sep 17 00:00:00 2001
From: Christian Foellmann <christian@foellmann.de>
Date: Tue, 25 Jan 2022 09:17:30 +0100
Subject: [PATCH 274/316] getTasksArray() fetch_optionals to populate
 ExtraFields

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

diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index d0b27caf326..87a66279714 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -800,9 +800,10 @@ class Task extends CommonObject
 	 * @param	array	$extrafields	    Show additional column from project or task
 	 * @param   int     $includebilltime    Calculate also the time to bill and billed
 	 * @param   array   $search_array_options Array of search
+	 * @param   int     $loadextras         Fetch all Extrafields on each task
 	 * @return 	array						Array of tasks
 	 */
-	public function getTasksArray($usert = null, $userp = null, $projectid = 0, $socid = 0, $mode = 0, $filteronproj = '', $filteronprojstatus = '-1', $morewherefilter = '', $filteronprojuser = 0, $filterontaskuser = 0, $extrafields = array(), $includebilltime = 0, $search_array_options = array())
+	public function getTasksArray($usert = null, $userp = null, $projectid = 0, $socid = 0, $mode = 0, $filteronproj = '', $filteronprojstatus = '-1', $morewherefilter = '', $filteronprojuser = 0, $filterontaskuser = 0, $extrafields = array(), $includebilltime = 0, $search_array_options = array(), $loadextras = 0)
 	{
 		global $conf, $hookmanager;
 
@@ -1022,6 +1023,10 @@ class Task extends CommonObject
 							}
 						}
 					}
+
+					if ($loadextras) {
+						$tasks[$i]->fetch_optionals();
+					}
 				}
 
 				$i++;

From 76b0dee58a8fce97e1ebfcdbbdcfe6e23eb8d51c Mon Sep 17 00:00:00 2001
From: Thomas Negre <tnegre@open-dsi.fr>
Date: Tue, 25 Jan 2022 09:59:49 +0100
Subject: [PATCH 275/316] Fix ticket module : security check would prevent
 automatic fill of thirdparty fields when creating a ticket from thirdparty
 card.

---
 htdocs/ticket/agenda.php    | 1 -
 htdocs/ticket/card.php      | 1 -
 htdocs/ticket/contact.php   | 1 -
 htdocs/ticket/messaging.php | 1 -
 4 files changed, 4 deletions(-)

diff --git a/htdocs/ticket/agenda.php b/htdocs/ticket/agenda.php
index 66cbe8e7290..9a4af31014a 100644
--- a/htdocs/ticket/agenda.php
+++ b/htdocs/ticket/agenda.php
@@ -80,7 +80,6 @@ if (!$action) {
 
 // Security check
 $id = GETPOST("id", 'int');
-$socid = 0;
 if ($user->socid > 0) $socid = $user->socid;
 $result = restrictedArea($user, 'ticket', $id, '');
 
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index 0af211d8a5c..690bcb5cad2 100755
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -115,7 +115,6 @@ if ($id || $track_id || $ref) {
 $url_page_current = DOL_URL_ROOT.'/ticket/card.php';
 
 // Security check - Protection if external user
-$socid = 0;
 if ($user->socid > 0) $socid = $user->socid;
 $result = restrictedArea($user, 'ticket', $object->id);
 
diff --git a/htdocs/ticket/contact.php b/htdocs/ticket/contact.php
index d31469f13f2..093aaf5de1e 100644
--- a/htdocs/ticket/contact.php
+++ b/htdocs/ticket/contact.php
@@ -61,7 +61,6 @@ $permissiontoadd = $user->rights->ticket->write;
 
 // Security check
 $id = GETPOST("id", 'int');
-$socid = 0;
 if ($user->socid > 0) $socid = $user->socid;
 $result = restrictedArea($user, 'ticket', $object->id, '');
 
diff --git a/htdocs/ticket/messaging.php b/htdocs/ticket/messaging.php
index 61291836cdb..292fff329ad 100644
--- a/htdocs/ticket/messaging.php
+++ b/htdocs/ticket/messaging.php
@@ -80,7 +80,6 @@ $permissiontoadd = $user->rights->ticket->write;
 
 // Security check
 $id = GETPOST("id", 'int');
-$socid = 0;
 if ($user->socid > 0) $socid = $user->socid;
 $result = restrictedArea($user, 'ticket', $object->id, '');
 

From 54e5b5d369f88f8ef505dee41e0e05cd3647e1b3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 Jan 2022 13:40:22 +0100
Subject: [PATCH 276/316] Fix reponsive

---
 htdocs/core/boxes/box_produits_alerte_stock.php | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/boxes/box_produits_alerte_stock.php b/htdocs/core/boxes/box_produits_alerte_stock.php
index 14862f3cf43..e074cb76198 100644
--- a/htdocs/core/boxes/box_produits_alerte_stock.php
+++ b/htdocs/core/boxes/box_produits_alerte_stock.php
@@ -163,7 +163,7 @@ class box_produits_alerte_stock extends ModeleBoxes
 					);
 
 					$this->info_box_contents[$line][] = array(
-						'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
+						'td' => 'class="tdoverflowmax100 maxwidth150onsmartphone"',
 						'text' => $objp->label,
 					);
 
@@ -186,18 +186,13 @@ class box_produits_alerte_stock extends ModeleBoxes
 						}
 					}
 
-					$this->info_box_contents[$line][] = array(
+					/*$this->info_box_contents[$line][] = array(
 						'td' => 'class="nowraponall right amount"',
-						'text' => $price,
-					);
+						'text' => $price.' '.$price_base_type,
+					);*/
 
 					$this->info_box_contents[$line][] = array(
-						'td' => 'class="right"',
-						'text' => $price_base_type,
-					);
-
-					$this->info_box_contents[$line][] = array(
-						'td' => 'class="center"',
+						'td' => 'class="center nowraponall"',
 						'text' => price2num($objp->total_stock, 'MS').' / '.$objp->seuil_stock_alerte,
 						'text2'=>img_warning($langs->transnoentitiesnoconv("StockLowerThanLimit", $objp->seuil_stock_alerte)),
 					);

From bab35fd97d7492c77ed772cd224775cd50ebc419 Mon Sep 17 00:00:00 2001
From: Thomas Negre <tnegre@open-dsi.fr>
Date: Tue, 25 Jan 2022 09:59:49 +0100
Subject: [PATCH 277/316] Fix ticket module : security check would prevent
 automatic fill of thirdparty fields when creating a ticket from thirdparty
 card.

---
 htdocs/ticket/agenda.php    | 1 -
 htdocs/ticket/card.php      | 1 -
 htdocs/ticket/contact.php   | 1 -
 htdocs/ticket/messaging.php | 1 -
 4 files changed, 4 deletions(-)

diff --git a/htdocs/ticket/agenda.php b/htdocs/ticket/agenda.php
index 66cbe8e7290..9a4af31014a 100644
--- a/htdocs/ticket/agenda.php
+++ b/htdocs/ticket/agenda.php
@@ -80,7 +80,6 @@ if (!$action) {
 
 // Security check
 $id = GETPOST("id", 'int');
-$socid = 0;
 if ($user->socid > 0) $socid = $user->socid;
 $result = restrictedArea($user, 'ticket', $id, '');
 
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index cf665e8a470..7decdeadd7b 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -115,7 +115,6 @@ if ($id || $track_id || $ref) {
 $url_page_current = DOL_URL_ROOT.'/ticket/card.php';
 
 // Security check - Protection if external user
-$socid = 0;
 if ($user->socid > 0) $socid = $user->socid;
 $result = restrictedArea($user, 'ticket', $object->id);
 
diff --git a/htdocs/ticket/contact.php b/htdocs/ticket/contact.php
index d31469f13f2..093aaf5de1e 100644
--- a/htdocs/ticket/contact.php
+++ b/htdocs/ticket/contact.php
@@ -61,7 +61,6 @@ $permissiontoadd = $user->rights->ticket->write;
 
 // Security check
 $id = GETPOST("id", 'int');
-$socid = 0;
 if ($user->socid > 0) $socid = $user->socid;
 $result = restrictedArea($user, 'ticket', $object->id, '');
 
diff --git a/htdocs/ticket/messaging.php b/htdocs/ticket/messaging.php
index 61291836cdb..292fff329ad 100644
--- a/htdocs/ticket/messaging.php
+++ b/htdocs/ticket/messaging.php
@@ -80,7 +80,6 @@ $permissiontoadd = $user->rights->ticket->write;
 
 // Security check
 $id = GETPOST("id", 'int');
-$socid = 0;
 if ($user->socid > 0) $socid = $user->socid;
 $result = restrictedArea($user, 'ticket', $object->id, '');
 

From 37338f9a6025b4f0a2f671f3dbcb6f217bf9e1c6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 Jan 2022 14:03:29 +0100
Subject: [PATCH 278/316] Update card.php

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

diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index d1ef5c1ea08..888d3c77d6c 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -57,7 +57,7 @@ $actioncode = GETPOST('actioncode');
 $fk_user = GETPOST('userid', 'int');
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('propalcard', 'globalcard'));
+$hookmanager->initHooks(array('taxcard', 'globalcard'));
 
 $object = new ChargeSociales($db);
 if ($id > 0) {

From ecc4a7c1ae899ff5a5d2d683fc569430c92deadd Mon Sep 17 00:00:00 2001
From: Markusi13 <Markusi13@users.noreply.github.com>
Date: Tue, 25 Jan 2022 14:55:34 +0100
Subject: [PATCH 279/316] Updated the old issue form to the new yml format

---
 .github/ISSUE_TEMPLATE/bug_report.md  | 35 ------------
 .github/ISSUE_TEMPLATE/bug_report.yml | 81 +++++++++++++++++++++++++++
 2 files changed, 81 insertions(+), 35 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE/bug_report.md
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.yml

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 432f30f2332..00000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,35 +0,0 @@
----
-name: Bug report
-about: Create a report to help us fix something that is broken
-title: ''
-labels: Bug
-assignees: ''
-
----
-
-# Instructions
-*This is a template to help you report good issues. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.*
-*Please:*
-- *replace the bracket enclosed texts with meaningful information*
-- *remove any unused sub-section*
-
-
-# Bug
-[*Short description*]
-
-## Environment
-- **Version**: [*Affected Dolibarr version(s)*]
-- **OS**: [*Server OS type and version*]
-- **Web server**: [*Webserver type and version*]
-- **PHP**: [*PHP version*]
-- **Database**: [*Database type and version*]
-- **URL(s)**: [*Affected URL(s)*]
-
-## Expected and actual behavior
-[*Verbose description*]
-
-## Steps to reproduce the behavior
-[*Verbose description*]
-
-## [Attached files](https://help.github.com/articles/issue-attachments) (Screenshots, screencasts, dolibarr.log, debugging informations…)
-[*Files*]
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 00000000000..23948ad189c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,81 @@
+name: Bug report
+description: Create a report to help us fix something that is broken
+title: ''
+labels: ["Bug"]
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        This is a template to help you report good issues. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.
+        
+  - type: textarea
+    id: bug
+    attributes:
+      label: Bug
+      description: Please give a short description of the bug
+    validations:
+      required: true
+
+  - type: input
+    id: environmentversion
+    attributes:
+      label: Environment Version
+      description: Affected Dolibarr version(s)
+
+  - type: input
+    id: environmentos
+    attributes:
+      label: Environment OS
+      description: Server OS type and version
+      
+  - type: input
+    id: environmentwebserver
+    attributes:
+      label: Environment Web server
+      description: Webserver type and version
+      
+  - type: input
+    id: environmentphp
+    attributes:
+      label: Environment PHP
+      description: PHP version
+      
+  - type: input
+    id: environmentdatabase
+    attributes:
+      label: Environment Database
+      description: Database type and version
+
+  - type: input
+    id: environmenturls
+    attributes:
+      label: Environment URL(s)
+      description: Affected URL(s)
+
+  - type: textarea
+    id: expectedbehaviour
+    attributes:
+      label: Expected and actual behavior
+      description: Verbose description
+
+  - type: textarea
+    id: reproduce
+    attributes:
+      label: Steps to reproduce the behavior
+      description: Verbose description
+      
+  - type: textarea
+    id: files
+    attributes:
+      label: Attached files
+      description: Screenshots, screencasts, dolibarr.log, debugging informations
+      
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: Code of Conduct
+      description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CODE_OF_CONDUCT.md)
+      options:
+        - label: I agree to follow this project's Code of Conduct
+          required: true

From 7efa219e33e4aa6b17c6bcbaee916c688002167b Mon Sep 17 00:00:00 2001
From: Markusi13 <Markusi13@users.noreply.github.com>
Date: Tue, 25 Jan 2022 14:55:52 +0100
Subject: [PATCH 280/316] Update bug_report.yml

---
 .github/ISSUE_TEMPLATE/bug_report.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 23948ad189c..2459458dc90 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,6 +1,6 @@
 name: Bug report
 description: Create a report to help us fix something that is broken
-title: ''
+title:
 labels: ["Bug"]
 
 body:

From 688e74aad877bdcb9966acd4a73083c20db093a0 Mon Sep 17 00:00:00 2001
From: Markusi13 <Markusi13@users.noreply.github.com>
Date: Tue, 25 Jan 2022 14:56:01 +0100
Subject: [PATCH 281/316] Update bug_report.yml

---
 .github/ISSUE_TEMPLATE/bug_report.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 2459458dc90..b215dc62f9c 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,6 +1,5 @@
 name: Bug report
 description: Create a report to help us fix something that is broken
-title:
 labels: ["Bug"]
 
 body:

From b7b88865e6ffe25997b7c74c61499676809f2bca Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 Jan 2022 14:58:00 +0100
Subject: [PATCH 282/316] Update card_presend.tpl.php

---
 htdocs/core/tpl/card_presend.tpl.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index ff107a0dea3..83f96c1bcb1 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -124,27 +124,25 @@ if ($action == 'presend') {
 
 	if ($object->element === 'facture' && !empty($conf->global->INVOICE_EMAIL_SENDER)) {
 		$formmail->frommail = $conf->global->INVOICE_EMAIL_SENDER;
-		(!empty($conf->global->INVOICE_EMAIL_SENDER_NAME) ? $formmail->fromname = $conf->global->INVOICE_EMAIL_SENDER_NAME : $formmail->fromname = '');
+		$formmail->fromname = (!empty($conf->global->INVOICE_EMAIL_SENDER_NAME) ? $conf->global->INVOICE_EMAIL_SENDER_NAME : '');
 		$formmail->fromtype = 'special';
 	}
 	if ($object->element === 'shipping' && !empty($conf->global->SHIPPING_EMAIL_SENDER)) {
 		$formmail->frommail = $conf->global->SHIPPING_EMAIL_SENDER;
-		(!empty($conf->global->SHIPPING_EMAIL_SENDER_NAME) ? $formmail->fromname = $conf->global->SHIPPING_EMAIL_SENDER_NAME : $formmail->fromname = '');
+		$formmail->fromname = (!empty($conf->global->SHIPPING_EMAIL_SENDER_NAME) ? $conf->global->SHIPPING_EMAIL_SENDER_NAME : '');
 		$formmail->fromtype = 'special';
 	}
 	if ($object->element === 'commande' && !empty($conf->global->COMMANDE_EMAIL_SENDER)) {
 		$formmail->frommail = $conf->global->COMMANDE_EMAIL_SENDER;
-		(!empty($conf->global->COMMANDE_EMAIL_SENDER_NAME) ? $formmail->fromname = $conf->global->COMMANDE_EMAIL_SENDER_NAME : $formmail->fromname = '');
+		$formmail->fromname = (!empty($conf->global->COMMANDE_EMAIL_SENDER_NAME) ? $conf->global->COMMANDE_EMAIL_SENDER_NAME : '');
 		$formmail->fromtype = 'special';
 	}
 	if ($object->element === 'order_supplier' && !empty($conf->global->ORDER_SUPPLIER_EMAIL_SENDER)) {
 		$formmail->frommail = $conf->global->ORDER_SUPPLIER_EMAIL_SENDER;
-		(!empty($conf->global->ORDER_SUPPLIER_EMAIL_SENDER_NAME) ? $formmail->fromname = $conf->global->ORDER_SUPPLIER_EMAIL_SENDER_NAME : $formmail->fromname = '');
+		$formmail->fromname = (!empty($conf->global->ORDER_SUPPLIER_EMAIL_SENDER_NAME) ? $conf->global->ORDER_SUPPLIER_EMAIL_SENDER_NAME : '');
 		$formmail->fromtype = 'special';
 	}
 
-
-
 	$formmail->trackid = $trackid;
 	$formmail->withfrom = 1;
 

From ea6dfb172c4f94c8afe9ed6c74d82e34f7682e5e Mon Sep 17 00:00:00 2001
From: Markusi13 <Markusi13@users.noreply.github.com>
Date: Tue, 25 Jan 2022 15:01:29 +0100
Subject: [PATCH 283/316] Update the feature request template to the new yml
 format

---
 .github/ISSUE_TEMPLATE/feature_request.md  | 27 -------------
 .github/ISSUE_TEMPLATE/feature_request.yml | 44 ++++++++++++++++++++++
 2 files changed, 44 insertions(+), 27 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE/feature_request.md
 create mode 100644 .github/ISSUE_TEMPLATE/feature_request.yml

diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 32e2deff2c1..00000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,27 +0,0 @@
----
-name: Feature request
-about: Suggest a new idea for this project
-title: ''
-labels: Feature request
-assignees: ''
-
----
-
-# Instructions
-*This is a template to help you report good issues. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.*
-*Please:*
-- *replace the bracket enclosed texts with meaningful information*
-- *remove any unused sub-section*
-
-
-# Feature Request
-[*Short description*]
-
-## Use case
-[*Verbose description*]
-
-## Suggested implementation
-[*Verbose description*]
-
-## Suggested steps
-[*List of tasks to achieve goal*]
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 00000000000..f4975622a8f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,44 @@
+name: Feature request
+description: Suggest a new idea for this project
+labels: ["Feature request"]
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        This is a template to help you report good issues. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.
+
+  - type: textarea
+    id: feature-request
+    attributes:
+      label: Feature Request
+      description: Short description
+    validations:
+      required: true
+
+  - type: textarea
+    id: use-case
+    attributes:
+      label: Use case
+      description: Verbose description
+      
+  - type: textarea
+    id: suggested-implementation
+    attributes:
+      label: Suggested implementation
+      description: Verbose description
+
+  - type: textarea
+    id: suggested-steps
+    attributes:
+      label: Suggested steps
+      description: List of tasks to achieve goal
+      
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: Code of Conduct
+      description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CODE_OF_CONDUCT.md)
+      options:
+        - label: I agree to follow this project's Code of Conduct
+          required: true

From 4ab28b10ea0f4556cb4413fa674523433516e0f3 Mon Sep 17 00:00:00 2001
From: Markusi13 <Markusi13@users.noreply.github.com>
Date: Tue, 25 Jan 2022 15:02:11 +0100
Subject: [PATCH 284/316] Update bug_report.yml

---
 .github/ISSUE_TEMPLATE/bug_report.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index b215dc62f9c..7e7a62c1e84 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -17,43 +17,43 @@ body:
       required: true
 
   - type: input
-    id: environmentversion
+    id: environment-version
     attributes:
       label: Environment Version
       description: Affected Dolibarr version(s)
 
   - type: input
-    id: environmentos
+    id: environment-os
     attributes:
       label: Environment OS
       description: Server OS type and version
       
   - type: input
-    id: environmentwebserver
+    id: environment-webserver
     attributes:
       label: Environment Web server
       description: Webserver type and version
       
   - type: input
-    id: environmentphp
+    id: environment-php
     attributes:
       label: Environment PHP
       description: PHP version
       
   - type: input
-    id: environmentdatabase
+    id: environment-database
     attributes:
       label: Environment Database
       description: Database type and version
 
   - type: input
-    id: environmenturls
+    id: environment-urls
     attributes:
       label: Environment URL(s)
       description: Affected URL(s)
 
   - type: textarea
-    id: expectedbehaviour
+    id: expected-behaviour
     attributes:
       label: Expected and actual behavior
       description: Verbose description

From 0126be54a330c0cf1830146404fa69289968889b Mon Sep 17 00:00:00 2001
From: Thomas Negre <tnegre@open-dsi.fr>
Date: Tue, 25 Jan 2022 15:12:32 +0100
Subject: [PATCH 285/316] fix ticket : an external user should be able to
 access only its own company tickets.

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

diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index e4ba75b84c5..44b9edf358e 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -157,6 +157,8 @@ $arrayfields = dol_sort_array($arrayfields, 'position');
 if (!$user->rights->ticket->read) {
 	accessforbidden();
 }
+// restrict view to current user's company
+if ($user->socid > 0) $socid = $user->socid;
 
 // Store current page url
 $url_page_current = DOL_URL_ROOT.'/ticket/list.php';

From 6677eccf45e01f334f84fc51449d4e96fb97ce05 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 Jan 2022 16:01:50 +0100
Subject: [PATCH 286/316] Update user.class.php

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

diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 6d4530d6077..a9dcbfe3b87 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1393,7 +1393,7 @@ class User extends CommonObject
 
 		dol_syslog(get_class($this)."::create login=".$this->login.", user=".(is_object($user) ? $user->id : ''), LOG_DEBUG);
 
-		$badCharUnauthorizedIntoLoginName = getDolGlobalString('MAIN_LOGIN_BADCHARUNAUTHORIZED', '/[,@<>"\']/');
+		$badCharUnauthorizedIntoLoginName = getDolGlobalString('MAIN_LOGIN_BADCHARUNAUTHORIZED', ',@<>"\'');
 
 		// Check parameters
 		if (!empty($conf->global->USER_MAIL_REQUIRED) && !isValidEMail($this->email)) {
@@ -1405,7 +1405,7 @@ class User extends CommonObject
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Login"));
 			return -1;
-		} elseif (preg_match($badCharUnauthorizedIntoLoginName, $this->login)) {
+		} elseif (preg_match('/['.preg_quote($badCharUnauthorizedIntoLoginName, '/').']/', $this->login)) {
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorBadCharIntoLoginName");
 			return -1;

From 05ff99f2e61bd44af1646020a6a85299304d97f7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 25 Jan 2022 16:03:30 +0100
Subject: [PATCH 287/316] Update user.class.php

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

diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index a9dcbfe3b87..cd38b9f2d66 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1789,7 +1789,7 @@ class User extends CommonObject
 		$this->fk_warehouse = (int) $this->fk_warehouse;
 
 		// Check parameters
-		$badCharUnauthorizedIntoLoginName = getDolGlobalString('MAIN_LOGIN_BADCHARUNAUTHORIZED', '/[,@<>"\']/');
+		$badCharUnauthorizedIntoLoginName = getDolGlobalString('MAIN_LOGIN_BADCHARUNAUTHORIZED', ',@<>"\'');
 
 		if (!empty($conf->global->USER_MAIL_REQUIRED) && !isValidEMail($this->email)) {
 			$langs->load("errors");
@@ -1800,7 +1800,7 @@ class User extends CommonObject
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorFieldRequired", 'Login');
 			return -1;
-		} elseif (preg_match($badCharUnauthorizedIntoLoginName, $this->login)) {
+		} elseif (preg_match('/['.preg_quote($badCharUnauthorizedIntoLoginName, '/').']/', $this->login)) {
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorBadCharIntoLoginName");
 			return -1;

From 311d6d666dad46de5cd9ad35304b1497ad19bfb3 Mon Sep 17 00:00:00 2001
From: Thomas Negre <tnegre@open-dsi.fr>
Date: Tue, 25 Jan 2022 15:12:32 +0100
Subject: [PATCH 288/316] fix ticket : an external user should be able to
 access only its own company tickets.

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

diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index e4ba75b84c5..44b9edf358e 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -157,6 +157,8 @@ $arrayfields = dol_sort_array($arrayfields, 'position');
 if (!$user->rights->ticket->read) {
 	accessforbidden();
 }
+// restrict view to current user's company
+if ($user->socid > 0) $socid = $user->socid;
 
 // Store current page url
 $url_page_current = DOL_URL_ROOT.'/ticket/list.php';

From a7d3facf889e4431f7d6999b1cd3ba4185d00590 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 24 Jan 2022 23:58:31 +0100
Subject: [PATCH 289/316] Fix tooltip for payment

---
 .../class/paymentexpensereport.class.php              | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/htdocs/expensereport/class/paymentexpensereport.class.php b/htdocs/expensereport/class/paymentexpensereport.class.php
index 48adeab929d..3aac0cee2b8 100644
--- a/htdocs/expensereport/class/paymentexpensereport.class.php
+++ b/htdocs/expensereport/class/paymentexpensereport.class.php
@@ -635,7 +635,16 @@ class PaymentExpenseReport extends CommonObject
 		if (empty($this->ref)) {
 			$this->ref = $this->label;
 		}
-		$label = $langs->trans("ShowPayment").': '.$this->ref;
+		$label = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Payment").'</u>';
+		if (isset($this->status)) {
+			$label .= ' '.$this->getLibStatut(5);
+		}
+		if (!empty($this->ref)) {
+			$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		}
+		if (!empty($this->datep)) {
+			$label .= '<br><b>'.$langs->trans('Date').':</b> '.dol_print_date($this->datep, 'dayhour');
+		}
 
 		if (!empty($this->id)) {
 			$link = '<a href="'.DOL_URL_ROOT.'/expensereport/payment/card.php?id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';

From 4de5ee97b35dd4a18297b9bff18a692d9c3e7ef7 Mon Sep 17 00:00:00 2001
From: Quentin VIAL-GOUTEYRON <quentin.vial-gouteyron@atm-consulting.fr>
Date: Tue, 25 Jan 2022 16:37:33 +0100
Subject: [PATCH 290/316] NEW : split consumption line on MO

---
 htdocs/mrp/js/lib_dispatch.js.php | 36 ++++++++++++++++++-------------
 htdocs/mrp/mo_production.php      |  2 +-
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/htdocs/mrp/js/lib_dispatch.js.php b/htdocs/mrp/js/lib_dispatch.js.php
index aa29b38c5fb..d8285ac75c1 100644
--- a/htdocs/mrp/js/lib_dispatch.js.php
+++ b/htdocs/mrp/js/lib_dispatch.js.php
@@ -70,8 +70,14 @@ function addDispatchLine(index, type, mode)
 	mode = mode || 'qtymissing'
 
 	console.log("fourn/js/lib_dispatch.js.php Split line type="+type+" index="+index+" mode="+mode);
-    if(mode == 'qtymissingconsume') var inputId = 'qtytoconsume';
-    else var inputId = 'qtytoproduce';
+    if(mode == 'qtymissingconsume') {
+        var inputId = 'qtytoconsume';
+        var warehouseId = 'idwarehouse';
+    }
+    else {
+        var inputId = 'qtytoproduce';
+        var warehouseId = 'idwarehousetoproduce';
+    }
 	var nbrTrs = $("tr[name^='"+type+"_"+index+"']").length; 				// position of line for batch
 	var $row = $("tr[name='"+type+'_'+index+"_1']").clone(true); 				// clone last batch line to jQuery object
 	var	qtyOrdered = parseFloat($("#qty_ordered_"+index).val()); 	// Qty ordered is same for all rows
@@ -105,11 +111,11 @@ function addDispatchLine(index, type, mode)
 		$row.html($row.html().replace(re1, '_'+index+'_'+(nbrTrs+1)));
 		$row.html($row.html().replace(re2, '-'+index+'-'+(nbrTrs+1)));
 		//create new select2 to avoid duplicate id of cloned one
-		$row.find("select[name='"+'idwarehousetoproduce-'+index+'-'+(nbrTrs+1)+"']").select2();
+		$row.find("select[name='"+warehouseId+'-'+index+'-'+(nbrTrs+1)+"']").select2();
 		// TODO find solution to copy selected option to new select
 		// TODO find solution to keep new tr's after page refresh
 		//clear value
-		$row.find("input[name^='qtytoproduce']").val('');
+		$row.find("input[id^='"+inputId+"']").val('');
 		//change name of new row
 		$row.attr('name',type+'_'+index+'_'+(nbrTrs+1));
 		//insert new row before last row
@@ -120,20 +126,20 @@ function addDispatchLine(index, type, mode)
 		$(".csswarehouse_"+index+"_"+(nbrTrs+1)+":first-child").parent("span.selection").parent(".select2").detach();
 
 		/*  Suffix of lines are:  index _ trs.length */
-		$("#qtytoproduce-"+index+"-"+(nbrTrs+1)).focus();
-		if ($("#qtytoproduce-"+index+"-"+(nbrTrs)).val() == 0) {
-			$("#qtytoproduce-"+index+"-"+(nbrTrs)).val(1);
+		$("#"+inputId+"-"+index+"-"+(nbrTrs+1)).focus();
+		if ($("#"+inputId+"-"+index+"-"+(nbrTrs)).val() == 0) {
+			$("#"+inputId+"-"+index+"-"+(nbrTrs)).val(1);
 		}
 		var totalonallines = 0;
 		for (let i = 1; i <= nbrTrs; i++) {
-			console.log(i+" = "+parseFloat($("#qtytoproduce-"+index+"-"+i).val()));
-			totalonallines = totalonallines + parseFloat($("#qtytoproduce-"+index+"-"+i).val());
+			console.log(i+" = "+parseFloat($("#"+inputId+"-"+index+"-"+i).val()));
+			totalonallines = totalonallines + parseFloat($("#"+inputId+"-"+index+"-"+i).val());
 		}
 		console.log("totalonallines="+totalonallines);
 		if (totalonallines == qtyOrdered && qtyOrdered > 1) {
-			var prevouslineqty = $("#qtytoproduce-"+index+"-"+nbrTrs).val();
-			$("#qtytoproduce-"+index+"-"+(nbrTrs)).val(1);
-			$("#qtytoproduce-"+index+"-"+(nbrTrs+1)).val(prevouslineqty - 1);
+			var prevouslineqty = $("#"+inputId+"-"+index+"-"+nbrTrs).val();
+			$("#"+inputId+"-"+index+"-"+(nbrTrs)).val(1);
+			$("#"+inputId+"-"+index+"-"+(nbrTrs+1)).val(prevouslineqty - 1);
 		}
 		$("#qty_dispatched_"+index).val(qtyDispatched);
 
@@ -147,9 +153,9 @@ function addDispatchLine(index, type, mode)
 			$("#qty_"+(nbrTrs-1)+"_"+index).val(qty);
 		}
 		// Store arbitrary data for dispatch qty input field change event
-		$("#qtytoproduce-"+index+(nbrTrs)).data('qty', qty);
-		$("#qtytoproduce-"+index+(nbrTrs)).data('type', type);
-		$("#qtytoproduce-"+index+(nbrTrs)).data('index', index);
+		$("#"+inputId+"-"+index+(nbrTrs)).data('qty', qty);
+		$("#"+inputId+"-"+index+(nbrTrs)).data('type', type);
+		$("#"+inputId+"-"+index+(nbrTrs)).data('index', index);
 	}
 }
 
diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index f83b32f1c99..6a5c41b77c5 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -1010,7 +1010,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 						if ($tmpproduct->type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
 							if (empty($line->disable_stock_change)) {
 								$preselected = (GETPOSTISSET('idwarehouse-'.$line->id.'-'.$i) ? GETPOST('idwarehouse-'.$line->id.'-'.$i) : ($tmpproduct->fk_default_warehouse > 0 ? $tmpproduct->fk_default_warehouse : 'ifone'));
-								print $formproduct->selectWarehouses($preselected, 'idwarehouse-'.$line->id.'-'.$i, '', 1, 0, $line->fk_product, '', 1, 0, null, 'maxwidth200');
+								print $formproduct->selectWarehouses($preselected, 'idwarehouse-'.$line->id.'-'.$i, '', 1, 0, $line->fk_product, '', 1, 0, null, 'maxwidth200 csswarehouse_'.$line->id.'_'.$i);
 							} else {
 								print '<span class="opacitymedium">'.$langs->trans("DisableStockChange").'</span>';
 							}

From 4f54149555b0bed3c66382ca76d7885e1820a593 Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Tue, 25 Jan 2022 22:28:47 +0100
Subject: [PATCH 291/316] Update commonobject.class.php

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 2d5ae6ca78b..dbf8f3869e0 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -2293,6 +2293,15 @@ abstract class CommonObject
 				if (get_class($this) == 'Fournisseur') {
 					$this->mode_reglement_supplier_id = $id;
 				}
+				// Triggers
+				if (!$error && !$notrigger) {
+					// Call triggers
+					$result = $this->call_trigger(strtoupper(get_class($this)).'_MODIFY', $user);
+					if ($result < 0) {
+						$error++;
+					}
+					// End call triggers
+				}
 				return 1;
 			} else {
 				dol_syslog(get_class($this).'::setPaymentMethods Error '.$this->db->error());

From 30fd55addc270e58b5e3184db0b8dd967f1ceee0 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Wed, 26 Jan 2022 07:29:37 +0100
Subject: [PATCH 292/316] NEW API Proposals - Add POST lines

---
 .../comm/propal/class/api_proposals.class.php | 90 ++++++++++++++++++-
 1 file changed, 86 insertions(+), 4 deletions(-)

diff --git a/htdocs/comm/propal/class/api_proposals.class.php b/htdocs/comm/propal/class/api_proposals.class.php
index 41ed388e044..6d4f9446021 100644
--- a/htdocs/comm/propal/class/api_proposals.class.php
+++ b/htdocs/comm/propal/class/api_proposals.class.php
@@ -1,7 +1,9 @@
 <?php
-/* Copyright (C) 2015   Jean-François Ferry     <jfefe@aternatik.fr>
- * Copyright (C) 2016   Laurent Destailleur     <eldy@users.sourceforge.net>
- * Copyright (C) 2020   Thibault FOUCART   		<support@ptibogxiv.net>
+/* Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
+ * Copyright (C) 2016       Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2020       Thibault FOUCART   		<support@ptibogxiv.net>
+ * Copyright (C) 2022       ATM Consulting   		<contact@atm-consulting.fr>
+ * Copyright (C) 2022       OpenDSI   				<support@open-dsi.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -308,7 +310,7 @@ class Proposals extends DolibarrApi
 	 * @param int   $id             Id of commercial proposal to update
 	 * @param array $request_data   Commercial proposal line data
 	 *
-	 * @url	POST {id}/lines
+	 * @url	POST {id}/line
 	 *
 	 * @return int
 	 */
@@ -368,6 +370,86 @@ class Proposals extends DolibarrApi
 		}
 	}
 
+	/**
+	 * Add lines to given commercial proposal
+	 *
+	 * @param int   $id             Id of commercial proposal to update
+	 * @param array $request_data   Commercial proposal line data
+	 *
+	 * @url	POST {id}/lines
+	 *
+	 * @return int
+	 */
+	public function postLines($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->propal->creer) {
+			throw new RestException(401);
+		}
+
+		$result = $this->propal->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Commercial Proposal not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		$errors = [];
+		$this->db->begin();
+
+		foreach ($request_data as $TData)
+		{
+			if(empty($TData[0])) $TData = array($TData);
+
+			foreach ($TData as $lineData) {
+
+				$line = (object)$lineData;
+
+				$updateRes = $this->propal->addline(
+					$line->desc,
+					$line->subprice,
+					$line->qty,
+					$line->tva_tx,
+					$line->localtax1_tx,
+					$line->localtax2_tx,
+					$line->fk_product,
+					$line->remise_percent,
+					'HT',
+					0,
+					$line->info_bits,
+					$line->product_type,
+					$line->rang,
+					$line->special_code,
+					$line->fk_parent_line,
+					$line->fk_fournprice,
+					$line->pa_ht,
+					$line->label,
+					$line->date_start,
+					$line->date_end,
+					$line->array_options,
+					$line->fk_unit,
+					$line->origin,
+					$line->origin_id,
+					$line->multicurrency_subprice,
+					$line->fk_remise_except
+				);
+
+				if ($updateRes < 0) {
+					$errors['lineLabel'] = $line->label;
+					$errors['msg'] = $this->propal->errors;
+				}
+			}
+		}
+		if (empty($errors)) {
+			$this->db->commit();
+			return count($request_data);
+		} else {
+			$this->db->rollback();
+			throw new RestException(400, implode(", ", $errors));
+		}
+	}
+
 	/**
 	 * Update a line of given commercial proposal
 	 *

From 68ba60896f293d213a8bcab43e6fe61eecb79d86 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Wed, 26 Jan 2022 07:31:17 +0100
Subject: [PATCH 293/316] Copyright

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

diff --git a/htdocs/comm/propal/class/api_proposals.class.php b/htdocs/comm/propal/class/api_proposals.class.php
index 6d4f9446021..778bdd3ba2f 100644
--- a/htdocs/comm/propal/class/api_proposals.class.php
+++ b/htdocs/comm/propal/class/api_proposals.class.php
@@ -1,9 +1,9 @@
 <?php
 /* Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
  * Copyright (C) 2016       Laurent Destailleur     <eldy@users.sourceforge.net>
- * Copyright (C) 2020       Thibault FOUCART   		<support@ptibogxiv.net>
- * Copyright (C) 2022       ATM Consulting   		<contact@atm-consulting.fr>
- * Copyright (C) 2022       OpenDSI   				<support@open-dsi.fr>
+ * Copyright (C) 2020       Thibault FOUCART        <support@ptibogxiv.net>
+ * Copyright (C) 2022       ATM Consulting          <contact@atm-consulting.fr>
+ * Copyright (C) 2022       OpenDSI                 <support@open-dsi.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

From 71876755d2c7c4092b06ab0897d47e1839cd229f Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 26 Jan 2022 06:35:26 +0000
Subject: [PATCH 294/316] Fixing style errors.

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

diff --git a/htdocs/comm/propal/class/api_proposals.class.php b/htdocs/comm/propal/class/api_proposals.class.php
index 778bdd3ba2f..19e1451b300 100644
--- a/htdocs/comm/propal/class/api_proposals.class.php
+++ b/htdocs/comm/propal/class/api_proposals.class.php
@@ -398,13 +398,11 @@ class Proposals extends DolibarrApi
 		$errors = [];
 		$this->db->begin();
 
-		foreach ($request_data as $TData)
-		{
-			if(empty($TData[0])) $TData = array($TData);
+		foreach ($request_data as $TData) {
+			if (empty($TData[0])) $TData = array($TData);
 
 			foreach ($TData as $lineData) {
-
-				$line = (object)$lineData;
+				$line = (object) $lineData;
 
 				$updateRes = $this->propal->addline(
 					$line->desc,

From 31787a99f0c76e8f89022e12a717bdc4298f4dd3 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Wed, 26 Jan 2022 08:50:57 +0100
Subject: [PATCH 295/316] NEW Proposal - Add filter on proposal get lines

---
 .../comm/propal/class/api_proposals.class.php | 18 +++++--
 htdocs/comm/propal/class/propal.class.php     | 51 +++++++++++--------
 2 files changed, 44 insertions(+), 25 deletions(-)

diff --git a/htdocs/comm/propal/class/api_proposals.class.php b/htdocs/comm/propal/class/api_proposals.class.php
index 41ed388e044..7d71dc4f244 100644
--- a/htdocs/comm/propal/class/api_proposals.class.php
+++ b/htdocs/comm/propal/class/api_proposals.class.php
@@ -274,14 +274,17 @@ class Proposals extends DolibarrApi
 	/**
 	 * Get lines of a commercial proposal
 	 *
-	 * @param int   $id             Id of commercial proposal
+	 * @param int		$id				Id of commercial proposal
+	 * @param string    $sqlfilters 	Other criteria to filter answers separated by a comma. d is the alias for proposal lines table, p is the alias for product table. "Syntax example "(p.ref:like:'SO-%') and (d.date_start:<:'20220101')"
 	 *
 	 * @url	GET {id}/lines
 	 *
 	 * @return int
 	 */
-	public function getLines($id)
+	public function getLines($id, $sqlfilters = '')
 	{
+		$filters = "";
+
 		if (!DolibarrApiAccess::$user->rights->propal->lire) {
 			throw new RestException(401);
 		}
@@ -294,7 +297,16 @@ class Proposals extends DolibarrApi
 		if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
-		$this->propal->getLinesArray();
+
+		if (!empty($sqlfilters)) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$filters = " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+		$this->propal->getLinesArray($filters);
 		$result = array();
 		foreach ($this->propal->lines as $line) {
 			array_push($result, $this->_cleanObjectDatas($line));
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index fd3bbfe7171..1c532e26147 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -1,20 +1,22 @@
 <?php
-/* Copyright (C) 2002-2004 Rodolphe Quiedeville		<rodolphe@quiedeville.org>
- * Copyright (C) 2004      Eric Seigne				<eric.seigne@ryxeo.com>
- * Copyright (C) 2004-2011 Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2005      Marc Barilley			<marc@ocebo.com>
- * Copyright (C) 2005-2013 Regis Houssin			<regis.houssin@inodbox.com>
- * Copyright (C) 2006      Andre Cianfarani			<acianfa@free.fr>
- * Copyright (C) 2008      Raphael Bertrand			<raphael.bertrand@resultic.fr>
- * Copyright (C) 2010-2020 Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2010-2017 Philippe Grand			<philippe.grand@atoo-net.com>
- * Copyright (C) 2012-2014 Christophe Battarel  	<christophe.battarel@altairis.fr>
- * Copyright (C) 2012      Cedric Salvador          <csalvador@gpcsolutions.fr>
- * Copyright (C) 2013      Florian Henry		  	<florian.henry@open-concept.pro>
- * Copyright (C) 2014-2015 Marcos García            <marcosgdf@gmail.com>
- * Copyright (C) 2018      Nicolas ZABOURI			<info@inovea-conseil.com>
- * Copyright (C) 2018-2021 Frédéric France          <frederic.france@netlogic.fr>
- * Copyright (C) 2018      Ferran Marcet         	<fmarcet@2byte.es>
+/* Copyright (C) 2002-2004  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+ * Copyright (C) 2004       Eric Seigne             <eric.seigne@ryxeo.com>
+ * Copyright (C) 2004-2011  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2005       Marc Barilley           <marc@ocebo.com>
+ * Copyright (C) 2005-2013  Regis Houssin           <regis.houssin@inodbox.com>
+ * Copyright (C) 2006       Andre Cianfarani        <acianfa@free.fr>
+ * Copyright (C) 2008       Raphael Bertrand        <raphael.bertrand@resultic.fr>
+ * Copyright (C) 2010-2020  Juanjo Menent           <jmenent@2byte.es>
+ * Copyright (C) 2010-2017  Philippe Grand          <philippe.grand@atoo-net.com>
+ * Copyright (C) 2012-2014  Christophe Battarel     <christophe.battarel@altairis.fr>
+ * Copyright (C) 2012       Cedric Salvador         <csalvador@gpcsolutions.fr>
+ * Copyright (C) 2013       Florian Henry           <florian.henry@open-concept.pro>
+ * Copyright (C) 2014-2015  Marcos García           <marcosgdf@gmail.com>
+ * Copyright (C) 2018       Nicolas ZABOURI         <info@inovea-conseil.com>
+ * Copyright (C) 2018-2021  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018       Ferran Marcet           <fmarcet@2byte.es>
+ * Copyright (C) 2022       ATM Consulting          <contact@atm-consulting.fr>
+ * Copyright (C) 2022       OpenDSI                 <support@open-dsi.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1714,12 +1716,13 @@ class Propal extends CommonObject
 	/**
 	 * Load array lines
 	 *
-	 *	@param		int		$only_product	Return only physical products
-	 *	@param		int		$loadalsotranslation	Return translation for products
+	 *	@param		int			$only_product			Return only physical products
+	 *	@param		int			$loadalsotranslation	Return translation for products
+	 *	@param		string		$filters				Filter on other fields
 	 *
-	 * @return		int						<0 if KO, >0 if OK
+	 *	@return		int									<0 if KO, >0 if OK
 	 */
-	public function fetch_lines($only_product = 0, $loadalsotranslation = 0)
+	public function fetch_lines($only_product = 0, $loadalsotranslation = 0, $filters = '')
 	{
 		global $langs, $conf;
 		// phpcs:enable
@@ -1738,6 +1741,9 @@ class Propal extends CommonObject
 		if ($only_product) {
 			$sql .= ' AND p.fk_product_type = 0';
 		}
+		if ($filters) {
+			$sql .= $filters;
+		}
 		$sql .= ' ORDER by d.rang';
 
 		dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
@@ -3689,12 +3695,13 @@ class Propal extends CommonObject
 
 	/**
 	 * 	Retrieve an array of proposal lines
+	 *	@param  string              $filters        Filter on other fields
 	 *
 	 * 	@return int		>0 if OK, <0 if KO
 	 */
-	public function getLinesArray()
+	public function getLinesArray($filters = '')
 	{
-		return $this->fetch_lines();
+		return $this->fetch_lines(0, 0, $filters);
 	}
 
 	/**

From ec723657c93da5d9f3160ebeba25fd0a44350828 Mon Sep 17 00:00:00 2001
From: Thomas Negre <tnegre@open-dsi.fr>
Date: Wed, 26 Jan 2022 09:55:41 +0100
Subject: [PATCH 296/316] new : allow informations to be displayed before the
 public ticket list

---
 htdocs/public/ticket/list.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/htdocs/public/ticket/list.php b/htdocs/public/ticket/list.php
index 8a353eea881..1a3c0c3babd 100644
--- a/htdocs/public/ticket/list.php
+++ b/htdocs/public/ticket/list.php
@@ -77,6 +77,9 @@ if (isset($_SESSION['email_customer'])) {
 
 $object = new Ticket($db);
 
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('ticketpubliclist', 'globalcard'));
+
 if (empty($conf->ticket->enabled)) {
 	accessforbidden('', 0, 0, 1);
 }
@@ -407,6 +410,11 @@ if ($action == "view_ticketlist") {
 				$varpage = empty($contextpage) ? $url_page_current : $contextpage;
 				$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 
+				// allow to display information before list
+				$parameters=array('arrayfields'=>$arrayfields);
+				$reshook=$hookmanager->executeHooks('printFieldListHeader', $parameters, $object, $action);    // Note that $action and $object may have been modified by hook
+				print $hookmanager->resPrint;
+
 				print '<table class="liste '.($moreforfilter ? "listwithfilterbefore" : "").'">';
 
 				// Filter bar

From 95df5bebe6d8e938849a72bd931b1ca407073d5b Mon Sep 17 00:00:00 2001
From: pandreani <pandreani@open-dsi.fr>
Date: Wed, 26 Jan 2022 10:18:44 +0100
Subject: [PATCH 297/316] NEW stock limit in stock export CSV

---
 htdocs/core/modules/modStock.class.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php
index 00e5a7859c0..b0de609a874 100644
--- a/htdocs/core/modules/modStock.class.php
+++ b/htdocs/core/modules/modStock.class.php
@@ -235,19 +235,22 @@ class modStock extends DolibarrModules
 			'p.rowid'=>"ProductId", 'p.ref'=>"Ref", 'p.fk_product_type'=>"Type", 'p.label'=>"Label", 'p.description'=>"Description", 'p.note'=>"Note",
 			'p.price'=>"Price", 'p.tva_tx'=>'VAT', 'p.tosell'=>"OnSell", 'p.tobuy'=>'OnBuy', 'p.duration'=>"Duration",
 			'p.datec'=>'DateCreation', 'p.tms'=>'DateModification', 'p.pmp'=>'PMPValue', 'p.cost_price'=>'CostPrice',
+			'p.seuil_stock_alerte'=>'StockLimit',
 		);
 		$this->export_TypeFields_array[$r] = array(
 			'e.rowid'=>'List:entrepot:ref::stock', 'e.ref'=>'Text', 'e.lieu'=>'Text', 'e.address'=>'Text', 'e.zip'=>'Text', 'e.town'=>'Text',
 			'p.rowid'=>"List:product:label::product", 'p.ref'=>"Text", 'p.fk_product_type'=>"Text", 'p.label'=>"Text", 'p.description'=>"Text", 'p.note'=>"Text",
 			'p.price'=>"Numeric", 'p.tva_tx'=>'Numeric', 'p.tosell'=>"Boolean", 'p.tobuy'=>"Boolean", 'p.duration'=>"Duree",
 			'p.datec'=>'Date', 'p.tms'=>'Date', 'p.pmp'=>'Numeric', 'p.cost_price'=>'Numeric',
-			'ps.reel'=>'Numeric'
+			'ps.reel'=>'Numeric',
+			'p.seuil_stock_alerte'=>'Numeric',
 		);
 		$this->export_entities_array[$r] = array(
 			'p.rowid'=>"product", 'p.ref'=>"product", 'p.fk_product_type'=>"product", 'p.label'=>"product", 'p.description'=>"product", 'p.note'=>"product",
 			'p.price'=>"product", 'p.tva_tx'=>'product', 'p.tosell'=>"product", 'p.tobuy'=>"product", 'p.duration'=>"product",
 			'p.datec'=>'product', 'p.tms'=>'product', 'p.pmp'=>'product', 'p.cost_price'=>'product',
-			'ps.reel'=>'stock'
+			'ps.reel'=>'stock',
+			'p.seuil_stock_alerte'=>'product',
 		);	// We define here only fields that use another icon that the one defined into export_icon
 		$this->export_aggregate_array[$r] = array('ps.reel'=>'SUM'); // TODO Not used yet
 		$this->export_dependencies_array[$r] = array('stock'=>array('p.rowid', 'e.rowid')); // We must keep this until the aggregate_array is used. To have a unique key, if we ask a field of a child, to avoid the DISTINCT to discard them.

From 3e1cfc2997208b5874b0761f37aad7ea0180e8f9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 26 Jan 2022 11:29:27 +0100
Subject: [PATCH 298/316] NEW Add status "Obsolete" to KM articles

---
 htdocs/bom/bom_card.php                       |  5 --
 .../class/knowledgerecord.class.php           |  6 +-
 .../knowledgerecord_card.php                  | 57 +++++++++++++++++--
 htdocs/langs/en_US/knowledgemanagement.lang   |  6 +-
 .../modulebuilder/template/myobject_card.php  | 12 +++-
 5 files changed, 72 insertions(+), 14 deletions(-)

diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index 748aea4ddb2..7d83a88ce55 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -354,8 +354,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$formquestion = array();
 		if (!empty($conf->bom->enabled)) {
 			$langs->load("mrp");
-			require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
-			$formproduct = new FormProduct($db);
 			$forcecombo = 0;
 			if ($conf->browser->name == 'ie') {
 				$forcecombo = 1; // There is a bug in IE10 that make combo inside popup crazy
@@ -384,8 +382,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$formquestion = array();
 		if (!empty($conf->bom->enabled)) {
 			$langs->load("mrp");
-			require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
-			$formproduct = new FormProduct($db);
 			$forcecombo = 0;
 			if ($conf->browser->name == 'ie') {
 				$forcecombo = 1; // There is a bug in IE10 that make combo inside popup crazy
@@ -415,7 +411,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		if (!empty($conf->bom->enabled)) {
 			$langs->load("mrp");
 			require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
-			$formproduct = new FormProduct($db);
 			$forcecombo = 0;
 			if ($conf->browser->name == 'ie') {
 				$forcecombo = 1; // There is a bug in IE10 that make combo inside popup crazy
diff --git a/htdocs/knowledgemanagement/class/knowledgerecord.class.php b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
index 8629ec7bbc6..b241cb2d9e9 100644
--- a/htdocs/knowledgemanagement/class/knowledgerecord.class.php
+++ b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
@@ -116,7 +116,7 @@ class KnowledgeRecord extends CommonObject
 		'model_pdf' => array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>'1', 'position'=>1010, 'notnull'=>-1, 'visible'=>0,),
 		//'url' => array('type'=>'varchar(255)', 'label'=>'URL', 'enabled'=>'1', 'position'=>55, 'notnull'=>0, 'visible'=>-1, 'csslist'=>'tdoverflow200', 'help'=>'UrlForInfoPage'),
 		'fk_c_ticket_category' => array('type'=>'integer:CTicketCategory:ticket/class/cticketcategory.class.php:0::pos', 'label'=>'SuggestedForTicketsInGroup', 'enabled'=>'$conf->ticket->enabled', 'position'=>512, 'notnull'=>0, 'visible'=>-1, 'help'=>'YouCanLinkArticleToATicketCategory', 'csslist'=>'minwidth200 tdoverflowmax250'),
-		'status' => array('type'=>'integer', 'label'=>'Status', 'enabled'=>'1', 'position'=>1000, 'notnull'=>1, 'visible'=>5, 'default'=>0, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Draft', '1'=>'Validated'),),
+		'status' => array('type'=>'integer', 'label'=>'Status', 'enabled'=>'1', 'position'=>1000, 'notnull'=>1, 'visible'=>5, 'default'=>0, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Draft', '1'=>'Validated', '9'=>'Obsolete'),),
 	);
 	public $rowid;
 	public $ref;
@@ -829,10 +829,10 @@ class KnowledgeRecord extends CommonObject
 			//$langs->load("knowledgemanagement");
 			$this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
 			$this->labelStatus[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Validated');
-			$this->labelStatus[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Disabled');
+			$this->labelStatus[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Obsolete');
 			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
 			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Validated');
-			$this->labelStatusShort[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Disabled');
+			$this->labelStatusShort[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Obsolete');
 		}
 
 		$statusType = 'status'.$status;
diff --git a/htdocs/knowledgemanagement/knowledgerecord_card.php b/htdocs/knowledgemanagement/knowledgerecord_card.php
index 809d69128cf..a388175dbcf 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_card.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_card.php
@@ -1,6 +1,5 @@
 <?php
-/* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) ---Put here your own copyright and developer email---
+/* Copyright (C) 2017-2021 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -295,6 +294,56 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneAsk', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
 	}
 
+	// Confirmation of action xxxx (You can use it for xxx = 'close', xxx = 'reopen', ...)
+	if ($action == 'close') {
+		$text = $langs->trans('ConfirmCloseKM', $object->ref);
+		/*if (! empty($conf->notification->enabled))
+		 {
+		 require_once DOL_DOCUMENT_ROOT . '/core/class/notify.class.php';
+		 $notify = new Notify($db);
+		 $text .= '<br>';
+		 $text .= $notify->confirmMessage('MYOBJECT_CLOSE', $object->socid, $object);
+		 }*/
+
+		$formquestion = array();
+		/*
+		 $forcecombo=0;
+		 if ($conf->browser->name == 'ie') $forcecombo = 1;	// There is a bug in IE10 that make combo inside popup crazy
+		 $formquestion = array(
+		 // 'text' => $langs->trans("ConfirmClone"),
+		 // array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1),
+		 // array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value' => 1),
+		 // array('type' => 'other',    'name' => 'idwarehouse',   'label' => $langs->trans("SelectWarehouseForStockDecrease"), 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse')?GETPOST('idwarehouse'):'ifone', 'idwarehouse', '', 1, 0, 0, '', 0, $forcecombo))
+		 );
+		 */
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('SetObsolete'), $text, 'confirm_close', $formquestion, 0, 1, 220);
+	}
+
+	// Confirmation of action xxxx (You can use it for xxx = 'close', xxx = 'reopen', ...)
+	if ($action == 'reopen') {
+		$text = $langs->trans('ConfirmReopenKM', $object->ref);
+		/*if (! empty($conf->notification->enabled))
+		 {
+		 require_once DOL_DOCUMENT_ROOT . '/core/class/notify.class.php';
+		 $notify = new Notify($db);
+		 $text .= '<br>';
+		 $text .= $notify->confirmMessage('MYOBJECT_CLOSE', $object->socid, $object);
+		 }*/
+
+		$formquestion = array();
+		/*
+		 $forcecombo=0;
+		 if ($conf->browser->name == 'ie') $forcecombo = 1;	// There is a bug in IE10 that make combo inside popup crazy
+		 $formquestion = array(
+		 // 'text' => $langs->trans("ConfirmClone"),
+		 // array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1),
+		 // array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value' => 1),
+		 // array('type' => 'other',    'name' => 'idwarehouse',   'label' => $langs->trans("SelectWarehouseForStockDecrease"), 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse')?GETPOST('idwarehouse'):'ifone', 'idwarehouse', '', 1, 0, 0, '', 0, $forcecombo))
+		 );
+		 */
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('Re-Open'), $text, 'confirm_reopen', $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
@@ -428,14 +477,14 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=enable&token='.newToken().'">'.$langs->trans("Enable").'</a>'."\n";
 				}
 			}
+			*/
 			if ($permissiontoadd) {
 				if ($object->status == $object::STATUS_VALIDATED) {
-					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=close&token='.newToken().'">'.$langs->trans("Cancel").'</a>'."\n";
+					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=close&token='.newToken().'">'.$langs->trans("SetObsolete").'</a>'."\n";
 				} else {
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans("Re-Open").'</a>'."\n";
 				}
 			}
-			*/
 
 			// Delete (need delete permission, or if draft, just need create/modify permission)
 			print dolGetButtonAction($langs->trans('Delete'), '', 'delete', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=delete&token='.newToken(), '', $permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd));
diff --git a/htdocs/langs/en_US/knowledgemanagement.lang b/htdocs/langs/en_US/knowledgemanagement.lang
index 1f5e9d3905b..ee93715a5c0 100644
--- a/htdocs/langs/en_US/knowledgemanagement.lang
+++ b/htdocs/langs/en_US/knowledgemanagement.lang
@@ -47,4 +47,8 @@ KnowledgeRecord = Article
 KnowledgeRecordExtraFields = Extrafields for Article
 GroupOfTicket=Group of tickets
 YouCanLinkArticleToATicketCategory=You can link an article to a ticket group (so the article will be suggested during qualification of new tickets)
-SuggestedForTicketsInGroup=Suggested for tickets when group is
\ No newline at end of file
+SuggestedForTicketsInGroup=Suggested for tickets when group is
+
+SetObsolete=Set as obsolete
+ConfirmCloseKM=Do you confirm the closing of this article as obsolete ?
+ConfirmReopenKM=Do you want to restore this article to status "Validated" ?
\ No newline at end of file
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index a493508878c..66279849abb 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -316,6 +316,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	if ($action == 'deleteline') {
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_deleteline', '', 0, 1);
 	}
+
 	// Clone confirmation
 	if ($action == 'clone') {
 		// Create an array for form
@@ -323,8 +324,17 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneAsk', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
 	}
 
-	// Confirmation of action xxxx
+	// Confirmation of action xxxx (You can use it for xxx = 'close', xxx = 'reopen', ...)
 	if ($action == 'xxx') {
+		$text = $langs->trans('ConfirmActionMyObject', $object->ref);
+		/*if (! empty($conf->notification->enabled))
+		{
+			require_once DOL_DOCUMENT_ROOT . '/core/class/notify.class.php';
+			$notify = new Notify($db);
+			$text .= '<br>';
+			$text .= $notify->confirmMessage('MYOBJECT_CLOSE', $object->socid, $object);
+		}*/
+
 		$formquestion = array();
 		/*
 		$forcecombo=0;

From 7b990a1a7ff7511337ffa9e169ba43ad531994d9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 26 Jan 2022 11:30:19 +0100
Subject: [PATCH 299/316] Fix phpcs

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index d29fd0d5e15..ff5f5d0d0a5 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1693,8 +1693,7 @@ class Form
 			if ($showempty && ! is_numeric($showempty)) {
 				$textforempty = $showempty;
 				$out .= '<option class="optiongrey" value="-1"'.(in_array(-1, $selected) ? ' selected' : '').'>'.$textforempty.'</option>';
-			}
-			else {
+			} else {
 				if (($showempty == 1 || ($showempty == 3 && $num > 1)) && ! $multiple) {
 					$out .= '<option value="0"'.(in_array(0, $selected) ? ' selected' : '').'>&nbsp;</option>';
 				}

From b7d199657b38f96792fa06237a16405ee56c8921 Mon Sep 17 00:00:00 2001
From: Markusi13 <Markusi13@users.noreply.github.com>
Date: Wed, 26 Jan 2022 12:23:12 +0100
Subject: [PATCH 300/316] Update bug_report.yml

---
 .github/ISSUE_TEMPLATE/bug_report.yml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 7e7a62c1e84..d7dc3d584e3 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -69,12 +69,3 @@ body:
     attributes:
       label: Attached files
       description: Screenshots, screencasts, dolibarr.log, debugging informations
-      
-  - type: checkboxes
-    id: terms
-    attributes:
-      label: Code of Conduct
-      description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CODE_OF_CONDUCT.md)
-      options:
-        - label: I agree to follow this project's Code of Conduct
-          required: true

From a47145f96247f3155002d3d172f7f059f0e00eeb Mon Sep 17 00:00:00 2001
From: Markusi13 <Markusi13@users.noreply.github.com>
Date: Wed, 26 Jan 2022 12:23:25 +0100
Subject: [PATCH 301/316] Update feature_request.yml

---
 .github/ISSUE_TEMPLATE/feature_request.yml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index f4975622a8f..885f3472d18 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -33,12 +33,3 @@ body:
     attributes:
       label: Suggested steps
       description: List of tasks to achieve goal
-      
-  - type: checkboxes
-    id: terms
-    attributes:
-      label: Code of Conduct
-      description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CODE_OF_CONDUCT.md)
-      options:
-        - label: I agree to follow this project's Code of Conduct
-          required: true

From 3b4c7ceb3bf5c81664cf4942aadefcdaab3fbcc2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 26 Jan 2022 13:00:48 +0100
Subject: [PATCH 302/316] Code comment

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 2eb1802d303..5f46e9632c7 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -783,7 +783,7 @@ function checkVal($out = '', $check = 'alphanohtml', $filter = null, $options =
 				// keep lines feed
 			}
 			break;
-		case 'alphawithlgt':		// No " and no ../ but we keep balanced < > tags with no special chars inside. Can be used for email string like "Name <email>"
+		case 'alphawithlgt':		// No " and no ../ but we keep balanced < > tags with no special chars inside. Can be used for email string like "Name <email>". Less secured than 'alphanohtml'
 			if (!is_array($out)) {
 				$out = trim($out);
 				do {

From cceb98a1959fcfedac34067dd322b2aba3162e6f Mon Sep 17 00:00:00 2001
From: BB2A Anthony Berton <bertonanthony@gmail.com>
Date: Wed, 26 Jan 2022 13:28:14 +0100
Subject: [PATCH 303/316] Correct VAR forget

---
 htdocs/theme/md/style.css.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 4dadc40306f..5e59c6be224 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -343,6 +343,7 @@ print '*/'."\n";
 	--productlinestockod: #002200;
 	--productlinestocktoolow: #884400;
 	--infoboxmoduleenabledbgcolor : linear-gradient(0.4turn, #fff, #fff, #fff, #e4efe8);
+	--butactionbg : #<?php print $butactionbg; ?>;
 }
 
 body {
@@ -444,7 +445,7 @@ input, select {
 	margin-top:1px;
 }
 #mainbody input.button:not(.buttongen):not(.bordertransp), #mainbody a.button:not(.buttongen):not(.bordertransp) {
-	background: rgb(<?php echo $butactionbg ?>);
+	background: var(--butactionbg);;
 	color: #FFF !important;
 	border-radius: 3px;
 	border-collapse: collapse;
@@ -569,7 +570,7 @@ a.butStatus {
 	padding-right: 5px;
 	background-color: transparent;
 	color: var(--colortext) !important;
-	border: 2px solid rgb(<?php echo $butactionbg ?>);
+	border: 2px solid var( --butactionbg);
 	margin: 0 0.45em !important;
 }
 

From 416543a5f5913b45c316d3df077b7ff5e4e29292 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 26 Jan 2022 13:49:46 +0100
Subject: [PATCH 304/316] Standardize code to allow deletion of an odt template

---
 htdocs/admin/agenda_other.php                                | 2 ++
 htdocs/admin/agenda_reminder.php                             | 2 ++
 htdocs/admin/barcode.php                                     | 1 +
 htdocs/admin/bom.php                                         | 2 ++
 htdocs/admin/commande.php                                    | 2 ++
 htdocs/admin/contract.php                                    | 2 ++
 htdocs/admin/delivery.php                                    | 2 ++
 htdocs/admin/eventorganization.php                           | 2 ++
 htdocs/admin/expedition.php                                  | 2 ++
 htdocs/admin/expensereport.php                               | 2 ++
 htdocs/admin/facture.php                                     | 2 ++
 htdocs/admin/facture_situation.php                           | 2 ++
 htdocs/admin/fichinter.php                                   | 2 ++
 htdocs/admin/holiday.php                                     | 2 ++
 htdocs/admin/hrm.php                                         | 2 ++
 htdocs/admin/import.php                                      | 2 ++
 htdocs/admin/knowledgemanagement.php                         | 3 ++-
 htdocs/admin/mrp.php                                         | 2 ++
 htdocs/admin/propal.php                                      | 2 ++
 htdocs/admin/reception_setup.php                             | 2 ++
 htdocs/admin/supplier_order.php                              | 2 ++
 htdocs/admin/supplier_payment.php                            | 2 ++
 htdocs/admin/supplier_proposal.php                           | 2 ++
 htdocs/admin/ticket.php                                      | 2 ++
 htdocs/admin/user.php                                        | 2 ++
 htdocs/admin/usergroup.php                                   | 2 ++
 htdocs/admin/workstation.php                                 | 1 +
 .../modules/propale/doc/doc_generic_proposal_odt.modules.php | 5 ++++-
 28 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index 8e50380e2ae..1014d40de50 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -41,6 +41,8 @@ $langs->loadLangs(array('admin', 'other', 'agenda', 'users'));
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $param = GETPOST('param', 'alpha');
 $cancel = GETPOST('cancel', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
diff --git a/htdocs/admin/agenda_reminder.php b/htdocs/admin/agenda_reminder.php
index 1d8cd8f723c..79aa081ddef 100644
--- a/htdocs/admin/agenda_reminder.php
+++ b/htdocs/admin/agenda_reminder.php
@@ -36,6 +36,8 @@ $langs->loadLangs(array("admin", "other", "agenda"));
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $param = GETPOST('param', 'alpha');
 $cancel = GETPOST('cancel', 'alpha');
 $scandir = GETPOST('scandir', 'alpha');
diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php
index 2fbfed35536..ee0fcd5d130 100644
--- a/htdocs/admin/barcode.php
+++ b/htdocs/admin/barcode.php
@@ -36,6 +36,7 @@ if (!$user->admin) {
 }
 
 $action = GETPOST('action', 'aZ09');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
 
 
 /*
diff --git a/htdocs/admin/bom.php b/htdocs/admin/bom.php
index a36c3698306..e3adb206d7e 100644
--- a/htdocs/admin/bom.php
+++ b/htdocs/admin/bom.php
@@ -36,6 +36,8 @@ if (!$user->admin) {
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'bom';
diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index 24a45bb413a..5c8eb88126c 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -46,6 +46,8 @@ if (!$user->admin) {
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'order';
diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index 1c6a0ec0458..0c8aba5ae2d 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -37,6 +37,8 @@ if (!$user->admin) {
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'contract';
diff --git a/htdocs/admin/delivery.php b/htdocs/admin/delivery.php
index 8e60b02a5bf..6f0f4c1b415 100644
--- a/htdocs/admin/delivery.php
+++ b/htdocs/admin/delivery.php
@@ -43,6 +43,8 @@ if (!$user->admin) {
 
 $action  = GETPOST('action', 'alpha');
 $value   = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $label   = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'delivery';
diff --git a/htdocs/admin/eventorganization.php b/htdocs/admin/eventorganization.php
index 8edc61bf255..904d10bff67 100644
--- a/htdocs/admin/eventorganization.php
+++ b/htdocs/admin/eventorganization.php
@@ -41,6 +41,8 @@ $backtopage = GETPOST('backtopage', 'alpha');
 
 $value = GETPOST('value', 'alpha');
 $label = GETPOST('label', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'myobject';
 
diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index 2d4736cc49d..12e0d0a6d01 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -43,6 +43,8 @@ if (!$user->admin) {
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'shipping';
diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php
index 5b73d995b5c..fc63940f0b8 100644
--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@@ -43,6 +43,8 @@ if (!$user->admin) {
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'expensereport';
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index ae269492ddf..9eec54b03a7 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -42,6 +42,8 @@ if (!$user->admin) {
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'invoice';
diff --git a/htdocs/admin/facture_situation.php b/htdocs/admin/facture_situation.php
index 789faacacad..609a6605d1a 100644
--- a/htdocs/admin/facture_situation.php
+++ b/htdocs/admin/facture_situation.php
@@ -51,6 +51,8 @@ $backtopage = GETPOST('backtopage', 'alpha');
 
 $value = GETPOST('value', 'alpha');
 $label = GETPOST('label', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'invoice';
 
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index 4369bb9a2a7..c95f354a189 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -43,6 +43,8 @@ if (!$user->admin) {
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'ficheinter';
diff --git a/htdocs/admin/holiday.php b/htdocs/admin/holiday.php
index bfd7e22c461..c1755b17edf 100644
--- a/htdocs/admin/holiday.php
+++ b/htdocs/admin/holiday.php
@@ -39,6 +39,8 @@ if (!$user->admin) {
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'contract';
diff --git a/htdocs/admin/hrm.php b/htdocs/admin/hrm.php
index 1ad84ce19ac..aea86069f4d 100644
--- a/htdocs/admin/hrm.php
+++ b/htdocs/admin/hrm.php
@@ -50,6 +50,8 @@ $backtopage = GETPOST('backtopage', 'alpha');
 
 $value = GETPOST('value', 'alpha');
 $label = GETPOST('label', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'myobject';
 
diff --git a/htdocs/admin/import.php b/htdocs/admin/import.php
index cd9d7b44074..37168baa3d4 100644
--- a/htdocs/admin/import.php
+++ b/htdocs/admin/import.php
@@ -41,6 +41,8 @@ if (!$user->admin) {
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 
 /*
  * Actions
diff --git a/htdocs/admin/knowledgemanagement.php b/htdocs/admin/knowledgemanagement.php
index 8d93c16741a..c2440bbb885 100644
--- a/htdocs/admin/knowledgemanagement.php
+++ b/htdocs/admin/knowledgemanagement.php
@@ -37,8 +37,9 @@ $langs->loadLangs(array("admin", "knowledgemanagement"));
 // Parameters
 $action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
-
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'knowledgemanagement';
diff --git a/htdocs/admin/mrp.php b/htdocs/admin/mrp.php
index 54efdc4df19..fac6a3f3d41 100644
--- a/htdocs/admin/mrp.php
+++ b/htdocs/admin/mrp.php
@@ -37,6 +37,8 @@ if (!$user->admin) {
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'mrp';
diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index 22ce045a7ab..6384c561967 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -43,6 +43,8 @@ if (!$user->admin) {
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'propal';
diff --git a/htdocs/admin/reception_setup.php b/htdocs/admin/reception_setup.php
index 218cc1ef853..26300ece329 100644
--- a/htdocs/admin/reception_setup.php
+++ b/htdocs/admin/reception_setup.php
@@ -36,6 +36,8 @@ if (!$user->admin) {
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'reception';
diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index 808528cdc0a..0da79845d14 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -43,6 +43,8 @@ if (!$user->admin) {
 
 $type = GETPOST('type', 'alpha');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $label = GETPOST('label', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $scandir = GETPOST('scan_dir', 'alpha');
diff --git a/htdocs/admin/supplier_payment.php b/htdocs/admin/supplier_payment.php
index b31e4c9a433..a41f9fdf80c 100644
--- a/htdocs/admin/supplier_payment.php
+++ b/htdocs/admin/supplier_payment.php
@@ -37,6 +37,8 @@ if (!$user->admin) {
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scandir', 'alpha');
 $type = 'supplier_payment';
diff --git a/htdocs/admin/supplier_proposal.php b/htdocs/admin/supplier_proposal.php
index 6e3f190aeb6..9bd684afb22 100644
--- a/htdocs/admin/supplier_proposal.php
+++ b/htdocs/admin/supplier_proposal.php
@@ -38,6 +38,8 @@ if (!$user->admin) {
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'supplier_proposal';
diff --git a/htdocs/admin/ticket.php b/htdocs/admin/ticket.php
index 03fd647dd29..f4e5b4f3fad 100644
--- a/htdocs/admin/ticket.php
+++ b/htdocs/admin/ticket.php
@@ -38,6 +38,8 @@ if (!$user->admin) {
 // Parameters
 $value = GETPOST('value', 'alpha');
 $action = GETPOST('action', 'aZ09');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scandir', 'alpha');
 $type = 'ticket';
diff --git a/htdocs/admin/user.php b/htdocs/admin/user.php
index 85ab0f0e9a8..53de8fe2502 100644
--- a/htdocs/admin/user.php
+++ b/htdocs/admin/user.php
@@ -43,9 +43,11 @@ $extrafields = new ExtraFields($db);
 
 $action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
 
 $value = GETPOST('value', 'alpha');
 $label = GETPOST('label', 'alpha');
+
 $scandir = GETPOST('scandir', 'alpha');
 $type = 'user';
 
diff --git a/htdocs/admin/usergroup.php b/htdocs/admin/usergroup.php
index 3319ab994a6..709b60068f7 100644
--- a/htdocs/admin/usergroup.php
+++ b/htdocs/admin/usergroup.php
@@ -42,6 +42,8 @@ $extrafields = new ExtraFields($db);
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $type = 'group';
 
 /*
diff --git a/htdocs/admin/workstation.php b/htdocs/admin/workstation.php
index e89cbb2fd41..58118827ed4 100644
--- a/htdocs/admin/workstation.php
+++ b/htdocs/admin/workstation.php
@@ -36,6 +36,7 @@ $langs->loadLangs(array("admin", "workstation"));
 // Parameters
 $action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
 
 $value = GETPOST('value', 'alpha');
 
diff --git a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
index 636bf4c4f7f..e636645f6c8 100644
--- a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
+++ b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
@@ -178,7 +178,10 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 			$texte .= '<div id="div_'.get_class($this).'" class="hiddenx">';
 			// Show list of found files
 			foreach ($listoffiles as $file) {
-				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=proposals/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
+				$texte .= '- '.$file['name'];
+				$texte .= ' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=proposals/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a>';
+				$texte .= ' &nbsp; <a class="reposition" href="'.$_SERVER["PHP_SELF"].'?modulepart=doctemplates&keyforuploaddir=PROPALE_ADDON_PDF_ODT_PATH&action=deletefile&token='.newToken().'&file='.urlencode(basename($file['name'])).'">'.img_picto('', 'delete').'</a>';
+				$texte .= '<br>';
 			}
 			$texte .= '</div>';
 

From 6d04bac740cddaa8310f2fc59fd0bbc56042b568 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 26 Jan 2022 13:50:49 +0100
Subject: [PATCH 305/316] phpcs

---
 htdocs/includes/odtphp/Segment.php | 519 ++++++++++++++---------------
 1 file changed, 257 insertions(+), 262 deletions(-)

diff --git a/htdocs/includes/odtphp/Segment.php b/htdocs/includes/odtphp/Segment.php
index ca8797ba577..811cf62dadd 100644
--- a/htdocs/includes/odtphp/Segment.php
+++ b/htdocs/includes/odtphp/Segment.php
@@ -16,296 +16,291 @@ class SegmentException extends Exception
  */
 class Segment implements IteratorAggregate, Countable
 {
-    protected $xml;
-    protected $xmlParsed = '';
-    protected $name;
-    protected $children = array();
-    protected $vars = array();
+	protected $xml;
+	protected $xmlParsed = '';
+	protected $name;
+	protected $children = array();
+	protected $vars = array();
 	protected $images = array();
 	protected $odf;
 	protected $file;
 
-    /**
-     * Constructor
-     *
-     * @param string $name  name of the segment to construct
-     * @param string $xml   XML tree of the segment
-     * @param string $odf   odf
-     */
-    public function __construct($name, $xml, $odf)
-    {
-        $this->name = (string) $name;
-        $this->xml = (string) $xml;
+	/**
+	 * Constructor
+	 *
+	 * @param string $name  name of the segment to construct
+	 * @param string $xml   XML tree of the segment
+	 * @param string $odf   odf
+	 */
+	public function __construct($name, $xml, $odf)
+	{
+		$this->name = (string) $name;
+		$this->xml = (string) $xml;
 		$this->odf = $odf;
-        $zipHandler = $this->odf->getConfig('ZIP_PROXY');
-        $this->file = new $zipHandler($this->odf->getConfig('PATH_TO_TMP'));
-        $this->_analyseChildren($this->xml);
-    }
-    /**
-     * Returns the name of the segment
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-    /**
-     * Does the segment have children ?
-     *
-     * @return bool
-     */
-    public function hasChildren()
-    {
-        return $this->getIterator()->hasChildren();
-    }
-    /**
-     * Countable interface
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return count($this->children);
-    }
-    /**
-     * IteratorAggregate interface
-     *
-     * @return Iterator
-     */
-    public function getIterator()
-    {
-        return new RecursiveIteratorIterator(new SegmentIterator($this->children), 1);
-    }
-    /**
-     * Replace variables of the template in the XML code
-     * All the children are also called
-     * Complete the current segment with new line
-     *
-     * @return string
-     */
-    public function merge()
-    {
-        // To provide debug information on line number processed
-        global $count;
-        if (empty($count)) $count=1;
-        else $count++;
+		$zipHandler = $this->odf->getConfig('ZIP_PROXY');
+		$this->file = new $zipHandler($this->odf->getConfig('PATH_TO_TMP'));
+		$this->_analyseChildren($this->xml);
+	}
+	/**
+	 * Returns the name of the segment
+	 *
+	 * @return string
+	 */
+	public function getName()
+	{
+		return $this->name;
+	}
+	/**
+	 * Does the segment have children ?
+	 *
+	 * @return bool
+	 */
+	public function hasChildren()
+	{
+		return $this->getIterator()->hasChildren();
+	}
+	/**
+	 * Countable interface
+	 *
+	 * @return int
+	 */
+	public function count()
+	{
+		return count($this->children);
+	}
+	/**
+	 * IteratorAggregate interface
+	 *
+	 * @return Iterator
+	 */
+	public function getIterator()
+	{
+		return new RecursiveIteratorIterator(new SegmentIterator($this->children), 1);
+	}
+	/**
+	 * Replace variables of the template in the XML code
+	 * All the children are also called
+	 * Complete the current segment with new line
+	 *
+	 * @return string
+	 */
+	public function merge()
+	{
+		// To provide debug information on line number processed
+		global $count;
+		if (empty($count)) $count=1;
+		else $count++;
 
-        if (empty($this->savxml)) $this->savxml = $this->xml;       // Sav content of line at first line merged, so we will reuse original for next steps
-        $this->xml = $this->savxml;
-        $tmpvars = $this->vars;                                     // Store into $tmpvars so we won't modify this->vars when completing data with empty values
+		if (empty($this->savxml)) $this->savxml = $this->xml;       // Sav content of line at first line merged, so we will reuse original for next steps
+		$this->xml = $this->savxml;
+		$tmpvars = $this->vars;                                     // Store into $tmpvars so we won't modify this->vars when completing data with empty values
 
-        // Search all tags fou into condition to complete $tmpvars, so we will proceed all tests even if not defined
-        $reg='@\[!--\sIF\s([{}a-zA-Z0-9\.\,_]+)\s--\]@smU';
-        preg_match_all($reg, $this->xml, $matches, PREG_SET_ORDER);
-        //var_dump($tmpvars);exit;
-        foreach($matches as $match)   // For each match, if there is no entry into this->vars, we add it
-        {
-            if (! empty($match[1]) && ! isset($tmpvars[$match[1]]))
-            {
-                $tmpvars[$match[1]] = '';     // Not defined, so we set it to '', we just need entry into this->vars for next loop
-            }
-        }
+		// Search all tags fou into condition to complete $tmpvars, so we will proceed all tests even if not defined
+		$reg='@\[!--\sIF\s([{}a-zA-Z0-9\.\,_]+)\s--\]@smU';
+		$matches = array();
+		preg_match_all($reg, $this->xml, $matches, PREG_SET_ORDER);
+		//var_dump($tmpvars);exit;
+		foreach ($matches as $match) {   // For each match, if there is no entry into this->vars, we add it
+			if (! empty($match[1]) && ! isset($tmpvars[$match[1]])) {
+				$tmpvars[$match[1]] = '';     // Not defined, so we set it to '', we just need entry into this->vars for next loop
+			}
+		}
 
-        // Conditionals substitution
-        // Note: must be done before static substitution, else the variable will be replaced by its value and the conditional won't work anymore
-        foreach($tmpvars as $key => $value)
-        {
-            // If value is true (not 0 nor false nor null nor empty string)
-            if ($value)
-            {
-                // Remove the IF tag
-                $this->xml = str_replace('[!-- IF '.$key.' --]', '', $this->xml);
-                // Remove everything between the ELSE tag (if it exists) and the ENDIF tag
-                $reg = '@(\[!--\sELSE\s' . $key . '\s--\](.*))?\[!--\sENDIF\s' . $key . '\s--\]@smU'; // U modifier = all quantifiers are non-greedy
-                $this->xml = preg_replace($reg, '', $this->xml);
-            }
-            // Else the value is false, then two cases: no ELSE and we're done, or there is at least one place where there is an ELSE clause, then we replace it
-            else
-            {
-                // Find all conditional blocks for this variable: from IF to ELSE and to ENDIF
-                $reg = '@\[!--\sIF\s' . $key . '\s--\](.*)(\[!--\sELSE\s' . $key . '\s--\](.*))?\[!--\sENDIF\s' . $key . '\s--\]@smU'; // U modifier = all quantifiers are non-greedy
-                preg_match_all($reg, $this->xml, $matches, PREG_SET_ORDER);
-                foreach($matches as $match) { // For each match, if there is an ELSE clause, we replace the whole block by the value in the ELSE clause
-                    if (!empty($match[3])) $this->xml = str_replace($match[0], $match[3], $this->xml);
-                }
-                // Cleanup the other conditional blocks (all the others where there were no ELSE clause, we can just remove them altogether)
-                $this->xml = preg_replace($reg, '', $this->xml);
-            }
-        }
+		// Conditionals substitution
+		// Note: must be done before static substitution, else the variable will be replaced by its value and the conditional won't work anymore
+		foreach ($tmpvars as $key => $value) {
+			// If value is true (not 0 nor false nor null nor empty string)
+			if ($value) {
+				// Remove the IF tag
+				$this->xml = str_replace('[!-- IF '.$key.' --]', '', $this->xml);
+				// Remove everything between the ELSE tag (if it exists) and the ENDIF tag
+				$reg = '@(\[!--\sELSE\s' . $key . '\s--\](.*))?\[!--\sENDIF\s' . $key . '\s--\]@smU'; // U modifier = all quantifiers are non-greedy
+				$this->xml = preg_replace($reg, '', $this->xml);
+			}
+			// Else the value is false, then two cases: no ELSE and we're done, or there is at least one place where there is an ELSE clause, then we replace it
+			else {
+				// Find all conditional blocks for this variable: from IF to ELSE and to ENDIF
+				$reg = '@\[!--\sIF\s' . $key . '\s--\](.*)(\[!--\sELSE\s' . $key . '\s--\](.*))?\[!--\sENDIF\s' . $key . '\s--\]@smU'; // U modifier = all quantifiers are non-greedy
+				preg_match_all($reg, $this->xml, $matches, PREG_SET_ORDER);
+				foreach ($matches as $match) { // For each match, if there is an ELSE clause, we replace the whole block by the value in the ELSE clause
+					if (!empty($match[3])) $this->xml = str_replace($match[0], $match[3], $this->xml);
+				}
+				// Cleanup the other conditional blocks (all the others where there were no ELSE clause, we can just remove them altogether)
+				$this->xml = preg_replace($reg, '', $this->xml);
+			}
+		}
 
-        $this->xmlParsed .= str_replace(array_keys($tmpvars), array_values($tmpvars), $this->xml);
-        if ($this->hasChildren()) {
-            foreach ($this->children as $child) {
-                $this->xmlParsed = str_replace($child->xml, ($child->xmlParsed=="")?$child->merge():$child->xmlParsed, $this->xmlParsed);
-                $child->xmlParsed = '';
-            }
-        }
-        $reg = "/\[!--\sBEGIN\s$this->name\s--\](.*)\[!--\sEND\s$this->name\s--\]/sm";
-        $this->xmlParsed = preg_replace($reg, '$1', $this->xmlParsed);
+		$this->xmlParsed .= str_replace(array_keys($tmpvars), array_values($tmpvars), $this->xml);
+		if ($this->hasChildren()) {
+			foreach ($this->children as $child) {
+				$this->xmlParsed = str_replace($child->xml, ($child->xmlParsed=="")?$child->merge():$child->xmlParsed, $this->xmlParsed);
+				$child->xmlParsed = '';
+			}
+		}
+		$reg = "/\[!--\sBEGIN\s$this->name\s--\](.*)\[!--\sEND\s$this->name\s--\]/sm";
+		$this->xmlParsed = preg_replace($reg, '$1', $this->xmlParsed);
 		// Miguel Erill 09704/2017 - Add macro replacement to invoice lines
-        $this->xmlParsed = $this->macroReplace($this->xmlParsed);
-        $this->file->open($this->odf->getTmpfile());
-        foreach ($this->images as $imageKey => $imageValue) {
+		$this->xmlParsed = $this->macroReplace($this->xmlParsed);
+		$this->file->open($this->odf->getTmpfile());
+		foreach ($this->images as $imageKey => $imageValue) {
 			if ($this->file->getFromName('Pictures/' . $imageValue) === false) {
 				// Add the image inside the ODT document
 				$this->file->addFile($imageKey, 'Pictures/' . $imageValue);
 				// Add the image to the Manifest (which maintains a list of images, necessary to avoid "Corrupt ODT file. Repair?" when opening the file with LibreOffice)
 				$this->odf->addImageToManifest($imageValue);
 			}
-        }
-        $this->file->close();
+		}
+		$this->file->close();
 
-        return $this->xmlParsed;
-    }
+		return $this->xmlParsed;
+	}
 
-   /**
-    * Function to replace macros for invoice short and long month, invoice year
-    *
-    * Substitution occur when the invoice is generated, not considering the invoice date
-    * so do not (re)generate in a diferent date than the one that the invoice belongs to
-    * Perhaps it would be better to use the invoice issued date but I still do not know
-    * how to get it here
-    *
-    * Miguel Erill 09/04/2017
-    *
-    * @param	string	$value	String to convert
-    */
-    public function macroReplace($text)
-    {
-    	include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-        global $langs;
+	/**
+	* Function to replace macros for invoice short and long month, invoice year
+	*
+	* Substitution occur when the invoice is generated, not considering the invoice date
+	* so do not (re)generate in a diferent date than the one that the invoice belongs to
+	* Perhaps it would be better to use the invoice issued date but I still do not know
+	* how to get it here
+	*
+	* Miguel Erill 09/04/2017
+	*
+	* @param	string	$value	String to convert
+	*/
+	public function macroReplace($text)
+	{
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+		global $langs;
 
-        $hoy = dol_getdate(dol_now('tzuser'));
-        $dateinonemontharray = dol_get_next_month($hoy['mon'], $hoy['year']);
-        $nextMonth = $dateinonemontharray['month'];
+		$hoy = dol_getdate(dol_now('tzuser'));
+		$dateinonemontharray = dol_get_next_month($hoy['mon'], $hoy['year']);
+		$nextMonth = $dateinonemontharray['month'];
 
-        $patterns=array( '/__CURRENTDAY__/u','/__CURENTWEEKDAY__/u',
-                         '/__CURRENTMONTH__/u','/__CURRENTMONTHLONG__/u',
-                         '/__NEXTMONTH__/u','/__NEXTMONTHLONG__/u',
-                         '/__CURRENTYEAR__/u','/__NEXTYEAR__/u' );
-        $values=array( $hoy['mday'], $langs->transnoentitiesnoconv($hoy['weekday']),
-                       $hoy['mon'], $langs->transnoentitiesnoconv($hoy['month']),
-                       $nextMonth, monthArray($langs)[$nextMonth],
-                       $hoy['year'], $hoy['year']+1 );
+		$patterns=array( '/__CURRENTDAY__/u','/__CURENTWEEKDAY__/u',
+						 '/__CURRENTMONTH__/u','/__CURRENTMONTHLONG__/u',
+						 '/__NEXTMONTH__/u','/__NEXTMONTHLONG__/u',
+						 '/__CURRENTYEAR__/u','/__NEXTYEAR__/u' );
+		$values=array( $hoy['mday'], $langs->transnoentitiesnoconv($hoy['weekday']),
+					   $hoy['mon'], $langs->transnoentitiesnoconv($hoy['month']),
+					   $nextMonth, monthArray($langs)[$nextMonth],
+					   $hoy['year'], $hoy['year']+1 );
 
-        $text=preg_replace($patterns, $values, $text);
+		$text=preg_replace($patterns, $values, $text);
 
-	return $text;
-    }
+		return $text;
+	}
 
-    /**
-     * Analyse the XML code in order to find children
-     *
-     * @param string $xml   Xml
-     * @return Segment
-     */
-    protected function _analyseChildren($xml)
-    {
-        // $reg2 = "#\[!--\sBEGIN\s([\S]*)\s--\](?:<\/text:p>)?(.*)(?:<text:p\s.*>)?\[!--\sEND\s(\\1)\s--\]#sm";
-        $reg2 = "#\[!--\sBEGIN\s([\S]*)\s--\](.*)\[!--\sEND\s(\\1)\s--\]#sm";
-        preg_match_all($reg2, $xml, $matches);
-        for ($i = 0, $size = count($matches[0]); $i < $size; $i++) {
-            if ($matches[1][$i] != $this->name) {
-                $this->children[$matches[1][$i]] = new self($matches[1][$i], $matches[0][$i], $this->odf);
-            } else {
-                $this->_analyseChildren($matches[2][$i]);
-            }
-        }
-        return $this;
-    }
+	/**
+	 * Analyse the XML code in order to find children
+	 *
+	 * @param string $xml   Xml
+	 * @return Segment
+	 */
+	protected function _analyseChildren($xml)
+	{
+		// $reg2 = "#\[!--\sBEGIN\s([\S]*)\s--\](?:<\/text:p>)?(.*)(?:<text:p\s.*>)?\[!--\sEND\s(\\1)\s--\]#sm";
+		$reg2 = "#\[!--\sBEGIN\s([\S]*)\s--\](.*)\[!--\sEND\s(\\1)\s--\]#sm";
+		preg_match_all($reg2, $xml, $matches);
+		for ($i = 0, $size = count($matches[0]); $i < $size; $i++) {
+			if ($matches[1][$i] != $this->name) {
+				$this->children[$matches[1][$i]] = new self($matches[1][$i], $matches[0][$i], $this->odf);
+			} else {
+				$this->_analyseChildren($matches[2][$i]);
+			}
+		}
+		return $this;
+	}
 
-    /**
-     * Assign a template variable to replace
-     *
-     * @param string $key       Key
-     * @param string $value     Value
-     * @param string $encode    Encode
-     * @param string $charset   Charset
-     * @throws SegmentException
-     * @return Segment
-     */
-    public function setVars($key, $value, $encode = true, $charset = 'ISO-8859')
-    {
-        if (strpos($this->xml, $this->odf->getConfig('DELIMITER_LEFT') . $key . $this->odf->getConfig('DELIMITER_RIGHT')) === false) {
-            //throw new SegmentException("var $key not found in {$this->getName()}");
-        }
+	/**
+	 * Assign a template variable to replace
+	 *
+	 * @param string $key       Key
+	 * @param string $value     Value
+	 * @param string $encode    Encode
+	 * @param string $charset   Charset
+	 * @throws SegmentException
+	 * @return Segment
+	 */
+	public function setVars($key, $value, $encode = true, $charset = 'ISO-8859')
+	{
+		if (strpos($this->xml, $this->odf->getConfig('DELIMITER_LEFT') . $key . $this->odf->getConfig('DELIMITER_RIGHT')) === false) {
+			//throw new SegmentException("var $key not found in {$this->getName()}");
+		}
 
-        $tag = $this->odf->getConfig('DELIMITER_LEFT') . $key . $this->odf->getConfig('DELIMITER_RIGHT');
+		$tag = $this->odf->getConfig('DELIMITER_LEFT') . $key . $this->odf->getConfig('DELIMITER_RIGHT');
 
 		$this->vars[$tag] = $this->odf->convertVarToOdf($value, $encode, $charset);
-        
-        return $this;
-    }
-    /**
-     * Assign a template variable as a picture
-     *
-     * @param string $key name of the variable within the template
-     * @param string $value path to the picture
-     * @throws OdfException
-     * @return Segment
-     */
-    public function setImage($key, $value)
-    {
-        $filename = strtok(strrchr($value, '/'), '/.');
-        $file = substr(strrchr($value, '/'), 1);
-        $size = @getimagesize($value);
-        if ($size === false) {
-            throw new OdfException("Invalid image");
-        }
-        // Set the width and height of the page
-        list ($width, $height) = $size;
-        $width *= Odf::PIXEL_TO_CM;
-        $height *= Odf::PIXEL_TO_CM;
-        // Fix local-aware issues (eg: 12,10 -> 12.10)
-        $width = sprintf("%F", $width);
-        $height = sprintf("%F", $height);
 
-        $xml = <<<IMG
+		return $this;
+	}
+	/**
+	 * Assign a template variable as a picture
+	 *
+	 * @param string $key name of the variable within the template
+	 * @param string $value path to the picture
+	 * @throws OdfException
+	 * @return Segment
+	 */
+	public function setImage($key, $value)
+	{
+		$filename = strtok(strrchr($value, '/'), '/.');
+		$file = substr(strrchr($value, '/'), 1);
+		$size = @getimagesize($value);
+		if ($size === false) {
+			throw new OdfException("Invalid image");
+		}
+		// Set the width and height of the page
+		list ($width, $height) = $size;
+		$width *= Odf::PIXEL_TO_CM;
+		$height *= Odf::PIXEL_TO_CM;
+		// Fix local-aware issues (eg: 12,10 -> 12.10)
+		$width = sprintf("%F", $width);
+		$height = sprintf("%F", $height);
+
+		$xml = <<<IMG
 <draw:frame draw:style-name="fr1" draw:name="$filename" text:anchor-type="aschar" svg:width="{$width}cm" svg:height="{$height}cm" draw:z-index="3"><draw:image xlink:href="Pictures/$file" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/></draw:frame>
 IMG;
-        $this->images[$value] = $file;
-        $this->setVars($key, $xml, false);
-        return $this;
-    }
-    /**
-     * Shortcut to retrieve a child
-     *
-     * @param string $prop      Prop
-     * @return Segment
-     * @throws SegmentException
-     */
-    public function __get($prop)
-    {
-        if (array_key_exists($prop, $this->children)) {
-            return $this->children[$prop];
-        } else {
-            throw new SegmentException('child ' . $prop . ' does not exist');
-        }
-    }
-    /**
-     * Proxy for setVars
-     *
-     * @param string $meth      Meth
-     * @param array $args       Args
-     * @return Segment
-     */
-    public function __call($meth, $args)
-    {
-        try {
-            return $this->setVars($meth, $args[0]);
-        } catch (SegmentException $e) {
-            throw new SegmentException("method $meth nor var $meth exist");
-        }
-    }
-    /**
-     * Returns the parsed XML
-     *
-     * @return string
-     */
-    public function getXmlParsed()
-    {
-        return $this->xmlParsed;
-    }
+		$this->images[$value] = $file;
+		$this->setVars($key, $xml, false);
+		return $this;
+	}
+	/**
+	 * Shortcut to retrieve a child
+	 *
+	 * @param string $prop      Prop
+	 * @return Segment
+	 * @throws SegmentException
+	 */
+	public function __get($prop)
+	{
+		if (array_key_exists($prop, $this->children)) {
+			return $this->children[$prop];
+		} else {
+			throw new SegmentException('child ' . $prop . ' does not exist');
+		}
+	}
+	/**
+	 * Proxy for setVars
+	 *
+	 * @param string $meth      Meth
+	 * @param array $args       Args
+	 * @return Segment
+	 */
+	public function __call($meth, $args)
+	{
+		try {
+			return $this->setVars($meth, $args[0]);
+		} catch (SegmentException $e) {
+			throw new SegmentException("method $meth nor var $meth exist");
+		}
+	}
+	/**
+	 * Returns the parsed XML
+	 *
+	 * @return string
+	 */
+	public function getXmlParsed()
+	{
+		return $this->xmlParsed;
+	}
 }
-

From cd1f5fead1f1d35bccea5ab7d0a9963006944309 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 26 Jan 2022 13:51:56 +0100
Subject: [PATCH 306/316] phpcs

---
 htdocs/mrp/js/lib_dispatch.js.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/mrp/js/lib_dispatch.js.php b/htdocs/mrp/js/lib_dispatch.js.php
index d8285ac75c1..e8ca84d7a4e 100644
--- a/htdocs/mrp/js/lib_dispatch.js.php
+++ b/htdocs/mrp/js/lib_dispatch.js.php
@@ -70,14 +70,14 @@ function addDispatchLine(index, type, mode)
 	mode = mode || 'qtymissing'
 
 	console.log("fourn/js/lib_dispatch.js.php Split line type="+type+" index="+index+" mode="+mode);
-    if(mode == 'qtymissingconsume') {
-        var inputId = 'qtytoconsume';
-        var warehouseId = 'idwarehouse';
-    }
-    else {
-        var inputId = 'qtytoproduce';
-        var warehouseId = 'idwarehousetoproduce';
-    }
+	if(mode == 'qtymissingconsume') {
+		var inputId = 'qtytoconsume';
+		var warehouseId = 'idwarehouse';
+	}
+	else {
+		var inputId = 'qtytoproduce';
+		var warehouseId = 'idwarehousetoproduce';
+	}
 	var nbrTrs = $("tr[name^='"+type+"_"+index+"']").length; 				// position of line for batch
 	var $row = $("tr[name='"+type+'_'+index+"_1']").clone(true); 				// clone last batch line to jQuery object
 	var	qtyOrdered = parseFloat($("#qty_ordered_"+index).val()); 	// Qty ordered is same for all rows

From 15d4d44cb55da948b1e5872f89af27ccedb75ea4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 26 Jan 2022 14:01:41 +0100
Subject: [PATCH 307/316] css

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

diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 5e59c6be224..02075c6fb87 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -445,7 +445,7 @@ input, select {
 	margin-top:1px;
 }
 #mainbody input.button:not(.buttongen):not(.bordertransp), #mainbody a.button:not(.buttongen):not(.bordertransp) {
-	background: var(--butactionbg);;
+	background: var(--butactionbg);
 	color: #FFF !important;
 	border-radius: 3px;
 	border-collapse: collapse;

From 7ce6f1393397bccbda9346308c3b4c3a7ebe01a0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 26 Jan 2022 14:07:13 +0100
Subject: [PATCH 308/316] Fix php8

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index dbf8f3869e0..cf00dc0e317 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -2266,7 +2266,10 @@ abstract class CommonObject
 	 */
 	public function setPaymentMethods($id)
 	{
+		$error = 0; $notrigger = 0;
+
 		dol_syslog(get_class($this).'::setPaymentMethods('.$id.')');
+
 		if ($this->statut >= 0 || $this->element == 'societe') {
 			// TODO uniformize field name
 			$fieldname = 'fk_mode_reglement';

From 9180e9a5c65dd6019e04ce2e38098bfe6acd5e5d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 26 Jan 2022 14:42:26 +0100
Subject: [PATCH 309/316] Clean code

---
 htdocs/includes/odtphp/Segment.php | 7 ++++---
 htdocs/includes/odtphp/odf.php     | 4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/includes/odtphp/Segment.php b/htdocs/includes/odtphp/Segment.php
index 811cf62dadd..b57983321a3 100644
--- a/htdocs/includes/odtphp/Segment.php
+++ b/htdocs/includes/odtphp/Segment.php
@@ -223,16 +223,17 @@ class Segment implements IteratorAggregate, Countable
 	 */
 	public function setVars($key, $value, $encode = true, $charset = 'ISO-8859')
 	{
-		if (strpos($this->xml, $this->odf->getConfig('DELIMITER_LEFT') . $key . $this->odf->getConfig('DELIMITER_RIGHT')) === false) {
+		$tag = $this->odf->getConfig('DELIMITER_LEFT') . $key . $this->odf->getConfig('DELIMITER_RIGHT');
+
+		if (strpos($this->xml, $tag) === false) {
 			//throw new SegmentException("var $key not found in {$this->getName()}");
 		}
 
-		$tag = $this->odf->getConfig('DELIMITER_LEFT') . $key . $this->odf->getConfig('DELIMITER_RIGHT');
-
 		$this->vars[$tag] = $this->odf->convertVarToOdf($value, $encode, $charset);
 
 		return $this;
 	}
+
 	/**
 	 * Assign a template variable as a picture
 	 *
diff --git a/htdocs/includes/odtphp/odf.php b/htdocs/includes/odtphp/odf.php
index 80183843b36..6c63da727b7 100644
--- a/htdocs/includes/odtphp/odf.php
+++ b/htdocs/includes/odtphp/odf.php
@@ -122,7 +122,8 @@ class Odf
 	}
 
 	/**
-	 * Assing a template variable
+	 * Assing a template variable into ->vars.
+	 * For example, key is {object_date} and value is '2021-01-01'
 	 *
 	 * @param string   $key        Name of the variable within the template
 	 * @param string   $value      Replacement value
@@ -134,6 +135,7 @@ class Odf
 	public function setVars($key, $value, $encode = true, $charset = 'ISO-8859')
 	{
 		$tag = $this->config['DELIMITER_LEFT'] . $key . $this->config['DELIMITER_RIGHT'];
+
 		// TODO Warning string may be:
 		// <text:span text:style-name="T13">{</text:span><text:span text:style-name="T12">aaa</text:span><text:span text:style-name="T13">}</text:span>
 		// instead of {aaa} so we should enhance this function.

From 28b9ead68803fb7a64a424cc4ae11039e322c727 Mon Sep 17 00:00:00 2001
From: BB2A Anthony Berton <bertonanthony@gmail.com>
Date: Wed, 26 Jan 2022 15:06:51 +0100
Subject: [PATCH 310/316] ADD config text color

---
 htdocs/admin/ihm.php                 |  7 ++++
 htdocs/core/lib/usergroups.lib.php   | 48 +++++++++++++++++++++++++++-
 htdocs/langs/en_US/admin.lang        |  1 +
 htdocs/theme/eldy/btn.inc.php        |  4 ++-
 htdocs/theme/eldy/global.inc.php     |  2 +-
 htdocs/theme/eldy/style.css.php      |  6 +++-
 htdocs/theme/eldy/theme_vars.inc.php |  1 +
 htdocs/theme/md/btn.inc.php          |  4 ++-
 htdocs/theme/md/style.css.php        |  9 ++++--
 htdocs/theme/md/theme_vars.inc.php   |  1 +
 10 files changed, 76 insertions(+), 7 deletions(-)

diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index ea675ed9001..e70e6a4cdd7 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -207,6 +207,13 @@ if ($action == 'update') {
 		} else {
 			dolibarr_set_const($db, 'THEME_ELDY_BTNACTION', $val, 'chaine', 0, '', $conf->entity);
 		}
+
+		$val=(implode(',', (colorStringToArray(GETPOST('THEME_ELDY_TEXTBTNACTION'), array()))));
+		if ($val == '') {
+			dolibarr_del_const($db, 'THEME_ELDY_TEXTBTNACTION', $conf->entity);
+		} else {
+			dolibarr_set_const($db, 'THEME_ELDY_TEXTBTNACTION', $val, 'chaine', 0, '', $conf->entity);
+		}
 	}
 
 	if ($mode == 'dashboard') {
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 9ee6afa182e..1f990bd955d 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2010-2017	Regis Houssin		<regis.houssin@inodbox.com>
  * Copyright (C) 2015	    Alexandre Spangaro	<aspangaro@open-dsi.fr>
  * Copyright (C) 2018       Ferran Marcet       <fmarcet@2byte.es>
- * Copyright (C) 2021       Anthony Berton          <bertonanthony@gmail.com>
+ * Copyright (C) 2021       Anthony Berton      <bertonanthony@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -952,6 +952,52 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '</tr>';
 	}
 
+		// Text btn action
+	if ($foruserprofile) {
+		/*
+		 print '<tr class="oddeven">';
+		 print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
+		 print '<td>'.($conf->global->THEME_ELDY_TOPMENU_BACK1?$conf->global->THEME_ELDY_TEXTBTNACTION:$langs->trans("Default")).'</td>';
+		 print '<td class="nowrap left" width="20%"><input name="check_THEME_ELDY_TEXTBTNACTION" id="check_THEME_ELDY_TEXTBTNACTION" type="checkbox" '.(! empty($object->conf->THEME_ELDY_TEXTBTNACTION)?" checked":"");
+		 print (empty($dolibarr_main_demo) && $edit)?'':' disabled="disabled"'; // Disabled for demo
+		 print '> '.$langs->trans("UsePersonalValue").'</td>';
+		 print '<td>';
+		 if ($edit)
+		 {
+		 print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTBTNACTION,array()),''),'THEME_ELDY_TEXTBTNACTION','',1).' ';
+		 }
+		 else
+		 {
+		 $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BTNACTION,array()),'');
+		 if ($color) print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+		 else print '';
+		 }
+			if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
+			print '</td>';*/
+	} else {
+		$default = (empty($textbutaction) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($textbutaction)));
+
+		print '<tr class="oddeven">';
+		print '<td>'.$langs->trans("TextBtnActionColor").'</td>';
+		print '<td colspan="'.($colspan - 1).'">';
+		if ($edit) {
+			print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_TEXTBTNACTION) ? $conf->global->THEME_ELDY_TEXTBTNACTION : ''), array()), ''), 'THEME_ELDY_TEXTBTNACTION', '', 1, '', '', 'colortextbtnaction').' ';
+		} else {
+			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTBTNACTION, array()), '');
+			if ($color) {
+				print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+			} else {
+				//print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$defaultcolor.'" value="'.$langs->trans("Default").'">';
+				//print '<span style="color: #000078">'.$langs->trans("Default").'</span>';
+				print $langs->trans("Default");
+			}
+		}
+		print ' &nbsp; <span class="nowraponall opacitymedium">'.$langs->trans("Default").'</span>: <strong><span style="color: #000">'.$default.'</span></strong> ';
+		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
+		print '</td>';
+		print '</tr>';
+	}
+
 	// Use MAIN_OPTIMIZEFORTEXTBROWSER
 	if ($foruserprofile && !empty($fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 		//$default=yn($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER);
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 99f87413d06..64c9cf5e0d7 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1918,6 +1918,7 @@ HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (use 'ffffff' for no highlight)
 HighlightLinesChecked=Highlight color of the line when it is checked (use 'ffffff' for no highlight)
 BtnActionColor=Color of the action button
+TextBtnActionColor=Text color of the action button
 TextTitleColor=Text color of Page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
diff --git a/htdocs/theme/eldy/btn.inc.php b/htdocs/theme/eldy/btn.inc.php
index 1b92ef80f04..d5a3f51e125 100644
--- a/htdocs/theme/eldy/btn.inc.php
+++ b/htdocs/theme/eldy/btn.inc.php
@@ -11,6 +11,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
 			--btncolorborder: #FFF;
 			--butactiondeletebg: rgb(234,228,225);
 			--butactionbg: rgb(<?php print $butactionbg; ?>);
+			--textbutaction: rgb(<?php print $textbutaction; ?>);
 }
 
 <?php
@@ -28,6 +29,7 @@ if (!empty($conf->global->THEME_DARKMODEENABLED)) {
             --btncolorborder: #2b2c2e;
             --butactiondeletebg: rgb(252,84,91);
 			--butactionbg: rgb(173,140,79);
+			--textbutaction: rgb(255,255,255);
 
       }\n";
 	if ($conf->global->THEME_DARKMODEENABLED != 2) {
@@ -67,7 +69,7 @@ span.butAction, span.butActionDelete {
 }
 .butAction {
 	background: var(--butactionbg);
-	color: #FFF !important;
+	color: var(--textbutaction) !important;
 	/* background: rgb(230, 232, 239); */
 }
 .butActionRefused, .butAction, .butActionDelete {
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index deb7cdadf9e..a26fe1aa2fa 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -228,7 +228,7 @@ input, select {
 }
 #mainbody input.button:not(.buttongen):not(.bordertransp), #mainbody a.button:not(.buttongen):not(.bordertransp) {
 	background: var(--butactionbg);
-	color: #FFF !important;
+	color: var(--textbutaction)!important;
 	border-radius: 3px;
 	border-collapse: collapse;
 	border: none;
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index edeab565f9d..8029ce93681 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -154,6 +154,9 @@ if (!isset($conf->global->THEME_ELDY_TEXTLINK)) {
 if (!isset($conf->global->THEME_ELDY_BTNACTION)) {
 	$conf->global->THEME_ELDY_BTNACTION = $butactionbg;
 }
+if (!isset($conf->global->THEME_ELDY_TEXTBTNACTION)) {
+	$conf->global->THEME_ELDY_TEXTBTNACTION = $textbutaction;
+}
 // Case of option editable only if option THEME_ELDY_ENABLE_PERSONALIZED is on
 if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED)) {
 	$conf->global->THEME_ELDY_BACKTABCARD1 = '255,255,255'; // card
@@ -181,7 +184,8 @@ $colortexttitle      = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (emp
 $colortexttitlelink  = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTTITLELINK) ? $colortexttitlelink : $conf->global->THEME_ELDY_TEXTTITLELINK) : (empty($user->conf->THEME_ELDY_TEXTTITLELINK) ? $colortexttitlelink : $user->conf->THEME_ELDY_TEXTTITLELINK);
 $colortext           = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXT) ? $colortext : $conf->global->THEME_ELDY_TEXT) : (empty($user->conf->THEME_ELDY_TEXT) ? $colortext : $user->conf->THEME_ELDY_TEXT);
 $colortextlink       = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTLINK) ? $colortextlink : $conf->global->THEME_ELDY_TEXTLINK) : (empty($user->conf->THEME_ELDY_TEXTLINK) ? $colortextlink : $user->conf->THEME_ELDY_TEXTLINK);
-$butactionbg       = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_BTNACTION) ? $butactionbg : $conf->global->THEME_ELDY_BTNACTION) : (empty($user->conf->THEME_ELDY_BTNACTION) ? $butactionbg : $user->conf->THEME_ELDY_BTNACTION);
+$butactionbg       	 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_BTNACTION) ? $butactionbg : $conf->global->THEME_ELDY_BTNACTION) : (empty($user->conf->THEME_ELDY_BTNACTION) ? $butactionbg : $user->conf->THEME_ELDY_BTNACTION);
+$textbutaction     = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTBTNACTION) ? $textbutaction : $conf->global->THEME_ELDY_TEXTBTNACTION) : (empty($user->conf->THEME_ELDY_TEXTBTNACTION) ? $textbutaction : $user->conf->THEME_ELDY_TEXTBTNACTION);
 $fontsize            = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_FONT_SIZE1) ? $fontsize : $conf->global->THEME_ELDY_FONT_SIZE1) : (empty($user->conf->THEME_ELDY_FONT_SIZE1) ? $fontsize : $user->conf->THEME_ELDY_FONT_SIZE1);
 $fontsizesmaller     = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_FONT_SIZE2) ? $fontsize : $conf->global->THEME_ELDY_FONT_SIZE2) : (empty($user->conf->THEME_ELDY_FONT_SIZE2) ? $fontsize : $user->conf->THEME_ELDY_FONT_SIZE2);
 
diff --git a/htdocs/theme/eldy/theme_vars.inc.php b/htdocs/theme/eldy/theme_vars.inc.php
index 41d162e6cbc..3346ac5d73d 100644
--- a/htdocs/theme/eldy/theme_vars.inc.php
+++ b/htdocs/theme/eldy/theme_vars.inc.php
@@ -75,6 +75,7 @@ $topMenuFontSize = '1.1em';
 $toolTipBgColor = 'rgba(255, 255, 255, 0.96)';
 $toolTipFontColor = '#333';
 $butactionbg = '150, 110, 162, 0.95';
+$textbutaction = '255, 255, 255';
 
 // text color
 $textSuccess   = '#28a745';
diff --git a/htdocs/theme/md/btn.inc.php b/htdocs/theme/md/btn.inc.php
index 174d53eb516..3ab9550e42d 100644
--- a/htdocs/theme/md/btn.inc.php
+++ b/htdocs/theme/md/btn.inc.php
@@ -11,6 +11,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
 			--btncolorborder: #FFF;
 			--butactiondeletebg: rgb(234,228,225);
 			--butactionbg: rgb(<?php print $butactionbg; ?>);
+			--textbutaction: rgb(<?php print $textbutaction; ?>);
 }
 
 <?php
@@ -28,6 +29,7 @@ if (!empty($conf->global->THEME_DARKMODEENABLED)) {
             --btncolorborder: #2b2c2e;
             --butactiondeletebg: rgb(252,84,91);
 			--butactionbg: rgb(173,140,79);
+			--textbutaction: rgb(255,255,255);
 
       }\n";
 	if ($conf->global->THEME_DARKMODEENABLED != 2) {
@@ -62,7 +64,7 @@ span.butAction, span.butActionDelete {
 
 .butAction {
 	background: var(--butactionbg);
-	color: #FFF !important;
+	color: var(--textbutaction) !important;
 	/* background: rgb(230, 232, 239); */
 }
 .butActionRefused, .butAction, .butActionDelete {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 5e59c6be224..7394cbe697f 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -152,6 +152,9 @@ if (!isset($conf->global->THEME_ELDY_TEXTLINK)) {
 if (!isset($conf->global->THEME_ELDY_BTNACTION)) {
 	$conf->global->THEME_ELDY_BTNACTION = $butactionbg;
 }
+if (!isset($conf->global->THEME_ELDY_TEXTBTNACTION)) {
+	$conf->global->THEME_ELDY_TEXTBTNACTION = $textbutaction;
+}
 
 // Case of option editable only if option THEME_ELDY_ENABLE_PERSONALIZED is on
 if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED)) {
@@ -182,6 +185,7 @@ $colortexttitlelink  = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (emp
 $colortext           = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXT) ? $colortext : $conf->global->THEME_ELDY_TEXT) : (empty($user->conf->THEME_ELDY_TEXT) ? $colortext : $user->conf->THEME_ELDY_TEXT);
 $colortextlink       = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTLINK) ? $colortext : $conf->global->THEME_ELDY_TEXTLINK) : (empty($user->conf->THEME_ELDY_TEXTLINK) ? $colortextlink : $user->conf->THEME_ELDY_TEXTLINK);
 $butactionbg       	 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_BTNACTION) ? $butactionbg : $conf->global->THEME_ELDY_BTNACTION) : (empty($user->conf->THEME_ELDY_BTNACTION) ? $butactionbg : $user->conf->THEME_ELDY_BTNACTION);
+$textbutaction     = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTBTNACTION) ? $textbutaction : $conf->global->THEME_ELDY_TEXTBTNACTION) : (empty($user->conf->THEME_ELDY_TEXTBTNACTION) ? $textbutaction : $user->conf->THEME_ELDY_TEXTBTNACTION);
 $fontsize            = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_FONT_SIZE1) ? $fontsize : $conf->global->THEME_ELDY_FONT_SIZE1) : (empty($user->conf->THEME_ELDY_FONT_SIZE1) ? $fontsize : $user->conf->THEME_ELDY_FONT_SIZE1);
 $fontsizesmaller     = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_FONT_SIZE2) ? $fontsize : $conf->global->THEME_ELDY_FONT_SIZE2) : (empty($user->conf->THEME_ELDY_FONT_SIZE2) ? $fontsize : $user->conf->THEME_ELDY_FONT_SIZE2);
 
@@ -344,6 +348,7 @@ print '*/'."\n";
 	--productlinestocktoolow: #884400;
 	--infoboxmoduleenabledbgcolor : linear-gradient(0.4turn, #fff, #fff, #fff, #e4efe8);
 	--butactionbg : #<?php print $butactionbg; ?>;
+	--textbutaction : #<?php print $textbutaction; ?>;
 }
 
 body {
@@ -445,8 +450,8 @@ input, select {
 	margin-top:1px;
 }
 #mainbody input.button:not(.buttongen):not(.bordertransp), #mainbody a.button:not(.buttongen):not(.bordertransp) {
-	background: var(--butactionbg);;
-	color: #FFF !important;
+	background: var(--butactionbg);
+	color: var(--textbutaction)!important;
 	border-radius: 3px;
 	border-collapse: collapse;
 	border: none;
diff --git a/htdocs/theme/md/theme_vars.inc.php b/htdocs/theme/md/theme_vars.inc.php
index d77b994dab8..5f26d0d83bd 100644
--- a/htdocs/theme/md/theme_vars.inc.php
+++ b/htdocs/theme/md/theme_vars.inc.php
@@ -70,6 +70,7 @@ $topMenuFontSize = '1.1em';
 $toolTipBgColor = 'rgba(255, 255, 255, 0.96)';
 $toolTipFontColor = '#333';
 $butactionbg = '150, 110, 162, 0.95';
+$textbutaction = '255, 255, 255, 255';
 
 // text color
 $textSuccess   = '#28a745';

From 512df3c580c1a2b16a54de5be0c573b9ea945dac Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 26 Jan 2022 15:12:42 +0100
Subject: [PATCH 311/316] Try to address a better solution for #19776

---
 htdocs/compta/facture/card-rec.php                 |  1 +
 .../doc/doc_generic_invoice_odt.modules.php        | 14 ++++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php
index a76332197bc..3909d9437b4 100644
--- a/htdocs/compta/facture/card-rec.php
+++ b/htdocs/compta/facture/card-rec.php
@@ -1354,6 +1354,7 @@ if ($action == 'create') {
 			$dateexample = $object->date_when;
 		}
 
+		// Help of substitution key
 		$substitutionarray = getCommonSubstitutionArray($langs, 2, null, $object);
 
 		$substitutionarray['__INVOICE_PREVIOUS_MONTH__'] = $langs->trans("PreviousMonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($dateexample, -1, 'm'), '%m').')';
diff --git a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
index 60e3d6bcfdd..b8bfcdc16ac 100644
--- a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
+++ b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
@@ -400,6 +400,20 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 				$tmparray = array_merge($substitutionarray, $array_object_from_properties, $array_user, $array_soc, $array_thirdparty, $array_objet, $array_propal, $array_other, $array_thirdparty_contact);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
 
+				// Complete also with substitution from keys directly found into template
+				// TODO Search all tags {object_...:xxxx} into template then loop on this found tags to analyze them and the the corresponding
+				// property of object and use the xxxx to know how to format it.
+				// Before that, we hard code this substitution as if we have found them into the template.
+				$tmparray['object_PREVIOUS_MONTH'] = dol_print_date(dol_time_plus_duree($this->date, -1, 'm'), '%m');
+				$tmparray['object_MONTH'] = dol_print_date($this->date, '%m');
+				$tmparray['object_NEXT_MONTH'] = dol_print_date(dol_time_plus_duree($this->date, 1, 'm'), '%m');
+				$tmparray['object_PREVIOUS_MONTH_TEXT'] = dol_print_date(dol_time_plus_duree($this->date, -1, 'm'), '%B');
+				$tmparray['object_MONTH_TEXT'] = dol_print_date($this->date, '%B');
+				$tmparray['object_NEXT_MONTH_TEXT'] = dol_print_date(dol_time_plus_duree($this->date, 1, 'm'), '%B');
+				$tmparray['object_PREVIOUS_YEAR'] = dol_print_date(dol_time_plus_duree($this->date, -1, 'y'), '%Y');
+				$tmparray['object_YEAR'] = dol_print_date($this->date, '%Y');
+				$tmparray['object_NEXT_YEAR'] = dol_print_date(dol_time_plus_duree($this->date, 1, 'y'), '%Y');
+
 				// Call the ODTSubstitution hook
 				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
 				$reshook = $hookmanager->executeHooks('ODTSubstitution', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks

From 538c5f14d314cf96e0d30dfc734b542f2c3b0740 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 26 Jan 2022 19:56:02 +0100
Subject: [PATCH 312/316] Fix phpcs

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index cf00dc0e317..dcc31870b1c 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -2266,6 +2266,8 @@ abstract class CommonObject
 	 */
 	public function setPaymentMethods($id)
 	{
+		global $user;
+
 		$error = 0; $notrigger = 0;
 
 		dol_syslog(get_class($this).'::setPaymentMethods('.$id.')');

From b0e5d63ee2aa5814777d8bed943be833d0b4833c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 27 Jan 2022 11:49:38 +0100
Subject: [PATCH 313/316] Better log

---
 htdocs/public/test/test_exec.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/htdocs/public/test/test_exec.php b/htdocs/public/test/test_exec.php
index 732bfefa824..06503901ef2 100644
--- a/htdocs/public/test/test_exec.php
+++ b/htdocs/public/test/test_exec.php
@@ -41,13 +41,14 @@ if (!defined("NOSESSION")) {
 	define("NOSESSION", '1');
 }
 
+print "*** SHOW SESSION STATUS<br>\n";
 print "Legend:<br>\n";
 print 'PHP_SESSION_DISABLED='.PHP_SESSION_DISABLED."<br>\n";
 print 'PHP_SESSION_NONE='.PHP_SESSION_NONE."<br>\n";
 print 'PHP_SESSION_ACTIVE='.PHP_SESSION_ACTIVE."<br>\n";
 print '<br>';
 
-print 'session_status='.session_status().' (before main.inc.php)';
+print 'session_status='.session_status().' (before main.inc.php)<br>';
 print '<br>';
 
 require '../../main.inc.php';
@@ -62,6 +63,8 @@ if ($dolibarr_main_prod) {
  * View
  */
 
+print "*** TEST READ OF /tmp/test.txt FILE<br>\n";
+
 echo "Test<br>\n";
 $out='';
 $ret=0;
@@ -78,12 +81,17 @@ if ($f) {
 
 print '<br><br>'."\n";
 
+
+print "*** TEST READ OF /test.txt FILE AND LS /dev/std*<br>\n";
+
 exec('cat /test.txt; ls /dev/std*; sleep 1;', $out, $ret);
 print $ret."<br>\n";
 print_r($out);
 
 print '<br><br>'."\n";
 
+print "*** TRY TO RUN CLAMDSCAN<br>\n";
+
 $ret = 0;
 $out = null;
 exec('/usr/bin/clamdscan --fdpass filethatdoesnotexists.php', $out, $ret);

From 2f1857a23a8fb21b6193e5895f7ffbbe02c0e237 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 27 Jan 2022 11:51:51 +0100
Subject: [PATCH 314/316] Log

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

diff --git a/htdocs/public/test/test_exec.php b/htdocs/public/test/test_exec.php
index 06503901ef2..ccb8f346fc4 100644
--- a/htdocs/public/test/test_exec.php
+++ b/htdocs/public/test/test_exec.php
@@ -49,7 +49,8 @@ print 'PHP_SESSION_ACTIVE='.PHP_SESSION_ACTIVE."<br>\n";
 print '<br>';
 
 print 'session_status='.session_status().' (before main.inc.php)<br>';
-print '<br>';
+
+print '<br><br>'."\n";
 
 require '../../main.inc.php';
 
@@ -65,7 +66,6 @@ if ($dolibarr_main_prod) {
 
 print "*** TEST READ OF /tmp/test.txt FILE<br>\n";
 
-echo "Test<br>\n";
 $out='';
 $ret=0;
 

From 6bd2caee084ab97e08e2a882ec11f6a5f3e982dd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 27 Jan 2022 16:35:09 +0100
Subject: [PATCH 315/316] test

---
 htdocs/public/test/test_exec.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/public/test/test_exec.php b/htdocs/public/test/test_exec.php
index ccb8f346fc4..94a1d96462b 100644
--- a/htdocs/public/test/test_exec.php
+++ b/htdocs/public/test/test_exec.php
@@ -87,9 +87,11 @@ print "*** TEST READ OF /test.txt FILE AND LS /dev/std*<br>\n";
 exec('cat /test.txt; ls /dev/std*; sleep 1;', $out, $ret);
 print $ret."<br>\n";
 print_r($out);
+print '<br>';
 
 print '<br><br>'."\n";
 
+
 print "*** TRY TO RUN CLAMDSCAN<br>\n";
 
 $ret = 0;

From 3f9feef91432dc2cc402054b6a3ab1eca816ffae Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 27 Jan 2022 20:38:38 +0100
Subject: [PATCH 316/316] Comment

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

diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 27e8cc6bf95..b2c9543453b 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -387,7 +387,7 @@ class Contrat extends CommonObject
 			if ($contratline->statut != ContratLigne::STATUS_OPEN) {
 				$contratline->context = $this->context;
 
-				$result = $contratline->active_line($user, $date_start, -1, $comment);
+				$result = $contratline->active_line($user, $date_start, -1, $comment);	// This call trigger LINECONTRACT_ACTIVATE
 				if ($result < 0) {
 					$error++;
 					$this->error = $contratline->error;